gentoo resync : 05.02.2020

20 files changed, 100 insertions, 23 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 4f56f03594f8..52c10ba2335a 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index c2e6a49cdafb..87be445b96d9 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -2,6 +2,6 @@ AUX autofs5-auto.master 693 BLAKE2B b3c601beb0c41ed32c6793c00a39ee65bb1f5b47fa0d
 AUX autofs5.initd 1558 BLAKE2B 253ce53d2b2b46f80606cfc654a45c710ae97649343fda7698f2b5af590c6bc1bf2f15912e5c86b626759eb89a659e293fa4bf6e28b5a84dc5a6b5e1a24615e7 SHA512 956e3753dfd56146a529522ff68e311c32906815ceec28afbe5ccc4e5da995dca0296f0824f583a6b7c713e443a6b6fe819bc2f18a116c8e82f2779d0a198afa
 DIST autofs-5.1.5.tar.xz 313476 BLAKE2B 9822f6eb6294a0ee14b08f7982bf6008eb9ac8a79f89cdf3ffa0ed234b83c932db1646fc5591269000372dbfb95ce1b9ded040f0724a7eb4b3888caf20f56a20 SHA512 c8138929a9e2cfa7e0096c1d490b9d7275d1d43a50f5f87ad457bdd9a49c7dd13a4aa5d86ab1e028d66dae630e1a1342661844e5775625fe585867f0f4778898
 DIST autofs-5.1.6.tar.xz 315316 BLAKE2B 0c5e2351462505c6de0b12e510f0c08a625a0235e1ff8eeaff825946c4530c258449d26aaf6a3794aa82a97e8860711226168f434dd31bfb8a4e70287beb3ca4 SHA512 dc8b2bd86c140905dd1bc461bfc469f92363d9c2687fe422e1e751cc7ad64c0733b011c80bf4840e510e5909176cd1a066968b9a5ba835b62c4cf27537863cf2
-EBUILD autofs-5.1.5-r2.ebuild 2938 BLAKE2B 0f3135c471be99c4eaf992c8c8bfee437048c3236cbbca480c248f6837a5a347b8602f15480e063384f6dd9524f24caa165a60f4caf3a337b5ef62932925c24f SHA512 8a3facc5b03c0c00971b2706c1788a70d2ea87647499afbc60dda11f69cb2b035cdcf29dbabe3c8f1413185cfe52a01d62cac10e0ae9afdca25eb4e256c47fd1
+EBUILD autofs-5.1.5-r2.ebuild 2939 BLAKE2B caf07a123a237b98d6c1d1cdfac9319eda9541fbdd2e9c96ca27cbeefdaa7a1f10bdc97c6e40bc529d62c655d5b27d3c212d92b0a27e604b4c15a15c8bf552fd SHA512 1216a65efc61ae77ea22cb6600c2d40bc594b11e2e786ea838cf049446cfc3efcee855e6a379ea423054c43afc0d7f92d241893c1abe012e9c3aac1f2e22db66
 EBUILD autofs-5.1.6.ebuild 2947 BLAKE2B 63a595cb2bacd550ab043ef16c22319e08c4f8faf727c9a257c1610fb37d6b714b09fa79435794118fcea27d2b32a8d49d8276e195f2cf58c7f1dacf5cc97d20 SHA512 fa33151fac764b3bc20ae1e464411ab21ca5f9f1a1c83db1b814980f837650c78720dad83dfa1b69959c06035802046448a3c53f157de87e09a211c407f9ea34
 MISC metadata.xml 897 BLAKE2B a986a7de6079af006edec362f4ebda0a0da7baf04ce9151164bb60aba9e73ed3b398def4c0693e6905ff36c4f7bb4c94e3bb72ddc04c24e520e3a1c5909eacde SHA512 ea9849bee9f3e8247a366f9fab08cb40d0421df977e4071bff1a04cad68766815059bbf3de64cd8670b8cd024d5f455e14cd41b2bcfa8bac00f032ef8aaaa821
diff --git a/net-fs/autofs/autofs-5.1.5-r2.ebuild b/net-fs/autofs/autofs-5.1.5-r2.ebuild
index 8548b75cb4d7..a2d85d7cf94a 100644
--- a/net-fs/autofs/autofs-5.1.5-r2.ebuild
+++ b/net-fs/autofs/autofs-5.1.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/daemons/${PN}/v5/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="-dmalloc ldap +libtirpc mount-locking sasl systemd"
 
 # currently, sasl code assumes the presence of kerberosV
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index 8a1354189ccc..e054bd6815bc 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -3,7 +3,7 @@ AUX cifs-utils-6.7-talloc.patch 857 BLAKE2B 3ffefe40f18db87992bf3a2816bba690251f
 DIST cifs-utils-6.7.tar.bz2 363647 BLAKE2B 692c4b7de92c2cc5cb88591fb5b5b01ca7d925b105d10f7149e350d1b1661bb6447e71e0ca86095a9e294637d80126e54295413a685786b62c8e70cf26f893d0 SHA512 ee050a0eb4a72fbc8d773e86fbe6839ea2bf11cda5ebd071c8ead66e31b46d50ea4e1d1b26478373be53227cd60b32a90b65b5cb989b5a8237cddfc65bad8e5e
 DIST cifs-utils-6.8.tar.bz2 384426 BLAKE2B 002518f44489aefc94c47a23438b176a4056ff4d995b3ed9f25a6c6c8d4c8d7437a3158d5c592d16cb6bfcd289b937d6ac1ef0573c346993d576a88aa1fcb118 SHA512 54a094f78c9e07acc997adfe0c8d4c2fb8e15c18adcc1805450e2180f8539aaec8619e781e985b289e097932637e2de3e6815e32f59ec2fc06cfc3762b832e13
 DIST cifs-utils-6.9.tar.bz2 400430 BLAKE2B fc8cc55fae54d84fc1f1d4a14a9d666d87a3da78d1502f0d72ac9cb44ff1424ca2c5b15b0be510579d4c9f5181980627efedd00e0e5cfb1b3e47188ba307ad28 SHA512 b92e4e39eeed1032bb175659296cde034703fb3ca63aae00419d46a33dadf821fedaf03734128112c164c84bcbb48d92d03cdc275c4a7cba26f984aeca40a40a
