gentoo resync : 13.10.2019

55 files changed, 267 insertions, 932 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index b58d7c8ee2cd..0ed9a0ab5d28 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 4f1991e8cb63..c2e6a49cdafb 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -1,5 +1,7 @@
 AUX autofs5-auto.master 693 BLAKE2B b3c601beb0c41ed32c6793c00a39ee65bb1f5b47fa0de6ad1fa70f7f15ee6c882058d657fae09807b86d19f1f1017306193cb18a3ce5115e31a53a5913e29af5 SHA512 3be4e92250cb678a6d8454b5703c48f6fac14653e1e89028917a627787e8785bfae1cac5a76b2d8a030fd2ec6e491e22488c19a2034cfeedf02e98c400a228dd
 AUX autofs5.initd 1558 BLAKE2B 253ce53d2b2b46f80606cfc654a45c710ae97649343fda7698f2b5af590c6bc1bf2f15912e5c86b626759eb89a659e293fa4bf6e28b5a84dc5a6b5e1a24615e7 SHA512 956e3753dfd56146a529522ff68e311c32906815ceec28afbe5ccc4e5da995dca0296f0824f583a6b7c713e443a6b6fe819bc2f18a116c8e82f2779d0a198afa
 DIST autofs-5.1.5.tar.xz 313476 BLAKE2B 9822f6eb6294a0ee14b08f7982bf6008eb9ac8a79f89cdf3ffa0ed234b83c932db1646fc5591269000372dbfb95ce1b9ded040f0724a7eb4b3888caf20f56a20 SHA512 c8138929a9e2cfa7e0096c1d490b9d7275d1d43a50f5f87ad457bdd9a49c7dd13a4aa5d86ab1e028d66dae630e1a1342661844e5775625fe585867f0f4778898
-EBUILD autofs-5.1.5-r2.ebuild 2927 BLAKE2B 6863078a585f3cdbdd1b897a47cb92ba6d7e681fdc995bd6f4b044a36163527622eb9f44afbecafddaf20fbb59e082840774e591f4ce85f4463f3788c4c3c598 SHA512 519ed73687be9f06273a9dbce8639ec00a2d089b955cd4bf73954826f9181884bb5bc4757b433a750e9e72f16fdcdc6facfc4bf43d799a68901b2a6bcdec43f0
+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.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 1e2fd32e46a7..8548b75cb4d7 100644
--- a/net-fs/autofs/autofs-5.1.5-r2.ebuild
+++ b/net-fs/autofs/autofs-5.1.5-r2.ebuild
@@ -7,7 +7,7 @@ inherit linux-info systemd toolchain-funcs
 
 DESCRIPTION="Kernel based automounter"
 HOMEPAGE="https://web.archive.org/web/*/http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
-SRC_URI="mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.xz"
+SRC_URI="https://www.kernel.org/pub/linux/daemons/${PN}/v5/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-fs/autofs/autofs-5.1.6.ebuild b/net-fs/autofs/autofs-5.1.6.ebuild
new file mode 100644
index 000000000000..8efb33bbc370
--- /dev/null
+++ b/net-fs/autofs/autofs-5.1.6.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info systemd toolchain-funcs
+
+DESCRIPTION="Kernel based automounter"
+HOMEPAGE="https://web.archive.org/web/*/http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
+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"
+IUSE="-dmalloc ldap +libtirpc mount-locking sasl systemd"
+
+# currently, sasl code assumes the presence of kerberosV
+RDEPEND=">=sys-apps/util-linux-2.20
+	dmalloc? ( dev-libs/dmalloc[threads] )
+	ldap? ( >=net-nds/openldap-2.0
+		sasl? (
+			dev-libs/cyrus-sasl
+			dev-libs/libxml2
+			virtual/krb5
+		)
+	)
+	systemd? ( sys-apps/systemd )
+	libtirpc? ( net-libs/libtirpc )
+	!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
+"
+DEPEND="${RDEPEND}
+	libtirpc? ( net-libs/rpcsvc-proto )
+"
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	local CONFIG_CHECK
+
+	if kernel_is -ge 4 18; then
+		CONFIG_CHECK="~AUTOFS_FS"
+	else
+		CONFIG_CHECK="~AUTOFS4_FS"
+	fi
+
+	check_extra_config
+}
+
+src_prepare() {
+	sed -i	-e "s:/usr/bin/kill:/bin/kill:" samples/autofs.service.in || die # bug #479492
+	sed -i	-e "/^EnvironmentFile/d"        samples/autofs.service.in || die # bug #592334
+
+	# Install samples including autofs.service
+	sed -i -e "/^SUBDIRS/s/$/ samples/g" Makefile.rules || die
+
+	default
+}
+
+src_configure() {
+	# bug #483716
+	tc-export AR
+	# --with-confdir is for bug #361481
+	# --with-mapdir is for bug #385113
+	local myeconfargs=(
+		--with-confdir=/etc/conf.d
+		--with-mapdir=/etc/autofs
+		$(use_with dmalloc)
+		$(use_with ldap openldap)
+		$(use_with libtirpc)
+		$(use_with sasl)
+		$(use_enable mount-locking)
+		$(use_with systemd systemd $(systemd_get_systemunitdir)) # bug #479492
+		--without-hesiod
+		--disable-ext-env
+		--enable-sloppy-mount # bug #453778
+		--enable-force-shutdown
+		--enable-ignore-busy
+		RANLIB="$(type -P $(tc-getRANLIB))" # bug #483716
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	rmdir "${D}"/run
+
+	if kernel_is -lt 2 6 30; then
+		# kernel patches
+		docinto patches
+		dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
+	fi
+	newinitd "${FILESDIR}"/autofs5.initd autofs
+	insinto etc/autofs
+	newins "${FILESDIR}"/autofs5-auto.master auto.master
+}
+
+pkg_postinst() {
+	if kernel_is -lt 2 6 30; then
+		elog "This version of ${PN} requires a kernel with autofs4 supporting"
+		elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
+		elog "been installed into"
+		elog "${EROOT}/usr/share/doc/${P}/patches."
+		elog "For further instructions how to patch the kernel, please refer to"
+		elog "${EROOT}/usr/share/doc/${P}/INSTALL."
+		elog
+	fi
+	elog "If you plan on using autofs for automounting remote NFS mounts,"
+	elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
+	elog "are running."
+}
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index e3e3a7b17632..8a1354189ccc 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 3226 BLAKE2B 4d0edab2d12ea2d8046995001c8c2bdc2d7ad580d901743e5fb5e104ae706768dd8f9ff0534b2b82cd6c5f36edba92d45b955e9602496befdc7bb1f561b51f68 SHA512 11d2651a795e9ff441bb4f80d02a6b568ad566190390477cc67dc5baf92fec15f8a1e195b291b2828bdb30b5dece1236ecffa907d5ef8c86a728ca43a0ec63bb
-EBUILD cifs-utils-6.8-r1.ebuild 3038 BLAKE2B c716960106acaa8a7cad9f4cb74ef9d5ae1c7df906728afb557baf909415fa78952bb06b83009c14eac739b03300ba40e67e6f6931969171f66640d2cd5b67ce SHA512 d5fd7ff2d03f6e21c413011855b61a79a64c2f9bcc90a7db4e4d0b49e863bac42e56b656765a78d172bdbf1071d89220d9ddb43b2ccb4071e40c842a1004855d
-EBUILD cifs-utils-6.9-r1.ebuild 2999 BLAKE2B 00f7a48914340d1a7e8e7da7d1122e3d584ed73064e7c5f2f9fb7748fd44954880708de1fb7a867d1de316c3281bc40adf9a59ec8b53406f066499dfd95ff035 SHA512 965c894c9077638e1c0ac99a8a94130128f7b5a5f7f6ad71e3c5a377fe965f951e394b9e154c37e4d3218b9249f45bd19db5e511ea0e8f6b245cc9cbbd340e78
+EBUILD cifs-utils-6.7.ebuild 3224 BLAKE2B 6d9089f05abc55aef567a6febbd758b32c88a7ea8809805da1667da9fd36ca1ae499b4eb2ca751a7c3f380eb07be92de4f24cc0acb18a5a2c59a00f57e4c6b9d SHA512 f5a057d93de93ee78910a99026b71dcc5a0906bf84d3803dadb1be9082a1c0b55c02867ba9dce9a04b4bf508111f1aa151b7f0064252ea02bb89710a1fe6b75a
+EBUILD cifs-utils-6.8-r1.ebuild 3039 BLAKE2B 21132df18c68ee976a1ebf43faa2ac45847ea5b44676ec06ec899e9ac6d871f19726b1dfcc3182e812d97d0dc65389941359fd1f9c6fadfa5e588e9372edfa8b SHA512 9d8bf2d11dd7219130ffb8b3dc9623f40117d7b13d359bd8412b652acfcf7f2015f487c9be1fc6d68b920d2c8751f59b707a3b2f266e336b8afe7ac3648766f3
+EBUILD cifs-utils-6.9-r1.ebuild 3000 BLAKE2B afc4f7a65e9c1735c73b7df4083e907390afd7533525903a5d48d73b59e26d429882c31129096cf8c0581323d29a506fc4acc2acd9bd2b3fef089bb0289a3ba2 SHA512 c5f69e6bdd191bfdb26ef85e81cacf19b7e30668c64711b821655952e4ba36948d7bf6451b471920e21d0f39e407d180350590e25b4079dab1d225fb769c8831
 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 48c64bc1af54..49bf00f123cf 100644
--- a/net-fs/cifs-utils/cifs-utils-6.7.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-6.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ RDEPEND="
 	)
 	caps? ( !caps-ng? ( sys-libs/libcap ) )
 	caps? ( caps-ng? ( sys-libs/libcap-ng ) )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 "
 DEPEND="${RDEPEND}"
 PDEPEND="
diff --git a/net-fs/cifs-utils/cifs-utils-6.8-r1.ebuild b/net-fs/cifs-utils/cifs-utils-6.8-r1.ebuild
index 15032dc76fbc..9e5e310b6524 100644
--- a/net-fs/cifs-utils/cifs-utils-6.8-r1.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-6.8-r1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 		virtual/krb5
 	)
 	caps? ( sys-libs/libcap-ng )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 "
 DEPEND="${RDEPEND}"
 PDEPEND="
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 299c2a378e64..1026905b7a13 100644
--- a/net-fs/cifs-utils/cifs-utils-6.9-r1.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-6.9-r1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 		virtual/krb5
 	)
 	caps? ( sys-libs/libcap-ng )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 "
 DEPEND="${RDEPEND}"
 PDEPEND="
diff --git a/net-fs/curlftpfs/Manifest b/net-fs/curlftpfs/Manifest
index 0cc1284cd039..37b462571bdc 100644
--- a/net-fs/curlftpfs/Manifest
+++ b/net-fs/curlftpfs/Manifest
@@ -1,8 +1,9 @@
-AUX curlftpfs-0.9.2-64bit_filesize.patch 626 BLAKE2B 1459bd10a3adcdf14e71a25287ab743009db22d2ace0c82c5a241b17b719faa7a50c3e93f7b52f8dce3ca88dcf283041901e7ae92ec764158d238414e89ee4d4 SHA512 3b23ee31c5008fffec3032c9ab440a584d672a3936f8fae943af31e5936964e8b5641f5778f56b5c656e9af26156d0a1f31e49ef8c4eb526ec8a83ff7076fcb7
-AUX curlftpfs-0.9.2-darwin.patch 517 BLAKE2B 5e2683e09303c0e9e51604fddd0da6c482d1fb5172b5cf173aa4713773787dcbf2e1f9f4951e10ad4dd8f4959ca720dd70eadaa59f92195d46e6dbf448b61b91 SHA512 81e77c00c6b13b2f023ad1230fbd2c48bcf902454207e7b221d507086df1facffd603e1e1ab615b28a3d44d886941a509c0d1246279cceea197286073d6a322d
+AUX curlftpfs-0.9.2-64bit_filesize.patch 626 BLAKE2B 7233a142fe0f046f4bfaa4066938deb09867ecea8231beef23e86a87e85c9cb4132e12ca7a37e7e42deec3b51a6d1f4128654d1a92d65c67606d34b1ff59946b SHA512 8bf99bc1f646dc5a401ca6148f3559f10ea9c6ad324e825fec6261f0597c6a0a4e859e5e2f4e1ed4a796a95944e49553c35d7fc959198796c30642ddc1ca2545
+AUX curlftpfs-0.9.2-darwin.patch 486 BLAKE2B 055384a64f8bb4812468872546f485eb4b119d610b8af5c127a119e095777551e4dee2fd0a832e8d7acbe3cb394c8baefabcd59ec33273a570d35d3abbbd2519 SHA512 988c995c4ca90fb21784b29780f3cce9f5e61dd79e67d80686e4201271902ca73be391892b22e21c631822092f06790e315603f34ec73081125c54a93dbcacbe
 AUX curlftpfs-0.9.2-fix-escaping.patch 15750 BLAKE2B b39b8619ce93a46da4ea430a2b53e36e9dbaef59622d9916c3a1a91d88b970e12c30e9a5c9e82dd8ed8e4624560b6808605762d90b74ba8c1a7e162898bff9b2 SHA512 9373aabf3748de309196d27fe26367ac0b8625df69a095d5ea67a1033b1c5db19820f3a5e5040e4fbdb38e55b24c620f351a21906fc3ad3d681bb08c7cef1e72
 AUX curlftpfs-0.9.2-memleak-nocache.patch 1810 BLAKE2B 70e63ca6b41a479bf88aa3d7cb8846a8dec2e09949f8a7e0ffead6be1a2f6cc50f6512f426eb7f8c03fef85984da2ea97808fa64029a56a26be2f37e599d910f SHA512 b53ed1acfea1aa539c0f69ab7dd961a635ded7299500337a7453fa2445e61590ec39a9010ac105d230880b09a90d388b8564295a185e5b44f3398903a6d1d5d4
 AUX curlftpfs-0.9.2-memleak.patch 834 BLAKE2B 1dff269ccf7e6fb3a4c10034ba124a22df2bc25f9f38352d21ef1164c8c375de9cecd36c03d050c6a524434d678dad26141ef8999f90282a56f03d1bdff5ae5a SHA512 dee0eac27bd09208f44d20d3c0627499da0664601abfb0cb5a3a979c988c71713ef00850f2b72e71c38a9dac09698e55cfbc6249bb1e2196a07a783b0fcd49bc
 DIST curlftpfs-0.9.2.tar.gz 365503 BLAKE2B 2175d5ecd0846a78038a813f76db99a911dff6e52aa170e59ae19d895961b0e9f5ba7b888288408daabc3a6c2b58590ab8b1c5424ea6b4b3875c460b089d6ddb SHA512 df07c418d175f766c89525017fc56e79726061eee0c3a6607ded0e1bf24f64f1475ba0e546157b65892194e3c4414c120822bf8fb175437e68366f82de216067
 EBUILD curlftpfs-0.9.2-r3.ebuild 1002 BLAKE2B 0f6849945dadc03f0e23c22c230aee90f515bc3ecb41781908b5bd0990c3b775175ab80689ddcdccb9d87fa41f43b98a18a7857116cbbd705a40bf28db4a6fc6 SHA512 219c9666751af37c4dedc86b95e975daf5f627fbbcb278b7a1cc7a767d8b29fdf7f26f5ce927159e435daee709cd719e0e344dcebf1f3abbfcebc8a837917ff3
