gentoo resync : 18.12.2020

5 files changed, 10 insertions, 12 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index c1d532a718e2..337bc757b225 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 644135aef0fb..81576b900fd1 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -17,7 +17,7 @@ EBUILD samba-4.11.13-r1.ebuild 9513 BLAKE2B c95ea186a5dfa4e1a7a06ab2e121a7716060
 EBUILD samba-4.12.10-r1.ebuild 9443 BLAKE2B e82901600cbdcb77505dd4358761f93f6465bb9106b68f2403e856bd89617b56c6a0ba33fe2b1d466f70c9ada6d2eba467153d7dc38692ba264fb3ac55913a25 SHA512 fc7b3279c63db4802ab7e3e23c3b6ffcd90a24a4e974a51e90fa3c63f5317c209f81f93eb0287f21a94cca874e8c3e5b107ec0b798113d7e70cf7900085f2bf6
 EBUILD samba-4.12.7-r2.ebuild 9486 BLAKE2B a403dea6562a0a5861a4a4b5ca3db66be912998d40cd442ea6c91bd682de45da38d4021350e1364fe8b3872068692d11232ce6d6dc983d27813aa344e8f20619 SHA512 f1aaa928f3f33c9db2205538c2d112c1688815ad2595a54a0b3cc574790224acb6238f8320fa76750231490745ddc9d11883e39ab2a2d6249b2482b587f295e8
 EBUILD samba-4.12.8-r1.ebuild 9489 BLAKE2B 7b7c9ea0b625b395b78cf3a1a3d1dcb2c79a19a535dcdb735b3dd9a611f54d55494ac33de15ac0725ccc7195e1c3b89bc3c2e91e8bf47a2e87bd01a7c990c33d SHA512 9a9ef802cc7946933274d643099911f4a4d455e89ff5c24af2c0d036ec833c2981912429221542e05bb0a643e842e5943e48e29c8b097fe26a30702ccc00fd08
-EBUILD samba-4.12.9-r1.ebuild 9484 BLAKE2B 25ab78dcfb13afd1ba105a7ce881d70010fc9c284b0bf52e54bc16f1c784996b333b8b9d2c94b4d4ba170cfd6ee2f07112312103918548e4cf60b7bc2073483c SHA512 a71388a9c136ca865c7750b89d1e7f1541b018f960f06391a0a8e234af0dfbf4c74bb53581c1b04b405c3380044fda57cce705afeeadedb9d9625146e5c6242f
+EBUILD samba-4.12.9-r1.ebuild 9483 BLAKE2B c7a83f4b2fd36e66458d5def49b152c1b013728356ed7c6f05b6a3865e5d1010fb16fe681e5df98207679d3318cf308887f1f7edcb5c421f5c508eb48d722a51 SHA512 4be213590e0ac5962a8aa50c3c5fb6a709766684e19e1ac6475c37142acab670ec1f2cafccee58ca9e2b92e202e3298b39120c8f986741f27bedd885287004cc
 EBUILD samba-4.13.1-r1.ebuild 9446 BLAKE2B 842a66c45fc20acff9fb1df4fdb15afedf7cc1915ce25d67063d3c0fb50fcb2b1a3ad7fa49cbd9dba135a022e56f375ab19399e1f01f1feed93f5c42dda93bd6 SHA512 cc161369926bb376c80ca7603d306a615c49f29f42b14799ebe789b29f55e9c4045ebc04142604f5d9113960257160d038944c807ab6b5914cee1cffb811be54
 EBUILD samba-4.13.2-r1.ebuild 9446 BLAKE2B 842a66c45fc20acff9fb1df4fdb15afedf7cc1915ce25d67063d3c0fb50fcb2b1a3ad7fa49cbd9dba135a022e56f375ab19399e1f01f1feed93f5c42dda93bd6 SHA512 cc161369926bb376c80ca7603d306a615c49f29f42b14799ebe789b29f55e9c4045ebc04142604f5d9113960257160d038944c807ab6b5914cee1cffb811be54
 MISC metadata.xml 1848 BLAKE2B 2ae9d28a0ea8d1b53f4999e23044713b42f0fc829dd2df20c301acefe9d2c9334c97121ed85c50a5d0734cec834652b1f8ec8d0bd5cca30afbecc4730cb4d1a8 SHA512 48ac3deb48a2188836be87c485f1ba988788814aa1b495e89d70eb17f67fa80163132ac788d3bc0d586ba1957b22e4094036186c40af0cfc48aa453490021ec5
