gentoo resync : 14.05.2020

3 files changed, 54 insertions, 4 deletions

diff --git a/net-fs/davfs2/Manifest b/net-fs/davfs2/Manifest
index 75d96d17de50..6dd44fe554bd 100644
--- a/net-fs/davfs2/Manifest
+++ b/net-fs/davfs2/Manifest
@@ -1,8 +1,9 @@
 AUX davfs2-1.5.5-gcc-10.patch 410 BLAKE2B 51854a72a87e36dc069071dadbbd13badff4fcdcfcc3d91f4949ecc80f4cc4e4f2ba33f3b66dd056014e9cbeee8a70b3196c9bcb229fc7cca7c0c24d0a92602d SHA512 09c764c1d762bd05f4f338827182172024b77cac8d7bd06919e897f8af645f4add4a90ef20e98c6ced14910a7c88e330e6a923c45a014efd524220ca3b9aff96
+AUX davfs2-1.5.6-neon31-support.patch 1719 BLAKE2B d9fddfcc6909bd1adb42ec816df61a4d3018ce7747eed21b75a89c4b53d985c0f1ff4be74231b196418088775d82f5d1be94778a21d7fa75140a1b720340aeb3 SHA512 32ac713dccb354f8ee19c32fb4cbdb4d1e964589879595241d5c56bba40998669d912728f89dfb36c3271669e3cf25bae449d6a0b3bcc0475a12a12a68d81231
 DIST davfs2-1.5.4.tar.gz 478377 BLAKE2B 25c7dba1a6cda384a60c8ce2e0a56d5c805f5c30f35f086bfe1f55ee4eb79b8228beca2e7214e9858a1c49c8f782c6de8f4f0631cf0e2090991a0e35ba5d8ed2 SHA512 08550f171f4b196f55f3fb71c6c75ed24063f8a5afc31c52502d0c911cf7aca4da01f7a123269d410dadc497c44ef5a3573e455aca6eafe48eb86f18429b94b2
 DIST davfs2-1.5.5.tar.gz 481021 BLAKE2B bff2f1a48caa74009209ea1422b20d46022358339f650228584ed1d7b8218be9fd360666cdd3f12a9e110af36caadc7de2daf4134ed4a34f498999ff09f6327a SHA512 3a660b29eab15226acf3cc896ec387beb96cb4a94beae40d5970d8d4f7f370afb7da2b637584d953b5dc342d81454d9a954990b04f3cb032fb2a0a469fd7983c
 DIST davfs2-1.5.6.tar.gz 481448 BLAKE2B 44a36d78f77222356dcde7733bd2aacc1b643c14d9d441b480002140881007f26fe4addb8dc70f3d3d185bdbe6eb4e74c7e8cb0539c035f220ed865c4526d3c1 SHA512 97c3f2eef93b418d89bb387a441d0624d4eb3de614973e3f25ded5e29d6913c7aa724022b610ff36d050ca11db63c47651413a93297e235725a42879bc8ac0c2
 EBUILD davfs2-1.5.4.ebuild 963 BLAKE2B 8d3d90d343aad9165f1bb0101fe3c8f79a4bc67246971b5a4c7ba018ba5e9d3ef9208cee0ef9647652d2c25cfb0dc80e4f0174c9f40ea92dd84157962935a54a SHA512 2d437012f6c6c96ff85bebbfc90ac60b967a7500fee0403676cb6e0579f3e20e0050e00077d3e1ba68c308086d6a4fca662a3f1531de5a3d001d0088b72941c0
 EBUILD davfs2-1.5.5.ebuild 1210 BLAKE2B 868962e2aa411620cc694bcc9689beabc498fbddec1d18998b0337d8d469f676dee3df6a9bdb869b22c60d10c4ae0034239a21b9d5ea9cae0c4fb695bdf0c6d5 SHA512 f092ccc716d45056247427d9e3aaae49142d0a89814de4339205f8aed825ce2775cd239ca7f059c2dfc431f939fe3a71cb9cb193b40d1f1f7083eb95311af734