+EBUILD curlftpfs-0.9.2-r4.ebuild 971 BLAKE2B f7d8ce139dcc97a77cddedfac016d5d94e4300c5109cb690841296becfe8444e67138895c99c032e1b8ae37e4d786d3a46fbc55c0ca8c052f402863b94874342 SHA512 d88705e880828980f6179c9a8ead0f3cb4439ffeeac71a3d2ffacd685fbc4dd174572263808b034f18dcde31ea39aaf556ae59334b9fe0298cf8c6ff2bb57500
 MISC metadata.xml 340 BLAKE2B 9741e9d58005e0fbfca0c6630eb3a0d1e2963a8ce66e42b61d3c48d5995ecdd99099abe914249460bf4f3bc66a0e73f1472cfa8c17bb403af92076d8c30cb5cb SHA512 4e0ec7a3f4ed5e5e1bf875275776d6d610bca1b6fbb8200e208eff80150df4e98bea430a976deef94405fcbf825aa5ba992b40e30175a30ebccc30d53591eba3
diff --git a/net-fs/curlftpfs/curlftpfs-0.9.2-r4.ebuild b/net-fs/curlftpfs/curlftpfs-0.9.2-r4.ebuild
new file mode 100644
index 000000000000..04a3efebf10f
--- /dev/null
+++ b/net-fs/curlftpfs/curlftpfs-0.9.2-r4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="File system for accessing ftp hosts based on FUSE"
+HOMEPAGE="http://curlftpfs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+RESTRICT="test" # bug 258460
+
+RDEPEND=">=net-misc/curl-7.17.0
+	>=sys-fs/fuse-2.2:0=
+	>=dev-libs/glib-2.0"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-64bit_filesize.patch
+	"${FILESDIR}"/${PN}-0.9.2-darwin.patch
+	"${FILESDIR}"/${PN}-0.9.2-memleak.patch
+	"${FILESDIR}"/${PN}-0.9.2-memleak-nocache.patch
+	"${FILESDIR}"/${PN}-0.9.2-fix-escaping.patch
+)
+
+src_prepare() {
+	default
+
+	# automake-1.13.1 obsoletes AM_* bit #469818
+	sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die
+
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc README
+}
diff --git a/net-fs/curlftpfs/files/curlftpfs-0.9.2-64bit_filesize.patch b/net-fs/curlftpfs/files/curlftpfs-0.9.2-64bit_filesize.patch
index 38b6f33a2ba5..256c74923708 100644
--- a/net-fs/curlftpfs/files/curlftpfs-0.9.2-64bit_filesize.patch
+++ b/net-fs/curlftpfs/files/curlftpfs-0.9.2-64bit_filesize.patch
@@ -1,5 +1,5 @@
---- ftpfs.c.old	2009-11-28 14:28:05.000000000 +0300
-+++ ftpfs.c	2009-11-28 14:28:19.000000000 +0300
+--- a/ftpfs.c	2009-11-28 14:28:05.000000000 +0300
++++ b/ftpfs.c	2009-11-28 14:28:19.000000000 +0300
 @@ -503,7 +503,7 @@
    
    curl_easy_setopt_or_die(fh->write_conn, CURLOPT_URL, fh->full_path);
diff --git a/net-fs/curlftpfs/files/curlftpfs-0.9.2-darwin.patch b/net-fs/curlftpfs/files/curlftpfs-0.9.2-darwin.patch
index fd0bd1f0cfe5..81265920531b 100644
--- a/net-fs/curlftpfs/files/curlftpfs-0.9.2-darwin.patch
+++ b/net-fs/curlftpfs/files/curlftpfs-0.9.2-darwin.patch
@@ -1,8 +1,7 @@
 https://sourceforge.net/tracker/?func=detail&atid=816359&aid=2799820&group_id=160565
 
-diff -ur configure.ac configure.ac
---- configure.ac	2008-04-23 15:37:42 +0400
-+++ configure.ac	2009-06-02 09:46:05 +0400
+--- a/configure.ac	2008-04-23 15:37:42 +0400
++++ b/configure.ac	2009-06-02 09:46:05 +0400
 @@ -18,6 +18,11 @@
  	AC_MSG_ERROR(["We need libcurl with support for FTP protocol."])
  fi
diff --git a/net-fs/ncpfs/Manifest b/net-fs/ncpfs/Manifest
index 58a3e2550a3e..15fe82383717 100644
--- a/net-fs/ncpfs/Manifest
+++ b/net-fs/ncpfs/Manifest
@@ -17,7 +17,7 @@ AUX ncpfs-2.2.6-remove-packed-attrib.patch 10312 BLAKE2B 9fe98d402ec9e4435128ff9
 AUX ncpfs-2.2.6-servername-array-fix.patch 523 BLAKE2B 6cf9c27ae7bda17722a74f550beb8a2f027517db264a4f895977c05b78609cf818d88fa79e2264a99e99ea09e6de626eb209c394d286b9cae84fd4636db3de47 SHA512 10c8a0b7c6d715018acf77ea3bcca2e50add48d479cc0ee07035f3f8fb910069c2c508a25ab3de945ef19c78add6d8192f0cb484e756d9a15ceb3afcd8195a69
 AUX ncpfs-2.2.6-zend_function_entry.patch 296 BLAKE2B 3bb6db87517e0fb086e95462e9b567628ede7fbeef77b5d6e101dec8a316f2a5185cad8846bbaf37dada789acfedf6f6bbc75dafa92f3eb140cfde4eb038e1eb SHA512 c96723a840cb1b0cdddb91ebe74620b87a32350be084f21b741bda4e399a7648fd00522e9f2ec8404d5a98835d3f5a343dd588f4279848cc031de5bed01680e0
 DIST ncpfs-2.2.6.tar.gz 2100545 BLAKE2B b95c8c0b097227c7b9e526e978efdca2234cdd0833468be99abaa68b0feba09794be26ebcb3a1c3371bc99f6c9d007eee164fa5f918aaee3eca44aeb1420211f SHA512 51f85eaae85deb66cea2ff434974699f6aa45ed1ed75217ef6176ac0b7d0f9f1c4fb186afc64c1b495474d5bad9ac7614033128c0bec39c05de723a9b29c8602
-EBUILD ncpfs-2.2.6-r3.ebuild 2604 BLAKE2B 3c768032c5ab48cafa7955330bafccc00816fb07b0d4d06049e590ddb2079a9506df3e0de694e8022cab705a6bdab8c43c5122f4d8bcbd80ceb16cd5ebfe79c5 SHA512 c81d58564071787615b572ed360230ad2fa2d8030a2a8aefa778467b7be7d9726c5556bb7faad3f73e7a92341a33aebc61cb812a951d9f7c2970424ef733b976
-EBUILD ncpfs-2.2.6-r4.ebuild 2449 BLAKE2B 02c2bbf4cea12348b64b1c584bee9b0b0e1c5fd688968b17799c8664b676d8e7205d6d33e025a6ec40a2485153649d774a8933196dcf448a76e59416394e4053 SHA512 46cf6f9b1968528649df09596d097b7f775fb2ac61e69ebedce78bb7ae0c7c1622d3febc9d25245278de73c938edf488f99712dac5c7db4aa4a3f150e83830e8
-EBUILD ncpfs-2.2.6-r5.ebuild 2304 BLAKE2B 6155f626da65d370265789c04d1cf41ddbcce1fe3448d6b34762a6180949194a10c01da9143f632c722edf3bbcd809558bd78a59c2894201c40c9f2bc6d219cc SHA512 fa97389a1326ffdfd204d052abf44d29b0c6dacb93956be53642be54e5c371f1ea278bd45554bc1fb7eed84f8faee2ef3fd34583d52ff42558540a685b77465f
+EBUILD ncpfs-2.2.6-r3.ebuild 2602 BLAKE2B fef73dbdac5f1742dfad592baba72b400a01b0fc4eb772b73caea4f45e15aeecb135ecf7b1da43f727878412b5df22e09234b45394bf0054757f225f93e6c2b6 SHA512 c075329795ab8da5e059b1eef5412f984a86402bbabf8a54df67841952117a44b86999d001989f5badffa36ac4103966c968e7f583b3fb76e8b5560a7dfb4b39
+EBUILD ncpfs-2.2.6-r4.ebuild 2447 BLAKE2B 09deb98327c5fd7f09ca546ff5225103095283a28f4a360475c498441bb6bf10c884407cfad7f36be86f1d286c7b2e554397bd37b9de036284c857803b8bafe1 SHA512 f43f3e7ec548d66d81a91f2cfed6928bddf7e97a8b0d6953eb331dad41f81a51c85b976cc9f29422840f0078998e151904b2c629f8cf919792393d72331916a3
+EBUILD ncpfs-2.2.6-r5.ebuild 2305 BLAKE2B 09dba15aa9a61f5bafff325c53ad61a7aed9bebcdbec5b848f47bbceaa6a581bc398e57fc64e498339c136fecdb53be3cdc621f75ddf74bf480e45cf97485be9 SHA512 80441e194f657b877442109de5dea2126eb82e075d68a5c0fcae9ffdc10d66b9e5f81e368d916b4187e0d67805fffb6104571a629918f7a041aa821f4b1067a1
 MISC metadata.xml 376 BLAKE2B 33c2a81c2a97ae39b1f66ae00a81dbc58144f8f264f31235f95852c70dadfd74ae8ab3db92bfed910354598d4f50e1ce0de546eef7fc2db3717158294fdf79e7 SHA512 dacdb06d762397d05a6ba195648173ddd13822bc020fd0c8ed12148003e9ee651636f162860c5aace8e1182111da4082d2c509a20e8523bd8ed05ef04c51afec
diff --git a/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild b/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild
index f66a06347b88..aeda73ee956a 100644
--- a/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild
+++ b/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ KEYWORDS="amd64 ~mips ppc ppc64 x86"
 IUSE="nls pam php"
 
 DEPEND="nls? ( sys-devel/gettext )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	php? ( || ( dev-lang/php virtual/httpd-php ) )"
 
 RDEPEND="${DEPEND}"
diff --git a/net-fs/ncpfs/ncpfs-2.2.6-r4.ebuild b/net-fs/ncpfs/ncpfs-2.2.6-r4.ebuild
index 481e43c3474f..04130516b2ca 100644
--- a/net-fs/ncpfs/ncpfs-2.2.6-r4.ebuild
+++ b/net-fs/ncpfs/ncpfs-2.2.6-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ IUSE="nls pam php"
 
 DEPEND="
 	nls? ( sys-devel/gettext )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	php? ( || ( dev-lang/php:* virtual/httpd-php:* ) )"
 
 RDEPEND="${DEPEND}"
diff --git a/net-fs/ncpfs/ncpfs-2.2.6-r5.ebuild b/net-fs/ncpfs/ncpfs-2.2.6-r5.ebuild
index a024decda07f..7e4c742a0e19 100644
--- a/net-fs/ncpfs/ncpfs-2.2.6-r5.ebuild
+++ b/net-fs/ncpfs/ncpfs-2.2.6-r5.ebuild
@@ -16,7 +16,7 @@ IUSE="nls pam"
 
 DEPEND="
 	nls? ( sys-devel/gettext )
-	pam? ( virtual/pam )"
+	pam? ( sys-libs/pam )"
 
 RDEPEND="${DEPEND}"
 
diff --git a/net-fs/netatalk/Manifest b/net-fs/netatalk/Manifest
index 9fc8e8e7bb42..771a11a34029 100644
--- a/net-fs/netatalk/Manifest
+++ b/net-fs/netatalk/Manifest
@@ -1,5 +1,5 @@
 AUX netatalk-3.1.7-gentoo.patch 4910 BLAKE2B cfff6844b53dfbae3336739df3e89baede2c9ed88566f0c3831d0a1e25e1c0aff8bbb5e09a36fd2b59b2ed7dc3fd0c9a3a68f80d65717f59538071cf1395c98e SHA512 5b8ff4ba306e1467d089df9c3f9dcfb22c4c21cce2c6b53e29dc84006efda0b88609cd00a01a2eec8f153d85d3c7283a1b5123219ecce1fe120a143290f3958f
 AUX netatalk-3.1.8-disable-ld-library-path.patch 1860 BLAKE2B 0c5c8671754c2868236c7b0603ad738b4ba5443f7fa61b9f32052103de33a611bdc628210785b9aee5feaaeea4fee969bc77ac90e494a7cfc72c10f567ee3f22 SHA512 971e1d4787f94e3f608dd7de4ea8721d3027aacc5b6461fbee0332d7434704336a35c2962d54c4b380bb3cf76c56d9cd6e8bf094f9bd9a0958054bf83e25299b
 DIST netatalk-3.1.12.tar.bz2 1918312 BLAKE2B a0672ad769530d96b13a4bf74a1f17d86aa924f05e8185cf6b1bdbfe97fbcf23d36e2f3e5e32a32194a9d3020864e5afa2812f8fb947c68629b15c259a745bf3 SHA512 0b22abaf0084d5684ccc049225abb34caa32893ea8fe7eb67901fde94726f054149ce78d2da49cf06fe30360eb18b2edccff20f9ac69d5ab5105f6d2f4178759
-EBUILD netatalk-3.1.12.ebuild 4873 BLAKE2B 4242362dc54d7f1864570a76bfc3858672450da7b05eba48a7052114cf7b1dada550a0e6c72831ba76eedca7c3569c46aae79c7f75d122199873070a7ede69c3 SHA512 146455d84282235c5357582f9c9276e3296da59ddc3159692d7fc204fc5e04a140238defb22b20f22d5310038471165300ec01ef8d1b95387bc132318b48ac8f
+EBUILD netatalk-3.1.12.ebuild 4864 BLAKE2B c5f1077fcaf4fb71f6ad47db3c941c44b4d7c00a31e97ab794b544e7b44f1bb221f0e123f33679d837126e4c81dfa466e16eae8fb244ae6736388706288e5387 SHA512 03739e7861e7349ecb5e176a7def479641fca60dff9989d40a05f26a7f61839c481039cb7793c0b83760121cfb1d08d9999fe49592b1a4a2165fdf9d91ba1e1d
 MISC metadata.xml 771 BLAKE2B a78f49af27765d075dc38234d4f0dd5c10e560b9ba10e17d6e24ed379b445f4db7e3148ecba449139e316c977ec43b606b7a83bf3075c7c53c3a8e81359f6033 SHA512 28ee7eb659776c18de5da3cb593e17f504b9eee22f429e41ad4cc1f7fcb64c953f67b2aed63cf43c5f05991bc3b4a37b1e768342213a13b7e866588c47d4f460
