gentoo resync : 18.05.2019

13 files changed, 453 insertions, 66 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 349f23f34350..b18e914ab2b5 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/btfs/Manifest b/net-fs/btfs/Manifest
index 69cfec8b524e..62fafa09f567 100644
--- a/net-fs/btfs/Manifest
+++ b/net-fs/btfs/Manifest
@@ -1,5 +1,7 @@
 DIST btfs-2.17.tar.gz 24231 BLAKE2B 2a66ce18e907f1a905c6d93e12bdf7963561d7dad6861168606e500102afe98de48d9d609af5a9a8955edbfe96b20b26822300aecf2869169a6bbf924c2faf2d SHA512 e4fae52e46581ca382ac4ddd64d80217a9bc0c18cd6317bb4780734c193dcdd9cfed210073b5fd2d8514be2922bb3f0481b13695411e97bb67b7d793f071c3e1
 DIST btfs-2.18.tar.gz 24185 BLAKE2B e9e8ca472b3231db66e859cbe28e6a664255aca456e6a0bdd5dd7d4e093b83d0322709c79d00b4d54d73adfdbf8f6d0487ad4ae69357a2f554ac899095416ac2 SHA512 d29f3816527c1eed105b45da559d025d61c8652144358227ed0ca3e516582cd8186fdcdf730b19fde6e7e9db1477690237444d2efe7c740f81f91032f1a12f86
+DIST btfs-2.19.tar.gz 24217 BLAKE2B 19e298fc4629e8292ed87aa817ed78da75df4c90cf1c437c967288a77355efcfee641d65d0d2732a88a78a40574144d06254f2fc4b04be6d0980f683d42552f9 SHA512 e890b25605808dbf09f70d4ad8703a4beafb098af39a872a6b98f6959eb30e1ba9be8ae420be0797ba8f2774b487f2434252e93eac599094a824ba411441fdd6
 EBUILD btfs-2.17.ebuild 841 BLAKE2B 7d33cd45288feeefeeda218e6484486e3a3833f96eb5e7261d74a3fa50bac62e6f6aa47e64a0e3b6cdd42321a52fb486c41bda4a2d68fcfb62d2d37ba3de9bb8 SHA512 c971d7bacd7f07d8d3af384bd0b959fd8ef837818beae76700dbe93d34077ab33a7ac8b04447fec75c0f71b33c211a82cedbf09d626ae375f8dc7a9fefcc2bd7
 EBUILD btfs-2.18.ebuild 841 BLAKE2B 7d33cd45288feeefeeda218e6484486e3a3833f96eb5e7261d74a3fa50bac62e6f6aa47e64a0e3b6cdd42321a52fb486c41bda4a2d68fcfb62d2d37ba3de9bb8 SHA512 c971d7bacd7f07d8d3af384bd0b959fd8ef837818beae76700dbe93d34077ab33a7ac8b04447fec75c0f71b33c211a82cedbf09d626ae375f8dc7a9fefcc2bd7
+EBUILD btfs-2.19.ebuild 845 BLAKE2B 8d5ed2c7fc5ad3465fc6283a99a6208117919fbe7ac9e2b67efdbecd8cadd22def16c2531058450302e8a14de3788a350699db011c7965c34c0c1e7d0499ea24 SHA512 9fdb00253b3e5d4f91a03ce63d4133a5f6c42f517c61abb1122ed33672c22c800cbfab6b157381b775adc989581fcedfd62a0694e08f29e20cda8ff9b5d4c06b
 MISC metadata.xml 322 BLAKE2B 6df2cb0bf659ea90565f14e53c051618f981799da0e56da43b15b8c5edd431ad99fbdf52c5fd9b1c9e25b224cfa65310ff14f989de41a7961184b304a8ceafd2 SHA512 56969b79f7cbbef67ffb5077fec8f1587dfae94a3af7d575d71a89f56c44f27ea0013a307c0ba6f1546d34ab7f0bc086a7c13e265209982a27fea38dd8f1c8b4
