gentoo resync : 25.09.2019

26 files changed, 400 insertions, 40 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 7a0ea9c8f317..b58d7c8ee2cd 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index 491540142173..e3e3a7b17632 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -5,5 +5,5 @@ DIST cifs-utils-6.8.tar.bz2 384426 BLAKE2B 002518f44489aefc94c47a23438b176a4056f
 DIST cifs-utils-6.9.tar.bz2 400430 BLAKE2B fc8cc55fae54d84fc1f1d4a14a9d666d87a3da78d1502f0d72ac9cb44ff1424ca2c5b15b0be510579d4c9f5181980627efedd00e0e5cfb1b3e47188ba307ad28 SHA512 b92e4e39eeed1032bb175659296cde034703fb3ca63aae00419d46a33dadf821fedaf03734128112c164c84bcbb48d92d03cdc275c4a7cba26f984aeca40a40a
 EBUILD cifs-utils-6.7.ebuild 3226 BLAKE2B 4d0edab2d12ea2d8046995001c8c2bdc2d7ad580d901743e5fb5e104ae706768dd8f9ff0534b2b82cd6c5f36edba92d45b955e9602496befdc7bb1f561b51f68 SHA512 11d2651a795e9ff441bb4f80d02a6b568ad566190390477cc67dc5baf92fec15f8a1e195b291b2828bdb30b5dece1236ecffa907d5ef8c86a728ca43a0ec63bb
 EBUILD cifs-utils-6.8-r1.ebuild 3038 BLAKE2B c716960106acaa8a7cad9f4cb74ef9d5ae1c7df906728afb557baf909415fa78952bb06b83009c14eac739b03300ba40e67e6f6931969171f66640d2cd5b67ce SHA512 d5fd7ff2d03f6e21c413011855b61a79a64c2f9bcc90a7db4e4d0b49e863bac42e56b656765a78d172bdbf1071d89220d9ddb43b2ccb4071e40c842a1004855d
-EBUILD cifs-utils-6.9-r1.ebuild 3001 BLAKE2B f45092f6ec2fae83843508b544c2d1e3a3d3e39b80a011ccbcf1e5553ed24b98c201b32314c64fe95771a2115c4e72ca45c6cbbf07f5778b48ebc52c6c1339a5 SHA512 4ee39faa74a3bc298cb4e4d0d449bf3e71174e70401deccff9ece6bf065ca06d0c225e4ca4dfe1ef9919e934b58bd580b7ac2044828602ecc3b2f680b4ed1b33
+EBUILD cifs-utils-6.9-r1.ebuild 2999 BLAKE2B 00f7a48914340d1a7e8e7da7d1122e3d584ed73064e7c5f2f9fb7748fd44954880708de1fb7a867d1de316c3281bc40adf9a59ec8b53406f066499dfd95ff035 SHA512 965c894c9077638e1c0ac99a8a94130128f7b5a5f7f6ad71e3c5a377fe965f951e394b9e154c37e4d3218b9249f45bd19db5e511ea0e8f6b245cc9cbbd340e78
 MISC metadata.xml 889 BLAKE2B 45b3f5f6cac2ca247c9d3a73d4f0e2703187e4a4eab2f850ef2f228489e365ac30d67d35187fab993af7611109c0e2a33bf8336e37496a131b641abade642ca7 SHA512 979960233f0941ecbfa1cadd79fae28898cf8f8333225483808cd25b84d0395d9a7dbc84a5912c2dedb38269d62b7d7f4a647b5d12e47b7706368b3640d90c66
diff --git a/net-fs/cifs-utils/cifs-utils-6.9-r1.ebuild b/net-fs/cifs-utils/cifs-utils-6.9-r1.ebuild
index e23f23150c17..299c2a378e64 100644
--- a/net-fs/cifs-utils/cifs-utils-6.9-r1.ebuild
+++ b/net-fs/cifs-utils/cifs-utils-6.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ftp.samba.org/pub/linux-cifs/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-linux"
 IUSE="+acl +ads +caps creds pam"
 
 RDEPEND="
diff --git a/net-fs/mc/Manifest b/net-fs/mc/Manifest
index afae36b8747a..02f465e5c927 100644
--- a/net-fs/mc/Manifest
+++ b/net-fs/mc/Manifest
@@ -50,9 +50,9 @@ EBUILD mc-2019.02.27.18.44.28.ebuild 1129 BLAKE2B 4b4baf5b05d0fd5c363385452a7b0b
 EBUILD mc-2019.03.06.18.41.35.ebuild 1129 BLAKE2B 4b4baf5b05d0fd5c363385452a7b0bee6e04293b0ccf18fb1e97872bc7a8cedf8012a8022f0b1ad09bbfafe0631d816f8f612f5cbfbfd56de9f25cec59366bdb SHA512 5b06ca0291203ba5c572902effb811218877e16d55c89d880122ec657b1e1620c7be0ccfb0fdcf13e327faf1570834700278fc59535ed0e1086f59bb55c85f12
 EBUILD mc-2019.03.09.00.30.31.ebuild 1129 BLAKE2B 4b4baf5b05d0fd5c363385452a7b0bee6e04293b0ccf18fb1e97872bc7a8cedf8012a8022f0b1ad09bbfafe0631d816f8f612f5cbfbfd56de9f25cec59366bdb SHA512 5b06ca0291203ba5c572902effb811218877e16d55c89d880122ec657b1e1620c7be0ccfb0fdcf13e327faf1570834700278fc59535ed0e1086f59bb55c85f12
 EBUILD mc-2019.03.20.21.29.03.ebuild 1129 BLAKE2B 4b4baf5b05d0fd5c363385452a7b0bee6e04293b0ccf18fb1e97872bc7a8cedf8012a8022f0b1ad09bbfafe0631d816f8f612f5cbfbfd56de9f25cec59366bdb SHA512 5b06ca0291203ba5c572902effb811218877e16d55c89d880122ec657b1e1620c7be0ccfb0fdcf13e327faf1570834700278fc59535ed0e1086f59bb55c85f12
