gentoo resync : 30.05.2020

53 files changed, 524 insertions, 846 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 798f1a404e1e..1d17f7a7867b 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/bcache-tools/Manifest b/sys-fs/bcache-tools/Manifest
index 1544a9df0ac1..c81bbc6852ca 100644
--- a/sys-fs/bcache-tools/Manifest
+++ b/sys-fs/bcache-tools/Manifest
@@ -8,8 +8,8 @@ DIST bcache-status-20140220.tar.gz 3779 BLAKE2B a3fa5e9d87b2c51f1f5178693db6d9f8
 DIST bcache-tools-1.0.5.tgz 21934 BLAKE2B 9761fd0b7b7fa5a9a6911576988065b80ada0fbb52a094b1290affca302b2b995f0418ed65ab5af6de71c7d18953606968cc910e7b4c4f8cb2e0e9970c8e7d7c SHA512 aaf27e4cc3037d482cb14c8bb083c1ce5cda5641a19cec67ca1ad22cde71ce035e49701145c6d920b4d62058897c4b7d29d341b3b8bd436c9c51e2f8bdb5c568
 DIST bcache-tools-1.0.8.tgz 22153 BLAKE2B d40a64b02e0d66ef8868151870715f6e6ab54633e4875c32d0e03dfe1871e5aa98d7e133b9eed583ac4898b1598f38b71e47109210009ca51c4dfe9dbd31768c SHA512 21eaed457e5de623089c0d4e1c11394a3950f29c749c502bfd5dd94d3dcdc7379c4a910825e33bf9fc8080df656949b94a1a28d19048a8eb6422976cb391b7dc
 DIST bcache-tools-1.0.8_p20140220.tgz 22153 BLAKE2B d40a64b02e0d66ef8868151870715f6e6ab54633e4875c32d0e03dfe1871e5aa98d7e133b9eed583ac4898b1598f38b71e47109210009ca51c4dfe9dbd31768c SHA512 21eaed457e5de623089c0d4e1c11394a3950f29c749c502bfd5dd94d3dcdc7379c4a910825e33bf9fc8080df656949b94a1a28d19048a8eb6422976cb391b7dc
-EBUILD bcache-tools-1.0.5.ebuild 950 BLAKE2B f0841d328abef9b5259718584d3eeaba692a94a6acaa70d9a4f0c8b4230b52d1576fdb374249aa56950d6b64e677111d95fee3249ec8c28605fb2db51dff1a2e SHA512 94e89384c4783604f1a930ed840428deb9574fbae37653ac5e6c3d315be62fb3497ba6a463ef95f3a0fa5a983a56cff84d55dba371b6f3ce7f2d39ab6323f028
-EBUILD bcache-tools-1.0.8.ebuild 950 BLAKE2B f0841d328abef9b5259718584d3eeaba692a94a6acaa70d9a4f0c8b4230b52d1576fdb374249aa56950d6b64e677111d95fee3249ec8c28605fb2db51dff1a2e SHA512 94e89384c4783604f1a930ed840428deb9574fbae37653ac5e6c3d315be62fb3497ba6a463ef95f3a0fa5a983a56cff84d55dba371b6f3ce7f2d39ab6323f028
-EBUILD bcache-tools-1.0.8_p20140220-r1.ebuild 1599 BLAKE2B 114457bf3cb6e79724863c241fda81fff29df4bbed5ae9c74109b773eb876f247af2ae894e17c63677b1829a555c4b4ceba92521927a969859730aea4ad5a4a9 SHA512 3e7fc66fbfb14a7f38fb0346c0fb1037d0a261d96313fe3faec28c347688e2efcf79d3e864a54ca17e82522222cc28f8fc09202bd8642d05110aefa4828b9384
-EBUILD bcache-tools-9999.ebuild 994 BLAKE2B 11e9b8fec92d414fdb4bde15d4e359a9b0f30ac9d09f1fd6f7fc94a5c4e4bf1e07d0e48b75735e238c88cceb88ab94e0ab7b8d5b8169dad173a2051632bc209c SHA512 d329bdbaa5f93eb42cfe8e7d77416d01f279db42f3f28f3186399253641442e064395db9ea9ea56db26f8cb9d3fd432eac986799c3f342bf1187fe1885709f02
+EBUILD bcache-tools-1.0.5.ebuild 948 BLAKE2B 933b23d5b1a82ace33886d6d85960630c19ceb7b65ee8a39cf3538d6f58f410d3caece111ea3db203b3e14148e5595f424f2c79caebb64195dd12f4cd894a735 SHA512 9aaf48abd2b5c5aeffbdf0d9036c45c795802281ac1424c1acb9ac45f26b5f232632738ebc22ad894c007478e1036c8ce28ed7fb85cddbe5ca14c98a0228d8f1
+EBUILD bcache-tools-1.0.8.ebuild 948 BLAKE2B 933b23d5b1a82ace33886d6d85960630c19ceb7b65ee8a39cf3538d6f58f410d3caece111ea3db203b3e14148e5595f424f2c79caebb64195dd12f4cd894a735 SHA512 9aaf48abd2b5c5aeffbdf0d9036c45c795802281ac1424c1acb9ac45f26b5f232632738ebc22ad894c007478e1036c8ce28ed7fb85cddbe5ca14c98a0228d8f1
+EBUILD bcache-tools-1.0.8_p20140220-r1.ebuild 1600 BLAKE2B b9cece80cc38461984bcfbe4a736f294f5d65339b29dc6e72ec5416fb6cca669d17af4137ef5e43100c682c01d779069c82e81ed87236200f29f6f1cab84c596 SHA512 37f20893675416762095b2d45aea6098a5f1886fe4a8abdf2005bad5e5a3e90ad5eeaa0642daf95adefc37866b00f2615a9291ee9aeff40cf5481ce797d4fb44
+EBUILD bcache-tools-9999.ebuild 992 BLAKE2B b44ccdac9c100f3777e73db2b5d91831d4cb9f434507df1b03d4aac965a0f3d927e1872f40050d1d5b3b81a0072d832425eb58ac047ca16ee3122e00f55bd525 SHA512 96f1b026c0365cb19fdd4d0815778609eb2f59cc6cd4760a5287a1e76f6c5591b9ac1ae36eae966255fa93b5be690e16553ca2881880c7cb8b4bb62ee4ae4de5
 MISC metadata.xml 304 BLAKE2B 57596b1ecdec4efba5eea65141ea49a3a5a12e4efa840bcadeded836dcdec0169f723917e52d28c56f6c0aabc6d3af587a9d276d88dd30b5978d901d72feae52 SHA512 4b5575ff0ece142ff6839b8a8a81c7c0515ac42993f5ca415d53d3a85a7171ff565332edbb237448cd662abe6f1d1ffa5dce0eb21817dd861a728f0652dcb541
diff --git a/sys-fs/bcache-tools/bcache-tools-1.0.5.ebuild b/sys-fs/bcache-tools/bcache-tools-1.0.5.ebuild
index 6cbfae0c1a1e..ed33527ffb9e 100644
--- a/sys-fs/bcache-tools/bcache-tools-1.0.5.ebuild
+++ b/sys-fs/bcache-tools/bcache-tools-1.0.5.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
@@ -6,7 +6,7 @@ EAPI=5
 inherit toolchain-funcs udev
 
 DESCRIPTION="Tools for bcachefs"
-HOMEPAGE="http://bcache.evilpiepirate.org/"
+HOMEPAGE="https://bcache.evilpiepirate.org/"
 SRC_URI="https://github.com/g2p/bcache-tools/archive/v${PV}.tar.gz -> ${P}.tgz"
 
 SLOT="0"
diff --git a/sys-fs/bcache-tools/bcache-tools-1.0.8.ebuild b/sys-fs/bcache-tools/bcache-tools-1.0.8.ebuild
index 6cbfae0c1a1e..ed33527ffb9e 100644
--- a/sys-fs/bcache-tools/bcache-tools-1.0.8.ebuild
+++ b/sys-fs/bcache-tools/bcache-tools-1.0.8.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
@@ -6,7 +6,7 @@ EAPI=5
 inherit toolchain-funcs udev
 
 DESCRIPTION="Tools for bcachefs"
-HOMEPAGE="http://bcache.evilpiepirate.org/"
+HOMEPAGE="https://bcache.evilpiepirate.org/"
 SRC_URI="https://github.com/g2p/bcache-tools/archive/v${PV}.tar.gz -> ${P}.tgz"
 
 SLOT="0"
diff --git a/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild b/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild
index 2fcef65f80b0..9052ec7ba751 100644
--- a/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild
+++ b/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit eutils flag-o-matic python-r1 toolchain-funcs udev
 
 DESCRIPTION="Tools for bcachefs"
-HOMEPAGE="http://bcache.evilpiepirate.org/"
+HOMEPAGE="https://bcache.evilpiepirate.org/"
 SRC_URI="
 	https://github.com/g2p/bcache-tools/archive/v${PV%%_p*}.tar.gz -> ${P}.tgz
 	https://dev.gentoo.org/~jlec/distfiles/bcache-status-20140220.tar.gz
diff --git a/sys-fs/bcache-tools/bcache-tools-9999.ebuild b/sys-fs/bcache-tools/bcache-tools-9999.ebuild
index 1ac411be39f2..3bd398fac481 100644
--- a/sys-fs/bcache-tools/bcache-tools-9999.ebuild
+++ b/sys-fs/bcache-tools/bcache-tools-9999.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
@@ -8,7 +8,7 @@ EGIT_NONSHALLOW=true
 inherit git-r3 toolchain-funcs udev
 
 DESCRIPTION="Tools for bcachefs"
-HOMEPAGE="http://bcache.evilpiepirate.org/"
+HOMEPAGE="https://bcache.evilpiepirate.org/"
 SRC_URI=""
 EGIT_REPO_URI="https://github.com/g2p/bcache-tools.git"
 
diff --git a/sys-fs/bindfs/Manifest b/sys-fs/bindfs/Manifest
index f1e4dbc4c531..cbc3c9b0ba9e 100644
--- a/sys-fs/bindfs/Manifest
+++ b/sys-fs/bindfs/Manifest
@@ -1,9 +1,5 @@
-DIST bindfs-1.14.1.tar.gz 407141 BLAKE2B 749578af588a8f9f778e799ae57b3303f6ae8c83f174aa6df96a92c6af4edcd3f76a332b18b55493e1f60cbbf44c66def3083f8cfe85c9b1af382f1ec6166fd1 SHA512 a0cf4f2cff147f5496c15a9bd9634ccdee323e299a4b132f2c2166a9d5379a26a151a14a45aec6950f8cf9c7ac3e9d2b9a97fee60b3130f5dcb20d65a43a1702
-DIST bindfs-1.14.3.tar.gz 407363 BLAKE2B 00095a6c5d8a095db1993d56f1987e91f3d66f20282b0939062a63ed1af8c14f29a3c9b26905f96ef88d57dc4031d55155dc0c181cc091ab2554308c6a78742e SHA512 34a927a59cc0ab77ff12f49765831fa9c2ec0f9cbd1d1af517e8746a7aa7370aef011d5f29c9bce6f48aca9218b192fdd489451cd08179bbef7c287e126ebbba
-DIST bindfs-1.14.4.tar.gz 407711 BLAKE2B e48bbb069c6b030d18361ef1bd347103d8ac25fb52b869ab03492434bf8dbb249b161d839d91d535cded7260b1693d38674c5402ffcc6bbc1b4000acc236c375 SHA512 f5c63ac87bbcb38f317b772bb69f17c756f7c738dfe9c317d866eb2712267674c7fe2836d697bce581db2391d5c73f1aff22d5188f735b6df533b7ab3ad88f47
 DIST bindfs-1.14.5.tar.gz 407863 BLAKE2B 2c75b426f2b2fd8947c2f7e8b74fd9826cccba99afce661713946acdc7765cd8065475ecc244d4ffd534fde8243d100eba03abcc643cec2a9d2fbec954c4ab73 SHA512 df8245339ef0491a58d69f3fca215b4cca4853976cedc507ba4c953ef136d34d245130c7bdb9b75adb7661e0f359582afae0b6e7b5f69252ca5adecbc09c51ec