diff --git a/net-fs/btfs/btfs-2.19.ebuild b/net-fs/btfs/btfs-2.19.ebuild
new file mode 100644
index 000000000000..c984674ed5dd
--- /dev/null
+++ b/net-fs/btfs/btfs-2.19.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+
+inherit autotools python-r1
+
+DESCRIPTION="a bittorrent filesystem based on FUSE"
+HOMEPAGE="https://github.com/johang/btfs"
+SRC_URI="https://github.com/johang/btfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CDEPEND=">=sys-fs/fuse-2.8.0:0
+	>=net-misc/curl-7.22.0
+	dev-libs/boost:=
+	>=net-libs/libtorrent-rasterbar-0.16.0:="
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	${PYTHON_DEPS}"
+
+src_prepare() {
+	default
+
+	# don't install btplay via make
+	sed -i '/^SUBDIRS =/s/scripts//' Makefile.am || die
+
+	eautoreconf
+}
+
+src_install() {
+	default
+	python_foreach_impl python_doscript scripts/btplay
+}
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index 443c3191288c..b963fc3d2ab3 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -2,6 +2,8 @@ AUX cifs-utils-6.7-heimdal.patch 904 BLAKE2B de816117010e71ced5ad094e8ed3537b672
 AUX cifs-utils-6.7-talloc.patch 857 BLAKE2B 3ffefe40f18db87992bf3a2816bba690251f3dc93f78e998acfebbff450c20072679e4ee7fdb9fe22e835d4a7cf8f3bb43cef887fa54d7a70d6bbbf7dd8ef1b8 SHA512 c1e64736ec7735213a66b9c2514667244e5dd78531c899b7e10ff93acfed8395ad970b9b2dac929d7894feff3cfc0f46c6693df244557dbb9d2f2f8939ccc8f5
 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.ebuild 3006 BLAKE2B da015779271df5eeb6e043c3fc1c8e664444d640fae362a38a3e94489bb6d27825786f642f54eb820b54eca42e74d82a196b375cd8e79bd36e1083be789781fa SHA512 59d26ea7a68cfea6c8cf0ce0954ca58a925098e0809ceb93c7e9e8d5c75ed68c71c671e7d94d7d5d8f0ed9adc67ef49dafdae5bc1903f47cbe43e5c4d56dffd5
 MISC metadata.xml 889 BLAKE2B 45b3f5f6cac2ca247c9d3a73d4f0e2703187e4a4eab2f850ef2f228489e365ac30d67d35187fab993af7611109c0e2a33bf8336e37496a131b641abade642ca7 SHA512 979960233f0941ecbfa1cadd79fae28898cf8f8333225483808cd25b84d0395d9a7dbc84a5912c2dedb38269d62b7d7f4a647b5d12e47b7706368b3640d90c66
diff --git a/net-fs/cifs-utils/cifs-utils-6.9.ebuild b/net-fs/cifs-utils/cifs-utils-6.9.ebuild
new file mode 100644
index 000000000000..c757b0aed04f
--- /dev/null
+++ b/net-fs/cifs-utils/cifs-utils-6.9.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info multilib pam
+
+DESCRIPTION="Tools for Managing Linux CIFS Client Filesystems"
+HOMEPAGE="https://wiki.samba.org/index.php/LinuxCIFS_utils"
+SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
+IUSE="+acl +ads +caps creds pam"
+
+RDEPEND="
+	!net-fs/mount-cifs
+	!<net-fs/samba-3.6_rc1
+	sys-apps/keyutils
+	ads? (
+		sys-libs/talloc
+		virtual/krb5
+	)
+	caps? ( sys-libs/libcap-ng )
+	pam? ( virtual/pam )
+"
+DEPEND="${RDEPEND}"
+PDEPEND="
+	acl? ( >=net-fs/samba-4.0.0_alpha1 )
+"
+
+REQUIRED_USE="acl? ( ads )"
+
+DOCS="doc/linux-cifs-client-guide.odt"
+
+pkg_setup() {
+	linux-info_pkg_setup
+
+	if ! linux_config_exists || ! linux_chkconfig_present CIFS; then
+		ewarn "You must enable CIFS support in your kernel config, "
+		ewarn "to be able to mount samba shares. You can find it at"
+		ewarn
+		ewarn "  File systems"
+		ewarn "	Network File Systems"
+		ewarn "			CIFS support"
+		ewarn
+		ewarn "and recompile your kernel ..."
+	fi
+}
+
+src_prepare() {
+	default
+
+	if has_version app-crypt/heimdal ; then
+		# https://bugs.gentoo.org/612584
+		eapply "${FILESDIR}/${PN}-6.7-heimdal.patch"
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-smbinfo
+		$(use_enable acl cifsacl cifsidmap)
+		$(use_enable ads cifsupcall)
+		$(use_with caps libcap)
+		$(use_enable creds cifscreds)
+		$(use_enable pam)
+		$(use_with pam pamdir $(getpam_mod_dir))
+	)
+	ROOTSBINDIR="${EPREFIX}"/sbin \
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# remove empty directories
+	find "${ED}" -type d -empty -delete || die
+
+	if use acl ; then
+		dodir /etc/cifs-utils
+		dosym ../../usr/$(get_libdir)/cifs-utils/idmapwb.so \
+			/etc/cifs-utils/idmap-plugin
+		dodir /etc/request-key.d
+		echo 'create cifs.idmap * * /usr/sbin/cifs.idmap %k' \
+			> "${ED}/etc/request-key.d/cifs.idmap.conf"
+	fi
+
+	if use ads ; then
+		dodir /etc/request-key.d
+		echo 'create dns_resolver * * /usr/sbin/cifs.upcall %k' \
+			> "${ED}/etc/request-key.d/cifs.upcall.conf"
+		echo 'create cifs.spnego * * /usr/sbin/cifs.upcall %k' \
+			> "${ED}/etc/request-key.d/cifs.spnego.conf"
+	fi
+}
+
+pkg_postinst() {
+	# Inform about set-user-ID bit of mount.cifs
+	ewarn "setuid use flag was dropped due to multiple security implications"
+	ewarn "such as CVE-2009-2948, CVE-2011-3585 and CVE-2012-1586"
+	ewarn "You are free to set setuid flags by yourself"
+
+	# Inform about upcall usage
+	if use acl ; then
+		einfo "The cifs.idmap utility has been enabled by creating the"
+		einfo "configuration file /etc/request-key.d/cifs.idmap.conf"
+		einfo "This enables you to get and set CIFS acls."
+	fi
+
+	if use ads ; then
+		einfo "The cifs.upcall utility has been enabled by creating the"
+		einfo "configuration file /etc/request-key.d/cifs.upcall.conf"
+		einfo "This enables you to mount DFS shares."
+	fi
+}
diff --git a/net-fs/docker-volume-netshare/Manifest b/net-fs/docker-volume-netshare/Manifest
index 35b8ca5a2d90..a2aaa070a4fc 100644
--- a/net-fs/docker-volume-netshare/Manifest
+++ b/net-fs/docker-volume-netshare/Manifest
@@ -1,29 +1,16 @@
 AUX docker-volume-netshare.confd 75 BLAKE2B 1c8473fc6e00c957b9e435c1c43d8c2d10cd40a9373b18571fc689d5d39bf9a67d6721a238070068ba616891a19df90bb013e9086033928bd058a6dec6ea2f64 SHA512 27d5b4a31807eee134fff6a79ebead41d0d7087379ab49b225ec77af26974c79122eaef95e316b092a1346cbee2f272bf711ad09547a61c47a7c42ae5ac11955
 AUX docker-volume-netshare.initd 410 BLAKE2B 8cc94d2ee1f472c9480b1bd99bda4fdc8bc119aefdb911e228a7a69e7df4303377d718e6b21feff45329cb5495992dfbd8add1cbcd5443dd3e159b522b3cb6de SHA512 1dfabf3abf1e1c61e52ec3178123350cb61e1cda050be0cab3faa5c0cbedb13b9e8969db40c79dcaf4567356d65a103fc5a6a9255caa3e8e379781e08e90cbac