diff --git a/net-fs/samba/samba-4.12.9-r1.ebuild b/net-fs/samba/samba-4.12.9-r1.ebuild
index d71989170169..b68e9a0c85b6 100644
--- a/net-fs/samba/samba-4.12.9-r1.ebuild
+++ b/net-fs/samba/samba-4.12.9-r1.ebuild
@@ -15,7 +15,7 @@ SRC_PATH="stable"
 
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ~ppc64 sparc x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="https://www.samba.org/"
diff --git a/net-fs/wdfs/Manifest b/net-fs/wdfs/Manifest
index 1cd574009c58..50af0131e2b3 100644
--- a/net-fs/wdfs/Manifest
+++ b/net-fs/wdfs/Manifest
@@ -1,4 +1,4 @@
 AUX wdfs-1.4.2-fix-Waddress.patch 1269 BLAKE2B 8ae89ff50d0feb200389f938c26586cce88bb67504aa30e4aac992ecf608f0478a0b36d5198cbb3e668f2b4207fd363549f67f2e044b2aef6d7ced0686224760 SHA512 e01f9a45cd045edf05b19ddd3b3a04bbf9a03dac4e032709a98396b024079bfb4856b91aa1c0aba8b1c3ce765ce9499f46102fafc87776ae5e0d57f8b71bc0e5
 DIST wdfs-1.4.2.tar.gz 109315 BLAKE2B 7bfe32d0c957afc347b4280e909b8964e2cb736686833580072149f107aec908e9ce220fa18ccd998ae9bea5d34e0aa2349c6a832ed40dbfae3bf6cb353f9e4e SHA512 da7e16ed86cbe4746fabe5fce44c83b1d0cd0fbc19994eefe0ce2a75f3d8c77c3c341a76409150a3509be08f8c0d28b8a9650037edcbbf2aa60f4c8ea5407004
-EBUILD wdfs-1.4.2-r1.ebuild 537 BLAKE2B 076400925aa5484fc83191750c94a408ff6ec70900aeef342eb60ac8ab249e365f84d326200d6bed2c75cb06083c77c81becbe3f9bc05581455472e4cda11cb0 SHA512 a1dc12bfdf86b98892862fadccaea957b733d28cd0553c75af3ca40710e9f8038cc0c1e6629316922595855dbb0ee4601f9e622bd3d62ee0d25ba91a9cbc2a14
+EBUILD wdfs-1.4.2-r2.ebuild 503 BLAKE2B ac6d082c357f8ff4d552075e818a5d950ab20dba9332d8010757d2e358bd3f86843fb97885cf5317656e37892d1cb18c7661e2a91b5b10295daa765491702c33 SHA512 f6fd0bced9465da533e6e57f6da81189c1fd517a9541f574374cb6c6d95edffa7c7ce0050c97c72326a6f126869d9b5946756c11cc6e1326e17b31e5bde993f4
 MISC metadata.xml 440 BLAKE2B 9930eff1050d22f7ee8019b00f3155b65b3156fd690820cb9eba3f6af02cca50d3a1072866a13a8bb7548b57c3c62ea223c3c5e0a4bd8a8305cde80892825f00 SHA512 00ef130f56f063239b4c4ea485009188e3ddf1840cec24b9df22b9b39645b98908fb35e480d68480938c2573533c6be3fca6830dea24c1475286b81986b58f4d
diff --git a/net-fs/wdfs/wdfs-1.4.2-r1.ebuild b/net-fs/wdfs/wdfs-1.4.2-r2.ebuild
index 5de6083daed2..60e8d6219fb5 100644
--- a/net-fs/wdfs/wdfs-1.4.2-r1.ebuild
+++ b/net-fs/wdfs/wdfs-1.4.2-r2.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="WebDAV filesystem with special features for accessing subversion repositories"
 HOMEPAGE="http://noedler.de/projekte/wdfs/"
@@ -15,10 +13,10 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=net-libs/neon-0.24.7
-	 >=sys-fs/fuse-2.5
-	 dev-libs/glib:2"
+	>=sys-fs/fuse-2.5:0
+	dev-libs/glib:2"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-fix-Waddress.patch"
-}
+PATCHES=(
+	"${FILESDIR}/${P}-fix-Waddress.patch"
+)