-EBUILD mc-2019.03.28.20.43.56.ebuild 3459 BLAKE2B 451d4e90542068b7c4c153c0f47579a5bce220c631ee71e8da231288a22a95a33c228aa61cb0bd4d5d0ffa373a74fe147868876033716e7266557eda649f83cc SHA512 0fdc4e663777b30da6b3b02dc365db1af1cca7c688f20ab6512da89ce1b17c63eb7c1dc9c702c6365d07c578dc2fcf4ede28ab396617fbab0a300381020acafd
-EBUILD mc-2019.04.03.17.59.57.ebuild 3459 BLAKE2B 451d4e90542068b7c4c153c0f47579a5bce220c631ee71e8da231288a22a95a33c228aa61cb0bd4d5d0ffa373a74fe147868876033716e7266557eda649f83cc SHA512 0fdc4e663777b30da6b3b02dc365db1af1cca7c688f20ab6512da89ce1b17c63eb7c1dc9c702c6365d07c578dc2fcf4ede28ab396617fbab0a300381020acafd
-EBUILD mc-2019.04.10.22.11.28.ebuild 3459 BLAKE2B 451d4e90542068b7c4c153c0f47579a5bce220c631ee71e8da231288a22a95a33c228aa61cb0bd4d5d0ffa373a74fe147868876033716e7266557eda649f83cc SHA512 0fdc4e663777b30da6b3b02dc365db1af1cca7c688f20ab6512da89ce1b17c63eb7c1dc9c702c6365d07c578dc2fcf4ede28ab396617fbab0a300381020acafd
-EBUILD mc-2019.07.17.22.13.42.ebuild 3560 BLAKE2B bffb370fb7fad024734c857e4e781072aa2e7f1c329c82f4181f77de872c3725ea3fc944979e279161893f089f727bb227f63d260cb8eefc7e2f58060f53f03b SHA512 35c134a370151f137c131754d8ffa44bb0d3ae6198e4b6c32491967e0dbb04cc622cc7c667d120a782ba58b1296f5f8c8e7061dc57022a7b2a3cd565f7c2cae3
-EBUILD mc-2019.07.31.19.17.35.ebuild 3560 BLAKE2B bffb370fb7fad024734c857e4e781072aa2e7f1c329c82f4181f77de872c3725ea3fc944979e279161893f089f727bb227f63d260cb8eefc7e2f58060f53f03b SHA512 35c134a370151f137c131754d8ffa44bb0d3ae6198e4b6c32491967e0dbb04cc622cc7c667d120a782ba58b1296f5f8c8e7061dc57022a7b2a3cd565f7c2cae3
+EBUILD mc-2019.03.28.20.43.56.ebuild 3475 BLAKE2B 917f951b0a53b53503a3cb997bb563113641c6d6cb39d4e1d20e32883ae658689dd0c3f4eb6188ae2d739e8d0662743f18b72faf1c59b880401a18890ae7e114 SHA512 8beb3d342ad759ad95f63f5ee66112b9dcc52b86966347eda2ca944142c258f4eb22bde8642480fceea46f25a90ca682ffb59393f8f34df6d24fee8b591f12c7
+EBUILD mc-2019.04.03.17.59.57.ebuild 3475 BLAKE2B 917f951b0a53b53503a3cb997bb563113641c6d6cb39d4e1d20e32883ae658689dd0c3f4eb6188ae2d739e8d0662743f18b72faf1c59b880401a18890ae7e114 SHA512 8beb3d342ad759ad95f63f5ee66112b9dcc52b86966347eda2ca944142c258f4eb22bde8642480fceea46f25a90ca682ffb59393f8f34df6d24fee8b591f12c7
+EBUILD mc-2019.04.10.22.11.28.ebuild 3475 BLAKE2B 917f951b0a53b53503a3cb997bb563113641c6d6cb39d4e1d20e32883ae658689dd0c3f4eb6188ae2d739e8d0662743f18b72faf1c59b880401a18890ae7e114 SHA512 8beb3d342ad759ad95f63f5ee66112b9dcc52b86966347eda2ca944142c258f4eb22bde8642480fceea46f25a90ca682ffb59393f8f34df6d24fee8b591f12c7
+EBUILD mc-2019.07.17.22.13.42.ebuild 3576 BLAKE2B 93b0bc042d3427618cd5f3e6cc7b2cede5deed5c4d9f3a29edec6c58f383cf76295b3f47f685169d0a1b130b0c657025c32982237967ad132ae9e8eb7b790f1d SHA512 6a8cae5e707276236c6a9342df2c125e9cb4add984dd8e0209b2e761c29bdc4edb3342f9a1dbe0e56864d54bba183ce7fc3650cecef7a612268bec5f650cffe6
+EBUILD mc-2019.07.31.19.17.35.ebuild 3576 BLAKE2B 93b0bc042d3427618cd5f3e6cc7b2cede5deed5c4d9f3a29edec6c58f383cf76295b3f47f685169d0a1b130b0c657025c32982237967ad132ae9e8eb7b790f1d SHA512 6a8cae5e707276236c6a9342df2c125e9cb4add984dd8e0209b2e761c29bdc4edb3342f9a1dbe0e56864d54bba183ce7fc3650cecef7a612268bec5f650cffe6
 MISC metadata.xml 316 BLAKE2B a9702a517ffa52bc439add8a4712f3835bb9b7200fcc0d0fba23c23e91387a185295198a80734c79dbd4cc0146f4b393f3396495830ecf0122cbbb334a5fa651 SHA512 630bdebb37c4df4255b8dd7dd28566e9f484697e1ff50981a743b94593ef56484b20aec86a0109458a0e88b7c357da78afa8ed946ba3bca2a7db5bf006747913
diff --git a/net-fs/mc/mc-2019.03.28.20.43.56.ebuild b/net-fs/mc/mc-2019.03.28.20.43.56.ebuild
index d15b0813a634..c9e2c129ad7e 100644
--- a/net-fs/mc/mc-2019.03.28.20.43.56.ebuild
+++ b/net-fs/mc/mc-2019.03.28.20.43.56.ebuild
@@ -46,7 +46,7 @@ HOMEPAGE="https://github.com/minio/mc"
 SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz
 	${EGO_VENDOR_URI}"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD MIT MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 
diff --git a/net-fs/mc/mc-2019.04.03.17.59.57.ebuild b/net-fs/mc/mc-2019.04.03.17.59.57.ebuild
index d15b0813a634..c9e2c129ad7e 100644
--- a/net-fs/mc/mc-2019.04.03.17.59.57.ebuild
+++ b/net-fs/mc/mc-2019.04.03.17.59.57.ebuild
@@ -46,7 +46,7 @@ HOMEPAGE="https://github.com/minio/mc"
 SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz
 	${EGO_VENDOR_URI}"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD MIT MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 
diff --git a/net-fs/mc/mc-2019.04.10.22.11.28.ebuild b/net-fs/mc/mc-2019.04.10.22.11.28.ebuild
index d15b0813a634..c9e2c129ad7e 100644
--- a/net-fs/mc/mc-2019.04.10.22.11.28.ebuild
+++ b/net-fs/mc/mc-2019.04.10.22.11.28.ebuild
@@ -46,7 +46,7 @@ HOMEPAGE="https://github.com/minio/mc"
 SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz
 	${EGO_VENDOR_URI}"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD MIT MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 
diff --git a/net-fs/mc/mc-2019.07.17.22.13.42.ebuild b/net-fs/mc/mc-2019.07.17.22.13.42.ebuild
index ae152571cd32..f9de8d0746e1 100644
--- a/net-fs/mc/mc-2019.07.17.22.13.42.ebuild
+++ b/net-fs/mc/mc-2019.07.17.22.13.42.ebuild
@@ -48,7 +48,7 @@ HOMEPAGE="https://github.com/minio/mc"
 SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz
 	${EGO_VENDOR_URI}"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD MIT MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 
diff --git a/net-fs/mc/mc-2019.07.31.19.17.35.ebuild b/net-fs/mc/mc-2019.07.31.19.17.35.ebuild
index ae152571cd32..f9de8d0746e1 100644
--- a/net-fs/mc/mc-2019.07.31.19.17.35.ebuild
+++ b/net-fs/mc/mc-2019.07.31.19.17.35.ebuild
@@ -48,7 +48,7 @@ HOMEPAGE="https://github.com/minio/mc"
 SRC_URI="https://${EGO_PN}/archive/RELEASE.${MY_PV}.tar.gz -> ${P}.tar.gz
 	${EGO_VENDOR_URI}"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD MIT MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 