-DIST docker-volume-netshare-0.34.tar.gz 18751 BLAKE2B f3c8e53f29f85bccfa3dc8adce48a527743d6ff79aadc3c17eef192d12b43eddf7036689bc8a28f9a002ff00e4ebed5faf209a360b4c7cb3e1a2d0a2c1407ae2 SHA512 a81e934540b52697845760c1443fb1148fb4a4921def2596c12745efb411726a0a144ce3951319ac98571ca5a5566e208ce4865139589d309514322b1be32198
 DIST docker-volume-netshare-0.35.tar.gz 18874 BLAKE2B 5d165b04014743cf4bf3bcdc7aab4d2d8c71906f21c7c6254b164fd92a935f4d806b7486a18bcba158c830a378237a07c8ef24d4f2704deab221fe5b97ea1ea6 SHA512 b1cc165b11d97d649b2d15cdc97888916ca6824b9a6206668b41e28ece977ec7b2f5e59664a1a618996d63c0645976315e3f7353eca370b4881f3412e9fed521
-DIST github.com-Sirupsen-logrus-85b1699d505667d13f8ac4478c1debbf85d6c5de.tar.gz 27996 BLAKE2B 589dc6351b6ce28c1861358fb67f687bbbc59a5a063ef7519608a8d9798ebd91f874b98a93e96b947dc28088f1d5b302cdb4f03a714e5572be3c3b4b7c68510d SHA512 7bc0a13cd2c63d7ac935a0c1379853c5788830431e39f8285a0b038fa7db510a287606628603fcf97a7ba839779558f1237db1bd0a84860fda98adeb5cdf7f78
 DIST github.com-Sirupsen-logrus-8c0189d9f6bbf301e5d055d34268156b317016af.tar.gz 28679 BLAKE2B 47127a7f53db13bcb4977f21b7faaaccc1aa23b8adb94ce1a97196ffe430f4a3241d72e1c5a4861c7bcf2787e027a907e9fcf8405a98fe37547f5dcba8efaf10 SHA512 2f096d0e55c5debeb50b56905702b2a5b37b2b4dc35f08e303ee4c8c449473b3cd4aa776f23598785c1667b7a64af525c6f0696089b0b9c31214eb3e3a9af192