-EBUILD cifs-utils-6.7.ebuild 3224 BLAKE2B 6d9089f05abc55aef567a6febbd758b32c88a7ea8809805da1667da9fd36ca1ae499b4eb2ca751a7c3f380eb07be92de4f24cc0acb18a5a2c59a00f57e4c6b9d SHA512 f5a057d93de93ee78910a99026b71dcc5a0906bf84d3803dadb1be9082a1c0b55c02867ba9dce9a04b4bf508111f1aa151b7f0064252ea02bb89710a1fe6b75a
+EBUILD cifs-utils-6.7.ebuild 3225 BLAKE2B ae850636ae695b1b8506a3275d018445c4823a7da18c32681ee2a832f7d27e104f5914004553d704e9c1377841e130ad1718f2ab9f87c3845ef14fd8943b52c8 SHA512 b4773540122fdb590bab0a2f8c31b24dab0c2a5cc70f9a12e7569b2dfdadf408db609db74dfbdca1c0d8d7cff526a53e62dd232856836d9ba8767003a2f40197
 EBUILD cifs-utils-6.8-r1.ebuild 3039 BLAKE2B 21132df18c68ee976a1ebf43faa2ac45847ea5b44676ec06ec899e9ac6d871f19726b1dfcc3182e812d97d0dc65389941359fd1f9c6fadfa5e588e9372edfa8b SHA512 9d8bf2d11dd7219130ffb8b3dc9623f40117d7b13d359bd8412b652acfcf7f2015f487c9be1fc6d68b920d2c8751f59b707a3b2f266e336b8afe7ac3648766f3
-EBUILD cifs-utils-6.9-r1.ebuild 3000 BLAKE2B afc4f7a65e9c1735c73b7df4083e907390afd7533525903a5d48d73b59e26d429882c31129096cf8c0581323d29a506fc4acc2acd9bd2b3fef089bb0289a3ba2 SHA512 c5f69e6bdd191bfdb26ef85e81cacf19b7e30668c64711b821655952e4ba36948d7bf6451b471920e21d0f39e407d180350590e25b4079dab1d225fb769c8831
+EBUILD cifs-utils-6.9-r1.ebuild 3001 BLAKE2B f61381df02e969324f363eca7bea91dce6e5c4dc2ce125495f7e5fa18bc609208c993cbf5e90f0a7a8761a99d330172801e7a875a29e0efcfd2730b8945a19d7 SHA512 c589cca6f0bdb4da8d45ad340ab9afdcc90ffce62cffaf19c00bf63c6d3dfc56adcf87c949ada0462f7590b58c4a92ff7f1660a100ad5d01d9304200816c326b
 MISC metadata.xml 889 BLAKE2B 45b3f5f6cac2ca247c9d3a73d4f0e2703187e4a4eab2f850ef2f228489e365ac30d67d35187fab993af7611109c0e2a33bf8336e37496a131b641abade642ca7 SHA512 979960233f0941ecbfa1cadd79fae28898cf8f8333225483808cd25b84d0395d9a7dbc84a5912c2dedb38269d62b7d7f4a647b5d12e47b7706368b3640d90c66
diff --git a/net-fs/cifs-utils/cifs-utils-6.7.ebuild b/net-fs/cifs-utils/cifs-utils-6.7.ebuild
index 49bf00f123cf..4eaa925e33ab 100644
--- a/net-fs/cifs-utils/cifs-utils-6.7.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-6.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-linux"
 IUSE="+acl +ads +caps +caps-ng creds pam"
 
 RDEPEND="
diff --git a/net-fs/cifs-utils/cifs-utils-6.9-r1.ebuild b/net-fs/cifs-utils/cifs-utils-6.9-r1.ebuild
index 1026905b7a13..d20e3f531125 100644
--- a/net-fs/cifs-utils/cifs-utils-6.9-r1.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-6.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-linux"
 IUSE="+acl +ads +caps creds pam"
 
 RDEPEND="
diff --git a/net-fs/davfs2/Manifest b/net-fs/davfs2/Manifest
index 23d70f541bba..75d96d17de50 100644
--- a/net-fs/davfs2/Manifest
+++ b/net-fs/davfs2/Manifest
@@ -1,5 +1,8 @@
+AUX davfs2-1.5.5-gcc-10.patch 410 BLAKE2B 51854a72a87e36dc069071dadbbd13badff4fcdcfcc3d91f4949ecc80f4cc4e4f2ba33f3b66dd056014e9cbeee8a70b3196c9bcb229fc7cca7c0c24d0a92602d SHA512 09c764c1d762bd05f4f338827182172024b77cac8d7bd06919e897f8af645f4add4a90ef20e98c6ced14910a7c88e330e6a923c45a014efd524220ca3b9aff96
 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 1123 BLAKE2B fbf5db293c9050d41e872847aba58b7ed11ec964027829f6fa2a35f50e9ebc0e2f733970282737e2851a3ecafbbe2340c628ad6691ffe8ee85c60267ce2e128d SHA512 c8313e75944fd4c17d1b2370fe9be02d5ec4a32517ddbaef79d971b0dffa16ab771d146de06659166743523fc720e646e010305ed92bc6f4cf50f808baf17361