diff --git a/net-fs/netatalk/netatalk-3.1.12.ebuild b/net-fs/netatalk/netatalk-3.1.12.ebuild
index a6adead6ef87..3e812e2ad855 100644
--- a/net-fs/netatalk/netatalk-3.1.12.ebuild
+++ b/net-fs/netatalk/netatalk-3.1.12.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}/$(ver_cut 1-3)/${P}.tar.bz2"
 
 LICENSE="GPL-2 BSD"
 SLOT="0/18.0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
 IUSE="acl cracklib dbus debug kerberos ldap pam pgp quota samba +shadow ssl static-libs tracker tcpd +utils zeroconf"
 
 CDEPEND="
@@ -33,7 +33,7 @@ CDEPEND="
 	dbus? ( sys-apps/dbus dev-libs/dbus-glib )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	ssl? ( dev-libs/openssl:0= )
 	tcpd? ( sys-apps/tcp-wrappers )
 	tracker? ( app-misc/tracker )
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 50eaaa54d957..db64845a9617 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,11 +1,7 @@
 AUX exports 66 BLAKE2B 8ddc8e1b7888570cf7ce21ecebf0fb390ab394d25e60f1d914406396b23cb3cbf243a15a199f30608ac7e3c0abde73f48e0ccea605a3dadad654dfd8d6572dcd SHA512 fd8052dc8e17eccb0bb1443f341c97ec7c9dac5824294cadf486d91475bc728d4bb69300034b528a690707520590f6675ee371f92e9838afc8ed88092ee0f220
 AUX nfs-utils-1.1.4-mtab-sym.patch 1020 BLAKE2B 6f1315a02a6070443fbd8cc943e382a02ac8ee99dbbc78f6b1b6c835548b80a78238ae4f7de18c7f02687df370bc58d628ed2bdbf216a41e80b5b589f1952c3c SHA512 1cd916028a8515772f05ef63832d73a09e9720055aedc9e2e4ce3a08ce1820948700a4f00ca9c4ee684880f18e67aca888dd857fc7931d923021ba50964be998
 AUX nfs-utils-1.2.8-cross-build.patch 1323 BLAKE2B 51ec6b58436725e78fd9000aa1d97a1a73e7884bea01e0d22d5ec0a88cc4d5c8f152baaeb2b602961232c08330b311f3e98cb79c40b7d700a279842430e484d9 SHA512 42a41411d0de384b66a2875fa9ea15e4b854150b5f75ba2db54ad7785fd147ee329eb8867d24a26b2b1d9ef89bd887caeaf0b5a59cdda15f5a11c47888882b9a
-AUX nfs-utils-2.3.1-limits.patch 2482 BLAKE2B 9d5a8d3811b43dae7c0cf40216146bf14e6344b3cbf7543db86b410428228d593748e05d9d54b7f9a7f1638981f509d0d805a1c2d3d93cb23d2a45ac0d0d69d0 SHA512 5fef0be2d531ca9f136f8812835007a39dac2b24729f67b19cd34c824afd92d1ca7fb6694d9c303cb3d54b4195d305e470b837a3ade868e520e17292edccbb44
-AUX nfs-utils-2.3.2-junction_libs.patch 1487 BLAKE2B 5ecd4709fdcbc1c0885c91aea134ef5e5e00e6f58ace39d35d31b5de74d73bf05a4c27befc35f2c8a54d72452f63589c3a2912c3ef37752416389dd9537598e8 SHA512 d724ff25b7bbf03fc2c7d122bb338979ef50c59906a433ced5aa50e84030a375b2c268a05ee930c4f64ce58e938de7d30a9d0b5d3b7e660d8894013786d5bb4f
-AUX nfs-utils-2.3.2-no-werror.patch 1375 BLAKE2B d494d00f81e236fd0531d4629108a4536415e3a6898b655f267b0125c0fd6b87cb567ef5cb7598fc19e68653572c1072566d7ef791fedb9f0c8d9ea663e67565 SHA512 acc3ccd6cf4afa73bbd253f6a1faa0349e6f8d50d57d9316fafa1faeb9f8ed5d5dfa60ec1b0a53339cd71af4d65b32d9595965ec435bc72eadcc86b8d187438b
 AUX nfs-utils-2.3.4-no-werror.patch 1832 BLAKE2B 6e0f3da6a355c3b828bbaae3135c3a6c8bab29008cf160ca728ff5b72402f108221b4def304e9bf36f98310407bee9c26d828ab833bb7a9619fdaf609e66d06c SHA512 ce76f46c8dcef8b151040b9d198843746b6c20507c23a0dc511b3d3dec7681b3ac65c089de3f09d4e496ffa1bd011c034ce70198def374058a0805daf4ec8292
-AUX nfs-utils-2.3.4_rc2-improved_res_querydomain_check.patch 1629 BLAKE2B 8d97392b754fefa5760c8c7c9d2f6615e5d9a6b3b29211fe2dbee85f3e01dc4c80dabe691beeb5d59410d1f917b5b597aed3da5958ac7c1de1cfc516bf617f4d SHA512 f4971098e0db597233806cbb79e4af7f3e2ed59280f7cc6f80b9e7b8684a5d53cd16a5e2c2ef1690daade84ca4676470217d0e65e750df103fd34363b6983de5
 AUX nfs-utils-2.4.1-Fix-include-order-between-config.h-and-stat.h.patch 4020 BLAKE2B 9f9079879be7bbaaf7748d4c2e5711fdeacac8b389fdb48d7fdc1c781191dc283f2dc05c9aded7558eb0cf3801cf7eda7032d091592e45cb8eb47018a0ce5430 SHA512 36b80e0f1ef0826e25ee719980171f4d6215db246392e1dbceef6aab4f1fbe78e4e1222256dfb23232b7da1b5328a23050966f3608a10c8b70b2f75491603f31
 AUX nfs-utils-2.4.1-gssd-Look-in-lib32-for-gss-libs-aswell.patch 1608 BLAKE2B 761eb16d6556b0df1029556453922925ccac7bdc88c4f769382afdf659dfccdd90aa6a183d317667c638e2d2d4d8fc080cfe49070c5fec5bb5f5dc2f66d2040e SHA512 cc4a7a7dde84854b52f57afe09bbff9e241712a19784febd0992b5b53b4b14905b6daf6620a8e9049fbda1dfe0a1619f322adc0517d9747466d7974d4c3eac06
 AUX nfs-utils.conf 74 BLAKE2B 504c298c1e8e7eb596cd87813f1aeeac5cbc830bb85be9e26ed98f7ed85cdbd14ae2c47b0e111c912398ef28ef629e6de7e585a7b161624e9698ea208750fd9f SHA512 d72c0fbdf12cb1ddf8eaa5885e1ed93a2078c40ca48eb8868836fb72fa456c4865df15273fb7472f70dfe8098167e695b1340ff9a59b55e73b47690baaf977d6
@@ -21,11 +17,6 @@ AUX rpc.idmapd.initd 482 BLAKE2B db643d164787a730ed8f1da73cbc045237bb641fcdf2970
 AUX rpc.pipefs.initd 760 BLAKE2B 4c05275e59d7d19d80779964a3631096258704cec2097f12d87232deecba5d74181f1713e18ebb01f5da9c3833037ba47566414f0b415608ad13e3fa97c8f1e6 SHA512 3d3fa6e7ae01e27d27d88aba1e307c5293dd1cbc9d555737e03c4f1e17988518f4f1e7f7a38a7337f8e8961e8378cc4611769b04db7368460589a3b218ac6d6b
 AUX rpc.statd.initd 706 BLAKE2B 6c175729706d298307deea1d190703e67edb671a6b2c86216658fc89dafff1ae9f85a25b5386e4c89b86ca1b7b1fce7bb3045f944b7a1aee5b6544594d753cf8 SHA512 7f6baea852fff91b88e15e432ba19f9da0a3e3510b6f550b553912cf3887ce176280367b62bcce2a044730a075e4c1f6d7df1a669556d42725dea6e6e8e967ac
 AUX rpc.svcgssd.initd 470 BLAKE2B c610a7abc44b86ca242d59f833ffa6e42f48d1c3bf93420988c6c6dfcd5cc4d8e02eaf2f3a86bb8bca7c8952e05017f887e6c4f4290085c41cc095a580e04235 SHA512 819cce4ae0a0f26bc74ce546e149b98420584240a594c9bb4a0a49413750320bde050866f3753c499425ea8d8df094211fb1f7e020ce281791e1933e1bc6a47f
-DIST nfs-utils-2.3.3.tar.bz2 888947 BLAKE2B 7c913f0c5061807d4af162fb392c8f466abb97c88960853b52298f61056bcad08f67a16e577036dec9afa737d88268d5a766b67c4b30a014b666dfbf3db81031 SHA512 266b86ef5041a7ecd144c6f2570e8a6eb00ebb4e547fa4b8c8c3e60a4af117c2690ff9effb0d4113a7b7ef57164583c8a6ada9cb1bb8f7b748524c826eaf1cba
-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
-EBUILD nfs-utils-2.3.3.ebuild 5534 BLAKE2B e70b34817cd313721687897c29622f66ac3c1c2e347f71a3ef6763d4693c121866e21dee282a9499661db2dfcf27a33a40a90cc80fe481859b402753c0ab1816 SHA512 f5afca6badb7be19d708632a624d535ffdd7abad2fac6ccc59295061f9354c5db66cacb841001dcc2039f5380a29e4f56450105311d42c38b7b2c60786a7373b
-EBUILD nfs-utils-2.3.4.ebuild 5274 BLAKE2B 8ac149fa4f44491d101a7fbdd283f7b0bfc1db7183c2622d54f0e39f1a3b477fc0ce52481d6ee13478e03e0f6dec08d04507e775a3851aab80c0f11586c18ad5 SHA512 97b33afd3742f740754502d991dbc2d99ddb4c361af497db0bc2c026315354bb45e82625c68a7ef198aa7f6dced68b325f82521a482a8d434bca24faa992aeb7
-EBUILD nfs-utils-2.4.1-r1.ebuild 5883 BLAKE2B f5d7a4cb014005d45ad02fe768465a7c7610bf11979b613d325519475e92ffcfcc5669b5db69c295b88076aa4401e5d7d8f8cda5099530d359df61ef4111b963 SHA512 10395eb302a7a3c4fd3d79d06c741a06133b560ac84ec4109623d9fa1395e3c3935bc9fc68b3badbc46088f4db4a0717764fd64aa3681d0327ef3ba03b7362cb
-EBUILD nfs-utils-2.4.1-r2.ebuild 5966 BLAKE2B cfbd2bdd3c8967f71cf95eee655cfe39f18fa7690a8f3fcfff9e71d803b4f13e8dbc184920c10d7a209b773a0f66396c3105ee84f67c5727703c79b4fc446185 SHA512 244423891fc20796f48efc3692e4fe279fbae79d392bfe9012767f74dbfb9e872fd03c7b3cbe2d0e5ccb362233291c6c14429b3d11f0e0e27f457022b3f2c012
+EBUILD nfs-utils-2.4.1-r2.ebuild 5954 BLAKE2B bb9adec2c148b07d5d09fcf77c04da15fe126bab11a1f81eee62b19115a80cb767b914f94a9fe4500b17365b33d9b99f6877d7e5652b9d0b1b8e4f552eb767d7 SHA512 da682d165e31fbb3fe913591ab7a5e2d4da69f30f486435cbf512d5cc14a8a07c41b8b23da4b0c1b3b6251f808f02de91eca55862ecdbe8dd21ced5d32989d20
 MISC metadata.xml 932 BLAKE2B 14cb95a010cdb52373502bdad4de008234494be6e38f6b3fbf6b69e0848a6daa1315ed69b8eaadaad0cd546e84ba0e291b56ebf9db486b7c6e66011147b9a97c SHA512 eb45c97d7ed2bdaa8e43ce0a4fdb2f8a1d197bfd67a8b04f718c6083e7701873e2c22550700049edc25068daacb5278ca2535b63a02a10c1040efe0dbcef76a5