-DIST github.com-coreos-go-systemd-24036eb3df68550d24a2736c5d013f4e83366866.tar.gz 54967 BLAKE2B 058fe5e9fc1264de2ccb7b569fc85acb449106dc6ce9dd16bc63f9e32aec99650f6aa34da1287330071852549a6426cecef74211559778c33c37f9016385e9c8 SHA512 60b46dc15c01d0415fda5efcff71cfdd43587ddb04d494c532c995a92cc700fb79762dceb29e621966dbb85a008f6f866c6faa36dcf85cc9064a8a919e801546
 DIST github.com-coreos-go-systemd-25fe332a900022d06a189ce01108392854c59df1.tar.gz 59314 BLAKE2B 4538ec89eb7386ac9d978b34c2372ec65ed16f3a4c32abdbd7c8b2e820eecf3fd958aab967e7ad7b06a2798b34e0db812f2bfbc7ee3f7859e5721bfdf0ef6662 SHA512 a7a666f36aa14b2de3026fb1509a39c519864f456992f3b2b82753e239422897e0aaa2646313693e0a0731e78cb58135b7a6d9a435db1a7e178e2f303807daa1
-DIST github.com-coreos-pkg-8dbaa491b063ed47e2474b5363de0c0db91cf9f2.tar.gz 31142 BLAKE2B 92d7b7ecbfa419fc2a7b40a3b20139534c9574bbecc6337c9086a171e4b56075e631cc56dcc574c1e591f066beca8700469134d3437f1733222f0c8253568020 SHA512 5f9602d8ce25190d77443c878e63e6e8d9c3efb29b3aaa32ec2a4adc28d40c2f12a5a6b152cbb4fc729f94a87193bd8c30d40f2c1720e885a84fe002d4eec2a8
-DIST github.com-dickeyxxx-netrc-3acf1b3de25d89c7688c63bb45f6b07f566555ec.tar.gz 5252 BLAKE2B 5db3b07a37732320b30d547b77e5bee40faa94273463197bdac8d0bd97cb598653fac95fb2d8d99158761a1d7fdcb02cf075e8c0d123e25de5f82960f746c755 SHA512 f513f94b180743a3bf447ee79648c067f7908a1877201919794ad7c387fbe8ef4c4513c2def45e24e1d1d7f15c272ecbf3667219071e8aa3922c1fc69aa254e1
 DIST github.com-dickeyxxx-netrc-e1a19c977509b96a5c76996dec63ab5aac67c38c.tar.gz 5936 BLAKE2B f739f764d1bba5d5745280aa7f390f6ddc9cbdcb8d00a0845884624dc1cc1e3e85a916e561c949c28ec8535a4a1ffa5d91e8d3e097c9b80fc521cec98116dc79 SHA512 1a4d29c41c987d5c4d2fbd91b22cc3e0b11b6db6208cb38f2a03d0a91b85450e6895787c0c2e96e7dd67d11f9c742af3a80472517faa4cc49e7165b005b0d5fb
 DIST github.com-docker-go-connections-7beb39f0b969b075d1325fecb092faf27fd357b6.tar.gz 30766 BLAKE2B c0c2b70e16341d95f5a7b99280833c8775c5c25e4b7d646dea8cc750cb12d2fd0105dc17794c74f6f983d2747a96b61ec70a35c7aa2f2b874205b4cf8f9af082 SHA512 dc3f44c94030b3ce1f4a9cac15d7f5c70bca2c8e535ed5581f128e5ce520a47d006d3776bf78c8faa2ac899e202fca272806ee6e8c9d23da76f1e1d964169a14