+EBUILD davfs2-1.5.5.ebuild 1210 BLAKE2B 868962e2aa411620cc694bcc9689beabc498fbddec1d18998b0337d8d469f676dee3df6a9bdb869b22c60d10c4ae0034239a21b9d5ea9cae0c4fb695bdf0c6d5 SHA512 f092ccc716d45056247427d9e3aaae49142d0a89814de4339205f8aed825ce2775cd239ca7f059c2dfc431f939fe3a71cb9cb193b40d1f1f7083eb95311af734
+EBUILD davfs2-1.5.6.ebuild 1166 BLAKE2B e03e1c6a0851168427c46a1520d3996be44efac07ef76475d596cf4d46f144f794956a382d1b8904cc04b1faf35f8872028221c7284667635c6e3f927188849e SHA512 6324cb3dccbdd9f9ecf73dfac55869bf07bb88078a280e1cb5229856f0c76a087709b48a04ed4a7fa205e56b95863ac8ac79e54512eb4fb9331c9e4581c930c5
 MISC metadata.xml 251 BLAKE2B 50ac338c9f09535de32ea2a1300195c358edff81cc3517de13846dbbc8b34331fa634e33633828beefb727a53bce0299ed784f4d0e18c07c977abfcfdd312074 SHA512 6d9ef84f36e3ce79747ee806d0194543d1c5a004e612ecbe308644829cf03234d7f52ef0dbbe57144da5d4af86e3a9a5df297a01c95c4d9938f49605e92aea32
diff --git a/net-fs/davfs2/davfs2-1.5.5.ebuild b/net-fs/davfs2/davfs2-1.5.5.ebuild
index 3ef5dd25f003..e90fe83a11dd 100644
--- a/net-fs/davfs2/davfs2-1.5.5.ebuild
+++ b/net-fs/davfs2/davfs2-1.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,6 +33,9 @@ src_prepare() {
 	sed -e '/^manual[58]_DATA/ s/\.gz//g' \
 		-i "${S}"/man/Makefile.in || die
 
+	# Bug: https://bugs.gentoo.org/706356
+	eapply "${FILESDIR}"/${PN}-1.5.5-gcc-10.patch
+
 	default
 }
 
diff --git a/net-fs/davfs2/davfs2-1.5.6.ebuild b/net-fs/davfs2/davfs2-1.5.6.ebuild
new file mode 100644
index 000000000000..320e82d5c52d
--- /dev/null
+++ b/net-fs/davfs2/davfs2-1.5.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~ppc ~x86"
+IUSE="nls"
+RESTRICT="test"
+
+RDEPEND="dev-libs/libxml2
+	net-libs/neon
+	sys-libs/zlib
+	nls? ( virtual/libintl virtual/libiconv )
+"
+DEPEND="${REPEND}
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="${RDEPEND}
+	acct-group/davfs2
+	acct-user/davfs2
+"
+
+src_prepare() {
+	# Let the package manager handle man page compression
+	sed -e '/^manual[58]_DATA/ s/\.gz//g' \
+		-i "${S}"/man/Makefile.in || die
+
+	eapply "${FILESDIR}"/${PN}-1.5.5-gcc-10.patch
+
+	default
+}
+
+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.5.5-gcc-10.patch b/net-fs/davfs2/files/davfs2-1.5.5-gcc-10.patch
new file mode 100644
index 000000000000..56b0bab44918
--- /dev/null
+++ b/net-fs/davfs2/files/davfs2-1.5.5-gcc-10.patch
@@ -0,0 +1,18 @@
+Handle building with '-fno-common' for gcc 10.
+See: https://bugs.gentoo.org/706356
+
+
+--- a/src/dav_coda.c
++++ b/src/dav_coda.c
+@@ -99,3 +99,3 @@ static size_t alignment;
+ /* Send debug messages to syslog if != 0. */
+-int debug;
++static int debug;
+ 
+--- a/src/dav_fuse.c
++++ b/src/dav_fuse.c
+@@ -86,3 +86,3 @@ static uint64_t root;
+ /* Send debug messages to syslog if != 0. */
+-int debug;
++static int debug;
+ 
diff --git a/net-fs/libnfs/Manifest b/net-fs/libnfs/Manifest
index 78849aeb44f1..b3290f98ae9c 100644
--- a/net-fs/libnfs/Manifest
+++ b/net-fs/libnfs/Manifest
@@ -2,7 +2,7 @@ AUX libnfs-3.0.0-utils.patch 499 BLAKE2B 0000a2140ea34201b41237b9fde5d7c0adb77e9
 DIST libnfs-2.0.0.tar.gz 200932 BLAKE2B df5ae4487bd7e19428551f047a1d61df712ecc73b3db33995121abfba2df8f9283ef69f4a0d897266d7d476010bfcfa5fdea109b265f82fe4df8904cd6d05c6c SHA512 701dd5317b0395523be89123d473f4da5c3ff53c2e30004a922f649f0dbbd97546ee39ab34fce06278a8148c13200ca383726a0822d09846fad6e308f29e42c7
 DIST libnfs-3.0.0.tar.gz 249035 BLAKE2B 321bbc6eb2d926c41afae95a873cd9103446d2bda0015f159341a7bca2245d708abaa283f9a8f505a320a0b446166b36106cd9f54e885a02cb486168c87a2a7f SHA512 9af31f8824431e9d28267c468dafc7cfc4062b1a280ca141036bc28a2ba544c4470a67955b5e5fbcc6c175435812381013b4c5d3d3d1a175d5efc7b802ae9b3b
 DIST libnfs-4.0.0.tar.gz 251662 BLAKE2B b6c33c42eb1715b8a996a432b0cc28af1a98cca3389a779378df0931e4d37418937e3ea4938efb4d075b39aac33facca86df3a02bd62d2c7b262859e8d04ecc1 SHA512 3d93d83d1909f24de304c0d47fa6240da7ecf43ce2488a242a58ddabe51d774caf813f5a90ae720a8edd251a765b30e88c0e5b6a13ecb254dfecdc98e30737fa