-EBUILD bindfs-1.14.1.ebuild 478 BLAKE2B 90d44601a2bd2825d73409e5c393eb6171438694ae864301e04cb60136c23aff30a5c18dd291bad21ced261badaae989b2861d9a90478c9d697e81c396e31965 SHA512 7b31f97aec25686a0ca7a4ced6f52391a944a02d2cf3eacc45b458bd7ab6d0640615e15d4adba55d2d191beace44ae79b985b4593abe74fd95fd82e1e105a5cf
-EBUILD bindfs-1.14.3.ebuild 478 BLAKE2B 8a742f9c0a17005ab1d6feec04d155cef1e9d6350dbaff76191273f3ff586bdbe21d96fdc34ce2f1f9ffe9c377537f1fe3135fd50e37db0e3c4d46d3124386a9 SHA512 23105ab140967691268df3809cfeb577a7c63538c356702ae471bf9dbaf3dd2fa1ff432f982ed0d90318cdef902d63237c6473e1487582ecff35ae7f6afd4e60
-EBUILD bindfs-1.14.4.ebuild 478 BLAKE2B 8a742f9c0a17005ab1d6feec04d155cef1e9d6350dbaff76191273f3ff586bdbe21d96fdc34ce2f1f9ffe9c377537f1fe3135fd50e37db0e3c4d46d3124386a9 SHA512 23105ab140967691268df3809cfeb577a7c63538c356702ae471bf9dbaf3dd2fa1ff432f982ed0d90318cdef902d63237c6473e1487582ecff35ae7f6afd4e60
+DIST bindfs-1.14.7.tar.gz 409427 BLAKE2B 0027ee589a39d6d29b4bc337aaa87e4cf231f4549245c14353a39fb7a66e8ade17412740f5caf2e2eed4cb0501b6537beaf4929d21256c5b0625304b056829a3 SHA512 03b0bce29b87219e7e159077942e66e7e0e783b8c41234231696f96aa83e66271431fd3b4e7c1d98ba74705ec7255bd7da9d9484981ddb86c4d1c1b35dcaa0cc
 EBUILD bindfs-1.14.5.ebuild 478 BLAKE2B 8a742f9c0a17005ab1d6feec04d155cef1e9d6350dbaff76191273f3ff586bdbe21d96fdc34ce2f1f9ffe9c377537f1fe3135fd50e37db0e3c4d46d3124386a9 SHA512 23105ab140967691268df3809cfeb577a7c63538c356702ae471bf9dbaf3dd2fa1ff432f982ed0d90318cdef902d63237c6473e1487582ecff35ae7f6afd4e60
+EBUILD bindfs-1.14.7.ebuild 478 BLAKE2B 8a742f9c0a17005ab1d6feec04d155cef1e9d6350dbaff76191273f3ff586bdbe21d96fdc34ce2f1f9ffe9c377537f1fe3135fd50e37db0e3c4d46d3124386a9 SHA512 23105ab140967691268df3809cfeb577a7c63538c356702ae471bf9dbaf3dd2fa1ff432f982ed0d90318cdef902d63237c6473e1487582ecff35ae7f6afd4e60
 MISC metadata.xml 325 BLAKE2B aa0a376311bff962fc56dfcfdf9f0d7eab54cde65ad9518ef24e38651e57bccc1514e444657e1dfc4c9a5c7f651e700b5b7122dedca39ac24029b6b7e990c493 SHA512 466c2a77d115de2a7b8110a3076d58b604e0f53a9de46842ffcb0fb2c913e0cc6e0393035432a101327a780163453ff973044f0b473584eb2be65a53a181e83c
diff --git a/sys-fs/bindfs/bindfs-1.14.1.ebuild b/sys-fs/bindfs/bindfs-1.14.1.ebuild
deleted file mode 100644
index 124f1fc221b4..000000000000
--- a/sys-fs/bindfs/bindfs-1.14.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="FUSE filesystem for bind mounting with altered permissions"
-HOMEPAGE="https://bindfs.org/"
-SRC_URI="https://bindfs.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=sys-fs/fuse-2.9:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-RESTRICT="test"
-
-src_configure() {
-	econf $(use_enable debug debug-output)
-}
diff --git a/sys-fs/bindfs/bindfs-1.14.4.ebuild b/sys-fs/bindfs/bindfs-1.14.4.ebuild
deleted file mode 100644
index 69f9d93e580a..000000000000
--- a/sys-fs/bindfs/bindfs-1.14.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="FUSE filesystem for bind mounting with altered permissions"
-HOMEPAGE="https://bindfs.org/"
-SRC_URI="https://bindfs.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=sys-fs/fuse-2.9:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-RESTRICT="test"
-
-src_configure() {
-	econf $(use_enable debug debug-output)
-}
diff --git a/sys-fs/bindfs/bindfs-1.14.3.ebuild b/sys-fs/bindfs/bindfs-1.14.7.ebuild
index 69f9d93e580a..69f9d93e580a 100644
--- a/sys-fs/bindfs/bindfs-1.14.3.ebuild
+++ b/sys-fs/bindfs/bindfs-1.14.7.ebuild
diff --git a/sys-fs/compsize/Manifest b/sys-fs/compsize/Manifest
index 280c857b8f28..d0f884598977 100644
--- a/sys-fs/compsize/Manifest
+++ b/sys-fs/compsize/Manifest
@@ -1,4 +1,4 @@
 DIST compsize-1.1.tar.gz 14345 BLAKE2B 8b35e6f3526b8b2395972ea1a595011b867fbc076d79c90c66a19853f1b101dbe3decedab8244d893b20d6cc9ff3ecfa2b3320fc12c583415b2d446a9298fcb1 SHA512 1c7de5156b695ffa4be9b634fd6224214d3de1653eb23e5d85b250e27146fe655883bed17ed458bae1b448ed9ae8a254d2a673fdb3860e69c99f8676daea0d8b
 EBUILD compsize-1.1.ebuild 940 BLAKE2B aae5bb225b287ece48d4bffc921d95837bcc5c48affc88ccf55eb6565943994bfa08eaf8be6cfeaf4c86cde3aca37946d6cc50ea10fa679d10e557c2b207090f SHA512 b97df62447581e46b6b7276044861ab1900b77055e0a8f0989fa46dce204bd52ad000d66a1662133fe581d8aa354b4c1214596c83547267997628f54c2172c5e
 EBUILD compsize-9999.ebuild 940 BLAKE2B aae5bb225b287ece48d4bffc921d95837bcc5c48affc88ccf55eb6565943994bfa08eaf8be6cfeaf4c86cde3aca37946d6cc50ea10fa679d10e557c2b207090f SHA512 b97df62447581e46b6b7276044861ab1900b77055e0a8f0989fa46dce204bd52ad000d66a1662133fe581d8aa354b4c1214596c83547267997628f54c2172c5e
-MISC metadata.xml 344 BLAKE2B fdc606b6541dd72532969c177a7d8b6f5e80f27643df091b43fc497a803636152648d8baab08097cffa0ae04e5b840815f204ab5afe51194f09d2fe87c7db09e SHA512 6073215942dbca66eebe8b22151ac1e166ab4d06a1f230519db75cc783e8b307387f0160cb172f4e38860944052b7e20d17f0384142328f979acbc979c2d5b41
+MISC metadata.xml 166 BLAKE2B df899de61ee57cf9c2d5822a8ca4cb62c697c6da7142003688afbdd1261a8623d48058189ebe005c053ffddcb9f7275f19a0e48fc47ce1890341e276400f1d8f SHA512 12bfcd38af9dc9fe67b866a4ae090e26873d363409efc5949cca4b4a59ba0d770b09ebec8a108482b29b94c922bcdb8ce3f5ccbb578137b44e35bd783b4c9472
diff --git a/sys-fs/compsize/metadata.xml b/sys-fs/compsize/metadata.xml
index 7f4384fb84c6..c1744fe7fc5b 100644
--- a/sys-fs/compsize/metadata.xml
+++ b/sys-fs/compsize/metadata.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>adebeus@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
+  <!--maintainer-needed-->
 </pkgmetadata>
diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index 9fc3c30d0ae1..9461b1aa7426 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -3,4 +3,4 @@ AUX cryfs-0.10.2-unbundle-libs.patch 15634 BLAKE2B dc484cc722cf80e605f52f3b193b1
 DIST cryfs-0.10.2.tar.xz 7902252 BLAKE2B 704d124ed32a8a958f400188af99498cedb706ccfc004131b677a113b6ab2733942becb1ab64fd06d0b9d5b39f7abe832b3b0669caaf2b6feb7c6577c8c7fbfd SHA512 e49dd6d1e402d968cc4df0e8ca0460a01a27e4e73482041dca0fa9cde905a91d12e2bda18d257a044335e32e316b9363cecf374eb2ca621924b394dd2fabcb8f
 EBUILD cryfs-0.10.2.ebuild 2252 BLAKE2B f6de0d76ff9c43d727cb62f1b8c419210bcb603e9a2b60dfd3c741a98cbbaec199f6eea7232d8c150da0448f9887a917062d14b21f01cacb14728d5212e26389 SHA512 aeacb7c7fc9f337f0b6e38320db58c772e4fe9a2fb15267471ec34332ceedbaa54e894e3d46b46e2e80da54a44936ed38781f052c0d21bf077af96a61cbcabe7
 EBUILD cryfs-9999.ebuild 2309 BLAKE2B a461261be9418b221dd1518110fb10795f26469d182cc0c8af729146c8378690997469cfa4fa2d09646583562018d5d4e4df164d0c814bc9f7cf5fa2a488b8a7 SHA512 f69c9d7d77be022931471cd4108a13d043e7356b832ad9e08695816556bcef73bbbd5a59906c6ee8e35615599196372de382f386e932988d02bcfb9fb9018f41
-MISC metadata.xml 501 BLAKE2B 8179813b2f222cf59af3842b2becc2acb84e529645f902bd7c197ec171a8882cd4083df9903ea648b1c5d5d062d6be5b5f20e82d53529e41d390aded450ccbc4 SHA512 9d6170ff1a7e2f56840911f35ec5d1ec3cbe8571fdf1a29738a1f608785643bfbef7d8e6ee0f8f2b954ff1128d4a7080b73729e46337b9e1878390f3892c1386
+MISC metadata.xml 272 BLAKE2B 1f7b2457b970cd9a387d88914129fc76ae26bcd3e089bcecffdab0a8a86657ce3abc9c19bab77c51e1bd12b4fbfece20077dc4b15a673a11e821ab7b4952e137 SHA512 9d4fce67773a55f3f8dedd7c1532eb639aed188f0fba41375bc4e8219ffa9e720f51175571c6defde06afdeebe83c940ec77192d78555cf28a41f0c64e25629f
diff --git a/sys-fs/cryfs/metadata.xml b/sys-fs/cryfs/metadata.xml
index 9d9b4938e31b..cf73e5490d63 100644
--- a/sys-fs/cryfs/metadata.xml
+++ b/sys-fs/cryfs/metadata.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>adebeus@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-  </maintainer>
+  <!--maintainer-needed-->
   <use>
     <flag name="custom-optimization">Use user-defined compiler optimization level</flag>
   </use>
-  <longdescription>Encrypted FUSE filesystem that conceals metadata</longdescription>
 </pkgmetadata>
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index a9ad53dec3aa..0c61276b905e 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,17 +1,8 @@
 AUX 1.6.7-dmcrypt.confd 3919 BLAKE2B 99e81cfe932dda45062966ada065da418500e58499af0f5ed18b7367cb6bc1b3fae1d4a0d4094ebf36c00292a4d4e2606026a65df66d5a96d01a0b9d5f6aa5e5 SHA512 74422d5e1614b43af894ea01da1ea80d805ec7f77981cbb80a6b1a4becad737a8825d7269812499095a7f50d39fa7da5bf4e4edae63529b1fe87b9176943a733
 AUX 1.6.7-dmcrypt.rc 8815 BLAKE2B 9e88475af36f7ab3c7b48672ecf64e885e7be4b1af27c2f41f74fe8640163ac272d44bfbbfeb0befb1af337f88d2711f27003575758d16c5f8104db0fabc2cb9 SHA512 fdbf44f7508ca10ab89e858c206fd9dc397a11d8a553045584ab95046c309a84dd6c7ab0c0ea63c66f7d52b31ed3a1ce46d5ce2ce2588f0d6593a1c4cc1c4194
 AUX cryptsetup-2.0.4-fix-static-pwquality-build.patch 427 BLAKE2B dfdc56c6627084732973254cd52c48f0869aa7b4c58e466840a87f77c1d4fb09ae37295fb54e980abccfdfe51dc63161e188a0be9bb4bf3c69d7731120f84bac SHA512 23b5f9b21ec86c92787bfc8744682ce0777dfa87e1de97afbb8db33c4587f1e2c8e5f8c9d0fa56ca801d7795739f9a66f14633d8a3904ea68ddd58ddc3863adf
-AUX setup-1.7.0.py 788 BLAKE2B dc7a2dbc2187f233f4fae9d85bbec9e2152259a45094f10ab043b36e31d80d40772795cb5f9911b0e9a3aa41d8f1773c0e60aa6da1a530165a26384c65532117 SHA512 823fe8a90a76de9f259a5b69425601b78a0b6c1204cda613e224cc21e4eebc2b22b4be9f53efe843156c45a20a099385bc4dad6d653a26749336023d3ae5de89
-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.tar.xz 11035660 BLAKE2B 0fff903cdb07d91183bbd35afb660aad42d31188a80d0ef6294c40082b39fdcde25da4fe1bf679ebe308133fc63051876ce813a2ef3a557f63b574d6f6f49d8c SHA512 d4af8edb7a50603028c6c6999ae7a1851d2232ee11d4a501270afb424f0a7dc82893a6a5d30d3a3188634aa80ec1a79f22a91b539910df10d07f8d9ae532cb08
-DIST cryptsetup-2.3.1.tar.xz 11041592 BLAKE2B acf3bb17503575b5d7edb58d0ab13989a2bc70ec96583dfc057b8258fd98a39a088411a9e0175d51d816b9164e5ec193710f1ada92427b1e6c6a53c5b8a6b9ea SHA512 e6ee77d72eda0b990db894d794a686f22043161b17b5f5c8cd54a64c5751f884a241c76b03bbccd52f74440c609036d50ed8503584bc3a0a011e4854a60dd4bf
 DIST cryptsetup-2.3.2.tar.xz 11037076 BLAKE2B b0f8a1a274e6b95b12aa7172dbdd41e512aea2c87a98d62b8b4d4cbb898b2d4b82e250368e385c4d4acc8e77046ea4b4f7be730750587569572c4b9490815bc1 SHA512 c5eb41751ca64ff906187f40805705570c261816b014dfcdbf2777f42e53668e32966197092a2235b8f6a7a4e7f9c3f301d82f17c45cfbcff96b9818631d7e5f