diff --git a/net-fs/nfs-utils/files/nfs-utils-2.3.1-limits.patch b/net-fs/nfs-utils/files/nfs-utils-2.3.1-limits.patch
deleted file mode 100644
index b322b6fb17ce..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-2.3.1-limits.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Required for successful build on musl
-https://bugs.gentoo.org/651080#c5
-
-Thanks-to: Robert Bridge <robert@robbieab.com>
-
---- nfs-utils-2.3.1/support/export/export.c
-+++ nfs-utils-2.3.1/support/export/export.c
-@@ -17,6 +17,7 @@
- #include <stdlib.h>
- #include <dirent.h>
- #include <errno.h>
-+#include <limits.h>
- #include "xmalloc.h"
- #include "nfslib.h"
- #include "exportfs.h"
---- nfs-utils-2.3.1/support/export/xtab.c
-+++ nfs-utils-2.3.1/support/export/xtab.c
-@@ -18,6 +18,7 @@
- #include <sys/stat.h>
- #include <errno.h>
- #include <libgen.h>
-+#include <limits.h>
- 
- #include "nfslib.h"
- #include "exportfs.h"
---- nfs-utils-2.3.1/support/misc/file.c
-+++ nfs-utils-2.3.1/support/misc/file.c
-@@ -27,6 +27,7 @@
- #include <dirent.h>
- #include <stdlib.h>
- #include <stdbool.h>
-+#include <limits.h>
- 
- #include "xlog.h"
- #include "misc.h"
---- nfs-utils-2.3.1/support/nfs/xcommon.c
-+++ nfs-utils-2.3.1/support/nfs/xcommon.c
-@@ -16,6 +16,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <limits.h>
- 
- #include "xcommon.h"
- #include "nls.h"	/* _() */
---- nfs-utils-2.3.1/support/nsm/file.c
-+++ nfs-utils-2.3.1/support/nsm/file.c
-@@ -85,6 +85,7 @@
- #include <fcntl.h>
- #include <dirent.h>
- #include <grp.h>
-+#include <limits.h>
- 
- #include "xlog.h"
- #include "nsm.h"
---- nfs-utils-2.3.1/utils/blkmapd/device-discovery.c
-+++ nfs-utils-2.3.1/utils/blkmapd/device-discovery.c
-@@ -49,6 +49,7 @@
- #include <unistd.h>
- #include <libgen.h>
- #include <errno.h>
-+#include <limits.h>
- #include <libdevmapper.h>
- 
- #ifdef HAVE_CONFIG_H
---- nfs-utils-2.3.1/utils/gssd/krb5_util.c
-+++ nfs-utils-2.3.1/utils/gssd/krb5_util.c
-@@ -120,6 +120,7 @@
- #endif
- #include <krb5.h>
- #include <rpc/auth_gss.h>
-+#include <limits.h>
- 
- #include "gssd.h"
- #include "err_util.h"
---- nfs-utils-2.3.1/utils/mountd/cache.c
-+++ nfs-utils-2.3.1/utils/mountd/cache.c
-@@ -26,6 +26,7 @@
- #include <pwd.h>
- #include <grp.h>
- #include <mntent.h>
-+#include <limits.h>
- #include "misc.h"
- #include "nfslib.h"
- #include "exportfs.h"
---- nfs-utils-2.3.1/utils/mountd/mountd.c
-+++ nfs-utils-2.3.1/utils/mountd/mountd.c
-@@ -22,6 +22,7 @@
- #include <fcntl.h>
- #include <sys/resource.h>
- #include <sys/wait.h>
-+#include <limits.h>
- 
- #include "conffile.h"
- #include "xmalloc.h"
---- nfs-utils-2.3.1/utils/mountd/rmtab.c
-+++ nfs-utils-2.3.1/utils/mountd/rmtab.c
-@@ -16,6 +16,7 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <netdb.h>
-+#include <limits.h>
- 
- #include "misc.h"
- #include "exportfs.h"
diff --git a/net-fs/nfs-utils/files/nfs-utils-2.3.2-junction_libs.patch b/net-fs/nfs-utils/files/nfs-utils-2.3.2-junction_libs.patch
deleted file mode 100644
index f13f07a4c81f..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-2.3.2-junction_libs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 8f3e4f4d6df9f813572051e12e974b35c26a1743 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Mon, 28 May 2018 12:13:10 +0200
-Subject: [PATCH] Fix undefined references and bad include when build with
- junction support
-
----
- support/junction/Makefile.am | 2 +-
- utils/nfsref/Makefile.am     | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/support/junction/Makefile.am b/support/junction/Makefile.am
-index 97e7426..89cb532 100644
---- a/support/junction/Makefile.am
-+++ b/support/junction/Makefile.am
-@@ -31,4 +31,4 @@ libjunction_la_SOURCES	= display.c export-cache.c junction.c \
- 
- MAINTAINERCLEANFILES	= Makefile.in
- 
--AM_CPPFLAGS		= -I. -I../include -I/usr/include/libxml2
-+AM_CPPFLAGS		= -I. -I../include -I/usr/include/libxml2 @TIRPC_CFLAGS@
-diff --git a/utils/nfsref/Makefile.am b/utils/nfsref/Makefile.am
-index 2b2bb53..a652b03 100644
---- a/utils/nfsref/Makefile.am
-+++ b/utils/nfsref/Makefile.am
-@@ -27,13 +27,13 @@ noinst_HEADERS		= nfsref.h
- 
- sbin_PROGRAMS		= nfsref
- nfsref_SOURCES		= add.c lookup.c nfsref.c remove.c
--LDADD			= $(LIBXML2) $(LIBCAP) \
--			  ../../support/nfs/libnfs.la \
-+LIBS			+= $(LIBXML2) $(LIBCAP)
-+LDADD			=  ../../support/nfs/libnfs.la \
- 			  ../../support/junction/libjunction.la
- 
- man8_MANS		= nfsref.man
- 
- MAINTAINERCLEANFILES	= Makefile.in
- 
--AM_CPPFLAGS		= -I. -I../../support/include
-+AM_CPPFLAGS		= -I. -I../../support/include @TIRPC_CFLAGS@
- ##AM_LDFLAGS		= -Wl,--as-needed
--- 
-2.17.0
-
diff --git a/net-fs/nfs-utils/files/nfs-utils-2.3.2-no-werror.patch b/net-fs/nfs-utils/files/nfs-utils-2.3.2-no-werror.patch
deleted file mode 100644
index d06fc4ce8b8b..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-2.3.2-no-werror.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://bugs.gentoo.org/656984
-
-Don't build with -Werror flags.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -544,45 +544,11 @@
- AC_SUBST(LDFLAGS_FOR_BUILD)
- 
- my_am_cflags="\
-- -pipe \
-  -Wall \
-  -Wextra \
-- -Werror=strict-prototypes \
-- -Werror=missing-prototypes \
-- -Werror=missing-declarations \
-- -Werror=format=2 \
-- -Werror=undef \
-- -Werror=missing-include-dirs \
-- -Werror=strict-aliasing=2 \
-- -Werror=init-self \
-- -Werror=implicit-function-declaration \
-- -Werror=return-type \
-- -Werror=switch \
-- -Werror=overflow \
-- -Werror=parentheses \
-- -Werror=aggregate-return \
-- -Werror=unused-result \
-  -fno-strict-aliasing \
- "
--
--AC_DEFUN([CHECK_CCSUPPORT], [
--  my_save_cflags="$CFLAGS"
--  CFLAGS=$1
--  AC_MSG_CHECKING([whether CC supports $1])
--  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],
--    [AC_MSG_RESULT([yes])]
--    [$2+=$1],
--    [AC_MSG_RESULT([no])]
--  )
--  CFLAGS="$my_save_cflags"
--])
--
--CHECK_CCSUPPORT([-Werror=format-overflow=2], [flg1])
--CHECK_CCSUPPORT([-Werror=int-conversion], [flg2])
--CHECK_CCSUPPORT([-Werror=incompatible-pointer-types], [flg3])
--CHECK_CCSUPPORT([-Werror=misleading-indentation], [flg4])
--
--AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg3 $flg4"])
-+AC_SUBST([AM_CFLAGS], ["$my_am_cflags"])
- 
- # Make sure that $ACLOCAL_FLAGS are used during a rebuild
- AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \$(ACLOCAL_FLAGS)"])
diff --git a/net-fs/nfs-utils/files/nfs-utils-2.3.4_rc2-improved_res_querydomain_check.patch b/net-fs/nfs-utils/files/nfs-utils-2.3.4_rc2-improved_res_querydomain_check.patch
deleted file mode 100644
index 787a96fe89d8..000000000000
--- a/net-fs/nfs-utils/files/nfs-utils-2.3.4_rc2-improved_res_querydomain_check.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 4f91877bb313a35ade44d9dde1fd219035ba1fd9 Mon Sep 17 00:00:00 2001
-From: Patrick Steinhardt <ps@pks.im>
-Date: Wed, 27 Feb 2019 11:58:47 -0500
-Subject: [PATCH] configure.ac: more carefully detect availability of
- res_querydomain(3)
-
-Since glibc 2.2, the function res_querydomain(3) is implemented as a
-define to `__res_querydomain`. Due to this implementation detail, using
-`AC_CHECK_LIB` with a symbol name of "res_querydomain" will cause a
-linking failure and thus fail to detect its availability. This is why
-right now, we try to detect availability of `__res_querydomain` instead.
-
-Unfortunately, this may break on other platforms where there is no
-`__res_querydomain` but only the function without leading underscores.
-To fix this, we can perform another `AC_CHECK_LIB([resolv],
-[res_querydomain], ...)` call in case where the other one was not found
-and only raise an error if both symbols weren't found.
-
-Signed-off-by: Patrick Steinhardt <ps@pks.im>
-Signed-off-by: Steve Dickson <steved@redhat.com>
----
- configure.ac | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4bf5aea..cb9d921 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -411,7 +411,8 @@ if test "$enable_gss" = yes; then
- fi
- 
- dnl libdnsidmap specific checks
--AC_CHECK_LIB([resolv], [__res_querydomain], , AC_MSG_ERROR(res_querydomain needed))
-+AC_CHECK_LIB([resolv], [__res_querydomain], ,
-+	AC_CHECK_LIB([resolv], [res_querydomain], , AC_MSG_ERROR(res_querydomain needed)))
- 
- AC_ARG_ENABLE([ldap],
- 	[AS_HELP_STRING([--disable-ldap],[Disable support for LDAP @<:default=detect@:>@])])
--- 
-1.8.3.1
-
diff --git a/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild
deleted file mode 100644
index 77465d97e588..000000000000
--- a/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic multilib systemd
-
-DESCRIPTION="NFS client and server daemons"
-HOMEPAGE="http://linux-nfs.org/"
-
-if [[ "${PV}" = *_rc* ]] ; then
-	inherit versionator
-	MY_PV="$(replace_all_version_separators -)"
-	SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
-	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 s390 sh sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
-REQUIRED_USE="kerberos? ( nfsv4 )"
-RESTRICT="test" #315573
-
-# kth-krb doesn't provide the right include
-# files, and nfs-utils doesn't build against heimdal either,
-# so don't depend on virtual/krb.
-# (04 Feb 2005 agriffis)
-DEPEND_COMMON="
-	dev-libs/libxml2
-	net-libs/libtirpc:=
-	>=net-nds/rpcbind-0.2.4
-	sys-libs/e2fsprogs-libs
-	caps? ( sys-libs/libcap )
-	ldap? ( net-nds/openldap )
-	libmount? ( sys-apps/util-linux )
-	nfsdcld? ( >=dev-db/sqlite-3.3 )
-	nfsv4? (
-		dev-libs/libevent:=
-		>=sys-apps/keyutils-1.5.9
-		kerberos? (
-			>=net-libs/libtirpc-0.2.4-r1[kerberos]
-			app-crypt/mit-krb5
-		)
-	)
-	nfsv41? (
-		sys-fs/lvm2
-	)
-	tcpd? ( sys-apps/tcp-wrappers )
-	uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND_COMMON}
-	!net-libs/libnfsidmap
-	!net-nds/portmap
-	!<sys-apps/openrc-0.13.9
-	selinux? (
-		sec-policy/selinux-rpc
-		sec-policy/selinux-rpcbind
-	)
-"
-DEPEND="${DEPEND_COMMON}
-	net-libs/rpcsvc-proto
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
-	"${FILESDIR}"/${PN}-1.2.8-cross-build.patch
-	"${FILESDIR}"/${PN}-2.3.2-junction_libs.patch
-	"${FILESDIR}"/${PN}-2.3.2-no-werror.patch
-	"${FILESDIR}"/${PN}-2.3.1-limits.patch #651080
-	"${FILESDIR}"/${PN}-2.3.4_rc2-improved_res_querydomain_check.patch #651080
-)
-
-src_prepare() {
-	default
-
-	sed \
-		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
-		-i utils/*/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
-	export ac_cv_header_keyutils_h=$(usex nfsidmap)
-	local myeconfargs=(
-		--with-statedir="${EPREFIX%/}"/var/lib/nfs
-		--enable-tirpc
-		--with-tirpcinclude="${EPREFIX%/}"/usr/include/tirpc/
-		--with-pluginpath="${EPREFIX%/}"/usr/$(get_libdir)/libnfsidmap
-		--with-rpcgen
-		--with-systemd="$(systemd_get_systemunitdir)"
-		--without-gssglue
-		$(use_enable caps)
-		$(use_enable ipv6)
-		$(use_enable junction)
-		$(use_enable kerberos gss)
-		$(use_enable kerberos svcgss)
-		$(use_enable ldap)
-		$(use_enable libmount libmount-mount)
-		$(use_enable nfsdcld nfsdcltrack)
-		$(use_enable nfsv4)
-		$(use_enable nfsv41)
-		$(use_enable uuid)
-		$(use_with tcpd tcp-wrappers)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile(){
-	# remove compiled files bundled in the tarball
-	emake clean
-	default
-}
-
-src_install() {
-	default
-	rm linux-nfs/Makefile* || die
-	dodoc -r linux-nfs README
-
-	# Don't overwrite existing xtab/etab, install the original
-	# versions somewhere safe...  more info in pkg_postinst
-	keepdir /var/lib/nfs/{,sm,sm.bak}
-	mv "${ED%/}"/var/lib/nfs "${ED%/}"/usr/$(get_libdir)/ || die
-
-	# Install some client-side binaries in /sbin
-	dodir /sbin
-	mv "${ED%/}"/usr/sbin/rpc.statd "${ED%/}"/sbin/ || die
-
-	if use nfsv4 && use nfsidmap ; then
-		# Install a config file for idmappers in newer kernels. #415625
-		insinto /etc/request-key.d
-		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
-		doins id_resolver.conf
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/exports
-	keepdir /etc/exports.d
-
-	local f list=() opt_need=""
-	if use nfsv4 ; then
-		opt_need="rpc.idmapd"
-		list+=( rpc.idmapd rpc.pipefs )
-		use kerberos && list+=( rpc.gssd rpc.svcgssd )
-	fi
-	for f in nfs nfsclient rpc.statd "${list[@]}" ; do
-		newinitd "${FILESDIR}"/${f}.initd ${f}
-	done
-	newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
-	for f in nfs nfsclient ; do
-		newconfd "${FILESDIR}"/${f}.confd ${f}
-	done
-	sed -i \
-		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
-		"${ED%/}"/etc/conf.d/nfs || die #234132
-
-	local systemd_systemunitdir="$(systemd_get_systemunitdir)"
-	sed -i \
-		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
-		"${ED%/}${systemd_systemunitdir}"/* || die
-
-	keepdir /var/lib/nfs #368505
-	keepdir /var/lib/nfs/v4recovery #603628
-
-}
-
-pkg_postinst() {
-	# Install default xtab and friends if there's none existing.  In
-	# src_install we put them in /usr/lib/nfs for safe-keeping, but
-	# the daemons actually use the files in /var/lib/nfs.  #30486
-	local f
-	for f in "${EROOT%/}"/usr/$(get_libdir)/nfs/*; do
-		[[ -e ${EROOT%/}/var/lib/nfs/${f##*/} ]] && continue
-		einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
-		cp -pPR "${f}" "${EROOT%/}"/var/lib/nfs/
-	done
-
-	if systemd_is_booted; then
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${v}" -lt 1.3.0; then
-				ewarn "We have switched to upstream systemd unit files. Since"
-				ewarn "they got renamed, you should probably enable the new ones."
-				ewarn "You can run 'equery files nfs-utils | grep systemd'"
-				ewarn "to know what services you need to enable now."
-			fi
-		done
-	else
-		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
-		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
-		ewarn "same runlevel as nfsmount."
-	fi
-}
diff --git a/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild
deleted file mode 100644
index 975b78c549b1..000000000000
--- a/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib systemd
-
-DESCRIPTION="NFS client and server daemons"
-HOMEPAGE="http://linux-nfs.org/"
-
-if [[ "${PV}" = *_rc* ]] ; then
-	MY_PV="$(ver_rs 1- -)"
-	SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
-	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 ~s390 ~sh ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
-REQUIRED_USE="kerberos? ( nfsv4 )"
-RESTRICT="test" #315573
-
-# kth-krb doesn't provide the right include
-# files, and nfs-utils doesn't build against heimdal either,
-# so don't depend on virtual/krb.
-# (04 Feb 2005 agriffis)
-DEPEND="
-	>=dev-db/sqlite-3.3
-	dev-libs/libxml2
-	net-libs/libtirpc:=
-	>=net-nds/rpcbind-0.2.4
-	sys-libs/e2fsprogs-libs
-	caps? ( sys-libs/libcap )
-	ldap? ( net-nds/openldap )
-	libmount? ( sys-apps/util-linux )
-	nfsv4? (
-		dev-libs/libevent:=
-		>=sys-apps/keyutils-1.5.9
-		kerberos? (
-			>=net-libs/libtirpc-0.2.4-r1[kerberos]
-			app-crypt/mit-krb5
-		)
-	)
-	nfsv41? (
-		sys-fs/lvm2
-	)
-	tcpd? ( sys-apps/tcp-wrappers )
-	uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND}
-	!net-libs/libnfsidmap
-	!net-nds/portmap
-	!<sys-apps/openrc-0.13.9
-	selinux? (
-		sec-policy/selinux-rpc
-		sec-policy/selinux-rpcbind
-	)
-"
-BDEPEND="
-	net-libs/rpcsvc-proto
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
-	"${FILESDIR}"/${PN}-1.2.8-cross-build.patch
-	"${FILESDIR}"/${PN}-2.3.4-no-werror.patch
-)
-
-src_prepare() {
-	default
-
-	sed \
-		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
-		-i utils/*/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
-	export ac_cv_header_keyutils_h=$(usex nfsidmap)
-	local myeconfargs=(
-		--with-statedir="${EPREFIX%/}"/var/lib/nfs
-		--enable-tirpc
-		--with-tirpcinclude="${EPREFIX%/}"/usr/include/tirpc/
-		--with-pluginpath="${EPREFIX%/}"/usr/$(get_libdir)/libnfsidmap
-		--with-rpcgen
-		--with-systemd="$(systemd_get_systemunitdir)"
-		--without-gssglue
-		$(use_enable caps)
-		$(use_enable ipv6)
-		$(use_enable junction)
-		$(use_enable kerberos gss)
-		$(use_enable kerberos svcgss)
-		$(use_enable ldap)
-		$(use_enable libmount libmount-mount)
-		$(use_enable nfsdcld nfsdcltrack)
-		$(use_enable nfsv4)
-		$(use_enable nfsv41)
-		$(use_enable uuid)
-		$(use_with tcpd tcp-wrappers)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile(){
-	# remove compiled files bundled in the tarball
-	emake clean
-	default
-}
-
-src_install() {
-	default
-	rm linux-nfs/Makefile* || die
-	dodoc -r linux-nfs README
-
-	# Don't overwrite existing xtab/etab, install the original
-	# versions somewhere safe...  more info in pkg_postinst
-	keepdir /var/lib/nfs/{,sm,sm.bak}
-	mv "${ED}"/var/lib/nfs "${ED}"/usr/$(get_libdir)/ || die
-
-	# Install some client-side binaries in /sbin
-	dodir /sbin
-	mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
-
-	if use nfsv4 && use nfsidmap ; then
-		# Install a config file for idmappers in newer kernels. #415625
-		insinto /etc/request-key.d
-		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
-		doins id_resolver.conf
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/exports
-	keepdir /etc/exports.d
-
-	local f list=() opt_need=""
-	if use nfsv4 ; then
-		opt_need="rpc.idmapd"
-		list+=( rpc.idmapd rpc.pipefs )
-		use kerberos && list+=( rpc.gssd rpc.svcgssd )
-	fi
-	for f in nfs nfsclient rpc.statd "${list[@]}" ; do
-		newinitd "${FILESDIR}"/${f}.initd ${f}
-	done
-	newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
-	for f in nfs nfsclient ; do
-		newconfd "${FILESDIR}"/${f}.confd ${f}
-	done
-	sed -i \
-		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
-		"${ED}"/etc/conf.d/nfs || die #234132
-
-	local systemd_systemunitdir="$(systemd_get_systemunitdir)"
-	sed -i \
-		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
-		"${ED}${systemd_systemunitdir}"/* || die
-
-	keepdir /var/lib/nfs #368505
-	keepdir /var/lib/nfs/v4recovery #603628
-
-}
-
-pkg_postinst() {
-	# Install default xtab and friends if there's none existing.  In
-	# src_install we put them in /usr/lib/nfs for safe-keeping, but
-	# the daemons actually use the files in /var/lib/nfs.  #30486
-	local f
-	for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
-		[[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
-		einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
-		cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
-	done
-
-	if systemd_is_booted; then
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${v}" -lt 1.3.0; then
-				ewarn "We have switched to upstream systemd unit files. Since"
-				ewarn "they got renamed, you should probably enable the new ones."
-				ewarn "You can run 'equery files nfs-utils | grep systemd'"
-				ewarn "to know what services you need to enable now."
-			fi
-		done
-	else
-		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
-		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
-		ewarn "same runlevel as nfsmount."
-	fi
-}
diff --git a/net-fs/nfs-utils/nfs-utils-2.4.1-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.4.1-r1.ebuild
deleted file mode 100644
index 26604696ea86..000000000000
--- a/net-fs/nfs-utils/nfs-utils-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic linux-info multilib systemd
-
-DESCRIPTION="NFS client and server daemons"
-HOMEPAGE="http://linux-nfs.org/"
-
-if [[ "${PV}" = *_rc* ]] ; then
-	MY_PV="$(ver_rs 1- -)"
-	SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
-	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"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
-REQUIRED_USE="kerberos? ( nfsv4 )"
-RESTRICT="test" #315573
-
-# kth-krb doesn't provide the right include
-# files, and nfs-utils doesn't build against heimdal either,
-# so don't depend on virtual/krb.
-# (04 Feb 2005 agriffis)
-DEPEND="
-	>=dev-db/sqlite-3.3
-	dev-libs/libxml2
-	net-libs/libtirpc:=
-	>=net-nds/rpcbind-0.2.4
-	sys-libs/e2fsprogs-libs
-	caps? ( sys-libs/libcap )
-	ldap? ( net-nds/openldap )
-	libmount? ( sys-apps/util-linux )
-	nfsv4? (
-		dev-libs/libevent:=
-		>=sys-apps/keyutils-1.5.9:=
-		kerberos? (
-			>=net-libs/libtirpc-0.2.4-r1[kerberos]
-			app-crypt/mit-krb5
-		)
-	)
-	nfsv41? (
-		sys-fs/lvm2
-	)
-	tcpd? ( sys-apps/tcp-wrappers )
-	uuid? ( sys-apps/util-linux )"
-RDEPEND="${DEPEND}
-	!net-libs/libnfsidmap
-	!net-nds/portmap
-	!<sys-apps/openrc-0.13.9
-	selinux? (
-		sec-policy/selinux-rpc
-		sec-policy/selinux-rpcbind
-	)
-"
-BDEPEND="
-	net-libs/rpcsvc-proto
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
-	"${FILESDIR}"/${PN}-1.2.8-cross-build.patch
-	"${FILESDIR}"/${PN}-2.3.4-no-werror.patch
-	"${FILESDIR}"/${P}-gssd-Look-in-lib32-for-gss-libs-aswell.patch
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	if use nfsv4 && ! use nfsdcld && linux_config_exists && ! linux_chkconfig_present CRYPTO_MD5 ; then
-		ewarn "Your NFS server will be unable to track clients across server restarts!"
-		ewarn "Please enable the \"${HILITE}nfsdcld${NORMAL}\" USE flag to install the nfsdcltrack usermode"
-		ewarn "helper upcall program, or enable ${HILITE}CONFIG_CRYPTO_MD5${NORMAL} in your kernel to"
-		ewarn "support the legacy, in-kernel client tracker."
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed \
-		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
-		-i utils/*/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
-	export ac_cv_header_keyutils_h=$(usex nfsidmap)
-	local myeconfargs=(
-		--with-statedir="${EPREFIX%/}"/var/lib/nfs
-		--enable-tirpc
-		--with-tirpcinclude="${EPREFIX%/}"/usr/include/tirpc/
-		--with-pluginpath="${EPREFIX%/}"/usr/$(get_libdir)/libnfsidmap
-		--with-rpcgen
-		--with-systemd="$(systemd_get_systemunitdir)"
-		--without-gssglue
-		$(use_enable caps)
-		$(use_enable ipv6)
-		$(use_enable junction)
-		$(use_enable kerberos gss)
-		$(use_enable kerberos svcgss)
-		$(use_enable ldap)
-		$(use_enable libmount libmount-mount)
-		$(use_enable nfsdcld nfsdcltrack)
-		$(use_enable nfsv4)
-		$(use_enable nfsv41)
-		$(use_enable uuid)
-		$(use_with tcpd tcp-wrappers)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile(){
-	# remove compiled files bundled in the tarball
-	emake clean
-	default
-}
-
-src_install() {
-	default
-	rm linux-nfs/Makefile* || die
-	dodoc -r linux-nfs README
-
-	# Don't overwrite existing xtab/etab, install the original
-	# versions somewhere safe...  more info in pkg_postinst
-	keepdir /var/lib/nfs/{,sm,sm.bak}
-	mv "${ED}"/var/lib/nfs "${ED}"/usr/$(get_libdir)/ || die
-
-	# Install some client-side binaries in /sbin
-	dodir /sbin
-	mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
-
-	if use nfsv4 && use nfsidmap ; then
-		insinto /etc
-		doins support/nfsidmap/idmapd.conf
-
-		# Install a config file for idmappers in newer kernels. #415625
-		insinto /etc/request-key.d
-		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
-		doins id_resolver.conf
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/exports
-	keepdir /etc/exports.d
-
-	local f list=() opt_need=""
-	if use nfsv4 ; then
-		opt_need="rpc.idmapd"
-		list+=( rpc.idmapd rpc.pipefs )
-		use kerberos && list+=( rpc.gssd rpc.svcgssd )
-	fi
-	for f in nfs nfsclient rpc.statd "${list[@]}" ; do
-		newinitd "${FILESDIR}"/${f}.initd ${f}
-	done
-	newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
-	for f in nfs nfsclient ; do
-		newconfd "${FILESDIR}"/${f}.confd ${f}
-	done
-	sed -i \
-		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
-		"${ED}"/etc/conf.d/nfs || die #234132
-
-	local systemd_systemunitdir="$(systemd_get_systemunitdir)"
-	sed -i \
-		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
-		"${ED}${systemd_systemunitdir}"/* || die
-
-	keepdir /var/lib/nfs #368505
-	keepdir /var/lib/nfs/v4recovery #603628
-
-}
-
-pkg_postinst() {
-	# Install default xtab and friends if there's none existing.  In
-	# src_install we put them in /usr/lib/nfs for safe-keeping, but
-	# the daemons actually use the files in /var/lib/nfs.  #30486
-	local f
-	for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
-		[[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
-		einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
-		cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
-	done
-
-	if systemd_is_booted; then
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${v}" -lt 1.3.0; then
-				ewarn "We have switched to upstream systemd unit files. Since"
-				ewarn "they got renamed, you should probably enable the new ones."
-				ewarn "You can run 'equery files nfs-utils | grep systemd'"
-				ewarn "to know what services you need to enable now."
-			fi
-		done
-	else
-		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
-		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
-		ewarn "same runlevel as nfsmount."
-	fi
-}
diff --git a/net-fs/nfs-utils/nfs-utils-2.4.1-r2.ebuild b/net-fs/nfs-utils/nfs-utils-2.4.1-r2.ebuild
index 778fbf1dd67e..26c3bbb3348d 100644
--- a/net-fs/nfs-utils/nfs-utils-2.4.1-r2.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.4.1-r2.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/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest
index b34d833b41e6..2c6d4085e2b9 100644
--- a/net-fs/openafs-kernel/Manifest
+++ b/net-fs/openafs-kernel/Manifest
@@ -1,6 +1,6 @@
 DIST openafs-1.6.22.1-src.tar.bz2 14682183 BLAKE2B a01e08f30f28dda9484407bbe0568df7b517e587b6e2475d669269e09745050bee955438dfeab9d86564dbc22821bc2fb417c15f8add0aae6acdde266c080df0 SHA512 901959051f60f7ffa2db8a253a16f9460713e3637a53f0b6b05e72247e08b633951116dc28b19db9c7448d8ebc7a20a8a851d5356c52f16c28f5c89209f8190e
 DIST openafs-1.6.22.2-src.tar.bz2 14673379 BLAKE2B 06408ad98a1812608b14ee89ffa40ccbbf6aa7d41dc0741c9c7b9e2c59a3f88c1f6676aa2f996b888cb7f50c04f0c8fe2da15c3f3647e3998f70c973c18ea7d3 SHA512 e4f2ce326a1d04ec20b1fa4115509bf35f73d937ff77e6e017e851ce871542d935e5ae8a597efd14027c385869657cf538cffa2674878bd4d4da37f20626172c
 DIST openafs-patches-20170822.tar.xz 11036 BLAKE2B e53d9e01c5808ca9876fd22f729e0e82cb0f6bc7c1f4875ad0607ac9d547e216c61cc2c3506eaafb7c81318958cd038c177e9e5b2c3728997d7f44e13bbbded4 SHA512 f4b574287bfe54881a70f3ccd4d4901b2f8f9ecbec7b3a4975b59050d5ef27c6de3da25f820b7b2b10f1a38034bb28e5c01ee094fb38cae80e244eeb04b29d0a
-EBUILD openafs-kernel-1.6.22.1.ebuild 3836 BLAKE2B 8dd7a31dcf4750985b848b50c915f2482b82501ff37e28940e695a9a50537ebc81445ce029713e30934a8b9415aea0d9b2647eac7c9a9b59ba3c6db5abb7d04e SHA512 de63b3202d81d2874bb28a6281642ed15cad6e73f707e79344d07335e5b9188e1d8454aaa536060f829c0c55fc230939f165029923d4e60074f1975ca0311a32
-EBUILD openafs-kernel-1.6.22.2.ebuild 3838 BLAKE2B 83a540f625303ae50f68a9f447614cc91e10522c767458c2a58065c13df86a9a4c07f46462e6d3a5507723aa17c63ed6076c29c86d8d4497c7671bff1b19046b SHA512 e1f2c1f5467c75b7ebccbc59938435af23f28e103a1e855a3dc463490e9027b6f3b47d2e387aab66d8edf7cddb0a01d6e71ac0d64957f8520e5892d32c581ec2
+EBUILD openafs-kernel-1.6.22.1.ebuild 3814 BLAKE2B ccf097e031288db5f9f18f3c30cd900b52f2d3e0f63a30f81128f0f10aceaf16e582eb78eb4071fb4962e324f1002527de92588dc306177f43f425b80ec4bf95 SHA512 ad2ecab157f548cdbcab347daf082a91cab283cc6b53b83856bb820a3db1de07b64c98e578817741599c9ac7cacc77dc136306b9cb1035d1c5aeb02ef7202320
+EBUILD openafs-kernel-1.6.22.2.ebuild 3816 BLAKE2B 2ca2e9c6483fa8d3af68f1358913335c25a0a772357c2363364e7ef9ce543f4698739b7d34ce3f11a271855bb83dd26cbe690e0f79d9622de07b28dbfbc5f889 SHA512 235f4a3a480734e5324c2a9f307eaab128efc8e804116bb303e08542f54b225c59bb1dabd9f3a19f91625ac53bc117c8ce61b9f2f40092424c92dbc3153d49d5
 MISC metadata.xml 325 BLAKE2B d173efd11e6fdc79eafa352e60e091bf539ceda665d052395047f255cb7682a72c7b839b6e3db6005e23ad38fa5cb008228f8971ef0622d801bb41f248c52c31 SHA512 60554e65e28506ae082618d223c5b00615f26c849f799a3077294430a1e23f9e5cc4d69aa115dcbf247d5805dfaaa06e3533e576434abe13426022f6776d9947
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.22.1.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.22.1.ebuild
index 4dd3b12d469d..74f487bd980b 100644
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.22.1.ebuild
+++ b/net-fs/openafs-kernel/openafs-kernel-1.6.22.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="IBM BSD openafs-krb5-a APSL-2"
 SLOT="0"
-KEYWORDS="amd64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 S=${WORKDIR}/${MY_P}
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.22.2.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.22.2.ebuild
index 772d026fd5e4..d93cbb0b44f9 100644
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.22.2.ebuild
+++ b/net-fs/openafs-kernel/openafs-kernel-1.6.22.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="IBM BSD openafs-krb5-a APSL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 S=${WORKDIR}/${MY_P}
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index 49ab51539a29..f550892cb84d 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -6,7 +6,7 @@ DIST openafs-1.8.2-doc.tar.bz2 3801937 BLAKE2B 321af6f0b97cfe195b18a7fb552089811
 DIST openafs-1.8.2-src.tar.bz2 15109003 BLAKE2B 13a786bcc2053d70a161e32911eef9c774492b28f93d33747f51fd55e4374d1dba52c83733d6cce8fdb4496a222800acaf4f95d8e7b4790259476c29486fd601 SHA512 8115098fc60e12f63e9177a7487c08bf60ac738ceaa84644e4c57345928f2764a9e06653f235456e8667a779bbce7647521574751d1bd6b64827b12f63f91b92
 DIST openafs-patches-20170822.tar.xz 11036 BLAKE2B e53d9e01c5808ca9876fd22f729e0e82cb0f6bc7c1f4875ad0607ac9d547e216c61cc2c3506eaafb7c81318958cd038c177e9e5b2c3728997d7f44e13bbbded4 SHA512 f4b574287bfe54881a70f3ccd4d4901b2f8f9ecbec7b3a4975b59050d5ef27c6de3da25f820b7b2b10f1a38034bb28e5c01ee094fb38cae80e244eeb04b29d0a
 DIST openafs-patches-20190106.tar.xz 29712 BLAKE2B 6377ffc6afa147f47e57e94c7c18c17c42f70c3c8d578ca7e53a4577918be0e6e6d3fbe427c5c460df8a5abb3e4f707beb27fda5e919b95285c4ce02484cd89d SHA512 bc35e422ffb3b231a3ba80f5408ebbec7b1220b8be56bf4a84024a2554060ca1c0e2ea97af989bcafade3629d40520df3d69f58a90f526f0d60523f8d3f96d16
-EBUILD openafs-1.6.22.1.ebuild 6990 BLAKE2B f2b7e8b03a47a4d274f6ff1cd1e10af59dbbe6c861d5a00d0871aa862de50625db3fd9f83ce960984b09e90b90e6097e5fcd1a86289758b464163ce349a69c5b SHA512 6cd10c62c10d28fc3af24e1e3adcccf75b2f36becff5228eb8d0cc3e1a99bdc621388be93be302ec86144bfc1236b8c7d711ad6d1bcd20a39531bb140d1c5773
-EBUILD openafs-1.6.22.2.ebuild 6992 BLAKE2B 2a4bb61cc25cf8c653c2a3ffc36062d484dc196fced583d3c3034c019c71ff1500503f9e8f0318e7bbe85616493b2264d1fee03f03c4248557f9d6709b10198e SHA512 6176e3c4b47b5b52f262a6d87e98987d0e17b90874f806bbe3743c89665c3f085fd5e2c8b90cf61ed8f623e6224d5c2c99e40fd1f26f7915556ac5e04430d4e2
-EBUILD openafs-1.8.2-r1.ebuild 10904 BLAKE2B 7fc3b1127a17447158558fdab55cc6066e48771616a3da5ae3556abe6da5f0597ea4d320722793f278479e431e6432c723aec7d626d35b9f6c1c05ccf7454566 SHA512 f88e2244e28910a4712c486ed4c49bce1e5d935b385c3373d472a516fd52873a30edb8debd1c0fbfcb723cb5fd0de1a6804d32cf47089481b16eed1c6cae0530
+EBUILD openafs-1.6.22.1.ebuild 6969 BLAKE2B 38d0afcf387995157317252cfad1ea5d831e89779c02a2635b600be0f0dc279357cc989b6982d5fab3b3e51acb7cf5d86eb97d0c07b9d5340e843861ecede6ee SHA512 96acce6ba9b8d4847ddaaaf459516f1b159bc27b9f9faa3c00909926d9a8aad3158864a2ccc74f83357419d31ccd8a94df994dd7f65f54e4513f532c47e02869
+EBUILD openafs-1.6.22.2.ebuild 6971 BLAKE2B 2cb82e548ec3c46082c4ebb2aa6c85387e0c8d6914fa772b23e02a94d94ac4cf41ff74749a6e94de235e980630991b629ed0b72639eb7e8e76501146fbc154b1 SHA512 eab046105a4744c1a3b21b29e436f028138333a182ee1d759e9d351fcd23fe9d218c21161131f4f381448a1f2c477cfec992efffa451e9178e00b856ae8a0d1e
+EBUILD openafs-1.8.2-r1.ebuild 10883 BLAKE2B 91c3157dd4a1cb1787854d7f68720b232dec9d61b5708edcda2214f30f34723f2a146725b19dd97a46e5f29ada6f3fabaa0620902f9484cc278aab124da91c9e SHA512 eeedb707a13d22b9966de705787c2498d08b444c161ba71f7bc2f09bf269beb64295883bf0d20c080a9281831e9f2d5c738ecd727b44b8e97e84c0a8099a3480
 MISC metadata.xml 1430 BLAKE2B cb3538d4816c5ebae039e2aba5bf3b2acf21a499c8f18f504862922507830f6534d6c0e0434052c62ae1e34676479ac8dd794a3e8f82504328589c8e86bd7455 SHA512 f57967dcc50858e63db43af63128b4a6d5a6db78019178a5a44a0a9ef770de4d274f26ad00f7e5abebfa900795cdfecd6a9019202419a426606ea1419eb4d948
diff --git a/net-fs/openafs/openafs-1.6.22.1.ebuild b/net-fs/openafs/openafs-1.6.22.1.ebuild
index c8d779968717..79daf3d59cf1 100644
--- a/net-fs/openafs/openafs-1.6.22.1.ebuild
+++ b/net-fs/openafs/openafs-1.6.22.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="IBM BSD openafs-krb5-a APSL-2"
 SLOT="0"
-KEYWORDS="amd64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 IUSE="bitmap-later debug doc fuse kerberos +modules ncurses pam pthreaded-ubik +supergroups"
 
@@ -30,7 +30,7 @@ CDEPEND="
 	fuse? ( sys-fs/fuse:0= )
 	kerberos? ( virtual/krb5 )
 	ncurses? ( sys-libs/ncurses:0= )
-	pam? ( virtual/pam )"
+	pam? ( sys-libs/pam )"
 
 DEPEND="${CDEPEND}
 	virtual/yacc
diff --git a/net-fs/openafs/openafs-1.6.22.2.ebuild b/net-fs/openafs/openafs-1.6.22.2.ebuild
index d1b9080afba6..394f4fe77717 100644
--- a/net-fs/openafs/openafs-1.6.22.2.ebuild
+++ b/net-fs/openafs/openafs-1.6.22.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="IBM BSD openafs-krb5-a APSL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="bitmap-later debug doc fuse kerberos +modules ncurses pam pthreaded-ubik +supergroups"
 
@@ -30,7 +30,7 @@ CDEPEND="
 	fuse? ( sys-fs/fuse:0= )
 	kerberos? ( virtual/krb5 )
 	ncurses? ( sys-libs/ncurses:0= )
-	pam? ( virtual/pam )"
+	pam? ( sys-libs/pam )"
 
 DEPEND="${CDEPEND}
 	virtual/yacc
diff --git a/net-fs/openafs/openafs-1.8.2-r1.ebuild b/net-fs/openafs/openafs-1.8.2-r1.ebuild
index 581e282d0b7e..df932a1492e9 100644
--- a/net-fs/openafs/openafs-1.8.2-r1.ebuild
+++ b/net-fs/openafs/openafs-1.8.2-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="IBM BSD openafs-krb5-a APSL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 IUSE="api bitmap-later debug doc fuse kauth kerberos +modules +namei
 ncurses perl +pthreaded-ubik +supergroups tsm ubik-read-while-write"
@@ -53,7 +53,7 @@ DEPEND="
 		app-text/docbook-xml-dtd:4.3
 	)
 	fuse? ( sys-fs/fuse:0= )
-	kauth? ( virtual/pam )
+	kauth? ( sys-libs/pam )
 	kerberos? ( virtual/krb5 )
 	ncurses? ( sys-libs/ncurses:0= )"
 RDEPEND="${DEPEND}"
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 58d2e27b37be..5d9658e589d9 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -26,15 +26,15 @@ DIST samba-4.8.12.tar.gz 17764832 BLAKE2B d2c0c8b9090da7c94b9343fd3f416e9aafad64
 DIST samba-4.8.6.tar.gz 17723841 BLAKE2B 38da52e14b4417f26462eef2226c4498e54d2c276b4056e8c6d6c66079f33bcda24c1eab30b29bc7413280ec89a74a55e043e8274ac50f9a25bae7563717ff34 SHA512 f6afab5ca466bd8653a56c205b71ce94ecf0ad0c6e4c9d64cbba7b1e56f1987bc2022e6b629d87eb6078e3f6ba53833c19cfb41e40b6d589e4317ea9d85de273
 DIST samba-4.9.11.tar.gz 18095745 BLAKE2B d06a15608f71e73e26dbb15ddfb3512a0cd6f6ce5cffe663451cdf1552473c28cc5a66fc5e28d0e3fbfc80be8524903bd42d75050b664e713efdb09855175bdf SHA512 3d1cd7e3f1ffbfa6bb44fe0cb12be47dd17c9b614b6509ecec20210ac734fa1ab90ea5d2d2180fe7c80bd4eb5bb9a73a09183edf70bdd28dde2d33e092c9e71a
 DIST samba-4.9.13.tar.gz 18109481 BLAKE2B 948ef6b0e1a9796c70635119f5aea5887e9f1c1d2a5264d072f3f3d218dfae3b6a16c640233063c9df0670dc7835a92a8c97447f57518aa9d387bc5d04831675 SHA512 ce80486c9ab093d44ee68b0e2ab28f9af97c7ed00cca1b8a0c65de18254ae40759a1e9fcb9a0ba18006aa296c6a6fbadf53dcd730785a96ac0c167efdbe9d3ae
-EBUILD samba-4.10.2.ebuild 9070 BLAKE2B 80a704b0a82cbe4a720cfb8418da6c5b6245f54da0689ff704ec579f38a05894d7a5474977b2802432670a9424c4efa8fff3f234782a551d54b5ac247db8075c SHA512 ea1422a0eb843444d7ab232d85fd1e5be1022aaf2ff785ee67edbe65516acc7d6d40ecff4a767de2f18290c8f91710c90aba19c2a19b91c32c98be61fe57a3a7
-EBUILD samba-4.10.6.ebuild 9266 BLAKE2B 206634d5aca6854b6e94d05fb86d02e7313f9261c4adfa41f5ffecb68e109d90fcc379d2aa96bdf493877bde09a2da55b4753183808cdc0b68601a461c44cf22 SHA512 6fd185aa69cc59031aeda035563e00a84392a8a73a70cbf499aa3e4e5ad76ec857ff06356a74de061e76a37dbdaf3b7e39674316880eafd616fc36c3bf62e59e
-EBUILD samba-4.10.7.ebuild 9207 BLAKE2B 27f90b5c7ee787923c220bed8617a9458f13fe231707f22fe614a696a08c45cb983ac1d2d875bd54eea3efd187f2111556ab635c18cf7b427f63c862f0ba68b2 SHA512 654b252dcec8b19ccf741a85a3862e3b3a52b845dd1d4845ec255349e254f5cfe150fef0d9cb940fc1c35798bd07620c58e50e10a15704cd0a73114b18d7c678
-EBUILD samba-4.10.8.ebuild 9207 BLAKE2B 27f90b5c7ee787923c220bed8617a9458f13fe231707f22fe614a696a08c45cb983ac1d2d875bd54eea3efd187f2111556ab635c18cf7b427f63c862f0ba68b2 SHA512 654b252dcec8b19ccf741a85a3862e3b3a52b845dd1d4845ec255349e254f5cfe150fef0d9cb940fc1c35798bd07620c58e50e10a15704cd0a73114b18d7c678
-EBUILD samba-4.11.0_rc3.ebuild 9099 BLAKE2B 9502151e0d54c22eaddc7b0c877b10c83d9acf7fe62a5e926f8ba59273bbd3c8bd59d2556fd69fcbb29bb15470d9a09cb16c98f1848fe8aa94f24655e308f877 SHA512 c7a1bb3e41eb5485c53760e0544eef103ba50781d2a7e028ae4c3c389f8805d1689b5fc1eb62e4b1555200ce665867937f9a9a33ffd97eb65d53dd6734b42a44
-EBUILD samba-4.5.16.ebuild 8166 BLAKE2B 2a0d68ff2848c1dee76d8329cab4f5a0b06bcac989b55a97bac1211f194b4c10736d8fd99eb32779c86406c8aa4c45523af34f43f70eebf928e4ceb787d374e3 SHA512 5a3e1645ec3d05ddf26e66f75cc2f43c86baad8b08e40e137919f0b33d68701cef8460fd3da3d080905af538659b834169e66cc946517ed1c9190dc52ac697d3
-EBUILD samba-4.8.12.ebuild 8901 BLAKE2B f01720de64da1ed13c6f717891919c2ccfad0221d1e0f6a612e620d7de8bcea57fdec4c10bed8e9842c31a412a1681b2e0376e7ac628646d121584de54220944 SHA512 deed37996e47a8889f783898fd0c99c63feb20a4d6b811384b8a964cbc4363c3e63d8c404de4a3bf9cd310cbdfd0f440434cd86d7c7426cb8a4bc6f5c88ea9fb
-EBUILD samba-4.8.6-r2.ebuild 8467 BLAKE2B bb9806f40f062f742e5e82778fdb82e1a9366c2f53fb977be373ca2dd54d3fbf49632c4f424acc12eb73847ce2d944d02fb54951bbbc6a02c11b42a521c05e2d SHA512 71a940ea88b17096512e160236dbebb9d82603c19262e2b955212b4a361d0c0f51466eb1150f501c0e13e2fcce0f29c1f480d1c38fd32bc27ebae0207e40dd79
-EBUILD samba-4.8.6-r3.ebuild 8862 BLAKE2B 23eea9d9f1e1aa4b5812b10a190a6c6d609dc9d7ce48a5052eb0505289aabc7644090e15bc72c7bbc2d79a42707d16fa36c3e41a58cdcec0c292b50d20ec7905 SHA512 d98d4a73c0404912a6946b0b9b793542158d061a72a1979e4e8aa7a8d378c818e29f3049daa07db71f4b3ccd550ce9325b85d5beab3d13204957912ac99cc4e7
-EBUILD samba-4.9.11.ebuild 9060 BLAKE2B 587779d9c3aced71a77202fd5d34eea51db1b506bf15ea9bc6fb35cb5525f09facaedbc52464cf2c4807976d1e7bd41b7de404e1adc4706e623674232a089605 SHA512 ffcf5c86d8fdc19b03abc4840c22060b291368ddbebef0e60a6414c7ab456303e76f2dae3ec38fa359560b89c0303e79cb670283b300f51a898bf50b67761d3d
-EBUILD samba-4.9.13.ebuild 9060 BLAKE2B 587779d9c3aced71a77202fd5d34eea51db1b506bf15ea9bc6fb35cb5525f09facaedbc52464cf2c4807976d1e7bd41b7de404e1adc4706e623674232a089605 SHA512 ffcf5c86d8fdc19b03abc4840c22060b291368ddbebef0e60a6414c7ab456303e76f2dae3ec38fa359560b89c0303e79cb670283b300f51a898bf50b67761d3d
+EBUILD samba-4.10.2.ebuild 9071 BLAKE2B 08a9b252186e759db6da8d29e7401fb7198a98c63fb5cde0e062aae1503e896c8e5bd0d2d356ec304f5f20778c94fdb70b35f139f5de1859ea652ed058cb2794 SHA512 f3ab9f70a8e707d17a801dfba2514e63b874d3f17fbcfd33bea0d44e0c520c705883063d8131ef9e0e08becbf47f28ab86694c93a91ffa6aa0f6677d8a644011
+EBUILD samba-4.10.6.ebuild 9267 BLAKE2B 952cc20955200a1c3dfe9bc0887d57c3f87222b3b59769b83bfc9d3c5f745fac1dc2b575e30e7fc45ffadab305b0e272147b93419a36ddc022a368eacdc917ee SHA512 7ba5814081c375a0d50ee4e1f1e1d9324dcff282619bd3967a99e33699c2aa210d5f389794fa81d40b370cdea1fe2b2407674bcb7bb5d7572cf4ee7d7f6fb826
+EBUILD samba-4.10.7.ebuild 9208 BLAKE2B fb83c351240882f82c9898566172192bef8fa11089e3f01f439286493f079daac5ea07cba77d408988d88ad82afcdeabda7d4ac5483c828e29f0aed55ca58a09 SHA512 06ff8c0ad031543d619aa219c707dc42168d7c67721fd756fbdb6933de64c6044afa9a9dfe26513c6a9e2c64d809f3804204783e47e0d414b1734bb6c83aab13
+EBUILD samba-4.10.8.ebuild 9208 BLAKE2B fb83c351240882f82c9898566172192bef8fa11089e3f01f439286493f079daac5ea07cba77d408988d88ad82afcdeabda7d4ac5483c828e29f0aed55ca58a09 SHA512 06ff8c0ad031543d619aa219c707dc42168d7c67721fd756fbdb6933de64c6044afa9a9dfe26513c6a9e2c64d809f3804204783e47e0d414b1734bb6c83aab13
+EBUILD samba-4.11.0_rc3.ebuild 9100 BLAKE2B 0f1064e88efb7621c6168b9f69a8ab87766f728cf8a00f1bf5bddf24f798db19fd10c0736ca2f5808a75cff851542c4cb3cceda3b6f8072881d2430acd0bae6e SHA512 d8b5a8c2ed7685c828f24d015df93e49ff2ec976a7f1494741400fc09a296c07893d1c70b86397ae1d5a9ef5c11907933355cd45548559ac8ae14e096041a737
+EBUILD samba-4.5.16.ebuild 8164 BLAKE2B 6e7e8fa7f38cf40be97e97ad968f8a75dcce5e0df93cf5990ebe5039f863d9c3459301fb20313a1883ab551ffc79b78c82878449e48179beb4c7b031c33da621 SHA512 66bb74a9175d78cef752932c54e0045adce96983c5b5fabacfe89ea0157c6a7216d19c763a8f350a418c1701e07632cf0c3fad17c16628729a42e757800799ac
+EBUILD samba-4.8.12.ebuild 8902 BLAKE2B 09c5d46c07a8e9ff88bbcd2c18e84ca3121b3d7d16b27bffa1460832555fbb53517714d322bdff42f928330293da4fbd2b7373b531afe914dfd0c5a2eb19da5e SHA512 b9469201e2c4f4e06e73104b80c1804bdc70df197062e0c48f1068ee7f76dcbd7b5bab1cb3a57cd673c1c3f2e60066fca8b2c9315202f526e2691416f76dfc2e
+EBUILD samba-4.8.6-r2.ebuild 8468 BLAKE2B 8050361f0a81ecad604aed38f36032d45dc5a8d276f6285f7477c40bdbb21ca77bba91285d864f63be7a889121ae44502441c5fcc41916e3e8cf44cde768732b SHA512 d6c1e3d82fbf733fb6583eedc69a36cfb984ba94c09da333d26c6f97e39beed7eae7cb8ccaf167c8f0105eab25e4d18dfb51f30d261625b6be9980f418565dd0
+EBUILD samba-4.8.6-r3.ebuild 8863 BLAKE2B 0db9ca3bc3b37e4dd7b59a7c0e29850e2f754dcc67841236e6d8bb1e1d4f3a1e6fb0d2da17bb34462aea6a78e36e2b3805981058390b016c68f8f963724fd634 SHA512 7286bac6d92c573a058ffc3ae33c52b153d9d3ec7abe50ae23c30b4de6f493d7131148fa17eea2e5a59f77a3c585257eaa6c72e2014fa42059930a0a98661982
+EBUILD samba-4.9.11.ebuild 9061 BLAKE2B 0645ef7f7af2f6e6dd41896d79d97dcc0011b676e6986670bec577daef9da2625e87b6484bb6b198d5a3c07458549a207b69c7a92585139c750b92a28152c47e SHA512 9fe44121a7ca24e40d25c6a8a7d5e6f26dc4d824804c2ad5d6e915ac2c98d5b1d1ca4d58f6e973d55a3c578e82ed1ef69e7f96855d8a7a81d0aa53cb5156a97d
+EBUILD samba-4.9.13.ebuild 9061 BLAKE2B 0645ef7f7af2f6e6dd41896d79d97dcc0011b676e6986670bec577daef9da2625e87b6484bb6b198d5a3c07458549a207b69c7a92585139c750b92a28152c47e SHA512 9fe44121a7ca24e40d25c6a8a7d5e6f26dc4d824804c2ad5d6e915ac2c98d5b1d1ca4d58f6e973d55a3c578e82ed1ef69e7f96855d8a7a81d0aa53cb5156a97d
 MISC metadata.xml 1756 BLAKE2B 74fcabbc9a00bd2e2b91d527354edde5e44c36755d81c849c2a81c03590794f1be30a92ad7cade453fdb183754ace37f7ddc2c171eab657689cf34d83e840aed SHA512 65ee3dbcb246c068278ffb6a8eaaa439bea10fa86662504d2aacfb1bcf58a215d915e50c4c6ea6c6e989870f7a9d9974b7a1a33d2a2f0077b9e263a6adf94279
diff --git a/net-fs/samba/samba-4.10.2.ebuild b/net-fs/samba/samba-4.10.2.ebuild
index 636b9efa77a8..fbc43f28c340 100644
--- a/net-fs/samba/samba-4.10.2.ebuild
+++ b/net-fs/samba/samba-4.10.2.ebuild
@@ -59,7 +59,7 @@ CDEPEND="
 	>=sys-libs/tevent-0.9.39[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	acl? ( virtual/acl )
 	addns? (
 		net-dns/bind-tools[gssapi]
diff --git a/net-fs/samba/samba-4.10.6.ebuild b/net-fs/samba/samba-4.10.6.ebuild
index 3d065562f7cc..8c43b37e38cc 100644
--- a/net-fs/samba/samba-4.10.6.ebuild
+++ b/net-fs/samba/samba-4.10.6.ebuild
@@ -60,7 +60,7 @@ CDEPEND="
 	>=sys-libs/tevent-0.9.39[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	acl? ( virtual/acl )
 	addns? (
 		net-dns/bind-tools[gssapi]
diff --git a/net-fs/samba/samba-4.10.7.ebuild b/net-fs/samba/samba-4.10.7.ebuild
index 87c4c3061f9e..6a46ad2a6bd3 100644
--- a/net-fs/samba/samba-4.10.7.ebuild
+++ b/net-fs/samba/samba-4.10.7.ebuild
@@ -60,7 +60,7 @@ CDEPEND="
 	>=sys-libs/tevent-0.9.39[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	acl? ( virtual/acl )
 	addns? (
 		net-dns/bind-tools[gssapi]
diff --git a/net-fs/samba/samba-4.10.8.ebuild b/net-fs/samba/samba-4.10.8.ebuild
index 87c4c3061f9e..6a46ad2a6bd3 100644
--- a/net-fs/samba/samba-4.10.8.ebuild
+++ b/net-fs/samba/samba-4.10.8.ebuild
@@ -60,7 +60,7 @@ CDEPEND="
 	>=sys-libs/tevent-0.9.39[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	acl? ( virtual/acl )
 	addns? (
 		net-dns/bind-tools[gssapi]
diff --git a/net-fs/samba/samba-4.11.0_rc3.ebuild b/net-fs/samba/samba-4.11.0_rc3.ebuild
index 8a6b44acada0..b4b6774a13a8 100644
--- a/net-fs/samba/samba-4.11.0_rc3.ebuild
+++ b/net-fs/samba/samba-4.11.0_rc3.ebuild
@@ -62,7 +62,7 @@ CDEPEND="
 	>=sys-libs/tevent-0.10.0[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	acl? ( virtual/acl )
 	addns? (
 		net-dns/bind-tools[gssapi]
diff --git a/net-fs/samba/samba-4.5.16.ebuild b/net-fs/samba/samba-4.5.16.ebuild
index 3fd2ad28eb1a..8d204366759a 100644
--- a/net-fs/samba/samba-4.5.16.ebuild
+++ b/net-fs/samba/samba-4.5.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -65,7 +65,7 @@ CDEPEND="${PYTHON_DEPS}
 	>=sys-libs/tevent-0.9.31-r1[${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	acl? ( virtual/acl )
 	addns? ( net-dns/bind-tools[gssapi] )
 	cluster? (
diff --git a/net-fs/samba/samba-4.8.12.ebuild b/net-fs/samba/samba-4.8.12.ebuild
index abff5eeec78a..edcf55e37112 100644
--- a/net-fs/samba/samba-4.8.12.ebuild
+++ b/net-fs/samba/samba-4.8.12.ebuild
@@ -60,7 +60,7 @@ CDEPEND="
 	>=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	acl? ( virtual/acl )
 	addns? (
 		net-dns/bind-tools[gssapi]
diff --git a/net-fs/samba/samba-4.8.6-r2.ebuild b/net-fs/samba/samba-4.8.6-r2.ebuild
index 99a93526abd5..b2693d114c1e 100644
--- a/net-fs/samba/samba-4.8.6-r2.ebuild
+++ b/net-fs/samba/samba-4.8.6-r2.ebuild
@@ -59,7 +59,7 @@ CDEPEND="
 	>=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	acl? ( virtual/acl )
 	addns? (
 		net-dns/bind-tools[gssapi]
diff --git a/net-fs/samba/samba-4.8.6-r3.ebuild b/net-fs/samba/samba-4.8.6-r3.ebuild
index c08ebb650770..01089ced9532 100644
--- a/net-fs/samba/samba-4.8.6-r3.ebuild
+++ b/net-fs/samba/samba-4.8.6-r3.ebuild
@@ -59,7 +59,7 @@ CDEPEND="
 	>=sys-libs/tevent-0.9.36[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	acl? ( virtual/acl )
 	addns? (
 		net-dns/bind-tools[gssapi]
diff --git a/net-fs/samba/samba-4.9.11.ebuild b/net-fs/samba/samba-4.9.11.ebuild
index c983eaa51e3e..7483f87913f1 100644
--- a/net-fs/samba/samba-4.9.11.ebuild
+++ b/net-fs/samba/samba-4.9.11.ebuild
@@ -60,7 +60,7 @@ CDEPEND="
 	>=sys-libs/tevent-0.9.37[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	acl? ( virtual/acl )
 	addns? (
 		net-dns/bind-tools[gssapi]
diff --git a/net-fs/samba/samba-4.9.13.ebuild b/net-fs/samba/samba-4.9.13.ebuild
index c983eaa51e3e..7483f87913f1 100644
--- a/net-fs/samba/samba-4.9.13.ebuild
+++ b/net-fs/samba/samba-4.9.13.ebuild
@@ -60,7 +60,7 @@ CDEPEND="
 	>=sys-libs/tevent-0.9.37[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
 	sys-libs/zlib[${MULTILIB_USEDEP}]
 	virtual/libiconv
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	acl? ( virtual/acl )
 	addns? (
 		net-dns/bind-tools[gssapi]
diff --git a/net-fs/smbnetfs/Manifest b/net-fs/smbnetfs/Manifest
index 84dc92823ed6..adb264a75b02 100644
--- a/net-fs/smbnetfs/Manifest
+++ b/net-fs/smbnetfs/Manifest
@@ -1,6 +1,6 @@
+AUX smbnetfs-0.6.1-docdir.patch 432 BLAKE2B e58dd4835d816b6908fb4f0198bf1f6a7a9de8bbedb1736f5137c6ea7ae2f271420c3afceda6b30739403a010c0c917153a82233873cdf8a4b301cdbfc910c8a SHA512 3c75db469adad6d6e69fd7406a17fbd7d60d1ee43371a1f9b4780dbaa51c0e893cd3bcbcd3c96c5c5a81c8616267c4fbc921f04bf2bd14368f47c5c93bfed598
 AUX smbnetfs-0.6.1-use-proper-xattr.patch 609 BLAKE2B b05b18598ea00a6337276a85de485af54c9453427d5b7f4736f551151277caa12c09de9dab8edbfc094a9fa30b25922eed3d152c2b3b61676042f09d83f8eb5c SHA512 ddd31c147bd65bde5ea9f05abc9b08b5630f293e4641d996d2571b99933969b7985da82040098547490e158f283cf04df475a966186f3f29c7239493b0755101
-DIST smbnetfs-0.6.0.tar.bz2 147946 BLAKE2B dc20ba86e8280365eead7cd540370e727e47f9ba54c24ec4f4174c28eafdf373d716f259a6cff129e88ea1c47f4c3aee83cc6cb8009f232af94168e5c3232be0 SHA512 5bc5327b1087d051cbedda40ea1183c2515e3a42b2027812c6528bbbcb736b7f92f95b3c7b9cc53da99c2138c945ceb517042359029cbe0ab8cd887839711ced
 DIST smbnetfs-0.6.1.tar.bz2 171032 BLAKE2B ac263c963318ac01d6acef0247c0cb2149b25d991770be5c717a5d0e8baae1a6df5f9d3bf1019bc2d3fb43c728b89828225047baf4bb82c708ff051957bbcf6a SHA512 b74e979e30075243e859b8b02918b7d379eaf92e61f0fc6d6375864cf12c31c6601719026d96a24e6ac82b572338cfea4b7e0d89fe2d9dc17fd9a1a81e7f7ebd
-EBUILD smbnetfs-0.6.0-r1.ebuild 779 BLAKE2B 2f13c6e91a94e054ae99fdab828dbf01829a214ff8970efe6872c5e14d993727ca37b7ecb2a17f7c104bfc5a92565a35062519ab88eca76945eead6645e81a38 SHA512 46a2557c4c2c3af40f5cc68742cd024040cc0d6728cee205191c83c410a8b3248370f98903271faba214e6766aa6525d217e970dc540d5181428cb4d6a57e526
+EBUILD smbnetfs-0.6.1-r1.ebuild 877 BLAKE2B 3d6f2f99738f9f62e38e644c74f56c095b4313fe4be2657204030b9b6701b95399cbc3ad5e7dbb577ac31749afb0dbd4868653daec8aef081fc7dc3799730a73 SHA512 03be4910bffcdbd0eddc35b25ec5a777a25ecf238f0a3a2a31c52fa458cd79c3f48d87d0aa8d41f3a350a2f7e9a014c15b00dcc84e3eacc83a6f8bde5fec7b56
 EBUILD smbnetfs-0.6.1.ebuild 848 BLAKE2B ce2e0635744099a1b3ab701bdd473ff45c3c38f304dad09a248a88a2a9ece76d640b015454d6bed7994f78a103d38fe53697dba495dfff2f66a50d4d8ace31dc SHA512 2eaf37edd50621d3946cf414161dc9fa04429052cb8727dd0e855ff9a8cd1d14eefd51ba0ca1f03030e36018f6e23bb93f74f23630b25764c1e4852f17df7b6f
-MISC metadata.xml 1261 BLAKE2B c1182020f6216b78ce934bf8a12a08ab2e26b83d153a1425691ca30c71cacb1f4fef4cf558df843c1c94008a88a4bedd4985d3a4bcbb18225272e779fe269ec5 SHA512 aecf5c54f76b710c7c2f098a00ac25a4b1d7488915192f3340a600f6925b4029c711fae2d8c57c6a44ca9908127a94c08f234f18c6247fc97f2bda7ef496ed13
+MISC metadata.xml 1149 BLAKE2B 420bbe890fc54b92ac4a3bb91e45649c775b3a1f7b593e78f3b9afb6e3f765369da3d0460fa10a336b542f94024961bd2c2954cd7ed6517b4671d240ed236c70 SHA512 1984bb9a158582347cd4ec4ab6a0277848db9c5e2c2d59a6f0e63301f3cc0fd86439c9be1eb3dc2bfd18d400712350573010a16b333b9675425ccc5da1e73544
diff --git a/net-fs/smbnetfs/files/smbnetfs-0.6.1-docdir.patch b/net-fs/smbnetfs/files/smbnetfs-0.6.1-docdir.patch
new file mode 100644
index 000000000000..e5e403e31198
--- /dev/null
+++ b/net-fs/smbnetfs/files/smbnetfs-0.6.1-docdir.patch
@@ -0,0 +1,18 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,3 @@
+-docdir = $(datadir)/doc/$(distdir)
+ doc_DATA = \
+ 	conf/smbnetfs.conf \
+ 	doc/ENGLISH.FAQ \
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -296,7 +296,7 @@ build_alias = @build_alias@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-docdir = $(datadir)/doc/$(distdir)
++docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host_alias = @host_alias@
diff --git a/net-fs/smbnetfs/metadata.xml b/net-fs/smbnetfs/metadata.xml
index da1a096c82b2..0b271c50ccec 100644
--- a/net-fs/smbnetfs/metadata.xml
+++ b/net-fs/smbnetfs/metadata.xml
@@ -19,9 +19,6 @@
 		- command "cd mountpoint/username:password@computer_or_ip" allows you to access "computer_or_ip" as user "username" with password "password" (this is insecure, but usefull)
 		- the program is multithreaded, so simultaneous access to a file/share is possible
 	</longdescription>
-	<use>
-		<flag name="gnome">Use the <pkg>gnome-base/gnome-keyring</pkg> for password management.</flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">smbnetfs</remote-id>
 	</upstream>
diff --git a/net-fs/smbnetfs/smbnetfs-0.6.0-r1.ebuild b/net-fs/smbnetfs/smbnetfs-0.6.1-r1.ebuild
index 15ded1593d01..a3eace2ad0c1 100644
--- a/net-fs/smbnetfs/smbnetfs-0.6.0-r1.ebuild
+++ b/net-fs/smbnetfs/smbnetfs-0.6.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils readme.gentoo
+EAPI=7
+inherit readme.gentoo-r1
 
 DESCRIPTION="FUSE filesystem for SMB shares"
 HOMEPAGE="https://sourceforge.net/projects/smbnetfs"
@@ -11,16 +11,21 @@ SRC_URI="mirror://sourceforge/smbnetfs/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="gnome"
+IUSE="gnome-keyring"
 
-RDEPEND=">=sys-fs/fuse-2.3
+RDEPEND=">=sys-fs/fuse-2.3:0=
 	>=net-fs/samba-4.2
 	>=dev-libs/glib-2.30
-	gnome? ( gnome-base/libgnome-keyring )"
+	gnome-keyring? ( app-crypt/libsecret )"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-use-proper-xattr.patch
+	"${FILESDIR}"/${P}-docdir.patch
+)
+
 DISABLE_AUTOFORMATTING=yes
 DOC_CONTENTS="
 For quick usage, exec:
@@ -29,11 +34,12 @@ For quick usage, exec:
 "
 
 src_configure() {
-	econf $(use_with gnome gnome-keyring)
+	econf $(use_with gnome-keyring libsecret)
 }
 
 src_install() {
 	default
+
 	readme.gentoo_create_doc
 	dodoc AUTHORS ChangeLog
 }
diff --git a/net-fs/sshfs/Manifest b/net-fs/sshfs/Manifest
index 5713ad53003c..4e520ab0ef88 100644
--- a/net-fs/sshfs/Manifest
+++ b/net-fs/sshfs/Manifest
@@ -3,8 +3,8 @@ DIST sshfs-2.10.tar.gz 163076 BLAKE2B e443b3bb65c432d8d8e3d6d198e3e41363ff506dbc
 DIST sshfs-3.5.0.tar.xz 47564 BLAKE2B 9a6fb1cb347de2903fb67900253f8b28ecf3dd4c972210d4839d0ed7bbbe2dff1be2d847dbfc1727cdeeef74d4b32856aa6e3041b603dc1e3f865269524ddff7 SHA512 6ba7be4bcad401d99fb864f105a6c8fc8b7c832d5b25f18cba27eee422fe65ee7bda8982466d624792a1fb21528c0cb078a59db48e93da4880a36aad7b506b0c
 DIST sshfs-3.5.1.tar.xz 48424 BLAKE2B 5d80de9e71e6f5c71e9302fde065855e495dfb276583baf335c8ef022fc28b1c5907fe735f15765b460d10e75a84d6d97495da81b1e03cdb69b7a69a31624197 SHA512 bda7aa0a7a69a0ace355ed755f454402ce7bdd0d66456dac8654a3eb76b6fcfd0ddee9cfc5bcd80485880f47262c72bcbaeeadc7db7d652e864fbbbff6728b76
 DIST sshfs-3.5.2.tar.xz 48744 BLAKE2B 4ef287605a1d08729a29998935125f8d71f719e0d7014c999bdf3b242b4663ae8e93dd527108a650f1bd16b59175b7e2db2cdcb57a5bd2cdcd24110fc29b6a9c SHA512 52f874196eef2327dfb11c7f6a9771c1837a89a9208e6503dd7bb839e63d65b3f42d61c2d9140c8100041794923c1bea1f6917ff04b3c1d0236071ff4811c272
-EBUILD sshfs-2.10-r1.ebuild 546 BLAKE2B 3b40d830dcf91234d814ec1689dcd509c2c9a2f9ccf9ad76d12cd1166a43784bc034ffa725991f14f844b7aa680fb240ac0a093d1ea76128e2bc45e877ad35b0 SHA512 d5871b0c1ea6a0fda3e2f6427381a49a93ad2af8d82a6e125e9b1a3cf7873a36d0c98bec6a28058baf1e65567c7302ede7b194132401b49c853f67a7b9e2e025
-EBUILD sshfs-3.5.0.ebuild 746 BLAKE2B 97f2744ba67ed8d2fd653aba23de5b5afe046b10a612e247877a1016c7b4acbe9e2af9085323b53d7eb5254c98e7682551ac2a3d09f582fffb8326cbea4fc6cd SHA512 9763f008b46f04068b1a460ede28f0c5ac396e090c1a637a06f46b78192f465456b6fc39bb86a2272b614104a753628fd04f139c2016f344c5bf0a8c7774939a
-EBUILD sshfs-3.5.1.ebuild 697 BLAKE2B 289fb1deb441054f0a2755d61f1055061a9240f28455b23f1a5db6d2e4478d408b73e1a1574e98ee3063917d0b78ef48e8aa6aabc5a7bebd28b96fb620eeb856 SHA512 72d328fea969f90530e19490c3b2226e44faefda633b505cf1fa5b8eef41c5e585ea3dc06d2d9770d8f411ec3230ac8c6db5ab9041aa15af367a3aad13d9fb8d
-EBUILD sshfs-3.5.2.ebuild 697 BLAKE2B 6b16188ea49894b3dccb25658b2048c43bc76f111fbe700dc34bd29e28ea346e6136e5f95041f00a7e7675b858c16d93198d0acadbd1a5bf247f596a83c43f9b SHA512 ee4d8f46a356dc81f7561914ad9ec712ace626f1c58c1de3e005fc00960311a4e0f7f51eaba75bc65a69603ee9a89e8c12f226985d8f0fef52ca7cfe3bfd1194
+EBUILD sshfs-2.10-r1.ebuild 536 BLAKE2B 9144d7f42c4cfed5ce4aad2fa202a0bce9902f7b0fd299de99de75b0505252fa4b90e7b84bbc2c8cb30060c3441cf4f3ea87ad9b7bb96a06c76444f16c298de0 SHA512 f9bad9f8b3e0db932c0c45ee0ce5f363a2585637819e2df3b26427ec6d6fcf527362cd3bb912c582c584852abbbaef2cc39da771a245afdf083ccdfc0abc3724
+EBUILD sshfs-3.5.0.ebuild 736 BLAKE2B 0c996df054eeb7858494dd39ca2fdd9ce6411ebeb09ab1f3de5247a3d891a5b07a949c12c71ac1748c0ecb9f8dd3b84020daa415725269e1274fb6b1ae6222e1 SHA512 536867549cdfad957bb1813683dc0f52d989b2a4c7ba4420d45a679466e5c82b91f3f7ec55edbe6684ca1641a7bd7a4f49b6014231149da8bccf66f3fcd8db7a
+EBUILD sshfs-3.5.1.ebuild 687 BLAKE2B 1e6d6509e69619d5c6edbae12c7095b60047b58e605f066ea57f7ec9b60a2a6d512de505f8b1831763d816f871de3624bc40cd4fff72ac6b88b1dc0d35332db2 SHA512 7e6e087e0339c73b37c33970ce9ba88a97f852f902e1ef4439b00a06fb8ca06ad41085dfc1899470b63de56a3dbdbf7b3427a4368348c0d4efccdadd31d82e75
+EBUILD sshfs-3.5.2.ebuild 687 BLAKE2B 766de9593655c2444350977fcb5622393a79a2a74fac0172fa8e49a11d3f6f85201c33ef1b6acb48f58aabf6417d4e69054702ba6dc50482e5c3b7058522f6ee SHA512 e3fa0b53fa7f4b93ebeff4f0ba2f0cce02dc462c2b07c372c74bb7d41b8b1932ff8d6dedf0a8cc46aff9c1c7671760485ffab134b96def313f1e74e4d560f057
 MISC metadata.xml 334 BLAKE2B efe6b250e6679987941b578fc0dabd47bad1ab687eb08d99bcedabb5064ea87fad7e2fc36657f0cea0ebd42489c92d85bc9c44d65fc6abc1451622584fb4a766 SHA512 17d120fe909408832fcfcae2cc074316fb1c1952f92b8ad1d395ac2b44f99a38cee499116b976b2326cea3778e01c2cd7b31dd82d05a11d97b95585a32071cec
diff --git a/net-fs/sshfs/sshfs-2.10-r1.ebuild b/net-fs/sshfs/sshfs-2.10-r1.ebuild
index d1dcab524e58..c83fec38ceae 100644
--- a/net-fs/sshfs/sshfs-2.10-r1.ebuild
+++ b/net-fs/sshfs/sshfs-2.10-r1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://github.com/libfuse/sshfs"
 SRC_URI="https://github.com/libfuse/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 arm ~arm64 hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 CDEPEND=">=sys-fs/fuse-2.6.0_pre3:0
diff --git a/net-fs/sshfs/sshfs-3.5.0.ebuild b/net-fs/sshfs/sshfs-3.5.0.ebuild
index 042873de9d7b..51bd27551eaf 100644
--- a/net-fs/sshfs/sshfs-3.5.0.ebuild
+++ b/net-fs/sshfs/sshfs-3.5.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/libfuse/sshfs"
 SRC_URI="https://github.com/libfuse/${PN}/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 CDEPEND=">=sys-fs/fuse-3.1.0:3
diff --git a/net-fs/sshfs/sshfs-3.5.1.ebuild b/net-fs/sshfs/sshfs-3.5.1.ebuild
index 0b8e826b0a9a..82799664d23c 100644
--- a/net-fs/sshfs/sshfs-3.5.1.ebuild
+++ b/net-fs/sshfs/sshfs-3.5.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/libfuse/sshfs"
 SRC_URI="https://github.com/libfuse/${PN}/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 CDEPEND=">=sys-fs/fuse-3.1.0:3
diff --git a/net-fs/sshfs/sshfs-3.5.2.ebuild b/net-fs/sshfs/sshfs-3.5.2.ebuild
index eb4c2de8ef82..e6ff7b984dfe 100644
--- a/net-fs/sshfs/sshfs-3.5.2.ebuild
+++ b/net-fs/sshfs/sshfs-3.5.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/libfuse/sshfs"
 SRC_URI="https://github.com/libfuse/${PN}/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 CDEPEND=">=sys-fs/fuse-3.1.0:3