-EBUILD libnfs-2.0.0.ebuild 1107 BLAKE2B c429ddaf504458c32bb2f6fe90917039db4da09812edd411a08229bba084322d5743fbcabd549c887b87a9184e5d49440fbe3c7a86c5363312c116073089cea3 SHA512 fe8efc097123d8b6f4b82c202dd4171daeb59c851e11b0a0d506cf9f50c51a46e11aa600882bacc1eae1c60d0b9dd22ae7eb25f4c6b13480f377e836d5013e97
+EBUILD libnfs-2.0.0.ebuild 1108 BLAKE2B 3ad049ec4ba08df7d605859267a76cfffdb414ba97a5eaa09770785d04e5d4f48dacf3067bcd8101cfeee3bf91f62d2cba4fa9eaa7e18416b38cf5d98d0cb521 SHA512 697617574057821c8ebe5a220700037973217e4b00986c719ece5afca6537bfdf231978b8cdce3df54479aa12fa33f622c77c3d85f16b9e44f8ecf31a1d69aff
 EBUILD libnfs-3.0.0.ebuild 1262 BLAKE2B 2863f0367604bb8a3eedd696a68e111283610ee5e1ff8e19be2db933d1f6ec5e29e21cab67900ca9d867933d45eab9be1529d3ae63c7ba1708b931616d7edac1 SHA512 8b2e891f5cd834953000b13d273b4270a748db10ea32ac55453fe32a8c66a05239feda67f547d54d3c443248d71f028a41c1c17ee2530b250292dfb4a698d1c0
 EBUILD libnfs-4.0.0.ebuild 1207 BLAKE2B db3e910667acf800ee60455ef76b04853edec5d9f640310f6a3cd14779172e2fb7eb35f3e4fef04c43f50b0bbec048f58b20ec466ae37b55e84552d93cf8bf46 SHA512 590f9ee5fe83d639202442415e1622f8c101c51f120e306d2a1557d60fe83f7bd9df438717cda1caba5bacda8c7397d7893f254805a081c79be19df6bb297318
 EBUILD libnfs-9999.ebuild 1207 BLAKE2B db3e910667acf800ee60455ef76b04853edec5d9f640310f6a3cd14779172e2fb7eb35f3e4fef04c43f50b0bbec048f58b20ec466ae37b55e84552d93cf8bf46 SHA512 590f9ee5fe83d639202442415e1622f8c101c51f120e306d2a1557d60fe83f7bd9df438717cda1caba5bacda8c7397d7893f254805a081c79be19df6bb297318
diff --git a/net-fs/libnfs/libnfs-2.0.0.ebuild b/net-fs/libnfs/libnfs-2.0.0.ebuild
index 894937592457..0f456f23edfb 100644
--- a/net-fs/libnfs/libnfs-2.0.0.ebuild
+++ b/net-fs/libnfs/libnfs-2.0.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86"
 fi
 
 DESCRIPTION="Client library for accessing NFS shares over a network"
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 67f0fb59e98b..36eabd2a36e0 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -22,7 +22,7 @@ AUX rpc.svcgssd.initd 470 BLAKE2B c610a7abc44b86ca242d59f833ffa6e42f48d1c3bf9342
 DIST nfs-utils-2.3.4.tar.bz2 906900 BLAKE2B 968fac7b37c7311bc8d29667c88db925aac0c062ed7ef8c13f9e5c11c3c88960ffaea56c1b6cfb5594a01238f9190e55ab7b837a79a7a804bc55dcca75908eea SHA512 25203b38be6683f25ad6583ac8534873c907124092a768955c1454899e2f467b9dd427b167556eb4f28992b5720da13078eb1eb086da991438454f268e1559a5
 DIST nfs-utils-2.4.1.tar.bz2 910791 BLAKE2B 4419eff7fca21747e0bc4969ebb8a8b863aa951984af8f23f197e7dfc4faad3770173808862b84178714ca75f021be1af96f9e4408fecd7ef97999d261f2f21b SHA512 655a115955f35177b761f821e29c752693d614f4c6c2a90d392e0ab83b615247a397cf18e8ad453a93c6dc528d1fa90cfdf8b04de6626e0f4083b10e2e54f540
 DIST nfs-utils-2.4.2.tar.bz2 918576 BLAKE2B a1dba3ae2e58794509ea7907d80e40fc49a0c5e72019222ba16daa74aa757cab5e6fde9ed066f6b5f379b40dbd61622a05fcafc298a79231e417ab2086127278 SHA512 f9724ff2ac185e6c29afd577b33da38b1d11803af1ccb905cd615afa3383c6ac7a3fa4e0f43ea8d062e9aedcdbae90adc9b55ae9d0abe4731f69aa3a6f8d2534