diff --git a/net-fs/minio/Manifest b/net-fs/minio/Manifest
index c0d7f1025064..9a6bce06579f 100644
--- a/net-fs/minio/Manifest
+++ b/net-fs/minio/Manifest
@@ -169,16 +169,16 @@ EBUILD minio-2019.03.06.22.47.10.ebuild 1381 BLAKE2B 5ce76ea9331938f9e42cfbfcdfa
 EBUILD minio-2019.03.13.21.59.47.ebuild 1381 BLAKE2B 5ce76ea9331938f9e42cfbfcdfa12c57f5cd2e2a7c06282379bf6af2bf31886d0eebcf8a8f33bae7fc6e773061df0bd6f54697936eaa4ac7c446a104b84718c4 SHA512 2708fac173db7349246b4391510cefd625e68986609e5fea2a6b8caf08afd00a5ba251689895a05c468ebae4e9328e95cdb2d0cf279cb0d701e1a145934a7290
 EBUILD minio-2019.03.20.22.38.47.ebuild 1381 BLAKE2B 5ce76ea9331938f9e42cfbfcdfa12c57f5cd2e2a7c06282379bf6af2bf31886d0eebcf8a8f33bae7fc6e773061df0bd6f54697936eaa4ac7c446a104b84718c4 SHA512 2708fac173db7349246b4391510cefd625e68986609e5fea2a6b8caf08afd00a5ba251689895a05c468ebae4e9328e95cdb2d0cf279cb0d701e1a145934a7290
 EBUILD minio-2019.03.27.22.35.21.ebuild 1371 BLAKE2B b65a6304901d076387fe16e3b69ac1f02ff626f1247c0ed71c58da3a18ecc050656e31ed0b8b598c5ded168496de375d8975ae40bd67e506312e341c951091dc SHA512 87cb94b18d44f3c1a07277d179b55b33cbbf09d56e59fd094970001156e667d45c804a581a7a23d4994f2b68d2a80c22b377927d096bb5b732752de84ee107a6
