From dea916b7acb979759a87c90ff23b147ebe7bec25 Mon Sep 17 00:00:00 2001 From: Zoltan Puskas Date: Fri, 5 Apr 2024 23:48:45 -0700 Subject: net-fs/davfs2: Add net-libs/neon-0.33.0 support for testing versions Add patch for build system and also add dependency slotting Closes: https://bugs.gentoo.org/925705 Closes: https://github.com/gentoo/gentoo/pull/36131 Signed-off-by: Zoltan Puskas Signed-off-by: Gokturk Yuksek Signed-off-by: Amy Liffey --- net-fs/davfs2/davfs2-1.6.1-r2.ebuild | 55 -------------------- net-fs/davfs2/davfs2-1.6.1-r3.ebuild | 59 ++++++++++++++++++++++ net-fs/davfs2/davfs2-1.7.0-r1.ebuild | 59 ++++++++++++++++++++++ net-fs/davfs2/davfs2-1.7.0.ebuild | 55 -------------------- .../files/davfs2-1.6.1-neon-version-support.patch | 14 +++++ 5 files changed, 132 insertions(+), 110 deletions(-) delete mode 100644 net-fs/davfs2/davfs2-1.6.1-r2.ebuild create mode 100644 net-fs/davfs2/davfs2-1.6.1-r3.ebuild create mode 100644 net-fs/davfs2/davfs2-1.7.0-r1.ebuild delete mode 100644 net-fs/davfs2/davfs2-1.7.0.ebuild create mode 100644 net-fs/davfs2/files/davfs2-1.6.1-neon-version-support.patch (limited to 'net-fs/davfs2') diff --git a/net-fs/davfs2/davfs2-1.6.1-r2.ebuild b/net-fs/davfs2/davfs2-1.6.1-r2.ebuild deleted file mode 100644 index 27aa924e32d7..000000000000 --- a/net-fs/davfs2/davfs2-1.6.1-r2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Linux FUSE (or coda) driver that allows you to mount a WebDAV resource" -HOMEPAGE="https://savannah.nongnu.org/projects/davfs2" -SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="nls" -RESTRICT="test" - -RDEPEND="dev-libs/libxml2 - acct-group/davfs2 - acct-user/davfs2 - net-libs/neon:= - sys-libs/zlib - nls? ( virtual/libintl virtual/libiconv ) -" -BDEPEND=" - nls? ( sys-devel/gettext ) -" - -src_prepare() { - local f - - # Let the package manager handle man page compression - while IFS="" read -d $'\0' -r f ; do - sed -e '/^manual[58]_DATA/ s/[.]gz//g' -i "${f}" || die - done < <(find "${S}"/man -type f -name 'Makefile.am' -print0) - - default - eautoreconf -} - -src_configure() { - econf --enable-largefile $(use_enable nls) ssbindir="${EPREFIX}/usr/sbin" -} - -pkg_postinst() { - elog - elog "Quick setup:" - elog " (as root)" - elog " # gpasswd -a \${your_user} davfs2" - elog " # echo 'https://path/to/dav /home/\${your_user}/dav davfs rw,user,noauto 0 0' >> /etc/fstab" - elog " (as user)" - elog " \$ mkdir -p ~/dav" - elog " \$ mount ~/dav" - elog -} diff --git a/net-fs/davfs2/davfs2-1.6.1-r3.ebuild b/net-fs/davfs2/davfs2-1.6.1-r3.ebuild new file mode 100644 index 000000000000..4685ec7210b8 --- /dev/null +++ b/net-fs/davfs2/davfs2-1.6.1-r3.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Linux FUSE (or coda) driver that allows you to mount a WebDAV resource" +HOMEPAGE="https://savannah.nongnu.org/projects/davfs2" +SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +IUSE="nls" +RESTRICT="test" + +RDEPEND="dev-libs/libxml2 + acct-group/davfs2 + acct-user/davfs2 + net-libs/neon:0/27 + sys-libs/zlib + nls? ( virtual/libintl virtual/libiconv ) +" +BDEPEND=" + nls? ( sys-devel/gettext ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.6.1-neon-version-support.patch +) + +src_prepare() { + local f + + # Let the package manager handle man page compression + while IFS="" read -d $'\0' -r f ; do + sed -e '/^manual[58]_DATA/ s/[.]gz//g' -i "${f}" || die + done < <(find "${S}"/man -type f -name 'Makefile.am' -print0) + + default + eautoreconf +} + +src_configure() { + econf --enable-largefile $(use_enable nls) ssbindir="${EPREFIX}/usr/sbin" +} + +pkg_postinst() { + elog + elog "Quick setup:" + elog " (as root)" + elog " # gpasswd -a \${your_user} davfs2" + elog " # echo 'https://path/to/dav /home/\${your_user}/dav davfs rw,user,noauto 0 0' >> /etc/fstab" + elog " (as user)" + elog " \$ mkdir -p ~/dav" + elog " \$ mount ~/dav" + elog +} diff --git a/net-fs/davfs2/davfs2-1.7.0-r1.ebuild b/net-fs/davfs2/davfs2-1.7.0-r1.ebuild new file mode 100644 index 000000000000..16f1eca17df8 --- /dev/null +++ b/net-fs/davfs2/davfs2-1.7.0-r1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Linux FUSE (or coda) driver that allows you to mount a WebDAV resource" +HOMEPAGE="https://savannah.nongnu.org/projects/davfs2" +SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +IUSE="nls" +RESTRICT="test" + +RDEPEND="dev-libs/libxml2 + acct-group/davfs2 + acct-user/davfs2 + net-libs/neon:0/27 + sys-libs/zlib + nls? ( virtual/libintl virtual/libiconv ) +" +BDEPEND=" + nls? ( sys-devel/gettext ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.6.1-neon-version-support.patch +) + +src_prepare() { + local f + + # Let the package manager handle man page compression + while IFS="" read -d $'\0' -r f ; do + sed -e '/^manual[58]_DATA/ s/[.]gz//g' -i "${f}" || die + done < <(find "${S}"/man -type f -name 'Makefile.am' -print0) + + default + eautoreconf +} + +src_configure() { + econf --enable-largefile $(use_enable nls) +} + +pkg_postinst() { + elog + elog "Quick setup:" + elog " (as root)" + elog " # gpasswd -a \${your_user} davfs2" + elog " # echo 'https://path/to/dav /home/\${your_user}/dav davfs rw,user,noauto 0 0' >> /etc/fstab" + elog " (as user)" + elog " \$ mkdir -p ~/dav" + elog " \$ mount ~/dav" + elog +} diff --git a/net-fs/davfs2/davfs2-1.7.0.ebuild b/net-fs/davfs2/davfs2-1.7.0.ebuild deleted file mode 100644 index 3ac4673512f8..000000000000 --- a/net-fs/davfs2/davfs2-1.7.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools - -DESCRIPTION="Linux FUSE (or coda) driver that allows you to mount a WebDAV resource" -HOMEPAGE="https://savannah.nongnu.org/projects/davfs2" -SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" -IUSE="nls" -RESTRICT="test" - -RDEPEND="dev-libs/libxml2 - acct-group/davfs2 - acct-user/davfs2 - net-libs/neon:= - sys-libs/zlib - nls? ( virtual/libintl virtual/libiconv ) -" -BDEPEND=" - nls? ( sys-devel/gettext ) -" - -src_prepare() { - local f - - # Let the package manager handle man page compression - while IFS="" read -d $'\0' -r f ; do - sed -e '/^manual[58]_DATA/ s/[.]gz//g' -i "${f}" || die - done < <(find "${S}"/man -type f -name 'Makefile.am' -print0) - - default - eautoreconf -} - -src_configure() { - econf --enable-largefile $(use_enable nls) -} - -pkg_postinst() { - elog - elog "Quick setup:" - elog " (as root)" - elog " # gpasswd -a \${your_user} davfs2" - elog " # echo 'https://path/to/dav /home/\${your_user}/dav davfs rw,user,noauto 0 0' >> /etc/fstab" - elog " (as user)" - elog " \$ mkdir -p ~/dav" - elog " \$ mount ~/dav" - elog -} diff --git a/net-fs/davfs2/files/davfs2-1.6.1-neon-version-support.patch b/net-fs/davfs2/files/davfs2-1.6.1-neon-version-support.patch new file mode 100644 index 000000000000..b002b49be6d3 --- /dev/null +++ b/net-fs/davfs2/files/davfs2-1.6.1-neon-version-support.patch @@ -0,0 +1,14 @@ +# Gentoo bug https://bugs.gentoo.org/925705 + +diff -Naur davfs2-1.7.0-orig/configure.ac davfs2-1.7.0/configure.ac +--- davfs2-1.7.0-orig/configure.ac 2022-09-08 13:17:15.000000000 -0700 ++++ davfs2-1.7.0/configure.ac 2024-04-05 03:39:20.044039872 -0700 +@@ -36,7 +36,7 @@ + # Checks for libraries. + AM_GNU_GETTEXT_VERSION(0.19.8) + AM_GNU_GETTEXT([external]) +-NE_REQUIRE_VERSIONS([0], [27 28 29 30 31 32]) ++NE_REQUIRE_VERSIONS([0], [27 28 29 30 31 32 33]) + DAV_CHECK_NEON + + # Checks for header files. -- cgit v1.2.3-65-gdbad