-DIST github.com-docker-go-connections-e15c02316c12de00874640cd76311849de2aeed5.tar.gz 29737 BLAKE2B 5aaf6ed1b75219d97b2fc95dd4fc1a2b23595cd6948dae338bca9b91d5d3a84056141452f9720e281abce6d67b01e1de413aa2afc25136a5cb5e18376ea4410c SHA512 bae235a7a1798452c4d28564e9531a2ef3d71ac1bfcb5627d7c73d49510d0a000e1844066a757cf99e1d93d88f830afab7086202e7a8fe04b6e008b8bc56dbd7
-DIST github.com-docker-go-plugins-helpers-021fd77358602b2c20fc3a1dfd260fd0dace4f53.tar.gz 22388 BLAKE2B 4a0641d4b3a73e608d58f2566acf824beb1d928c2186c2c89f582d67ac68b559f6c579a4d096c910b7538874974522949054c1540f8c7abd675ca158873c5744 SHA512 20147a6888ef97f4e008a92abeafc735e7672ad469404eb3b27894ae5467473069a4f5f3e8c735372ad3e5a5b7b2e1cfed0c9c38e0851b81194144c0c6bd47ff
 DIST github.com-docker-go-plugins-helpers-61cb8e2334204460162c8bd2417cd43cb71da66f.tar.gz 26117 BLAKE2B 41337898be01f7fe0e8e819163884281eed9a77804241f741b1c833ace8d9f8df211a3238be2b8cd544b50e9d920123ed5aaf70725d77cf3077e11d795081e7c SHA512 44a1661dc3ca5e5262153a62702a4944cfa41d2925f735b79208e78837e9144e32801ded6af80c69a70d0b4eba367c59b2fb3bada18adfb374820a0ac82ba7b5
 DIST github.com-golang-crypto-432090b8f568c018896cd8a0fb0345872bbac6ce.tar.gz 1451209 BLAKE2B bef38d2cd606eaa06ca8fb226ba7ac0f1078df1232428c868fcc1ceaaeba1b781b1152747a6f92a0a40cda67b07fddf091d70fd28abb7b40028884d1a2a8c9f0 SHA512 97ebc686dfdf17d3887485063f2f808c041cbecd78fd8b6285fde2c22c8f0059c1b70eccdc4353b20d55902bc8c199edc53c564368c1ff4aed65ef534dc8b9f3
-DIST github.com-golang-crypto-850760c427c516be930bc91280636328f1a62286.tar.gz 1342197 BLAKE2B f91e5b7fb05b4c8203560ad59fef1475968d68d91191aacf36bcfd823ccd630ba878a5e2f199d35fdc2bb8a49abd5b215bf8de828d72f736b34507be91a2dc0d SHA512 7c37d7b759506fd187646702a1fd6b6bf8a99abc93f96eeaec45d1d912cb40cbf8327fd8d43967a41fb90cc4a29f5271e4be147d85c6b96e4c0da7a0b4311e20
 DIST github.com-golang-net-cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb.tar.gz 936963 BLAKE2B 19f9996d10bd9f5aecd2bba512301519c65acd6d1c11e97617e69c4fe810f3558b05e1a3d546d3ee75c6eda96d310f63906a9217505d16d35438ca8544de4f68 SHA512 48e12282dc20ee3c614a7622ea10d986071976e3c3ea04eae01469d5e50495f9b22ccc70f0dc1ac00a5a8fda86ecb350acc6708d9467fc588a0aafc9e3641f7c
-DIST github.com-golang-net-dfe83d419c9403b40b19d08cdba2afec27b002f7.tar.gz 901402 BLAKE2B 510187393d0049618ab9c310c41518afa73fc206a0a933e17e408b8cf2c38e5f0dab2903f824f601e335d19ed9863e51f419274af182ee744832b6ec5073f815 SHA512 de273a65adece387770bbff75c3b79acaf75f0e26233893d50c251be109fe6db88a715d94b07dfda7d8578515352483ffeefe988a74952a7c93169707ebaeeea
 DIST github.com-golang-sys-37707fdb30a5b38865cfb95e5aab41707daec7fd.tar.gz 796903 BLAKE2B 4e31f27784cdc5781628ac082d7994a5559be59268003366a3185eac6eb514495f6d82ba13c3046f1061c6abc68712ae8d0505ab7567c8e6057b90f3217c272e SHA512 580bd4cfd26d82aa8c6870eabbd289b76f2ba529ed8496428b29e482ec39bc617cdbcd2f2f2d476ee93526bd18550dcd239085b9f74fb4d24ccb87a3b357bff6
 DIST github.com-miekg-dns-5364553f1ee9cddc7ac8b62dce148309c386695b.tar.gz 2517679 BLAKE2B ad17feb9fe826f84d65e6fe85f10cf6cf901bc6cf593d9e44a02edce72e399b0184a29617cb67f38b2fb0278ffa46d872c32f997c3facc2154a23cceec046bdd SHA512 d4f6709e2c20a3d639b167c0d0e7f987cd2e2d849899460ed26cc7e7f4ce682b45eb3be59a4be91e872a9eea29130f72a7de4f3c1006d99449c6f762f993b9bb