-EBUILD minio-2019.04.04.18.31.46.ebuild 10304 BLAKE2B 0fcd367af6caf8d1137604ce8e2f61e0bd81f4054fbc59acb75c37b49a321766eb917382167a0cb1b940898c7ba308afceb8d01a3d730a0be032c7f746f5fe7d SHA512 df8bff9f3828695e512e84a7f35879d73dcfa72ccf49cad5ff9b1ffd62b96431964d772f3216540963b64d558e0065c00fa10f6550c2b5d3c4a99921c8687a7a
-EBUILD minio-2019.04.09.01.22.30.ebuild 10304 BLAKE2B 0fcd367af6caf8d1137604ce8e2f61e0bd81f4054fbc59acb75c37b49a321766eb917382167a0cb1b940898c7ba308afceb8d01a3d730a0be032c7f746f5fe7d SHA512 df8bff9f3828695e512e84a7f35879d73dcfa72ccf49cad5ff9b1ffd62b96431964d772f3216540963b64d558e0065c00fa10f6550c2b5d3c4a99921c8687a7a
-EBUILD minio-2019.04.18.01.15.57.ebuild 10304 BLAKE2B 0fcd367af6caf8d1137604ce8e2f61e0bd81f4054fbc59acb75c37b49a321766eb917382167a0cb1b940898c7ba308afceb8d01a3d730a0be032c7f746f5fe7d SHA512 df8bff9f3828695e512e84a7f35879d73dcfa72ccf49cad5ff9b1ffd62b96431964d772f3216540963b64d558e0065c00fa10f6550c2b5d3c4a99921c8687a7a
-EBUILD minio-2019.04.18.21.44.59.ebuild 10304 BLAKE2B 0fcd367af6caf8d1137604ce8e2f61e0bd81f4054fbc59acb75c37b49a321766eb917382167a0cb1b940898c7ba308afceb8d01a3d730a0be032c7f746f5fe7d SHA512 df8bff9f3828695e512e84a7f35879d73dcfa72ccf49cad5ff9b1ffd62b96431964d772f3216540963b64d558e0065c00fa10f6550c2b5d3c4a99921c8687a7a
-EBUILD minio-2019.04.23.23.50.36.ebuild 11222 BLAKE2B 5eb7574b7dcf78f4ba8487acb5791eab33c4ea508928f68bf4fb7a41c79796f9272190517a389a72c80396d9a92b2056cde0165ac5f8afccf4bdf50425285abc SHA512 d9501ff47f6011a6ff11599c68fec86dfa75e845b219fd7a17afadf99040111d259f46846207c548b93dfb301eb27cb8ea124d49bdbc56b64f5c1028860eb68f
-EBUILD minio-2019.07.24.02.02.23.ebuild 11693 BLAKE2B 1626e907246dc8745b3b9f6ba53b71af3ef8149537af6e0b96a2f77127e109daf621e1f619b5af4da6f49f1893965f40f3e492224498e0665a39bb52e1f65560 SHA512 666c9a7e023134d5aa8d484bc17d5574a66494060498952a3bbe860bca850027dd8bfdb6b7e4bd6fd98913cf4f4a2ef309a1eea6ceeae67d432968876dfd8eb7
-EBUILD minio-2019.07.31.18.57.56.ebuild 11693 BLAKE2B 1626e907246dc8745b3b9f6ba53b71af3ef8149537af6e0b96a2f77127e109daf621e1f619b5af4da6f49f1893965f40f3e492224498e0665a39bb52e1f65560 SHA512 666c9a7e023134d5aa8d484bc17d5574a66494060498952a3bbe860bca850027dd8bfdb6b7e4bd6fd98913cf4f4a2ef309a1eea6ceeae67d432968876dfd8eb7
-EBUILD minio-2019.08.01.22.18.54.ebuild 11896 BLAKE2B eb5f3d23f030595cc42ce6ff3542a34059dcbb2f86b76c286e987c5a16525d0ba6f7e48f8c3944deab604caf566a96d2da596f4b1d5270a2cbe2038c51ea5d7d SHA512 58968c4793bd6d3c34c07781f849dafacb398502c28d4f9356b210c7ec2c743488a3041b06cb818c05766be3e97f54b84a4f0f8401940f9621d283ed3d467446
-EBUILD minio-2019.08.14.20.37.41.ebuild 11896 BLAKE2B eb5f3d23f030595cc42ce6ff3542a34059dcbb2f86b76c286e987c5a16525d0ba6f7e48f8c3944deab604caf566a96d2da596f4b1d5270a2cbe2038c51ea5d7d SHA512 58968c4793bd6d3c34c07781f849dafacb398502c28d4f9356b210c7ec2c743488a3041b06cb818c05766be3e97f54b84a4f0f8401940f9621d283ed3d467446
-EBUILD minio-2019.08.21.19.40.07.ebuild 11939 BLAKE2B 1f4ccf9bd8c6c3a04cce98ca212784e10e5c2c12043c11b903daf403e17b9e536645bcd15a0f07cd2cd892fb258aa2faf80de18b7881ff3833e7312725e20897 SHA512 b6179ff35ef06d333462c3b9b1b3b3a808e8dcd129c9217748d535948152762912c602cf87a9041cdc23b7fcb1b0e2ca4d5ed2e7c26cd46436102abfb123e8e8
-EBUILD minio-2019.08.29.00.25.01.ebuild 11939 BLAKE2B 1f4ccf9bd8c6c3a04cce98ca212784e10e5c2c12043c11b903daf403e17b9e536645bcd15a0f07cd2cd892fb258aa2faf80de18b7881ff3833e7312725e20897 SHA512 b6179ff35ef06d333462c3b9b1b3b3a808e8dcd129c9217748d535948152762912c602cf87a9041cdc23b7fcb1b0e2ca4d5ed2e7c26cd46436102abfb123e8e8
-EBUILD minio-2019.09.11.19.53.16.ebuild 12088 BLAKE2B 75b25e2bbffe3333b26e169b764943dd42678f0a8dd403500614db11e168e5c8a0a2138d4a1df35cf90760c4a3fbf51e52f0eebc283e7ca97f220acb55eaf1aa SHA512 22ffce5fcd3896a72baffab621bb5af5145913e0fa9bb114e770f921b813485f4ebe164275d9970ffcb66b27bba530e8a7ea077d2785e910c456d4b3ce29bc6c
+EBUILD minio-2019.04.04.18.31.46.ebuild 10326 BLAKE2B 10b7f6a9edcf87f669ccc2e8d70b4d4dfdb73e8045b86a1b200500557a411d118660290f487548d00879c9ad8335426d56a87f238b7d751155e0654a8ae62de7 SHA512 1104ecd0dffdf3bb7e50be6a1d0bd0e28da513d57ef1e0cd8bae27457636a5cce67028e537d3774c09b91c129adfd700ac464ea139de552926600a5907ac6a0e
+EBUILD minio-2019.04.09.01.22.30.ebuild 10326 BLAKE2B 10b7f6a9edcf87f669ccc2e8d70b4d4dfdb73e8045b86a1b200500557a411d118660290f487548d00879c9ad8335426d56a87f238b7d751155e0654a8ae62de7 SHA512 1104ecd0dffdf3bb7e50be6a1d0bd0e28da513d57ef1e0cd8bae27457636a5cce67028e537d3774c09b91c129adfd700ac464ea139de552926600a5907ac6a0e
+EBUILD minio-2019.04.18.01.15.57.ebuild 10326 BLAKE2B 10b7f6a9edcf87f669ccc2e8d70b4d4dfdb73e8045b86a1b200500557a411d118660290f487548d00879c9ad8335426d56a87f238b7d751155e0654a8ae62de7 SHA512 1104ecd0dffdf3bb7e50be6a1d0bd0e28da513d57ef1e0cd8bae27457636a5cce67028e537d3774c09b91c129adfd700ac464ea139de552926600a5907ac6a0e
+EBUILD minio-2019.04.18.21.44.59.ebuild 10326 BLAKE2B 10b7f6a9edcf87f669ccc2e8d70b4d4dfdb73e8045b86a1b200500557a411d118660290f487548d00879c9ad8335426d56a87f238b7d751155e0654a8ae62de7 SHA512 1104ecd0dffdf3bb7e50be6a1d0bd0e28da513d57ef1e0cd8bae27457636a5cce67028e537d3774c09b91c129adfd700ac464ea139de552926600a5907ac6a0e
+EBUILD minio-2019.04.23.23.50.36.ebuild 11244 BLAKE2B 014b54e3ba10d7f3b891486f8f6ffc322f3d91b36de091af362a749254a351c869e98f2eb7d8cc940a63e2c8fe92495750d7727a29f344834d5306746ea75ad1 SHA512 f4177744e8c6ba968da95218da1f8d4f7650cafb0c8fd437b5e6628e64567f693f8c4c18273ed3da38cb7957a5fd242067949fe6e71779394cd7ee0d056f5654
+EBUILD minio-2019.07.24.02.02.23.ebuild 11715 BLAKE2B 383fd87d30bf06e8f6a76d67048a333d44d48779aa8b265312d591a496f8b34358b5417adc6a02c87ba5fbe8b397fbda46b2c48c90323064691dfd50b9682a31 SHA512 16a669c067b257ad097ff8b68f81bdd4fcc21b3ce1159845ede1fc3999c2e3df1c5a77b365b55921fad71db2ec67cedd60f4dda282c46fd8e8c2d7157c71a2a1
+EBUILD minio-2019.07.31.18.57.56.ebuild 11715 BLAKE2B 383fd87d30bf06e8f6a76d67048a333d44d48779aa8b265312d591a496f8b34358b5417adc6a02c87ba5fbe8b397fbda46b2c48c90323064691dfd50b9682a31 SHA512 16a669c067b257ad097ff8b68f81bdd4fcc21b3ce1159845ede1fc3999c2e3df1c5a77b365b55921fad71db2ec67cedd60f4dda282c46fd8e8c2d7157c71a2a1
+EBUILD minio-2019.08.01.22.18.54.ebuild 11918 BLAKE2B a1a7bab2e7dfa8f1bca40977e9b7968c5f0472523f121ae4aa24d7d9c72784b887c6745f6648e15731ea5d1f3a5949c334ca600918b16d1f1071b4c499816339 SHA512 3d3eec522eb14022f58573bb1aaac7a4d2f944b472a778ce5d4f18fd357e64ba4963a55954c54530ee1357c74f749780fc0f9f9fbf9a62ed02847bbdb8cb90c3
+EBUILD minio-2019.08.14.20.37.41.ebuild 11918 BLAKE2B a1a7bab2e7dfa8f1bca40977e9b7968c5f0472523f121ae4aa24d7d9c72784b887c6745f6648e15731ea5d1f3a5949c334ca600918b16d1f1071b4c499816339 SHA512 3d3eec522eb14022f58573bb1aaac7a4d2f944b472a778ce5d4f18fd357e64ba4963a55954c54530ee1357c74f749780fc0f9f9fbf9a62ed02847bbdb8cb90c3
+EBUILD minio-2019.08.21.19.40.07.ebuild 11961 BLAKE2B 24e77744cfbdd5622105ea43eb188b3ebb37261c21fbd1e16d86c4f5c78f48f714120d501592f6e85f259ea0a6d7eaf2a8f4109407bcbdc152332a46c69440a9 SHA512 9c8d5ca90b19199e25cdeafcada60b9d0614286442fc379451c8348a2d93dd6cd2a9aba1f8d036129b153e11e86d099677cfd314c1de0f525f8eb7df4d50f495
+EBUILD minio-2019.08.29.00.25.01.ebuild 11961 BLAKE2B 24e77744cfbdd5622105ea43eb188b3ebb37261c21fbd1e16d86c4f5c78f48f714120d501592f6e85f259ea0a6d7eaf2a8f4109407bcbdc152332a46c69440a9 SHA512 9c8d5ca90b19199e25cdeafcada60b9d0614286442fc379451c8348a2d93dd6cd2a9aba1f8d036129b153e11e86d099677cfd314c1de0f525f8eb7df4d50f495
+EBUILD minio-2019.09.11.19.53.16.ebuild 12116 BLAKE2B 239142529bbce69eb1944e1b231f577198acaf6e8f596605f7da85b62f4c5be110fcfa4cacb87079591e5a72dd42176e6f86db306906ac208eb42fbc4f7cd028 SHA512 ee7b600ed56a0370fbefe3f441d2047a0d752b01ef7a953f6e17b570793b30af21dd762a7c6c08a61ecbdbb06d246c0b74e8add997bb76ba0414483e3ed08607
 MISC metadata.xml 323 BLAKE2B 53e4aa74bfb7ce2ce83686b69238aa7d248c06dfdf61703b7e5d40a099d0c972492a2a6eaed91fe16914443e1dab70ebd421c4dbec06064ac72736dc381d6a7e SHA512 827c8163d2b096af06bee067f81fb16236681807b71e945427290ee9b077be0520a4d18f404a8c75eef1d49eeaa36850d2035fd1addaf42dfada0922f2eac3b4