-EBUILD nfs-utils-2.3.4.ebuild 5269 BLAKE2B 5c940049177cd424d61b426d94edf488643ddad19e95de2245e5e8c581f9f0dce78bf55a73e6ead084ad0f293e7a5e6ea564078702bb5b72a104334fc5810fd1 SHA512 2856242c30e23c07ed63b1e2108d83acd5e322e4e3dc32ca93a52b444912a183e1c3a2d8dc34ea5b698b5cf4986392d005477456fd16dcfddc9b1757ab06484e
-EBUILD nfs-utils-2.4.1-r4.ebuild 6211 BLAKE2B 8164f3fafd11a4b42ab99e9e19e65e2490bad1370b2c1a19de323d51d0f624d61ba9a112ebb9018ebe89adbad46bc25a56c3e0ced2adab6caf4315dfd62073c5 SHA512 b1fec1ea6330e1142761fb6f0c4aabe3adfa661876c31a680e23d38e1c2ae42fed8806bfd20f5f41f65209bc7ad4e926816020f9f2bdd03329d6057a33f785f2
+EBUILD nfs-utils-2.3.4.ebuild 5270 BLAKE2B 2478830995019c5a29aea7db6bca238b7f4422ba95d174a455eae1840631115c77b433be0859698921995fd9cb06208eb18eaeb8de58016928e39240d8d65f26 SHA512 04b9730fc5a2a960f9350bd8039373d151ca75d2df299ba0ace371607ad87c24fa4a785f2d3b7a123e51eef51a6f2ed12949f98220f1b6f09982a325c0ded4d9
+EBUILD nfs-utils-2.4.1-r4.ebuild 6212 BLAKE2B 9031813ca35e9e813510b948a0c9254f28f1bbd40aef26e0a42299462a5b1cde14058755c3622dd8ba5ff7355fc490012d37dc31b107f157a4c909ae3fbe14e1 SHA512 85a8fc1b07be07a68c3399d8e7351d3ca410865b2440fe5b6702fd4f8a5f0a5b68d674d5cf87f9909a0d081b698870472dae69b07a4cee5909802b855f28ad34
 EBUILD nfs-utils-2.4.2-r1.ebuild 6065 BLAKE2B 45f0c136d6ab0bc8ff79d2f7f7906c94288d0431a6189c0855970911341704921b96ec90d661c94aa6499e99d65fcb2105fab37ad47671f41ac7594ecbf06b40 SHA512 3e86d8a0083cd691ad91ed598290516ff93b2a2de2d5d654313b154d79e8db800f76fea20d2d18d4b35e64dfff1b71c15c76445620a69dd519bb09805125fcc0
 MISC metadata.xml 932 BLAKE2B 14cb95a010cdb52373502bdad4de008234494be6e38f6b3fbf6b69e0848a6daa1315ed69b8eaadaad0cd546e84ba0e291b56ebf9db486b7c6e66011147b9a97c SHA512 eb45c97d7ed2bdaa8e43ce0a4fdb2f8a1d197bfd67a8b04f718c6083e7701873e2c22550700049edc25068daacb5278ca2535b63a02a10c1040efe0dbcef76a5
diff --git a/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild
index e13b00d0c3e0..c180c1bc2011 100644
--- a/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
 	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
 	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-fs/nfs-utils/nfs-utils-2.4.1-r4.ebuild b/net-fs/nfs-utils/nfs-utils-2.4.1-r4.ebuild
index fc20760da240..270b62e3b6c2 100644
--- a/net-fs/nfs-utils/nfs-utils-2.4.1-r4.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.4.1-r4.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
 	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
 	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 10c6ddc30793..195c9e7a2257 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -15,26 +15,26 @@ AUX smbd.socket 121 BLAKE2B 1261742bb1cd586f376ccd1027a5c57754460bcaf7aed4b800ae
 AUX smbd_at.service 145 BLAKE2B 729dd189fc69ff33930ec96a68cff42438645ff7f3cf0a88f2bf12f56d6cb213f58c9699c19800bed429640218bba81fdb4009882fdf7bc84fc07d0e4634acc7 SHA512 e6486c35dfa6f77ad46547a78fcae55fb71e4dad7dc7b4580c2b8c1be232c0a870f56714b2b103a1fd8717298f41347d7178fbebb90f0f2d0324fe5233f0f9f3
 AUX talloc-disable-python.patch 1706 BLAKE2B cc447f5077c82d7eb584692121b9b34c03afb5f7dda2b799ea518d08421d31ce54fe2422c5ca7efe74f66011951c97b171a326604bd67446a15ad2849bade919 SHA512 ac0bf82e8ed8b918a5efbdeb0a6cbaaef22bb72231abb09026637d62b8ce35b25212960d26c07abe63661328ab7ea8a82590cd93f04de583e23239211daf6efa
 AUX winbindd.service 240 BLAKE2B f0b96a5a1d93a3c04bb2a2b2b500718b41fc907a3c551827a459c5d8184abc3caed0ac5edcf16032650dc2d58c38b779473c7a619047956f1381415e3de4dd93 SHA512 f1ce6d035e8e0fcdc73f14e3b60c9647043777ff6b2a982a81ed07eb4df5ff245a9511e3e4a9d8163f9c8f3fb86d2a39a67621ace68392eb7c2f2e2a55d587f7
