gentoo resync : 15.12.2019

32 files changed, 762 insertions, 118 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 3e718f355918..69dfe1b981b7 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/cvmfs/Manifest b/net-fs/cvmfs/Manifest
index 88397cd23555..1ff987f48b95 100644
--- a/net-fs/cvmfs/Manifest
+++ b/net-fs/cvmfs/Manifest
@@ -1,3 +1,3 @@
 DIST cvmfs-2.3.5.tar.gz 37771779 BLAKE2B 06366cc1bdc2e133b65ec6f348507ef0d5f752f69b87632b0b27bb5b29e0546922d5a12e406f733341e9c8b7d32f8bd32878e247d98a168d6985a620607720d3 SHA512 7f2d05776a747c72d0aa8b5270cfb46f7dc31a458deee65a4a21446718ba813e4c449f6424c7419345e6ffb7cefce3d328dea7b414fe5a5980f9b93ccac0157b
-EBUILD cvmfs-2.3.5-r2.ebuild 3595 BLAKE2B 2f147f335a7ea7a2f217947119a391d926b6a9ee03e55d1272758a5b789fc31123ec6946b1055ad8baaae971f159da074faa5d895237d9511ab45c0a88e048f0 SHA512 e656004a46c4d65fb70fd0d542f726c452232c0e42bf6f7a271cbd0f92a6e1c1b46d4a4fbd928ea672b23082b4fa664c7160e799a3c02edaa6e0897e5c32b31b
-MISC metadata.xml 1269 BLAKE2B 7e2ceea18ac7bcb268ffb7ee2b8d1044459eacadb43729f0626a70ec2aa81bf3ddaeb1a96fa8ce56108e2baa0ed406618de59070a1c4766d366bf4338d95f170 SHA512 8b8bc97444b17839eda59f6d15a1bca70eb6a8a90f940e1e8af775c2e1c0f291652d3b47d4ca95ebc4181ac9c913a44ee8151ca391a39ed839dcae55294831a6
+EBUILD cvmfs-2.3.5-r2.ebuild 3622 BLAKE2B 8cebea8aeac19c59d6edbba3cc3822ea398fd021620938e2e3478c9fcfdcd6d47d0c014f24ea62b0ed89b3fc0d026665585fad0bd37ab3a9578634636cff2b0a SHA512 edfcce5ee2e65e7f3ebc750cee0b62d3114ff8065e08a746f5a4feecfe165c9d4aa7efd3ca4f930a6e2dcd087c053211c2cba0c1d1a23350c1f69ce82c7dcb5a
+MISC metadata.xml 1385 BLAKE2B b1766d512ec47f2db5a91d80e7386c5f83fa18e6eb4b263597d7c437a6fc60954c012c1a7192281f3bdf76781b2e614f25c500250d8f09698a5264ed8b848baa SHA512 7c67b9912a6e433a3acd495064b65b0ba793c44d97d4c8a8bd546fb850875301fa1e1d14403b59e99229f016a21e64d0c1b6e6b2a7652b9bb460e2277f663649
diff --git a/net-fs/cvmfs/cvmfs-2.3.5-r2.ebuild b/net-fs/cvmfs/cvmfs-2.3.5-r2.ebuild
index 393df3a15fde..98352290b975 100644
--- a/net-fs/cvmfs/cvmfs-2.3.5-r2.ebuild
+++ b/net-fs/cvmfs/cvmfs-2.3.5-r2.ebuild
@@ -16,6 +16,7 @@ SLOT="0"
 
 KEYWORDS="~amd64 ~x86"
 IUSE="aufs bash-completion debug doc preload server test test-programs"
+RESTRICT="!test? ( test )"
 
 CDEPEND="
 	dev-cpp/gtest
diff --git a/net-fs/cvmfs/metadata.xml b/net-fs/cvmfs/metadata.xml
index 987bd831fc9e..e05f7bafa0ae 100644
--- a/net-fs/cvmfs/metadata.xml
+++ b/net-fs/cvmfs/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
+    <email>amadio@gentoo.org</email>
+    <name>Guilherme Amadio</name>
+  </maintainer>
+  <maintainer type="person">
     <email>zlogene@gentoo.org</email>
     <name>Mikle Kolyada</name>
   </maintainer>
diff --git a/net-fs/ncpfs/Manifest b/net-fs/ncpfs/Manifest
index 15fe82383717..0261c6b8da54 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 2602 BLAKE2B fef73dbdac5f1742dfad592baba72b400a01b0fc4eb772b73caea4f45e15aeecb135ecf7b1da43f727878412b5df22e09234b45394bf0054757f225f93e6c2b6 SHA512 c075329795ab8da5e059b1eef5412f984a86402bbabf8a54df67841952117a44b86999d001989f5badffa36ac4103966c968e7f583b3fb76e8b5560a7dfb4b39
+EBUILD ncpfs-2.2.6-r3.ebuild 2588 BLAKE2B 27eff05fc13f2b7329d77d6ce0f9545a67122f880357103cd72a6ca39a44784c014c9540b9d57b7d6e512c77d9cdecf3280ae8179f23260a88daa16cb3769c50 SHA512 1545b64928579e16016bfb2300e90611ce64d3f0d481351448fb3690f96fdf08cc04a06004d37700ca576d599388df5d7213e464e495b2ccbb4139f382cd18c2
 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 aeda73ee956a..3cababd6aa33 100644
