gentoo auto-resync : 20:04:2024 - 12:05:23

7 files changed, 31 insertions, 77 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 0345368bf25d..f94418db743f 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/davfs2/Manifest b/net-fs/davfs2/Manifest
index 69319731b2cb..cf59699445ba 100644
--- a/net-fs/davfs2/Manifest
+++ b/net-fs/davfs2/Manifest
@@ -1,9 +1,9 @@
 AUX davfs2-1.6.0-neon-0.32-support.patch 336 BLAKE2B 6f21c679eb1cdc305e6648be4d3114b9e34adc1eb4cd285ed0731ee7576f20d73d6349085af04807f07cd5acf4cf2624ccb093b679bc8d0611a9105b1317f3c8 SHA512 e50e2a5ccc415b43e8942d7d240603dc376195b5945a02ea1c57ce9d41356ce724f6de47e7d34369c2170e683f02ed340e0844dbda07860dc6dafd5ba854f302
+AUX davfs2-1.6.1-neon-version-support.patch 496 BLAKE2B c5edb051ae20c9d4b2cbb19d1231c7939bc7d7f86309a06ed240bec3db76117cee83d74324493a723ee4d7374a03624cc9be292dd3e5619011f3b1005870f78a SHA512 6ee74c461f410757d9ca3872f7592efdd4706c04ed59f824faad577f45c8b7738e6d909980f618633348eccc505f7b80f2b12de1da97881b807ff82923f6cab9
 DIST davfs2-1.6.0.tar.gz 472511 BLAKE2B aed1ec060d5639fb90a58257038a75c25c2f77a7d6393130ffa3b4d36b92433654b8396dfe4615e4f2ea06d5c6d961d5de27b0347e62d730a22eddd003db71e1 SHA512 e016eb847152b7d0c20abfdafd36f43fcff29339362be6765202a45692a186c70b1c33d3566ed8ca695c399a7f0ca1aef7b05d378cdda33d892cb684da34de33
 DIST davfs2-1.6.1.tar.gz 472426 BLAKE2B b24a3f17604838e763cbcf86f62719ee41b5569e58732441a621d210dd0c2e619d4f363d90e9b13d1616e84a3da940da941a15ad6eadfa2b339d14a6e26c75a2 SHA512 12f9eadd2049741b7cb61c5583be6c6982559e702e5cbd4767c655110187524d7afad0a6ff8ad00d457e194ad75b3ce391f5fe566fb4a0bbaed0a705caa3f163
 DIST davfs2-1.7.0.tar.gz 476244 BLAKE2B 671d473bc94c2a0cfc3d2cfb47b6eb558fee0e834ed4de9c3670279643f8903568d9fb077b6fbc2f81e848d076ff02ea5b07d885f16e89331393a28df62055a6 SHA512 6ee5820b60ed28ad100949bb4db65ea07bbae1ad0128cd35e7bb69f7f6bdde99606e8cf704ddb197f1400abadc3934d34ab85f298f9100b6ea9e60813c2345f2
-EBUILD davfs2-1.6.0-r1.ebuild 1454 BLAKE2B 2fe5b6b8ae968bf11a48eaae0d6d08f266b87a3ce19ae4477e81ba1b8c63581d4fe5ca777065245e0b576e1add9a438758448d9a4763f6f0b96b89ae050082b0 SHA512 9f951f7ca89107085a82a2b4d6ceaba1e572eadd3d5892f6112430fee1a8cc6ed67593af093cd4f0d15309849d705916e8cf21c6ad93457363a70c63a147400c
-EBUILD davfs2-1.6.0-r2.ebuild 1343 BLAKE2B 5013a00d8da47c1320410036dd0d76a08fb75206b0657839a8bb28b1f5d82a54c5f03f99016f4ae514a255d5dcd40fb931fffb5292ada3e7ffe92717b8373d96 SHA512 34013816585ea94cdd2c50d4b31b5033d96d656620377caf3412324e81aeb126c76034d8e0c69bd12c39ace904a74699691ee2eaca709c01a99a7b42824e18cd
-EBUILD davfs2-1.6.1-r2.ebuild 1253 BLAKE2B a3563210e465af4ca559342b6c4616102af05753f23c5c58c271f667cba2aa84189c7779026c73234416498d53104490b7baf1a9c46a143d7ccd9a00af010eac SHA512 019b0dff59d4badab74b5c3dcb4ba687930891bf080be77e5c8e31139b561ea59e62e88d882e12df694829f7bb103170b9ed2e076eaa8290ec64be5b63da6db7
-EBUILD davfs2-1.7.0.ebuild 1222 BLAKE2B 6ab7e8217a0d448f102c363e8360e224927aa5b0e45a40b253485bd0f7e2c5233a697f666fe24d7bdd6b91c16f72b20ada0075f8716b57ec1b266aa37338a449 SHA512 067846b51285e7fd2732ccbc3c45c73c1bff3e3d6e4fc9b7609782e70d765285230836837bebc891d6d8a5174c0317875a2cf0e30e976505a9c972728e838c72
+EBUILD davfs2-1.6.0-r2.ebuild 1351 BLAKE2B da95a5c415a30b71654769968f5544ddc3a868948c5790a4d58d9fe391ee0f7d2d46f2f99e315587a561e0857df0aec5c92350c4cbe4cfc12466ef66af6b4377 SHA512 6aae3f1fb5be4d14411deadce3877569d658404bccb69a1434cff590954e6e4c90fdc680731baa9b8f08ad920989380ade690eacacedd0d44bcc0190de162692
+EBUILD davfs2-1.6.1-r3.ebuild 1323 BLAKE2B c824b72479d8a73ec1182708ba19d42568b4e00ff06eb4eb9440b127bcdde31e73ef340da67afed0f54ab221ba1685838c17a3252ee72c2b9e0eec6499a8fe47 SHA512 d8eabdbf29cf1e008916463168f4f10abb8784f577abe444fed8f4559ff508211556d4eb30776ce6834b15f7a09f908b1b2f090946ac6e3369c93b0d38da2b1e
+EBUILD davfs2-1.7.0-r1.ebuild 1292 BLAKE2B 0c1674105955cf1664a83aafde1bd3f5ad81fd34755c090a062d26e9ed6dfb5c017f657d07250f6917de7bdc459dc411ea6b5fdef10dc9b54cf2332f57114561 SHA512 c57d275f7c0b6bebd23ef7b86a6306209e5d4c2c3bdec8cbca68559f9a5535a609efb26ac756b7e1e234235de7772d685bd8d72559568a6d50b6477ebb4a8a60
 MISC metadata.xml 342 BLAKE2B 00339b6e849aa8ae26de58e48ece3d3df8d176fa6171756f297cabe81ec6037d3b82add01fcfb915c82fcfa74d4c7816882adc581c0f8a3ed4635fffa3c6727f SHA512 472d5f316a3b1c0b7f2f0f11bd567e9bd3b4b3f4e54c8018e38b179b293e2ac42a7452fae43994929b7f8647e866e612a499e322ef8719beba0d1fae32a1fbb8