-DIST github.com-miekg-dns-e78414ef75607394ad7d917824f07f381df2eafa.tar.gz 176815 BLAKE2B 017ac792774ce823e2953eacf8b8c2f8c3218a50a3095a286dd41a5ca22cf4e1f8a6ef32ee427fc376a1d1df028450c0d049947304964e7936fe8d6cda6eecf1 SHA512 dee878a85620d8db53c147b7ea6903a7e80da556bead1780f15c7d1ced0df0ef29e46a5ac7c1cde726262a99d789bfd7024301e048282ffef74e39734552d392
-DIST github.com-spf13-cobra-b4dbd37a01839e0653eec12aa4bbb2a2ce7b2a37.tar.gz 97045 BLAKE2B 46a40e7d6cfae018b8d8ca6f493478334cca2e314d42cb81fd3696832d4cc1461cac522382dec46fed5241314e377dafe4be49929048be0391ea253c3a5b2b37 SHA512 e612a10cad34c480f0401aaab229e7cba9e52dcca21814d89f900f12547ef2493017f48bb447736d1a9de9948006b296f1e0d9184fa3bf88f4a5ff4251b5afa1
 DIST github.com-spf13-cobra-be77323fc05148ef091e83b3866c0d47c8e74a8b.tar.gz 100452 BLAKE2B 921b681489b620c626ecdc112b20e45cd0a424d6a1088c1b45e4a3339e7645d9a29154c6fcb341af6e3d80750bc8a89aec837d8a3741b9665ab065526e1188b0 SHA512 81edc5080eba62c58766597d3e1e02779eeb1ee578d7d3fd36cd38c725d58e02300960f311cb4cf1713127ef3ccbe16d581399e2bd7e20f2e37fee7a68dcbf15
-DIST github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz 39045 BLAKE2B a933e0ae64f3bb344a7dffdf8f7ed73e4fba329a81794442ac3a8fa8904f29958bcc6b0f2af9848bc6c715b27abc5908d5ff16d23ea790899f71d2f5ff0ce6cb SHA512 c05ef1bc05cba471a55a11a2209fe4bdaaba491434a28b7f08d23528f4074b82a656b62972efdd49384dd49bde429d2d2c0e6ba311cae0d23f55b229b768dae8
 DIST github.com-spf13-pflag-ee5fd03fd6acfd43e44aea0b4135958546ed8e73.tar.gz 41039 BLAKE2B 1dae2f35f0f165c94b3477cf853126cd7c3a9171bbfa639b505936c6ec495a27f99d2c69b34cdf09641959ada6559b5d707cca808069eb4dae20ac4a5443fc89 SHA512 4b5ed5c08f08f347be1832ea5bb8b8ea4ca7b5c5fc8aff2a08dfe667e0c8c0bc1a55ade7ebe83d68746a10af317eec3e8053d2d63a3e24caf437eff7405e719c
-EBUILD docker-volume-netshare-0.34.ebuild 1765 BLAKE2B 90b29e560a4c953a5e5ff48de716f258a10e7f578d6f67c675647e474de5b31aac61b4088a7a91a0d505b910b494c508aa0e9fd6c024adccdf7053707a87daa0 SHA512 407de406ca4c37cdabff43407954d99c91ab3089f2a4edfbd8316b72ce458a08aeeb0c980c9fefe15538f3c1372af673ac276637f1b1282544bebf1a38d834e0
 EBUILD docker-volume-netshare-0.35.ebuild 1782 BLAKE2B 941b9c6b48fd0205305798e46e8ca8acb4f61e753d9f825c810c925b23ab4ded8e0f7c6ee92a63a49fd08697d56d47b41a179f0c1c6bf9b973bbed57658efcc1 SHA512 21506318a5c750081ec20febc2f5a01fbd7d8fff137081a9a822848f3e9a6f5f270d9d07b6265c6454dccd046dc7aac5f52a3a6cbc3f8dac4771350dc52469d2
 MISC metadata.xml 268 BLAKE2B 5d31dcd3b8c1daf54b4d26f99b5a6f105cf1985fc0209135976a5f0a6d1abe23ff3d4b760292a4cdf5445a99a288f7990e02fe7aa3927103da52791d13358433 SHA512 ae6cf611c58c1b63c2479f82810c5daef47708cee934892c06deaf2b435f4db3ba3b829620fca35369f1e9cbdb97293fc48500b00308445dd1813ab811ea3503