diff --git a/net-fs/minio/minio-2019.04.04.18.31.46.ebuild b/net-fs/minio/minio-2019.04.04.18.31.46.ebuild
index 275580fb0ffb..6808438e9ba2 100644
--- a/net-fs/minio/minio-2019.04.04.18.31.46.ebuild
+++ b/net-fs/minio/minio-2019.04.04.18.31.46.ebuild
@@ -125,7 +125,7 @@ KEYWORDS="~amd64 ~amd64-linux"
 DESCRIPTION="An Amazon S3 compatible object storage server"
 HOMEPAGE="https://github.com/minio/minio"
 SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="0"
 
 RESTRICT="test"
diff --git a/net-fs/minio/minio-2019.04.09.01.22.30.ebuild b/net-fs/minio/minio-2019.04.09.01.22.30.ebuild
index 275580fb0ffb..6808438e9ba2 100644
--- a/net-fs/minio/minio-2019.04.09.01.22.30.ebuild
+++ b/net-fs/minio/minio-2019.04.09.01.22.30.ebuild
@@ -125,7 +125,7 @@ KEYWORDS="~amd64 ~amd64-linux"
 DESCRIPTION="An Amazon S3 compatible object storage server"
 HOMEPAGE="https://github.com/minio/minio"
 SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="0"
 
 RESTRICT="test"
diff --git a/net-fs/minio/minio-2019.04.18.01.15.57.ebuild b/net-fs/minio/minio-2019.04.18.01.15.57.ebuild
index 275580fb0ffb..6808438e9ba2 100644
--- a/net-fs/minio/minio-2019.04.18.01.15.57.ebuild
+++ b/net-fs/minio/minio-2019.04.18.01.15.57.ebuild
@@ -125,7 +125,7 @@ KEYWORDS="~amd64 ~amd64-linux"
 DESCRIPTION="An Amazon S3 compatible object storage server"
 HOMEPAGE="https://github.com/minio/minio"
 SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="0"
 
 RESTRICT="test"
diff --git a/net-fs/minio/minio-2019.04.18.21.44.59.ebuild b/net-fs/minio/minio-2019.04.18.21.44.59.ebuild
index 275580fb0ffb..6808438e9ba2 100644
--- a/net-fs/minio/minio-2019.04.18.21.44.59.ebuild
+++ b/net-fs/minio/minio-2019.04.18.21.44.59.ebuild
@@ -125,7 +125,7 @@ KEYWORDS="~amd64 ~amd64-linux"
 DESCRIPTION="An Amazon S3 compatible object storage server"
 HOMEPAGE="https://github.com/minio/minio"
 SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="0"
 
 RESTRICT="test"
diff --git a/net-fs/minio/minio-2019.04.23.23.50.36.ebuild b/net-fs/minio/minio-2019.04.23.23.50.36.ebuild
index ba23747b2119..6549f81a620f 100644
--- a/net-fs/minio/minio-2019.04.23.23.50.36.ebuild
+++ b/net-fs/minio/minio-2019.04.23.23.50.36.ebuild
@@ -136,7 +136,7 @@ KEYWORDS="~amd64 ~amd64-linux"
 DESCRIPTION="An Amazon S3 compatible object storage server"
 HOMEPAGE="https://github.com/minio/minio"
 SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="0"
 
 RESTRICT="test"
diff --git a/net-fs/minio/minio-2019.07.24.02.02.23.ebuild b/net-fs/minio/minio-2019.07.24.02.02.23.ebuild
index 4f57a0ebede2..9d79fce13821 100644
--- a/net-fs/minio/minio-2019.07.24.02.02.23.ebuild
+++ b/net-fs/minio/minio-2019.07.24.02.02.23.ebuild
@@ -145,7 +145,7 @@ KEYWORDS="~amd64 ~amd64-linux"
 DESCRIPTION="An Amazon S3 compatible object storage server"
 HOMEPAGE="https://github.com/minio/minio"
 SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="0"
 
 RESTRICT="test"
diff --git a/net-fs/minio/minio-2019.07.31.18.57.56.ebuild b/net-fs/minio/minio-2019.07.31.18.57.56.ebuild
index 4f57a0ebede2..9d79fce13821 100644
--- a/net-fs/minio/minio-2019.07.31.18.57.56.ebuild
+++ b/net-fs/minio/minio-2019.07.31.18.57.56.ebuild
@@ -145,7 +145,7 @@ KEYWORDS="~amd64 ~amd64-linux"
 DESCRIPTION="An Amazon S3 compatible object storage server"
 HOMEPAGE="https://github.com/minio/minio"
 SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="0"
 
 RESTRICT="test"
diff --git a/net-fs/minio/minio-2019.08.01.22.18.54.ebuild b/net-fs/minio/minio-2019.08.01.22.18.54.ebuild
index 03c3ac317c05..e8ed769ce47b 100644
--- a/net-fs/minio/minio-2019.08.01.22.18.54.ebuild
+++ b/net-fs/minio/minio-2019.08.01.22.18.54.ebuild
@@ -148,7 +148,7 @@ KEYWORDS="~amd64 ~amd64-linux"
 DESCRIPTION="An Amazon S3 compatible object storage server"
 HOMEPAGE="https://github.com/minio/minio"
 SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="0"
 
 RESTRICT="test"
diff --git a/net-fs/minio/minio-2019.08.14.20.37.41.ebuild b/net-fs/minio/minio-2019.08.14.20.37.41.ebuild
index 03c3ac317c05..e8ed769ce47b 100644
--- a/net-fs/minio/minio-2019.08.14.20.37.41.ebuild
+++ b/net-fs/minio/minio-2019.08.14.20.37.41.ebuild
@@ -148,7 +148,7 @@ KEYWORDS="~amd64 ~amd64-linux"
 DESCRIPTION="An Amazon S3 compatible object storage server"
 HOMEPAGE="https://github.com/minio/minio"
 SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="0"
 
 RESTRICT="test"
diff --git a/net-fs/minio/minio-2019.08.21.19.40.07.ebuild b/net-fs/minio/minio-2019.08.21.19.40.07.ebuild
index c0b5ee79d46f..ab65d9024847 100644
--- a/net-fs/minio/minio-2019.08.21.19.40.07.ebuild
+++ b/net-fs/minio/minio-2019.08.21.19.40.07.ebuild
@@ -149,7 +149,7 @@ KEYWORDS="~amd64 ~amd64-linux"
 DESCRIPTION="An Amazon S3 compatible object storage server"
 HOMEPAGE="https://github.com/minio/minio"
 SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="0"
 
 RESTRICT="test"
diff --git a/net-fs/minio/minio-2019.08.29.00.25.01.ebuild b/net-fs/minio/minio-2019.08.29.00.25.01.ebuild
index c0b5ee79d46f..ab65d9024847 100644
--- a/net-fs/minio/minio-2019.08.29.00.25.01.ebuild
+++ b/net-fs/minio/minio-2019.08.29.00.25.01.ebuild
@@ -149,7 +149,7 @@ KEYWORDS="~amd64 ~amd64-linux"
 DESCRIPTION="An Amazon S3 compatible object storage server"
 HOMEPAGE="https://github.com/minio/minio"
 SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="0"
 
 RESTRICT="test"
