gentoo resync : 10.02.2020

47 files changed, 543 insertions, 150 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index cfa49d9f9ad1..dc474082ff28 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 9fcb5757fd70..51b6ab04e848 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -3,9 +3,9 @@ DIST btrfs-progs-v4.19.tar.xz 2001340 BLAKE2B 117087adcb57e4ebf6a2e9c66bf0ad2b09
 DIST btrfs-progs-v4.4.1.tar.xz 1173248 BLAKE2B 8bf07a3bc3d24a3f641c2dc7a6353f186ebd98f7a633bdbc2689359e6204b3f1db76accee3e648634f319e26b57e6376c13fa31d39413908d0b2308e0ae28d0e SHA512 3086e2e0385d9e14edcfa25e1aee1ed98087dd5b91a66aa450786c932d79841b5c4ee3f9a40b8fdecee0ba1e386196b89679d28e58e4924ce66cd78c5e3c0d4a
 DIST btrfs-progs-v5.4.1.tar.xz 2107476 BLAKE2B 1ea58f49b0f8185e944010804e544643a2eafeea58fecb480b13095c362350c218f0602fbb43a96705a81befe88ec3e3abe35cc90d4732006479b059aa7fed32 SHA512 56381b37036aecea61b758fb4971abfeda24a387bb3a828f7d54eb068982a37763a8ebe2bcc6be61d6a8bc2057dddcd4754325b236e14d8ec02e58cf711f192f
 DIST btrfs-progs-v5.4.tar.xz 2103432 BLAKE2B 8ed1321c61d73b66bd27b37a255056e601302dacdcf2dd3122d1b7c41e537ebd1aa5df51100e61458084ec15efd6a1aa478d13f424d45d33d7454d886214a994 SHA512 cc445b9e2b7c5a0adeaa0c467de797f240e4ee9b58c6ac51b9dad51bc0ba0c580fd265efebc04fa46dc23e5b3c4d6baf3ad0b8e2e82728cf34ef51973f028a90
-EBUILD btrfs-progs-4.19.ebuild 2894 BLAKE2B 7e925cef1d0f7173dfdf19c21e9b5ae279dba0ccb54bcad8a193d354de76a3fac3ad09a2986ffdcd7fdeeac07f506685ae85a5222aa3421a48b6fc1831b319f0 SHA512 48cc6f6dc9c50bc55fa38b07202303a7c329ae9951f8a2b487dab896e4fa5fecab22fa5a3ffc94c295b1d75d26d64cf9fab7e9d759853afe7aaf152ecc3258de
+EBUILD btrfs-progs-4.19.ebuild 2935 BLAKE2B ec90c74cd306183cf06e9a16551d0bb3c029eed1336ee32ba06fc243fa6598cfeacf896334e36855055031c67c49d4eaac15f27d6c2c13e1dbe125cfef757c7d SHA512 cd4490f127fa27ffd9916c8464c3dcf6453d5da8e9a4ba81e3c4ddcc6fa17740293c7324a80c1bc5d3faa2a28b6f7dbcf5cba577cf6a9e09652fb1a02bb66cff
 EBUILD btrfs-progs-4.4.1.ebuild 2233 BLAKE2B 3aebd699880baa42196d1fc632ef36023401fa142d46f3d919c256a0b49209fee96f96b3a9e858e67c6b35f3298044c556ecdfcbf883532f134e4a3874b6e193 SHA512 af818f7c469477dd83fa3129d4f7065aaec0652fda04498c7f1aeeb03a3c60e4dd502545efdc24e37839d73d22a7fc4f82023a302f77a03c01ce016bd43b4aad