--- a/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild
+++ b/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild
@@ -77,8 +77,8 @@ src_install() {
 	#ln -s "${D}"/usr/lib64/libncp.so.2.3 "${D}"/libncp.so.2.3.0
 
 	# Install the main programs, then the headers.
-	emake DESTDIR="${D}" install || die
-	emake DESTDIR="${D}" install-dev || die
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install-dev
 
 	# Install a startup script in /etc/init.d and a conf file in /etc/conf.d
 	newconfd "${FILESDIR}"/ipx.confd ipx
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 83afa8aa49b8..29ad68bbf55e 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -5,6 +5,9 @@ AUX nfs-utils-2.3.4-no-werror.patch 1832 BLAKE2B 6e0f3da6a355c3b828bbaae3135c3a6
 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-2.4.1-statx.patch 976 BLAKE2B 22441e3a872603978ea6d397554de76be60addf04e115cc85b0899ed471446759010bcd30e77656082be9553cdb4454e0e384140034b87af1240f810a6f7a94c SHA512 8528282344a036ce8de2173cf370141d9dac93eae4616e39748dd07bb20592464479b53ac89e02159d65f1f7c2290410122c27e9f878bee07e950ac5f4b8d423
+AUX nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch 2808 BLAKE2B 921a0e8e16d0490fb2217d8d2014770a59ff737e989bcc1424a540358b6af5e954d5c8cdf7b6096f128fc86c96a909ee68878a89b803819f57c3b6908443b7e2 SHA512 9150b778701a47bb86a98b6c1b2251d60f135794a212a9b03cb3b0f7830cb62ee466cce5f85dbee008aa476eac71e54bb3b0fca677d9dd5a31b09256d4892f48
+AUX nfs-utils-2.4.2-mountd-Add-check-for-struct-file_handle.patch 1745 BLAKE2B f86feba7e005dc6766b66a15018c5b1e7c2bf192fcf41a4be6feef6ebfd56ee290b6a7fcb789ad32499ef2cb61343d84e9f248a031e949fe2a1288a059f81e47 SHA512 087c5923cb09616846629671721763d3600dd2c55b0f70fb0a7a9f60da884ed448dc1b338a0cf6245845053a8138b99132605a9abd0e90e3be9719ce37d7a0b3
+AUX nfs-utils-2.4.2-mountd-Fix-compilation-for--disable-uuid.patch 1031 BLAKE2B eabcf55eada5f7dcc16a576cc49a1ed163d482906d1e0cbd6d42d18512374215455050bec38ce0e29c5b6516bed4113a476aeceea2f6ba229b8254e62905bdc3 SHA512 bf130ed8cce32849bd45957b5f4077e58fe6d98111f90746d628401b804bc9f13623aaca329967210a76e91ead254f3755906de313ad200f76bd52b835d79809
 AUX nfs-utils-2.4.2-no-werror.patch 1866 BLAKE2B 6307f2dad086ea39b851085479a3503fd205946ee27ea693af996b2ff5cbbd642822afa18eba6598267914e0667f80cc84df64ad69689e2706d1121abace2f68 SHA512 861956a04ef5bcac9d9eb18e93e5257b0c35598a527f5b20e305ce6993532bc905e66610300b6c098433a81ee3eb08312b307f5cd276c530dcb4071429c0ffcc
 AUX nfs.confd 930 BLAKE2B 4ef1662b31cffd78b0e96396ad74dc8b8135a9a18956fa1267639d2069893d4f218ded5809497b56d19a192e7e18408e1d1b56bd1535abed8db236bc1a1649cb SHA512 bc11b073735ee86c96b9c249ee187f4d16329c279a4e26760875059d2b5fa1d510ef3e4df5ee9dfb2a3133d755e1eb5c323d2fadc432a0cf630191ec353ac535
 AUX nfs.initd 4013 BLAKE2B 3ccbafc56cb1aaf7b091ca5e895e71516a899177dbf5b74d3b8ecd7cb369ed2a3108cef8f76f6abc72272fbc1c692bc50a219025a9abc05d2ffb0e9caf2309d9 SHA512 2bfd641d1ff3b377aef81632ceba75e1e9aa0305d776ac8ca03217f253040ea3e6349d6d2d1815b91c5f6c90d076d6cb86294e41ecd19f31c288219620703ecc
@@ -16,8 +19,10 @@ 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.4.tar.bz2 906900 BLAKE2B 968fac7b37c7311bc8d29667c88db925aac0c062ed7ef8c13f9e5c11c3c88960ffaea56c1b6cfb5594a01238f9190e55ab7b837a79a7a804bc55dcca75908eea SHA512 25203b38be6683f25ad6583ac8534873c907124092a768955c1454899e2f467b9dd427b167556eb4f28992b5720da13078eb1eb086da991438454f268e1559a5
 DIST nfs-utils-2.4.1.tar.bz2 910791 BLAKE2B 4419eff7fca21747e0bc4969ebb8a8b863aa951984af8f23f197e7dfc4faad3770173808862b84178714ca75f021be1af96f9e4408fecd7ef97999d261f2f21b SHA512 655a115955f35177b761f821e29c752693d614f4c6c2a90d392e0ab83b615247a397cf18e8ad453a93c6dc528d1fa90cfdf8b04de6626e0f4083b10e2e54f540
 DIST nfs-utils-2.4.2.tar.bz2 918576 BLAKE2B a1dba3ae2e58794509ea7907d80e40fc49a0c5e72019222ba16daa74aa757cab5e6fde9ed066f6b5f379b40dbd61622a05fcafc298a79231e417ab2086127278 SHA512 f9724ff2ac185e6c29afd577b33da38b1d11803af1ccb905cd615afa3383c6ac7a3fa4e0f43ea8d062e9aedcdbae90adc9b55ae9d0abe4731f69aa3a6f8d2534
-EBUILD nfs-utils-2.4.1-r3.ebuild 6001 BLAKE2B 2cc1e77beb725f3d78b80d881865eb11ca50db5d1f9fe3e1d09236e355d0d2c65b661ea294f54a8310976439fc543fce83555afcc26844a9a09492335f681ad2 SHA512 a81ac62e01ddf000515f48bca196896cd56acec1fd447d912a659b825489b196e54b86b46606c1411f0eae4d740ce55fa95583b9b56c7d76b232c20eef889d22
-EBUILD nfs-utils-2.4.2.ebuild 5876 BLAKE2B 4c5fad2645a665852a93625397699a18e34f643a11e66048074a5b969f9ed75d5344f19d3f1780edfcc975a6718688cd2fa51f8f8d8374cb1379e0a4628ddb79 SHA512 00d04c4416287c9ea3c8940b843ed2bbd36791dce425641e7fe82fdc4bcc4936873d13252ede34a7b4b6f23bdb49a696d946e0a1fdee4a20658c4492ad2f1596
+EBUILD nfs-utils-2.3.4.ebuild 5269 BLAKE2B 5c940049177cd424d61b426d94edf488643ddad19e95de2245e5e8c581f9f0dce78bf55a73e6ead084ad0f293e7a5e6ea564078702bb5b72a104334fc5810fd1 SHA512 2856242c30e23c07ed63b1e2108d83acd5e322e4e3dc32ca93a52b444912a183e1c3a2d8dc34ea5b698b5cf4986392d005477456fd16dcfddc9b1757ab06484e
+EBUILD nfs-utils-2.4.1-r4.ebuild 6211 BLAKE2B 8164f3fafd11a4b42ab99e9e19e65e2490bad1370b2c1a19de323d51d0f624d61ba9a112ebb9018ebe89adbad46bc25a56c3e0ced2adab6caf4315dfd62073c5 SHA512 b1fec1ea6330e1142761fb6f0c4aabe3adfa661876c31a680e23d38e1c2ae42fed8806bfd20f5f41f65209bc7ad4e926816020f9f2bdd03329d6057a33f785f2
+EBUILD nfs-utils-2.4.2-r1.ebuild 6065 BLAKE2B 45f0c136d6ab0bc8ff79d2f7f7906c94288d0431a6189c0855970911341704921b96ec90d661c94aa6499e99d65fcb2105fab37ad47671f41ac7594ecbf06b40 SHA512 3e86d8a0083cd691ad91ed598290516ff93b2a2de2d5d654313b154d79e8db800f76fea20d2d18d4b35e64dfff1b71c15c76445620a69dd519bb09805125fcc0
 MISC metadata.xml 932 BLAKE2B 14cb95a010cdb52373502bdad4de008234494be6e38f6b3fbf6b69e0848a6daa1315ed69b8eaadaad0cd546e84ba0e291b56ebf9db486b7c6e66011147b9a97c SHA512 eb45c97d7ed2bdaa8e43ce0a4fdb2f8a1d197bfd67a8b04f718c6083e7701873e2c22550700049edc25068daacb5278ca2535b63a02a10c1040efe0dbcef76a5
diff --git a/net-fs/nfs-utils/files/nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch b/net-fs/nfs-utils/files/nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch
new file mode 100644
index 000000000000..e64e2c6da385
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-2.4.2-Ensure-consistent-struct-stat.patch
@@ -0,0 +1,115 @@
+From 1378280398ef9f5cd45f5542ae2945b9a360b132 Mon Sep 17 00:00:00 2001
+From: Doug Nazar <nazard@nazar.ca>
+Date: Sun, 17 Nov 2019 14:31:33 -0500
+Subject: [PATCH] Ensure consistent struct stat definition
+
+Although 2fbc62e2a13fc ("Fix include order between config.h and stat.h")
+reorganized those files that were already including config.h, not all
+files were including config.h.
+
+Fixes at least stack smashing crashes in mountd on 32-bit systems.
+
+Signed-off-by: Doug Nazar <nazard@nazar.ca>
+Signed-off-by: Steve Dickson <steved@redhat.com>
+---
+ support/junction/junction.c | 4 ++++
+ support/misc/file.c         | 4 ++++
+ support/misc/mountpoint.c   | 4 ++++
+ support/nfs/cacheio.c       | 4 ++++
+ utils/mount/fstab.c         | 4 ++++
+ utils/nfsdcld/legacy.c      | 4 ++++
+ 6 files changed, 24 insertions(+)
+
+diff --git a/support/junction/junction.c b/support/junction/junction.c
+index ab6caa6..41cce26 100644
+--- a/support/junction/junction.c
++++ b/support/junction/junction.c
+@@ -23,6 +23,10 @@
+  *	http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
+diff --git a/support/misc/file.c b/support/misc/file.c
+index e7c3819..06f6bb2 100644
+--- a/support/misc/file.c
++++ b/support/misc/file.c
+@@ -18,6 +18,10 @@
+  * along with nfs-utils.  If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
+ #include <sys/stat.h>
+ 
+ #include <string.h>
+diff --git a/support/misc/mountpoint.c b/support/misc/mountpoint.c
+index c6217f2..14d6731 100644
+--- a/support/misc/mountpoint.c
++++ b/support/misc/mountpoint.c
+@@ -3,6 +3,10 @@
+  * check if a given path is a mountpoint 
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
+ #include <string.h>
+ #include "xcommon.h"
+ #include <sys/stat.h>
+diff --git a/support/nfs/cacheio.c b/support/nfs/cacheio.c
+index 9dc4cf1..7c4cf37 100644
+--- a/support/nfs/cacheio.c
++++ b/support/nfs/cacheio.c
+@@ -15,6 +15,10 @@
+  *
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
+ #include <nfslib.h>
+ #include <stdio.h>
+ #include <stdio_ext.h>
+diff --git a/utils/mount/fstab.c b/utils/mount/fstab.c
+index eedbdda..8b0aaf1 100644
+--- a/utils/mount/fstab.c
++++ b/utils/mount/fstab.c
+@@ -7,6 +7,10 @@
+  * - Moved code to nfs-utils/support/nfs from util-linux/mount.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
+ #include <errno.h>
+ #include <stdio.h>
+ #include <fcntl.h>
+diff --git a/utils/nfsdcld/legacy.c b/utils/nfsdcld/legacy.c
+index 07f477a..3c6bea6 100644
+--- a/utils/nfsdcld/legacy.c
++++ b/utils/nfsdcld/legacy.c
+@@ -15,6 +15,10 @@
+  * Boston, MA 02110-1301, USA.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
+ #include <stdio.h>
+ #include <dirent.h>
+ #include <string.h>
+-- 
+1.8.3.1
+
diff --git a/net-fs/nfs-utils/files/nfs-utils-2.4.2-mountd-Add-check-for-struct-file_handle.patch b/net-fs/nfs-utils/files/nfs-utils-2.4.2-mountd-Add-check-for-struct-file_handle.patch
new file mode 100644
index 000000000000..2a89cc7665f0
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-2.4.2-mountd-Add-check-for-struct-file_handle.patch
@@ -0,0 +1,54 @@
+From f100d07d923b5db60d42dc2453485fa0dba69a79 Mon Sep 17 00:00:00 2001
+From: Petr Vorel <petr.vorel@gmail.com>
+Date: Mon, 18 Nov 2019 08:58:36 -0500
+Subject: [PATCH] mountd: Add check for 'struct file_handle'
+
+From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
+
+The code to check if name_to_handle_at() is implemented generates only a
+warning but with some toolchain it doesn't fail to link (the function must be
+implemented somewhere).
+However the "struct file_handle" type is not available.
+
+So, this patch adds a check for this struct.
+
+Patch taken from buildroot distribution.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+[ pvorel: rebased from nfs-utils-1-3-4 ]
+Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
+Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
+Signed-off-by: Steve Dickson <steved@redhat.com>
+---
+ configure.ac         | 1 +
+ utils/mountd/cache.c | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9ba9d4b..949ff9f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -510,6 +510,7 @@ AC_TYPE_PID_T
+ AC_TYPE_SIZE_T
+ AC_HEADER_TIME
+ AC_STRUCT_TM
++AC_CHECK_TYPES([struct file_handle])
+ 
+ dnl *************************************************************
+ dnl Check for functions
+diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
+index 3861f84..31e9507 100644
+--- a/utils/mountd/cache.c
++++ b/utils/mountd/cache.c
+@@ -446,7 +446,7 @@ static int same_path(char *child, char *parent, int len)
+ 	if (count_slashes(p) != count_slashes(parent))
+ 		return 0;
+ 
+-#if HAVE_NAME_TO_HANDLE_AT
++#if defined(HAVE_NAME_TO_HANDLE_AT) && defined(HAVE_STRUCT_FILE_HANDLE)
+ 	struct {
+ 		struct file_handle fh;
+ 		unsigned char handle[128];
+-- 
+1.8.3.1
+
diff --git a/net-fs/nfs-utils/files/nfs-utils-2.4.2-mountd-Fix-compilation-for--disable-uuid.patch b/net-fs/nfs-utils/files/nfs-utils-2.4.2-mountd-Fix-compilation-for--disable-uuid.patch
new file mode 100644
index 000000000000..3bb9f8b3c9bf
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-2.4.2-mountd-Fix-compilation-for--disable-uuid.patch
@@ -0,0 +1,35 @@
+From 31bb484b22c220c561f3a95c3b7ca3ea9b96cc9b Mon Sep 17 00:00:00 2001
+From: Petr Vorel <petr.vorel@gmail.com>
+Date: Mon, 18 Nov 2019 11:27:19 -0500
+Subject: [PATCH] mountd: Fix compilation for --disable-uuid
+
+Although code in configure.ac pretends to set USE_BLKID as 0
+via AC_DEFINE_UNQUOTED, it's actually not defined
+support/include/config.h.in
+support/include/config.h
+/* #undef USE_BLKID */
+
+Fixes: 8e643554 ("Allow disabling of libblkid usage.")
+
+Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
+Signed-off-by: Steve Dickson <steved@redhat.com>
+---
+ utils/mountd/cache.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
+index 31e9507..e5186c7 100644
+--- a/utils/mountd/cache.c
++++ b/utils/mountd/cache.c
+@@ -221,7 +221,7 @@ static void auth_unix_gid(int f)
+ 		xlog(L_ERROR, "auth_unix_gid: error writing reply");
+ }
+ 
+-#if USE_BLKID
++#ifdef USE_BLKID
+ static const char *get_uuid_blkdev(char *path)
+ {
+ 	/* We set *safe if we know that we need the
+-- 
+1.8.3.1
+
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..e13b00d0c3e0
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-2.3.4.ebuild
@@ -0,0 +1,192 @@
+# 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 ~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
+)
+
+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-r3.ebuild b/net-fs/nfs-utils/nfs-utils-2.4.1-r4.ebuild
index 24e426f2374b..fc20760da240 100644
--- a/net-fs/nfs-utils/nfs-utils-2.4.1-r3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.4.1-r4.ebuild
@@ -70,6 +70,9 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gssd-Look-in-lib32-for-gss-libs-aswell.patch
 	"${FILESDIR}"/${P}-Fix-include-order-between-config.h-and-stat.h.patch
 	"${FILESDIR}"/${PN}-2.4.1-statx.patch #688644
+	"${FILESDIR}"/${PN}-2.4.2-Ensure-consistent-struct-stat.patch
+	"${FILESDIR}"/${PN}-2.4.2-mountd-Add-check-for-struct-file_handle.patch
+	"${FILESDIR}"/${PN}-2.4.2-mountd-Fix-compilation-for--disable-uuid.patch
 )
 
 pkg_setup() {
diff --git a/net-fs/nfs-utils/nfs-utils-2.4.2.ebuild b/net-fs/nfs-utils/nfs-utils-2.4.2-r1.ebuild
index 4ff3af16fc9d..9bfa0765d646 100644
--- a/net-fs/nfs-utils/nfs-utils-2.4.2.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.4.2-r1.ebuild
@@ -68,6 +68,9 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.8-cross-build.patch
 	"${FILESDIR}"/${PN}-2.4.2-no-werror.patch
 	"${FILESDIR}"/${PN}-2.4.1-statx.patch #688644
+	"${FILESDIR}"/${P}-Ensure-consistent-struct-stat.patch
+	"${FILESDIR}"/${P}-mountd-Add-check-for-struct-file_handle.patch
+	"${FILESDIR}"/${P}-mountd-Fix-compilation-for--disable-uuid.patch
 )
 
 pkg_setup() {
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 0094c8f5379e..844d137c2e7f 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -26,15 +26,17 @@ 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.13.tar.gz 18109481 BLAKE2B 948ef6b0e1a9796c70635119f5aea5887e9f1c1d2a5264d072f3f3d218dfae3b6a16c640233063c9df0670dc7835a92a8c97447f57518aa9d387bc5d04831675 SHA512 ce80486c9ab093d44ee68b0e2ab28f9af97c7ed00cca1b8a0c65de18254ae40759a1e9fcb9a0ba18006aa296c6a6fbadf53dcd730785a96ac0c167efdbe9d3ae
 DIST samba-4.9.15.tar.gz 18110369 BLAKE2B fb09601f424b7e0368328023a80c3dbfcfc48e6d66d59bf13b828e9706d3e663b8fc80f0baecdc6b646855750e64f96d961edbeaf2110b6432568f600f9ddad6 SHA512 6eb589ad3a5070b5649f1c76bafd2d691c3efbef264a100f5cdda457ccdb633fcbe64a9c4f7f0b8a5422fa08aa73534dc6f87248c6c871a1fa09577364e962c0
-EBUILD samba-4.10.10.ebuild 9237 BLAKE2B 0c8e936d96e4e3837e30eb0c5c024474a9d5491e91f782bd4e4d95e2c492d5d0b519c279937151a69ce17a088c8a136e4828013d1a19a417a81b05b4a1e9bb14 SHA512 fb902ea2efa7bee1e2345b47af815841f53e67e4ca20795a0b1defedc052c833a4efda2f6d3dd3a7365308d6e8771d978fde9b9cbea96752d5cfc8242764ae4c
-EBUILD samba-4.10.2.ebuild 9100 BLAKE2B b8f92f3fd5b1934a43297cf52364b5accf5ec320d9f09a80d63bb49b538d169186e6059a116cd434bad56f772529f43ec40dd6aa488e363d4b3320f5c6762325 SHA512 08ad17bd5ea1ecc8f516302a02564cc3b57a214923dfc392444fa011927350310adb407d5c91159c891d1fb8bec96e83b9bebce1f6c97d008263497b187e20ee
-EBUILD samba-4.10.8.ebuild 9237 BLAKE2B 7566cf19195dbb23f46e73b99de7dfde560536ce098a32807abbc322d4e93369a5c88bf05aa44841c2ec07822621b8683c924af711aa16736451ddeaa6118bdc SHA512 e355a47f796d3e9d9e45aa2f75023f08d159c72e01d6d7298b10ade4c202f99753fd1ce7dd355f0e7e7559892f4a072effff435c6bbc5406a9df8f0e9106f59b
-EBUILD samba-4.11.1.ebuild 9129 BLAKE2B b4f5029773eb2054b121f05140a8ab9dc15784608aa028e9bfeeb24e333ead5dd51b017299584377c9390ddee28c2c9f80d4077d81fa18a3aa0541c3665d5719 SHA512 720708602f681936423891dc031c0ed507f1f5d3e4adc96306db4aef7564b3758c68aabbd8df39e9f1d1b8c83b99479327ba22f0036b9ce84f9f4de37ef39b65
-EBUILD samba-4.11.2.ebuild 9129 BLAKE2B b4f5029773eb2054b121f05140a8ab9dc15784608aa028e9bfeeb24e333ead5dd51b017299584377c9390ddee28c2c9f80d4077d81fa18a3aa0541c3665d5719 SHA512 720708602f681936423891dc031c0ed507f1f5d3e4adc96306db4aef7564b3758c68aabbd8df39e9f1d1b8c83b99479327ba22f0036b9ce84f9f4de37ef39b65
+DIST samba-4.9.16.tar.gz 18110660 BLAKE2B 5a75fb9b0010ce7a2eec00e911744a2b180525eea06ca08126bbfd558928e4165ed32da449ee31ee8e7f1bc705949548b9a6da8ed60de23a616bdb0acd020690 SHA512 bd9e7ee68351f0a7d006b47ed102bbd2984c08b483b20f4cf1db0354bef725d2e77816f7f3c3a20da46f69c4c9a476a18d22b8197414ea427abbd3acf6be6db0
+EBUILD samba-4.10.10.ebuild 9230 BLAKE2B 09314c37068f12da89a3d3c049efab5639c3d0f69d10e857a0d0e229ca08e7b9508f76fe57c24edc6196a7cfa0d9d8eddb77522de0397d2687544ffce7722ae1 SHA512 b8312593ebf58f42454b4517a6ae5bdc6fcf57c4f11eab9a95ecd27685294ba9b5f2fd17e78f34b24ae6c72d6900cc3d8bc6c427b8d614b801caf1a9d6343d9f
+EBUILD samba-4.10.2.ebuild 9093 BLAKE2B caf7aad5a5b17b0e0e9572010b8178648a03d474fa863c4bff7800f61d5b89dc948f243f9db29edaf539def301539e8922e83bf7dd50ccf1c53de7288c905a55 SHA512 8a2cfdea16e67ad5ab81aabd1c05629465e8fb482cc34e1d84a68f06124823916ba4048acf001d52c1abdf6ed61469e3c68d01af609516b6b3ba32f046877d3c
+EBUILD samba-4.10.8.ebuild 9230 BLAKE2B 366620e44d8c27a48277cd7609807113b438a229f2860e0a4ba53ffdd0772c19a11681087c878c4b31d4e596e948e32590ccd1a91d8acdb2657959abd0368c78 SHA512 4966c5a5fdb300892a6a8cfe34b314972ed4c28b74e1f0b580902518057a419adf501e7e254328e07c510f86cedf2878acca6619ee0018fc5a4110508c5329c3
+EBUILD samba-4.11.1.ebuild 9122 BLAKE2B cf950e7f6b9d6a3d8d5e275f76400794b3e3e37958df60fa45ace21a683315eff70d4cfdd0884ef1f35da66d48e6f1b0e2cec07a729fc8050e2f261d28617af8 SHA512 5a59bee38acdf87389407fe9efa694b76236e4648f5f6715858c0884fe9688dc4aa0928d0d39505ea456d9a71a4f650cff2d26c859d2730fe1a0816a6c76a0eb
+EBUILD samba-4.11.2.ebuild 9122 BLAKE2B cf950e7f6b9d6a3d8d5e275f76400794b3e3e37958df60fa45ace21a683315eff70d4cfdd0884ef1f35da66d48e6f1b0e2cec07a729fc8050e2f261d28617af8 SHA512 5a59bee38acdf87389407fe9efa694b76236e4648f5f6715858c0884fe9688dc4aa0928d0d39505ea456d9a71a4f650cff2d26c859d2730fe1a0816a6c76a0eb
 EBUILD samba-4.5.16.ebuild 8193 BLAKE2B ddc187ed358b6f2bd6727d3fe74bca0872dd46fbe6b12a606b2f7cf4c3903314bfdae35ea186be3999f9cc01a4b2f1d725f13a655707d71aef162a21f2914599 SHA512 2aecf97660ff948ec8341da21c7b43a8ed8c465ba19e7a157ca591b1d21e0cff12ceaa4fe57740aba7416eb0b780dd8b4f4549ba90634ec7c5c0028bbe09c000
-EBUILD samba-4.8.12.ebuild 8931 BLAKE2B 076ec80561f4c716e44704384ec9b362430bffe21ea7ea1a1ae6b7bc30735a15c141d89149e042ade63d76d0fc4fcc7cc6dc3cc10c3c40d139d212850113eae8 SHA512 5b0a5ec029d83772320058eb7f711d12e527fc1672ca50e94058efe618166db756e29530d3247bcd9c5013cb082d88bf89d0a1d17d82c3e339481d6a95f18282
+EBUILD samba-4.8.12.ebuild 8924 BLAKE2B 4ea486ecca9964519c4739195d14ce22e013acb7a9a9308cb9ce43b3ed6aa9cf64ab2a4a3bff13983e13f217b511d12a8726a57bb97d19952f99bb53b15a2db1 SHA512 f795b98e9a0580c034247fe8f64f1b7158ed239630b92666686cf32945907ab9159acc93ac541b3f9f04d2132da9f820e72ea80e242c440d72605d5ccd500578
 EBUILD samba-4.8.6-r2.ebuild 8497 BLAKE2B 4db3c17b11ef2146db59131877014b44c136ba0b720c906a407f6f7b6c405a858fe3fb0e0b31a7e17df8af68f02d881849b270ca8141b47dd401beb5a6465e92 SHA512 063682dafc10fa9505be914e2986f8abde6eaab92bcbda68a06f0d2a153f0659e1c75f7eef63153862e9699be5bec56de73b74b41f8988aa8b06f09eaccf2ca6
-EBUILD samba-4.8.6-r3.ebuild 8892 BLAKE2B 6b420c9beaa63a5c7600319207c357351bfe5201dc9c1ece32de526f4c34b05e08cd31ffb2661c671c634e6b7c0a40d363c1d75ff3bd8304d7c489dbcaa34861 SHA512 50a42f5462d72f59132243799d1089c2ca8bfe57fd15b97fe74be2dc4518f4f645497b2b8e9bd0f1fc37fb270cab3867949b19ef7146146bce6fbfb976293393
-EBUILD samba-4.9.13.ebuild 9090 BLAKE2B 74428d7674025d10d70f2a542b3aa7cfc2f000431a34bc48d49f6c21a8f77ecb16f46bc76ab81dacb198a8c63a30a7f1e6033edecb9db0b9ff8fa7c6240678c0 SHA512 52bc2908e250bd1ec0f450e1b68a6d03339c21a071937a283161bf4e510837e4bd0e2754f0cfe2699cdbfbf5c8efa987c4b3409500ca0e47eabd232b5f7c5f39
-EBUILD samba-4.9.15.ebuild 9090 BLAKE2B 86b23b461d9004af26e77d0af3f2f1fe262050bd5b94f7d7740f0bcb1cb83a87828feb2e80bcc00558def1da643da8296b79670bbf6f96bb83857ce37e130c26 SHA512 84faf0c69cc849ce0289d1308076c8ebf3660765ee3b4e24fbfd57fb23574c6a5f82c9bab1b9f4484120f066c2cfbc60ed2d8977a54a6461e92a12d15fcf56df
+EBUILD samba-4.8.6-r3.ebuild 8885 BLAKE2B cc2ee57e0463f6daaaeecd0bd149538f838e39534589f2a94d7f331981563c544d27a2e94860b4a701f6ad1150f20891590af93a5cd9db229615033063251c10 SHA512 bed25be8178f0b2899fcca57bb577a86c917075d901abeb8ba46462c82629c2a832ebf5f7b36e95cffea7189eca082b3863a3b79ad29c972569826d3ac906ac9
+EBUILD samba-4.9.13.ebuild 9083 BLAKE2B 3ab11deaa3d0e13a7db15c41bd6572bdb7eecc4152362c7c7f8acd9ce2463cfbac705e06e75655964bc3dd1e7e8d164b9c2c4a65b211fa44c1b49fe1435c8a87 SHA512 6d525b03ad5b247803da393c1289f8a3e4e4f1f5f5a8945ad7aa68869161fb13c8e459b3538b803e419944e5bf7d24fa90fabbc60e0d9ca046e83883774e5aa8
+EBUILD samba-4.9.15.ebuild 9083 BLAKE2B bf4afc1b617c0515e5a4055bf696c655d6c5bf935d692f8ccfb55fc9685425acdbdc2aaae953d89774ef70a2e71b1b9ce633edb1fab3e47b9bbec7d61cce1d3a SHA512 ac72300aac950bf9b7c829aeeaf454a9706638c68b0917cf5e113c91c4bcf7ae3e540e11a678f9c41f7c6dfe5aaeecca14e50ecd3d55ac1d68980783614cf6cc
+EBUILD samba-4.9.16.ebuild 9083 BLAKE2B bf4afc1b617c0515e5a4055bf696c655d6c5bf935d692f8ccfb55fc9685425acdbdc2aaae953d89774ef70a2e71b1b9ce633edb1fab3e47b9bbec7d61cce1d3a SHA512 ac72300aac950bf9b7c829aeeaf454a9706638c68b0917cf5e113c91c4bcf7ae3e540e11a678f9c41f7c6dfe5aaeecca14e50ecd3d55ac1d68980783614cf6cc
 MISC metadata.xml 1756 BLAKE2B 74fcabbc9a00bd2e2b91d527354edde5e44c36755d81c849c2a81c03590794f1be30a92ad7cade453fdb183754ace37f7ddc2c171eab657689cf34d83e840aed SHA512 65ee3dbcb246c068278ffb6a8eaaa439bea10fa86662504d2aacfb1bcf58a215d915e50c4c6ea6c6e989870f7a9d9974b7a1a33d2a2f0077b9e263a6adf94279
diff --git a/net-fs/samba/samba-4.10.10.ebuild b/net-fs/samba/samba-4.10.10.ebuild
index d24131ca91cb..1f0de6ef9a86 100644
--- a/net-fs/samba/samba-4.10.10.ebuild
+++ b/net-fs/samba/samba-4.10.10.ebuild
@@ -280,7 +280,7 @@ multilib_src_install() {
 		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
 		# bugs #376853 and #590374
 		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf || die
+		doins examples/pam_winbind/pam_winbind.conf
 	fi
 
 	keepdir /var/cache/samba
diff --git a/net-fs/samba/samba-4.10.2.ebuild b/net-fs/samba/samba-4.10.2.ebuild
index a1e8acf7aed2..7517cb4afc56 100644
--- a/net-fs/samba/samba-4.10.2.ebuild
+++ b/net-fs/samba/samba-4.10.2.ebuild
@@ -279,7 +279,7 @@ multilib_src_install() {
 		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
 		# bugs #376853 and #590374
 		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf || die
+		doins examples/pam_winbind/pam_winbind.conf
 	fi
 
 	keepdir /var/cache/samba
diff --git a/net-fs/samba/samba-4.10.8.ebuild b/net-fs/samba/samba-4.10.8.ebuild
index 66119026d236..b675f8c85a89 100644
--- a/net-fs/samba/samba-4.10.8.ebuild
+++ b/net-fs/samba/samba-4.10.8.ebuild
@@ -280,7 +280,7 @@ multilib_src_install() {
 		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
 		# bugs #376853 and #590374
 		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf || die
+		doins examples/pam_winbind/pam_winbind.conf
 	fi
 
 	keepdir /var/cache/samba
diff --git a/net-fs/samba/samba-4.11.1.ebuild b/net-fs/samba/samba-4.11.1.ebuild
index e971356a350a..8a88f65a21d8 100644
--- a/net-fs/samba/samba-4.11.1.ebuild
+++ b/net-fs/samba/samba-4.11.1.ebuild
@@ -276,7 +276,7 @@ multilib_src_install() {
 		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
 		# bugs #376853 and #590374
 		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf || die
+		doins examples/pam_winbind/pam_winbind.conf
 	fi
 
 	keepdir /var/cache/samba
diff --git a/net-fs/samba/samba-4.11.2.ebuild b/net-fs/samba/samba-4.11.2.ebuild
index e971356a350a..8a88f65a21d8 100644
--- a/net-fs/samba/samba-4.11.2.ebuild
+++ b/net-fs/samba/samba-4.11.2.ebuild
@@ -276,7 +276,7 @@ multilib_src_install() {
 		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
 		# bugs #376853 and #590374
 		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf || die
+		doins examples/pam_winbind/pam_winbind.conf
 	fi
 
 	keepdir /var/cache/samba
diff --git a/net-fs/samba/samba-4.8.12.ebuild b/net-fs/samba/samba-4.8.12.ebuild
index a16b7a81e761..ad3cf03c2386 100644
--- a/net-fs/samba/samba-4.8.12.ebuild
+++ b/net-fs/samba/samba-4.8.12.ebuild
@@ -275,7 +275,7 @@ multilib_src_install() {
 		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
 		# bugs #376853 and #590374
 		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf || die
+		doins examples/pam_winbind/pam_winbind.conf
 	fi
 
 	keepdir /var/cache/samba
diff --git a/net-fs/samba/samba-4.8.6-r3.ebuild b/net-fs/samba/samba-4.8.6-r3.ebuild
index 6be58e9b9728..9d93bd81c79e 100644
--- a/net-fs/samba/samba-4.8.6-r3.ebuild
+++ b/net-fs/samba/samba-4.8.6-r3.ebuild
@@ -273,7 +273,7 @@ multilib_src_install() {
 		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
 		# bugs #376853 and #590374
 		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf || die
+		doins examples/pam_winbind/pam_winbind.conf
 	fi
 
 	keepdir /var/cache/samba
diff --git a/net-fs/samba/samba-4.9.13.ebuild b/net-fs/samba/samba-4.9.13.ebuild
index d2b15f5811ff..b65c53c68ed6 100644
--- a/net-fs/samba/samba-4.9.13.ebuild
+++ b/net-fs/samba/samba-4.9.13.ebuild
@@ -279,7 +279,7 @@ multilib_src_install() {
 		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
 		# bugs #376853 and #590374
 		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf || die
+		doins examples/pam_winbind/pam_winbind.conf
 	fi
 
 	keepdir /var/cache/samba
diff --git a/net-fs/samba/samba-4.9.15.ebuild b/net-fs/samba/samba-4.9.15.ebuild
index 0253eb32433a..3ad0587ccb32 100644
--- a/net-fs/samba/samba-4.9.15.ebuild
+++ b/net-fs/samba/samba-4.9.15.ebuild
@@ -279,7 +279,7 @@ multilib_src_install() {
 		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
 		# bugs #376853 and #590374
 		insinto /etc/security
-		doins examples/pam_winbind/pam_winbind.conf || die
+		doins examples/pam_winbind/pam_winbind.conf
 	fi
 
 	keepdir /var/cache/samba
diff --git a/net-fs/samba/samba-4.9.16.ebuild b/net-fs/samba/samba-4.9.16.ebuild
new file mode 100644
index 000000000000..3ad0587ccb32
--- /dev/null
+++ b/net-fs/samba/samba-4.9.16.ebuild
@@ -0,0 +1,308 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+[[ ${PV} = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="https://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg
+iprint json ldap pam profiling-data python quota selinux syslog system-heimdal
++system-mitkrb5 systemd test winbind zeroconf"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/libaio[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/iniparser:0
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+	net-libs/libnsl:=[${MULTILIB_USEDEP}]
+	sys-apps/attr[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.4.8[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	<sys-libs/ldb-1.5.0[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.1.14[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.16[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.37[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	pam? ( sys-libs/pam )
+	acl? ( virtual/acl )
+	addns? (
+		net-dns/bind-tools[gssapi]
+		dev-python/dnspython:=[${PYTHON_USEDEP}]
+	)
+	ceph? ( sys-cluster/ceph )
+	cluster? (
+		net-libs/rpcsvc-proto
+		!dev-db/ctdb
+	)
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gnutls? (
+		dev-libs/libgcrypt:0
+		>=net-libs/gnutls-1.4.0
+	)
+	gpg? ( app-crypt/gpgme )
+	json? ( dev-libs/jansson )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )
+	zeroconf? ( net-dns/avahi )
+"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	net-libs/libtirpc[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	test? (
+		!system-mitkrb5? (
+			>=sys-libs/nss_wrapper-1.1.3
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.9
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${CDEPEND}
+	python? ( ${PYTHON_DEPS} )
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+	!dev-perl/Parse-Yapp
+"
+
+REQUIRED_USE="
+	addc? ( python gnutls json winbind )
+	addns? ( python )
+	ads? ( acl gnutls ldap winbind )
+	cluster? ( ads )
+	gpg? ( addc )
+	test? ( python )
+	?? ( system-heimdal system-mitkrb5 )
+	${PYTHON_REQUIRED_USE}
+"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+	"${FILESDIR}/${PN}-4.9.2-timespec.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use cluster ; then
+		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS="idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	if ! use test ; then
+		sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+	fi
+
+	# ugly hackaround for bug #592502
+	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with addns dnsupdate)
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_with json json-audit)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
+		$(use_enable gnutls)
+		$(use_with debug lttng)
+		$(use_with ldap)
+		$(use_with profiling-data)
+	)
+	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED%/}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+		systemd_dounit "${FILESDIR}"/nmbd.service
+		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+		systemd_dounit "${FILESDIR}"/winbindd.service
+		systemd_dounit "${FILESDIR}"/samba.service
+	fi
+
+	if use pam && use winbind ; then
+		newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+		# bugs #376853 and #590374
+		insinto /etc/security
+		doins examples/pam_winbind/pam_winbind.conf
+	fi
+
+	keepdir /var/cache/samba
+	keepdir /var/lib/ctdb
+	keepdir /var/lib/samba/{bind-dns,private}
+	keepdir /var/lock/samba
+	keepdir /var/log/samba
+	keepdir /var/run/{ctdb,samba}
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "https://samba.org/samba/history/${P}.html "
+	elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-fs/sshfs/Manifest b/net-fs/sshfs/Manifest
index 20517b27d26f..5342ab061bd9 100644
--- a/net-fs/sshfs/Manifest
+++ b/net-fs/sshfs/Manifest
@@ -1,10 +1,5 @@
-AUX sshfs-3.5.0-rst2man.patch 341 BLAKE2B fd58d59ee5a2ee02465ce94896a6cc99892a8365a442fc7c59809e9801b25a50697157822f22410e2bd362af6dd59cc538d718aedb6e04dd948d320c9047594b SHA512 d162169bda8a542d39324eb2ae2738385466f8cd1ae059bf6c9fcd07f5c0b9158539411318758b63c9cabc2c6bda0b645c4b6fb1610d72dbd0cf5f4a2af4a3f7
 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
+DIST sshfs-3.6.0.tar.xz 49860 BLAKE2B 5486c41a710a635e6e35fc5235d8ea713aa58ed69a648d7872e2235a56ba0eec7337cdc1d65ac72c58aaea9ad079652599a619778d7fb14a20537ac8817a3ff1 SHA512 fe34d7bbb76bea6aedf96b4ce7500ad6d81230cca9a43b831302159e5926797a243b7d1675d23ba101057ef247f64ad7df18a73d20578e84b9524218d9ff97bd
 EBUILD sshfs-2.10-r1.ebuild 543 BLAKE2B 90bd833157115a7b005c395b17ae2dda010e7bf005883005178f75ff0e5020bf3e4ed9277360bb294e8df4ad359072e5a309f2d65842317889ee2813863a9bfb SHA512 35f73359d4e4efcaf09fda132a18d9f05e67c75e8d5f1d355a31545fce3748c6c846622f32fd491f30916e2f878269ea8d03db670f97296f0ea632466ecabec8
-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
+EBUILD sshfs-3.6.0.ebuild 674 BLAKE2B d6255f1265d08fdceca9ebf8e2619c168a7fe53eb24bbaba2363eca3fa15740224e718f05511c873c7a46eb8e35452f14599b7048e6b5f23a9155a5d8b0523b3 SHA512 3c7383f5e4415fa02d9afb8f714139e9885fea852368164a619f29caa03576ac293597cb543596ed268b3a619a3bc8fe6f267895c492f88f0c262556662933c3
+MISC metadata.xml 321 BLAKE2B 63f619f047201cf5745c86bf111c8a427189ebffa8ca4e5fb4a94ecc671003aab278e0c04f24aaf17e0f3054b36099fa0d7efe07433b70d79a860656ff5952a2 SHA512 a76a76e6ec67e739a91c4a6055bae77923eff18c6e32512d22f091f8d13707c6c263212fac2f2caf2dd62bb5ef2410ac844c7efbcef51e0dced817ec9ec041bf
diff --git a/net-fs/sshfs/files/sshfs-3.5.0-rst2man.patch b/net-fs/sshfs/files/sshfs-3.5.0-rst2man.patch
deleted file mode 100644
index ad58de4e5054..000000000000
--- a/net-fs/sshfs/files/sshfs-3.5.0-rst2man.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fallback to looking for rst2man.py executable as that's what docutils upstream
-defaults to installing.
-
---- sshfs-3.5.0/meson.build
-+++ sshfs-3.5.0/meson.build
-@@ -25,7 +25,7 @@
- endif
- 
- 
--rst2man = find_program('rst2man', required: false)
-+rst2man = find_program('rst2man', 'rst2man.py', required: false)
-   
- cfg = configuration_data()
- 
diff --git a/net-fs/sshfs/metadata.xml b/net-fs/sshfs/metadata.xml
index 1dde05c3d522..a23ff0249f74 100644
--- a/net-fs/sshfs/metadata.xml
+++ b/net-fs/sshfs/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>radhermit@gentoo.org</email>
-    <name>Tim Harder</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">libfuse/sshfs</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>bman@gentoo.org</email>
+		<name>Aaron Bauman</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">libfuse/sshfs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-fs/sshfs/sshfs-3.5.0.ebuild b/net-fs/sshfs/sshfs-3.5.0.ebuild
deleted file mode 100644
index 51bd27551eaf..000000000000
--- a/net-fs/sshfs/sshfs-3.5.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 ~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"
-
-PATCHES=( "${FILESDIR}"/${P}-rst2man.patch )
-
-DOCS=( AUTHORS ChangeLog.rst README.rst )
diff --git a/net-fs/sshfs/sshfs-3.5.1.ebuild b/net-fs/sshfs/sshfs-3.5.1.ebuild
deleted file mode 100644
index 82799664d23c..000000000000
--- a/net-fs/sshfs/sshfs-3.5.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 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 ~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 )
diff --git a/net-fs/sshfs/sshfs-3.5.2.ebuild b/net-fs/sshfs/sshfs-3.6.0.ebuild
index e6ff7b984dfe..2bf50acbf8d6 100644
--- a/net-fs/sshfs/sshfs-3.5.2.ebuild
+++ b/net-fs/sshfs/sshfs-3.6.0.ebuild
@@ -13,12 +13,11 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
-CDEPEND=">=sys-fs/fuse-3.1.0:3
+DEPEND=">=sys-fs/fuse-3.1.0:3
 	>=dev-libs/glib-2.4.2"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	>=net-misc/openssh-4.4"
-DEPEND="${CDEPEND}
-	dev-python/docutils
+BDEPEND="dev-python/docutils
 	virtual/pkgconfig"
 
 # requires root privs and specific localhost sshd setup
diff --git a/net-fs/wdfs/Manifest b/net-fs/wdfs/Manifest
index d1d1cd50c293..1cd574009c58 100644
--- a/net-fs/wdfs/Manifest
+++ b/net-fs/wdfs/Manifest
@@ -1,4 +1,4 @@
 AUX wdfs-1.4.2-fix-Waddress.patch 1269 BLAKE2B 8ae89ff50d0feb200389f938c26586cce88bb67504aa30e4aac992ecf608f0478a0b36d5198cbb3e668f2b4207fd363549f67f2e044b2aef6d7ced0686224760 SHA512 e01f9a45cd045edf05b19ddd3b3a04bbf9a03dac4e032709a98396b024079bfb4856b91aa1c0aba8b1c3ce765ce9499f46102fafc87776ae5e0d57f8b71bc0e5
 DIST wdfs-1.4.2.tar.gz 109315 BLAKE2B 7bfe32d0c957afc347b4280e909b8964e2cb736686833580072149f107aec908e9ce220fa18ccd998ae9bea5d34e0aa2349c6a832ed40dbfae3bf6cb353f9e4e SHA512 da7e16ed86cbe4746fabe5fce44c83b1d0cd0fbc19994eefe0ce2a75f3d8c77c3c341a76409150a3509be08f8c0d28b8a9650037edcbbf2aa60f4c8ea5407004
 EBUILD wdfs-1.4.2-r1.ebuild 537 BLAKE2B 076400925aa5484fc83191750c94a408ff6ec70900aeef342eb60ac8ab249e365f84d326200d6bed2c75cb06083c77c81becbe3f9bc05581455472e4cda11cb0 SHA512 a1dc12bfdf86b98892862fadccaea957b733d28cd0553c75af3ca40710e9f8038cc0c1e6629316922595855dbb0ee4601f9e622bd3d62ee0d25ba91a9cbc2a14
-MISC metadata.xml 492 BLAKE2B 1d1aad1e66d6a6a2e147fdee1224fd7b8047713af27a67012ad2fc52aee69ae7674fa8d3d5c0de3a7fec61b954970a41f7143d7abe521ed3c4a0de4f18612c9e SHA512 23ca1d71257b7163f4c22ad9422b5f756e54e750a47f03b2fc576141e7cc3462a5f7f229eecb649666fff94af8af54540ff065e17c00f92f724352904c85d272
+MISC metadata.xml 440 BLAKE2B 9930eff1050d22f7ee8019b00f3155b65b3156fd690820cb9eba3f6af02cca50d3a1072866a13a8bb7548b57c3c62ea223c3c5e0a4bd8a8305cde80892825f00 SHA512 00ef130f56f063239b4c4ea485009188e3ddf1840cec24b9df22b9b39645b98908fb35e480d68480938c2573533c6be3fca6830dea24c1475286b81986b58f4d
diff --git a/net-fs/wdfs/metadata.xml b/net-fs/wdfs/metadata.xml
index 59ebf8dba9c7..1e76a615be5a 100644
--- a/net-fs/wdfs/metadata.xml
+++ b/net-fs/wdfs/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dev-zero@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		wdfs is a webdav filesystem that makes it possible to mount a webdav
 		share under linux, freebsd and apple mac os x. wdfs has some special