diff --git a/net-fs/minio/minio-2019.09.11.19.53.16.ebuild b/net-fs/minio/minio-2019.09.11.19.53.16.ebuild
index 8ed7ee7897f1..9d8fad8d7cfd 100644
--- a/net-fs/minio/minio-2019.09.11.19.53.16.ebuild
+++ b/net-fs/minio/minio-2019.09.11.19.53.16.ebuild
@@ -132,8 +132,8 @@ EGO_VENDOR=( "gopkg.in/yaml.v2 51d6538a90f86fe93ac480b35f37b2be17fef232 github.c
 	     "gopkg.in/jcmturner/goidentity.v2 v2.0.0 github.com/jcmturner/goidentity"
 	     "gopkg.in/jcmturner/goidentity.v3 v3.0.0 github.com/jcmturner/goidentity"
 	     "github.com/kurin/blazer cf2f27cc0be3dac3c1a94c3c8b76834ce741439e"
-		 "gopkg.in/ldap.v3 v3.0.3 github.com/go-ldap/ldap"
-		 "gopkg.in/asn1-ber.v1 f715ec2f112d1e4195b827ad68cf44017a3ef2b1 github.com/go-asn1-ber/asn1-ber"
+	     "gopkg.in/ldap.v3 v3.0.3 github.com/go-ldap/ldap"
+	     "gopkg.in/asn1-ber.v1 f715ec2f112d1e4195b827ad68cf44017a3ef2b1 github.com/go-asn1-ber/asn1-ber"
 )
 
 inherit user golang-build golang-vcs-snapshot
@@ -150,7 +150,7 @@ KEYWORDS="~amd64 ~amd64-linux"
 DESCRIPTION="An Amazon S3 compatible object storage server"
 HOMEPAGE="https://github.com/minio/minio"
 SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="0"
 
 RESTRICT="test"
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index c858622e929f..50eaaa54d957 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -6,6 +6,7 @@ AUX nfs-utils-2.3.2-junction_libs.patch 1487 BLAKE2B 5ecd4709fdcbc1c0885c91aea13
 AUX nfs-utils-2.3.2-no-werror.patch 1375 BLAKE2B d494d00f81e236fd0531d4629108a4536415e3a6898b655f267b0125c0fd6b87cb567ef5cb7598fc19e68653572c1072566d7ef791fedb9f0c8d9ea663e67565 SHA512 acc3ccd6cf4afa73bbd253f6a1faa0349e6f8d50d57d9316fafa1faeb9f8ed5d5dfa60ec1b0a53339cd71af4d65b32d9595965ec435bc72eadcc86b8d187438b
 AUX nfs-utils-2.3.4-no-werror.patch 1832 BLAKE2B 6e0f3da6a355c3b828bbaae3135c3a6c8bab29008cf160ca728ff5b72402f108221b4def304e9bf36f98310407bee9c26d828ab833bb7a9619fdaf609e66d06c SHA512 ce76f46c8dcef8b151040b9d198843746b6c20507c23a0dc511b3d3dec7681b3ac65c089de3f09d4e496ffa1bd011c034ce70198def374058a0805daf4ec8292
 AUX nfs-utils-2.3.4_rc2-improved_res_querydomain_check.patch 1629 BLAKE2B 8d97392b754fefa5760c8c7c9d2f6615e5d9a6b3b29211fe2dbee85f3e01dc4c80dabe691beeb5d59410d1f917b5b597aed3da5958ac7c1de1cfc516bf617f4d SHA512 f4971098e0db597233806cbb79e4af7f3e2ed59280f7cc6f80b9e7b8684a5d53cd16a5e2c2ef1690daade84ca4676470217d0e65e750df103fd34363b6983de5
+AUX nfs-utils-2.4.1-Fix-include-order-between-config.h-and-stat.h.patch 4020 BLAKE2B 9f9079879be7bbaaf7748d4c2e5711fdeacac8b389fdb48d7fdc1c781191dc283f2dc05c9aded7558eb0cf3801cf7eda7032d091592e45cb8eb47018a0ce5430 SHA512 36b80e0f1ef0826e25ee719980171f4d6215db246392e1dbceef6aab4f1fbe78e4e1222256dfb23232b7da1b5328a23050966f3608a10c8b70b2f75491603f31
 AUX nfs-utils-2.4.1-gssd-Look-in-lib32-for-gss-libs-aswell.patch 1608 BLAKE2B 761eb16d6556b0df1029556453922925ccac7bdc88c4f769382afdf659dfccdd90aa6a183d317667c638e2d2d4d8fc080cfe49070c5fec5bb5f5dc2f66d2040e SHA512 cc4a7a7dde84854b52f57afe09bbff9e241712a19784febd0992b5b53b4b14905b6daf6620a8e9049fbda1dfe0a1619f322adc0517d9747466d7974d4c3eac06
 AUX nfs-utils.conf 74 BLAKE2B 504c298c1e8e7eb596cd87813f1aeeac5cbc830bb85be9e26ed98f7ed85cdbd14ae2c47b0e111c912398ef28ef629e6de7e585a7b161624e9698ea208750fd9f SHA512 d72c0fbdf12cb1ddf8eaa5885e1ed93a2078c40ca48eb8868836fb72fa456c4865df15273fb7472f70dfe8098167e695b1340ff9a59b55e73b47690baaf977d6
 AUX nfs.confd 930 BLAKE2B 4ef1662b31cffd78b0e96396ad74dc8b8135a9a18956fa1267639d2069893d4f218ded5809497b56d19a192e7e18408e1d1b56bd1535abed8db236bc1a1649cb SHA512 bc11b073735ee86c96b9c249ee187f4d16329c279a4e26760875059d2b5fa1d510ef3e4df5ee9dfb2a3133d755e1eb5c323d2fadc432a0cf630191ec353ac535
@@ -25,5 +26,6 @@ DIST nfs-utils-2.3.4.tar.bz2 906900 BLAKE2B 968fac7b37c7311bc8d29667c88db925aac0
 DIST nfs-utils-2.4.1.tar.bz2 910791 BLAKE2B 4419eff7fca21747e0bc4969ebb8a8b863aa951984af8f23f197e7dfc4faad3770173808862b84178714ca75f021be1af96f9e4408fecd7ef97999d261f2f21b SHA512 655a115955f35177b761f821e29c752693d614f4c6c2a90d392e0ab83b615247a397cf18e8ad453a93c6dc528d1fa90cfdf8b04de6626e0f4083b10e2e54f540
 EBUILD nfs-utils-2.3.3.ebuild 5534 BLAKE2B e70b34817cd313721687897c29622f66ac3c1c2e347f71a3ef6763d4693c121866e21dee282a9499661db2dfcf27a33a40a90cc80fe481859b402753c0ab1816 SHA512 f5afca6badb7be19d708632a624d535ffdd7abad2fac6ccc59295061f9354c5db66cacb841001dcc2039f5380a29e4f56450105311d42c38b7b2c60786a7373b
 EBUILD nfs-utils-2.3.4.ebuild 5274 BLAKE2B 8ac149fa4f44491d101a7fbdd283f7b0bfc1db7183c2622d54f0e39f1a3b477fc0ce52481d6ee13478e03e0f6dec08d04507e775a3851aab80c0f11586c18ad5 SHA512 97b33afd3742f740754502d991dbc2d99ddb4c361af497db0bc2c026315354bb45e82625c68a7ef198aa7f6dced68b325f82521a482a8d434bca24faa992aeb7