diff --git a/net-fs/docker-volume-netshare/docker-volume-netshare-0.34.ebuild b/net-fs/docker-volume-netshare/docker-volume-netshare-0.34.ebuild
deleted file mode 100644
index 3bb8f1d16afa..000000000000
--- a/net-fs/docker-volume-netshare/docker-volume-netshare-0.34.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/ContainX/docker-volume-netshare"
-EGIT_COMMIT="v${PV}"
-
-EGO_VENDOR=( "github.com/Sirupsen/logrus 85b1699d505667d13f8ac4478c1debbf85d6c5de"
-	"github.com/dickeyxxx/netrc 3acf1b3de25d89c7688c63bb45f6b07f566555ec"
-	"github.com/docker/go-plugins-helpers 021fd77358602b2c20fc3a1dfd260fd0dace4f53"
-	"github.com/coreos/go-systemd 24036eb3df68550d24a2736c5d013f4e83366866"
-	"github.com/docker/go-connections e15c02316c12de00874640cd76311849de2aeed5"
-	"github.com/miekg/dns e78414ef75607394ad7d917824f07f381df2eafa"
-	"github.com/spf13/cobra b4dbd37a01839e0653eec12aa4bbb2a2ce7b2a37"
-	"github.com/spf13/pflag e57e3eeb33f795204c1ca35f56c44f83227c6e66"
-	"golang.org/x/net dfe83d419c9403b40b19d08cdba2afec27b002f7 github.com/golang/net"
-	"github.com/coreos/pkg 8dbaa491b063ed47e2474b5363de0c0db91cf9f2"
-	"golang.org/x/crypto 850760c427c516be930bc91280636328f1a62286 github.com/golang/crypto"
-)
-
-inherit golang-vcs-snapshot systemd user
-
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-DESCRIPTION="Docker NFS, AWS EFS, Ceph & Samba/CIFS Volume Plugin"
-HOMEPAGE="https://github.com/ContainX/docker-volume-netshare"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-src_prepare() {
-	default
-	sed -i -e "s/dmaj/ContainX/" -e "s/VERSION string = \"\"/VERSION string =\"${PV}\"/" src/${EGO_PN}/main.go || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	CGO_LDFLAGS="-fno-PIC" GOPATH="${S}" go build || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin ${PN}
-	dodoc README.md
-	popd || die
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index cfc0d91ba8d1..5e15a94a865d 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -4,6 +4,7 @@ AUX nfs-utils-1.2.8-cross-build.patch 1323 BLAKE2B 51ec6b58436725e78fd9000aa1d97
 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.conf 74 BLAKE2B 504c298c1e8e7eb596cd87813f1aeeac5cbc830bb85be9e26ed98f7ed85cdbd14ae2c47b0e111c912398ef28ef629e6de7e585a7b161624e9698ea208750fd9f SHA512 d72c0fbdf12cb1ddf8eaa5885e1ed93a2078c40ca48eb8868836fb72fa456c4865df15273fb7472f70dfe8098167e695b1340ff9a59b55e73b47690baaf977d6
 AUX nfs.confd 930 BLAKE2B 4ef1662b31cffd78b0e96396ad74dc8b8135a9a18956fa1267639d2069893d4f218ded5809497b56d19a192e7e18408e1d1b56bd1535abed8db236bc1a1649cb SHA512 bc11b073735ee86c96b9c249ee187f4d16329c279a4e26760875059d2b5fa1d510ef3e4df5ee9dfb2a3133d755e1eb5c323d2fadc432a0cf630191ec353ac535
@@ -19,5 +20,7 @@ AUX rpc.pipefs.initd 760 BLAKE2B 4c05275e59d7d19d80779964a3631096258704cec2097f1
 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
-EBUILD nfs-utils-2.3.3.ebuild 5494 BLAKE2B a4cbaf68f5fab5a90c5f4a94204c2cb70ba272636f4ad97548b46e07f080552d94e73d721f005fc3897549a6296e8235ea16e5d9d18d0042a0a072c5a2ecf623 SHA512 ab1884745ce12a192c9a8da5ce2a7abbf9cccc9a426124f10cadc82ea37399b30a1b7784099091fc338e37882c307052d7b3a15816118e43c521683aee76b42a
+DIST nfs-utils-2.3.4.tar.bz2 906900 BLAKE2B 968fac7b37c7311bc8d29667c88db925aac0c062ed7ef8c13f9e5c11c3c88960ffaea56c1b6cfb5594a01238f9190e55ab7b837a79a7a804bc55dcca75908eea SHA512 25203b38be6683f25ad6583ac8534873c907124092a768955c1454899e2f467b9dd427b167556eb4f28992b5720da13078eb1eb086da991438454f268e1559a5
+EBUILD nfs-utils-2.3.3.ebuild 5494 BLAKE2B 1da519c6135e9fd70d88bede60e19479dca05e80645a04a4a57ee21be978589d86a6adb3bc1f1881fbaff8839685da6fa1b1e37212a36ced856f60220b6bd5d2 SHA512 39b5e83e3140d203d3b7d411a81d8341ffc55fc1f72d81a4b2ea2be0b2398607fcd7fb3b45ed7dfdc71a4ef13f6c28fa2d3139543fa65553fa8855e943e4d79e
+EBUILD nfs-utils-2.3.4.ebuild 5234 BLAKE2B 0beca63652f9b6bc82afbcd09b1d2a3b1d7c139317a5c41468c2ea0a98f2eb85fe81734cc4243cb6f1cb32fd6167960ca7ad50fe8b5cb07495c78c27a7aa7f5d SHA512 0f6538a18a71a137a277c5c6bf9b525d8ccaa880e85f4c32389d616acd398e12fbb45f11a4c39106cc4ae14f6d711ac3df7a3e3d02527fadc6316951da8ffc67
 MISC metadata.xml 932 BLAKE2B 14cb95a010cdb52373502bdad4de008234494be6e38f6b3fbf6b69e0848a6daa1315ed69b8eaadaad0cd546e84ba0e291b56ebf9db486b7c6e66011147b9a97c SHA512 eb45c97d7ed2bdaa8e43ce0a4fdb2f8a1d197bfd67a8b04f718c6083e7701873e2c22550700049edc25068daacb5278ca2535b63a02a10c1040efe0dbcef76a5
diff --git a/net-fs/nfs-utils/files/nfs-utils-2.3.4-no-werror.patch b/net-fs/nfs-utils/files/nfs-utils-2.3.4-no-werror.patch
new file mode 100644
index 000000000000..7fc0dd1c7249
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-2.3.4-no-werror.patch
@@ -0,0 +1,67 @@
+From 04c9e3cc26dd330d9cb524c02de610c3bccd4b7b Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sat, 11 May 2019 22:51:35 +0200
+Subject: [PATCH] Don't build with -Werror flags
+
+https://bugs.gentoo.org/656984
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure.ac | 34 +---------------------------------
+ 1 file changed, 1 insertion(+), 33 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4d70961..e6e709c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -574,46 +574,14 @@ AC_SUBST(CPPFLAGS_FOR_BUILD)
+ AC_SUBST(LDFLAGS_FOR_BUILD)
+ 
+ my_am_cflags="\
+- -pipe \
+  -Wall \
+  -Wextra \
+  $rpcgen_cflags \
+- -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 \
+  -Wno-cast-function-type \
+  -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)"])
+-- 
+2.21.0
+
diff --git a/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild
index 07216af6e213..b98297ce0b07 100644
--- a/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.3.3.ebuild
@@ -29,6 +29,7 @@ RESTRICT="test" #315573
 # 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