diff --git a/net-fs/davfs2/davfs2-1.6.0-r1.ebuild b/net-fs/davfs2/davfs2-1.6.0-r1.ebuild
deleted file mode 100644
index fdd0b7931658..000000000000
--- a/net-fs/davfs2/davfs2-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 split-usr"
-RESTRICT="test"
-
-RDEPEND="dev-libs/libxml2
-	net-libs/neon
-	sys-libs/zlib
-	nls? ( virtual/libintl virtual/libiconv )
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="${RDEPEND}
-	acct-group/davfs2
-	acct-user/davfs2
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-neon-0.32-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.in' -print0)
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local ssbindir
-	if use split-usr; then
-		ssbindir=${EPREFIX}/sbin
-	else
-		ssbindir=${EPREFIX}/usr/sbin
-	fi
-
-	econf --enable-largefile $(use_enable nls) ssbindir="${ssbindir}"
-}
-
-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.0-r2.ebuild b/net-fs/davfs2/davfs2-1.6.0-r2.ebuild
index d1c70c69d9e6..2f0191604584 100644
--- a/net-fs/davfs2/davfs2-1.6.0-r2.ebuild
+++ b/net-fs/davfs2/davfs2-1.6.0-r2.ebuild
@@ -16,7 +16,7 @@ IUSE="nls"
 RESTRICT="test"
 
 RDEPEND="dev-libs/libxml2
-	net-libs/neon
+	<net-libs/neon-0.33.0
 	sys-libs/zlib
 	nls? ( virtual/libintl virtual/libiconv )
 "
diff --git a/net-fs/davfs2/davfs2-1.6.1-r2.ebuild b/net-fs/davfs2/davfs2-1.6.1-r3.ebuild
index 27aa924e32d7..4685ec7210b8 100644
--- a/net-fs/davfs2/davfs2-1.6.1-r2.ebuild
+++ b/net-fs/davfs2/davfs2-1.6.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ RESTRICT="test"
 RDEPEND="dev-libs/libxml2
 	acct-group/davfs2
 	acct-user/davfs2
-	net-libs/neon:=
+	net-libs/neon:0/27
 	sys-libs/zlib
 	nls? ( virtual/libintl virtual/libiconv )
 "
@@ -26,6 +26,10 @@ BDEPEND="
 	nls? ( sys-devel/gettext )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-neon-version-support.patch
+)
+
 src_prepare() {
 	local f
 
diff --git a/net-fs/davfs2/davfs2-1.7.0.ebuild b/net-fs/davfs2/davfs2-1.7.0-r1.ebuild
index 3ac4673512f8..16f1eca17df8 100644
--- a/net-fs/davfs2/davfs2-1.7.0.ebuild
+++ b/net-fs/davfs2/davfs2-1.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ RESTRICT="test"
 RDEPEND="dev-libs/libxml2
 	acct-group/davfs2
 	acct-user/davfs2
-	net-libs/neon:=
+	net-libs/neon:0/27
 	sys-libs/zlib
 	nls? ( virtual/libintl virtual/libiconv )
 "
@@ -26,6 +26,10 @@ BDEPEND="
 	nls? ( sys-devel/gettext )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-neon-version-support.patch
+)
+
 src_prepare() {
 	local f
 
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.