-EBUILD nfs-utils-2.4.1-r1.ebuild 5885 BLAKE2B a10469ff0db08c9f593395e78653da622b9c06fb12592a0d0c5586e5c110ca3bdec60e9565b63415f7210387b5746ba1f6481003785aaed934f22df16fa1567f SHA512 e2f57b4c9761201305e8f70e161fb9704cd10899d8673ed643aa969a400e79d1022eab1053935f8bbfba9933d92d09fb027ef5003c19f1617907733eded72b9c
+EBUILD nfs-utils-2.4.1-r1.ebuild 5883 BLAKE2B f5d7a4cb014005d45ad02fe768465a7c7610bf11979b613d325519475e92ffcfcc5669b5db69c295b88076aa4401e5d7d8f8cda5099530d359df61ef4111b963 SHA512 10395eb302a7a3c4fd3d79d06c741a06133b560ac84ec4109623d9fa1395e3c3935bc9fc68b3badbc46088f4db4a0717764fd64aa3681d0327ef3ba03b7362cb
+EBUILD nfs-utils-2.4.1-r2.ebuild 5966 BLAKE2B cfbd2bdd3c8967f71cf95eee655cfe39f18fa7690a8f3fcfff9e71d803b4f13e8dbc184920c10d7a209b773a0f66396c3105ee84f67c5727703c79b4fc446185 SHA512 244423891fc20796f48efc3692e4fe279fbae79d392bfe9012767f74dbfb9e872fd03c7b3cbe2d0e5ccb362233291c6c14429b3d11f0e0e27f457022b3f2c012
 MISC metadata.xml 932 BLAKE2B 14cb95a010cdb52373502bdad4de008234494be6e38f6b3fbf6b69e0848a6daa1315ed69b8eaadaad0cd546e84ba0e291b56ebf9db486b7c6e66011147b9a97c SHA512 eb45c97d7ed2bdaa8e43ce0a4fdb2f8a1d197bfd67a8b04f718c6083e7701873e2c22550700049edc25068daacb5278ca2535b63a02a10c1040efe0dbcef76a5