-EBUILD cryptsetup-1.7.5-r1.ebuild 4045 BLAKE2B ba5b5cd14dc6de5874463c3c5dfd634e3455914b46f90aa06c3da8713bafc1792299e68bf08d90dee4edca2777297c8e45d4b4fb643a4df026609e8ff58c0695 SHA512 75655720e5d213d4ef358faffd87da25404006e2d37463cd1234ac3d96be8f51906ca1abc02955f9b284ad590fe524e6107a1f28ccf5c6a990d9b5bb5358345c
-EBUILD cryptsetup-2.2.1-r1.ebuild 4231 BLAKE2B 9f5ae26fffc3aeaf88c3ceb39be1ebd4887813246e667e64eb435463e56b28fb5f2d773f1bdf651e473275677bba072e0109a10c5bdc0aa2e5aa7e9253e85135 SHA512 358d8dee276bbc0979e29fc1267b877b4864cdbc5e9ddc06dfc5f8651641b7a8686352a48242797b732e2a6fc39d9594e15e1e60170183fa8d11a0fe8b9ea088
-EBUILD cryptsetup-2.2.2.ebuild 4231 BLAKE2B 9f5ae26fffc3aeaf88c3ceb39be1ebd4887813246e667e64eb435463e56b28fb5f2d773f1bdf651e473275677bba072e0109a10c5bdc0aa2e5aa7e9253e85135 SHA512 358d8dee276bbc0979e29fc1267b877b4864cdbc5e9ddc06dfc5f8651641b7a8686352a48242797b732e2a6fc39d9594e15e1e60170183fa8d11a0fe8b9ea088
-EBUILD cryptsetup-2.3.0.ebuild 4239 BLAKE2B 1befc4792f7f4348319155bc6d6ad96aef8ebf5dc2df9974e9fb4a02cec82978901736b9653936918eff6d8c74f03a8e02a14ae3a5e19d5d956009bece0082d1 SHA512 2710235dc0b6ab62be7a4277a3a4ab64ecc2132085ef900d25935280129af0753a19fe0f0d0f77c48f131dd637e513d7d63339cec5bcc1d34914a57d0d16d6ce
-EBUILD cryptsetup-2.3.1.ebuild 4246 BLAKE2B fd0847b15440e36bcce552f84678dc995e06722938e64f4700d51c545f77dfc60fe08f0e4cabd8ac5bf02496ae3d42f13f413f75b4b1dfc484559263dc7d0b9b SHA512 388e9da18c262989e564a3cc8c5d0bababa3620b9ad13e1b49aa63d0082d1837460845e626e839befe07dda48b32c8c41248e77156dc46909ff5c70c41be8323
-EBUILD cryptsetup-2.3.2.ebuild 4246 BLAKE2B fd0847b15440e36bcce552f84678dc995e06722938e64f4700d51c545f77dfc60fe08f0e4cabd8ac5bf02496ae3d42f13f413f75b4b1dfc484559263dc7d0b9b SHA512 388e9da18c262989e564a3cc8c5d0bababa3620b9ad13e1b49aa63d0082d1837460845e626e839befe07dda48b32c8c41248e77156dc46909ff5c70c41be8323
+DIST cryptsetup-2.3.3.tar.xz 11104768 BLAKE2B 54aa6f087c5366e843c1f9b649fd77ec8be8c4e65c783a2a84a036b4ef460c9d070bdd8aff72f87a7a3136f13581e84534940b435f0b49eb1951d1a755cab47a SHA512 d613efb80e003364a21832da3fefe3891d36a891119cc0efa970aad40ba135dfcd42b32a0c19c31ad879d4eddf27864beccbea1d4b31a47a4e075bc0f756365c
+EBUILD cryptsetup-2.3.2.ebuild 4237 BLAKE2B 162a44538c0e962723b53de1e1c62252b2ba18d102724572d97c7a769d2a3298fe9c02170c0a6569d8f915c5987e4ebcd3cbe5d03c093d7181b8dbb8f98d8abc SHA512 6fd1de10c444320888ec5b0d4378c45001afae613f501c89914647a210cf3bb1ac8414325aa79d32fbfd4d4b6954b77ffcd50e06a3867c9fa43d8b044c9e59f9
+EBUILD cryptsetup-2.3.3.ebuild 4246 BLAKE2B fd0847b15440e36bcce552f84678dc995e06722938e64f4700d51c545f77dfc60fe08f0e4cabd8ac5bf02496ae3d42f13f413f75b4b1dfc484559263dc7d0b9b SHA512 388e9da18c262989e564a3cc8c5d0bababa3620b9ad13e1b49aa63d0082d1837460845e626e839befe07dda48b32c8c41248e77156dc46909ff5c70c41be8323
 MISC metadata.xml 1074 BLAKE2B b1a6789b42307eb919717d35dabb48fc060490e561a1b5d4b0a25a2ba4dfe1399a7bf564c5477be61a68b7b5248153843f6892f95893e36257b9d790f8501779 SHA512 d070c22187874175ae93078fc80f4d150da102557cc680c8dd324ffe21de533ad67b4478f0d83e385ef5d4e75541bb04fd8308697db0ebf6ecd9f1e11382847b