-DIST samba-4.10.10.tar.gz 18335638 BLAKE2B f8c215b82fea4ef69b9baf8ffac417e8530b17e4974c249fbf566c231374c299f4de9a1fd9ba5027fdf41d59f3e275456a6e1e435edd4bebba35eacbaa9a9c1a SHA512 d82f96af5754d484673d3497b2837d9df06352d7be4810fe6d812d64db5b95d588ed42d5565bf0f6f7c305bb9c6d3274e740ea9acd75b32aad75d0b38e4d2bc9
 DIST samba-4.10.11.tar.gz 18342499 BLAKE2B 9555f0e7ee46a7d372defd1c0978024cf36e23a33229cba2e374bed7bad67cb1e24ad5f37e989e01397fec2bcf7aa403bbb67669a764ec0a669571b182915c34 SHA512 776978698cc2d0e86d22d61caadc24f886f0e7fd35788806ebc641502a9a1f4a46afcde7c82e3d644eaaef8c302da5f795b9518681014b7f46a39422766fb758
+DIST samba-4.10.13.tar.gz 18350580 BLAKE2B ab97d46284bee60762543ed1c27846e22dd984ff61b1601cc32af46b87cca30751ffc6b1ca4da7045c22224cd4f23c46cfa42f478098676bc243412f319f6658 SHA512 959986ce8cb846d9e3e6b83eff896fefa140b1b5d03ace878100c806a4e969352b37b0dca9e7795775bab7d8230770dae66cd48b4856a2c416f0234fd63e0bf2
 DIST samba-4.10.2.tar.gz 18280710 BLAKE2B f15b117d1159dfa6cd279c5011629d688fcfba94a2ca8184a827d0787a31f76a38f46b355454b916f2e62c0a88109b86664f6bb16fc0e23d0f61d09908e587cd SHA512 3d146ea12567ebb02a7babcad779b82339ffbfb19f6f2be5cac33eb18af2c9b546dc1cd910072a5c9e152ba9c4a632ed6870c48a8f6ad9d04304b130f240a4bf
-DIST samba-4.11.2.tar.gz 18516056 BLAKE2B 2b2a11e9b72deec54cf19830a402a5f2ae0dc2c3437116a636823d29e55c68842fce2434d196d567a8250b59e5bdffe9af367592c6949496f63caccbf4a5cb6f SHA512 f91053f019c9f979d7e29af00ea9b03a79c6f8efe91413ac2d6dca823f45ca9c30686264fdc0545dddabc687ad369a80c9ec78ebe75d1787dfc9b834233e12c1
 DIST samba-4.11.4.tar.gz 18530105 BLAKE2B 39e0cc6965681f3d64e861edebe2b77e558b68d9a3f4d7fa52e6ccfe704f2294fb3fb1a619d07d2130f36b1bf572300c733a273ccf78d554807e0f5897dcbcff SHA512 18ae1cb8b092c441a3fd4c6ecc9f35841dc51e3061f435107f7d2579b5e8ca6f8c96a947627dbd401b81c7de2293ff2587c30be694e160bf8a10c6d15aa73880
+DIST samba-4.11.6.tar.gz 18541566 BLAKE2B 2b4a40be7cec8a9706cbc344796885f59403aa11ca3d8a7dc40b3d287ec222c11d7395fd193c4b66c4116f1bffd869caf444a950d508f5a9a596db32553e1461 SHA512 3815080a1693c596a126371a5ea4e8534317a7266803c7de13a7e5b3ee9757dfbf13c0de20d498a6683d3aaf56941ed42f289e3c24f88713529a5f047a691af2
 DIST samba-4.5.11-disable-python-patches.tar.xz 6292 BLAKE2B c2a32a1059a02bc1c87ce5f604cbc5878c654b8f693c8486b5ba63b37513444915a7b6389fe82b7e31ab2f9577dd8462eddba60b4f4f756b4ed1145ce7bd90ae SHA512 f0e3076e3e1ecaae3f06b3ef30efc81719fb3f63a1041dcbdae4b62ca4cf693732f9eb16f047d046d4930136fed82194e82b455ea888e12cf845b3e6a122d57d
 DIST samba-4.5.16.tar.gz 21024396 BLAKE2B e737559fb748044076608fa233700eb54c7e1c56bc234763f062b6341a179cc78a4a8cdf9f3d6f4d7f3cf8a79f846852ddd5cc753a468c3adb3a0451e1809ed9 SHA512 de8a41013cfb5ef3adcb290efd97a78a5de876d90ad05764d631f14e663a1849bb53e4ac394b46c906f1109be5748fee9316407a659c57007d36851ae8adcd7f
 DIST samba-4.8.12.tar.gz 17764832 BLAKE2B d2c0c8b9090da7c94b9343fd3f416e9aafad64273abc9be0639b011f71072926a0b303cf53e63c4e470aeb168e8ec23003b5f4ed4258aac8d6b3d029f71fba6f SHA512 f29595f6390d01860cb6acd750d2e36b4d207dd1da16465c21c8d6d732ce27bd0582a0f34296081e2659638d839c8b12f28deccc31982afa94650da8bce8df8b
 DIST samba-4.8.6.tar.gz 17723841 BLAKE2B 38da52e14b4417f26462eef2226c4498e54d2c276b4056e8c6d6c66079f33bcda24c1eab30b29bc7413280ec89a74a55e043e8274ac50f9a25bae7563717ff34 SHA512 f6afab5ca466bd8653a56c205b71ce94ecf0ad0c6e4c9d64cbba7b1e56f1987bc2022e6b629d87eb6078e3f6ba53833c19cfb41e40b6d589e4317ea9d85de273