-EBUILD btrfs-progs-5.4.1.ebuild 3016 BLAKE2B 20ba919b88e1700f48fc5b600359211f9cc68c18889ab7fffd8b632a9197c6c2afc0d315a74e35d55e8b081b216ead9b817110832015933d772bb3eff8805c1d SHA512 390b2caea1825be56835c3f53ace56370ece103b7c2be0c4070e86e73aa665fd5c01539711266e3cf85a897cde75d8255e6cea6a5d4670909f1ea69e85052c05
-EBUILD btrfs-progs-5.4.ebuild 3021 BLAKE2B 897e13c0ac0c7cb1672e7378a6d019bf7c37dcb2ef06ae67caf839090ac1b2c9449f188a34558ea562adaf0fa82cad335ee0644652e5b298e55668925a18bf09 SHA512 aebd9316b8b7c80b458337b8a22544bacb393dc8ec7fedab75f7986c6caf1e7e60128f5b53c3d0e3f58cd45a03fd35aa729f8331d1f30c3e44e2dea5964878b4
-EBUILD btrfs-progs-9999.ebuild 3021 BLAKE2B 897e13c0ac0c7cb1672e7378a6d019bf7c37dcb2ef06ae67caf839090ac1b2c9449f188a34558ea562adaf0fa82cad335ee0644652e5b298e55668925a18bf09 SHA512 aebd9316b8b7c80b458337b8a22544bacb393dc8ec7fedab75f7986c6caf1e7e60128f5b53c3d0e3f58cd45a03fd35aa729f8331d1f30c3e44e2dea5964878b4
-MISC metadata.xml 759 BLAKE2B 3f94ebaadb23c54121e8ffa1b80549b9e8a9d977d26ddcfdd8772e549e55fc762fcca5c8e2374a562dd9992086949eff626be71aa6da8326f8847cbc4f791fb7 SHA512 ababf03834be253af5402e167e7883fc73c6ad47198369eba02557e07ec8baaa81140837315e98979dc4b95ca160d2d984e970acdbf0ea4db9c2a9e9deddc9a8
+EBUILD btrfs-progs-5.4.1.ebuild 3057 BLAKE2B ea4719eae94d8466501d701ef0734ac95ad009535f7b7cd60a9d5fe5d569385102d69237874fea58688686a57e256d443b73af5329135c5b55b3ad336a960575 SHA512 7349724ea6470a3b46a69c9d959860cfa3c0a791a28359ff7b80f8dc829bd9acd6e3fedff5d6dc3f769f090a5ed9e39c904979fa5c80fb618c4361ab5d1c41c0
+EBUILD btrfs-progs-5.4.ebuild 3062 BLAKE2B a0ddb0bf111a4c716bdb9d67e3b0192586b019d846d8597ed4bfbb7dc75d4837cedab792e6669830771faf150a87e1c714629848d72d1c817a233aeb07c609af SHA512 62789c672e68734a8b7acfbf1bb646b3b31a90289eb9534b841178c09f9cb0f61885d72c081fa3de1585b3cca05d902471089c6a415a4feeeb5a60eb0ae04beb
+EBUILD btrfs-progs-9999.ebuild 3062 BLAKE2B a0ddb0bf111a4c716bdb9d67e3b0192586b019d846d8597ed4bfbb7dc75d4837cedab792e6669830771faf150a87e1c714629848d72d1c817a233aeb07c609af SHA512 62789c672e68734a8b7acfbf1bb646b3b31a90289eb9534b841178c09f9cb0f61885d72c081fa3de1585b3cca05d902471089c6a415a4feeeb5a60eb0ae04beb
+MISC metadata.xml 641 BLAKE2B 19bc0129354cdadfd5b7235d350d353ca9117339173a7974c3a66339f7941aa85cc8bd65ae2a02c658e4cce707e41242b17ffd0f8a7699b255415a131e0e9e31 SHA512 03901f600a69c9246533f90378e17c861dc2fee5f5621aa33d7e08b5f3119f4c58b14b4f2bdc65d8dc1e2b111ee57064ad26aa23ba1f8a37ee34217f4cda7486
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
index 14922a652c3c..12bf74643416 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
@@ -50,7 +50,11 @@ DEPEND="${RDEPEND}
 	>=app-text/asciidoc-8.6.0
 	app-text/docbook-xml-dtd:4.5
 	app-text/xmlto
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	static? (
 		dev-libs/lzo:2[static-libs(+)]
 		sys-apps/util-linux:0[static-libs(+)]
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.4.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.4.1.ebuild
index b42145c66b47..279448662bff 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.4.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.4.1.ebuild
@@ -47,7 +47,11 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	convert? ( sys-apps/acl )
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	static? (
 		dev-libs/lzo:2[static-libs(+)]
 		sys-apps/util-linux:0[static-libs(+)]
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.4.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.4.ebuild
index 43710cbc3332..87c21e1d5e81 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.4.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.4.ebuild
@@ -47,7 +47,11 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	convert? ( sys-apps/acl )
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	static? (
 		dev-libs/lzo:2[static-libs(+)]
 		sys-apps/util-linux:0[static-libs(+)]
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index 43710cbc3332..87c21e1d5e81 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -47,7 +47,11 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	convert? ( sys-apps/acl )
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 	static? (
 		dev-libs/lzo:2[static-libs(+)]
 		sys-apps/util-linux:0[static-libs(+)]
diff --git a/sys-fs/btrfs-progs/metadata.xml b/sys-fs/btrfs-progs/metadata.xml
index 7de09065cc96..fa11b7da7f87 100644
--- a/sys-fs/btrfs-progs/metadata.xml
+++ b/sys-fs/btrfs-progs/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>slyfox@gentoo.org</email>
-    <name>Sergei Trofimovich</name>
-  </maintainer>
-  <maintainer type="person">
     <email>polynomial-c@gentoo.org</email>
     <name>Lars Wendler</name>
   </maintainer>
diff --git a/sys-fs/btrfsmaintenance/Manifest b/sys-fs/btrfsmaintenance/Manifest
index 335dc6b97d90..949d5f63b974 100644
--- a/sys-fs/btrfsmaintenance/Manifest
+++ b/sys-fs/btrfsmaintenance/Manifest
@@ -3,6 +3,6 @@ DIST btrfsmaintenance-0.4.1.tar.gz 21621 BLAKE2B 36632d64022c7bf64548b0f6076640e
 DIST btrfsmaintenance-0.4.2.tar.gz 21826 BLAKE2B 0efc06b6780d7e75573958cd979b991580d518ab756ae80c9f4328f113ab7de87367c6730c23b408298919ac740da3b0ec85ae76face60ad97bf75d9aaa2a178 SHA512 802c131edfbc07bca13b89cd8bfc90923b2f23ba780dcb07009a4c4991a588c66a6ffe780938e66ab632201980e5087cd0751cd9185a8bae1a5faba84bf87233
 DIST btrfsmaintenance-0.4.tar.gz 21622 BLAKE2B 844d467b7712093370c1d6391e26d5046deb84cee6fd60b5774743415c75ad00a1e27c0be21004c260680b72b5615dcfd01b84f1eba3d57f7c9c5d22b6750d8d SHA512 2d19e82c03b291d157dc5f763dcb094330fd1a4aaee6215dbe576a5da44f71f4adee55fd06c60409e4699ac671d2fc73628f202f4f68270910eeba782f0ad153
 EBUILD btrfsmaintenance-0.4.1-r1.ebuild 2061 BLAKE2B 4d019f8de6871da3319c52d040c2d23f7abbe52f804450801a20d97451b5ab70b7bd705f1aa0f23fd383fb57e82e80b38a55c8fd2da0792186bfa80e52726d3b SHA512 ba9f8b94f49b686f637086f68a6db23437a13bd661ee03ae2b4b26e114e0aa5b179ae29d3a9191348750be6b47f950f0d55ddb8bdb288fcee93545a78019df8f
-EBUILD btrfsmaintenance-0.4.2.ebuild 2020 BLAKE2B 1f14812ae0d4e72c14abad57dc08ac6f343d2906edad6a368b28ffacd12c630b98562f52c68951f3567d95f3979e2387d22c5349fdf840ccb13772c40dc09c45 SHA512 134a2d4c7232a53d25e2b5c4b0950529dac4aaf25d3a64f9f926edc09fcdf0fc0a514003448672ace474b6e4b56d00938c3892ee6f54382ee2318c84b3663cae
+EBUILD btrfsmaintenance-0.4.2.ebuild 2014 BLAKE2B 3be5d5624357b8a62497e9965f738ae09a183987938e9de9af908c3e10b55671fbe1f4bc93bde77abbcbb28bebbc4a5ca3652e7755739de0dd095e4515108d15 SHA512 54e679afa1ed4accf57acfa31ee8d517cb11e232b7cfdef9f45521e0357fca31908b995e56e7d43d5cfc787dddb2fc30c51c9cefc9fbf6c0acbfc18111aa5293
 EBUILD btrfsmaintenance-0.4.ebuild 2052 BLAKE2B 066777c1ce55409a50ea2e1a640881cc0161ebc128e1d5d84bf7081f0ce5834bcf00ff5dc2d85d8fedccc7d2283223bf0842d227604fc6bd9ab3c2ac31de249c SHA512 80c3f7ae618e6b14dff3aae9d8387654de280388cbb7607d8a347d016c7c73a5015942fd1bf1a2fbbbd1f1e68e139c1d3af393aee6d4bd56b6836ee7c65c3b1a
 MISC metadata.xml 564 BLAKE2B a54366a1b7a22e5b6f7ba8814ebcc75e4fb6185a5ce49f021bc2dec51277f31f82cafd4cf2de29918b97aa9276485bdc0dcf42d21e65d71636d3ab6ea4bf78da SHA512 6affb15730bb1ec7d8601c46ac5ea9f48b603d36825b364831459025764080641f51644af6c838d0e6de9edca766236662d068ee5893ba811687c4a1d7585bdc
diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.2.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.2.ebuild
index ed7fa2413f8b..3406ed71445e 100644
--- a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.2.ebuild
+++ b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.2.ebuild
@@ -41,9 +41,9 @@ src_install() {
 pkg_postinst() {
 	elog "Installing default btrfsmaintenance scripts"
 	if use systemd; then
-		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer || die
+		"${EROOT}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer || die
 	else
-		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh || die
+		"${EROOT}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh || die
 	fi
 	elog "Now edit cron periods and mount points in /etc/default/btrfsmaintenance "
 	elog "then run /usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh to"
@@ -57,6 +57,6 @@ pkg_postinst() {
 pkg_prerm() {
 	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
 		elog "Removing symlinks from btrfsmaintenance cron tasks"
-		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh uninstall || die
+		"${EROOT}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh uninstall || die
 	fi
 }
diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index 0f5ab181e737..73d10643ac07 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -1,6 +1,6 @@
 AUX cryfs-0.10.2-install-targets.patch 1296 BLAKE2B d43ada858124c67242fdf537ae3dd7e6b7bf3566ee564dae47aaa0b0ee3ae20c2beada683d8cda12518f89bda2919ec296c26d004c48a5bbc953aa6c23bc9dc8 SHA512 c097dcc9893dbe7f6098ab80d9937810856de16e6c34ede558dc30edf76571a2e1ef2fdd91fd8d14b2e40d5e32246d08d198cd3ba28f33d19442cd8c2332b4e7
 AUX cryfs-0.10.2-unbundle-libs.patch 15634 BLAKE2B dc484cc722cf80e605f52f3b193b1ae5747ad01b796a6b7d8fd81b03be9bcde456591f94d2839c3be3a39dc2a9975ba503d8ad369bf838232157cf1385ef43d6 SHA512 815956b160f5f117a5c4f89babe088e6f485d89a58feb12d514ff0fd3d39752db6695f7a9a2e279d88eb3ef490394dd03ee8b0ca2d04f66793096fac742ae45c
 DIST cryfs-0.10.2.tar.xz 7902252 BLAKE2B 704d124ed32a8a958f400188af99498cedb706ccfc004131b677a113b6ab2733942becb1ab64fd06d0b9d5b39f7abe832b3b0669caaf2b6feb7c6577c8c7fbfd SHA512 e49dd6d1e402d968cc4df0e8ca0460a01a27e4e73482041dca0fa9cde905a91d12e2bda18d257a044335e32e316b9363cecf374eb2ca621924b394dd2fabcb8f
-EBUILD cryfs-0.10.2.ebuild 2260 BLAKE2B 53dc41edfa47c3453106728138684e035d635979fb2992e4e313bf992d79d0035b75f8fdff9f69620840a5169d3aee36e4a1df1fc94874d7726ac045961bca39 SHA512 56ec304e947279413c2b6fdcb618f8adf16d97df5c010713c7c0ae6ff700e266fc1fcf5129acd32508bb6ab259c55d6bc30e74e9c6132413357a07f03f61fa2b
+EBUILD cryfs-0.10.2.ebuild 2250 BLAKE2B da3a6a49c0f7c5a9d944ec3159ebf5d3dcd2b6b3017b68b4021cc7e3a32c0ee2ee1326398f5dfc66547517d0bfa8271f4ee043adce486fcb760f122e25c34182 SHA512 0384c4f90c69f8ddb5f4a2e5345c1e89a4e47f0786a4a4eff1ae5bff505115ab0d62853810bed3452c8cc961c429a5606aba99c5d40eb531c9bbc890c0f650da
 EBUILD cryfs-9999.ebuild 2309 BLAKE2B a461261be9418b221dd1518110fb10795f26469d182cc0c8af729146c8378690997469cfa4fa2d09646583562018d5d4e4df164d0c814bc9f7cf5fa2a488b8a7 SHA512 f69c9d7d77be022931471cd4108a13d043e7356b832ad9e08695816556bcef73bbbd5a59906c6ee8e35615599196372de382f386e932988d02bcfb9fb9018f41
 MISC metadata.xml 501 BLAKE2B 8179813b2f222cf59af3842b2becc2acb84e529645f902bd7c197ec171a8882cd4083df9903ea648b1c5d5d062d6be5b5f20e82d53529e41d390aded450ccbc4 SHA512 9d6170ff1a7e2f56840911f35ec5d1ec3cbe8571fdf1a29738a1f608785643bfbef7d8e6ee0f8f2b954ff1128d4a7080b73729e46337b9e1878390f3892c1386
diff --git a/sys-fs/cryfs/cryfs-0.10.2.ebuild b/sys-fs/cryfs/cryfs-0.10.2.ebuild
index 384dc785fe06..8bae478822f8 100644
--- a/sys-fs/cryfs/cryfs-0.10.2.ebuild
+++ b/sys-fs/cryfs/cryfs-0.10.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit cmake flag-o-matic linux-info python-any-r1
 
 if [[ ${PV} == 9999 ]] ; then
diff --git a/sys-fs/cryptmount/Manifest b/sys-fs/cryptmount/Manifest
index b2b0ac6be840..905abd18efb6 100644
--- a/sys-fs/cryptmount/Manifest
+++ b/sys-fs/cryptmount/Manifest
@@ -1,5 +1,3 @@
-DIST cryptmount-5.3.1.tar.gz 748020 BLAKE2B 63c66717ed8a8ede983894564576d26720a571b47bd33f3cd160596d831c017c7239b307eb9fb8112c6a51f91799117a47392675f9fe53c0286ada84887d528e SHA512 c4bfb7a2bd2f672dfed014d3a4b1feaa4d20237f9b658ea981a0a054e83ad4d0282089a006ceb769ee05e0cf6ecd004c97b48d69973ed630330e77bf13925680
 DIST cryptmount-5.3.2.tar.gz 545190 BLAKE2B 708c6ba33060c0698361de7bcdc5e0a5932e063c9178c0a6b9cfb1cba9ec236337dbda0664e8755cc017113ee8ef0149c47fc85019a57ac84bf240790d5d798c SHA512 972c7fefadb86bb82cdeb96b185f45bec08ac07d39474a4c7e2a473bc2453624ffcc387b6836a02260dcd0d1176a5a743c45bdf3d7e78d2f519f02a48c62a6b8
-EBUILD cryptmount-5.3.1.ebuild 1709 BLAKE2B da79362593365d5f651db76728d597190f648206ac4f161bafb9bf378f2b0534d597bdac335a1e56e5ce4a852de0227bf96d9fb233bd9326d643e8d9873fb76e SHA512 10dfe4ef20e77839695313678635133a5f0bbf74e13017e6b787af60c46b3b29e0114ae64cb7aaa476351558054e91f538a8e7f2818a67992589c90c961ad52e
-EBUILD cryptmount-5.3.2.ebuild 1703 BLAKE2B 8901b9bad5f03a5efe9c5b38734c74f2ea22648a753575d4d8a373c316fd7acf1fcb55d35436a1526255e1377cb36c06c73c6c565c1edc212bdddb6756e0a9d0 SHA512 f6c0566f1e38df5b38c8c82a41b0a447e92007fafa96edb4ecc05b280267f2b8d531dcd38fc68c4b3a46af232c379fe1dbe2576e1ccd1c3e13707e3d61d8e28d
+EBUILD cryptmount-5.3.2.ebuild 1702 BLAKE2B 30734735a4ff0e4a59bfd12c84eb004a1defeffd348a0bb05486b0e3982daf56afb51ffbb3309fb5b65ede468d62c459b57c7a6c0c70cea523f931a9aeb447e4 SHA512 ceb28c17908dd268688ee59979a18e134dc55d0ef6f55ec176ba4d2bfe477098adf605c1a3ff51fe3f23c05ba20ac4f271b82a6bb000cb1683881806a4a34c5b
 MISC metadata.xml 2145 BLAKE2B 6249f6be21900ffb75bb15d01232626fa43a92894208af23c8e9e50b771fe7f259dfb607a96907c70606da90b35c515d67436a50b83c2627b01aecb8bd07dd41 SHA512 e84164de214f81cf728615e7a68d8c9ac9daf707b585240d2a3c16212cbc0b0fe47f0096d35e6d98ccd8e3f1e984af4e5d820c7508b91625b6d4e356ca9cbde4
diff --git a/sys-fs/cryptmount/cryptmount-5.3.1.ebuild b/sys-fs/cryptmount/cryptmount-5.3.1.ebuild
deleted file mode 100644
index 68573f304edb..000000000000
--- a/sys-fs/cryptmount/cryptmount-5.3.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info systemd
-
-DESCRIPTION="A utility for management and user-mode mounting of encrypted filesystems"
-HOMEPAGE="http://cryptmount.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="argv0switch cswap fsck +gcrypt +largefile mount +nls +luks +openssl selinux systemd udev"
-REQUIRED_USE="
-	luks? ( gcrypt )
-	openssl? ( gcrypt )
-"
-
-RDEPEND="
-	gcrypt? ( dev-libs/libgcrypt:0= )
-	nls? ( sys-devel/gettext )
-	luks? ( sys-fs/cryptsetup )
-	openssl? ( dev-libs/openssl:0= )
-	systemd? ( sys-apps/systemd )
-	udev? ( virtual/udev )
-	virtual/libiconv
-	virtual/libintl
-"
-
-DEPEND="
-	${RDEPEND}
-	sys-kernel/linux-headers
-"
-
-DOCS=( "AUTHORS" "ChangeLog" "NEWS" "README" "README.OpenSSL" "README.sshfs" "RELNOTES" "ToDo" )
-
-CONFIG_CHECK="BLK_DEV_DM"
-ERROR_BLK_DEV_DM="
-	Please enable Device Mapper support in your kernel config
-	-> Device Drivers
-		-> Multiple devices driver support (RAID and LVM)
-			-> Multiple devices driver support (RAID and LVM)
-				<*>/<M> Device mapper support
-"
-
-src_prepare() {
-	default
-
-	# Since SELinux is hardcoded, remove it on disabled SELinux profile
-	if ! use selinux; then
-		sed -e '/selinux/d' -i dmutils.c || die
-	fi
-}
-
-src_configure() {
-	local myeconf=(
-		--disable-rpath
-		$(use_enable argv0switch)
-		$(use_enable cswap)
-		$(use_enable fsck)
-		$(use_with gcrypt libgcrypt)
-		$(use_enable largefile)
-		$(use_enable mount delegation)
-		$(use_enable nls)
-		$(use_enable luks)
-		$(use_enable openssl openssl-compat)
-		$(use_with systemd)
-		$(use_enable udev libudev)
-
-	)
-
-	econf "${myeconf[@]}"
-}
diff --git a/sys-fs/cryptmount/cryptmount-5.3.2.ebuild b/sys-fs/cryptmount/cryptmount-5.3.2.ebuild
index a4e882b5edea..95c674a5b8b6 100644
--- a/sys-fs/cryptmount/cryptmount-5.3.2.ebuild
+++ b/sys-fs/cryptmount/cryptmount-5.3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="argv0switch cswap fsck +gcrypt +largefile mount +nls +luks +openssl selinux systemd udev"
 REQUIRED_USE="
 	luks? ( gcrypt )
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index a15bb68013bc..fb28990f9500 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -5,9 +5,9 @@ AUX setup-1.7.0.py 788 BLAKE2B dc7a2dbc2187f233f4fae9d85bbec9e2152259a45094f10ab
 DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 1bd62b186564e0b902480d66f623074f8d2f06ea09f11788566e33d58f7d0dc8c79d5827e5966e1a20a5597c2cbdec76da49c8f54c0538a1ac3f869d8ef55456 SHA512 d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439
 DIST cryptsetup-2.2.1.tar.xz 10803072 BLAKE2B 00ee2eff11e3054a40a4d9036c1786422288ff4c61ff497cb7039721dde80ca337cab067faa4f70721de3aded465f612e9328a6b533ff7c9b67d1069fe435bed SHA512 e4b45b24ad63cc4c22cb816f04cf4af71431e15134a8208af1a24e64ded54c07aba6c43521c063f03429304e0610b6cce849332564d69a46934fb7bae8e99718
 DIST cryptsetup-2.2.2.tar.xz 10808684 BLAKE2B d8d864d9ec2a5d646706d3ba003a21aa83d2373ca7afed5663c5167172116ea9342704483559f49c06979cbe0f6ac5670f4e9baae88ab908423b793043ba4a68 SHA512 d04123a622438ecbee28145cbdc71886b6f13db87df1c67522bff6e6e3cba817e895e2d085bdb08c78f9cafba557b1203177811a0c316ccd9b7c19939f3fc851
-DIST cryptsetup-2.3.0-rc0.tar.xz 11013200 BLAKE2B 999d2d1c6f11b57b7ebbae403a1e5dbbc6d5ff45337bf58ab0e49ffcca8495ce1956839d431bf0cf855bb9b84cb448bd08d61a035892b4dc38aac1c7a8594ef2 SHA512 3b707f85828aa0691c7bf039041a5b95444471c402fe74c74c50404d8bd1abae3021f180c6510cd1bb8537e56a3bfac085199fab597b48eaeb156b1d1a317df5
+DIST cryptsetup-2.3.0.tar.xz 11035660 BLAKE2B 0fff903cdb07d91183bbd35afb660aad42d31188a80d0ef6294c40082b39fdcde25da4fe1bf679ebe308133fc63051876ce813a2ef3a557f63b574d6f6f49d8c SHA512 d4af8edb7a50603028c6c6999ae7a1851d2232ee11d4a501270afb424f0a7dc82893a6a5d30d3a3188634aa80ec1a79f22a91b539910df10d07f8d9ae532cb08
 EBUILD cryptsetup-1.7.5-r1.ebuild 4044 BLAKE2B 17327e6f655be6e556146fb301b0b602ab75fb545713d43a2225f70c25d003545a87566d6672d45e641db2156e161a42d6a8cbab5bb34b9d185b24945a4aa228 SHA512 3f3a56cb91afd5e90d988720b329a0b8fb40e538beac776ec7fa118f4c565e4d1cc364cab1755840475736ecfc72e2ad5b7e97c44614f70d274b1685a746a43e
 EBUILD cryptsetup-2.2.1-r1.ebuild 4234 BLAKE2B 1ce55cd19adcd62e653b770c5545e9dbee1e48385b501a3ae38908b96618bd902ee421c412000e3233ce96742a7083bad301a9de2009e9ddbaa7fc96cea2a7ef SHA512 31b7cc3bb04bce6c75539356e5a930a91815b6f81c94a7af0721da2cda12b5d78f4a89ae546c96bc8b2dd2830ee02e5761d1001b4a22bca6f19b8ed576a6edcb
-EBUILD cryptsetup-2.2.2.ebuild 4244 BLAKE2B c3ea10ab5824f1f60e19256a19c1726025f277d968203db89043adbd6289ad88ce786547540ad58a21acf51695e842ea0e9f6730e3f34f6e1315a0c26a6331ad SHA512 a723ce4032546dc97d58bcfa3845fa8d6aa6a7c437674778056f23c644d0b5c1020c4cb91e2f7d5ca8a5d6a0e94ac24840519b29d281bc0308cfb6bbea2a66b8
-EBUILD cryptsetup-2.3.0_rc0.ebuild 4243 BLAKE2B 11ff6ee8da600b25406e3a7939691ae310a1579c772e4a82c67d00f9565f1f5c9a042a087d196ab2f325026d466ea775221bcd3bdc630328995b0fa5d296b48e SHA512 4b1d49b544b9cf8606c1dbbb6417a4e354266bccc593b7b039d8aaf59199c73ceac54a4da65dc4467f89ccf48f6a3f2d1c47d7ada9fc716da0f0f37e8f882b49
+EBUILD cryptsetup-2.2.2.ebuild 4240 BLAKE2B 90a268488f2e443c560123d07d19dfed764976d2a583dc08416e510d21e0372c0d67ea9b3ef6703ed6ecd2a6e17b886a8c0390432f542e9c2ce12663f55d4f9f SHA512 20dd0d446c82095d5d20c540244d2d4cf30294ee9534f635e410d6fda80d3a2fde4c16bdcc38c7844d18331904cfbee092f430f4f92dcb9e99d765222002ec02
+EBUILD cryptsetup-2.3.0.ebuild 4243 BLAKE2B 11ff6ee8da600b25406e3a7939691ae310a1579c772e4a82c67d00f9565f1f5c9a042a087d196ab2f325026d466ea775221bcd3bdc630328995b0fa5d296b48e SHA512 4b1d49b544b9cf8606c1dbbb6417a4e354266bccc593b7b039d8aaf59199c73ceac54a4da65dc4467f89ccf48f6a3f2d1c47d7ada9fc716da0f0f37e8f882b49
 MISC metadata.xml 1074 BLAKE2B b1a6789b42307eb919717d35dabb48fc060490e561a1b5d4b0a25a2ba4dfe1399a7bf564c5477be61a68b7b5248153843f6892f95893e36257b9d790f8501779 SHA512 d070c22187874175ae93078fc80f4d150da102557cc680c8dd324ffe21de533ad67b4478f0d83e385ef5d4e75541bb04fd8308697db0ebf6ecd9f1e11382847b
diff --git a/sys-fs/cryptsetup/cryptsetup-2.2.2.ebuild b/sys-fs/cryptsetup/cryptsetup-2.2.2.ebuild
index 9c8f2b108340..008ac94f9b2e 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.2.2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.0_rc0.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.0.ebuild
index cf95b7a30b03..cf95b7a30b03 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.0_rc0.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.0.ebuild
diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest
index 8a3386d19c58..99b985f36106 100644
--- a/sys-fs/dd-rescue/Manifest
+++ b/sys-fs/dd-rescue/Manifest
@@ -3,5 +3,5 @@ AUX dd_rescue-1.99-musl-r2.patch 4035 BLAKE2B cffc620f429db2042a405174a280e44c27
 DIST dd_rescue-1.46.tar.gz 126790 BLAKE2B 027d509349e77fa020757b826184b4a2206c3f5923c797c294ca8caf210cf6af20afa1d518d826413989612295a4365c480d7aa4293686824ee96394cbbe9851 SHA512 efd1bf5d80d4bafa6e6971caa84205dc5df4456a29a9fa3bb56aa984d68675ae3418e8ba3a355906f491f0f2e750c38fd695e37dbd193e554cd41afec3841e28
 DIST dd_rescue-1.99.8.tar.bz2 174594 BLAKE2B 51e62989bf6318cb5926f30bc1db746bddd41fb49aab15dc2b1c67e0af079469161d390ba4e1e109d195249b3aace3aa830a3aec14ba534eb47f38c0136f910c SHA512 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac07777d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d
 EBUILD dd-rescue-1.46.ebuild 1935 BLAKE2B 96cb26dbaf1af6e3653593bb3416b27165a078e2211519dd94ac7bdc889cba2c66ac9f04dee253828b56c00a8aaf9de51091aabe706b0bfe6e27de9d44854066 SHA512 57bdaccabd2da99bb329c82f47e52fbd2066f736c742b8de551671fab294297e45a874daa0ddd701234a3e6c216f52ddee55283d70bf1a166d3538f32485e8c7
-EBUILD dd-rescue-1.99.8.ebuild 2383 BLAKE2B 62cb1d8b4f7f768b619eafdaf85cd35266026b12126ff8004a65b316cadff8842082629d4b3bff9c99ba02bb303043e1abe8fc9a13f8e025fee69178b00736b2 SHA512 e7675ff724abdbcfb5558f02302115329231023f71cca1700ac4d3f2ee97121185a796e0fa71d9750d207f2f87489ea105882de4e713b650f348908a3e70327c
+EBUILD dd-rescue-1.99.8.ebuild 2381 BLAKE2B 0b88c472f6b3d2477b424a3cc3a0f9a54a88f8c618c127e3c738d2be127e8860982463a1be436fef65110723e711f0128bcb304a14267128f4c82ff66ac8f88a SHA512 e77d6d58bf0adecaefc4194c75a1133db11eaf09c40a5b9b12c9ddc5d0765738fb28dff66248ec0c37cfafed9d91e7f09e3ab6bcadc7ba125285ab74c6455d90
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild
index a40b043634bb..57548ff8a323 100644
--- a/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild
@@ -81,7 +81,7 @@ _emake() {
 		HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \
 		RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \
 		CFLAGS_OPT='$(CFLAGS)' \
-		LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX%/}/usr/$(get_libdir)/${PN}" \
+		LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/${PN}" \
 		CC="$(tc-getCC)" \
 		"$@"
 }
diff --git a/sys-fs/fatsort/Manifest b/sys-fs/fatsort/Manifest
index ff90877cdaf9..9745a11e2d6d 100644
--- a/sys-fs/fatsort/Manifest
+++ b/sys-fs/fatsort/Manifest
@@ -1,3 +1,5 @@
 DIST fatsort-1.5.0.456.tar.xz 56100 BLAKE2B 996f144c67a2311ef9962b06e776d0a0c8897814383e50c9f48f5af0bc800159ee34c10d9f8d51dae5160844dfe9fcbc4b56bb9883cbdb0402a0ea20198fc1d6 SHA512 fe9d8108494fd64da730ec40882582fc16a89e76a5ba4e8040d03a3dbbf12c525904abe24814337713f5f1d15c72e8321b27fad69db816c073a96fbfd15ea486
+DIST fatsort-1.6.2.605.tar.xz 122928 BLAKE2B 2690233828e47a4809aac14a8d64dc8d95a824bec52f787190186adbe066d5d4e6f9c6d1873fc6b809c6df6879d12154430f44d412944963bdff49e673079d12 SHA512 0d119c99c5efff4c10367152fc6efe95e2cb1c39405ca02dd25b66cc68c7420b5b28c0daca1346b7928633bac8ace2d05d731502f989d39ca5c783dcec69ccc7
 EBUILD fatsort-1.5.0.ebuild 791 BLAKE2B 1a7977e9e5ccaa82997389e928ad9c0cfa20b52cb5b832ee10a2bb230a7df565eb2ab58701312a01c69a11ad80d6dc8371ae97b62a8da89b5d74eb3e286f7c15 SHA512 ab728f5bf316680d9443ce345819062132d802bcd38c451a8efb21a761f86ceb4d1f7e217242bcce44d7580750b38a919f97b4ca7847eb37c260d32db7e09537
+EBUILD fatsort-1.6.2.605.ebuild 711 BLAKE2B 32f6849c788b83476c2388097eb14169e56b8b30381d388dc63c74cce6ac15696934f581ad6dbc397c4b0e08ea98b5cced46cac5c3cf447387b67b7d5f8b271d SHA512 f25a251ff55fedf93c2e7d81ac5416dec9c3cd66b3087bb7212e3c2f328783b08b690ca0ea56dd170936806cf198d6ac5a5883b1b1aefa8569f54ee1df042f8e
 MISC metadata.xml 738 BLAKE2B b4ae8042af9b7a74705b42322ffcfba47aa18e3cb1bee693ff2db3fecb6555d516ec9a3f4746643ef37007e9d1b44ea79d5fa0e4bc12b6ca4ba813129d208dcd SHA512 42cb5be41b29129b17ea55591d352872ccd6078705068c6899d4f1f5a5b99ab5f6809e75ee6b49bd6b536f6b66632ce9e1859f4bbad764b966d5520a8aa5a228
diff --git a/sys-fs/fatsort/fatsort-1.6.2.605.ebuild b/sys-fs/fatsort/fatsort-1.6.2.605.ebuild
new file mode 100644
index 000000000000..e80f5c53a7f4
--- /dev/null
+++ b/sys-fs/fatsort/fatsort-1.6.2.605.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Sorts files on FAT16/32 partitions, ideal for basic audio players"
+HOMEPAGE="http://fatsort.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	default
+
+	sed -i -e 's|/usr/local|/usr|g' \
+		$(find ./ -name Makefile) || die
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) LD=$(tc-getCC) \
+		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		DESTDIR="${D}"
+}
+
+src_test() {
+	# Tests require root permissions and mounting filesystems which does
+	# not work inside the ebuild environment
+	true
+}
diff --git a/sys-fs/hfsplusutils/Manifest b/sys-fs/hfsplusutils/Manifest
index edd7688ac86f..dc429dbab4b0 100644
--- a/sys-fs/hfsplusutils/Manifest
+++ b/sys-fs/hfsplusutils/Manifest
@@ -1,9 +1,11 @@
 AUX hfsplusutils-1.0.4-cflags.patch 702 BLAKE2B 90c41a588979dc7966aa9a889d5c200f44e513b5cc04eaef0da904a5f635f325deeae6b68b99436b6e7ccefdb883dc3e8531e08ae81ccaab4024bdc5f1e31317 SHA512 b66a64a085abdb2c6c2b1f8008019ea41e9e4ee4b58ecbbf96aad4500392d1935a9aa9bd2694fc62af7cf196ddf556e754908bbcdeb64842e8e72a3cbb125a05
 AUX hfsplusutils-1.0.4-errno.patch 214 BLAKE2B a2b48502ac7789a0d035f5d68bdd2834e93348c2e0463c0043fbef64a7d2a4d7434c3b34fa96765e26d5131351ebe8ea37022bd70d486a05800a75dfb339e8bc SHA512 97cb9d90d57f3ddc1b9083198664db6da755cc40f416d79d7ded4e94846302e1ea9b0ebc389dfc8996c1c30931d686e09abd908d44fc92044081c75a61d57d24
+AUX hfsplusutils-1.0.4-fno-common-gcc10.patch 591 BLAKE2B b804a5969a83cadb0cf8c8deb5138ee5f5abacc9c261adf2f5ff1e9933764165041f1e2e9e04351934dd680874405e69a0abfd87042dc49d93295d157d29ba42 SHA512 46c04b1a6043b8c208e55c4edf912ec4c09973081b7f1974c473c89dfe656a7c1565a834827a203428606c52af876a89878284a95b113d2828fc910807d778de
 AUX hfsplusutils-1.0.4-gcc4.patch 5736 BLAKE2B c88d82b15ae7126d61bee78a5f10cab757ae462f73dfa5b7892290e8bd8405c11309162cb72159620e38ed47add63c41b43a0e370e53d712a0bd9311393cee6b SHA512 fb357a52452f6f8b16a9f3c9f02f1a7c213f6b8adfaf7fd7da70a15cb6ec3469ca8705f3dcd6419385a340e7b5644c17c323c6b951f0c56f4776b86ee86b267d
+AUX hfsplusutils-1.0.4-gcc5.patch 4603 BLAKE2B dacb7aa0d62fb22175685cff27310f216445878fc29e49cdc724baba687a834ee382e0b13a10b130274d12a70cf80ba32b5a8455a334e601e990558bc386c0da SHA512 f673fcc71ce9b668f420cb21c3aa8323b1b1511582d913e53ca2c91d14ff5b5a969efc79bd6d4a3d72f33e41c695ccb33f61fbf14aa0e820a78b213f02ef808f
 AUX hfsplusutils-1.0.4-glob.patch 215 BLAKE2B bd1aed8730e8695efc713908d33c64be14cbb24adbc0aa26b01ced08f741f1f8c3af1cd545fe556e1c6c89e0baf26a94b4317653e795103dc058c1ab6cb710c4 SHA512 da53dc8f18f77b15bb8b76bff371515da0fac03ae79bdd8450dad60063fd18f47d0e95577451ff5da285acf167e547ec392aa42ae254d77fc1789ba4cf2025aa
 AUX hfsplusutils-1.0.4-stdlib.patch 403 BLAKE2B 20ee7a1c8d96d8a4aee549a24b0795b0a9f0d4b5e5d3102b50962d03147b7a26f7f29e6f3652c55df912ccc68db104c4565ea2d563b97d7c67abade7affea437 SHA512 23361a4cae07b679cb5c6122cf1a74aac19a11b0b892a369683881ed1bed63cfb1369aa84762b0447f2c91b1226a73c9f42b06fe8cb25a40dd7fc58fbf22806a
 AUX hfsplusutils-1.0.4-string.patch 606 BLAKE2B a9c789fe631c94577c32a330803c490b882c7cccbec213882a297a16e5ef5e0cc4fa805f9df454d4b278ed460eca42189ae1d65c00c4555e0df129bffe68c902 SHA512 5f7d4a7bbbb15479d00d3ff49fac08328b5d3fb4549d3278b43c73025ab4f0f5657c7b084b2671a5e1524a88bbcf5bc459b88c8d944cdc98fbf0c2ba4e6b0339
 DIST hfsplus_1.0.4.src.tar.bz2 185461 BLAKE2B 81b93f59c4e57d80a979b9d9c56b841bcc32747136d01dc0e90afa0af486e527bda241d7c21f0f3f61a5d2efe6215e29499405aad9623a7ec9906b876aa6303f SHA512 94cf6bc8e9d561dea5e8b5860c4ef979f21349d6546c767b43c18156fa1f805e843fae8a64096c147a28886467f5e2012b06b93918773457eaf486b85958b2ee
-EBUILD hfsplusutils-1.0.4-r2.ebuild 1006 BLAKE2B b12ebfcd380b5e741e1ded3f506930b44c17986a09621a69ce5643e81f661ab91519e05cac95159e486f5c72a2582509f01ec26a9e601554534c6c279a213c14 SHA512 726d8386f0945644b7d34161a00c9b3f7c5d6c128cc124d5a24d0ccdf760d091aef6cb1cc3c739844379e46877bcb495a98692a60d4b31751b00bf72d65dd804
+EBUILD hfsplusutils-1.0.4-r2.ebuild 989 BLAKE2B 9cc48ec7067af83dcf8fe19c0365b6a525a61fed9fb85dc91b27e857e84b2e8607c00b3106b6521d7a258940aea83e7b3d6c586ae7b3dd0fc6673376a5bec2cc SHA512 503db98fc289f6f537e7f36d70fd0df8650f80d27af7f59c806866a290c0de833f0d908e05d205d23de8055b8b6611549c97ab05536fa20fd3f843909c2894c1
 MISC metadata.xml 244 BLAKE2B bd2c6209566a4936a38d9109a9a533aa1669dd50701ff8a96d2a65411aa692517ab70cafd98afcad7058979d62f1a7ac796c5b99a520c0f6ca1ed92cf9e0e207 SHA512 57959095dc10704e073e5517ac49ceee80e42fb1cc3f26b1b7308f872ffda810ce42e0b80ea6da57faa7a759878a9b8d2476fe351fecac1450f9c83751802787
diff --git a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-fno-common-gcc10.patch b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-fno-common-gcc10.patch
new file mode 100644
index 000000000000..dde912d4ef62
--- /dev/null
+++ b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-fno-common-gcc10.patch
@@ -0,0 +1,27 @@
+--- a/libhfsp/src/fscheck.c
++++ b/libhfsp/src/fscheck.c
+@@ -47,6 +47,8 @@
+ # include "os.h"
+ # include "swab.h"
+ 
++struct fsck_data_t fsck_data;
++
+ /* Dump all raw fork information to stdout */
+ void print_fork(hfsp_fork_raw* f)
+ {
+--- a/libhfsp/src/fscheck.h
++++ b/libhfsp/src/fscheck.h
+@@ -100,10 +100,11 @@
+ int fscheck_files(volume* vol);
+ 
+ /** global data used during fsck */
+-struct {
++struct fsck_data_t {
+     UInt32  maxCnid;
+     UInt32  macNow; // current date in mac-offset
+     int	    verbose;
+     int	    ignoreErr;
+-} fsck_data;
++};
+ 
++extern struct fsck_data_t fsck_data;
diff --git a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-gcc5.patch b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-gcc5.patch
new file mode 100644
index 000000000000..7b3b30c1090a
--- /dev/null
+++ b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-gcc5.patch
@@ -0,0 +1,201 @@
+https://bugs.gentoo.org/580620
+
+--- a/libhfsp/src/blockiter.c
++++ b/libhfsp/src/blockiter.c
+@@ -143,9 +143,3 @@
+   fail:
+     return -1;
+ }
+-
+-/* return current block */
+-UInt32 blockiter_curr(blockiter *b) /* inline */
+-{
+-    return b->e->start_block + b->block;
+-}
+--- a/libhfsp/src/blockiter.h
++++ b/libhfsp/src/blockiter.h
+@@ -52,7 +52,7 @@
+ extern int blockiter_skip(blockiter *b, UInt32 skip);
+ 
+ /* return current block */
+-extern inline UInt32 blockiter_curr(blockiter *b)
++static inline UInt32 blockiter_curr(blockiter *b)
+ {
+     return b->e->start_block + b->block;
+ }
+--- a/libhfsp/src/libhfsp.c
++++ b/libhfsp/src/libhfsp.c
+@@ -32,15 +32,5 @@
+ 
+ const char *hfsp_error = "no error";       /* static error string */   
+ 
+-/** helper function to create those Apple 4 byte Signatures */
+-UInt32 sig(char c0, char c1, char c2, char c3)
+-{
+-    UInt32 sig;
+-    ((char*)&sig)[0] = c0;
+-    ((char*)&sig)[1] = c1;
+-    ((char*)&sig)[2] = c2;
+-    ((char*)&sig)[3] = c3;
+-    return sig;
+-}
+ 
+ 
+--- a/libhfsp/src/libhfsp.h
++++ b/libhfsp/src/libhfsp.h
+@@ -90,7 +90,7 @@
+ 
+     
+ /** helper function to create those Apple 4 byte Signatures */
+-extern inline UInt32 sig(char c0, char c1, char c2, char c3)
++static inline UInt32 sig(char c0, char c1, char c2, char c3)
+ {
+     UInt32 sig;
+     ((char*)&sig)[0] = c0;
+--- a/libhfsp/src/volume.c
++++ b/libhfsp/src/volume.c
+@@ -604,14 +604,6 @@
+     vol->extents = NULL;    
+ }
+ 
+-/* accessor for entends btree, is created on demand */
+-/* inline */ btree* volume_get_extents_tree(volume* vol) 
+-{
+-    if (!vol->extents)
+-	volume_create_extents_tree(vol);
+-    return vol->extents;
+-}
+-
+ /* return new Id for files/folder and check for overflow.
+  *
+  * retun 0 on error .
+--- a/libhfsp/src/volume.h
++++ b/libhfsp/src/volume.h
+@@ -75,7 +75,7 @@
+ extern void volume_create_extents_tree(volume* vol);
+ 
+ /* accessor for entends btree, is created on demand */
+-extern inline btree* volume_get_extents_tree(volume* vol) 
++static inline btree* volume_get_extents_tree(volume* vol)
+ {
+     if (!vol->extents)
+ 	volume_create_extents_tree(vol);
+--- a/src/darray.c
++++ b/src/darray.c
+@@ -65,16 +65,6 @@
+   return (array->eltend - array->mem) / array->elemsz;
+ }
+ 
+-/*
+- * NAME:	darray->array()
+- * DESCRIPTION:	return the array as an indexable block
+- */
+-inline
+-void *darray_array(darray *array)
+-{
+-  return (void *) array->mem;
+-}
+-
+ 
+ /*
+  * NAME:	darray->append()
+--- a/src/darray.h
++++ b/src/darray.h
+@@ -40,7 +40,7 @@
+ extern	void	    darray_sort(darray *, int (*)(const void *, const void *));
+ 
+ /* return the array as an indexable block */
+-extern inline void *darray_array(darray *array)
++static inline void *darray_array(darray *array)
+ {
+   return (void *) array->mem;
+ }
+--- a/src/dlist.c
++++ b/src/dlist.c
+@@ -60,24 +60,6 @@
+ }
+ 
+ /*
+- * NAME:	dlist->array()
+- * DESCRIPTION:	return the array of strings in a list; can dispose with free()
+- */
+-char **dlist_array(dlist *list)
+-{
+-    return (char **) list->mem;
+-} 
+-
+-/*
+- * NAME:	dlist->size()
+- * DESCRIPTION:	return the number of strings in a list
+- */
+-int dlist_size(dlist *list)
+-{
+-  return list->eltend - (char **) list->mem;
+-}
+-
+-/*
+  * NAME:	dlist->append()
+  * DESCRIPTION:	insert a string to the end of a list
+  */
+--- a/src/dlist.h
++++ b/src/dlist.h
+@@ -36,13 +36,13 @@
+ extern int	dlist_append(dlist *, const char *);
+ 
+ /* return the array of strings in a list; can dispose with free() */
+-extern inline char **dlist_array(dlist *list)
++static inline char **dlist_array(dlist *list)
+ {
+     return (char **) list->mem;
+ } 
+ 
+ /* return the number of strings in a list */
+-extern inline int dlist_size(dlist *list)
++static inline int dlist_size(dlist *list)
+ {
+   return list->eltend - (char **) list->mem;
+ }
+--- a/src/dstring.c
++++ b/src/dstring.c
+@@ -124,24 +124,6 @@
+     return 0;
+ }
+ 
+-/*
+- * NAME:	dstring->string()
+- * DESCRIPTION:	return a pointer to a dynamic string's content
+- */
+-char *dstring_string(dstring *string)
+-{
+-  return string->str;
+-}
+-
+-/*
+- * NAME:	dstring->length()
+- * DESCRIPTION:	return the length of a dynamic string
+- */
+-int dstring_length(dstring *string)
+-{
+-  return string->len;
+-}
+-
+ 
+ /*
+  * NAME:	dstring->shrink()
+--- a/src/dstring.h
++++ b/src/dstring.h
+@@ -42,12 +42,12 @@
+ extern void	dstring_shrink(dstring *, size_t);
+ extern void	dstring_free(dstring *);
+ 
+-extern inline char	*dstring_string(dstring *string)
++static inline char	*dstring_string(dstring *string)
+ {
+     return string->str;
+ }
+ 
+-extern inline int	dstring_length(dstring *string)
++static inline int	dstring_length(dstring *string)
+ {
+     return string->len;
+ }  
diff --git a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild
index 4e624f1b33c8..34c9cf508cba 100644
--- a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild
+++ b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools flag-o-matic
+inherit autotools
 
 MY_P="hfsplus_${PV}"
+
 DESCRIPTION="HFS+ Filesystem Access Utilities (a PPC filesystem)"
 HOMEPAGE="http://penguinppc.org/historical/hfsplus/"
 SRC_URI="http://penguinppc.org/historical/hfsplus/${MY_P}.src.tar.bz2"
@@ -13,7 +14,6 @@ SRC_URI="http://penguinppc.org/historical/hfsplus/${MY_P}.src.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc ppc64 x86"
-IUSE="static-libs"
 
 S="${WORKDIR}/hfsplus-${PV}"
 
@@ -24,6 +24,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-string.patch
 	"${FILESDIR}"/${P}-stdlib.patch
 	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-fno-common-gcc10.patch
+	"${FILESDIR}"/${P}-gcc5.patch
 )
 
 src_prepare() {
@@ -35,10 +37,7 @@ src_prepare() {
 }
 
 src_configure() {
-	# bug 580620
-	append-flags -fgnu89-inline
-
-	econf $(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_install() {
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index a96b099d0b23..5e43264883c2 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -5,6 +5,6 @@ DIST mtools-4.0.18.tar.bz2 420190 BLAKE2B 92fdf8b054287e3cb4eddb40c98f5ac4229a38
 DIST mtools-4.0.22.tar.bz2 431185 BLAKE2B 19b6ed58fd44e51eba11799347590f8c36fe2de7cbb2b612c0f16f4f35c916331abf19b8ca9a735fcc627db5180b1f8cbf355e25319af8587a0de033d50a6e79 SHA512 9a35a27c6de768e3e925d9163aeb8b021620de9016cf12666ee0259cbfc87fa7a8d0311fc0a77c04dbef8bd3e8d86c747069a9aca2f5df69e6391c3cf5a0b113
 DIST mtools-4.0.23.tar.bz2 418592 BLAKE2B 442f552087a5d53ef0ead6161cdad7997dc45a3e210c2cb442a8b2ba42866152f93e4a1f5b58df8d68316168374ea034b390bcf4c607ac3a1c477c4ec5e7842c SHA512 c8c48adedc3f3e4eeafead27ce80172c9cb9690b575618842001ed16aa0011dcd2bc517882ea4bf01a73810ba151aa4b86f8ce2f97d6e8a0177d09be71a6d1ed
 EBUILD mtools-4.0.18-r2.ebuild 1443 BLAKE2B 874b1e4856597be1d32cec7e25aebd1d1fb64201d29432505bb45a5cddb860230f030a74a8fdf5f61d943d2f4a8af70b6b2140193fe3128bb270efe65fd22a6e SHA512 e6eb4336d42ef80c4f8dcac65375e2f6861ffeefb9a61ec8cc3ad09e84c3c1b15115fd362a2342b085428c8d93c6102b1e6559d05368a389a2059af47d28ed9a
-EBUILD mtools-4.0.22.ebuild 1178 BLAKE2B 3fa2b089538673259b7e6600a841f94b96a116213aa76d31be62951537ce662c8b1d78720c55a6f0c40f8ae4e83261abe2a35cb25d3f76a5160cb23bb7054bef SHA512 ac4561a82fb5d0c6658d9173585dd173f631bd374793ea2c53038b40a7f789e4bc48ae097187303010a5e6cdbd49ab59fa1f1848f342a75d5148a5324a103762
-EBUILD mtools-4.0.23.ebuild 1178 BLAKE2B 3fa2b089538673259b7e6600a841f94b96a116213aa76d31be62951537ce662c8b1d78720c55a6f0c40f8ae4e83261abe2a35cb25d3f76a5160cb23bb7054bef SHA512 ac4561a82fb5d0c6658d9173585dd173f631bd374793ea2c53038b40a7f789e4bc48ae097187303010a5e6cdbd49ab59fa1f1848f342a75d5148a5324a103762
+EBUILD mtools-4.0.22.ebuild 1176 BLAKE2B 413416a698b78fe7f4d5457c34f74beea5b63ddb95e8191338dfde2d57a1dd1be8c61db44b58210f842cbfe463e4dfdd24634a7e1a1a66ea96485ee6ca2266fd SHA512 1f1bcf1cee5ecbf1219be2ec5bf5478d97ef94c16e78226c6e10f431089a876d758eb459d89b3d3cb3f2b9a9e611930992715fc012ebc677b7098eca7f97af35
+EBUILD mtools-4.0.23.ebuild 1176 BLAKE2B 413416a698b78fe7f4d5457c34f74beea5b63ddb95e8191338dfde2d57a1dd1be8c61db44b58210f842cbfe463e4dfdd24634a7e1a1a66ea96485ee6ca2266fd SHA512 1f1bcf1cee5ecbf1219be2ec5bf5478d97ef94c16e78226c6e10f431089a876d758eb459d89b3d3cb3f2b9a9e611930992715fc012ebc677b7098eca7f97af35
 MISC metadata.xml 327 BLAKE2B 24ec22d469778c0c13d9bf96aed3214f59598b5ddf6a6bdf7dbe971e014396e8075c62059b1033ccdca6c5acca1af0fa2c1f377b006471358238402b40d7fec5 SHA512 9b9c5a4a88cf046ad30bf9764d7d865d692c73477220cc871e7e727fe3f718302c9ff1a8492b165270a88049e2bdebe68923415e52da1257971d887d8f808f7d
diff --git a/sys-fs/mtools/mtools-4.0.22.ebuild b/sys-fs/mtools/mtools-4.0.22.ebuild
index 651e08e2c962..42ad7d717b90 100644
--- a/sys-fs/mtools/mtools-4.0.22.ebuild
+++ b/sys-fs/mtools/mtools-4.0.22.ebuild
@@ -36,7 +36,7 @@ src_configure() {
 	# 447688
 	use !elibc_glibc && use !elibc_musl && append-libs "-liconv"
 	local myeconfargs=(
-		--sysconfdir="${EPREFIX%/}"/etc/mtools
+		--sysconfdir="${EPREFIX}"/etc/mtools
 		$(use_with X x)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/sys-fs/mtools/mtools-4.0.23.ebuild b/sys-fs/mtools/mtools-4.0.23.ebuild
index 651e08e2c962..42ad7d717b90 100644
--- a/sys-fs/mtools/mtools-4.0.23.ebuild
+++ b/sys-fs/mtools/mtools-4.0.23.ebuild
@@ -36,7 +36,7 @@ src_configure() {
 	# 447688
 	use !elibc_glibc && use !elibc_musl && append-libs "-liconv"
 	local myeconfargs=(
-		--sysconfdir="${EPREFIX%/}"/etc/mtools
+		--sysconfdir="${EPREFIX}"/etc/mtools
 		$(use_with X x)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 1cfd7c821ff5..20df6e5897ff 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -16,5 +16,5 @@ EBUILD squashfs-tools-4.3-r2.ebuild 2130 BLAKE2B 7395e3137ace870d801a19a1111dabc
 EBUILD squashfs-tools-4.3_p12.ebuild 2176 BLAKE2B b55b7e215becdd233a43fbd2abfb4676b694270257b87f49b9a301c2271fb7de29f6a4e41ec1af4c89ed777e000d2bb27025c1314e74e4ea263d8928f6896f89 SHA512 13537ed71d3c8f4a599107eed5efb20f3a70633bb1e4cd193f98febfa89ddc4c38b2fd6eadfec2c0aca187044a40198d01c0d16b33685db85e7a9433e9b625b6
 EBUILD squashfs-tools-4.3_p7.ebuild 2082 BLAKE2B 3759b4f836a47783c2123d5f5dadbeef39fac9e2477065392e56cbed03345688c263e86473b6f512cf3135760e57878cfefb92e84a9a7580d1d62d5c2fb1c2b8 SHA512 bb022bd76d01afe17edf16220a2f58e4ee0a03dd96d8a54dee90f33b999070f92fe886e8e26a4b85b9cfa967b3c955f2a463838de5fdbd58b3d1df845d72ed31
 EBUILD squashfs-tools-4.4.ebuild 1723 BLAKE2B 21b10ff20d4777a911af10118e780de33a84ba76cce0407a2f537dc65ed18c4d642a4514b423afc4bb66f5a395bfcfa2a27eb7ab4b85c9bfcea00016495da33b SHA512 c48b71312b2484f80b5bd5d7dbbcc614383b8c00ed80eeed183fb360c5ce34d2358d739556a163987e0a17493c7f80d52947dc973df0266589ac53bb8b6d6d3c
-EBUILD squashfs-tools-9999.ebuild 1561 BLAKE2B 11c5821cf9591e4ad7ac26cc636c9858e9ba6d229381f6bc642310d2e876051a4d8e9996a7f537473bd5ffd8f5da280496cc50ec578cee523f1163483df6e518 SHA512 801cbb143d6cea3270f1a9bc7e6767643a8be079a7ccf5eb8d619cf5b57f4cb059e723cccb8b5b022b8f4b4c0a74e37a0410243a7dcb609033c947e3d61c984c
+EBUILD squashfs-tools-9999.ebuild 1519 BLAKE2B eaa594fd211e1045f6bf1b4d2a4a94883971fd9997da58eb7eb9a02138713a84d047cd3fd97a98a83fecfd6aa136f69ae68fddfee66a4517b8de6f7f4dee6c42 SHA512 6691b989d05f6bebf801050214fa062cc06e33d340c61cc77bb0aac0219e8a1ddd26c9f89aea935b8e4082666151ca207ada02234ee0a4520354b6d58ec614c2
 MISC metadata.xml 438 BLAKE2B 7bb1623378cbc91becb4e12f91bfdead33f1859c9a13e5dc53652a1202b0d5cdf4a7be46071e766fc932f15ab3223b889e6ff32063d67d50e8ef809e887221dc SHA512 985005bd45043f21efc64f544cc685e93a70dac00a869416aa93bbc91571461dae236d2b4bb3325c63c7c3515b88f32a84ab56d3405e84545053c86d164c7dc0
diff --git a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
index c5bf886e7767..1234cc3f4c52 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
@@ -34,7 +34,6 @@ DEPEND="
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.3-sysmacros.patch
-	"${FILESDIR}"/${PN}-4.4-fno-common.patch
 )
 
 use10() { usex $1 1 0 ; }
diff --git a/sys-fs/traydevice/Manifest b/sys-fs/traydevice/Manifest
index e195e78474cb..524704141c49 100644
--- a/sys-fs/traydevice/Manifest
+++ b/sys-fs/traydevice/Manifest
@@ -1,3 +1,3 @@
 DIST traydevice-1.6.2.tar.gz 29238 BLAKE2B 78a5e01ad4f5f1f4df2f64d876b2567aa2001683c9827ac4a152219ab0febeaf4a47744f4cca277516a1cd4a2461f2fd915ab08762c16ab9198326fa2f2c0bab SHA512 19523c502a58aed9e1ea3c52970438a7119d9f4895527777b6c5c4167d44e917b23ca4cb7c1916f7eb7ff8c539d3c72cc1b70712affaa32a9eaa344ec8e92634
-EBUILD traydevice-1.6.2-r1.ebuild 887 BLAKE2B 1085ffd65714fcc17ded9428f99fecc244ef24ac9d334e3435e88859e9bccb4c7f103b211c93864cc32540e6fe3ae070dbd2bb51d53a8cbdb6043a34992d4706 SHA512 bd8174c9438d9ccdf5c70a5f761ac5c3b28216cbfdd935f5f01f165348da05bc2dc1adedcd45c35999810e889ccede84dba3d14260bbc6cecc8f19798e16cd66
+EBUILD traydevice-1.6.2-r2.ebuild 936 BLAKE2B 3a138ad8363021abd13fca896523a9b17188ad78a773ea9e53a99ec48434849ef0d4153831510bbecb1b43891ffd43cc489c1365eb1ed841c463dff95f1c32f1 SHA512 e92df319cf7effc0a5930242f7c5aa567328a1625c447e5cb2e420e341aa3f0ec8d17904103cffae82b03487e4b6b6722055e82abfb73d2c26686f08e95ea876
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/sys-fs/traydevice/traydevice-1.6.2-r1.ebuild b/sys-fs/traydevice/traydevice-1.6.2-r2.ebuild
index da259161112d..43f07a7fa705 100644
--- a/sys-fs/traydevice/traydevice-1.6.2-r1.ebuild
+++ b/sys-fs/traydevice/traydevice-1.6.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,9 +15,12 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
+	')
 	sys-fs/udisks:2"
 DEPEND="app-text/docbook2X"
 
diff --git a/sys-fs/udev-init-scripts/Manifest b/sys-fs/udev-init-scripts/Manifest
index bb59a7b01b9c..58fa50c35f21 100644
--- a/sys-fs/udev-init-scripts/Manifest
+++ b/sys-fs/udev-init-scripts/Manifest
@@ -1,4 +1,4 @@
 DIST udev-init-scripts-33.tar.gz 3698 BLAKE2B fc79b3f6984131180324919f7be4309715976309ee582147662634bb020b8162b293e7fd0e675a9cc7a3b1630ce0fc49b29c899e393c7748d47cf924b1ca2809 SHA512 2119aace937da02f47a5adc9af720587d25c2852cf70a9bcb04138e3ee511308c8f30cf0301fbec58cf0432b7fd6672ae6a02d1740c774703959197b3511fbcc
-EBUILD udev-init-scripts-33.ebuild 1479 BLAKE2B 6100ecf100ca73c2a62c70b0f2b7d732d75749aaea2ffed9e8bc4fdcdb72cf6e7b3961ec8e7160b7fc154402655273913eef17423e1448e28c61280fe8918a6a SHA512 589bfb949048914dd60c2b478e2d7241e4affd61ef1c9f73879d828243b153a22629916f41bc584099078be3468b19b2a860cd64d2176e5237b4bb9854d217f0
-EBUILD udev-init-scripts-9999.ebuild 1488 BLAKE2B a0e3675e423214b4b96f52aea796d215497222367669fcecef0fb5d0d0a13a748485e24abbcba34979026e0814d8005c9a295eafe4ac379cc45ed94713d3378b SHA512 2974bb69e988f43dc66eb83bb2e4148c1df74dee5c1ae4af0bc3224e0120349f70730cdd4b594edafc5cad99b8579ee0577f458129e22de030266368b518166b
+EBUILD udev-init-scripts-33.ebuild 1497 BLAKE2B df0c3b0fa591069bd34707c7da998918af8ae59bac7f04ddd577b250648ee7da4a587a7794ca4d0adf649215c111a095c891abe4eec638dffa68d3c3b22d97d6 SHA512 40ae141c3a01222a7787be72d1c0ccaf15d6d7d555206a0444f367daa833d0c96f17cfb54e20b58b1c348ef486e9ee8b0c82b81f46fd10452bb05b292213a587
+EBUILD udev-init-scripts-9999.ebuild 1506 BLAKE2B 8ab01f1e29ac32ddd5c9659eba67d7495b0665a3f6629f990627596e644aed0fd1463ba031acb6935cf558c4eb9c4b610f4ccc94846f64a752b6bef266fb4df7 SHA512 6ee4314c90cf78c02e267c663d00d1add439505832285e56879a462268545634bb3af21fea7447a9daee56ea700ef9588e3b7df9316bd60207f37e0a3fec99be
 MISC metadata.xml 221 BLAKE2B 9e0d24573ec598eccd3ad7e41a38ead4192d9e757ff4b870b51b02a96f04a13596b15c5c05ee2a4d888c4b9b0b9b30aafe5ba96d39ff9faa157b58e30e91ba55 SHA512 accbe81ec1cf4c8d7c6eb99b7ceb7a8119eb1f2f55dcaf6d368610c255e7a21ff222e7c613ca4be37083ce9527ca325f3ee91515dadad7c5929f60f4fda334df
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild
index 9df7c668a9cb..745836b006f8 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild
@@ -15,7 +15,7 @@ else
 fi
 
 DESCRIPTION="udev startup scripts for openrc"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
index 4ce4b403509b..1ace564000ff 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
@@ -15,7 +15,7 @@ else
 fi
 
 DESCRIPTION="udev startup scripts for openrc"
-HOMEPAGE="https://www.gentoo.org"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-fs/udiskie/Manifest b/sys-fs/udiskie/Manifest
index fa2e6309c26e..5900a39824be 100644
--- a/sys-fs/udiskie/Manifest
+++ b/sys-fs/udiskie/Manifest
@@ -1,5 +1,7 @@
 DIST udiskie-1.7.7.tar.gz 91858 BLAKE2B 7d9729f8c66e0d9afdf2b89f5cc2a941ce6726c809af1069146f13466eccdfa54ed45f43535d84592f1b09ccf6454814d7ff62d453781c547ebfb989fcab7767 SHA512 ea192cc8a50c742e96d5163bb1378a7cd110599cfe731d676343766a1ce3ee1102ab43322c5f9666d6c6a232e310fd494e0f76ad33aeab1fd8225a3267f3193a
 DIST udiskie-2.0.4.tar.gz 85944 BLAKE2B f7281ea04e6a5d76d490fa7f126e6214d4a9cf77d055e8d19d30395ae710e4298026cf50c58629634b6d81c095baff731b315fe175ec2fc94eff2ea518d18a0b SHA512 67dc6d27edaf956cd2b7d5de2625b15029723573a3f7bcabd56d397fb1493010c50194cd178f0c4071a0bebaed4672a19f39d902946c7bfb0891000fdf3f43cc
+DIST udiskie-2.1.0.tar.gz 86339 BLAKE2B e92c61ac61aaab81bb91874ed1ed0c8bab60524fe79c9432053968418767b6ebc5c15c33abc74f37471fcc5a799152a50d88528a4b7bbd91e015d448fb36d0cb SHA512 704bdf8226dd2eeb6b13c5a4facca76d9f5fa7119cef7b5af08d0d399f9e65318ed5a921638cd9b7db3acbadcff1029f2e7698a942350f31b8f94f5032c25663
 EBUILD udiskie-1.7.7.ebuild 1001 BLAKE2B 4c11cc62dc78e04bac3b01a7b6b1fc19b4ad29a876a86a1abcf5b3d7f1233f9e71211b7bc211f5873637fd21269e4d0d0819748e26edc94e4be49f76eac3a06c SHA512 dcc2cd4ffbbf77021fc9ad7d4c74163fe5825a6f9ae3d19b90c1fb333382b1fdab90dcb1b860b1c0ca8c6eda259878d5182afc43f1f2cf3f96644f8225672ca6
 EBUILD udiskie-2.0.4.ebuild 1096 BLAKE2B 329a2c23ff404ba204bfbe9859aad676dc77ea44097f94859d96d7248d77486061aaadf1cc699a2b943f4971b91feb1afa928e1c4acaa5f040dccc712d9a8fbf SHA512 a80a1a402beaabe9bac66a30e7d09576bb4c81943f067da7be503f3f251204547e9d6176b6704e81c3c190f6df074d312a602760c395acf3816ef7a452d7c65e
+EBUILD udiskie-2.1.0.ebuild 1096 BLAKE2B 329a2c23ff404ba204bfbe9859aad676dc77ea44097f94859d96d7248d77486061aaadf1cc699a2b943f4971b91feb1afa928e1c4acaa5f040dccc712d9a8fbf SHA512 a80a1a402beaabe9bac66a30e7d09576bb4c81943f067da7be503f3f251204547e9d6176b6704e81c3c190f6df074d312a602760c395acf3816ef7a452d7c65e
 MISC metadata.xml 369 BLAKE2B 0241a847b1eb2f650f66bc3fd631ccdf1927562d510e08c7bcd3db850752b665894838d0c705b7d03690aeea0aa93372d1faae5b313c9136d46e4913c177b0a4 SHA512 0772b0fa065a42292268b9e6a6b99b7198f5923bcc4697913b6c432db4e206a28b0fb1bd6c14b6363591cca02108a8a91029233824c3ec5bd7fbc592a941137e
diff --git a/sys-fs/udiskie/udiskie-2.1.0.ebuild b/sys-fs/udiskie/udiskie-2.1.0.ebuild
new file mode 100644
index 000000000000..342a8f0494a3
--- /dev/null
+++ b/sys-fs/udiskie/udiskie-2.1.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1 gnome2-utils
+
+DESCRIPTION="An automatic disk mounting service using udisks"
+HOMEPAGE="https://pypi.org/project/udiskie/ https://github.com/coldfix/udiskie"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	sys-fs/udisks:2
+	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' 'python3_6')"
+DEPEND="app-text/asciidoc
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed -i -e 's:gtk-update-icon-cache:true:' setup.py || die
+	default
+
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	emake -C doc
+}
+
+src_install() {
+	distutils-r1_src_install
+	doman doc/${PN}.8
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index e2b7b6e83bd9..f3cc6f1e80e6 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -5,5 +5,5 @@ AUX udisks-1.0.5-sysmacros.patch 1773 BLAKE2B 9ff54a1a134c798ddb9ef1c9d0eb770f45
 DIST udisks-1.0.5.tar.gz 736221 BLAKE2B 9a709c5d4fcd390d9a52ac764d0e3c678983a14644f79cfcf92dd4ea7ddecbac90aa046b890b7bdd1ad701f1106d5956d72dab1fbb030606319b4bcc4c297bdd SHA512 bdf4970113975221ff0e17866db18fd969ff9c8e1e851c8ad7572630814ab0c46b59df59433edcb2e7cc41cc8152afd35807f45e07f6d0fa87b21b5a77d0965a
 DIST udisks-2.8.4.tar.bz2 1619051 BLAKE2B 4fdf3d5ea8ae02eb74efd552afee2dbe94137767c343034dd68f1553b224871a51bb2382eda00de90d45bad18b4088b4812e1f3fbb004cd29e753e92afb34e05 SHA512 70860e5ca9ac73d442ca67f0e0429ce2f33575d8f64945fbf06d1694b080c8b6fed8d65b2485eff0ab66eab59cdebeb9309424820a2ee82c5faaa38029e15e6c
 EBUILD udisks-1.0.5-r3.ebuild 2797 BLAKE2B 5269e1aeb27a1f50c028bc04c3c7e7e59ff3e7e762320e6a153173e150db5b2cfc4f88e6ca6541d0564485f6ecc08bd6e32f33d3455c9ca850ce5df24fcdea33 SHA512 b63b5739a5cbdd58ccf7c0034e8034e020354b1ce79dc9009f7dd6d0a164cbf4dc794a5c1c19b6f1209bcc771dcfddf19416f691ef786d5827c766c3ab4680c2
-EBUILD udisks-2.8.4.ebuild 3284 BLAKE2B 59a74c88ce67b3d243c85cf6150b273c80a7b329d407eaad7fec71e345e462342dd46806dee9ebb6c14d2de63a8cffd19b541acd7e9781bc9a77512dbea7caff SHA512 7093d1e21ae620dbac252baabd657af62a4dc5df6cf68084f50f00b54844be4da93b8bf828a712c3c08be5820631f4bc45d47b52413304b6d4c8053f8213f4ed
+EBUILD udisks-2.8.4.ebuild 3278 BLAKE2B b28d2fb07c49ee7023fb819e4e6603cc08a8390a822cb0011b524d673dcf0961bb45f3eea19f09b10ff21351f5c9432ac76ae78285a0ae62f65303d48aaae061 SHA512 6f9dea136448ab8012a9bef0ce1a37a550aa6626db3a9e118010ec00776191577f18bcfb8e17800198566a8e52beaed51fd362d061eac3d32b8a65644674fcfe
 MISC metadata.xml 666 BLAKE2B 901164cd5d79ae10dedfe4905228912e88f38d9c555f512a31a55dfd5c61a5156f2498af7e1aef59713afda07e7218e922757f8ced95443557e0b8e8d088ceea SHA512 f2f854b15d66c994008195a9b24a6a98db493e3faf38da7324c7ed780df4f34bd029ae5083b0f52e46e5c6ada490e1427ce45cb1a56c07059789c7b12fe4863e
diff --git a/sys-fs/udisks/udisks-2.8.4.ebuild b/sys-fs/udisks/udisks-2.8.4.ebuild
index 826b59d7bcac..abf9347e9de9 100644
--- a/sys-fs/udisks/udisks-2.8.4.ebuild
+++ b/sys-fs/udisks/udisks-2.8.4.ebuild
@@ -76,9 +76,9 @@ src_configure() {
 		--enable-btrfs
 		--disable-gtk-doc
 		--disable-static
-		--localstatedir="${EPREFIX%/}"/var
-		--with-html-dir="${EPREFIX%/}"/usr/share/gtk-doc/html
-		--with-modprobedir="${EPREFIX%/}"/lib/modprobe.d
+		--localstatedir="${EPREFIX}"/var
+		--with-html-dir="${EPREFIX}"/usr/share/gtk-doc/html
+		--with-modprobedir="${EPREFIX}"/lib/modprobe.d
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
 		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
 		--with-udevdir="$(get_udevdir)"
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 9170d048f8ad..e92d1d9d29ce 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,5 +1,7 @@
 AUX 0.7.13-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch 1945 BLAKE2B db5d094bcac52a3b53bae9df4b0444f656858dd83f21994cbefe4900554a2579c67b5058d149d226ca354bd45d9e24c12244186da3232064233b74ec590187dc SHA512 71a009336fdcac8e5813001fd6741f4310c3e792b20650ebad73ba0049730acb5188587dc8e706846e886bf9ac241d2163b9558150eb389c99d7910a730542d0
 AUX 0.8.2-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch 3386 BLAKE2B fd12c67ae3d481dda5a6bcf3c3815ac752f7f22834aadc02ee11a592b7114bccc7fc8b494763f80999428d90c9903cbf4df5e544443c2cec0bfc91a942f5c708 SHA512 739d1e050d8894e3d92a995500d1f70e128cf33de941eacdb0b3ad8e743fedf464a02ba4a5ac85f43e302d53302ce866d88ab836dd60b861914cb5b7a190f376
+AUX 0.8.3-fno-common.patch 2377 BLAKE2B 61390e1c64b212b94060777154f5cf18942d4c22ba845f85ae91e81cdb6978e6d01cc9f90b1739bf3503bc40f26a98389659dbc0f83d3cedc954b802792b3b55 SHA512 7b2b066d0f4def5950c031ef87626ef68e0eccfe388f451dd6e5a36874674020ed2e4658bf24ab3977673b77aa7631822ef12318381f7785f310a0b24a61dfbc
+AUX 0.8.3-zfs-functions.patch 1707 BLAKE2B 6ead7415be7dbeff6377b8d4074bb4e1cf6b154cf145e77b876e514c57d05cc041c5a66cfd6ab4c0bbb4931fa2553680c5749c4e06810ebd5658941088f9e7cf SHA512 cda47f5ef47ab86b2fda87e9ac2ab26d08431b2bd7420ecdd8ab9625a283c48278caa794b2aaa4c5f9341e08a2751b5b4a7b93a3b53491ccbdf2f085a0cb86ec
 AUX bash-completion-r1 11310 BLAKE2B f6c105fef1737d4be0e76967fdec62aa52fa7665bfc1e9aa4c944dd6442d64d7d31b8af54f92f5db25542f968ecf83da46db8c2a8f978577526bf9f90d8bccf3 SHA512 03be521e2c646196766d5fd049f241cb97f290abf0409881ea6ba709934984deda402c8513009e62a5787e0648023b55c040e5f99baef27709e81c3bc9c8f56e
 AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e0699ae82618c4c14caf4b26cb466367a5372d7e0a030aa857d024e3db0faef4bb5fa32c54f41f0d4766693a95ba5ab SHA512 e53c79401f4c634a94af27b2f88a40440b68a4c192fd1944668786650aaa0f1f08dff851dca5b9666ce8bba1f0e2b7cb195314cd9d1314c9bab1194d03122319
 AUX zfs-init.sh.in 582 BLAKE2B 27e5c1aff398c42178b3d7c005e91a1f8f3afa303a22e49c93a2cd7134016a8d07d68483126d60e46ed4ff5cbaeb87f050e9c9fb5bff5352d5dc32b4d94db7b4 SHA512 bed7eae5f902f13489241782d3d560b53a5a3258de492763b7b25783ca9417975afb9000f68f58be5c2057e1db50a569374ed0ff572140aa65e401e20e646461
@@ -7,9 +9,9 @@ AUX zfs.service.in 335 BLAKE2B a18ad1d70975df98cfb7b5196ad17b7197d5eb59cac2ccb3b
 DIST zfs-0.7.13.tar.gz 6614047 BLAKE2B c59c46287715779eb04d69333b0a417fa9865eb0d61c642b043188c4c97d4eed369f76a48327326ed1d4dd608ff95d91d20d26c80ed0b120a8fcd5f83cea638f SHA512 457d8f110b68c9656194cd3738b216d5d807d680e5cfc6ed1f3cf5ebde67860476387c6b862ba3ba7f972d8945075963e6c325543ab84468e3eff5dbce68476e
 DIST zfs-0.8.2.tar.gz 8738111 BLAKE2B 5c15f6664ca70f0deeb5b9e32f2bcff68f9821529e5203ff18612ce88473fee9af369354c442f3db7882d301cf17c805c9635b05bfd3460833ed8e5ff8004dd0 SHA512 1424b1a030b814f812b5da422100669db5b8c3ccae14c2fdd62a5e0df28e7255247fe5ca99c95a14f08c92cc1574c22dd132093e4a1dd81e38c95b10cc5e2496
 DIST zfs-0.8.3.tar.gz 8779385 BLAKE2B 8b51b9d5b61543566bc7839d8452fdf9358442155e95f93a011531338824bbd4fc8879500e276b02d5d49d504a046728ecc0c6154f69eb7b47180b9bb0e46958 SHA512 aded632e6b04180560d4f2ff283260016e883dadae4e7fda9070b7113dee948099cb7a7b183f1c8139654389a2610fb9cc6f997acdc846040e605125cf016010
-EBUILD zfs-0.7.13-r1.ebuild 6282 BLAKE2B 9fae8590e1d6f723bea164f90b6b8a5ce1a96d8dc2d10b514f0d50a2c24c70ede7fd3dc1888efc4c3746e72d4970d5c2ed501072a21f08a46a188cd288a9743b SHA512 b50d3835a65153143ea4b9236e8084a495565397d570b64f4b622e4b501432a55b8b604dc7f276502e97e0b500302b74ae53fc8ba12c087f9e43ba84a4891ceb
-EBUILD zfs-0.7.13-r2.ebuild 6346 BLAKE2B f317a17063a320a92c13b1546507dc37b75c48ae5c19871d8ed0113590dd84687bd5b331f168a5d68e8d0aef0c135519e5abd9a8c91c858ab6bae53c5236496b SHA512 4c24e183caf67d52b14047add79947d0331eb1590a0754486ca5a03c2ab9f7cade308973164924855e8293d7c0d905bae1d4295f7cb5efbafe9dea8a4d1b9125
-EBUILD zfs-0.8.2-r2.ebuild 5701 BLAKE2B b7c845e5342023bbdc210f306c64f6cef3383bfe6c9f445a77f05a2117dfe22e6a792d2d55b61108638926225791bc6c45335410d65adf67e00cc7b6faea430e SHA512 f5e09062ed0496bf51257f1b89f7e21e0f727d222a25ef22745727d6d7ca56d136222fd149cf8f6a6a8d87054427d30aaa451b7ae0360b29b99da095bb1e8135
-EBUILD zfs-0.8.3.ebuild 5567 BLAKE2B 8b0768a1d6a36f16598aee0039417e08818dfd115f93682c9e255ba3d49c5dd5fe93e54c953bf9978594c69b1b817c8739647a708e90073885accdc29458f97d SHA512 16ecd59b2911eb8dde31032e950c150c68bc9c3a904daa8be32fb594e85185e858790c71b3589fdaf5cc8cc801e10bbfe5b6192a3a99f848277086367717c734
-EBUILD zfs-9999.ebuild 5430 BLAKE2B 681134f5d63ec4b0d88a2029ef600d2ed76fa843924db5abf949a7ee33d75711564988d4559badbb367023b112f9d2495cb943662b770a3ca6996ed01b0a9ace SHA512 a55a3d4cae07ec07d4f4a5b196c06653bc774389c3e772b8a262528237081bf38eb624c0c3d7080d8f3bb9b42dcc0c80e3b351af1ed967c94ef294407ab35105
+EBUILD zfs-0.7.13-r1.ebuild 6276 BLAKE2B b2aafe81b97e72249710bbed0282afe8e03aaf5029236d5b12d3089ef58458b9615f1f60f89b1473097321b8182704a5ba2964fb94b86f03a20d269029351264 SHA512 3547d9918e2b082299dbbaf39310ecaa780f44c2c7ece907b6149b3cff98ce68fc73846c303d579112453aaa6763bd029ccd24ab330c1578432a44da73a0d816
+EBUILD zfs-0.7.13-r2.ebuild 6340 BLAKE2B a351568c54fecd31574471e164f41e1909fe6096ac68211664ef6a90435c59c4189a5ed9a1356867a81941a17874c8580b6a27ec0caef49976afdda655bb8571 SHA512 4a17ca33411e286f19ae8d4c6eaee42cad9a2db024a83b6355f0f33db0fcbd83ca138f3e4b88a2b14cc3fded942edf4bd22f4588afc6082e608e02ced2d59b10
+EBUILD zfs-0.8.2-r2.ebuild 5695 BLAKE2B 6e8096f02073a66e3c441ffe445efa13343d578b4da24b132cbd1336590c9fe6a260901acbb7db792d802f1f4838eaa86ed769c3acff670bcf2ab5d1b3f35ca6 SHA512 5ea68d75bee0c3fba23ed178c564f997a1e39ea3a036f3964e7badf0f8f31f359de184375f71060590aae86d18c222e36d9957639e7fd764f5ac4d824057282a
+EBUILD zfs-0.8.3-r1.ebuild 5632 BLAKE2B 4e3ad4d539fd8a3564506c2c81ae64d5e7384e42d0a016da9edd0b6ca27392c7c6bee5085944137e9ae7e7e010b07b1854ebfa931bcfff65cc7474429a074fef SHA512 6739e8a0b86c1e763e44ed454ed74bb8f680ca49a85ba12a3a877b9a5a41f83fdd501c6a411e9e79855139de9a034e6a77aa9773cc418dbee60b12bd0d782feb
+EBUILD zfs-9999.ebuild 5424 BLAKE2B fc1a9905e15e42717447c4f572e28e7834231da76a91bbb7072834e0e18a649c19a455de69c1f5ccc9f0afce590733c3aafa90f499723bc838b7f0200722e0b9 SHA512 9c4f99a617dfa274ad92e3b24671743724c8c4c54c6a2dcf92c452ecfd246d5a37e77f31fefd8992305ecfdc8821aa643df3d78125d685f206411071f5425aa5
 MISC metadata.xml 751 BLAKE2B 84331bb699e48773412c2b3a26786e746428a111b64d1a309d0acd6f2454220e917a6650b2a35e88269f77c725f848493f46516adf72a0deb149dbb1e0275bf3 SHA512 a16f2fff439157fa1910926bd5b90ccfc3cab262fe7b41e5565b645f29774b14f1d9ac11aceaee57b8685ec1c782d826e08715559fb0b2e06031a165ca5f6295
diff --git a/sys-fs/zfs/files/0.8.3-fno-common.patch b/sys-fs/zfs/files/0.8.3-fno-common.patch
new file mode 100644
index 000000000000..3b09d8bbc597
--- /dev/null
+++ b/sys-fs/zfs/files/0.8.3-fno-common.patch
@@ -0,0 +1,83 @@
+From af09c050e95bebbaeca52156218f3f91e8c9951a Mon Sep 17 00:00:00 2001
+From: Romain Dolbeau <romain.dolbeau@european-processor-initiative.eu>
+Date: Thu, 6 Feb 2020 18:25:29 +0100
+Subject: [PATCH] Fix static data to link with -fno-common
+
+-fno-common is the new default in GCC 10, replacing -fcommon in
+GCC <= 9, so static data must only be allocated once.
+
+Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Signed-off-by: Romain Dolbeau <romain.dolbeau@european-processor-initiative.eu>
+Closes #9943
+---
+ cmd/zfs/zfs_util.h     | 2 +-
+ cmd/zpool/zpool_main.c | 2 ++
+ cmd/zpool/zpool_util.h | 2 +-
+ lib/libshare/smb.c     | 2 ++
+ lib/libshare/smb.h     | 2 +-
+ 5 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/cmd/zfs/zfs_util.h b/cmd/zfs/zfs_util.h
+index 3ddff9e22d7..a56af59adb1 100644
+--- a/cmd/zfs/zfs_util.h
++++ b/cmd/zfs/zfs_util.h
+@@ -33,7 +33,7 @@ extern "C" {
+ 
+ void * safe_malloc(size_t size);
+ void nomem(void);
+-libzfs_handle_t *g_zfs;
++extern libzfs_handle_t *g_zfs;
+ 
+ #ifdef	__cplusplus
+ }
+diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
+index ae5e8a370fc..ff4f44d4652 100644
+--- a/cmd/zpool/zpool_main.c
++++ b/cmd/zpool/zpool_main.c
+@@ -76,6 +76,8 @@
+ 
+ #include "statcommon.h"
+ 
++libzfs_handle_t *g_zfs;
++
+ static int zpool_do_create(int, char **);
+ static int zpool_do_destroy(int, char **);
+ 
+diff --git a/cmd/zpool/zpool_util.h b/cmd/zpool/zpool_util.h
+index ce760df723c..1f23f61aaa4 100644
+--- a/cmd/zpool/zpool_util.h
++++ b/cmd/zpool/zpool_util.h
+@@ -79,7 +79,7 @@ void pool_list_free(zpool_list_t *);
+ int pool_list_count(zpool_list_t *);
+ void pool_list_remove(zpool_list_t *, zpool_handle_t *);
+ 
+-libzfs_handle_t *g_zfs;
++extern libzfs_handle_t *g_zfs;
+ 
+ 
+ typedef	struct vdev_cmd_data
+diff --git a/lib/libshare/smb.c b/lib/libshare/smb.c
+index a95607ee032..f567f7c49d7 100644
+--- a/lib/libshare/smb.c
++++ b/lib/libshare/smb.c
+@@ -65,6 +65,8 @@ static boolean_t smb_available(void);
+ 
+ static sa_fstype_t *smb_fstype;
+ 
++smb_share_t *smb_shares;
++
+ /*
+  * Retrieve the list of SMB shares.
+  */
+diff --git a/lib/libshare/smb.h b/lib/libshare/smb.h
+index 7a0c0fd162d..8ea44677f9a 100644
+--- a/lib/libshare/smb.h
++++ b/lib/libshare/smb.h
+@@ -44,6 +44,6 @@ typedef struct smb_share_s {
+ 	struct smb_share_s *next;
+ } smb_share_t;
+ 
+-smb_share_t *smb_shares;
++extern smb_share_t *smb_shares;
+ 
+ void libshare_smb_init(void);
diff --git a/sys-fs/zfs/files/0.8.3-zfs-functions.patch b/sys-fs/zfs/files/0.8.3-zfs-functions.patch
new file mode 100644
index 000000000000..9cce3e1c1a7d
--- /dev/null
+++ b/sys-fs/zfs/files/0.8.3-zfs-functions.patch
@@ -0,0 +1,51 @@
+From 00478e1b5141f8b6ceaf14c173382d1aa11878b9 Mon Sep 17 00:00:00 2001
+From: Tony Hutter <hutter2@llnl.gov>
+Date: Thu, 6 Feb 2020 09:28:20 -0800
+Subject: [PATCH] Fix zfs-functions packaging bug
+
+This fixes a bug where the generated zfs-functions was being included along
+with original zfs-functions.in in the make dist tarball.  This caused an
+unfortunate series of events during build/packaging that resulted in the
+RPM-installed /etc/zfs/zfs-functions listing the paths as:
+
+ZFS="/usr/local/sbin/zfs"
+ZED="/usr/local/sbin/zed"
+ZPOOL="/usr/local/sbin/zpool"
+
+When they should have been:
+
+ZFS="/sbin/zfs"
+ZED="/sbin/zed"
+ZPOOL="/sbin/zpool"
+
+This affects init.d (non-systemd) distros like CentOS 6.
+
+Fixes: #9443
+
+Signed-off-by: Tony Hutter <hutter2@llnl.gov>
+---
+ contrib/initramfs/Makefile.am | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/contrib/initramfs/Makefile.am b/contrib/initramfs/Makefile.am
+index 52bdeb2afe5..4e52e8ea5e9 100644
+--- a/contrib/initramfs/Makefile.am
++++ b/contrib/initramfs/Makefile.am
+@@ -6,15 +6,12 @@ initrd_SCRIPTS = \
+ SUBDIRS = hooks scripts
+ 
+ EXTRA_DIST = \
+-	$(top_srcdir)/etc/init.d/zfs \
+-	$(top_srcdir)/etc/init.d/zfs-functions \
++	$(top_srcdir)/etc/init.d/zfs.in \
++	$(top_srcdir)/etc/init.d/zfs-functions.in \
+ 	$(top_srcdir)/contrib/initramfs/conf.d/zfs \
+ 	$(top_srcdir)/contrib/initramfs/conf-hooks.d/zfs \
+ 	$(top_srcdir)/contrib/initramfs/README.initramfs.markdown
+ 
+-$(top_srcdir)/etc/init.d/zfs $(top_srcdir)/etc/init.d/zfs-functions:
+-	$(MAKE) -C $(top_srcdir)/etc/init.d zfs zfs-functions
+-
+ install-initrdSCRIPTS: $(EXTRA_DIST)
+ 	for d in conf.d conf-hooks.d scripts/local-top; do \
+ 		$(MKDIR_P) $(DESTDIR)$(initrddir)/$$d; \
diff --git a/sys-fs/zfs/zfs-0.7.13-r1.ebuild b/sys-fs/zfs/zfs-0.7.13-r1.ebuild
index 7bfb7393b91a..e7978fd5d927 100644
--- a/sys-fs/zfs/zfs-0.7.13-r1.ebuild
+++ b/sys-fs/zfs/zfs-0.7.13-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 if [ ${PV} == "9999" ] ; then
 	inherit git-r3 linux-mod
diff --git a/sys-fs/zfs/zfs-0.7.13-r2.ebuild b/sys-fs/zfs/zfs-0.7.13-r2.ebuild
index 2b547fcde15c..2362e5ccec08 100644
--- a/sys-fs/zfs/zfs-0.7.13-r2.ebuild
+++ b/sys-fs/zfs/zfs-0.7.13-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 if [ ${PV} == "9999" ] ; then
 	inherit git-r3 linux-mod
diff --git a/sys-fs/zfs/zfs-0.8.2-r2.ebuild b/sys-fs/zfs/zfs-0.8.2-r2.ebuild
index 341a978b2793..c744e615de44 100644
--- a/sys-fs/zfs/zfs-0.8.2-r2.ebuild
+++ b/sys-fs/zfs/zfs-0.8.2-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit bash-completion-r1 flag-o-matic linux-info linux-mod distutils-r1 systemd toolchain-funcs udev usr-ldscript
 
diff --git a/sys-fs/zfs/zfs-0.8.3.ebuild b/sys-fs/zfs/zfs-0.8.3-r1.ebuild
index 9ac492e30ce3..df59d685573c 100644
--- a/sys-fs/zfs/zfs-0.8.3.ebuild
+++ b/sys-fs/zfs/zfs-0.8.3-r1.ebuild
@@ -4,15 +4,15 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
-inherit bash-completion-r1 flag-o-matic linux-info linux-mod distutils-r1 systemd toolchain-funcs udev usr-ldscript
+inherit bash-completion-r1 flag-o-matic linux-info distutils-r1 systemd toolchain-funcs udev usr-ldscript
 
 DESCRIPTION="Userland utilities for ZFS Linux kernel module"
 HOMEPAGE="https://zfsonlinux.org/"
 
 if [[ ${PV} == "9999" ]] ; then
-	inherit autotools git-r3
+	inherit autotools git-r3 linux-mod
 	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
 else
 	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
@@ -68,7 +68,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" )
+PATCHES=(
+	"${FILESDIR}/bash-completion-sudo.patch"
+	"${FILESDIR}/${PV}-fno-common.patch"
+	"${FILESDIR}/${PV}-zfs-functions.patch"
+)
 
 pkg_setup() {
 	if use kernel_linux && use test-suite; then
@@ -111,6 +115,10 @@ src_prepare() {
 	# prevent errors showing up on zfs-mount stop, #647688
 	# openrc will unmount all filesystems anyway.
 	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" etc/init.d/zfs.in || die
+
+	# needed to get files regenerated
+	# https://github.com/zfsonlinux/zfs/issues/9443
+	rm -v etc/init.d/zfs{,-functions} || die
 }
 
 src_configure() {
@@ -138,9 +146,6 @@ src_configure() {
 	)
 
 	econf "${myconf[@]}"
-
-	# temp hack for https://github.com/zfsonlinux/zfs/issues/9443
-	sed -i "s@/usr/local/@"${EPREFIX}/"@g" etc/init.d/zfs-functions || die
 }
 
 src_compile() {
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 1c02c0298585..f40bd0bca2a7 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -4,15 +4,15 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
-inherit bash-completion-r1 flag-o-matic linux-info linux-mod distutils-r1 systemd toolchain-funcs udev usr-ldscript
+inherit bash-completion-r1 flag-o-matic linux-info distutils-r1 systemd toolchain-funcs udev usr-ldscript
 
 DESCRIPTION="Userland utilities for ZFS Linux kernel module"
 HOMEPAGE="https://zfsonlinux.org/"
 
 if [[ ${PV} == "9999" ]] ; then
-	inherit autotools git-r3
+	inherit autotools git-r3 linux-mod
 	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
 else
 	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"