@@ -59,7 +60,6 @@ RDEPEND="${DEPEND_COMMON}
 	)
 "
 DEPEND="${DEPEND_COMMON}
-	dev-libs/libxml2
 	net-libs/rpcsvc-proto
 	virtual/pkgconfig"
 
diff --git a/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild b/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild
new file mode 100644
index 000000000000..dafe5f83ce34
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild
@@ -0,0 +1,190 @@
+# 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
+		if [[ ${REPLACING_VERSIONS} < 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
+	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/sshfs/Manifest b/net-fs/sshfs/Manifest
index 20a61fa0b2d7..5713ad53003c 100644
--- a/net-fs/sshfs/Manifest
+++ b/net-fs/sshfs/Manifest
@@ -2,7 +2,9 @@ AUX sshfs-3.5.0-rst2man.patch 341 BLAKE2B fd58d59ee5a2ee02465ce94896a6cc99892a83
 DIST sshfs-2.10.tar.gz 163076 BLAKE2B e443b3bb65c432d8d8e3d6d198e3e41363ff506dbc19a215b8606317fb02ef3ea370d0f3fbbe01e6f5c49581c74faefbceb9f50ab44bb3791c82e0a633d86655 SHA512 8887eb634edc4c64cf7a0c1a1be4d9ef72d5080eec687d187898dc31bb841ed730850bae8467247a05e56c2b4ef7e9d02fdc0812d48876e145c9826a7406d9ff
 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
 MISC metadata.xml 334 BLAKE2B efe6b250e6679987941b578fc0dabd47bad1ab687eb08d99bcedabb5064ea87fad7e2fc36657f0cea0ebd42489c92d85bc9c44d65fc6abc1451622584fb4a766 SHA512 17d120fe909408832fcfcae2cc074316fb1c1952f92b8ad1d395ac2b44f99a38cee499116b976b2326cea3778e01c2cd7b31dd82d05a11d97b95585a32071cec
diff --git a/net-fs/sshfs/sshfs-3.5.2.ebuild b/net-fs/sshfs/sshfs-3.5.2.ebuild
new file mode 100644
index 000000000000..eb4c2de8ef82
--- /dev/null
+++ b/net-fs/sshfs/sshfs-3.5.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Fuse-filesystem utilizing the sftp service"
+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"
+SLOT="0"
+
+CDEPEND=">=sys-fs/fuse-3.1.0:3
+	>=dev-libs/glib-2.4.2"
+RDEPEND="${CDEPEND}
+	>=net-misc/openssh-4.4"
+DEPEND="${CDEPEND}
+	dev-python/docutils
+	virtual/pkgconfig"
+
+# requires root privs and specific localhost sshd setup
+RESTRICT="test"
+
+DOCS=( AUTHORS ChangeLog.rst README.rst )