-DIST samba-4.9.16.tar.gz 18110660 BLAKE2B 5a75fb9b0010ce7a2eec00e911744a2b180525eea06ca08126bbfd558928e4165ed32da449ee31ee8e7f1bc705949548b9a6da8ed60de23a616bdb0acd020690 SHA512 bd9e7ee68351f0a7d006b47ed102bbd2984c08b483b20f4cf1db0354bef725d2e77816f7f3c3a20da46f69c4c9a476a18d22b8197414ea427abbd3acf6be6db0
 DIST samba-4.9.17.tar.gz 18100548 BLAKE2B c0b9a869b67fafaaa09776c472d8a7fd56eed10577ea554d07a8ed1d591dcb783381ea3d2c026315bdeebb0b4a8d456d4193da65be1a88b246d235ecda70cac0 SHA512 658fd4a073e7f93ccb270d63d4a12fc29ec30d3928464f81c583c85706d3a559794dbde23c6dee17ac7c3333ce2c5afb965c152fdeb6b7bd643fe1bafcd35823
-EBUILD samba-4.10.10.ebuild 9228 BLAKE2B 184f94b37acbe51653f121bd766140383f7e0fdddb708d5782e9e610f720bc726016e19245c6d090924c7624d41ea66a1c1c091661cf77ff0e407317d32e5cb1 SHA512 2c8b79786135a38a5e8b4ad5e15940cb6c8a493ab55f3543ea923dc65515c427815f79b762ef542e3c8f4b6f570667eb0dbde2b6985354fbec6f343521174abc
+DIST samba-4.9.18.tar.gz 18103049 BLAKE2B f1071f76924722294be545534c3462d12963073dade444d9aebbbcb56bb84f5ae608bf9a97583e1050713ea668ced6aaf13f0a180e7b682da8405d40600cace9 SHA512 c7161fdf90d5e2ee5fd28aca93b596f4dc4417d2f8519a586a2319e42a62107a026adc128b90f7c3ad71d4d21c0b782bc8eb79005714bf0ee93fba19ffeef624
 EBUILD samba-4.10.11.ebuild 9228 BLAKE2B 184f94b37acbe51653f121bd766140383f7e0fdddb708d5782e9e610f720bc726016e19245c6d090924c7624d41ea66a1c1c091661cf77ff0e407317d32e5cb1 SHA512 2c8b79786135a38a5e8b4ad5e15940cb6c8a493ab55f3543ea923dc65515c427815f79b762ef542e3c8f4b6f570667eb0dbde2b6985354fbec6f343521174abc
+EBUILD samba-4.10.13.ebuild 9228 BLAKE2B 184f94b37acbe51653f121bd766140383f7e0fdddb708d5782e9e610f720bc726016e19245c6d090924c7624d41ea66a1c1c091661cf77ff0e407317d32e5cb1 SHA512 2c8b79786135a38a5e8b4ad5e15940cb6c8a493ab55f3543ea923dc65515c427815f79b762ef542e3c8f4b6f570667eb0dbde2b6985354fbec6f343521174abc
 EBUILD samba-4.10.2.ebuild 9091 BLAKE2B 0bb02d822c1844b309024dc9baa3deec2c640d1b730d5e65ffafacb9699a6b99d3ee1e081e0c71ff4bcb13eb3fb35ed42c1a0e60ac744ebbbd812576f9e57dfb SHA512 581cdec2ecca48938e44234a3a304dac9812fe4a46fed1baa80c12761c20e2e396841e7b2d709b2b70958ace6f762b586286f582106ff4a33d78cc861e21f26d
-EBUILD samba-4.11.2.ebuild 9120 BLAKE2B 4d7cfcefef618c01187a718f51274730203b751ce993293e682498cd6fb60774e51639fd878bbabd4f47b660af40c4923b640c21ed0e3f5255a1d9c065829bb0 SHA512 3c926ec0362e7740d0ce9c90cbbc35b6b1719579ff87d2c0cd30050d6bfdbf3fbe686b3dc00cf3f24a20a0e480d9f69696d14d8fd8aed49bb1eadd520bc093cc
 EBUILD samba-4.11.4.ebuild 9120 BLAKE2B 3fae352c31471f27cc0ee0b562823f3f2c73b4912855370d7b6c4c162aa605f5411a161861a8b84d0ec2a3976a82ff735c9dd920f036fa149265308caa075824 SHA512 9ff6eea2d8544012d2d5e9b39e0506e5453d5c3d344c2b84126631916b7184e993e198380c41e5a62116e3bf1a892570abb28a768cbc4081eaa58894d4ba78f0