-EBUILD davfs2-1.5.6.ebuild 1166 BLAKE2B e03e1c6a0851168427c46a1520d3996be44efac07ef76475d596cf4d46f144f794956a382d1b8904cc04b1faf35f8872028221c7284667635c6e3f927188849e SHA512 6324cb3dccbdd9f9ecf73dfac55869bf07bb88078a280e1cb5229856f0c76a087709b48a04ed4a7fa205e56b95863ac8ac79e54512eb4fb9331c9e4581c930c5
+EBUILD davfs2-1.5.6-r1.ebuild 1306 BLAKE2B 32123141e0a0e52c0c934963a4ad71ff653c3059efd60a33a18c337827ad9f583684573121ca174ec134a1a885311a7ad1093d03dd44fd6c3afcc5bf9dd8eeed SHA512 356b445a652eb090729da45349fca20b07cd7e33e6868c06a8646e9ffb529a7c00633bb8a915ea5f437664af86846aa149a2a71b2fabb937854b6495bdcea831
 MISC metadata.xml 251 BLAKE2B 50ac338c9f09535de32ea2a1300195c358edff81cc3517de13846dbbc8b34331fa634e33633828beefb727a53bce0299ed784f4d0e18c07c977abfcfdd312074 SHA512 6d9ef84f36e3ce79747ee806d0194543d1c5a004e612ecbe308644829cf03234d7f52ef0dbbe57144da5d4af86e3a9a5df297a01c95c4d9938f49605e92aea32
diff --git a/net-fs/davfs2/davfs2-1.5.6.ebuild b/net-fs/davfs2/davfs2-1.5.6-r1.ebuild
index 320e82d5c52d..1786c1a079ae 100644
--- a/net-fs/davfs2/davfs2-1.5.6.ebuild
+++ b/net-fs/davfs2/davfs2-1.5.6-r1.ebuild
@@ -27,11 +27,15 @@ RDEPEND="${RDEPEND}
 "
 
 src_prepare() {
+	local f
+
 	# Let the package manager handle man page compression
-	sed -e '/^manual[58]_DATA/ s/\.gz//g' \
-		-i "${S}"/man/Makefile.in || die
+	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)
 
-	eapply "${FILESDIR}"/${PN}-1.5.5-gcc-10.patch
+	eapply "${FILESDIR}"/${PN}-1.5.5-gcc-10.patch \
+		   "${FILESDIR}"/${P}-neon31-support.patch
 
 	default
 }
diff --git a/net-fs/davfs2/files/davfs2-1.5.6-neon31-support.patch b/net-fs/davfs2/files/davfs2-1.5.6-neon31-support.patch
new file mode 100644
index 000000000000..1f5b0b376db9
--- /dev/null
+++ b/net-fs/davfs2/files/davfs2-1.5.6-neon31-support.patch
@@ -0,0 +1,45 @@
+Update configure to support neon-0.31.1
+Bug: https://bugs.gentoo.org/719954
+
+--- a/configure
++++ b/configure
+@@ -6800,7 +6800,7 @@
+ $as_echo "$ne_cv_lib_neon" >&6; }
+     if test "$ne_cv_lib_neon" = "yes"; then
+        ne_cv_lib_neonver=no
+-       for v in 27 28 29 30; do
++       for v in 27 28 29 30 31; do
+           case $ne_libver in
+           0.$v.*) ne_cv_lib_neonver=yes ;;
+           esac
+@@ -6983,8 +6983,8 @@
+     neon_got_library=yes
+ 
+ else
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: incompatible neon library version $ne_libver: wanted 0.27 28 29 30" >&5
+-$as_echo "$as_me: incompatible neon library version $ne_libver: wanted 0.27 28 29 30" >&6;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: incompatible neon library version $ne_libver: wanted 0.27 28 29 30 31" >&5
++$as_echo "$as_me: incompatible neon library version $ne_libver: wanted 0.27 28 29 30 31" >&6;}
+     neon_got_library=no
+ fi
+ 
+@@ -7040,7 +7040,7 @@
+ $as_echo "$ne_cv_lib_neon" >&6; }
+     if test "$ne_cv_lib_neon" = "yes"; then
+        ne_cv_lib_neonver=no
+-       for v in 27 28 29 30; do
++       for v in 27 28 29 30 31; do
+           case $ne_libver in
+           0.$v.*) ne_cv_lib_neonver=yes ;;
+           esac
+@@ -7223,8 +7223,8 @@
+     neon_got_library=yes
+ 
+ else
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: incompatible neon library version $ne_libver: wanted 0.27 28 29 30" >&5
+-$as_echo "$as_me: incompatible neon library version $ne_libver: wanted 0.27 28 29 30" >&6;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: incompatible neon library version $ne_libver: wanted 0.27 28 29 30 31" >&5
++$as_echo "$as_me: incompatible neon library version $ne_libver: wanted 0.27 28 29 30 31" >&6;}
+     neon_got_library=no
+ fi
+