diff --git a/net-fs/nfs-utils/files/nfs-utils-2.4.1-Fix-include-order-between-config.h-and-stat.h.patch b/net-fs/nfs-utils/files/nfs-utils-2.4.1-Fix-include-order-between-config.h-and-stat.h.patch
new file mode 100644
index 000000000000..836a2af54078
--- /dev/null
+++ b/net-fs/nfs-utils/files/nfs-utils-2.4.1-Fix-include-order-between-config.h-and-stat.h.patch
@@ -0,0 +1,151 @@
+From 2fbc62e2a13fc22b6ae4910e295a2c10fb790486 Mon Sep 17 00:00:00 2001
+From: Zoltan Karcagi <zkr7432@gmail.com>
+Date: Mon, 12 Aug 2019 13:27:16 -0400
+Subject: [PATCH] Fix include order between config.h and stat.h
+
+At least on Arch linux ARM, the definition of struct stat in stat.h depends
+on __USE_FILE_OFFSET64. This symbol comes from config.h when defined,
+therefore config.h must always be included before stat.h. Fix all
+occurrences where the order is wrong by moving config.h to the top.
+
+This fixes the client side error "Stale file handle" when mounting from
+a server running Arch Linux ARM.
+
+Signed-off-by: Zoltan Karcagi <zkr7432@gmail.com>
+Signed-off-by: Steve Dickson <steved@redhat.com>
+---
+ support/misc/nfsd_path.c         | 5 ++++-
+ support/misc/xstat.c             | 5 ++++-
+ support/nfs/conffile.c           | 8 +++++++-
+ utils/blkmapd/device-discovery.c | 8 ++++----
+ utils/idmapd/idmapd.c            | 8 ++++----
+ 5 files changed, 23 insertions(+), 11 deletions(-)
+
+diff --git a/support/misc/nfsd_path.c b/support/misc/nfsd_path.c
+index 84e48028..f078a668 100644
+--- a/support/misc/nfsd_path.c
++++ b/support/misc/nfsd_path.c
+@@ -1,3 +1,7 @@
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
+ #include <errno.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -5,7 +9,6 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ 
+-#include "config.h"
+ #include "conffile.h"
+ #include "xmalloc.h"
+ #include "xlog.h"
+diff --git a/support/misc/xstat.c b/support/misc/xstat.c
+index fa047880..4c997eea 100644
+--- a/support/misc/xstat.c
++++ b/support/misc/xstat.c
+@@ -1,3 +1,7 @@
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
+ #include <errno.h>
+ #include <sys/types.h>
+ #include <fcntl.h>
+@@ -5,7 +9,6 @@
+ #include <sys/sysmacros.h>
+ #include <unistd.h>
+ 
+-#include "config.h"
+ #include "xstat.h"
+ 
+ #ifdef HAVE_FSTATAT
+diff --git a/support/nfs/conffile.c b/support/nfs/conffile.c
+index b6400bec..6ba8a35c 100644
+--- a/support/nfs/conffile.c
++++ b/support/nfs/conffile.c
+@@ -500,7 +500,7 @@ conf_readfile(const char *path)
+ 
+ 	if ((stat (path, &sb) == 0) || (errno != ENOENT)) {
+ 		char *new_conf_addr = NULL;
+-		size_t sz = sb.st_size;
++		off_t sz;
+ 		int fd = open (path, O_RDONLY, 0);
+ 
+ 		if (fd == -1) {
+@@ -517,6 +517,11 @@ conf_readfile(const char *path)
+ 
+ 		/* only after we have the lock, check the file size ready to read it */
+ 		sz = lseek(fd, 0, SEEK_END);
++		if (sz < 0) {
++			xlog_warn("conf_readfile: unable to determine file size: %s",
++				  strerror(errno));
++			goto fail;
++		}
+ 		lseek(fd, 0, SEEK_SET);
+ 
+ 		new_conf_addr = malloc(sz+1);
+@@ -2162,6 +2167,7 @@ conf_write(const char *filename, const char *section, const char *arg,
+ 	ret = 0;
+ 
+ cleanup:
++	flush_outqueue(&inqueue, NULL);
+ 	flush_outqueue(&outqueue, NULL);
+ 
+ 	if (buff)
+diff --git a/utils/blkmapd/device-discovery.c b/utils/blkmapd/device-discovery.c
+index e811703d..f5f9b10b 100644
+--- a/utils/blkmapd/device-discovery.c
++++ b/utils/blkmapd/device-discovery.c
+@@ -26,6 +26,10 @@
+  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif /* HAVE_CONFIG_H */
++
+ #include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -51,10 +55,6 @@
+ #include <errno.h>
+ #include <libdevmapper.h>
+ 
+-#ifdef HAVE_CONFIG_H
+-#include "config.h"
+-#endif /* HAVE_CONFIG_H */
+-
+ #include "device-discovery.h"
+ #include "xcommon.h"
+ #include "nfslib.h"
+diff --git a/utils/idmapd/idmapd.c b/utils/idmapd/idmapd.c
+index 62e37b8a..267acea5 100644
+--- a/utils/idmapd/idmapd.c
++++ b/utils/idmapd/idmapd.c
+@@ -34,6 +34,10 @@
+  *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif /* HAVE_CONFIG_H */
++
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/inotify.h>
+@@ -62,10 +66,6 @@
+ #include <libgen.h>
+ #include <nfsidmap.h>
+ 
+-#ifdef HAVE_CONFIG_H
+-#include "config.h"
+-#endif /* HAVE_CONFIG_H */
+-
+ #include "xlog.h"
+ #include "conffile.h"
+ #include "queue.h"
+-- 
+2.21.0
+
diff --git a/net-fs/nfs-utils/nfs-utils-2.4.1-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.4.1-r1.ebuild
index f836166582d2..26604696ea86 100644
--- a/net-fs/nfs-utils/nfs-utils-2.4.1-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.4.1-r1.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" = *_rc* ]] ; then
 	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
 	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-fs/nfs-utils/nfs-utils-2.4.1-r2.ebuild b/net-fs/nfs-utils/nfs-utils-2.4.1-r2.ebuild
new file mode 100644
index 000000000000..778fbf1dd67e
--- /dev/null
+++ b/net-fs/nfs-utils/nfs-utils-2.4.1-r2.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic linux-info multilib systemd
+
+DESCRIPTION="NFS client and server daemons"
+HOMEPAGE="http://linux-nfs.org/"
+
+if [[ "${PV}" = *_rc* ]] ; then
+	MY_PV="$(ver_rs 1- -)"
+	SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
+else
+	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="caps ipv6 junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 selinux tcpd +uuid"
+REQUIRED_USE="kerberos? ( nfsv4 )"
+RESTRICT="test" #315573
+
+# kth-krb doesn't provide the right include
+# files, and nfs-utils doesn't build against heimdal either,
+# so don't depend on virtual/krb.
+# (04 Feb 2005 agriffis)
+DEPEND="
+	>=dev-db/sqlite-3.3
+	dev-libs/libxml2
+	net-libs/libtirpc:=
+	>=net-nds/rpcbind-0.2.4
+	sys-libs/e2fsprogs-libs
+	caps? ( sys-libs/libcap )
+	ldap? ( net-nds/openldap )
+	libmount? ( sys-apps/util-linux )
+	nfsv4? (
+		dev-libs/libevent:=
+		>=sys-apps/keyutils-1.5.9:=
+		kerberos? (
+			>=net-libs/libtirpc-0.2.4-r1[kerberos]
+			app-crypt/mit-krb5
+		)
+	)
+	nfsv41? (
+		sys-fs/lvm2
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+	uuid? ( sys-apps/util-linux )"
+RDEPEND="${DEPEND}
+	!net-libs/libnfsidmap
+	!net-nds/portmap
+	!<sys-apps/openrc-0.13.9
+	selinux? (
+		sec-policy/selinux-rpc
+		sec-policy/selinux-rpcbind
+	)
+"
+BDEPEND="
+	net-libs/rpcsvc-proto
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
+	"${FILESDIR}"/${PN}-1.2.8-cross-build.patch
+	"${FILESDIR}"/${PN}-2.3.4-no-werror.patch
+	"${FILESDIR}"/${P}-gssd-Look-in-lib32-for-gss-libs-aswell.patch
+	"${FILESDIR}"/${P}-Fix-include-order-between-config.h-and-stat.h.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	if use nfsv4 && ! use nfsdcld && linux_config_exists && ! linux_chkconfig_present CRYPTO_MD5 ; then
+		ewarn "Your NFS server will be unable to track clients across server restarts!"
+		ewarn "Please enable the \"${HILITE}nfsdcld${NORMAL}\" USE flag to install the nfsdcltrack usermode"
+		ewarn "helper upcall program, or enable ${HILITE}CONFIG_CRYPTO_MD5${NORMAL} in your kernel to"
+		ewarn "support the legacy, in-kernel client tracker."
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed \
+		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
+		-i utils/*/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
+	export ac_cv_header_keyutils_h=$(usex nfsidmap)
+	local myeconfargs=(
+		--with-statedir="${EPREFIX%/}"/var/lib/nfs
+		--enable-tirpc
+		--with-tirpcinclude="${EPREFIX%/}"/usr/include/tirpc/
+		--with-pluginpath="${EPREFIX%/}"/usr/$(get_libdir)/libnfsidmap
+		--with-rpcgen
+		--with-systemd="$(systemd_get_systemunitdir)"
+		--without-gssglue
+		$(use_enable caps)
+		$(use_enable ipv6)
+		$(use_enable junction)
+		$(use_enable kerberos gss)
+		$(use_enable kerberos svcgss)
+		$(use_enable ldap)
+		$(use_enable libmount libmount-mount)
+		$(use_enable nfsdcld nfsdcltrack)
+		$(use_enable nfsv4)
+		$(use_enable nfsv41)
+		$(use_enable uuid)
+		$(use_with tcpd tcp-wrappers)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile(){
+	# remove compiled files bundled in the tarball
+	emake clean
+	default
+}
+
+src_install() {
+	default
+	rm linux-nfs/Makefile* || die
+	dodoc -r linux-nfs README
+
+	# Don't overwrite existing xtab/etab, install the original
+	# versions somewhere safe...  more info in pkg_postinst
+	keepdir /var/lib/nfs/{,sm,sm.bak}
+	mv "${ED}"/var/lib/nfs "${ED}"/usr/$(get_libdir)/ || die
+
+	# Install some client-side binaries in /sbin
+	dodir /sbin
+	mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
+
+	if use nfsv4 && use nfsidmap ; then
+		insinto /etc
+		doins support/nfsidmap/idmapd.conf
+
+		# Install a config file for idmappers in newer kernels. #415625
+		insinto /etc/request-key.d
+		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
+		doins id_resolver.conf
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/exports
+	keepdir /etc/exports.d
+
+	local f list=() opt_need=""
+	if use nfsv4 ; then
+		opt_need="rpc.idmapd"
+		list+=( rpc.idmapd rpc.pipefs )
+		use kerberos && list+=( rpc.gssd rpc.svcgssd )
+	fi
+	for f in nfs nfsclient rpc.statd "${list[@]}" ; do
+		newinitd "${FILESDIR}"/${f}.initd ${f}
+	done
+	newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount # Nuke after 2015/08/01
+	for f in nfs nfsclient ; do
+		newconfd "${FILESDIR}"/${f}.confd ${f}
+	done
+	sed -i \
+		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
+		"${ED}"/etc/conf.d/nfs || die #234132
+
+	local systemd_systemunitdir="$(systemd_get_systemunitdir)"
+	sed -i \
+		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
+		"${ED}${systemd_systemunitdir}"/* || die
+
+	keepdir /var/lib/nfs #368505
+	keepdir /var/lib/nfs/v4recovery #603628
+
+}
+
+pkg_postinst() {
+	# Install default xtab and friends if there's none existing.  In
+	# src_install we put them in /usr/lib/nfs for safe-keeping, but
+	# the daemons actually use the files in /var/lib/nfs.  #30486
+	local f
+	for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
+		[[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
+		einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
+		cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
+	done
+
+	if systemd_is_booted; then
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -lt 1.3.0; then
+				ewarn "We have switched to upstream systemd unit files. Since"
+				ewarn "they got renamed, you should probably enable the new ones."
+				ewarn "You can run 'equery files nfs-utils | grep systemd'"
+				ewarn "to know what services you need to enable now."
+			fi
+		done
+	else
+		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
+		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
+		ewarn "same runlevel as nfsmount."
+	fi
+}