diff --git a/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild
deleted file mode 100644
index 309bb43a6de8..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit autotools distutils-r1 linux-info libtool ltprune eutils versionator
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
-SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(get_version_component_range 1-2)/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 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
-IUSE="${CRYPTO_BACKENDS} libressl nls pwquality python reencrypt static static-libs +udev urandom"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	static? ( !gcrypt )" #496612
-
-LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)]
-	dev-libs/popt[static-libs(+)]
-	sys-apps/util-linux[static-libs(+)]
-	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-	openssl? (
-		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-		libressl? ( dev-libs/libressl:=[static-libs(+)] )
-	)
-	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
-	sys-fs/lvm2[static-libs(+)]
-	udev? ( virtual/libudev[static-libs(-)] )"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# !static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-	${LIB_DEPEND//\[static-libs\([+-]\)\]}
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )"
-
-#PATCHES=( )
-
-pkg_setup() {
-	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-}
-
-src_prepare() {
-	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-	#epatch "${PATCHES[@]}"
-	epatch_user && eautoreconf
-
-	if use python ; then
-		cd python
-		cp "${FILESDIR}"/setup-1.7.0.py setup.py || die
-		distutils-r1_src_prepare
-	fi
-}
-
-src_configure() {
-	if use kernel ; then
-		ewarn "Note that kernel backend is very slow for this type of operation"
-		ewarn "and is provided mainly for embedded systems wanting to avoid"
-		ewarn "userspace crypto libraries."
-	fi
-
-	# We disable autotool python integration so we can use eclasses
-	# for proper integration with multiple python versions.
-	econf \
-		--sbindir=/sbin \
-		--enable-shared \
-		--disable-python \
-		$(use_enable static static-cryptsetup) \
-		$(use_enable static-libs static) \
-		$(use_enable nls) \
-		$(use_enable pwquality) \
-		$(use_enable reencrypt cryptsetup-reencrypt) \
-		$(use_enable udev) \
-		$(use_enable !urandom dev-random) \
-		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
-
-	use python && cd python && distutils-r1_src_configure
-}
-
-src_compile() {
-	default
-	use python && cd python && distutils-r1_src_compile
-}
-
-src_test() {
-	if [[ ! -e /dev/mapper/control ]] ; then
-		ewarn "No /dev/mapper/control found -- skipping tests"
-		return 0
-	fi
-	local p
-	for p in /dev/mapper /dev/loop* ; do
-		addwrite ${p}
-	done
-	default
-}
-
-src_install() {
-	default
-	if use static ; then
-		mv "${ED}"/sbin/cryptsetup{.static,} || die
-		mv "${ED}"/sbin/veritysetup{.static,} || die
-		use reencrypt && { mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die ; }
-	fi
-	prune_libtool_files --modules
-
-	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
-	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
-
-	use python && cd python && distutils-r1_src_install
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-2.2.1-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.2.1-r1.ebuild
deleted file mode 100644
index e48c4ff99e6f..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info libtool
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
-SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/12" # libcryptsetup.so version
-[[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 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
-IUSE="${CRYPTO_BACKENDS} +argon2 libressl +luks1_default nls pwquality reencrypt static static-libs +udev urandom"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-	libressl? ( openssl )
-	static? ( !gcrypt )" #496612
-
-LIB_DEPEND="
-	dev-libs/json-c:=[static-libs(+)]
-	dev-libs/libgpg-error[static-libs(+)]
-	dev-libs/popt[static-libs(+)]
-	>=sys-apps/util-linux-2.31-r1[static-libs(+)]
-	argon2? ( app-crypt/argon2:=[static-libs(+)] )
-	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-	openssl? (
-		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-	)
-	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
-	sys-fs/lvm2[static-libs(+)]
-	udev? ( virtual/libudev[static-libs(-)] )"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# !static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-	${LIB_DEPEND//\[static-libs\([+-]\)\]}"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
-
-pkg_pretend() {
-	if ! use luks1_default ; then
-		ewarn "WARNING! WARNING! WARNING!"
-		ewarn "You have chosen LUKS2 as your default format."
-		ewarn "This can break LUKS1 backwards compatibility."
-		ewarn "Enable \"luks1_default\" USE flag if you need backwards compatibility."
-	fi
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-}
-
-src_prepare() {
-	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	if use kernel ; then
-		ewarn "Note that kernel backend is very slow for this type of operation"
-		ewarn "and is provided mainly for embedded systems wanting to avoid"
-		ewarn "userspace crypto libraries."
-	fi
-
-	local myeconfargs=(
-		--disable-internal-argon2
-		--enable-shared
-		--sbindir=/sbin
-		# for later use
-		--with-default-luks-format=LUKS$(usex luks1_default 1 2)
-		--with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d"
-		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
-		$(use_enable argon2 libargon2)
-		$(use_enable nls)
-		$(use_enable pwquality)
-		$(use_enable reencrypt cryptsetup-reencrypt)
-		$(use_enable static static-cryptsetup)
-		$(use_enable static-libs static)
-		$(use_enable udev)
-		$(use_enable !urandom dev-random)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	if [[ ! -e /dev/mapper/control ]] ; then
-		ewarn "No /dev/mapper/control found -- skipping tests"
-		return 0
-	fi
-
-	local p
-	for p in /dev/mapper /dev/loop* ; do
-		addwrite ${p}
-	done
-
-	default
-}
-
-src_install() {
-	default
-
-	if use static ; then
-		mv "${ED}"/sbin/cryptsetup{.static,} || die
-		mv "${ED}"/sbin/veritysetup{.static,} || die
-		if use reencrypt ; then
-			mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die
-		fi
-	fi
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	dodoc docs/v*ReleaseNotes
-
-	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
-	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-2.2.2.ebuild b/sys-fs/cryptsetup/cryptsetup-2.2.2.ebuild
deleted file mode 100644
index e48c4ff99e6f..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-2.2.2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info libtool
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
-SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/12" # libcryptsetup.so version
-[[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 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
-IUSE="${CRYPTO_BACKENDS} +argon2 libressl +luks1_default nls pwquality reencrypt static static-libs +udev urandom"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-	libressl? ( openssl )
-	static? ( !gcrypt )" #496612
-
-LIB_DEPEND="
-	dev-libs/json-c:=[static-libs(+)]
-	dev-libs/libgpg-error[static-libs(+)]
-	dev-libs/popt[static-libs(+)]
-	>=sys-apps/util-linux-2.31-r1[static-libs(+)]
-	argon2? ( app-crypt/argon2:=[static-libs(+)] )
-	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-	openssl? (
-		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-	)
-	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
-	sys-fs/lvm2[static-libs(+)]
-	udev? ( virtual/libudev[static-libs(-)] )"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# !static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-	${LIB_DEPEND//\[static-libs\([+-]\)\]}"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
-
-pkg_pretend() {
-	if ! use luks1_default ; then
-		ewarn "WARNING! WARNING! WARNING!"
-		ewarn "You have chosen LUKS2 as your default format."
-		ewarn "This can break LUKS1 backwards compatibility."
-		ewarn "Enable \"luks1_default\" USE flag if you need backwards compatibility."
-	fi
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-}
-
-src_prepare() {
-	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	if use kernel ; then
-		ewarn "Note that kernel backend is very slow for this type of operation"
-		ewarn "and is provided mainly for embedded systems wanting to avoid"
-		ewarn "userspace crypto libraries."
-	fi
-
-	local myeconfargs=(
-		--disable-internal-argon2
-		--enable-shared
-		--sbindir=/sbin
-		# for later use
-		--with-default-luks-format=LUKS$(usex luks1_default 1 2)
-		--with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d"
-		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
-		$(use_enable argon2 libargon2)
-		$(use_enable nls)
-		$(use_enable pwquality)
-		$(use_enable reencrypt cryptsetup-reencrypt)
-		$(use_enable static static-cryptsetup)
-		$(use_enable static-libs static)
-		$(use_enable udev)
-		$(use_enable !urandom dev-random)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	if [[ ! -e /dev/mapper/control ]] ; then
-		ewarn "No /dev/mapper/control found -- skipping tests"
-		return 0
-	fi
-
-	local p
-	for p in /dev/mapper /dev/loop* ; do
-		addwrite ${p}
-	done
-
-	default
-}
-
-src_install() {
-	default
-
-	if use static ; then
-		mv "${ED}"/sbin/cryptsetup{.static,} || die
-		mv "${ED}"/sbin/veritysetup{.static,} || die
-		if use reencrypt ; then
-			mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die
-		fi
-	fi
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	dodoc docs/v*ReleaseNotes
-
-	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
-	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.0.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.0.ebuild
deleted file mode 100644
index d911035b0857..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-2.3.0.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info libtool
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
-SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/12" # libcryptsetup.so version
-[[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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
-IUSE="${CRYPTO_BACKENDS} +argon2 libressl luks1_default nls pwquality reencrypt static static-libs +udev urandom"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-	libressl? ( openssl )
-	static? ( !gcrypt )" #496612
-
-LIB_DEPEND="
-	dev-libs/json-c:=[static-libs(+)]
-	dev-libs/libgpg-error[static-libs(+)]
-	dev-libs/popt[static-libs(+)]
-	>=sys-apps/util-linux-2.31-r1[static-libs(+)]
-	argon2? ( app-crypt/argon2:=[static-libs(+)] )
-	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-	openssl? (
-		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
-	)
-	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
-	sys-fs/lvm2[static-libs(+)]
-	udev? ( virtual/libudev[static-libs(-)] )"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# !static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-	${LIB_DEPEND//\[static-libs\([+-]\)\]}"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
-
-pkg_pretend() {
-	if ! use luks1_default ; then
-		ewarn "WARNING! WARNING! WARNING!"
-		ewarn "You have chosen LUKS2 as your default format."
-		ewarn "This can break LUKS1 backwards compatibility."
-		ewarn "Enable \"luks1_default\" USE flag if you need backwards compatibility."
-	fi
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-}
-
-src_prepare() {
-	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	if use kernel ; then
-		ewarn "Note that kernel backend is very slow for this type of operation"
-		ewarn "and is provided mainly for embedded systems wanting to avoid"
-		ewarn "userspace crypto libraries."
-	fi
-
-	local myeconfargs=(
-		--disable-internal-argon2
-		--enable-shared
-		--sbindir=/sbin
-		# for later use
-		--with-default-luks-format=LUKS$(usex luks1_default 1 2)
-		--with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d"
-		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
-		$(use_enable argon2 libargon2)
-		$(use_enable nls)
-		$(use_enable pwquality)
-		$(use_enable reencrypt cryptsetup-reencrypt)
-		$(use_enable static static-cryptsetup)
-		$(use_enable static-libs static)
-		$(use_enable udev)
-		$(use_enable !urandom dev-random)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	if [[ ! -e /dev/mapper/control ]] ; then
-		ewarn "No /dev/mapper/control found -- skipping tests"
-		return 0
-	fi
-
-	local p
-	for p in /dev/mapper /dev/loop* ; do
-		addwrite ${p}
-	done
-
-	default
-}
-
-src_install() {
-	default
-
-	if use static ; then
-		mv "${ED}"/sbin/cryptsetup{.static,} || die
-		mv "${ED}"/sbin/veritysetup{.static,} || die
-		if use reencrypt ; then
-			mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die
-		fi
-	fi
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	dodoc docs/v*ReleaseNotes
-
-	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
-	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
index e9301bd41330..c9775999f930 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.2.ebuild
@@ -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 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 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.1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.3.ebuild
index e9301bd41330..e9301bd41330 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.3.ebuild
diff --git a/sys-fs/cryptsetup/files/setup-1.7.0.py b/sys-fs/cryptsetup/files/setup-1.7.0.py
deleted file mode 100644
index 0da063c0b1c8..000000000000
--- a/sys-fs/cryptsetup/files/setup-1.7.0.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import os
-from distutils.core import setup, Extension
-
-top_srcdir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-
-def get_ver():
-    with open(os.path.join(top_srcdir, 'configure')) as f:
-        for line in f:
-            if line.startswith('PACKAGE_VERSION='):
-                return line.split('=')[1].replace("'", '').strip()
-
-module = Extension('pycryptsetup',
-                   include_dirs=[os.path.join(top_srcdir, 'lib')],
-                   extra_compile_args=['-include', os.path.join(top_srcdir, 'config.h')],
-                   library_dirs=[os.path.join(top_srcdir, 'lib', '.libs')],
-                   libraries=['cryptsetup'],
-                   sources=['pycryptsetup.c'])
-
-setup(name='pycryptsetup',
-      version=get_ver(),
-      ext_modules=[module])
diff --git a/sys-fs/fatsort/Manifest b/sys-fs/fatsort/Manifest
index a573029bff16..0374842806d9 100644
--- a/sys-fs/fatsort/Manifest
+++ b/sys-fs/fatsort/Manifest
@@ -3,5 +3,5 @@ AUX fatsort-1.6.2.605-gcc10.patch 7400 BLAKE2B 05d9f3bc9c0118c9505e96f2766d27b14
 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 843 BLAKE2B d92b7e2d4b4bc25ab55cbd43ea1321b07b275e56a82505d9e8628ab9e33eb90eb39eba53d9b1aa0e1fc633e426e89adb004574c1a1fa78749813b4bc98608ad7 SHA512 e47dff05c99d535a9dcfa06c2b16367b449dc683a87e1e1f8a46e8f605634c737e65ecefea2a7808fddcbd1662d32452abd933b726e2e03c2e4b6fa692af2b52
-EBUILD fatsort-1.6.2.605.ebuild 756 BLAKE2B 61bcaa758a9b6ca17a1740c4102e8e2e6b181dedea1bc31624cc03ab7958093cd576f74928c9914414767f606cc35dc6cbf015df88c1f73946746f967e892938 SHA512 76594b7789ffdf3f3f5b030f4f0ecbaae5d89dc51b9c40482396fae280cbe9c984025e0fc3142c5fdd946d3e9772f002b6b7620050129d6aad6a4aa1cf9156e4
+EBUILD fatsort-1.6.2.605.ebuild 754 BLAKE2B 11850d6ad2ca62de3f7c110773fa216a5d5cf1b7df81e2fc8eaa81fae2e9f029f4ee7b40ddcd5a66991a98d5bbb35e48b9328591aa6ce93e2f305da588d98d6a SHA512 cc94184f60f4ed2c17a476c4ed0718caae60db2769129233b82f39c5d0d9eb41eed803377c1b38bcb6db3b720937f85f5e659ed51fccb2e5bb72b0562d7c9202
 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
index 9fefbf5330a0..0f3cb645a3c3 100644
--- a/sys-fs/fatsort/fatsort-1.6.2.605.ebuild
+++ b/sys-fs/fatsort/fatsort-1.6.2.605.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 PATCHES=(
 	"${FILESDIR}/${P}-gcc10.patch"
diff --git a/sys-fs/iprutils/Manifest b/sys-fs/iprutils/Manifest
index 913d84801246..5c705a1e3ef9 100644
--- a/sys-fs/iprutils/Manifest
+++ b/sys-fs/iprutils/Manifest
@@ -11,6 +11,6 @@ DIST iprutils-2.4.17.1.tar.gz 524770 BLAKE2B eb3864a431193ce342810449bde2ac6a4e7
 DIST iprutils-2.4.18.1.tar.gz 524809 BLAKE2B c32b01ada70e67748653b8e346cdecae35f3ac240a7eaa8be0ff70590bc68b8be770bffe2f3131cbd6cbbe75812f12524c0817aa02674cd4643e846724be2891 SHA512 42da77c0fde0a2650368b2f0605d63762389ab394f755f4e4144704e155333a2ad8133731244b8383e9a334517aca45f62487229a27a2e90cf22a10c760aab3d
 DIST iprutils-2.4.7.tar.gz 467671 BLAKE2B 8ca3e77f927dcb3cd45b78e1b5e15d7edc67b3fbc8762383e0e9e84ebd42ce74927909aae926762d6bf0378d3b8d8f77cece65bb3ace746f889fbebb7fdcbf43 SHA512 9e6fd37cb72ce1d092b02f1cdfeb9e97962007327f92f4d9dd2a755489dab3a5d51a459d2f256d8453de74935a5cee8f25f71a820d82347ae67aa72a89043a91
 EBUILD iprutils-2.4.17.1.ebuild 1046 BLAKE2B 4cb8cd45fbef28639c260f740296922171da2c33a2c9b40efc52a4b80eab70b7cc4a5666312c02204070076d784605230b2cd16c23bb9fcc3cd4d90f959dd662 SHA512 c99df2b9c485662eaf9603baba25ed8e21405f063c360d9447879fa4747bf5f41ce77477865a60f215d5268426ac1d19df3a42653e5618a46635503ba1dfd009
-EBUILD iprutils-2.4.18.1.ebuild 1124 BLAKE2B 17dc520794dc26bd6d09f0100da55ce7cfd91850836fd3aeec5f51b605868a5505712d2c2a797d5af2566ed90a8f388d37dd63c394af1eaf23a0e6b31e53e285 SHA512 43b2346544c73865f7d874caed42df2e4d1d08f165e8808b907994729d2c64ab0e853109d843372d4e289cb5d564f46a538c4bb084826d2e503ebb26ef3ef320
+EBUILD iprutils-2.4.18.1.ebuild 1122 BLAKE2B c94343844730156c0cbb6d29e691e4dde09621ff1d7dc16d1f82a95ba3d4cd349456b76a3fbe897c993c681087a1e100656a67a0d21fa4c9a236d96692ba01b6 SHA512 ea6eb2bc10b350cdb423176c4762445ca710f147110466037a4514495ab8be27175cf1bd8959b5aa04c5b4fa709cdef8933be1d990344a7913d41b15a675e779
 EBUILD iprutils-2.4.7.ebuild 839 BLAKE2B e0e1b3af3728393f410b111d3e0def80c8b598c04e61778075fa7dd75b380494ecb940c6082fa5f4270c92d62943a3cbe4aea690b370839d117e41c399055b68 SHA512 349a3f06f3e75e39786efa5aced19659c094433a1778ab0c43f870b4b8e536e5ed2441105ecfdd56e5b95fb1f5e8da4642be6cffcac1e00e19fef93f98c8d312
 MISC metadata.xml 338 BLAKE2B f1a657a6c8fc11e853f0530c94e8376b8b424818873d909ed8a54c0bef0e47bea40733eea3e8f8e8340562c58dd29c2d3b072023dce9edb6ba803f2774fe1076 SHA512 6323616f564434719f3466d45a7d0a41969ac75a8e6efb5b0225a915061f9a5e8698aa296633ec54f3708903b39ac2d8fe5275686a2bd76bd1ae8662b8dc7600
diff --git a/sys-fs/iprutils/iprutils-2.4.18.1.ebuild b/sys-fs/iprutils/iprutils-2.4.18.1.ebuild
index 2ba2c4386cfa..b1595889fdb3 100644
--- a/sys-fs/iprutils/iprutils-2.4.18.1.ebuild
+++ b/sys-fs/iprutils/iprutils-2.4.18.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://sourceforge.net/projects/iprdd/"
 
 SLOT="0"
 LICENSE="IBM"
-KEYWORDS="~ppc ~ppc64"
+KEYWORDS="ppc ppc64"
 IUSE="static-libs"
 
 IPRUTILS_DEPEND="
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 42bb21d17d43..9bd09f4f48b6 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,5 +1,9 @@
+AUX lxcfs-4.0.0.confd 221 BLAKE2B 18924acc45506885e0f1795ffd4dd666d341abc2957c22a241909004ea988f1464b817939b450741bc77e413fb37d2e2dcd8f85405ab69f27d475567f48df2db SHA512 ebccfce0f865c8dbc1cff67712be4ac625b91ccc42aa78971c6619cf32553abe15ae82c6b3f320600cf3605f8b8c7ccbbcac3a399c6ae8261a08ea2793992e58
+AUX lxcfs-4.0.0.initd 533 BLAKE2B c4dee71fbbe477c46cf2d661f335a43517158c3c2061decfdf327a24cb1360dd08184d8cdc3936db26b6a50c47748f146414a1ae1ab61f963a9c7740c0ec3919 SHA512 755356e2a4f1e92803d8864c4edc223c183c81592562d6492d4b374174d4e5ca2d30fcdeb9861c46df795e6373ecf5f14c089c7ad22465d02516748c2c18aed7
 AUX lxcfs-fusermount-path.patch 489 BLAKE2B 3b9aa2d1202dd6b306be6b7820315214fe3b1cb07255a5723c92edf553536f3afb18849551a52a999941d7aeae90e2956e66d18d93d00fce20527a84e8d8e79e SHA512 560f06e7a996c4a2805b5a2c37d652631ad96e1f963f18fc73b72ee535ec333f7ad56a1a92806922dd673ffa512bab2b2c70c4b403b67dc2be02f2293b1221f6
 AUX lxcfs.initd 536 BLAKE2B cc8906ec07679c2aafcfc92e038e0442622ade31a9e7b3745426cfce8e42db3f1c277d84802368f53f656fffdadca747a742b8874e5edb2724dfc74d6e97a628 SHA512 196e59cfc4b8fc06975ed24a38b710916b88a18477a0e6c7f63ff3ee8d9fb395d728bbcbf59c9dc97452262f6e2d74f3b2e6ef205bead907d989cd22bacb74ff
 DIST lxcfs-3.0.3.tar.gz 49824 BLAKE2B 02e3a0a6f4fd515924c5f038f00d664ef347c9b685e6561334b460e0ce0ce5580aca67f33df56b44b9cdafa4953f4f92843662f3516e1c923f9242388b17dbc6 SHA512 d994e1dd85f499eba2847d33870281a4bcaf4466e2c8f7acb065f4f3d5688b93b775c486bc6db571e64d09a3567710b0c816e12555ffb3e3e50f81bc7f5f6be6
+DIST lxcfs-4.0.3.tar.gz 100719 BLAKE2B 24371b921ad635f97c51ac8406c949e81330ae358b0166c2af295cb1f630594bb72da802aad41971c11303f393fd05bc9f1b109bd4da4953db2c3bb7e5189315 SHA512 0aaedfe826d982b9464dfb60fb57c58e34ea6022b8503bc858538b6634dc7d0845f65832d6f814043dbc0677f887e1b559549a8f3865c755970c6b47ba65eb2b
 EBUILD lxcfs-3.0.3.ebuild 1735 BLAKE2B 51a331b3697b9e74a99de4bfaf1ba57aade89740d353fd0c2587bcb68d3a3a6089f161bc4c41a0f0f175364df9e4f0c829e9237d50460b85b7f3bd8342baf6f9 SHA512 e5bd8924ad6da0650f960ff18ef21f8607eee17e35198a3079a4758cceec5d971089b7118ee25a97a5374a7c9a7a26a4ef34ec3762ab161920d3bda7d5a53e83
+EBUILD lxcfs-4.0.3.ebuild 1162 BLAKE2B 01e17b5e82b4c9c3969fa9694145a455fee4afc739c8f98fd8ad776d48b847c3382ab2a37a55fa51e177d5018dd0d7ad004a83f19f853da554351ae2a08e8ba5 SHA512 a291d1de3ff3d3c46d0016b0f2ea42dbe3a666bc3c6eea42d94fa5049e46d196f83595abcad76cd796b44cfdcfb1b84a6b02d43a5c971c3ba8b6e0891eb5d4cb
 MISC metadata.xml 808 BLAKE2B b8b8be1a8fd8a1a9614dbfeddd97cd322bcf0ed4d11a97bc6680bde28faa0bdaabbf8b5a92242e0da09845f6a08280dd0d6681e3932a7319117c186f167bf6fd SHA512 dfb81661c2feb5abb3397c93eabf26c12af51099f6676d8fec346c83ca3edea788745e4a59ea05035b16b1baf21edd16d9537f66fbd10d0c8da8a7933b35c528
diff --git a/sys-fs/lxcfs/files/lxcfs-4.0.0.confd b/sys-fs/lxcfs/files/lxcfs-4.0.0.confd
new file mode 100644
index 000000000000..ba443ee4b1f1
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-4.0.0.confd
@@ -0,0 +1,7 @@
+# /etc/conf.d/lxcfs: config file for /etc/init.d/lxcfs
+
+# lxcfs options:
+# -l == calculate container load average instead of displaying host load average
+# -u == don't display swap usage to containers
+
+LXCFS_OPTS="-l -u"
diff --git a/sys-fs/lxcfs/files/lxcfs-4.0.0.initd b/sys-fs/lxcfs/files/lxcfs-4.0.0.initd
new file mode 100644
index 000000000000..d9368e4f28cf
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-4.0.0.initd
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+DAEMON=/usr/bin/lxcfs
+PIDFILE=/run/lxcfs.pid
+
+start() {
+	ebegin "Starting lxcfs."
+	/sbin/modprobe -q fuse
+	install -d /var/lib/lxcfs
+	start-stop-daemon --start \
+			--pidfile ${PIDFILE} \
+			--exec ${DAEMON} \
+			--background \
+			--make-pidfile \
+			-- ${LXCFS_OPTS} \
+			/var/lib/lxcfs
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping lxcfs."
+	start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+	eend ${?}
+}
diff --git a/sys-fs/lxcfs/lxcfs-4.0.3.ebuild b/sys-fs/lxcfs/lxcfs-4.0.3.ebuild
new file mode 100644
index 000000000000..2c44e836a2c6
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-4.0.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/"
+SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Omit all dbus.  Upstream appears to require it because systemd, but
+# lxcfs makes no direct use of dbus.
+# acct-group/lxd needed for the fowners below.
+RDEPEND="dev-libs/glib:2
+	sys-fs/fuse:0"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/help2man"
+
+RESTRICT="test"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Without the localstatedir the filesystem isn't mounted correctly
+	econf --localstatedir=/var
+}
+
+src_test() {
+	emake tests
+	tests/main.sh || die "Tests failed"
+}
+
+src_install() {
+	default
+
+	# Getting weird file collisions, 
+	# keepdir /var/lib/lxcfs
+	# fowners -R root:lxd /var/lib/lxcfs
+
+	newconfd "${FILESDIR}"/lxcfs-4.0.0.confd lxcfs
+	newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs
+	systemd_dounit config/init/systemd/lxcfs.service
+}
diff --git a/sys-fs/pysize/Manifest b/sys-fs/pysize/Manifest
deleted file mode 100644
index 5c959e2fdaeb..000000000000
--- a/sys-fs/pysize/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 0.2-setuptools-automagic.patch 265 BLAKE2B da39d6dc75ead004365561b443966a388b3596073d21ba05b8faad4b77c7dae8ce994e72ce878141c81dd7b3350a52d57550abe5b3a3bfea9bc669f0d5208bfc SHA512 8caa271dcfb016c81392e0f590e06f6057d297e9bb5196e9362372c725d218fbef911561e6528c624c2acf133b0ab8947e2b5ccc58704dc2ea5e0cbab0011dad
-AUX psyco-0.2-automagic.patch 591 BLAKE2B 2e28396f8236fcf0a7d832155893785fa514846cc964b3ede2c6a59f96ba9b650f8a60e4e75b9a0fabfdb865f425af7b2e01cee2799f8a717a07294a00c207aa SHA512 04cdf174c9fdab2abca56fa84704d83fba976fa8cd6a2a40d704aa54dd46e733e7b2ac8e236da6b8e003b06fc8c55691fc0eff2c7666b3c2eb672d5607f86983
-DIST pysize-0.2.tar.bz2 498930 BLAKE2B ada679a30073f7ac27e632be80f44891d6b84137db4a0ae27d406aaf36a9c8c90f9f1700da1a69615cf4f92ac4ae27f8b70cea5bfe06a3f48de25a58f507d39f SHA512 621e6e8de75d3486c196cf59e29f1c01eca151139a1d8518ace334d92533dd2df19fce52a3362c3b8abbb1e3b244148609a081832ae53f91bccc65f5f7fa57a5
-EBUILD pysize-0.2-r1.ebuild 1658 BLAKE2B a58ccb09a1137205dbf6518b339df41495ed54cb3d7dcc473371f57d3b4d6d20646c3aa52a87b9ab8f575e6159ef6230fd11aa39eb972c0e00d8676b70a93180 SHA512 5860cab4ab2990e8eb457dea657f322a57a9e4dc529fb1571608faa59bb3df1dc2953bfa361aacf277199ebd63a18e1f6de88be817cc59ac01fd29a4a7fcd904
-EBUILD pysize-0.2-r2.ebuild 1660 BLAKE2B 0fddf71eab1ddbb1401101c9aae57730facfb48ebddd2c3ad8ea64c1bb3b10c9103372b1259083c2995c64ce5648eacaf96af98a77cf02867d60552022bc5320 SHA512 e7c2c663e6a1a7c6a63c9ed5f5f0a47c0e4dc64c6bd134bf341289eff0e532649e9beaa2d112bab344d4a1caf3eec2ed31af937bc105007ce53202528697dcac
-MISC metadata.xml 219 BLAKE2B 813585cd65d05a9ef9aaa9a9fca8cfa66b803be8df8b300a6adfe0263e593ab53afd106180cc44391c9c27129ea9fdacdd8b1c37841e6aa33d833278b8c7dd9f SHA512 e075cd1d2568691a299ae945f75e194b462a394f88f7b3e5a60c4529cee7ac7e7a275204602085f15d024c3496f21554a18a24002770e9c5ef0ce64a74597602
diff --git a/sys-fs/pysize/files/0.2-setuptools-automagic.patch b/sys-fs/pysize/files/0.2-setuptools-automagic.patch
deleted file mode 100644
index 3e27c889f1a5..000000000000
--- a/sys-fs/pysize/files/0.2-setuptools-automagic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 5550188..123d22c 100755
---- a/setup.py
-+++ b/setup.py
-@@ -2,7 +2,6 @@
- 
- import sys
- 
--sys.path.append('setuptools-0.7a1dev_r53614-py2.4.egg')
- from setuptools import setup, find_packages
- from pysize.version import VERSION
- 
diff --git a/sys-fs/pysize/files/psyco-0.2-automagic.patch b/sys-fs/pysize/files/psyco-0.2-automagic.patch
deleted file mode 100644
index 72129804b88c..000000000000
--- a/sys-fs/pysize/files/psyco-0.2-automagic.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/pysize/main.py	2007-03-11 16:09:53.000000000 +0100
-+++ b/pysize/main.py.new	2009-01-02 00:08:43.384827054 +0100
-@@ -69,17 +69,8 @@
-     stats.print_stats(40)
-     os.remove(prof_file)
- 
--def _try_psyco():
--    try:
--        # Try to use psyco if available
--        import psyco
--        psyco.full()
--    except ImportError:
--        pass
--
- def main():
-     install_sigquit_traceback()
--    _try_psyco()
-     locale.setlocale(locale.LC_ALL, '')
-     usage = '%s [OPTIONS] [DIRECTORIES...]' % (sys.argv[0])
-     parser = optparse.OptionParser(usage=usage, version='pysize ' + VERSION)
diff --git a/sys-fs/pysize/metadata.xml b/sys-fs/pysize/metadata.xml
deleted file mode 100644
index 969a14ab6ca2..000000000000
--- a/sys-fs/pysize/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>jlec@gentoo.org</email>
-  </maintainer>
-</pkgmetadata>
diff --git a/sys-fs/pysize/pysize-0.2-r1.ebuild b/sys-fs/pysize/pysize-0.2-r1.ebuild
deleted file mode 100644
index abf13864ccb8..000000000000
--- a/sys-fs/pysize/pysize-0.2-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A graphical and console tool for exploring the size of directories"
-HOMEPAGE="http://guichaz.free.fr/pysize/"
-SRC_URI="http://guichaz.free.fr/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="gtk ncurses"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-RDEPEND="
-	gtk? ( dev-python/pygtk:2 )
-	ncurses? ( sys-libs/ncurses:0= )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/psyco-${PV}-automagic.patch
-	"${FILESDIR}"/${PV}-setuptools-automagic.patch
-	)
-
-python_prepare_all() {
-	if ! use gtk; then
-		sed \
-			-e '/^from pysize.ui.gtk/d' \
-		    -e "s~'gtk': ui_gtk.run,~~g" \
-		    -e 's:ui_gtk.run,::g' \
-		    -i pysize/main.py || die "Failed to remove gtk support"
-		rm -rf pysize/ui/gtk || die "Failed to remove gtk support"
-	fi
-
-	if ! use ncurses; then
-		sed \
-			-e '/^from pysize.ui.curses/d' \
-		    -e "s~'curses': ui_curses.run,~~g" \
-		    -e 's:ui_curses.run,::g' \
-		    -i pysize/main.py || die "Failed to remove ncurses support"
-		rm -rf pysize/ui/curses || die "Failed to remove ncurses support"
-	fi
-
-	sed \
-		-e "s:/tmp:${T}:g" \
-		-i tests/tests/*.py tests/*py || die
-
-	sed \
-		-e '/for ui_run in/s:ui_ascii.run:ui_ascii.run, ui_ascii.run:g' \
-		-i pysize/main.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pushd "${S}"/tests > /dev/null
-	PYTHONPATH=.:../ "${PYTHON}" pysize_tests.py || die "tests failed under ${EPYTHON}"
-	popd  > /dev/null
-}
diff --git a/sys-fs/pysize/pysize-0.2-r2.ebuild b/sys-fs/pysize/pysize-0.2-r2.ebuild
deleted file mode 100644
index b95233617d65..000000000000
--- a/sys-fs/pysize/pysize-0.2-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A graphical and console tool for exploring the size of directories"
-HOMEPAGE="http://guichaz.free.fr/pysize/"
-SRC_URI="http://guichaz.free.fr/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="gtk ncurses"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-RDEPEND="
-	gtk? ( dev-python/pygtk:2 )
-	ncurses? ( sys-libs/ncurses:0= )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/psyco-${PV}-automagic.patch
-	"${FILESDIR}"/${PV}-setuptools-automagic.patch
-	)
-
-python_prepare_all() {
-	if ! use gtk; then
-		sed \
-			-e '/^from pysize.ui.gtk/d' \
-		    -e "s~'gtk': ui_gtk.run,~~g" \
-		    -e 's:ui_gtk.run,::g' \
-		    -i pysize/main.py || die "Failed to remove gtk support"
-		rm -rf pysize/ui/gtk || die "Failed to remove gtk support"
-	fi
-
-	if ! use ncurses; then
-		sed \
-			-e '/^from pysize.ui.curses/d' \
-		    -e "s~'curses': ui_curses.run,~~g" \
-		    -e 's:ui_curses.run,::g' \
-		    -i pysize/main.py || die "Failed to remove ncurses support"
-		rm -rf pysize/ui/curses || die "Failed to remove ncurses support"
-	fi
-
-	sed \
-		-e "s:/tmp:${T}:g" \
-		-i tests/tests/*.py tests/*py || die
-
-	sed \
-		-e '/for ui_run in/s:ui_ascii.run:ui_ascii.run, ui_ascii.run:g' \
-		-i pysize/main.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	pushd "${S}"/tests > /dev/null
-	PYTHONPATH=.:../ "${PYTHON}" pysize_tests.py || die "tests failed under ${EPYTHON}"
-	popd  > /dev/null
-}
diff --git a/sys-fs/reiser4progs/Manifest b/sys-fs/reiser4progs/Manifest
index dfe0b21b0b60..ce5a28edf6ee 100644
--- a/sys-fs/reiser4progs/Manifest
+++ b/sys-fs/reiser4progs/Manifest
@@ -1,6 +1,8 @@
 AUX reiser4progs-1.0.7-readline-6.3.patch 472 BLAKE2B 88f0489b88691e72a8813145428e949b0ace21b15dc01f18da4292524e3601adfbe30e3b6cb3d1f12174bc5241fa7732bf36856025c7af5c678f3ca53d24497e SHA512 0162505148699f8e5270314be586d8db7d42f9ea5fc8517b5475aa59f54b47eb626349c36820cc34c0490e0c3df1597a230c27abf316226cc7d261e986963788
 DIST reiser4progs-1.2.1.tar.gz 980203 BLAKE2B 8c9cb77458c083c50f34c17bddf4747b755b52b911a63835152ad584494c2738a5317c28e5b3f1e6bfdc49416f3715ca4fbbd9c8a428b5b484b54f8f4a861a58 SHA512 2caac5a98d672d68910c6df3e694a42365fa6273ae367c26126778c1fbe956aa502dac236d36c3302a5bf109468ad3447e645a6eab89c83f122dd1afe2aeda21
 DIST reiser4progs-2.0.0.tar.gz 1019362 BLAKE2B 94d94697e427932b82634a756e7797ba7b061592c4ce946660f3c7750eb48ece7a5c0a265aa392a463c598212a87ec9fe769af88f680fa24adff36bd6db51128 SHA512 1993a38b2c4f339acb5d305b3b4c3360e57bf3df4684543f708bfd1062ecfb2435dd16e22f9555ab1317d77e95750cf9c2b2f81a91a109ad65aa30a5e7d815bd
+DIST reiser4progs-2.0.1.tar.gz 1019909 BLAKE2B d415a32c0d75e311ca0ece734a1f95273403341c4e38eee9e036c5c83a95d6e3aaebae8e5b89c713bbe7630c5dd902438b582e7ab1197202f7f5027702c89a67 SHA512 c1f5ab1ef36e959fb03bee81ddc4ad62152d43867d3021fa41aa07eca64a16e8bf56f6cf27378e0df9f77f223fd3d334f13c015620cd16f0aa1b9e7718274d14
 EBUILD reiser4progs-1.2.1.ebuild 1295 BLAKE2B 8ef4781ad4a121a92f6c732ba92eb8d6adb51f918eb975eb7cb97969135d1380e41bb1b010788ebd970805d29d8ca7267387ed3da75943922ac0fad729066ef1 SHA512 81f2db7655fe926394e628cacc97ef1d1749a4387393a7c04575cff245268f42b8e9fa58c974a5a8647b9d34f9e73b4f9b596dc70bf512f53b90fd3022af9fdd
 EBUILD reiser4progs-2.0.0.ebuild 1341 BLAKE2B dd6207a5efd9f565c717ae0fc1517a1c2208e9efdddc71fed1d3b83ff0c890def4681029e828208009fd5c5f0fc7dab22c2ed488893921817b2bcd9cc17f331a SHA512 1d14e1acf510629aa32e6b7a50dcdb962e332ae7f5c8402b63e97ab2b5d16d244835a7a858cd477143b5d1a085db3534903c183e2cb81b113c4987840a1cc5a4
+EBUILD reiser4progs-2.0.1.ebuild 1341 BLAKE2B dd6207a5efd9f565c717ae0fc1517a1c2208e9efdddc71fed1d3b83ff0c890def4681029e828208009fd5c5f0fc7dab22c2ed488893921817b2bcd9cc17f331a SHA512 1d14e1acf510629aa32e6b7a50dcdb962e332ae7f5c8402b63e97ab2b5d16d244835a7a858cd477143b5d1a085db3534903c183e2cb81b113c4987840a1cc5a4
 MISC metadata.xml 440 BLAKE2B ccaa949c04b37b13f2b7d11a4ab6586de239bc61be58e772f160e797e6da6c102b66be660e57e7888ca5960911b0dd2455978709de0d6e75b615a37bd870e8de SHA512 f12899412ca119abba07a6012e55f243ea069e1132c7dd9786aeb399f7d543ff82cba92f0957443ec08f230e68bc257729b789519ef52337ebc5679ee63b3ddc
diff --git a/sys-fs/reiser4progs/reiser4progs-2.0.1.ebuild b/sys-fs/reiser4progs/reiser4progs-2.0.1.ebuild
new file mode 100644
index 000000000000..fa83088da8fb
--- /dev/null
+++ b/sys-fs/reiser4progs/reiser4progs-2.0.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib toolchain-funcs usr-ldscript
+
+DESCRIPTION="reiser4progs: mkfs, fsck, etc..."
+HOMEPAGE="https://sourceforge.net/projects/reiser4/"
+SRC_URI="mirror://sourceforge/reiser4/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86"
+IUSE="debug readline static static-libs"
+
+LIB_DEPEND=">=sys-libs/libaal-1.0.7:=[static-libs(+)]
+	readline? ( sys-libs/readline:0=[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	static-libs? ( >=sys-libs/libaal-1.0.7:=[static-libs(+)] )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.7-readline-6.3.patch )
+
+src_prepare() {
+	printf '#!/bin/sh\ntrue\n' > run-ldconfig
+	# Delete hardcoded link/compile flags.
+	sed -i -r \
+		-e '/CFLAGS=/s: -static":":' \
+		-e '/CFLAGS/s: (-O[123s]|-g)\>::g' \
+		configure || die
+
+	default
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static full-static)
+		$(use_enable static-libs static)
+		$(use_enable debug)
+		$(use_with readline)
+		--disable-Werror
+		--enable-libminimal
+		--sbindir=/sbin
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	gen_usr_ldscript -a reiser4{,-minimal} repair
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-fs/snapraid/Manifest b/sys-fs/snapraid/Manifest
index 8ec7b80abb90..e6f451e7be44 100644
--- a/sys-fs/snapraid/Manifest
+++ b/sys-fs/snapraid/Manifest
@@ -1,5 +1,7 @@
 DIST snapraid-11.2.tar.gz 735526 BLAKE2B d039c56c2fa4f0d2b333cb9eada2d59346e672c5196c0622c5536c5c3fe49b6df0ba742bcd467695fcbd46bb0ede06b1e54dc0c8088c275aeb4b1acd2f8e0f84 SHA512 975c0bb3e69e4feb2845c7d2971676beb59e3815070ee5fae09447925e74af5666dd51783fdadca096bd8bca43cfa19a88132d0999eb86a338915842a46a1834
 DIST snapraid-11.3.tar.gz 736549 BLAKE2B 67ad1e23630076b088167525e50f0ae2673201a9c02b25116d7d0ad9d2d8e34b17e240bd2fd90d39c6906842a6f321a2b76569d90c6ae24b40d1c6c335b8d6b4 SHA512 f0ed2bc1ab480b58220dac299ef95635747d5a8046bfcddf21b216d92d5cbfbf4299cb4130856a7fa5b808ba42662534b35a370193fe0a51791c994ed773a2ae
+DIST snapraid-11.4.tar.gz 742589 BLAKE2B 21c0976b6fcf792653fb0d2f223cd9b728e8850505aa78914c37fa2e3b5399df33b38fcbe870a567b1beb87ba1e2a37d63afc32ae08fb487d7b24fcffe5da8a4 SHA512 d9d5d48f6f996f2c1fbec2f84219b007ac28828d54e6b8614d05ab87f717b3498333ec950e861060c1278993f4971af2435cf8f268c0f1fb403c279d00a96b92
 EBUILD snapraid-11.2.ebuild 513 BLAKE2B 35b85972d74b40296d65dad5f8bfbf862f4f33e821c13dc1f959ce507989a9bf1a1d556de634b4abb74f102bb522b059e73c4d8379b8a59ccee797a6a676dc38 SHA512 b189b49887f3d7bac7abeacc1e81ebcdb7079c81d73f5994790811a249803349909145f180bb257859329d3019229d80bd2c512ad0d513d01d112abd27b2b4a2
 EBUILD snapraid-11.3.ebuild 513 BLAKE2B c485fe4163015ed5989afe2625bea9f764b990382f86af2375b709184f49d83ec9583c7e5e220e9d535edb171695d76b8e01c0ad048b312137d80d98a461a253 SHA512 345e56a11747f9f10fea995d63695f9c0b859a7bfba86d4ed3c2c1b1204ba13ccc8f8be990093076c51c34a1f27695cee3781e3de251adb2eb6fd042bfc6f338
+EBUILD snapraid-11.4.ebuild 513 BLAKE2B c485fe4163015ed5989afe2625bea9f764b990382f86af2375b709184f49d83ec9583c7e5e220e9d535edb171695d76b8e01c0ad048b312137d80d98a461a253 SHA512 345e56a11747f9f10fea995d63695f9c0b859a7bfba86d4ed3c2c1b1204ba13ccc8f8be990093076c51c34a1f27695cee3781e3de251adb2eb6fd042bfc6f338
 MISC metadata.xml 502 BLAKE2B df99ef331bfd0b3180fb3ab31d46fd0a2673deeca91bdbdca8033c5a2b8c2931d489dca5fccb2103df1bc10ac7217f976808f43841cffbb756c1f757a6f99199 SHA512 f3cc7f7f8bcf1b7dc813a8cbf18c562771437628fecce4824aac5abc849741ec81dcbcaac2a1a5e44b3410741213167894b882697701fd66857985c900372851
diff --git a/sys-fs/snapraid/snapraid-11.4.ebuild b/sys-fs/snapraid/snapraid-11.4.ebuild
new file mode 100644
index 000000000000..d9c8f45f3452
--- /dev/null
+++ b/sys-fs/snapraid/snapraid-11.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="a backup program for disk array for home media centers"
+HOMEPAGE="http://snapraid.it/"
+SRC_URI="https://github.com/amadvance/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DOCS=( "AUTHORS" "HISTORY" "README" "TODO" "snapraid.conf.example" )
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/sys-fs/treesize/Manifest b/sys-fs/treesize/Manifest
index 91b479ee5610..00ec547671ce 100644
--- a/sys-fs/treesize/Manifest
+++ b/sys-fs/treesize/Manifest
@@ -1,4 +1,5 @@
-AUX 0.54.1-amd64.patch 286 BLAKE2B 2321c2fffb5fd3f92dcdb4de7a446b709857e0a9b6b8eaca4a8e82195e5b2df95c2527ac4c8dacdab30415d6995ac3e6b4128344c57642c373c156addd27c1a7 SHA512 260901b9ae35b1e85cbc761a34e042723b5d2ee000807e7bc0487202df6ee5a7bf19561649032fac898c649159f75e3053867474419732c31193dd075c2ce0ac
+AUX 0.54.1-amd64.patch 214 BLAKE2B b7fc27441ee03b0757cd876f8bcb3629c23227a0271cf1cb3329956bddae6f71e803c4f96a2c98fc42ecd481fd0c8a9bb6849a8c8001bff69ed97617f59625e0 SHA512 c4040242cd5d58eaf2f142a271ee7f4f7e80ff5c2e516953bd9e62027b78087b0a234cee269e37f447e4888634f6ca1b0769404663470cef686be436a477400c
+AUX 0.54.1-fno-common.patch 214 BLAKE2B a6b467f62ef1ab201897a303fc1afbee99dd3c7bb5333b70d2925302a1485c37299300724a88473a0ea3608fc5e1a0f6a304116ab3f919b3c6a72bfaa99f2ea2 SHA512 6516e8557a9f15d99b080a25d77757bb3ce68f90f72de9f5715e6166ba75839bf1a168cf4f0a860f3270589dc41df0573eff366b8a3f64bcc28ad3a9a3d916ee
 DIST treesize-0.54.1-src.tbz2 296047 BLAKE2B a00cdadc225976bc2cecb8e0e26509650c1a2707eaaa14b6edbbb5ee88871eaa5e56f164aa7285efa369aad77ec6414e9d025de31d1aef16c5910d9142fb07dc SHA512 461e3f6aa01127afd11b98395d65911f441012fcdaa3741ef35789d51fdb491731cfc62b5616150d74bbcbb8c2742561a387aef8ec4f9a493e9ce6683fb5fcae
-EBUILD treesize-0.54.1-r1.ebuild 456 BLAKE2B 7044a51c077ebdf06710ec8a68b0cd606a71ba1c849b9edf0fea818238fd91cff7b57aae55ecf9997b8f57939d39eee99bfcdb6589be7a475bd6e5259cf6b037 SHA512 65020fc042cc24427e2d0a917b51ff7226e4353047a9a177758cddba8a82548f2f53e8961f71dd3d023526a16858a9931ddd5081110f019d436ed3c049617f70
+EBUILD treesize-0.54.1-r1.ebuild 495 BLAKE2B 9c511427040bc3602baf5078067e708861639675af02c3f026c8379b2c8e3f0ac7a3ba7ef63028c34f54266b1713a115daa0ea1525bfe07ca848384587518f74 SHA512 965f8802f7c29f17c850c656570e307f6e7167da6b96c6a305b0ba72d56aefed820bc6811580312bd0d4eb076fe1be7bc3f2ea4d8659fb3bc63720b8274411c4
 MISC metadata.xml 245 BLAKE2B 379d9f118f924bb9c4fca6ccf376e9be6d26f243e0517922acc4a2959912dced4b592df9440699016c20a8a1280577cb7c71b0f744b66e46266c64955b66eec0 SHA512 ce493a808a1b4807488b017b1813c1ae857367457fec5fa2f27ba9bdb780f6aa431fe30e33a3dcb7574168ef9245305ea223a273c9e9f0557b7aa12bd02b5ef7
diff --git a/sys-fs/treesize/files/0.54.1-amd64.patch b/sys-fs/treesize/files/0.54.1-amd64.patch
index c03df8a258e7..dd45436e75e5 100644
--- a/sys-fs/treesize/files/0.54.1-amd64.patch
+++ b/sys-fs/treesize/files/0.54.1-amd64.patch
@@ -1,5 +1,5 @@
---- a/src/ui-util.c	2007-11-16 22:08:01.000000000 +0100
-+++ b/src/ui-util.c	2009-05-09 11:34:59.000000000 +0200
+--- a/src/ui-util.c
++++ b/src/ui-util.c
 @@ -18,6 +18,7 @@
  
  #include "ui-util.h"
diff --git a/sys-fs/treesize/files/0.54.1-fno-common.patch b/sys-fs/treesize/files/0.54.1-fno-common.patch
new file mode 100644
index 000000000000..7001b4ba8b37
--- /dev/null
+++ b/sys-fs/treesize/files/0.54.1-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/main.c
++++ b/src/main.c
+@@ -39,7 +39,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
+-GdkPixbuf* gdkTreeSize;
++extern GdkPixbuf* gdkTreeSize;
+ GtkMenu *TreeSizeMenuGlobal;
+ GtkWidget *mainWindow;
+ 
diff --git a/sys-fs/treesize/treesize-0.54.1-r1.ebuild b/sys-fs/treesize/treesize-0.54.1-r1.ebuild
index 315e9e86c23f..90940c262473 100644
--- a/sys-fs/treesize/treesize-0.54.1-r1.ebuild
+++ b/sys-fs/treesize/treesize-0.54.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,10 @@ KEYWORDS="amd64 x86"
 RDEPEND="x11-libs/gtk+:2"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${PV}-amd64.patch" )
+PATCHES=(
+	"${FILESDIR}"/${PV}-amd64.patch
+	"${FILESDIR}"/${PV}-fno-common.patch
+)
 
 src_prepare() {
 	default
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index a4c3e8f68520..474a4f71f55d 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -2,9 +2,11 @@ AUX 242-gcc-9.patch 7672 BLAKE2B 1cd98213f70e6813582706e7b523925fd7956507bd5bf11
 DIST systemd-242.tar.gz 7831435 BLAKE2B 288e65d0a8e133ef5885689eb16118a83d93c730e342da63115cea0892fc999104c3a4856c83f3e7ef909ba2f3311146730b05ee02d84cc0400851ccbdcd54cd SHA512 578f68a3c8f2d454198fc04ff8d943abcfb390531d57f9603d185857f7afa7f4dc641dafecf49ce50fe22f5837b252b181400891e8efd4459fd4f69bb4283cb4
 DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
 DIST systemd-245.tar.gz 8993479 BLAKE2B be0b1fca5ba8585978f570868bc9135c1fee78ea64dcdf8b1a3419e856a83da90104ed2f86e5f3e5b0b6f29d4b34f603bfe1e4cbc61ccf71bedce547db62ff35 SHA512 1b80d0e02472dfc4197f11dab4f56cf90e8a6e105ce19f837cb11335b6d8577ed49031dad94cdb41aa9bdc06ec8eec62c8e9246272b83935e7bb9dcd3cd8c012
+DIST systemd-stable-245.5.tar.gz 9020836 BLAKE2B 7753eecceffa86c9208c3e71df2037b58b445f9090b73c6ff499b4170b94488a1fd1cabcd17cbb98506a692875a3eef07a40a54d23e09c331a01319f8d03d13d SHA512 47de4a59980643002f325c499eeb4dd76fa9f1d1267686e7564f103690487bf85974590d7cb3e3641409e5bfba567fe2a66efa80320e7e8adc48af4461e2e172
 EBUILD udev-242.ebuild 9610 BLAKE2B 0dcc6a6952d3c8681ee17710b45366ab9d11e75f57173ed51160b148a038f27fe9def06257ccc070f25777c03eb569febc75bab5bf3b82517de93cea8f7003b6 SHA512 29fe9d4174b70d474e65c7ef67a799ef8a0b3918a3fd811318f119fadf6dc4637c7d24bf9acbe99e4674a461402479c4ca4312babe27beb01a114b79df019944
 EBUILD udev-243-r2.ebuild 9807 BLAKE2B afd9f20de9da69ae4479bfa2c19682555cdce783194ebef1ff56be2e43e6d4df6645653a2e554532a6cf86630f3f6e7dd100e1e98ff437ac2ac962ecd2264247 SHA512 4e6aafea5860f2d9f9b905b093dcdbf1f618dc51c00eca4557aa22ac5acbd765422a962e0d4b5fff14c76f6341df93199689d36477a08046591ab277399b7d6d
 EBUILD udev-243.ebuild 9566 BLAKE2B 3f5159a90dfb4be8a55c894820db190692f36542d01cc68120efb59201a1bb65299b91175f9ee4739836477aca71618dbc28407106de9049bf9db7deb0b89637 SHA512 923ae752ec75c8d5ff42fcf929932e04972dbcd529d2ac85decaa7998ace17e0bde3ef304e8097892f29f5ed0235388742f2668b06b7653b63e19bdd19934206
+EBUILD udev-245.5.ebuild 5851 BLAKE2B bfe759c1c69e2efa7138aec74a795f7c0d448097c1724b44707f8dbff2158e0d5db423e5a21f7c0be720c763e19c2d8c6d5bc4e3453444b89749eef0664809f3 SHA512 577e2b02531a584cffac132b12927874ad11e38393034913bb56a4265ab9dcddec9b548ed5692c8631612ba7b6ee7dea105dc90d44221bde02b808c779db3933
 EBUILD udev-245.ebuild 5771 BLAKE2B f240fde995db1e73ab8cd9ba79d5fadd2761dc376afe627cf3be28d4fdfb3e5be56df6b0f7be90637ce029163520026b11f682bf407b5bc4dc2bc61738a44dbb SHA512 c66b30ebf223fe98c7de56d693296e04061f269e6f59dd897f26b987a0a78026bfdd36c94489cec0d8b3eef42d1c4108d94f8bd65691743cbdb1ed00840c32e3
-EBUILD udev-9999.ebuild 5771 BLAKE2B f240fde995db1e73ab8cd9ba79d5fadd2761dc376afe627cf3be28d4fdfb3e5be56df6b0f7be90637ce029163520026b11f682bf407b5bc4dc2bc61738a44dbb SHA512 c66b30ebf223fe98c7de56d693296e04061f269e6f59dd897f26b987a0a78026bfdd36c94489cec0d8b3eef42d1c4108d94f8bd65691743cbdb1ed00840c32e3
+EBUILD udev-9999.ebuild 5851 BLAKE2B bfe759c1c69e2efa7138aec74a795f7c0d448097c1724b44707f8dbff2158e0d5db423e5a21f7c0be720c763e19c2d8c6d5bc4e3453444b89749eef0664809f3 SHA512 577e2b02531a584cffac132b12927874ad11e38393034913bb56a4265ab9dcddec9b548ed5692c8631612ba7b6ee7dea105dc90d44221bde02b808c779db3933
 MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d
diff --git a/sys-fs/udev/udev-245.5.ebuild b/sys-fs/udev/udev-245.5.ebuild
new file mode 100644
index 000000000000..f8ba208e8aef
--- /dev/null
+++ b/sys-fs/udev/udev-245.5.ebuild
@@ -0,0 +1,242 @@
+# Copyright 2003-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev usr-ldscript
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
+	MY_PV=${PV/_/-}
+	MY_P=${MY_PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="acl +kmod selinux static-libs"
+
+RESTRICT="test"
+
+BDEPEND="
+	dev-util/gperf
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+"
+COMMON_DEPEND="
+	>=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl )
+	kmod? ( >=sys-apps/kmod-15 )
+	selinux? ( >=sys-libs/libselinux-2.1.9 )
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-3.9
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/kmem
+	acct-group/tty
+	acct-group/audio
+	acct-group/cdrom
+	acct-group/dialout
+	acct-group/disk
+	acct-group/input
+	acct-group/kvm
+	acct-group/lp
+	acct-group/render
+	acct-group/tape
+	acct-group/video
+	!sys-apps/gentoo-systemd-integration
+	!sys-apps/systemd
+"
+PDEPEND=">=sys-apps/hwids-20140304[udev]
+	>=sys-fs/udev-init-scripts-26"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX"
+		linux-info_pkg_setup
+
+		# CONFIG_FHANDLE was introduced by 2.6.39
+		local MINKV=2.6.39
+
+		if kernel_is -lt ${MINKV//./ }; then
+			eerror "Your running kernel is too old to run this version of ${P}"
+			eerror "You need to upgrade kernel at least to ${MINKV}"
+		fi
+
+		if kernel_is -lt 3 7; then
+			ewarn "Your running kernel is too old to have firmware loader and"
+			ewarn "this version of ${P} doesn't have userspace firmware loader"
+			ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
+		fi
+	fi
+}
+
+src_prepare() {
+	cat <<-EOF > "${T}"/40-gentoo.rules
+	# Gentoo specific floppy and usb groups
+	ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
+	ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
+	EOF
+
+	if [[ -d "${WORKDIR}/patches" ]]; then
+		eapply "${WORKDIR}/patches"
+	fi
+
+	local PATCHES=(
+	)
+
+	default
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dacl=$(meson_multilib_native_use acl)
+		-Defi=false
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dselinux=$(meson_multilib_native_use selinux)
+		-Dlink-udev-shared=false
+		-Dsplit-usr=true
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dstatic-libudev=$(usex static-libs true false)
+
+		# Prevent automagic deps
+		-Dgcrypt=false
+		-Dlibcryptsetup=false
+		-Dlibidn=false
+		-Dlibidn2=false
+		-Dlibiptc=false
+		-Dseccomp=false
+		-Dlz4=false
+		-Dxz=false
+	)
+	meson_src_configure
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	# meson creates this link
+	local libudev=$(readlink src/udev/libudev.so.1)
+
+	local targets=(
+		src/udev/${libudev}
+	)
+	if use static-libs; then
+		targets+=( src/udev/libudev.a )
+	fi
+	if multilib_is_native_abi; then
+		targets+=(
+			systemd-udevd
+			udevadm
+			src/udev/ata_id
+			src/udev/cdrom_id
+			src/udev/mtd_probe
+			src/udev/scsi_id
+			src/udev/v4l_id
+			man/udev.conf.5
+			man/systemd.link.5
+			man/hwdb.7
+			man/udev.7
+			man/systemd-udevd.service.8
+			man/udevadm.8
+		)
+	fi
+	eninja "${targets[@]}"
+}
+
+multilib_src_install() {
+	local libudev=$(readlink src/udev/libudev.so.1)
+
+	dolib.so src/udev/{${libudev},libudev.so.1,libudev.so}
+	gen_usr_ldscript -a udev
+	use static-libs && dolib.a src/udev/libudev.a
+
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins src/libudev/libudev.pc
+
+	if multilib_is_native_abi; then
+		into /
+		dobin udevadm
+
+		exeinto /lib/systemd
+		doexe systemd-udevd
+
+		exeinto /lib/udev
+		doexe src/udev/{ata_id,cdrom_id,mtd_probe,scsi_id,v4l_id}
+
+		rm rules.d/99-systemd.rules || die
+		insinto /lib/udev/rules.d
+		doins rules.d/*.rules
+
+		insinto /usr/share/pkgconfig
+		doins src/udev/udev.pc
+
+		mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die
+		rm man/systemd-udevd-{control,kernel}.socket.8 || die
+		doman man/*.[0-9]
+	fi
+}
+
+multilib_src_install_all() {
+	doheader src/libudev/libudev.h
+
+	insinto /etc/udev
+	doins src/udev/udev.conf
+	keepdir /etc/udev/{hwdb.d,rules.d}
+
+	insinto /lib/systemd/network
+	doins network/99-default.link
+
+	# see src_prepare() for content of 40-gentoo.rules
+	insinto /lib/udev/rules.d
+	doins "${T}"/40-gentoo.rules
+	doins "${S}"/rules.d/*.rules
+
+	dobashcomp shell-completion/bash/udevadm
+
+	insinto /usr/share/zsh/site-functions
+	doins shell-completion/zsh/_udevadm
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	# Update hwdb database in case the format is changed by udev version.
+	if has_version 'sys-apps/hwids[udev]'; then
+		udevadm hwdb --update --root="${ROOT}"
+		# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
+		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+		[[ -z ${REPLACING_VERSIONS} ]] && udev_reload
+	fi
+}
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 4cdaa936a654..f8ba208e8aef 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -9,10 +9,15 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
 	inherit git-r3
 else
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
 	MY_PV=${PV/_/-}
-	MY_P=systemd-${MY_PV}
+	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 0294cfe22e80..f07dac8b6135 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -3,6 +3,6 @@ DIST zfs-0.8.3.tar.gz 8779385 BLAKE2B 8b51b9d5b61543566bc7839d8452fdf9358442155e
 DIST zfs-0.8.4.tar.gz 9285838 BLAKE2B 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 SHA512 9086dc6a6262dd93ca6ec43f1b4c2e5c804deba708c8a7460b8531aa4802b0bf8cac0917a1a00e6af2e96d4a21cd68b85e226bf571bd94041d0325c457106eb1
 EBUILD zfs-kmod-0.7.13.ebuild 4119 BLAKE2B f8d921251bc94644a7331762054935518bb9fb68425b404572876466bff118b9ae20cf297f34d9267c933d7ea28840c84fe8e4a867e9a9f191b627f29207798b SHA512 8e4eb43e5b4edd7dcb8b0ecb13a809340ee20247017e7cb141b8489dc4c9988b84b40e866028e8d3b73aea69981a923e4fc4b237389115fb8e72d8b6ed450340
 EBUILD zfs-kmod-0.8.3.ebuild 4247 BLAKE2B 7346912021c1aece40acdb2d25f1eaeb64630fbb78c276fa8f76b5a51fd27ca816a5d7f990d7bebe6422648f8c001d4b343d3e0957a831904fc9c11d9eb2a714 SHA512 ab215e7b0ceed0f282022a36ecda3b4e6fe50913ae7684823a4eee987b9a11e11ad7755001cf47a737613216df550de391aef59230859b3ca89c0a48d074263a
-EBUILD zfs-kmod-0.8.4.ebuild 4246 BLAKE2B 0d6cee74d3051ff59086597a2e926db9b026a3071026f4d494e04d73a08b60d87789308d3398bee4038ad907b88cd1eb7e69b267d4dba0d44f5c176a5b4edfbb SHA512 d719db5a0fafd77734d31f42333a4695f97e4333562ba99c8b73cef4b81ceb001528e58db4412f5596a7ab54ca1d823ab00e8315fcee70360a1e3521d37f4774
-EBUILD zfs-kmod-9999.ebuild 4246 BLAKE2B 0d6cee74d3051ff59086597a2e926db9b026a3071026f4d494e04d73a08b60d87789308d3398bee4038ad907b88cd1eb7e69b267d4dba0d44f5c176a5b4edfbb SHA512 d719db5a0fafd77734d31f42333a4695f97e4333562ba99c8b73cef4b81ceb001528e58db4412f5596a7ab54ca1d823ab00e8315fcee70360a1e3521d37f4774
+EBUILD zfs-kmod-0.8.4.ebuild 4390 BLAKE2B 3a7e549b456e0d40fd1082b160cf516843667e1e779d2d8a2da3106ddf48ef7db290fd540a6e6ca75dc8d605012dfa18cc6f9bf3c71c24018a304dd94861af96 SHA512 9e042db9684919ef1a32f0725dc58e635282e6bd3525994430d26fd0d9b2f5ea0be39b7bf0f4422ccf33266448e0fdf7eb3c526a0e548919cb880c432078f7cf
+EBUILD zfs-kmod-9999.ebuild 4390 BLAKE2B 3a7e549b456e0d40fd1082b160cf516843667e1e779d2d8a2da3106ddf48ef7db290fd540a6e6ca75dc8d605012dfa18cc6f9bf3c71c24018a304dd94861af96 SHA512 9e042db9684919ef1a32f0725dc58e635282e6bd3525994430d26fd0d9b2f5ea0be39b7bf0f4422ccf33266448e0fdf7eb3c526a0e548919cb880c432078f7cf
 MISC metadata.xml 551 BLAKE2B c8dc35c8f884d3f5d8720ad838c34ae5be7dc3b3cc63ab7713330a5611bca2829942eeb640b7e00ef285af9b52dd2d134cd793a20baeecff2af56f6b60116e21 SHA512 1cfd4a6a6ec4a120c8e02d3dde831b1f73294a06b798388ff8d4e761ef986e625a56fa980f8d412fab082630f58932116cf795bc5e5728c6485dd9ad54e22a7a
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.4.ebuild
index ea8054e8f0dd..8481dbb73811 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.8.4.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.4.ebuild
@@ -66,8 +66,6 @@ pkg_setup() {
 
 	kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
 
-	kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
-
 	if [[ ${PV} != "9999" ]]; then
 		local kv_major_max kv_minor_max zcompat
 		zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
@@ -76,6 +74,12 @@ pkg_setup() {
 		kv_minor_max="${zcompat%%.*}"
 		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
 			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
+		
+		# 0.8.x requires at least 2.6.32
+		kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
+	else
+		# git master requires at least 3.10
+		kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
 	fi
 
 	linux-mod_pkg_setup
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index ea8054e8f0dd..8481dbb73811 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -66,8 +66,6 @@ pkg_setup() {
 
 	kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
 
-	kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
-
 	if [[ ${PV} != "9999" ]]; then
 		local kv_major_max kv_minor_max zcompat
 		zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
@@ -76,6 +74,12 @@ pkg_setup() {
 		kv_minor_max="${zcompat%%.*}"
 		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
 			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
+		
+		# 0.8.x requires at least 2.6.32
+		kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
+	else
+		# git master requires at least 3.10
+		kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
 	fi
 
 	linux-mod_pkg_setup
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 670a59725f7d..adfb32ca0c27 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,6 +1,7 @@
 AUX 0.7.13-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch 1945 BLAKE2B db5d094bcac52a3b53bae9df4b0444f656858dd83f21994cbefe4900554a2579c67b5058d149d226ca354bd45d9e24c12244186da3232064233b74ec590187dc SHA512 71a009336fdcac8e5813001fd6741f4310c3e792b20650ebad73ba0049730acb5188587dc8e706846e886bf9ac241d2163b9558150eb389c99d7910a730542d0
 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 0.8.4-initconfdir.patch 1004 BLAKE2B fd4186b5f378f562098040a8e13a12e6fd7f0f37f3b981a8d46e0e3bc943eb8dd5fa474e6c65cefd8c03fc3c45a119f6a141d42753ce4729e3a234e7f57dc4b8 SHA512 c18e9cd03d537a3ad632e1aeb354b56f5db9a8ef51c30b2e728ea527b7e9017219b1a230374238ecdd24082d9f2c62510aea68b234df84961ada5dce2ed617cc
 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
@@ -11,6 +12,6 @@ DIST zfs-0.8.4.tar.gz 9285838 BLAKE2B 776bcd6dfab8825c07d315085e288b29bf543d6957
 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.3-r1.ebuild 5631 BLAKE2B bddee093199db937dfb3803c959fcad9d7a582bdd662f73c03653a9a1024f72dc117204cf13939e130cc4c0580db7b5266b03f4561e96c2caed2cf349bfa766c SHA512 ec01abfbe7ca3661dcfe6b9acb7a7d6cce59bd81f9a8d14175cf196ee523c6f2dea315d6b4f22c77d4322f663b9087b4e5dac9ba52105e69447dba4dffc2eebb
-EBUILD zfs-0.8.4.ebuild 5156 BLAKE2B 9dbb83c08b6bc0338303d6572a152f423a4de615c664c268991341f4ec4b7112cc5839c504de9f105404055415a9d5574271593673dfcf6838d1d9722865c668 SHA512 b99a1a80d4a5677d2e2624475f7694f1f2467643574fdaed8af0e4f929103ecba3cb6865c6fdae55c8b6c8e75027f0af88e8a142525448158ad518d50bb9d055
+EBUILD zfs-0.8.4-r1.ebuild 5197 BLAKE2B a26eda5c79de67dfb2b7873de472c976e5e2983972aaee347a2b39ed85239bf42b7125108c0d0452cba2f02330d5f2c7ff729b2c512a9f437c5ce4d5a1fc558e SHA512 579dbe8d0cc66cbb63a2641a10779aeb00a47be24955037767608c303b5223e4ba5cabeba7b5b567d258affa99c4e52c14542f779d33e187759a6937a4a2564f
 EBUILD zfs-9999.ebuild 5156 BLAKE2B 9dbb83c08b6bc0338303d6572a152f423a4de615c664c268991341f4ec4b7112cc5839c504de9f105404055415a9d5574271593673dfcf6838d1d9722865c668 SHA512 b99a1a80d4a5677d2e2624475f7694f1f2467643574fdaed8af0e4f929103ecba3cb6865c6fdae55c8b6c8e75027f0af88e8a142525448158ad518d50bb9d055
 MISC metadata.xml 751 BLAKE2B 84331bb699e48773412c2b3a26786e746428a111b64d1a309d0acd6f2454220e917a6650b2a35e88269f77c725f848493f46516adf72a0deb149dbb1e0275bf3 SHA512 a16f2fff439157fa1910926bd5b90ccfc3cab262fe7b41e5565b645f29774b14f1d9ac11aceaee57b8685ec1c782d826e08715559fb0b2e06031a165ca5f6295
diff --git a/sys-fs/zfs/files/0.8.4-initconfdir.patch b/sys-fs/zfs/files/0.8.4-initconfdir.patch
new file mode 100644
index 000000000000..aac40896f39b
--- /dev/null
+++ b/sys-fs/zfs/files/0.8.4-initconfdir.patch
@@ -0,0 +1,35 @@
+From 5dbe98184278878746a5f548fead1d2ef1e98dbe Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Tue, 26 May 2020 16:44:54 -0700
+Subject: [PATCH] 0.8.4 initconfdir
+
+fix for https://github.com/openzfs/zfs/issues/10375
+
+---
+ etc/zfs/Makefile.am | 1 +
+ etc/zfs/Makefile.in | 9 +++++----
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/etc/zfs/Makefile.am b/openzfs/etc/zfs/Makefile.am
+index 81567a4..5370f41 100644
+--- a/etc/zfs/Makefile.am
++++ b/etc/zfs/Makefile.am
+@@ -1,4 +1,5 @@
+ pkgsysconfdir = $(sysconfdir)/zfs
++initconfdir = $(DEFAULT_INITCONF_DIR)
+ 
+ pkgsysconf_DATA = \
+ 	vdev_id.conf.alias.example \
+diff --git a/etc/zfs/Makefile.in b/etc/zfs/Makefile.in
+index fb02811..795d3b1 100644
+@@ -571,6 +571,7 @@ udevdir = @udevdir@
+ udevruledir = @udevruledir@
+ zfsexecdir = @zfsexecdir@
+ pkgsysconfdir = $(sysconfdir)/zfs
++initconfdir = $(DEFAULT_INITCONF_DIR)
+ pkgsysconf_DATA = \
+ 	vdev_id.conf.alias.example \
+ 	vdev_id.conf.sas_direct.example \
+-- 
+2.26.2
+
diff --git a/sys-fs/zfs/zfs-0.8.4.ebuild b/sys-fs/zfs/zfs-0.8.4-r1.ebuild
index c7cc180b9ea0..5f7c23109c09 100644
--- a/sys-fs/zfs/zfs-0.8.4.ebuild
+++ b/sys-fs/zfs/zfs-0.8.4-r1.ebuild
@@ -68,7 +68,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" )
+PATCHES=( 
+	"${FILESDIR}/bash-completion-sudo.patch"
+	"${FILESDIR}/${PV}-initconfdir.patch"
+)
 
 pkg_setup() {
 	if use kernel_linux && use test-suite; then