-EBUILD samba-4.5.16.ebuild 8193 BLAKE2B ddc187ed358b6f2bd6727d3fe74bca0872dd46fbe6b12a606b2f7cf4c3903314bfdae35ea186be3999f9cc01a4b2f1d725f13a655707d71aef162a21f2914599 SHA512 2aecf97660ff948ec8341da21c7b43a8ed8c465ba19e7a157ca591b1d21e0cff12ceaa4fe57740aba7416eb0b780dd8b4f4549ba90634ec7c5c0028bbe09c000
+EBUILD samba-4.11.6.ebuild 9120 BLAKE2B 3fae352c31471f27cc0ee0b562823f3f2c73b4912855370d7b6c4c162aa605f5411a161861a8b84d0ec2a3976a82ff735c9dd920f036fa149265308caa075824 SHA512 9ff6eea2d8544012d2d5e9b39e0506e5453d5c3d344c2b84126631916b7184e993e198380c41e5a62116e3bf1a892570abb28a768cbc4081eaa58894d4ba78f0
+EBUILD samba-4.5.16.ebuild 8194 BLAKE2B 23e95a991215abdc79c68b1e24682a6fb5d2cff89916fe480adf4d4de91501d6fc4d3e39efab8cae8b3ec7e4c6b927feb66b715ed3c460ce39d6110ca50125f4 SHA512 f24289fa7576dfd647ddd2caf286ac2f0403c1cb9e1902cc5197394e063294199bfb57bc773494371f53a081434221432489d2b5aea1919aab002a8f09f8aadb
 EBUILD samba-4.8.12.ebuild 8924 BLAKE2B 4ea486ecca9964519c4739195d14ce22e013acb7a9a9308cb9ce43b3ed6aa9cf64ab2a4a3bff13983e13f217b511d12a8726a57bb97d19952f99bb53b15a2db1 SHA512 f795b98e9a0580c034247fe8f64f1b7158ed239630b92666686cf32945907ab9159acc93ac541b3f9f04d2132da9f820e72ea80e242c440d72605d5ccd500578
 EBUILD samba-4.8.6-r2.ebuild 8497 BLAKE2B 4db3c17b11ef2146db59131877014b44c136ba0b720c906a407f6f7b6c405a858fe3fb0e0b31a7e17df8af68f02d881849b270ca8141b47dd401beb5a6465e92 SHA512 063682dafc10fa9505be914e2986f8abde6eaab92bcbda68a06f0d2a153f0659e1c75f7eef63153862e9699be5bec56de73b74b41f8988aa8b06f09eaccf2ca6
 EBUILD samba-4.8.6-r3.ebuild 8885 BLAKE2B cc2ee57e0463f6daaaeecd0bd149538f838e39534589f2a94d7f331981563c544d27a2e94860b4a701f6ad1150f20891590af93a5cd9db229615033063251c10 SHA512 bed25be8178f0b2899fcca57bb577a86c917075d901abeb8ba46462c82629c2a832ebf5f7b36e95cffea7189eca082b3863a3b79ad29c972569826d3ac906ac9
-EBUILD samba-4.9.16.ebuild 9083 BLAKE2B bf4afc1b617c0515e5a4055bf696c655d6c5bf935d692f8ccfb55fc9685425acdbdc2aaae953d89774ef70a2e71b1b9ce633edb1fab3e47b9bbec7d61cce1d3a SHA512 ac72300aac950bf9b7c829aeeaf454a9706638c68b0917cf5e113c91c4bcf7ae3e540e11a678f9c41f7c6dfe5aaeecca14e50ecd3d55ac1d68980783614cf6cc
 EBUILD samba-4.9.17.ebuild 9083 BLAKE2B bf4afc1b617c0515e5a4055bf696c655d6c5bf935d692f8ccfb55fc9685425acdbdc2aaae953d89774ef70a2e71b1b9ce633edb1fab3e47b9bbec7d61cce1d3a SHA512 ac72300aac950bf9b7c829aeeaf454a9706638c68b0917cf5e113c91c4bcf7ae3e540e11a678f9c41f7c6dfe5aaeecca14e50ecd3d55ac1d68980783614cf6cc
+EBUILD samba-4.9.18.ebuild 9083 BLAKE2B bf4afc1b617c0515e5a4055bf696c655d6c5bf935d692f8ccfb55fc9685425acdbdc2aaae953d89774ef70a2e71b1b9ce633edb1fab3e47b9bbec7d61cce1d3a SHA512 ac72300aac950bf9b7c829aeeaf454a9706638c68b0917cf5e113c91c4bcf7ae3e540e11a678f9c41f7c6dfe5aaeecca14e50ecd3d55ac1d68980783614cf6cc
 MISC metadata.xml 1756 BLAKE2B 74fcabbc9a00bd2e2b91d527354edde5e44c36755d81c849c2a81c03590794f1be30a92ad7cade453fdb183754ace37f7ddc2c171eab657689cf34d83e840aed SHA512 65ee3dbcb246c068278ffb6a8eaaa439bea10fa86662504d2aacfb1bcf58a215d915e50c4c6ea6c6e989870f7a9d9974b7a1a33d2a2f0077b9e263a6adf94279
diff --git a/net-fs/samba/samba-4.10.10.ebuild b/net-fs/samba/samba-4.10.13.ebuild
index 329dc7c24129..329dc7c24129 100644
--- a/net-fs/samba/samba-4.10.10.ebuild
+++ b/net-fs/samba/samba-4.10.13.ebuild
diff --git a/net-fs/samba/samba-4.11.2.ebuild b/net-fs/samba/samba-4.11.6.ebuild
index 1f6514fb4b36..56647c0a98fa 100644
--- a/net-fs/samba/samba-4.11.2.ebuild
+++ b/net-fs/samba/samba-4.11.6.ebuild
@@ -52,7 +52,7 @@ CDEPEND="
 	>=net-libs/gnutls-3.2.0
 	net-libs/libnsl:=[${MULTILIB_USEDEP}]
 	sys-apps/attr[${MULTILIB_USEDEP}]
-	>=sys-libs/ldb-2.0.7[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-2.0.8[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	<sys-libs/ldb-2.2.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/libcap
 	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
diff --git a/net-fs/samba/samba-4.5.16.ebuild b/net-fs/samba/samba-4.5.16.ebuild
index 4ebce95524c8..0a8cd5fdfec9 100644
--- a/net-fs/samba/samba-4.5.16.ebuild
+++ b/net-fs/samba/samba-4.5.16.ebuild
@@ -16,7 +16,7 @@ SRC_PATH="stable"
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
 	https://dev.gentoo.org/~polynomial-c/samba-4.5.11-disable-python-patches.tar.xz"
 [[ ${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/samba/samba-4.9.16.ebuild b/net-fs/samba/samba-4.9.18.ebuild
index 3ad0587ccb32..3ad0587ccb32 100644
--- a/net-fs/samba/samba-4.9.16.ebuild
+++ b/net-fs/samba/samba-4.9.18.ebuild