gentoo resync : 25.08.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
commit: 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree: c513fe68548b40365c1c2ebfe35c58ad431cdd77 /sys-apps
parent: 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
271 files changed, 3272 insertions, 3475 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 450c1fd01ae3..75cc1822cedb 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/ack/Manifest b/sys-apps/ack/Manifest
index 2a1d22127e94..450152409eb7 100644
--- a/sys-apps/ack/Manifest
+++ b/sys-apps/ack/Manifest
@@ -3,7 +3,9 @@ AUX ack-3.3.0-gentoo.patch 315 BLAKE2B 8fb44f3540a3567519f626c954f52c37945a48644
 DIST ack-v3.0.0.tar.gz 238646 BLAKE2B 679cf84c7dffd6f1ec3881de465cbdbebf9ec8958a6e36c5265d11492d84990a67b34af0e42041280b9a9ab6c57d951a2c73ba5b6fe07c9ac8774bac445c10fd SHA512 2bf4e9719d8a5ec56c9d31acbcff647aece7b52ff7ffaacbfec56e59e30efb9ca7397fa379e13a9113a27abe47053261b9adb641b995d3e8579d459c0483fb45
 DIST ack-v3.2.0.tar.gz 246140 BLAKE2B ac729ba6b1c7f0b720ddd076498452660f7f50ba7f866f908717d19c2ef985858d63dad96a2acd5c93d0a991a1870bec895da3dc64b974bc11c5f74b9245332a SHA512 3604a8ad6a79c63fdd65721fc790db09f345f66b81e5272fa073cb53b7964b576ba3638e1f358d8e0c28c38acd0d9a0362f2666ece9abe374cf6355b752a0f69
 DIST ack-v3.3.1.tar.gz 250024 BLAKE2B 3cf4882929afb05ea592a7e964a06745bef58303d5bc1c66e65ca3eb7d21fccc7fe285b142fe9518cfd9eb5c37bc32dfbec113df775b84de4f55b12864a4ba9e SHA512 7f0a5cc55b331f69877d186699e2fab64a196b0ea0fd148699b7be5f9a7bb2850ecf9e45dc026325af8407a37f719faf3f3e314c43e48d575b3685087461addd
+DIST ack-v3.4.0.tar.gz 251106 BLAKE2B 192d1e851ef5bd3547e21fe49cf276180eb278af783209046c02e4a1ae1471c7b24aaf6825223aad96dedea9fd266576a2021dcb808b0e229312e8237e2f7afd SHA512 cc8de5a784f63a8f48b9548e930972578866d0fcc520febc6002d1ce4f9b55aabb0c8e87860586a668d94b5091c66194c05a07c584fe30fad2c5d786aee95db5
 EBUILD ack-3.0.0.ebuild 810 BLAKE2B 2617de5e26ff8f9ecf601ee5a4f5c2104ec9acfc2e42fcc1fe56742dbe64c729bfbd58f780374bdd1bc6563bac29e05284e99e73ec5f5310cef0fa10cef239b6 SHA512 574ee3043cc235a1914d2002ac9a3184890f2ae6f23037823a699bca22b04b44d15c2617d4bd910e4e00123106d2c5a47d36e8289d75b1583e758f4b6cefd51e
 EBUILD ack-3.2.0.ebuild 812 BLAKE2B 916da318cdcc7aeb9b98f65f156365f103e59248c1087615c293da0a73d4fc1ad3f535e2f6f5a422406a26a522cebcb12f97d9e05c3d80aecf64e2e445020898 SHA512 b4272f60a2ffd169b490b07f2ac28db6c069ed5543451202d1b49b34f2deea2dc05098a0a304bc4a8b5cfde86419f2ab486a8a9b5dd88951d8994d2c4946a2eb
 EBUILD ack-3.3.1.ebuild 812 BLAKE2B aef52558bf7791b754afdfdce9fb497c26b44a3aeebe8a1b2bc587bcbce6d5477340194c33d551f7aedb4b2f5fe9fd71fce8aa6e382fffa686dffc0ea2a7fc87 SHA512 93c5e79e1800400bd40405993f5a8e05e43a446c308b26f3e6c9f670df36c354e2cf6f0396b5ad9fe636a1f6031d8a5e4a655b8b32e2e5abc1af4158983972f2
-MISC metadata.xml 1725 BLAKE2B 864ea988225ca7865583529aebcc7eefe2b836572ff64b35aae34380287702a7693813fde2fedb3c6c2154e3ab9f0e597f512b419ecccad484ef4b49a9a5b265 SHA512 a7119c9d5de56f3bf73bf76a1803a5b851e951112b3c4a25789fd48645cc03912dc40f750e3e3f73decc3df76d12e2b7801f401ce0c630f459b27d4515965879
+EBUILD ack-3.4.0.ebuild 812 BLAKE2B aef52558bf7791b754afdfdce9fb497c26b44a3aeebe8a1b2bc587bcbce6d5477340194c33d551f7aedb4b2f5fe9fd71fce8aa6e382fffa686dffc0ea2a7fc87 SHA512 93c5e79e1800400bd40405993f5a8e05e43a446c308b26f3e6c9f670df36c354e2cf6f0396b5ad9fe636a1f6031d8a5e4a655b8b32e2e5abc1af4158983972f2
+MISC metadata.xml 1749 BLAKE2B c8803cd3161065885162a0a3c21a426e36914ff7796b3f99eb57f1e1db40be7cb789df331dde048e112f6ab691a30607100a521091ece034d2edabffc22751ee SHA512 91bee1d028fac56e397138f7db10742721a509c3ba1f7de21aebe5d9c334b2bc56736cbedf47df90f3dec5bc6193feacccceb45ad247e54fefdae5a06df65dac
diff --git a/sys-apps/ack/ack-3.4.0.ebuild b/sys-apps/ack/ack-3.4.0.ebuild
new file mode 100644
index 000000000000..0df2c490211b
--- /dev/null
+++ b/sys-apps/ack/ack-3.4.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DIST_AUTHOR=PETDANCE
+DIST_VERSION="v${PV}"
+inherit perl-module
+
+DESCRIPTION="ack is a tool like grep, optimized for programmers"
+HOMEPAGE="https://beyondgrep.com"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-perl/File-Next-1.180.0"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/IO-Tty )"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.3.0-gentoo.patch )
+
+src_test() {
+	# Tests fail when run in parallel and if dev-perl/IO-Tty is installed
+	# which enables interactive tests that need to read from stdin. If IO-Tty
+	# is not installed the related tests are skipped.
+	MAKEOPTS+=" -j1" perl-module_src_test
+}
diff --git a/sys-apps/ack/metadata.xml b/sys-apps/ack/metadata.xml
index 1dc39059f197..0cfba749742e 100644
--- a/sys-apps/ack/metadata.xml
+++ b/sys-apps/ack/metadata.xml
@@ -9,6 +9,7 @@
 		<email>perl@gentoo.org</email>
 		<name>Gentoo Perl Project</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="cpan">ack</remote-id>
 		<remote-id type="cpan-module">App::Ack</remote-id>
diff --git a/sys-apps/agedu/Manifest b/sys-apps/agedu/Manifest
index 33bcc0aa0934..413dd0ad6c52 100644
--- a/sys-apps/agedu/Manifest
+++ b/sys-apps/agedu/Manifest
@@ -1,8 +1,6 @@
 AUX agedu-r9671-fix-automagic.patch 1684 BLAKE2B ab7d2d33a7577251fa65e222914a25e621c68f6bdedbe3c9e62b43f2d8b51e29bbdbc08560fbcd76beab98e115ddf43e76e4cd290f1ce751c0452318ad8ee9e1 SHA512 61f11c624ebd5fa632f24ecc46230146f999a68ffbd9c2ce73f6319a527cd9c37d634ecec9a6b2a7fd1dcc792ab3d23a6c8a599499bab54194f36acb262a201b
-DIST agedu-20190630.66cb14d.tar.gz 180129 BLAKE2B e37e11afdf6d4e7b4169b65d547ed0fb672015118668d108081fd45728bd91cabb9774a586cdb2a44121bb7a8457cc59e2fbbc649d8585b1bb3b25207e48a3c2 SHA512 9a18f62eba86b71d54eee540ff194bb6d4292fca08ca2fc6f31e631d97e2cc7e9c63d1c796b05b0ebc529bdfe9ba9d0b34f1fd8b84c016d0ccfd9934394a7821
-DIST agedu-20200206.963bc9d.tar.gz 181308 BLAKE2B 44cdf607813153ee2a9f58f62a5f94215048eb2b2c3103f5a19fadd0aeaa4658a535e4c30f27cf2832dcdc77de0a2b3709c9cef98c0cfc13aaa70272bd8bc29c SHA512 7e2b1e909d6f16ef939bab9759880581a40f7aeb28b5ca92992f035f0dfaf2ad480498ae355239f2db0c5dfed93ee5ce732708520c5d661ebc3b019989117cec
 DIST agedu-20200617.cec3021.tar.gz 181804 BLAKE2B 19acc1ac37d09f45227e08b92483c1a0be7d9faaf4b2bf65479ca99a0294305788e88d6494508ac742a4396c4a22352d927c125ed7437fe29cb71890dbb2217b SHA512 d7a913a867817a0457c8ec3644a6986ed3632721df1040de1db96c04e85f9e59c4aba632dc1f3f3666496435b6be3f68335a2ec3e50440c844ebd4ab81b2682a
-EBUILD agedu-20190630.ebuild 817 BLAKE2B b4c2b9dc444e2dd2ba72330f9120b087870886aa6063a29fae3c85d08d438582149ea93aae1e68caf069477c992a773b2a7ccf6ce2e4662caad5f8e4dabbad33 SHA512 abda070387b4c5c403d2ed9ebeb94c391f77216e907661c7f887c80a360a429c9c3eeb0707b63496798e202ab01b059aaac562afc58a5a323eb5b5486bab8939
-EBUILD agedu-20200206.ebuild 817 BLAKE2B 036ff5fd3fd840aff6511fe908dc0ef0b926e5702acb7daa8e55db556967ae7a106449260a7874308f1b83f06f3a32d0983a6cd32df3ea7e4e689b5acca46173 SHA512 5a735912a8d5db41d99269843e25d2926ef9ef373521fc9b6e8f1a97c896c52ef7a568bced0838a388a112bb0bf9fbdeafef630321420b7646f1a1dbde3beae4
+DIST agedu-20200705.2a7d4a2.tar.gz 181809 BLAKE2B 2802b223979b2f15efd14b6f1f445b9ca00312068ade3c26a057d54a65d5074fdcdee043c9673a59e4e6cc222deba7c817ee078a0a742f09ec1087ec921414bd SHA512 a65f90990706493fc2a080dc313706107ab603f461dcd63531f9afbc1efe785747947f2222559ab2b0b354453a7d9242025c7b96df7f4cac608b8422855c55d6
 EBUILD agedu-20200617.ebuild 817 BLAKE2B 8ae8b06a95d40ada2ac01194808b0c4f2c9b450824579e08b29bd5805573c45ac43f3a91e26e189eb0253032905882b33523ab56d2985736a93db77ec95c5ef5 SHA512 7b087160a3165e4ffa3b35fc165e41ba17b20cf052d1f8790635e77742694a8aa17f78a9c1fef6ef9a114be12c736610f75260d116cc99f60b1f38e57333c591
+EBUILD agedu-20200705.ebuild 817 BLAKE2B 8f574eb51c4a49355b2e325c0bd4c5122a624f07711aadc586025d41cb5efdfa871752e7edab351c5ea0c3936cdb56acc110ac47176ab3a50ae4539ddb020913 SHA512 2a44168dc23904b6c39e397b5cd9a9da04ea44e8bb173c1917f81b8f714211a2071e91c03899bfd3e365fe963c4af2a3aa86691db126975bdba4390d8860ee7b
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/sys-apps/agedu/agedu-20190630.ebuild b/sys-apps/agedu/agedu-20190630.ebuild
deleted file mode 100644
index 2b4da5780461..000000000000
--- a/sys-apps/agedu/agedu-20190630.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools eutils
-
-# agedu-20151213.59b0ed3.ebuild is not a legitimate name
-# so we'll drop versionator and just set MY_P manually.
-MY_P="${PN}"-20190630.66cb14d
-
-DESCRIPTION="A utility for tracking down wasted disk space"
-HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/agedu/"
-SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/agedu/${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ipv6"
-
-DEPEND="doc? ( app-doc/halibut )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-r9671-fix-automagic.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf --enable-ipv4 \
-		$(use_enable doc halibut) \
-		$(use_enable ipv6)
-}
diff --git a/sys-apps/agedu/agedu-20200206.ebuild b/sys-apps/agedu/agedu-20200705.ebuild
index d15f135f3af0..a49e4fc983bc 100644
--- a/sys-apps/agedu/agedu-20200206.ebuild
+++ b/sys-apps/agedu/agedu-20200705.ebuild
@@ -7,7 +7,7 @@ inherit autotools eutils
 
 # agedu-20151213.59b0ed3.ebuild is not a legitimate name
 # so we'll drop versionator and just set MY_P manually.
-MY_P="${PN}"-20200206.963bc9d
+MY_P="${PN}"-20200705.2a7d4a2
 
 DESCRIPTION="A utility for tracking down wasted disk space"
 HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/agedu/"
diff --git a/sys-apps/apply-default-acl/Manifest b/sys-apps/apply-default-acl/Manifest
index 19137e28a615..d7b46d70920e 100644
--- a/sys-apps/apply-default-acl/Manifest
+++ b/sys-apps/apply-default-acl/Manifest
@@ -1,5 +1,3 @@
-DIST apply-default-acl-0.4.2.tar.xz 246660 BLAKE2B dfb698d6a220b426ea607a70e1c51295629e6ac4637de72cf64a8fe577ed83ceaf6beb7f8b1507ed0d059e6f16e88e1b58a24e641dd6280765c55a70fa30712c SHA512 afe3a0182b76689e41d3a6922a8459587f6013112767ab0d9b60e5197d677ee0cdabd9ebd18f9cb59d4e373b4df2f5845cabddbd382c2743a80c3a20205aa861
 DIST apply-default-acl-0.4.4.tar.xz 252164 BLAKE2B 7e584a1cc479b82a82a06214da06619e3e0d0228681277144785346c9829f2411bcdc0a0248bd5688813e9c8d2dcd4591653568e536e167d95b2c0ccc1fcc0bb SHA512 23c637845fcd7ab61a04c3d459b1468c36cd2a27f63b3ab5252a4e39615675431b3d781a7ddf87029ad1c03c4bda43f1689c24b1ad76d2f548bfe3484350df1a
-EBUILD apply-default-acl-0.4.2.ebuild 520 BLAKE2B 73d380faa9de3094a406e5860439e3d61eccb5cd9fc30dbc08d73e9e09f71b38f58d1c90131e6e8ac10effc56f11f58ba5acb77f43c55a6236747306fdd0ef08 SHA512 7a766757a43671e4e8b6dceb048b1fe36f10b79fc3b836d0174c0d2b9a5555ff822914f08869aaa722e650f0115f6267266a7a9a0038b39ae032759f82b42ded
-EBUILD apply-default-acl-0.4.4.ebuild 593 BLAKE2B b3dd0bee16e0c01fc961c06ed2f1e3066a47a11261790435db557174e8ba067fa5f5d53fd557fbb4c40d31117e2d646d7b96f0936903fda388c20fc5e8159053 SHA512 3069b26550cee43999ecff6f3c9629e95c585702ce46c4cffa857bc071728247357e968384a50379e321a7919f50cdfd7491661e1dc16197ba03816cc3e8c043
+EBUILD apply-default-acl-0.4.4.ebuild 591 BLAKE2B 8f29fbbdda362edaefb2ad67ee14810d5e4d166ea4c83535fd7f9da0fabaaffd4acff93eb8885f2e15af48fb4d5d48a7e99f4a83f6afb65e2a8468732d25d56a SHA512 7a7b37173d3fc116da01e970240c86848dde6a2e24eb9da75091c6fec5bdbe5c646e9ef4fc7b8dd4be7eb4e28f0975f8ba85b01260ae8b7a34d4a0cc24bfd24e
 MISC metadata.xml 409 BLAKE2B d120f8236355cd9c5534402178c29eb8879f341053686f3d44c7c08f44d8e15abe905e8567b9154f6abb324aa1dbe5a3095e4a8d5377ea14c4906e932d5ee6b1 SHA512 ccf6bafbdfc01736cd151ee30fe4d2e7124ee633463052aa41e0a8ef687793d358825b53b01d21aa9cc9a64633ec37b2bd2b7a27aac20a6d56b12f79eff56b18
diff --git a/sys-apps/apply-default-acl/apply-default-acl-0.4.2.ebuild b/sys-apps/apply-default-acl/apply-default-acl-0.4.2.ebuild
deleted file mode 100644
index a35fd4c488a1..000000000000
--- a/sys-apps/apply-default-acl/apply-default-acl-0.4.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Apply default POSIX ACLs to files and directories"
-HOMEPAGE="http://michael.orlitzky.com/code/apply-default-acl.xhtml"
-SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="sys-apps/acl"
-RDEPEND="${DEPEND}"
-
-DOCS=( doc/README )
-
-# tests need to be executed on filesystem with ACL support
-# skipping them for now
-RESTRICT="test"
diff --git a/sys-apps/apply-default-acl/apply-default-acl-0.4.4.ebuild b/sys-apps/apply-default-acl/apply-default-acl-0.4.4.ebuild
index 956755978eab..6d77b523fbd3 100644
--- a/sys-apps/apply-default-acl/apply-default-acl-0.4.4.ebuild
+++ b/sys-apps/apply-default-acl/apply-default-acl-0.4.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.xz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="sys-apps/acl"
 RDEPEND="${DEPEND}"
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest
index f99422f047be..87ed71fa8f55 100644
--- a/sys-apps/baobab/Manifest
+++ b/sys-apps/baobab/Manifest
@@ -1,3 +1,5 @@
 DIST baobab-3.34.0.tar.xz 454960 BLAKE2B c9e695074711442418bfd9c9c1453feeaf573429f1d9a03ef6c542d581d39c5bf1cb14d98025cc522705b1f8649150f418d39c05cf06f77f5900780eb058f67e SHA512 e821ba445c65742e92580e12be9b82ff352c6a2a8a58bab7fba97b01a120a948b06e35459196f16e9eef347cc6c5aeacfd563e86d78c758099fbab2ecfc4aa0e
+DIST baobab-3.34.1.tar.xz 458500 BLAKE2B 1f27640bb369cf1712c7b1c79d1261fd4a99e427a99debbf7d2f31f191f5e0ddaec7b366cb6b34add6a552c9728b9b1f4b64bdc05f06b29e0071ccad73a77c6a SHA512 8234f26fde68d6ebe578360345dcb45314b6a818aa899f858b7e3b9ae1874165e4f1d644d169d6ba56270689a34e8cd78d993e99c08f66b3f2c7c9fd0b7ea516
 EBUILD baobab-3.34.0.ebuild 741 BLAKE2B 10803eba1cddb0f50d6520faa8b966e7a97461f99b0187782aa2c02f2ee559348bf0c43bd2b87f41a62e0cab128a5e66ae69a28cba4504294b4ce831c7b1dce5 SHA512 6aa9a9e559875b149d3872f884c9d0bd60cd0ed6287da38804211fa14e2a2567cce76cc22be364cb70e157157ade86519f02a415fdf60c456ddaabe16eb00b40
+EBUILD baobab-3.34.1.ebuild 743 BLAKE2B 3065535511eb518f47a6e46845494b7b06c19d28b2388274b75131fa52e8ffd4fd62e3881a878e4d1791d9463f88466e01e2a8fa823784ebf234fd52679fc715 SHA512 4877a679da20609b0a8bd5d1a6fcf9a5d243cf209139ed4284da389329da3f2aae1d29247fdd54b429ff0f73905b5b9fe0f1aedad676892d951db724e4ce8c0f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/baobab/baobab-3.34.1.ebuild b/sys-apps/baobab/baobab-3.34.1.ebuild
new file mode 100644
index 000000000000..98e6be622baf
--- /dev/null
+++ b/sys-apps/baobab/baobab-3.34.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Disk usage browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Baobab"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=x11-libs/gtk+-3.20:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-libs/appstream-glib
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index af7753169985..43d1442d4f75 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -3,6 +3,6 @@ DIST baselayout-2.6.tar.bz2 31871 BLAKE2B 4a51d173dc5a2837f78cd1247b5eadd89e7d0b
 DIST baselayout-2.7.tar.bz2 30317 BLAKE2B 7b7c284b7d0a9608a0d03dbde0d62d793829b61d5361f5062fdeb8880a2f792c142e20acf7fa92e713e2ebb0bd1609ca65bc8a4191f2bf2c5df4f474eaeef1ee SHA512 8b28d2dc20fd5887db5c0e6b67a4217c4d0730529023fc57fb1ee95a431e1f492fb21e3e66980bef766819e9f542dc7e4ad3ae25465390194bbf970c3653c88e
 EBUILD baselayout-2.4.1-r2.ebuild 8567 BLAKE2B 35400fafd5addba2128aab3ce0476893302572d16c9becd92963c99b4a260ccceb2b104e0a49e75ba3fd4ac25b623c22b31af78d689c71a68843b7071c51a0f9 SHA512 bfa7d130955aa6d8a55cdd1685f639ae009847ce88bed3088c26479dd47b8c47ff6775d6addf92716513b490544e2937a0ebff35b32eab4f3a98f0e308547a73
 EBUILD baselayout-2.6-r1.ebuild 9560 BLAKE2B 03f1513752235adeffe7274004ab9e6e3f11ce38c4715c3db4a5619571c11764385fc8e3bbf1b57120ac9b19efafaf6d2bb006c4be884eaf9d8db00ceceae2b7 SHA512 446b72d50abb3624e0e73590a903054b227b47d2ef6d65f1ca5e268fc0177d7f04139944afdc5b8cef1952d64c5d12067c00565c1ca84e904a29a4ac45515657
-EBUILD baselayout-2.7.ebuild 9882 BLAKE2B 9cbff5c47f5215f359209f3900bbe7e0c111097fbad692ff4bb13faf7cd6383ee04c13de51ce4067a6a54287297850e0982aa5c2ccf456d65b0092f5cb81258f SHA512 7190579f6a50ac164662853ed7978fd8c0bf3435a01b9fb87b0fba59e8d164fa748dd5c1bf36737f5eaec980d9b694281e95e7e0d60516b16a0b80ae6cdf00ed
-EBUILD baselayout-9999.ebuild 9850 BLAKE2B d45df5ac9f261fd4ce6a8aeee007f80a6e6eb75986344469c75890473f8c129e20041bbc5e2ff7817cd57ae562750a4190b9f65dde42c1b892d76503a8cfdf7b SHA512 040e90d0cbbe037ec71d5ed938a2a925833b80e03138224e865e2773e27b082941d16123b54ea3ab47d329cdcc1c9392c3529fe327c48e5b3fda30a54f5e4a71
+EBUILD baselayout-2.7.ebuild 10032 BLAKE2B 8fcce0e238c2998edfafcc9968513edf2f04cdef69857fdbd757c0487df1d09eabf6709bff717b74bcb5e9e02ede7e41e4d901b52af4cf055ec805e17aa07c9b SHA512 19856e31bcfa1ce6afec5a66809c2d601cc346e5e0e72e77c13f02e2cd988bf6341efc091dd57a57712d5308aef30c6191851235a15ab9f12781b0bedfa781bb
+EBUILD baselayout-9999.ebuild 9940 BLAKE2B 6354e020354282c0ee7dadbf3044ed8a410b986149f25c565e015e8b3d616fc40b357490b322f7f2d749790c98bc7d1bfb34f80a7da7f99419540a88b5538e2d SHA512 e4f0ecf7b329f71835cd7667282def8acd114485390900279beb19d1d37c153d802f02c45a2993e28ae09f293eadd90fd7942b4bdcc7ee85d82708f8428089a0
 MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f
diff --git a/sys-apps/baselayout/baselayout-2.7.ebuild b/sys-apps/baselayout/baselayout-2.7.ebuild
index 104cf105212f..25ccf0871bf7 100644
--- a/sys-apps/baselayout/baselayout-2.7.ebuild
+++ b/sys-apps/baselayout/baselayout-2.7.ebuild
@@ -33,7 +33,7 @@ multilib_layout() {
 
 	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
 		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
-		for prefix in ${prefix_lst[@]}; do
+		for prefix in "${prefix_lst[@]}"; do
 			for libdir in ${libdirs}; do
 				dir="${prefix}${libdir}"
 				if [[ -e "${dir}" ]]; then
@@ -101,7 +101,7 @@ multilib_layout() {
 			elif [ -d "${prefix}lib" ] ; then
 				# "lib" is a dir, so need to convert to a symlink
 				ewarn "Converting ${prefix}lib from a dir to a symlink"
-				rm -f "${prefix}lib"/.keep
+				rm -f "${prefix}lib"/.keep || die
 				if rmdir "${prefix}lib" 2>/dev/null ; then
 					ln -s ${def_libdir} "${prefix}lib" || die
 				else
@@ -113,7 +113,7 @@ multilib_layout() {
 				mkdir -p "${prefix}" || die
 				rm -f "${prefix}lib" || die
 				ln -s ${def_libdir} "${prefix}lib" || die
-				mkdir -p "${prefix}${def_libdir}" #423571
+				mkdir -p "${prefix}${def_libdir}" || die #423571
 			fi
 		else
 			# we need to make sure "lib" is a dir
@@ -135,7 +135,7 @@ multilib_layout() {
 				*-gentoo-freebsd*) ;; # We want it the other way on fbsd.
 				i?86*|x86_64*|powerpc*|sparc*|s390*)
 					if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
-						rm -f "${prefix}lib32"/.keep
+						rm -f "${prefix}lib32"/.keep || die
 						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
 							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
 							die "non-empty dir found where there should be none: ${prefix}lib32"
@@ -153,7 +153,8 @@ multilib_layout() {
 	if ! use split-usr ; then
 		for libdir in ${libdirs}; do
 			if [[ ! -e "${EROOT}${libdir}" ]]; then
-				ln -s usr/"${libdir}" "${EROOT}${libdir}"
+				ln -s usr/"${libdir}" "${EROOT}${libdir}" ||
+					die " Unable to make ${EROOT}${libdir} symlink"
 			fi
 		done
 	fi
@@ -163,7 +164,7 @@ pkg_preinst() {
 	# This is written in src_install (so it's in CONTENTS), but punt all
 	# pending updates to avoid user having to do etc-update (and make the
 	# pkg_postinst logic simpler).
-	rm -f "${EROOT}"/etc/._cfg????_gentoo-release
+	rm -f "${EROOT}"/etc/._cfg????_gentoo-release || die
 
 	# We need to install directories and maybe some dev nodes when building
 	# stages, but they cannot be in CONTENTS.
@@ -176,7 +177,7 @@ pkg_preinst() {
 			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge
 		fi
 	fi
-	rm -f "${ED}"/usr/share/${PN}/Makefile
+	rm -f "${ED}"/usr/share/${PN}/Makefile || die
 }
 
 src_prepare() {
@@ -222,7 +223,7 @@ src_install() {
 		DESTDIR="${ED}" \
 		install
 	dodoc ChangeLog
-	rm "${ED}"/etc/sysctl.d/README
+	rm "${ED}"/etc/sysctl.d/README || die
 
 	# need the makefile in pkg_preinst
 	insinto /usr/share/${PN}
@@ -240,17 +241,19 @@ pkg_postinst() {
 	for x in master.passwd passwd shadow group fstab ; do
 		[ -e "${EROOT}etc/${x}" ] && continue
 		[ -e "${EROOT}usr/share/baselayout/${x}" ] || continue
-		cp -p "${EROOT}usr/share/baselayout/${x}" "${EROOT}"etc
+		cp -p "${EROOT}usr/share/baselayout/${x}" "${EROOT}"etc || die
 	done
 
 	# Force shadow permissions to not be world-readable #260993
 	for x in shadow ; do
-		[ -e "${EROOT}etc/${x}" ] && chmod o-rwx "${EROOT}etc/${x}"
+		if [ -e "${EROOT}etc/${x}" ] ; then
+			chmod o-rwx "${EROOT}etc/${x}" || die
+		fi
 	done
 
 	# Take care of the etc-update for the user
 	if [ -e "${EROOT}"etc/._cfg0000_gentoo-release ] ; then
-		mv "${EROOT}"etc/._cfg0000_gentoo-release "${EROOT}"etc/gentoo-release
+		mv "${EROOT}"etc/._cfg0000_gentoo-release "${EROOT}"etc/gentoo-release || die
 	fi
 
 	# whine about users that lack passwords #193541
@@ -275,7 +278,7 @@ pkg_postinst() {
 
 	# https://bugs.gentoo.org/361349
 	if use kernel_linux; then
-		mkdir -p "${EROOT}"run
+		mkdir -p "${EROOT}"run || die
 
 		local found fstype mountpoint
 		while read -r _ mountpoint fstype _; do
@@ -298,7 +301,7 @@ pkg_postinst() {
 		# clean up after 2.5 typos
 		# https://bugs.gentoo.org/show_bug.cgi?id=656380
 		if [[ ${x} == 2.5 ]]; then
-			rm -fr "${EROOT}{,usr"
+			rm -fr "${EROOT}{,usr" || die
 		fi
 	done
 
diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild
index a94078654b83..ee4f298e8409 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-9999.ebuild
@@ -33,7 +33,7 @@ multilib_layout() {
 
 	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
 		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
-		for prefix in ${prefix_lst[@]}; do
+		for prefix in "${prefix_lst[@]}"; do
 			for libdir in ${libdirs}; do
 				dir="${prefix}${libdir}"
 				if [[ -e "${dir}" ]]; then
@@ -153,7 +153,8 @@ multilib_layout() {
 	if ! use split-usr ; then
 		for libdir in ${libdirs}; do
 			if [[ ! -e "${EROOT}${libdir}" ]]; then
-				ln -s usr/"${libdir}" "${EROOT}${libdir}"
+				ln -s usr/"${libdir}" "${EROOT}${libdir}" ||
+					die " Unable to make ${EROOT}${libdir} symlink"
 			fi
 		done
 	fi
@@ -222,6 +223,7 @@ src_install() {
 		DESTDIR="${ED}" \
 		install
 	dodoc ChangeLog
+	rm "${ED}"/etc/sysctl.d/README
 
 	# need the makefile in pkg_preinst
 	insinto /usr/share/${PN}
diff --git a/sys-apps/bat/Manifest b/sys-apps/bat/Manifest
index e822b4876ed6..0db0159ede11 100644
--- a/sys-apps/bat/Manifest
+++ b/sys-apps/bat/Manifest
@@ -163,5 +163,5 @@ DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST xml-rs-0.8.2.crate 52353 BLAKE2B e5f041831d7e15459704e031b22b018c82aa214c0d3041639aceca53661536d71f33f2ae254a6376f683fafea351e34e274190a8abfa57cde778acd35ca305b9 SHA512 b98dcb7e9293b372ab61739ea5c82782f4b8dab87c9f3de24fb2c98b87399c6990d77cff87921c4c5b3e072b79a3c5ebd9088d0476d19956b4771e879f575dd3
 DIST yaml-rust-0.4.3.crate 45768 BLAKE2B 6af7374439000dc5e8795b26fccb1bc691040846f844e10765fe5df06237f5cf52752b0f9d25ed7c6f62337f628ee7be2e024f8aeb6b55a7c76f0d3b2ad0489c SHA512 31b0236fe041706befa938cdeb9c74940daccd2f80bdbd4e0e890901c868ecffc39367a41914c8bb98373d1002904f18b18ff13a08bbecd19dec634c08b7a7a3
-EBUILD bat-0.15.4.ebuild 3968 BLAKE2B e90582c9be5b751cfe07a029ef0a7db159401d751e388bc4b89e057ed8e532e09a78ffee3eea59b9bfcb5eeaf4f786ce8feadc32ad94b7b4a8db7683b5b1c114 SHA512 b6138fac7fe2ec0006a4d67c14cb04e2693dd7196fb2c62154d7faf5be6786daa99a231b31465720a296f886e46b5142980786ffc56880c7a5d96a16f75b6c06
-MISC metadata.xml 709 BLAKE2B 5d8265e6f27b8b650024dd6298773ef8b3afaa63b5f210467bff6b35df4b14112fc5b144d73d5074e97d47200c4cc03d6048359f9df4110a18a75d841083c6bd SHA512 779c6d9b6cc09f8f6d06bc256f83aff716ac4638d0ee0be84420b6ea52bb6fae7bec0dd4e672cacbec4d27a537c27c1dcd6d6a49c44be0670c45dc75ca97c0b3
+EBUILD bat-0.15.4.ebuild 3975 BLAKE2B 1f53e7236725360091e06e9568a0b00f4e5193c7842ad4fe1929feb0021cd1c3f24dada83504b97d149517687802b33feb8760159a8f9f7f93127ffed69452e7 SHA512 301acd3940aad422b93aaae0cc7f6695cc7e6fcf3d93b70a40141c7e4e4000ca0dc40ff8e23dde4424b2f08b79e841e66e728677bf62fadbd5962685b38b30a7
+MISC metadata.xml 818 BLAKE2B a006c6a94fd0c73b87ec6395c42e29e0b6986224606ee98d1eb058b22bb7530048035fbad80f58696d651e4192bcd0c841610011390a7e043a425520b92a9df8 SHA512 0f74f00f4e135e8daaa1744b3d3c7b05d1d5b8c1bc1a6bdeb72d9a7375c5ec2a15be332489ba8d9f7bb24d3d2c695ed592407b672990e58a762bf754780a100e
diff --git a/sys-apps/bat/bat-0.15.4.ebuild b/sys-apps/bat/bat-0.15.4.ebuild
index 854a5c3dfd18..864ac40b0ab1 100644
--- a/sys-apps/bat/bat-0.15.4.ebuild
+++ b/sys-apps/bat/bat-0.15.4.ebuild
@@ -179,7 +179,7 @@ SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 CC0-1.0 ISC LGPL-3+ MIT Apache-2.0 Unlicense ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 DEPEND="
 	>=dev-libs/libgit2-0.99:=
diff --git a/sys-apps/bat/metadata.xml b/sys-apps/bat/metadata.xml
index c48ee37fa4f0..9bbc255a76f4 100644
--- a/sys-apps/bat/metadata.xml
+++ b/sys-apps/bat/metadata.xml
@@ -2,8 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>gyakovlev@gentoo.org</email>
-		<name>Georgy Yakovlev</name>
+		<email>toshokan@shojigate.net</email>
+		<name>J. Pz</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription lang="en">
 		A cat(1) clone with wings
diff --git a/sys-apps/biosdisk/Manifest b/sys-apps/biosdisk/Manifest
index 09d9d460bc10..bace85276cba 100644
--- a/sys-apps/biosdisk/Manifest
+++ b/sys-apps/biosdisk/Manifest
@@ -1,5 +1,3 @@
-DIST biosdisk-0_p20171116.tar.gz 712587 BLAKE2B f09a8c68f57cddb1949d369cfc18d1216c3e64612a7074c58e6c50c12682fce92a4d6295810d5358fac0340483387f14059811a5681ae4f37c7da8e40c34fec4 SHA512 27d99990d0e92f1295d2ddb949214946db681e7f80c6606b252473fe7b5b0d3254180b54cb26479c9014219f6b989aa6ba29e8a818f3801f9ccce4efd2f1c3b9
 DIST biosdisk-1.01.tar.gz 214715 BLAKE2B 1a42523d0ec713a895276e3ca3b383206bb841c59bf789eb2b869ce3ade6bfde1e96d47afb8874eec5efec1ef4d404c093a707e36d2d9ab785211fa62abb5782 SHA512 f1920a0eee0a1f8530488c5ccd3f37b36170150b7658658af55beb41c2084c66b6d6bded6e144e36dd9d74f963881c504d7869bbe5c8b57749bff4d918581537
-EBUILD biosdisk-0_p20171116.ebuild 971 BLAKE2B 19cc49a6fcf3e44298bf55c46edbe819dcbf1302fb8cbbae83831d6072bd31ecdeaca73695b01138ce42d65e05cfe3930c983a7d226de232c33da2f3f607fa31 SHA512 87024d007d88014c0ac837cbeaaecc24b453e596329f0f2d8a212b0243a79c437e272cd15cabb0afaeb8f2bf06969c1e4f1d92fd0d59ea2433b059aabb112627
 EBUILD biosdisk-1.01.ebuild 588 BLAKE2B ca0d2e385dbf7138407ddb9ce60e4eb0ff8ff22e351a3ebf68d223c23490003721035bb54d2b128a419400f4b29312d2ee9d28e62ff032271000991dfd93dc19 SHA512 e81b6743cc3570f7ea0a903ea13d8f044eda3d538df6b5a3973ef4d943ab1c261832306c65bc4642e6df1e21724f5bc1f1add61b29531ea17f27744e26851f9c
 MISC metadata.xml 245 BLAKE2B 9d48c927e5844df237d0d7c23fe22d6b1896b0369c41a9c7d62c6ff09ccd0937de415f743270a074b9d389a6ea0c10933b9701a264a2ce155899ec2535f6bf0c SHA512 77077cbe810752d5fb24ae88ff5d9a00a175d7d043e95268d69b1f461546d9bf9053273e5d5bc3ba9dc80641b0ef908f8d189d7f51602f0c6786d04c8c991bfa
diff --git a/sys-apps/biosdisk/biosdisk-0_p20171116.ebuild b/sys-apps/biosdisk/biosdisk-0_p20171116.ebuild
deleted file mode 100644
index 87367d63b19d..000000000000
--- a/sys-apps/biosdisk/biosdisk-0_p20171116.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-EGIT_COMMIT="f534dd22a795dca9c42f44b52f206bf02eadb682"
-DESCRIPTION="A script that creates floppy boot images to flash Dell BIOSes"
-HOMEPAGE="https://github.com/dell/biosdisk"
-SRC_URI="https://github.com/dell/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=app-text/dos2unix-5.0
-	sys-boot/syslinux
-	${PYTHON_DEPS}
-"
-
-S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-
-src_install() {
-	python_fix_shebang blconf
-
-	dosbin biosdisk blconf
-
-	dodoc AUTHORS README README.dosdisk TODO VERSION
-	gunzip biosdisk.8.gz || die
-	doman biosdisk.8
-
-	insinto /usr/share/biosdisk
-	doins dosdisk.img dosdisk{288,8192,20480}.img biosdisk-mkrpm-{fedora,redhat,generic}-template.spec
-
-	insinto /etc
-	doins biosdisk.conf
-}
diff --git a/sys-apps/bolt/Manifest b/sys-apps/bolt/Manifest
index dc8b5ad88f5e..f2b6c2a45e9f 100644
--- a/sys-apps/bolt/Manifest
+++ b/sys-apps/bolt/Manifest
@@ -1,6 +1,4 @@
-DIST bolt-0.8.tar.gz 219317 BLAKE2B 9d76f3630d7f690c96447a894e54095deb7a19e46f2b02d7fbd9e584376d6b1a19391007a3a80e293adc8c9de6470279b587807d08006bbc12c7179bf0501e40 SHA512 0fdbc026178a4ca6a8c53aa46933d1c411eb04e350955f8b10c7faff814576d0796dd28e56b968648e549c79cf5fa13d43970d797595af0f66457abaef8ace09
+AUX bolt.openrc 362 BLAKE2B 1cefc0db24bcd6dca7483a582f89a68800e13651330d8873c2b9f3042c70e0f8d8a2b7c363ceeae5ec63fa4b736b42e129f9e90ea4a576e5419af7e0e26d848e SHA512 59616543c6cd101373249b06bcbc0b7dd13fb2c8e45d6dc61a56088434cdf0a6b57630471bd2d788dd6253b66bcbfc3ec60b11ba8442043e837119130344216e
 DIST bolt-0.9.tar.gz 238596 BLAKE2B 8032ecb83d39d6c3550c000eed400ee0451e5ed94f7c898ffe9c8fcf512af387cfd759bd94241a47623b5aac63615bcda40ddb3e9ae3ec4060da20e46d7e9b7d SHA512 427e9ad95a8d018dd22326cc4b458fc9149b001d3aa6e4bb8e4047eaf6c3cf04a4dc3be9396049734dc0bd54f990b3bce31b6eef4031e3b671a6202a588cfe78
-DIST bolt-210-r2.patch 369 BLAKE2B 2ee8b084d8a89fac361e434fddaac50a1c10fd412b450dbe496d263d07cbd9961c33b84b04ae8296154ad16c01f6c3ba6599b48649d54c4ceb77d52797eddb53 SHA512 e66787ab18acb9924903ab92bf878e48b4aed39ea6aa18d874121316cb0452a00358a4adde1e7bbd903d682a6a001e20fd573af782db25d6c54b18ffafd29329
-EBUILD bolt-0.8-r1.ebuild 1035 BLAKE2B 86674fb1f2b2c59cdf07d60cb9671cadd9bbd6da0ce20ea559b4f2c545414580f032d6aec687890244388e1b877095930df7cbcc4e69cf814f5196766fc1775f SHA512 0aae5be42f2062a68723542aeaff86e74ad34f488338034b2c9398fd04ff03c49de4eff2f5c43231bdc31bff47d6a11a46a47299c428a7a2d689d934190332fe
-EBUILD bolt-0.9.ebuild 870 BLAKE2B 323048debaab00c3dcc587bd33023cf4b3073aaacf99d5c43fa044d0beab2a99df81f740d1a6ff929d8b5e79e7f1bbf21ddb64c191d098ee8a421852b1b22550 SHA512 be8f347b7bb3e99797b80bc06c26bfb0b05fb3e7f17fd18c3da38a7eb2b10a4f7bb6d539cc13740c33e50d87746469f327f4de4d5e0dfd58ba78a960e66cff88
+EBUILD bolt-0.9-r1.ebuild 1179 BLAKE2B 2275f3ce707e18f2481a34f7b96acfb2f58a03d511be185ffcaa50e93460b52cdb78d202f5b3bec36147aca04a4585bdbf4b5ecb4d98a70d9b05e58b7eccf716 SHA512 01e8bfa3ee62e9f28c3da06f7adf5c79be75b736a3fa7f1ce6f0cff559307f3e254a63bb6115fbecc0d70f95baae02f4fe4b5772cd225075d9541bf27192c279
 MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
diff --git a/sys-apps/bolt/bolt-0.8-r1.ebuild b/sys-apps/bolt/bolt-0.8-r1.ebuild
deleted file mode 100644
index 83ece17b667f..000000000000
--- a/sys-apps/bolt/bolt-0.8-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson systemd
-
-DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3"
-HOMEPAGE="https://gitlab.freedesktop.org/bolt/bolt"
-SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz
-	https://gitlab.freedesktop.org/bolt/bolt/-/commit/5a739574608e5190816b3efd22e75f214c5fe4c4.diff -> ${PN}-210-r2.patch"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc systemd"
-
-DEPEND="
-	>=dev-libs/glib-2.50.0:2
-	dev-util/glib-utils
-	virtual/libudev
-	virtual/udev
-	dev-util/umockdev
-	sys-auth/polkit[introspection]
-	systemd? ( sys-apps/systemd )
-	doc? ( app-text/asciidoc )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${DISTDIR}/${PN}-210-r2.patch"
-)
-
-src_configure() {
-	local emesonargs=(
-		-Dman=$(usex doc true false)
-		--sysconfdir=/etc
-		--localstatedir=/var
-		--sharedstatedir=/var/lib
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	keepdir /var/lib/boltd
-}
diff --git a/sys-apps/bolt/bolt-0.9.ebuild b/sys-apps/bolt/bolt-0.9-r1.ebuild
index f9decd2321f0..8145c75880e1 100644
--- a/sys-apps/bolt/bolt-0.9.ebuild
+++ b/sys-apps/bolt/bolt-0.9-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit meson systemd
+inherit linux-info meson systemd
 
 DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3"
 HOMEPAGE="https://gitlab.freedesktop.org/bolt/bolt"
@@ -25,6 +25,16 @@ DEPEND="
 	doc? ( app-text/asciidoc )"
 RDEPEND="${DEPEND}"
 
+pkg_pretend() {
+	CONFIG_CHECK="~THUNDERBOLT"
+	ERROR_THUNDERBOLT="This package requires the thunderbolt kernel driver."
+	check_extra_config
+
+	CONFIG_CHECK="~HOTPLUG_PCI"
+	ERROR_HOTPLUG_PCI="Thunderbolt requires PCI hotplug support."
+	check_extra_config
+}
+
 src_configure() {
 	local emesonargs=(
 		-Dman=$(usex doc true false)
@@ -37,5 +47,6 @@ src_configure() {
 
 src_install() {
 	meson_src_install
+	newinitd "${FILESDIR}"/${PN}.openrc boltd
 	keepdir /var/lib/boltd
 }
diff --git a/sys-apps/bolt/files/bolt.openrc b/sys-apps/bolt/files/bolt.openrc
new file mode 100644
index 000000000000..b80a7b31b26e
--- /dev/null
+++ b/sys-apps/bolt/files/bolt.openrc
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="Thunderbolt Security Daemon"
+description="Userspace system daemon to enable security levels for Thunderbolt 3"
+command="/usr/libexec/boltd"
+command_background="true"
+pidfile="/var/run/boltd.pid"
+
+depend() {
+	need dbus
+	before xdm
+}
diff --git a/sys-apps/bubblewrap/Manifest b/sys-apps/bubblewrap/Manifest
index a9287600d2a5..b170e84ccdcb 100644
--- a/sys-apps/bubblewrap/Manifest
+++ b/sys-apps/bubblewrap/Manifest
@@ -1,4 +1,4 @@
 AUX bubblewrap-0.3.1-selinux-configure.patch 5208 BLAKE2B 69db3066eebae54d34f02a02aa053a6bf5ed675329b3d18a4f261529a434d1c9dbfb637a3f96f4079a6adba586b666d7890370c8761c92dc9450f096a8368bbe SHA512 f6515a25c6b311c9b8336761c7daea2440964982f8a7a6587b6707ef9e9a5705ec380e13982b0765af205c221724ef418b44c3efd1b6e5f0c1788b143a88ef17
 DIST bubblewrap-0.4.1.tar.xz 214496 BLAKE2B bdbff50cc4e28c91d83c814df7f2ee15702962d26a9316bd841b1e63bf5976c4549c88e20869e8cc236a8a0c9a065518f945c356fa7a058f8831f5b1e9d4eb0d SHA512 0ff46dc0fda2d0cffbb36cc52ff43951b30cbd835a42cc56806acbbbd827796bfadbb1cfafc84d6b47a72c031ca44abe1c377acc0cc25fe3b33e854f5f687d35
-EBUILD bubblewrap-0.4.1.ebuild 1128 BLAKE2B 0dbea9f9cc66e2004efe3d2be96706f6e6be015a1f849408d8dfdd419c3745b269fde4c9d7d85c851ffb11ab706d15c3eaac234df257df0a732e264d14bb57be SHA512 22e4e6d45c7b692ea7e3a55bfd4f48e58fc0013a6aa06659ce59de3a9bfe820434fd1445aef95397a7e3b65f188497d3d7809bff759122697d344ba66a4e44ed
+EBUILD bubblewrap-0.4.1.ebuild 1139 BLAKE2B 9f94cb92c33bb2ed0d3c4ccab96f4469386e3a812c5f636ad5979c4035e3a5a77a75225654c8519b2691e1586116d418da0952944a73381b2df029a2ee4ac261 SHA512 36984a98da1a40251109bacb8d7a7eda097bdecec2f2caf32edd00ff63e3372d811cdd59e78a4ca667890475bd3f83bc4b0e6f9d0a97797d74b907f5f6b73fad
 MISC metadata.xml 452 BLAKE2B c11d7134d3623de9f970ddcb4782d1312f89b17955090ee7d4c56a1acb9b45f1c5ae0d08d091b57be21b696cceda0ed7d747c10aa6765c927df8dae81233d66c SHA512 3e6ec22d7109fdf7772edba88f6f76783df8ee233d9f927b6e5570d1453f611f93627c2ea3dfcbe9ae1259d1c23692b26d5403fef02558dcf296f569702c5103
diff --git a/sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild b/sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild
index 9067b08a242a..df71b56f75f8 100644
--- a/sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild
+++ b/sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild
@@ -19,7 +19,8 @@ RDEPEND="
 	sys-libs/libcap
 	selinux? ( >=sys-libs/libselinux-2.1.9 )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/docbook-xml-dtd:4.3
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 5d001016c47d..b742b0516257 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -15,6 +15,8 @@ AUX syslogd.initd 267 BLAKE2B 1daf252138bfb5904feb04dcc2127b8e8058d9d43652474e75
 AUX watchdog.confd 232 BLAKE2B 14ff3813297bc987e98bf3cabee2e7b150e23d8aa9f016303396569ffca3633b3e048497f85649c20d769233baa430a4cb54d2d5e5d63646db8113761960552d SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232
 AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379afe9d490ad32b19a6d10d456155fdeb0468c67816f061b1cac166db7f104dbadadf0d175082efdb4 SHA512 d329fb72ce078a95a1fb77b72321dee56d19c76b45cb78a7a57a46d9fa385b982a114be49dd8696c2d4fc2b2dd90a17ee728ef2938172cc2f8b12b5a9ebd62f5
 DIST busybox-1.31.1.tar.bz2 2430221 BLAKE2B 95c2345bc715eb7a1f08816a40add9b7a6176ef509a84069343ec2caddec58d8d57a07676ca2b03c209734169321433e27ba963b4c8b98dbfda4e409dcc347b4 SHA512 0d1197c25d963d7f95ef21e08c06c0d6124ac7b59c99989e891f744ffee4878a3b1fe44a247241a9da39fa5de0ba87f1b6d862401b591f277e66e89c02764bbf
+DIST busybox-1.32.0.tar.bz2 2439463 BLAKE2B 75937ae6e1401d7ab947d80f4b206112023ff2b7d04257ffa2c254cadabb92282ba04d5d608659b6c98fade1ccd0b0f6b204c8758263d59dea6508a3157a7c69 SHA512 1b1227af69a97e820e28f5f1c62413e4e179202ab525725ea0b1afe9b9f9a5f00e5e32f4603e804ba1596b0fedd60d60457a6d2b8fcedfab45b6e049caeb319b
 EBUILD busybox-1.31.1-r2.ebuild 9531 BLAKE2B 9b590ec44931fd6986385210681f607ab85f68ac5fc50cff9a31d6619735eb2b9c287a8d9a1917cd5e0f33ec0e89f1cc1ba0ee675f418d7853055273b1710a40 SHA512 c903448a82ce2889e203731aec408e93e89879ae935e5955b9ed2871662afcf3615d427cdcf5f0e206ac72defbb18f5c4bddf890f1f35c6af1f20f5d947226e3
+EBUILD busybox-1.32.0.ebuild 9495 BLAKE2B f0b5bbea9274936236b75b646726fc5bd5f95857aaccc702aad8a6ae16696399532dcf3dc75904c88078e914817027a041c372bc04815ab57e518bde1a3354db SHA512 c26f045878d30ed97c08686e77e7411ef5f3712208d6a4330900cfcc40885016739aa428e7ae82ae5bef80a27ca067efe9e6cf3d1be537b1973c7b30c2062b0e
 EBUILD busybox-9999.ebuild 9438 BLAKE2B fdfb82402864e50f294dffc3b93f06d1fec142734918ccf9042d520098e803deb4c14095fbe4f6b2c536e8a3b58066ce217e78ff277adecd1535d90fb20713ca SHA512 b718d6272b43efa50d38064cffed0a284c4d70e351642da996ed759bbe4e9de1119b645c0adb1349782635661aa5bcb76f1f71ae85bbf52c9730a6967d4a28fd
 MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07
diff --git a/sys-apps/busybox/busybox-1.32.0.ebuild b/sys-apps/busybox/busybox-1.32.0.ebuild
new file mode 100644
index 000000000000..e4d93e71de3f
--- /dev/null
+++ b/sys-apps/busybox/busybox-1.32.0.ebuild
@@ -0,0 +1,337 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
+
+EAPI=7
+
+inherit flag-o-matic savedconfig toolchain-funcs
+
+DESCRIPTION="Utilities for rescue and embedded systems"
+HOMEPAGE="https://www.busybox.net/"
+if [[ ${PV} == "9999" ]] ; then
+	MY_P=${P}
+	EGIT_REPO_URI="https://git.busybox.net/busybox"
+	inherit git-r3
+else
+	MY_P=${PN}-${PV/_/-}
+	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2" # GPL-2 only
+SLOT="0"
+IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd"
+REQUIRED_USE="pam? ( !static )"
+RESTRICT="test"
+
+COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
+	pam? ( sys-libs/pam )
+	virtual/libcrypt:="
+DEPEND="${COMMON_DEPEND}
+	static? (
+		virtual/libcrypt[static-libs]
+		selinux? ( sys-libs/libselinux[static-libs(+)] )
+	)
+	>=sys-kernel/linux-headers-2.6.39"
+RDEPEND="${COMMON_DEPEND}
+	mdev? ( !<sys-apps/openrc-0.13 )"
+
+S="${WORKDIR}/${MY_P}"
+
+busybox_config_option() {
+	local flag=$1 ; shift
+	if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then
+		busybox_config_option $(usex ${flag} y n) "$@"
+		return
+	fi
+	local expr
+	while [[ $# -gt 0 ]] ; do
+		case ${flag} in
+		y) expr="s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" ;;
+		n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;;
+		*) expr="s:.*\<CONFIG_$1\>.*:CONFIG_$1=${flag}:g" ;;
+		esac
+		sed -i -e "${expr}" .config || die
+		einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find CONFIG_$1 ...")"
+		shift
+	done
+}
+
+busybox_config_enabled() {
+	local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
+	case ${val} in
+	"") return 1 ;;
+	y)  return 0 ;;
+	*)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
+	esac
+}
+
+# patches go here!
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.26.2-bb.patch
+	# "${FILESDIR}"/${P}-*.patch
+)
+
+src_prepare() {
+	default
+	unset KBUILD_OUTPUT #88088
+	append-flags -fno-strict-aliasing #310413
+	use ppc64 && append-flags -mminimal-toc #130943
+
+	cp "${FILESDIR}"/ginit.c init/ || die
+
+	# flag cleanup
+	sed -i -r \
+		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
+		Makefile.flags || die
+	#sed -i '/bbsh/s:^//::' include/applets.h
+	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
+	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
+	sed -i \
+		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
+		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
+		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
+		Makefile || die
+	sed -i \
+		-e 's:-static-libgcc::' \
+		Makefile.flags || die
+}
+
+src_configure() {
+	# check for a busybox config before making one of our own.
+	# if one exist lets return and use it.
+
+	restore_config .config
+	if [ -f .config ]; then
+		yes "" | emake -j1 -s oldconfig >/dev/null
+		return 0
+	else
+		ewarn "Could not locate user configfile, so we will save a default one"
+	fi
+
+	# setup the config file
+	emake -j1 -s allyesconfig >/dev/null
+	# nommu forces a bunch of things off which we want on #387555
+	busybox_config_option n NOMMU
+	sed -i '/^#/d' .config
+	yes "" | emake -j1 -s oldconfig >/dev/null
+
+	# now turn off stuff we really don't want
+	busybox_config_option n DMALLOC
+	busybox_config_option n FEATURE_2_4_MODULES #607548
+	busybox_config_option n FEATURE_SUID_CONFIG
+	busybox_config_option n BUILD_AT_ONCE
+	busybox_config_option n BUILD_LIBBUSYBOX
+	busybox_config_option n FEATURE_CLEAN_UP
+	busybox_config_option n MONOTONIC_SYSCALL
+	busybox_config_option n USE_PORTABLE_CODE
+	busybox_config_option n WERROR
+	# triming the BSS size may be dangerous
+	busybox_config_option n FEATURE_USE_BSS_TAIL
+
+	# These cause trouble with musl.
+	if use elibc_musl; then
+		busybox_config_option n FEATURE_UTMP
+		busybox_config_option n EXTRA_COMPAT
+		busybox_config_option n FEATURE_VI_REGEX_SEARCH
+	fi
+
+	# If these are not set and we are using a uclibc/busybox setup
+	# all calls to system() will fail.
+	busybox_config_option y ASH
+	busybox_config_option y SH_IS_ASH
+	busybox_config_option n HUSH
+	busybox_config_option n SH_IS_HUSH
+
+	busybox_config_option '"/run"' PID_FILE_PATH
+	busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH
+
+	# disable ipv6 applets
+	if ! use ipv6; then
+		busybox_config_option n FEATURE_IPV6
+		busybox_config_option n TRACEROUTE6
+		busybox_config_option n PING6
+		busybox_config_option n UDHCPC6
+	fi
+
+	busybox_config_option pam PAM
+	busybox_config_option static STATIC
+	busybox_config_option syslog {K,SYS}LOGD LOGGER
+	busybox_config_option systemd FEATURE_SYSTEMD
+	busybox_config_option math FEATURE_AWK_LIBM
+
+	# disable features that uClibc doesn't (yet?) provide.
+	if use elibc_uclibc; then
+		busybox_config_option n FEATURE_SYNC_FANCY #567598
+		busybox_config_option n NSENTER
+	fi
+
+	# all the debug options are compiler related, so punt them
+	busybox_config_option n DEBUG_SANITIZE
+	busybox_config_option n DEBUG
+	busybox_config_option y NO_DEBUG_LIB
+	busybox_config_option n DMALLOC
+	busybox_config_option n EFENCE
+	busybox_config_option $(usex debug y n) TFTP_DEBUG
+
+	busybox_config_option selinux SELINUX
+
+	# this opt only controls mounting with <linux-2.6.23
+	busybox_config_option n FEATURE_MOUNT_NFS
+
+	# glibc-2.26 and later does not ship RPC implientation
+	busybox_config_option n FEATURE_HAVE_RPC
+	busybox_config_option n FEATURE_INETD_RPC
+
+	# default a bunch of uncommon options to off
+	local opt
+	for opt in \
+		ADD_SHELL \
+		BEEP BOOTCHARTD \
+		CRONTAB \
+		DC DEVFSD DNSD DPKG{,_DEB} \
+		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
+		FEATURE_DEVFS \
+		HOSTID HUSH \
+		INETD INOTIFYD IPCALC \
+		LOCALE_SUPPORT LOGNAME LPD \
+		MAKEMIME MKFS_MINIX MSH \
+		OD \
+		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
+		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
+		TASKSET TCPSVD \
+		RPM RPM2CPIO \
+		UDPSVD UUDECODE UUENCODE
+	do
+		busybox_config_option n ${opt}
+	done
+
+	emake -j1 oldconfig > /dev/null
+}
+
+src_compile() {
+	unset KBUILD_OUTPUT #88088
+	export SKIP_STRIP=y
+
+	emake V=1 busybox
+}
+
+src_install() {
+	unset KBUILD_OUTPUT #88088
+	save_config .config
+
+	into /
+	dodir /bin
+	if use sep-usr ; then
+		# install /ginit to take care of mounting stuff
+		exeinto /
+		newexe busybox_unstripped ginit
+		dosym /ginit /bin/bb
+		dosym bb /bin/busybox
+	else
+		newbin busybox_unstripped busybox
+		dosym busybox /bin/bb
+	fi
+	if use mdev ; then
+		dodir /$(get_libdir)/mdev/
+		use make-symlinks || dosym /bin/bb /sbin/mdev
+		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
+
+		exeinto /$(get_libdir)/mdev/
+		doexe "${FILESDIR}"/mdev/*
+
+		newinitd "${FILESDIR}"/mdev.initd mdev
+	fi
+	if use livecd ; then
+		dosym busybox /bin/vi
+	fi
+
+	# add busybox daemon's, bug #444718
+	if busybox_config_enabled FEATURE_NTPD_SERVER; then
+		newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
+		newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
+	fi
+	if busybox_config_enabled SYSLOGD; then
+		newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
+		newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
+	fi
+	if busybox_config_enabled KLOGD; then
+		newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
+		newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
+	fi
+	if busybox_config_enabled WATCHDOG; then
+		newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
+		newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
+	fi
+	if busybox_config_enabled UDHCPC; then
+		local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
+		exeinto "${path%/*}"
+		newexe examples/udhcp/simple.script "${path##*/}"
+	fi
+	if busybox_config_enabled UDHCPD; then
+		insinto /etc
+		doins examples/udhcp/udhcpd.conf
+	fi
+
+	# bundle up the symlink files for use later
+	emake DESTDIR="${ED}" install
+	rm _install/bin/busybox
+	# for compatibility, provide /usr/bin/env
+	mkdir -p _install/usr/bin
+	ln -s /bin/env _install/usr/bin/env
+	tar cf busybox-links.tar -C _install . || : #;die
+	insinto /usr/share/${PN}
+	use make-symlinks && doins busybox-links.tar
+
+	dodoc AUTHORS README TODO
+
+	cd docs
+	docinto txt
+	dodoc *.txt
+	docinto pod
+	dodoc *.pod
+	docinto html
+	dodoc *.html
+
+	cd ../examples
+	docinto examples
+	dodoc inittab depmod.pl *.conf *.script undeb unrpm
+}
+
+pkg_preinst() {
+	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
+		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
+		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
+		ewarn "If you are creating a binary only and not merging this is probably ok."
+		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
+		die "silly options will destroy your system"
+	fi
+
+	if use make-symlinks ; then
+		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
+	fi
+}
+
+pkg_postinst() {
+	savedconfig_pkg_postinst
+
+	if use make-symlinks ; then
+		cd "${T}" || die
+		mkdir _install
+		tar xf busybox-links.tar -C _install || die
+		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
+	fi
+
+	if use sep-usr ; then
+		elog "In order to use the sep-usr support, you have to update your"
+		elog "kernel command line.  Add the option:"
+		elog "     init=/ginit"
+		elog "To launch a different init than /sbin/init, use:"
+		elog "     init=/ginit /sbin/yourinit"
+		elog "To get a rescue shell, you may boot with:"
+		elog "     init=/ginit bb"
+	fi
+}
diff --git a/sys-apps/cciss_vol_status/Manifest b/sys-apps/cciss_vol_status/Manifest
index 83a801bc7799..c239cf4524f2 100644
--- a/sys-apps/cciss_vol_status/Manifest
+++ b/sys-apps/cciss_vol_status/Manifest
@@ -1,5 +1,4 @@
-AUX cciss_vol_status.cron 646 BLAKE2B a35f73a527e21c62e9b1214d2b962f115f64cb0f385fec04eab60aaef6ccb16cd5d8dcdef32d8a93c11f35a45b8e2891c3946da40b406645e757763db90f5d5f SHA512 658004668f6d1914c1526e07113eaee9a24e8d1945ab378a27537e9fd421e5b39eeb5f56610d59bebcbc6d7b2addfce65fee697b6877d164775b696930591a56
-AUX cciss_vol_status.cron2 1611 BLAKE2B db62a46e933357537132405e862b96fe0d3a8fe9f078982e797be8897d09f2c6310abbd6de1472d8401ebeb33b7ec9cd3f13a060933539816d051115df52df42 SHA512 b0ca78c96dad516abe49be96a1ca0956a5dcc5f721bd5088422da9327a783e5483798f96d2f4eb9bd8484fd07c94e86305be7a88ba0b503f5771634b31a7ac68
-DIST cciss_vol_status-1.12.tar.gz 120346 BLAKE2B 8094f7b421c8c3f003f38cef380eb14c6778b750a62a5b8b94df955f87c0a77b1b7dfa9df16d6bb10f4955b6961b022b871fc39d143717b8024ec40fdb3b819f SHA512 f9fa8b98bd42810932f03f514b4b8c6cea690378f065a6c9788ddb78612c7ca2aa9a7fefa8a40634cfe247600fb6d3f11f0b687fba77d1423087a2b319773d69
-EBUILD cciss_vol_status-1.12.ebuild 556 BLAKE2B 8e7ba5a01040520ff8a22be5a8f12df84817fd00099976cd81de3ab3adc632f570a17d7ee0960d64876e0c706a842e630240ba03385bb03ba6ec4347ba558154 SHA512 f619ff586271493d57aae42c28874ae1dc7ad8262c18429ce42cb1966aaaa1f188706d6883b3c5d299a6ff7aa631826b356dfe6f53b21b64d61bde7dc2b391c8
+AUX cciss_vol_status-r2.cron 1611 BLAKE2B db62a46e933357537132405e862b96fe0d3a8fe9f078982e797be8897d09f2c6310abbd6de1472d8401ebeb33b7ec9cd3f13a060933539816d051115df52df42 SHA512 b0ca78c96dad516abe49be96a1ca0956a5dcc5f721bd5088422da9327a783e5483798f96d2f4eb9bd8484fd07c94e86305be7a88ba0b503f5771634b31a7ac68
+DIST cciss_vol_status-1.12a.tar.gz 120748 BLAKE2B 855712328e53165f6b7cf5858a1f73fe71a55570a104ad401cb8359ae9bccb3f2abc01d0e92f0001b8d69c732fadfe26c54a73e52af50cc544a76d13e72c6023 SHA512 c6aeae0d1fd66aabcd4a82f69b12433770fab2dde726bca67d97a09636e39f2eb596a0695afdb7e3e1a35c3d6882a9804a8263caa9b0dad97da8256afea778be
+EBUILD cciss_vol_status-1.12a.ebuild 555 BLAKE2B 4c494dca28c62940ca5c298854039504916ba44ccb0277a4d8d18115757c18e03b28260a381096964a42b3cf3fc8d3262e34e628ea60c7023ba9d5a9c9412f5f SHA512 40657360f2419dd5662800746cdc4e5acce41e26823aad15e3b5fbc1be5b95b16dcf517b88adec13727e15428dcdf2f39405991a0fc60feeedd1e430e27ca4ba
 MISC metadata.xml 402 BLAKE2B e69409b303a34d9e6ac1f7ddf96eb9cda2a9d233adf718ec546f723714d78a0960ad4b43eb1945a56aba6af12b5934f0a45693b23a8914c491a67fb2f2c2eb00 SHA512 346a18ccc25fd45f14252b81a275cc1d3b18568d9a2b8404a7b80c53f05a36d8af0926ef50fca2b92b693d38deec31419f1a1d284a8f4b8506ea8f8cc149062d
diff --git a/sys-apps/cciss_vol_status/cciss_vol_status-1.12.ebuild b/sys-apps/cciss_vol_status/cciss_vol_status-1.12a.ebuild
index 8c5f27b95379..94fedd2679d0 100644
--- a/sys-apps/cciss_vol_status/cciss_vol_status-1.12.ebuild
+++ b/sys-apps/cciss_vol_status/cciss_vol_status-1.12a.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 IUSE=""
 DESCRIPTION="Shows status of logical drives attached to HP SmartArray controllers"
@@ -17,5 +17,5 @@ src_install() {
 	emake DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog NEWS README
 	exeinto /etc/cron.hourly
-	newexe "${FILESDIR}/cciss_vol_status.cron2" cciss_vol_status
+	newexe "${FILESDIR}/cciss_vol_status-r2.cron" cciss_vol_status
 }
diff --git a/sys-apps/cciss_vol_status/files/cciss_vol_status.cron2 b/sys-apps/cciss_vol_status/files/cciss_vol_status-r2.cron
index 43731b48e0ca..43731b48e0ca 100644
--- a/sys-apps/cciss_vol_status/files/cciss_vol_status.cron2
+++ b/sys-apps/cciss_vol_status/files/cciss_vol_status-r2.cron
diff --git a/sys-apps/cciss_vol_status/files/cciss_vol_status.cron b/sys-apps/cciss_vol_status/files/cciss_vol_status.cron
deleted file mode 100644
index 8d1175b45678..000000000000
--- a/sys-apps/cciss_vol_status/files/cciss_vol_status.cron
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-test -x /usr/bin/cciss_vol_status || exit 0
-
-STATUS=0
-
-if [ -d /proc/driver/cciss ]; then
-   DEVS=`awk -F: '/^cciss\/c.*d0/{print "/dev/" $1}' /proc/driver/cciss/cciss*`
-   OUTPUT=`/usr/bin/cciss_vol_status $DEVS`
-   if [ $? -ne 0 ];  then
-        printf "%s\n" "$OUTPUT"
-        exit 1
-   fi
-fi
-# FIXME: This cronjob should also look at the scsi generic nodes
-# (/dev/sg*?) to cover the hpsa driver, fibre-attached MSA1000 family
-# devices, orthehpahcisr software RAID driver (see cciss_vol_status(8)
-# about how to choose the correct nodes -- i don't use these other
-# devices, so i cannot verify how to check them cleanly)
-#
-exit 0
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 73d39d36fd2d..dcad1e348f10 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -7,5 +7,5 @@ DIST coreutils-8.31.tar.xz 5410140 BLAKE2B e3ae6be8edbe9df9164b4c9ac8bf14dc23b14
 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
 EBUILD coreutils-8.30.ebuild 6248 BLAKE2B 3fd8d6648cb5d7ca2dda584a81d8ca154c96453fc73fe6fa35b97a525d2f98ca21fb3a8237c1bc27aa769e1f5373044789b8e51a34782c57dcd268ac278624ad SHA512 7b525a7d2cf84b5af61e7ae00c8c75715ff346881bba15085b0ca17b4ad4b0678adbabeabc53ff1797e7716ea36a02bebf28d6aaa0eee42abb4f62196f2cd933
 EBUILD coreutils-8.31-r1.ebuild 5685 BLAKE2B 8adcf7ff796153278c7c81075e81b1748ec29ec9dd79338d7db87fa92344131220b812049cb0abb847a842ed653501dd22e5d5edd520a7033b10fe8f421a4815 SHA512 9775562def55e2b4cbdaad3ce68058bd8c9a2e8db8bd175ad74fe8446fad49b494d5a654c1ce8faf248310441b1f88ede613bb1ef21938a0c1a07491455ba37c
-EBUILD coreutils-8.32-r1.ebuild 5809 BLAKE2B c3584ad5a4563180b48dc23cfc87ee982361b5b770e9fe76b7c5c3b4bab8d5b3a66d0a93535b04c0db4dad525caa0b448e465dcec9af5a5bf55cc4affef01121 SHA512 16fa426898464bd9994ead9bf4e57bc57e545158a654776fe4999d6c0f439b2daa9fef8474d12f9968bdd27b7f312fd704818f6613bcec35ac66d48c4a142c26
+EBUILD coreutils-8.32-r1.ebuild 5803 BLAKE2B 6f88db044decf751d5c7941cd4150ecaa1b90c2413629319a8ec20dac9bf00dfecadddb98b30213f928bd305f22c1735bf4ed54a8874078b5cfd652d0d3a79e3 SHA512 4f395a15fdfda6bc2a7f7b11e4e4e0f4f19a9b24d1d803946798f58afa116c98084dbc2bc1b8ce0a15d71909b8a1a17a4747d2d58192164ceabd55a8817a524a
 MISC metadata.xml 958 BLAKE2B f66e780b413255fcde84ab0114e0be6d285963be305cf67bf170243d491e2677dae0e6d33eee5660dfcd6672b55cae383651f878feceffea5085aab31c83b7b6 SHA512 3e4c60dc34a3b6a74392e45bee5a075126728ccc278d61985124780f24b387ef75934c0c0bb4f647e96916d289a5f0c3eccd5411546758c67d703638af87c044
diff --git a/sys-apps/coreutils/coreutils-8.32-r1.ebuild b/sys-apps/coreutils/coreutils-8.32-r1.ebuild
index 153e7d36ac9e..b083549dbeec 100644
--- a/sys-apps/coreutils/coreutils-8.32-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.32-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~x86-linux"
 IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 6ae789e26dd2..a951a581516b 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,8 +1,4 @@
-AUX cpuid-20180519-add-spec-ctrl-output.patch 516 BLAKE2B f6c3a5c42afe5a97fd3712a9168b3d883614919a3e00c0bb671275b5227b9a4aebb8185fc27ccdfc3588db412a1234b0962987deb559c70a24afae580d04c49a SHA512 0e14946bf58eb009b65a8b849353b3940f8a13cb0a8ee1d53006b1e36e846785bad1bdeaab35e56b26faf08f5b8d81cf279cbc0de88fc5f13cb8471e8554c96a
-AUX cpuid-20180519-makefile.patch 1618 BLAKE2B ee25815c8f60b77b0e8866100d90767416414ef07e818892e4c552741bb0001b040c2e6ccdbb470fc7eefaa5f428f611d9d8feb03675d91ec603c6794e0262b5 SHA512 272391a70c4b6b31769f6ae4c4c39b942fd0fc7130729c93abd977a5d82f655e3e7513747fdf4abb238bd1ddebb11eb7925e8ebbed393a0704ad9bbef52b6da4
 AUX cpuid-20200203-makefile.patch 1341 BLAKE2B 54d2d82710d88d4f095f712b19488bdc44376aeeeb9395e7d9061ea4f8b33e4a38818937e29dbcf4f48455aca568c3d362b2898fadbfd0ba9b11edfee78878c6 SHA512 ced9f8b91c67b0a9a7aeb7f581cd101a1161810a1de0d876b417e55a56f13c775005f3879c576fed318b2f4809a40db3347dc456d73d9e529d10ff8ab51e1e79
-DIST cpuid-20180519.src.tar.gz 84784 BLAKE2B 87098145a378081d296f0473f9106e7c5b6654c2bd63d385dc27e293079adf3a527801fa644000ede53228e087e9e9afdf807a3c8d9cc8eb93826f01a5a89e9a SHA512 565738c41777669e750a2ef2e122ed0568de5ac8cc2584fa5047ba66d42eb5c3324b283bda25605e055d85402a4e2d109bc6d033ccd34243caab728465792669
 DIST cpuid-20200427.src.tar.gz 115896 BLAKE2B 0c325fe140ffb9e9d1591d414156d280ac6e802eb652f876fcb6888ea4d6cefd485bc6501179a4f7f3db33ca0fe9f64b83214f883b86bda0c8014b81916d893c SHA512 8f943ac517680c8744563f35654f5b5201fde16cfe24264d8ad171ab517b65a6f50dc569789228e095e2b485e5a0d4fe58e2a0d7f199df2b225652689e3a2e83
-EBUILD cpuid-20180519.ebuild 640 BLAKE2B c4800406ac7f031a9206013f968a945a5625a53523b9abe577d76189dd5cb4e2dff85f77af7142594c49fdd35c51450f4c65c806c11c05578f3393dfe419458e SHA512 ac7f070dc1f1df53607a705d193897312af921b61a3d9358420996ecbc112e0ecf533d3d11ecce5bbb247b1d9090d0592dcf2bf22031e86ba624e490913a9469
-EBUILD cpuid-20200427.ebuild 604 BLAKE2B 8e34b2c78d88273d214fa6df847b6db84d2dc8dcf26514f779e61a9bde540fc3b42946a5bf2b3aa51a238824d2169a08510ce942bdd21e5b0a5b7e112265bf83 SHA512 f68fc7a76850491a58891043465849feb1c71e8f79c0f8ac978dc86289d1e03c964af93cc80d08d2ba4e5ed695f51a3b5d42352a191b48bebad2bf1c93577623
+EBUILD cpuid-20200427.ebuild 602 BLAKE2B bd80e3581f4e15953ad1cfe1fdfb102729316fd9f085d06e38f82ac4f0aa3d97c7989ab2dc9a6d94269faff3b04b205a02b0f44d466e15b57e75ed95c7749d97 SHA512 c4bd77425b100a9f86b56c1c9f386df7eaab703ee44ea62d34f0ad19baac6f7d5a977ac07621615301a2d5aad2fc6b8ba9c0ea0bfef62e92d23bcff2e0c260c3
 MISC metadata.xml 637 BLAKE2B ffd825f4b6e67bff67d861d85f26fe2c3054fe7e8d0433c82faa5f5e8a1c2b75b24284b33ff4cbb9ef4ca97061077f04ef968652ff08adbfa97fa479a0cd6105 SHA512 e7b082eb434cc930af77168e31cc83c1aedc1de4d8e5f431e84325aa7c52cdd180f60aec2487b11c3c31ea6596f9caab32a44a6eb60845a5b0fc64e71c1aa799
diff --git a/sys-apps/cpuid/cpuid-20180519.ebuild b/sys-apps/cpuid/cpuid-20180519.ebuild
deleted file mode 100644
index 5150f88eecac..000000000000
--- a/sys-apps/cpuid/cpuid-20180519.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Linux tool to dump x86 CPUID information about the CPUs"
-HOMEPAGE="http://www.etallen.com/cpuid.html"
-SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="dev-lang/perl"
-DEPEND="app-arch/gzip"
-
-DOCS=( "ChangeLog" "FUTURE" )
-
-PATCHES=(
-	"${FILESDIR}/${P}-add-spec-ctrl-output.patch"
-	"${FILESDIR}/${P}-makefile.patch"
-)
-
-src_prepare() {
-	default
-
-	tc-export CC
-}
-
-src_install() {
-	emake BUILDROOT="${ED}" install
-
-	einstalldocs
-}
diff --git a/sys-apps/cpuid/cpuid-20200427.ebuild b/sys-apps/cpuid/cpuid-20200427.ebuild
index c48d21a156d2..df1d0117c3b7 100644
--- a/sys-apps/cpuid/cpuid-20200427.ebuild
+++ b/sys-apps/cpuid/cpuid-20200427.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="dev-lang/perl"
 DEPEND="app-arch/gzip"
diff --git a/sys-apps/cpuid/files/cpuid-20180519-add-spec-ctrl-output.patch b/sys-apps/cpuid/files/cpuid-20180519-add-spec-ctrl-output.patch
deleted file mode 100644
index 7cb078fe7eca..000000000000
--- a/sys-apps/cpuid/files/cpuid-20180519-add-spec-ctrl-output.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/cpuid.c	2018-05-19 14:09:29.000000000 +0200
-+++ b/cpuid.c	2019-08-08 21:53:03.000000000 +0200
-@@ -4249,6 +4249,7 @@
-           { "fast short REP MOV"                      ,  4,  4, bools },
-           { "PCONFIG"                                 , 18, 18, bools },
-           { "CET_IBT: CET indirect branch tracking"   , 20, 20, bools },
-+          { "SPEC_CTRL: Speculation Control" ,  26,  26, bools },
-       };
-    print_names(value, names, LENGTH(names, named_item),
-                /* max_len => */ 40);
diff --git a/sys-apps/cpuid/files/cpuid-20180519-makefile.patch b/sys-apps/cpuid/files/cpuid-20180519-makefile.patch
deleted file mode 100644
index e140c322fb19..000000000000
--- a/sys-apps/cpuid/files/cpuid-20180519-makefile.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/Makefile	2018-05-19 14:15:37.000000000 +0200
-+++ b/Makefile	2019-08-08 21:43:09.000000000 +0200
-@@ -1,4 +1,4 @@
--CFLAGS+=-g
-+CFLAGS+=
- CPPFLAGS?=
- LDFLAGS?=
- ifneq (,$(findstring arch=i386,$(CFLAGS)))
-@@ -36,7 +36,7 @@
- 
- BUILDROOT=
- 
--default: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz
-+default: $(PROG) cpuinfo2cpuid cpuinfo2cpuid.man
- 
- $(PROG): cpuid.c Makefile
- 	$(CC) $(CFL) $(LDFLAGS) -o $@ cpuid.c
-@@ -50,11 +50,11 @@
- cpuinfo2cpuid.man.gz: cpuinfo2cpuid.man
- 	gzip < $< > $@
- 
--install: $(PROG) $(PROG).man.gz cpuinfo2cpuid cpuinfo2cpuid.man.gz
--	install -D -s -m 755 $(PROG)              $(BUILDROOT)/usr/bin/$(PROG)
--	install -D    -m 444 $(PROG).man.gz       $(BUILDROOT)/usr/share/man/man1/$(PROG).1.gz
-+install: $(PROG) cpuinfo2cpuid
-+	install -D    -m 755 $(PROG)              $(BUILDROOT)/usr/bin/$(PROG)
-+	install -D    -m 444 $(PROG).man          $(BUILDROOT)/usr/share/man/man1/$(PROG).1
- 	install -D    -m 755 cpuinfo2cpuid        $(BUILDROOT)/usr/bin/cpuinfo2cpuid
--	install -D    -m 444 cpuinfo2cpuid.man.gz $(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1.gz
-+	install -D    -m 444 cpuinfo2cpuid.man    $(BUILDROOT)/usr/share/man/man1/cpuinfo2cpuid.1
- 
- clean:
- 	rm -f $(PROG) $(PROG).i386 $(PROG).x86_64
-@@ -71,10 +71,10 @@
- # Todd's Development rules
- 
- $(PROG).i386: cpuid.c Makefile
--	$(CC) -m32 -Wl,--hash-style=both $(CFL) $(LDFLAGS) -o $@ cpuid.c
-+	$(CC) -m32 $(CFL) -o $@ cpuid.c
- 
- $(PROG).x86_64: cpuid.c Makefile
--	$(CC) -m64 $(CFL) $(LDFLAGS) -o $@ cpuid.c
-+	$(CC) -m64 $(CFL) -o $@ cpuid.c
- 
- todd: $(PROG).i386 $(PROG).x86_64
- 	rm -f ~/.bin/execs/i586/$(PROG)
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index 8aab4751be89..d1adb546be1d 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -1,8 +1,4 @@
 AUX debianutils-3.4.2-no-bs-namespace.patch 1168 BLAKE2B 1951a40e7f3c2a872a7dbe3ecc7a1a8587af5d56ce3ffde76608ffc7d5cde099fede8b4da76247ccabd7060b0306d2311db716b12e0bd4fb6062ea782fd2dd3d SHA512 05ffb53243a178e91d67066a30039e9ccc21caabe7769e8920548c615b6d9d23959125f2fc9073cc70ba3f3502df7d780db59e4768e7add2682af98079bd6bd4
-DIST debianutils_4.11.tar.xz 157440 BLAKE2B a0238a97b2700119570ee80e4fb85c36a44ac6fa700fc927bda85bd5358ff364f19389160e4a01685c7263e8b3855b63197590dc65825002e532bfea98ef9f5c SHA512 87f6b7d9fecbaff615a5529328d384d8adf4ed69c8cc00acc54681d91fc146f4241a761dde2c9b092cb279b63d30dcaa6c2d0309ef4d29d6a2b09600c53c0ac6
-DIST debianutils_4.9.1.tar.xz 157516 BLAKE2B b2c8927e37448f4e45f19b4a7d2977198d2c610a203a2c8692a0592c8c8319c5dc42050b83435cb7381e30cc653911083b76717a53ac908113cc7388a4155167 SHA512 b442950febe6df9e15ec04a6fec0ee8be12d3eac38dc3f9331438d871e3382f4e0f599da0eaeff0e7e9ba0fa5136ce3c3b51c6718e4d7f11c1675f745052a9b1
-DIST debianutils_4.9.3.tar.xz 157404 BLAKE2B 527844c0bd623f3b560d544f6f041f7db7dc39c225333427bb81a5044975005b288cde58e9dfaf7f633f706f78e4ff33132c149cd6f0e918852f1170c0ae2c32 SHA512 6c5771c4737c48c9ca0cf01ad58102190d78ece41e66306a4bdf30cd7ea784a325df2a4a2b7ba371d9ba5aebaee8cf87286c423a8eff54dbfe8eb6de58eda532
-EBUILD debianutils-4.11.ebuild 921 BLAKE2B 7151da83405f097266befc29f8dfd828046e048bd273baa446bc2a89d1694a85c71b98daf38c17776747bdaf2902ed277873b129bd834424e7b7171361367eec SHA512 69efd86bdfa1886fdd832e8ea2461e97e586ca1dd0fe02c6ff38ba584f72cc2283fc88827174957d07ed09382b11d46a9f5bcab323bda233d71f279ef34bef2d
-EBUILD debianutils-4.9.1.ebuild 885 BLAKE2B 2cf203acd346e00c768740c894ba301e577e04d9fccd280d4b9ca3b56fe40a3ead94a0fa637b06356000c73dba6223acb69eb86942f8e656a3aeb54512b6d8a9 SHA512 16ef6859c60c1d57e67a12cc69ad1e1eebd7d4d4eaaa6db4814e73d6e08bcc06d56c4c3f5c74d55cbd12aca1aee5dbee853e816f5e278028fd5ac83b15fb59ee
-EBUILD debianutils-4.9.3.ebuild 921 BLAKE2B 7151da83405f097266befc29f8dfd828046e048bd273baa446bc2a89d1694a85c71b98daf38c17776747bdaf2902ed277873b129bd834424e7b7171361367eec SHA512 69efd86bdfa1886fdd832e8ea2461e97e586ca1dd0fe02c6ff38ba584f72cc2283fc88827174957d07ed09382b11d46a9f5bcab323bda233d71f279ef34bef2d
+DIST debianutils_4.11.1.tar.xz 157536 BLAKE2B 2093568ff6e779d25ff2960b1bc6b12bcd451eaf9ad586ee48d6a6f52bcb0d53c58cb01697eee3fe47d22bf9019fedb5e2857fc8bb358b1449f65079cab1190b SHA512 8283e42f190a9c59c54817a745e219fcc9a1f8995204d62aff84f755ace041e433fe707d3b4373060207a70c9c01d958234281061f77e6e6fb6c560c79711772
+EBUILD debianutils-4.11.1.ebuild 912 BLAKE2B ab957374835ccb707a397e8039ca176804822429e1641a3e959df05ba9fda3afbd818a7aafda525115270b750f0c7cfb952bf7d650939f6ff3ea388f80d2be3b SHA512 8f81748727bf9a8d4e3af8165f3859a544c80e96108f83c87c97ac8b3a9a2e5771b724707d7534e2409862f3803e14133c3344c16f4bb74a90db5d91579f73ae
 MISC metadata.xml 445 BLAKE2B e074fb05a82e69de19cfca5e102bd6577060cd6bbd3b5b6b7e4c8f24d8715b50abe3e7444eb04827d41f73777ab2588807b708636287271c39e14b2bcd7c90ef SHA512 b07bcaaba5700fa08a6dbd84c514ff720efd155fe442cc35a7c62b5c0b64802ca286c991f20f0d6d56b15bb6ecc097804bcee83b0d924b868e8c9106effa1db0
diff --git a/sys-apps/debianutils/debianutils-4.9.1.ebuild b/sys-apps/debianutils/debianutils-4.11.1.ebuild
index fea1a187ce2a..20486d2d14c8 100644
--- a/sys-apps/debianutils/debianutils-4.9.1.ebuild
+++ b/sys-apps/debianutils/debianutils-4.11.1.ebuild
@@ -34,9 +34,10 @@ src_install() {
 	dobin tempfile run-parts
 
 	into /usr
+	dobin ischroot
 	dosbin savelog
 
-	doman tempfile.1 run-parts.8 savelog.8
+	doman ischroot.1 tempfile.1 run-parts.8 savelog.8
 	cd debian || die
 	dodoc changelog control
 }
diff --git a/sys-apps/debianutils/debianutils-4.11.ebuild b/sys-apps/debianutils/debianutils-4.11.ebuild
deleted file mode 100644
index ecc8cf6303d4..000000000000
--- a/sys-apps/debianutils/debianutils-4.11.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="A selection of tools from Debian"
-HOMEPAGE="https://packages.qa.debian.org/d/debianutils.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="BSD GPL-2 SMAIL"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="+installkernel static"
-
-PDEPEND="
-	installkernel? (
-		|| (
-			sys-kernel/installkernel-gentoo
-			sys-kernel/installkernel-systemd-boot
-		)
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
-
-src_configure() {
-	use static && append-ldflags -static
-	default
-}
-
-src_install() {
-	into /
-	dobin tempfile run-parts
-
-	into /usr
-	dobin ischroot
-	dosbin savelog
-
-	doman ischroot.1 tempfile.1 run-parts.8 savelog.8
-	cd debian || die
-	dodoc changelog control
-}
diff --git a/sys-apps/debianutils/debianutils-4.9.3.ebuild b/sys-apps/debianutils/debianutils-4.9.3.ebuild
deleted file mode 100644
index ecc8cf6303d4..000000000000
--- a/sys-apps/debianutils/debianutils-4.9.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="A selection of tools from Debian"
-HOMEPAGE="https://packages.qa.debian.org/d/debianutils.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="BSD GPL-2 SMAIL"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
-IUSE="+installkernel static"
-
-PDEPEND="
-	installkernel? (
-		|| (
-			sys-kernel/installkernel-gentoo
-			sys-kernel/installkernel-systemd-boot
-		)
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
-
-src_configure() {
-	use static && append-ldflags -static
-	default
-}
-
-src_install() {
-	into /
-	dobin tempfile run-parts
-
-	into /usr
-	dobin ischroot
-	dosbin savelog
-
-	doman ischroot.1 tempfile.1 run-parts.8 savelog.8
-	cd debian || die
-	dodoc changelog control
-}
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 5e2566f38754..51c2c4db3c12 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,5 +1,6 @@
 DIST diffutils-3.6.tar.xz 1398296 BLAKE2B 1b0a1443f676a1c09d25ad0be4c2d936156da8e690fade9d39d94be3850c502db24c3f508178a51e817437069db2d110fb4577cd67b2cf645c11a1f26a043e3d SHA512 3c159ff1cb7c901b0a57518483566b5740ca3c45aeb8d3004089f052975481db52994cc18592c502c68b0d2a1e22f1f7830f0d8dd9a9ed86de96e28cce9f70c1
 DIST diffutils-3.7.tar.xz 1448828 BLAKE2B d9f115e0ec9b2499545a3bef4e469fb7786d4a95e0a1c8459c885c53e8b1dc797027979e42c53c2a7df4e1e224942bd9ce5214813977af2bcc67f0698ea0c647 SHA512 7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c
 EBUILD diffutils-3.6-r1.ebuild 1220 BLAKE2B 1d3dfa6fbeee65cd45cc0d7e49c508e6803ef8fd3fcba26f58b22ffece28a74d8847ab08faf2065f8ac5b3b73fb1099d7499c8b750bc0d57e1d27b3f32849f02 SHA512 5b6d7e50235b5d7329c13bddd1e08c7aa2704c98490f25ead15c211e6c0cba133ec29fc699e040ac52703e568be9e009424ca8dd39bb3f855b37dcac24bb1463
-EBUILD diffutils-3.7.ebuild 1229 BLAKE2B 442caa51227891b565ae2144de1f2379cc9719c27f6187c27173b96bd8686ed3dc432f3fb94b20ddd0c6ff5b69bca1a7c103617c427e484baf1b1a4c134cf052 SHA512 84cad36a0595d24fbc5625dd4eccd072c6a6db6bcf2ea929f09a9e1bb3abdcce02f7732dfd312ed4095193089bfe3bcb2b34d20e00c4ff8bc8a1f75031200383
+EBUILD diffutils-3.7-r1.ebuild 1204 BLAKE2B c7cc6569172c4d27f90aded32c940a571868fdb113e0950adb884b0d1b9f19971b9267ea3c587f921a29684e8ca2714256c29b30affc3b1fa9c91ec89ef91e66 SHA512 4c11973b22baddedc5ae002153b328bbc3ce2df8e58b490e63bceab490983363ead8345229a8cc59fc0f66f4193b32f10773631baef5066ed4c3bea1ebbc7f61
+EBUILD diffutils-3.7.ebuild 1220 BLAKE2B 1d3dfa6fbeee65cd45cc0d7e49c508e6803ef8fd3fcba26f58b22ffece28a74d8847ab08faf2065f8ac5b3b73fb1099d7499c8b750bc0d57e1d27b3f32849f02 SHA512 5b6d7e50235b5d7329c13bddd1e08c7aa2704c98490f25ead15c211e6c0cba133ec29fc699e040ac52703e568be9e009424ca8dd39bb3f855b37dcac24bb1463
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/diffutils/diffutils-3.7-r1.ebuild b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
new file mode 100644
index 000000000000..21da40ee701f
--- /dev/null
+++ b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="Tools to make diffs and compare files"
+HOMEPAGE="https://www.gnu.org/software/diffutils/"
+SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
+	mirror://gnu-alpha/diffutils/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls static"
+
+BDEPEND="nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_configure() {
+	use static && append-ldflags -static
+
+	# Disable automagic dependency over libsigsegv; see bug #312351.
+	export ac_cv_libsigsegv=no
+
+	# required for >=glibc-2.26, bug #653914
+	use elibc_glibc && export gl_cv_func_getopt_gnu=yes
+
+	local myeconfargs=(
+		--with-packager="Gentoo"
+		--with-packager-version="${PVR}"
+		--with-packager-bug-reports="https://bugs.gentoo.org/"
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# explicitly allow parallel testing
+	emake check
+}
diff --git a/sys-apps/diffutils/diffutils-3.7.ebuild b/sys-apps/diffutils/diffutils-3.7.ebuild
index d67de2ba9472..ad6055ecdcc8 100644
--- a/sys-apps/diffutils/diffutils-3.7.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/dstat/Manifest b/sys-apps/dstat/Manifest
index a4e6267aa40c..58fb72293333 100644
--- a/sys-apps/dstat/Manifest
+++ b/sys-apps/dstat/Manifest
@@ -1,9 +1,11 @@
 AUX dstat-0.7.3-skip-non-sandbox-tests.patch 705 BLAKE2B 3a20e75fd1aaed47d02066b7c889c13b4e1d8a2f8fd9772973d99736eb7cdf1fa9b8c04126beace166a6ac65de5de8743b904e9fa20d60a3aeae706f7ca41d18 SHA512 efa1c6a807efc7fabf8566ec446be94922e1fe78191101648dc066f107474f1b89c4c8cac51d6d1ba7d4b1061ce0358abf317761ce52199479667da1684f0929
+AUX dstat-0.7.4-fix-csv-output.patch 888 BLAKE2B 6aa25d7b7c2fed6986be55bf5802692ca6fd9d982d9b0a819983fbff3745c5aaf12667bd0e5cd2e385c8f4583273feff2744ba015b04fe1c8545b388ab828dc4 SHA512 4e68c320983c5e1851dcf6e51d2d0e1de92e084310fb650f0bf7ddae68d6b923f9a013003ca91f98f513e9ae135c1800582f214d70f65f5e8b5809e9bda6600a
 AUX dstat-0.7.4-skip-non-sandbox-tests.patch 661 BLAKE2B 31f98e58c8f23e3b6322de86bdddb83afa22b0b8bed48164378c6c071348ac2a37350b789985634017c1e338ceb73d7f9221d99e0b8b4b4d550f10d7840bde76 SHA512 0087d7fa2ce9388440bacdac52038433c1a7f0c5fd885027a4b18895c8f450cc7cae7610e6232e26393749f1b165c4ade5ee2a0e453c7e2542450f5a3d3100ac
 AUX fix-collections-deprecation-warning.patch 899 BLAKE2B ec02bf38b8c40f8f018ba6da523da24f9215dfd7c967dbfc2384ea16ab9b01489a7d69cd99d81ddb1222e75e6d070e40d435e1d12ad8ea2961e447721d9656bc SHA512 4164f61a1ef97f2a4962f84138305b68cdbc9fcc5c639fade7b580c9f9904d592af9e05982536cd2bea5581c30696a0308dedbe6f739f0094c319bc85d547fea
 DIST dstat-0.7.3.tar.gz 135583 BLAKE2B c846a06b6039e49944d43cc36178fed74fd4e0e3a1a4418dbe0e5987763995eb36dff0245cfa7107d446b8ac2ea500e13980f87e97aa8e5b8d566ee188be1639 SHA512 db37cc8bb7afd235ae9088e76c4defaa4d76651b111fbfdcd0980bc96376de20d57964912799a413397a79651730503bdeb8fea5cb97ab4d6d81632f528aefd2
 DIST dstat-0.7.4.tar.gz 139992 BLAKE2B c8226358956687a4f64e248ef539b431b9e394e87986366f9941df2e86f0dac3032261ec2ca9c816d3bc89afabc352bc8bc80f9ad3eaa6118fd16bd7b0f1e68e SHA512 d100223887ebd83d0fd1259436f39419a85df9002556abcfc8e4195aa63be73d85707dcd5c4fb56a979b29131485dce6e97c177fbfca08dc50bd0f92b15cc6f5
 EBUILD dstat-0.7.3.ebuild 865 BLAKE2B 60f79ac34d777a864ad9aaa154346323b7818e219833ff152597cf1f148f60439e19430e303b0ca3fc66c69538fde1d3744d91246fe5779644a73c77558fe52a SHA512 b4462000fcd9ff5554f6e3c5571997e0db595613efb13eaf7fe2a722a79e5115046039fd09ecac7578b661c6aec15a4180ff53f87dee51e17b3b9e11f95cfbe0
 EBUILD dstat-0.7.4-r1.ebuild 1269 BLAKE2B bf9547eff38162ee495b8e8efe8c6180c8c983349d67452379ee32999d4daf5bc77f91db16ca6c2427ab995da6a8057fef81cc39a91ecb68931772dfeb8533f4 SHA512 90cfcbc53830b7b194992e81c81a1c5629111ab5619eb12645873284b8c0604c1dfc6023712ae15a0c9aedf9ac5f4d5bd47361a148d37609d66b419154456fe4
+EBUILD dstat-0.7.4-r2.ebuild 1259 BLAKE2B c839f4ae6c0dd3734a8954a40ee7b4bcf4d4f7c6508a86e97bfbd86f08c003d97ce524fe9a2ac28e9d7ecb9e8b2533875d3b855491db323358409557561e67d1 SHA512 29416045e5f7c956b5ef0bcca1736b8b35b74b32dfc28eaeb102ba8d13b0103f6b5d2761274844d002358872da5e20ccb80031b7fb7c257a98c8c346601d516b
 EBUILD dstat-0.7.4.ebuild 1160 BLAKE2B a2b25f7361ea74b2432efeaebeaf095e809c52c46b978d7fdca1c429c47e1ef5d2d77fcdbb19544d6524b2a8f349dc85882d1f323c62681794d15ffd4976a88e SHA512 ad500b7419422236bd4d09795eab2b13e524c0019a9dd11d340201dfa37f5edab781eb37bdf29f46ef734dcac489b467174eb9afc92f281f88a33714e3764f77
 MISC metadata.xml 867 BLAKE2B 11beeb2f2c4f397a0be3f5c97351be3d0ad6a3d54132c8a354ee405ca429d99b0d8983ca844e4d07d4d25d3be2642f6b1c4cd47068d91bebf89b5637ea86a7ef SHA512 751ac86ff9b2aa7435743d9fff4d44a1c34a9e6bbd568c3637f2f32564723c45d8de84840b90372cd809a6d9edf7ddd706927e24d6611583ea33d7be17eef1f9
diff --git a/sys-apps/dstat/dstat-0.7.4-r2.ebuild b/sys-apps/dstat/dstat-0.7.4-r2.ebuild
new file mode 100644
index 000000000000..6116fd501610
--- /dev/null
+++ b/sys-apps/dstat/dstat-0.7.4-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit python-r1
+
+DESCRIPTION="Versatile replacement for vmstat, iostat and ifstat"
+HOMEPAGE="http://dag.wieers.com/home-made/dstat/"
+SRC_URI="https://github.com/dagwieers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+IUSE="doc examples"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/dstat-${PV}-skip-non-sandbox-tests.patch"
+	"${FILESDIR}/fix-collections-deprecation-warning.patch"
+	"${FILESDIR}/dstat-0.7.4-fix-csv-output.patch"
+)
+
+src_prepare() {
+
+	# bug fix: allow delay to be specified
+	# backport from: https://github.com/dagwieers/dstat/pull/167/files
+	sed -i -e 's; / op\.delay; // op.delay;' "dstat" || die
+
+	default
+}
+
+src_install() {
+	python_foreach_impl python_doscript dstat
+
+	insinto /usr/share/dstat
+	newins dstat dstat.py
+	doins plugins/dstat_*.py
+
+	doman docs/dstat.1
+
+	einstalldocs
+
+	if use examples; then
+		dodoc examples/{mstat,read}.py
+	fi
+	if use doc; then
+		dodoc docs/*.html
+	fi
+}
diff --git a/sys-apps/dstat/files/dstat-0.7.4-fix-csv-output.patch b/sys-apps/dstat/files/dstat-0.7.4-fix-csv-output.patch
new file mode 100644
index 000000000000..e44125b0e469
--- /dev/null
+++ b/sys-apps/dstat/files/dstat-0.7.4-fix-csv-output.patch
@@ -0,0 +1,21 @@
+https://serverfault.com/questions/996996/dstat-fails-to-start-trying-to-load-python3s-csv
+
+diff --git a/dstat b/dstat
+index 9359965..1682fb5 100755
+--- a/dstat
++++ b/dstat
+@@ -541,12 +541,12 @@ class dstat:
+ 
+         line = ''
+         for i, name in enumerate(self.vars):
+-            if isinstance(self.val[name], types.ListType) or isinstance(self.val[name], types.TupleType):
++            if isinstance(self.val[name], (tuple, list)):
+                 for j, val in enumerate(self.val[name]):
+                     line = line + printcsv(val)
+                     if j + 1 != len(self.val[name]):
+                         line = line + char['sep']
+-            elif isinstance(self.val[name], types.StringType):
++            elif isinstance(self.val[name], str):
+                 line = line + self.val[name]
+             else:
+                 line = line + printcsv(self.val[name])
diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index 69538b2ecf37..96d6a229d180 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -2,6 +2,9 @@ AUX dtc-1.4.4-posix-shell.patch 1232 BLAKE2B eadb56c06e7ff7699d462e3c4c50d1f2c6e
 AUX dtc-1.5.0-fdt_check_full-visibility.patch 259 BLAKE2B db9ba9d714c16c07d3b138e1cb50d39dcb991f98bdb8b1c819018827f143e9554621c7eb2dc42b746076a39cce6f66246f8e1d304a45b91c5ee42c3b04d6b596 SHA512 49d11a3b85342ecc81f7af167439c216dcd9b94621ac2ceb8ffcb96775164b65a11047dce7b19352d73621c587c1d0c242179542c98d87a1772e7b6e3424d9a0
 AUX dtc-1.5.0-gcc-10.patch 1693 BLAKE2B 4887f0fc548343605930dc434a1a426435446d0c1d44cbf633218aa3cf90001bb97142b4a6851d5a163b893f138bd282f18d47278a1d782647c4ba1fae46be50 SHA512 2b0cf9e111b461684da7900f7f13062514c46be4c071f39ae7895be56456d80fa6a73a3798f533017a14d769194eca5458504fdebc1c9740eab149c5a2f29811
 DIST dtc-1.5.0.tar.xz 152936 BLAKE2B 4ad9cf8f8fd0ccde0c7b8b66c0039eb9b012ed26e51387c06c03fa7950ca194878bbb23b50be5b80c4d4e18140d6316092a9f0eea87e5d713856635dcfc1b0ec SHA512 fd1e692a1b7bf7987f921ad17d9be6719f7b3aa7915873b45fa86f4ecb1398a0a62cdf53c1fddf98a0f7fed9bf34a79f684018bd01a2b5e88746b50879bf7102
-EBUILD dtc-1.5.0.ebuild 1286 BLAKE2B 6e0ce034cbbc4934a2d05a74a7cdbc4928fa08364883a00d20e916e9b41b96be27db8c423d92af519bff28115980b0d3417c0c574a6bba60cebc54cf41eb3080 SHA512 66fe6ccf274a83d98595fc952eec76732dfb6ea935b398aef92a056a87e8f6e828b1eab7600c909303681bd854611d0d74d5a716ca8487954c2658e6fcbf92cb
-EBUILD dtc-9999.ebuild 1185 BLAKE2B 0acd0e3949624defcb575043ab9fca611ed7a0aa382e1f29634a5fa1c9b1e343b378e3e3c8519fb46d716ab5053d5c588742f92fcc4eae2600aa4586aa712c0f SHA512 4e82ae7cd17e6c3f02c759165945f5499f989e8385f4a9a0ce04ad96222b16763ee31ce491f309227f05c99c979319b65e86e4c39eac60ce2bae0a72006435c0
-MISC metadata.xml 416 BLAKE2B 550a9af835cd395d8cc77230f5ee6e7dcd0ff70c3290af7771bb04e5c5c6a9b5508c634555a4444e6bdac9ad007ff2bed10a05dfee57db432eb1fcf15ef57022 SHA512 7d9e26636a6fb8c5bd06cc06c837b42643313be040b2a36ff09056d81a0e75608a4593f37bb7fb2471d5e4eec5db3bd12cb8f3ddce49a8036122c2c1d8fe5187
+DIST dtc-1.6.0.tar.xz 158584 BLAKE2B 47b15b5df7f5d87369d6daaad87f2989a80865f2fab19f89d050d390a9f8319bcd86a36e12f7cc8d62947bb4d1335769071d0e3ea0a6e16861aea163e78f4696 SHA512 15433b24f1d6b7ed1f8066d050bd1bcbf988731aa38147564e3dd04b5f69af8d69e03befdc621a768526c620425a9bdd24aad4f9ff135930d6a1eeb0625f7de3
+EBUILD dtc-1.5.0-r2.ebuild 1663 BLAKE2B a819481eb057a777ff6f405b06a90c0af5e45f27d644b71835954af2e1f5fcb6a268a1553fba2119058516df17120da7221fc5a85fcc4e1da7dcc8a1bd784555 SHA512 7feab3bfbe64fda933b8034e1aee397244e7937502fea343512f6908709e9ae746aa43cbb8b25ba27ffb94ff90269a3d881cd08fdf9a764c05ed0bd90a2fdd4d
+EBUILD dtc-1.5.0.ebuild 1296 BLAKE2B c233996dc4f35d0ba521de4ede3a3eb37533c8cfd7655dac83602c70cb55093fa631e16785469ad41244dbf61836ef4cabf541ec166694c34e8960b0576f75ad SHA512 7b5dacd6a422da8e2353047f36cf47269a473e4c39809e0b71401e99bc27b7d37a2be743afe033fe444f00ed244e329bc82999d3cfef005504a3024160e918d1
+EBUILD dtc-1.6.0.ebuild 1506 BLAKE2B e5a5878e19541b6e4072b448e0fdda5538a6a7a5db03d7d9ce7e692894a851728cfe88c1993837c110302acdfc2ee1bc14f1565c230e4daf295e54631f97c573 SHA512 11061dea5cdd017080d32a56f4aefa534d67de2d816249ef570f924ce02866d8fe5cb1d72697142e22dead7f9d4bb9c51da0d17afc6977abb6ea76d86fdccc76
+EBUILD dtc-9999.ebuild 1506 BLAKE2B e5a5878e19541b6e4072b448e0fdda5538a6a7a5db03d7d9ce7e692894a851728cfe88c1993837c110302acdfc2ee1bc14f1565c230e4daf295e54631f97c573 SHA512 11061dea5cdd017080d32a56f4aefa534d67de2d816249ef570f924ce02866d8fe5cb1d72697142e22dead7f9d4bb9c51da0d17afc6977abb6ea76d86fdccc76
+MISC metadata.xml 491 BLAKE2B e57c27c911b37572b2836c634b03b2fb52bae256c22972af19637113f467e3eaa270e8dca070dbb9522495db5bad1f1b4441fcaae9d47e7eff8efd0b4127628a SHA512 9e328b8fd47363cf6caaf40832df015d9055ae746118dd9c501311af24a12d5377781cfb2ad8d42d2c82539709597310c1dbded4e522d0b0272b23859735506a
diff --git a/sys-apps/dtc/dtc-1.5.0-r2.ebuild b/sys-apps/dtc/dtc-1.5.0-r2.ebuild
new file mode 100644
index 000000000000..ac119788204b
--- /dev/null
+++ b/sys-apps/dtc/dtc-1.5.0-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib toolchain-funcs eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/dtc/dtc.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Open Firmware device tree compiler"
+HOMEPAGE="https://devicetree.org/ https://git.kernel.org/cgit/utils/dtc/dtc.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static-libs yaml"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="yaml? ( dev-libs/libyaml )"
+DEPEND="${RDEPEND}"
+
+DOCS="
+	Documentation/dt-object-internal.txt
+	Documentation/dts-format.txt
+	Documentation/manual.txt
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.4-posix-shell.patch
+	"${FILESDIR}"/${PN}-1.5.0-fdt_check_full-visibility.patch
+	"${FILESDIR}"/${PN}-1.5.0-gcc-10.patch
+)
+
+_emake() {
+	# valgrind is used only in 'make checkm'
+	emake \
+		NO_PYTHON=1 \
+		NO_VALGRIND=1 \
+		NO_YAML=$(usex !yaml 1 0) \
+		\
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		\
+		V=1 \
+		\
+		PREFIX="${EPREFIX}/usr" \
+		\
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		\
+		"$@"
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/^CFLAGS =/s:=:+=:' \
+		-e '/^CPPFLAGS =/s:=:+=:' \
+		-e 's:-Werror::' \
+		-e 's:-g -Os::' \
+		Makefile || die
+
+	tc-export AR CC PKG_CONFIG
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake check
+}
+
+src_install() {
+	_emake DESTDIR="${D}" install
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+}
diff --git a/sys-apps/dtc/dtc-1.5.0.ebuild b/sys-apps/dtc/dtc-1.5.0.ebuild
index 7abe2f748886..f2284dee2e44 100644
--- a/sys-apps/dtc/dtc-1.5.0.ebuild
+++ b/sys-apps/dtc/dtc-1.5.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Open Firmware device tree compiler"
@@ -47,7 +47,7 @@ src_prepare() {
 		-e "/^LIBDIR =/s:=.*:= \$(PREFIX)/$(get_libdir):" \
 		Makefile || die
 
-	tc-export AR CC
+	tc-export AR CC PKG_CONFIG
 	export V=1
 }
 
diff --git a/sys-apps/dtc/dtc-1.6.0.ebuild b/sys-apps/dtc/dtc-1.6.0.ebuild
new file mode 100644
index 000000000000..5d8cb20a5b37
--- /dev/null
+++ b/sys-apps/dtc/dtc-1.6.0.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib toolchain-funcs eutils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/dtc/dtc.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Open Firmware device tree compiler"
+HOMEPAGE="https://devicetree.org/ https://git.kernel.org/cgit/utils/dtc/dtc.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="static-libs yaml"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+RDEPEND="yaml? ( dev-libs/libyaml )"
+DEPEND="${RDEPEND}"
+
+DOCS="
+	Documentation/dt-object-internal.txt
+	Documentation/dts-format.txt
+	Documentation/manual.txt
+"
+
+_emake() {
+	# valgrind is used only in 'make checkm'
+	emake \
+		NO_PYTHON=1 \
+		NO_VALGRIND=1 \
+		NO_YAML=$(usex !yaml 1 0) \
+		\
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		\
+		V=1 \
+		\
+		PREFIX="${EPREFIX}/usr" \
+		\
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		\
+		"$@"
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/^CFLAGS =/s:=:+=:' \
+		-e '/^CPPFLAGS =/s:=:+=:' \
+		-e 's:-Werror::' \
+		-e 's:-g -Os::' \
+		Makefile || die
+
+	tc-export AR CC PKG_CONFIG
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake check
+}
+
+src_install() {
+	_emake DESTDIR="${D}" install
+
+	use static-libs || find "${ED}" -name '*.a' -delete
+}
diff --git a/sys-apps/dtc/dtc-9999.ebuild b/sys-apps/dtc/dtc-9999.ebuild
index d60b43b0b331..5d8cb20a5b37 100644
--- a/sys-apps/dtc/dtc-9999.ebuild
+++ b/sys-apps/dtc/dtc-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit multilib toolchain-funcs eutils
 
 if [[ ${PV} == "9999" ]] ; then
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Open Firmware device tree compiler"
@@ -17,21 +17,41 @@ HOMEPAGE="https://devicetree.org/ https://git.kernel.org/cgit/utils/dtc/dtc.git/
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="static-libs"
+IUSE="static-libs yaml"
 
-DEPEND="
+BDEPEND="
 	sys-devel/bison
 	sys-devel/flex
+	virtual/pkgconfig
 "
+RDEPEND="yaml? ( dev-libs/libyaml )"
+DEPEND="${RDEPEND}"
+
 DOCS="
 	Documentation/dt-object-internal.txt
 	Documentation/dts-format.txt
 	Documentation/manual.txt
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.4-posix-shell.patch
-)
+_emake() {
+	# valgrind is used only in 'make checkm'
+	emake \
+		NO_PYTHON=1 \
+		NO_VALGRIND=1 \
+		NO_YAML=$(usex !yaml 1 0) \
+		\
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		\
+		V=1 \
+		\
+		PREFIX="${EPREFIX}/usr" \
+		\
+		LIBDIR="\$(PREFIX)/$(get_libdir)" \
+		\
+		"$@"
+}
 
 src_prepare() {
 	default
@@ -41,16 +61,21 @@ src_prepare() {
 		-e '/^CPPFLAGS =/s:=:+=:' \
 		-e 's:-Werror::' \
 		-e 's:-g -Os::' \
-		-e "/^PREFIX =/s:=.*:= ${EPREFIX}/usr:" \
-		-e "/^LIBDIR =/s:=.*:= \$(PREFIX)/$(get_libdir):" \
 		Makefile || die
 
-	tc-export AR CC
-	export V=1
+	tc-export AR CC PKG_CONFIG
+}
+
+src_compile() {
+	_emake
+}
+
+src_test() {
+	_emake check
 }
 
 src_install() {
-	default
+	_emake DESTDIR="${D}" install
 
 	use static-libs || find "${ED}" -name '*.a' -delete
 }
diff --git a/sys-apps/dtc/metadata.xml b/sys-apps/dtc/metadata.xml
index 9d02ff2575d4..17bad4a3b9b4 100644
--- a/sys-apps/dtc/metadata.xml
+++ b/sys-apps/dtc/metadata.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>lu_zero@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-	<email>ppc@gentoo.org</email>
-	<name>Gentoo Linux PowerPC Development</name>
-</maintainer>
-<upstream>
-	<remote-id type="cpe">cpe:/a:dtc_project:dtc</remote-id>
-</upstream>
+	<maintainer type="person">
+		<email>lu_zero@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>embedded@gentoo.org</email>
+		<name>Embedded Gentoo</name>
+	</maintainer>
+	<use>
+		<flag name="yaml">support .yaml-encoded device trees</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:dtc_project:dtc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index 3baab9780cd9..c926c8684831 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,5 +1,5 @@
 DIST ed-1.15.tar.xz 67924 BLAKE2B 89a5614e528f974853d8c23060b77a872ae34675f6898b713543109d3a21d0d42b4d07fea5e86e842a34619617d342058ebb82655088320764295422f700fdc4 SHA512 b723353d4f2a1e719b79cb210750596c723be87c282ab96285524eb707d5ae15c242b2d7b0a282ce2ebd0aaf221cd2be41897e79f8fc17f10e9e318a9be487a0
 DIST ed-1.16.tar.xz 68432 BLAKE2B 222ab30f72fb466372cd7ced75807e9324a916ca5962c6829d562476ae1d9ae9c01235a130e58f952bd6029b931f6362d2a695b35963ca32bb3cfa539dceab0d SHA512 45b29fb86c7e7d8569c02c8177a9c7f7e691e08e913bc07b301b34210b6dc27377858ce60dd695feb950ef436c86d7059ade90396364c95aefa3c1e7a9d3a2a4
 EBUILD ed-1.15-r1.ebuild 940 BLAKE2B fc9db3e1436b6b2029b9975b325af87e4a55361b6b359b4342e5d6f13251d21c4903e6dbbb8f45f7629f8507f4ee1f222b20b2c3f47b8919bd53484614fcba4d SHA512 4a1f7a922a10f9e3c6278f3cc633fd5ceb61409247ff39cbb6adf9aeb125ebf71c66466093be701bba4a6b1d0b478c00f22a820ccbde5753c17f935eac15c85b
-EBUILD ed-1.16.ebuild 1028 BLAKE2B fdcf538eabc2ae84db780bbc212e874fed26a1d627755de9e9cc668d56d8046c61d8e69cd2f3bc0214cfeb260e13924e6087b1e8f8dd731df5a2b7fec7569efd SHA512 1bb48e14e9905a989f3c1e3df2b1622a40ed727d2e3b962276e2da567e8732bbc3b1a8b1363e302b678b8ad9ac3e462ed6e7cc6257fc202d290b88238652c5e1
+EBUILD ed-1.16.ebuild 1021 BLAKE2B 9fe185b453f812c84d385cfc45b16486d278a1f2192c426333a2425d42a9923ef4e976b2c6512e8f961800ca4020b81f9cd3a1737fdce71824b6c1d498e6bdc9 SHA512 a6181209ba7ecce1ad22a25724b7f2d0a16f08966438528f462a306fefe5e35e9bf8ba94f2c5c93ddefb81ef8392ec4973bd58fcce82ac4a103b01bf432b4258
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/ed/ed-1.16.ebuild b/sys-apps/ed/ed-1.16.ebuild
index d558c52fa98a..818a0ec2f921 100644
--- a/sys-apps/ed/ed-1.16.ebuild
+++ b/sys-apps/ed/ed-1.16.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="sys-apps/texinfo"
diff --git a/sys-apps/edid-decode/Manifest b/sys-apps/edid-decode/Manifest
index bd84d39bbad1..d66f0c6d3848 100644
--- a/sys-apps/edid-decode/Manifest
+++ b/sys-apps/edid-decode/Manifest
@@ -1,6 +1,6 @@
-DIST edid-decode-0_pre20191209.tar.gz 57651 BLAKE2B 2a8717547939b7ff25482edc00a158c1cb3ff162b6e450549a274a10b10678fabf20529c9e97a455f6d4bfaf6dcb1db54c38cea3908761432bcd4d15e58271d1 SHA512 8d4c6a15538da1720f0e6c8fc4f9f3f64e6ade0e217a6860016167eb14f752e60bbfe69979f25189979fbc6405b417e8f1a9bf9f2a75a299b4914ce1827b680f
 DIST edid-decode-0_pre20200422.tar.gz 88332 BLAKE2B 1458e9045adbdd20a95061460fc8a646e4f04428cd7d64b177b8b6bd4d67109f9ca6103227bf72280bb22718ae5fd4922a598114f811492435b45db1fd806100 SHA512 7ea4861b40e131a716322dfae50cc83b44d9a716a6272994cf66969d997f0fc330781ce763ce1fe8f08e22ba9d0d2d5394d6aa63686bc954f2296639bd2bc677
-EBUILD edid-decode-0_pre20191209.ebuild 688 BLAKE2B d31ea5d6c5a720c5bf49e497ad4c67e55ea680e8a709bcef4f50852064f6804362db50f160ff98c9586d4d6a6f60cddfc469484e7483121bc60000872e6d733c SHA512 8441172b6ff136a915d31affe79ffed15a1a14f904aa253966690d7813790d45311326f1a85b9fb8299963b88a838b8eb985287478d4f27162eee0953f517a3b
-EBUILD edid-decode-0_pre20200422.ebuild 690 BLAKE2B 17ec2a87091ddda4b9ac46a3cfef3c986284f6e6bf6c53d433a391496d59c764aa26191a191a10105523cf273dd5fdff0c264b02baf6e330d05917c512f32bfa SHA512 818699e0aacd6f43716e52ae898b540c5634ac9fb55532e90b066b21431690d96c4871a5023ba40a557cb9a390d9c24bda4a29c5a007c6432542136e4cc7b976
+DIST edid-decode-0_pre20200720.tar.gz 102525 BLAKE2B 57b296987ef890c9d4dd46d432730ffab5adfb758be4e1bcc7b6b5e34fc3fae42901da98c302c4a1742d39274b295b8b639012e4b848ed48ab0ee69cbc45b98a SHA512 4545c3a2263587eaf98cab0a3ec109659b50478b17e2ee51605ae53b1475761aee16f4c6e1549889016359cfce3de03cd907c3e801f12021e7459f25cebfdccb
+EBUILD edid-decode-0_pre20200422.ebuild 688 BLAKE2B 0d4cf39fcd6cd213cf2598b38eced501bdb962185a2657663355f4f5ecfb061b035ced285312bd8a2553cecdc3e3f933e07ffd779e08cdadb2a974baad86b3d5 SHA512 d0abef9e136ed9eeb28e79e9327d4740094be3d704137ac35e8c96d942925c43c53e33873a39f05e4f388d386690e0a1f0c43c60072f1b3bad1d941f3dbc1dbb
+EBUILD edid-decode-0_pre20200720.ebuild 690 BLAKE2B 61803f0af301c161c7ff8bd07cca19b0124ddec000cdaa726d654343ed2d6b30dcacf1b0672da03138c653a366f8ebf012e4617d781502e3e4ffe5fb03412832 SHA512 8850f45eb884bca4ca47c9e066a1093f2634bedd4390c10f25e4b766898decc4efe3201fa2c8e48e90c970d05c0dca98c4f2ce04c0f9ac83d0552e9094134c0a
 EBUILD edid-decode-9999.ebuild 550 BLAKE2B 6e79eb700ebfe891bcd2f5451ecb80a27bcbb29af23d0126f5105f984372986c23527e7781b5f5db1737fd1c6c3efe8688e2de6c84e1515f7ad6cbaf7b783739 SHA512 c913ea25760f4ef10d56c1467f3de2a9c79bac6f0f25768989207aab8354dc0fa8903d100773fb81cfdc0118d8ae6762ab9436db11c0cfba7e270fbd17bc3d76
 MISC metadata.xml 646 BLAKE2B 37a3db350195905c7a4b420d0d2d2d4741cca1b3954d42620a9a411696a734702e145bde400c4d68997aedd0de45d418faacb1d132ab385f8454f7f5c0039260 SHA512 95293d61feeeca16b0341a5c5fad464db4fca0d2dcfc9b7f51cb3d2984f3ff4530d2938d80ecdf658fc2c784368166bc5fbd220787de6564938ee2171f1816e2
diff --git a/sys-apps/edid-decode/edid-decode-0_pre20200422.ebuild b/sys-apps/edid-decode/edid-decode-0_pre20200422.ebuild
index 3458cbf665d5..3c3480be14f2 100644
--- a/sys-apps/edid-decode/edid-decode-0_pre20200422.ebuild
+++ b/sys-apps/edid-decode/edid-decode-0_pre20200422.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Decode EDID data in a human-readable format"
 HOMEPAGE="https://git.linuxtv.org/edid-decode.git/"
 SRC_URI="https://dev.gentoo.org/~conikost/files/${MY_P}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="examples"
diff --git a/sys-apps/edid-decode/edid-decode-0_pre20191209.ebuild b/sys-apps/edid-decode/edid-decode-0_pre20200720.ebuild
index 2175fb057e47..99543090a86f 100644
--- a/sys-apps/edid-decode/edid-decode-0_pre20191209.ebuild
+++ b/sys-apps/edid-decode/edid-decode-0_pre20200720.ebuild
@@ -5,14 +5,14 @@ EAPI=7
 
 inherit toolchain-funcs
 
-EGIT_COMMIT="e719d04077d098eb51d9494f41060eba2419d4bc"
+EGIT_COMMIT="56dd103a0c20724ee956950f5bcb8cc1c8667af9"
 MY_P="${PN}-${EGIT_COMMIT}"
 
 DESCRIPTION="Decode EDID data in a human-readable format"
 HOMEPAGE="https://git.linuxtv.org/edid-decode.git/"
 SRC_URI="https://dev.gentoo.org/~conikost/files/${MY_P}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="examples"
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index 453a2dccb67e..6a0e0c24451f 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -1,7 +1,10 @@
+AUX ethtool-5.8-avoid_bashisms.patch 674 BLAKE2B 75b1fdd5980b91348eed8dbbfae00855e2c7f66e2ef4f95b2c8bc679b7d6759358c4d464825956bbb8ab01773d23af7cbe5bdc98eed856baa4589ac44b2cc172 SHA512 0755b7c05026935762b89ff58c083b4dbcc02227400285b0b64e5421f02c2c9c1fb373c8ba43eabe3d38110898fcdbbf664d6f1aff6e28d33759489339d1262b
 DIST ethtool-5.4.tar.xz 239288 BLAKE2B 8c8b2bee53fe3e71510684ca7c6f64153cb6f1c5ebe44cd4d1dc351885d2d9957eb206a96bda9efadb5faa0e15a3f0ba07923d7e29b27694e3e3f605151a940d SHA512 c7bfe7eae2ba207d710716274e9f5ae275c57d0bebc0a9acb95677125e64f1b42ef610032011fb59894aab46973988bad40fddbc5ccc238893e7da66f913255b
 DIST ethtool-5.6.tar.xz 281084 BLAKE2B 1fecc52e9031a3d13cbe6b3c508ebd7fc6dc03b02d4126b3ddd9ef40eedbef151b66f52e80b6570d45ebba09437b587124d2c22817da7d4f3658bd1ff1d3c8a1 SHA512 9308f8e4a297d842a7a5a51419e408951e669da1f58cb1eed41f52be4cd2f32f811d1d19e9bee59d8297938a6d5a4abff2b9bbf789d0c49ed5074a78826d3199
 DIST ethtool-5.7.tar.xz 283048 BLAKE2B 1f265ea452ec0d37b4bd4bb4e602a27d2d26144d750940b2c61638524626fffb59c3fbf054472e31ff755260d7cce8f6cdc31ef74a512a3656830b546b4bbe6d SHA512 195e24c48201412e0eaad7d7ca4e530c3a8cf50f3518cfe49d299fd091cf9198007c5d23be95109c735ceb2ccad37ac9f2e9cde0fb36ea426ab17b1dd064d4a9
+DIST ethtool-5.8.tar.xz 299416 BLAKE2B ea7433205eba831b6ba56e140c73cfe283cc5dc56ced963414a017b0d6b6fbde9d0195ff64ebdc060351e5e9844af8beb8f00f7e04d76b04f958b166cda7e589 SHA512 5eada909f82573ad93bc5476e6f8d50f68ce2c9948558877eb6ace8dc17aee895b2f27343592f5f23eaef0e0fc70b5f776f76e75d9614bab305a2819ca82370e
 EBUILD ethtool-5.4.ebuild 457 BLAKE2B ce0d2ef607cc8970596e8a27c677eaa8ca24d03c41d879f107a6c0981ef33cdc75b1a6f63ca402467d0e02a39e253866995867b2242e1f4a5c205bf19011129b SHA512 28e8a1049a95e8d6ab2ea8b2728af57c57c4e271cb1648059289bd176143607b7a332d9efb455f8ed86a1882ff779f1bd6c2d03555c02feb84c24f64bde5be9d
 EBUILD ethtool-5.6-r1.ebuild 570 BLAKE2B c356433d45fc4d07c2b5cf18c9f27da07fa33ef34d01a3ba4831a194906673e984eb85dbabf17d60ce4ed8b1fc639b890ab68f29cbf2f137077358911ac5a04b SHA512 20bd3dfbd68e9fe25c913e9a90f75745b3741d9a1fa20a66a19a3ca85566a131afff582a686ce45dd1f212c8cf60b843e4c3aedff5142be3797bdeca51c4791f
 EBUILD ethtool-5.7.ebuild 570 BLAKE2B c356433d45fc4d07c2b5cf18c9f27da07fa33ef34d01a3ba4831a194906673e984eb85dbabf17d60ce4ed8b1fc639b890ab68f29cbf2f137077358911ac5a04b SHA512 20bd3dfbd68e9fe25c913e9a90f75745b3741d9a1fa20a66a19a3ca85566a131afff582a686ce45dd1f212c8cf60b843e4c3aedff5142be3797bdeca51c4791f
+EBUILD ethtool-5.8.ebuild 624 BLAKE2B c59e501e26f33c7e4910be6018a5b875fe46656661a401934078c94d9d5b0b7aac4d426c88dab22d8f1da0b8fcbf74f5593f8b86fce10b9370f069429c017404 SHA512 9b0a10a330f386420b724f62801cc6ea4cbd4005681d9f7b2b54f5f564b969bba6b48bcd7e203543f8b4753bb63345117de59663d61cfc4d3e21eaef29436b4d
 MISC metadata.xml 992 BLAKE2B e549f4afab6b9e4642ccbf9b14f95e7182f6b2d8a9bb0913a30372ea1ff0be92e7a119e708741932ba90183bdd40d2bc314f980e61437b974a6ae590f3598186 SHA512 73a3fe59ca21626b769dc63e428761d33c9796fce642e2da48805a8d4ad59b103a3c7a6a1b17788bfed35ed79fc1e4adad265a16676cb03df0e19e6a6615a69b
diff --git a/sys-apps/ethtool/ethtool-5.8.ebuild b/sys-apps/ethtool/ethtool-5.8.ebuild
new file mode 100644
index 000000000000..b27b41a4f57e
--- /dev/null
+++ b/sys-apps/ethtool/ethtool-5.8.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Utility for examining and tuning ethernet-based network interfaces"
+HOMEPAGE="https://www.kernel.org/pub/software/network/ethtool/"
+SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
+IUSE="+netlink"
+
+DEPEND="app-arch/xz-utils"
+RDEPEND="netlink? ( net-libs/libmnl )"
+
+PATCHES=( "${FILESDIR}/${PN}-5.8-avoid_bashisms.patch" )
+
+src_configure() {
+	econf $(use_enable netlink)
+}
diff --git a/sys-apps/ethtool/files/ethtool-5.8-avoid_bashisms.patch b/sys-apps/ethtool/files/ethtool-5.8-avoid_bashisms.patch
new file mode 100644
index 000000000000..9cd9fd86fb70
--- /dev/null
+++ b/sys-apps/ethtool/files/ethtool-5.8-avoid_bashisms.patch
@@ -0,0 +1,29 @@
+Running this script with dash results in an endless loop spitting out this:
+
+  ./test-driver: 62: [: --test-name: unexpected operator
+  ./test-driver: 78: [[: not found
+
+This is caused by two bashisms which are being fixed by the below patch
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+
+--- ethtool-5.8/test-driver
++++ ethtool-5.8/test-driver
+@@ -59,7 +59,7 @@
+ while test $# -gt 1; do
+  arg=${1%=*}
+  val=${1#*=}
+- if [ $arg == $val ]; then
++ if [ $arg = $val ]; then
+    val=$2
+    shift
+  fi
+@@ -75,7 +75,7 @@
+   --) break;;
+   -*) usage_error "invalid option: '$1'";;
+   esac
+-  [[ $arg != $val ]] && shift
++  [ $arg != $val ] && shift
+ done
+ 
+ missing_opts=
diff --git a/sys-apps/exa/Manifest b/sys-apps/exa/Manifest
index c50ad30e9fad..4cae59837cb0 100644
--- a/sys-apps/exa/Manifest
+++ b/sys-apps/exa/Manifest
@@ -63,4 +63,4 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
 DIST zoneinfo_compiled-0.4.8.crate 7959 BLAKE2B 06b41aa69298319760eef3959c9447d9078ced6ea409b95bc0a3de5d9ddc1006d022caa23a64f46a9c6abf1eb077681ffaa3e03af0d533ec65d3351a4ecb3ac7 SHA512 e5337233b464cb97501a2694972a5707f6762ee567416bae876e0ee72aa0bb9cfd152a9253ba97c9fcb24a59e6b2fd5417d5567f7e17336ddc8dee121ba76589
 EBUILD exa-0.9.0-r1.ebuild 2036 BLAKE2B 5344785f721a35548a99edfba4ff6fd3ad679a3eb57c9b94a0d10aea6b37744e0cf47a7ff4026d1e2eb4d07a8c9228800fb1fdaeba13b99733220d6e467abaed SHA512 4ac3694ebbc396f806d9b7b195a1a1fae0a0848d3794249c0830c71b37ef4d9212cd5e7a3e084114b90214be89401c925de440edd782873501e3d41f5be1ac9c
-MISC metadata.xml 801 BLAKE2B 26cfc79f2f068d554e61d425c1f74aa0196009a7664b6e76f10e19945ed909c91931bd711f444477fd60269c11e0c6304b4df03770c9332f08707c9dbf5b12db SHA512 aca6729adb1889417932bdea2e39aa4e3430617cc3b4e56665fc0a5518c2174fb44065d77df2386d131c03284ac031ae9da83a51dbd7050621d959818ff2553d
+MISC metadata.xml 717 BLAKE2B 513b32288ac66f97bcda880bb525e078386bff526405b4fea84d8e426a773fe4bc8a9ed6b678499391ee1afa733c62e8c0dbde60c00546a3855ad9defb12c18d SHA512 b2c0d0bc4c63c730c70a90b0fb1c74e9f138e7d3e27be1015812e6ac48192f830a6030eb0cd37f96d273003fed84edc98487623519bf12cba653f4feb333e87a
diff --git a/sys-apps/exa/metadata.xml b/sys-apps/exa/metadata.xml
index 40e778e6f25a..973eccd22023 100644
--- a/sys-apps/exa/metadata.xml
+++ b/sys-apps/exa/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gyakovlev@gentoo.org</email>
-		<name>Georgy Yakovlev</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		exa is a modern replacement for ls.
 
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 18fe50194b8a..d002f331201e 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -11,7 +11,7 @@ DIST file-5.39.tar.gz 954266 BLAKE2B 4d6d9a6317961e0a2aa391f502b0be8bbb40ede57c3
 EBUILD file-5.37-r1.ebuild 3186 BLAKE2B ae1dc50d4a3e863b7ad9e1732c96b75c97d780bd7b42a34b3cdf8559e21e55724df58e5cb0ec54d1ce33c33c180755803b4545fdec3026a66f364b4436610328 SHA512 58fe1683e40742719d76cb17e0d8cebbf04de75fe1c8d4c4d8873ed75c0a0f1a4f196fa74c182c170ef00a19e42e9e892ef0ce68ef7709194f55cddb0f382eb1
 EBUILD file-5.38-r1.ebuild 3397 BLAKE2B 7cd1c545d4df9e9f448a07ae492df789fe2503c81dc7ec1bf530904099a0ec25789e205e33c725feeb03671f2fab11d04052a161c895f42e7fa2994aea316002 SHA512 baef4c52a5e40e35a3cb1717f78ecb066a10513c1e75e2c69e9ac381c58fdaf1cdb935cfc51720c382ecead25ea485163d544ba6ca19ece6dc556ec7e75c32c1
 EBUILD file-5.39-r1.ebuild 3291 BLAKE2B ae8369b3553dd3b7813b3f45cebf7334e9508deaa4c0a6fbfcc0e3df5caf0111ba3943b788f18cfab3b74238c1e95f97965775c536060516f2ed83a4a3e720f6 SHA512 2ff57e9b96bfc89a77d848e75d9420699999f6c73f12a1282877cd4f3b64454b3249cbb151b4078984454eed13c824956b4edde6f4d238cc7eb83131ef887c4e
-EBUILD file-5.39-r2.ebuild 3345 BLAKE2B 42e68fc14e26709f9f4b92f05f7f0e9ce78c83b41b05bc51c7e706282c40088b14c1efd6a394ecee611871f4e6d5279ba59802f0a28a0cff1320cc4fc073dbbb SHA512 a00a867a66f5a0ddd91cc3de97c425d2103e8823d0b38da75d8cf5d4eafa009b2043c78e37b931ed9b52996931524b601c76423efd4c27dd0395ac3d333578c8
+EBUILD file-5.39-r2.ebuild 3338 BLAKE2B a17eb8d05c4f5be851fac949f81d28f349b94113597982d555a11139ca00b297714528743faa426d72f822632ffa9e68b074a253c929706e025d1c384023943b SHA512 0d94ed3bf061e1ca62668a9061373682cbb882b5dc6a6b4be8cdce7cb602469ae5193be2725e134ae58a842a2f22d31b4fe84785bfcdd62903e0e7feb2f1d988
 EBUILD file-5.39.ebuild 3283 BLAKE2B de652a223726670f67d97998e9285b4b997ea3809ac76a41618d9295f2635833ea98e0e93c8cad47c5531cf2babe83bbf1b6b7a20c1e9f9f862ac99a607c50d1 SHA512 17cc98d07cad36198d8069d35ef36f973290402db72561ca42c0c935d61acf6592eb8d2fa5550c457e738bcea2bbebc233870932ea4a37508fd2f0adf4ca51a1
 EBUILD file-9999.ebuild 3291 BLAKE2B ae8369b3553dd3b7813b3f45cebf7334e9508deaa4c0a6fbfcc0e3df5caf0111ba3943b788f18cfab3b74238c1e95f97965775c536060516f2ed83a4a3e720f6 SHA512 2ff57e9b96bfc89a77d848e75d9420699999f6c73f12a1282877cd4f3b64454b3249cbb151b4078984454eed13c824956b4edde6f4d238cc7eb83131ef887c4e
 MISC metadata.xml 381 BLAKE2B 242f4a2403d0a4c69c7ff400fdbd447bb7fb8572dc57dc05f3edd0c875da68433217bec46d43467fa03c5e9ec69616e3450635ff2662ae3ed830a138521e23ab SHA512 f69d67890ecb0b574d414c432df12f6e8d31ceb7755055683941017563da8713d07728e49cd4a7277699a97cd3ba732c946ecf5435cee94778a0d5652e7d6857
diff --git a/sys-apps/file/file-5.39-r2.ebuild b/sys-apps/file/file-5.39-r2.ebuild
index 204826c0d4d5..815dcf0aa5f7 100644
--- a/sys-apps/file/file-5.39-r2.ebuild
+++ b/sys-apps/file/file-5.39-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index df85cf0db36e..9857176e7a21 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,3 +1,3 @@
 DIST findutils-4.7.0.tar.xz 1895048 BLAKE2B 5d9f1f2f6bc47415057f9139af3d28abae7be9f812a15bce6016a4478eb3206f35c9329f281fda892f614d017f4f5615003ad60b6a74996ebfad81b1f4b54bf0 SHA512 650a24507f8f4ebff83ad28dd27daa4785b4038dcaadc4fe00823b976e848527074cce3f9ec34065b7f037436d2aa6e9ec099bc05d7472c29864ac2c69de7f2e
-EBUILD findutils-4.7.0.ebuild 1676 BLAKE2B 54482e487f70ff164cbee012787fd0c8ddd9a62fa705d8909f056f2b70a7d1e08c9bf072304bd5f6c134557498ede3d17b7eef32b86e7927dd1dc83472bcc26e SHA512 cf265f04b860872bd48db1b40bf3116899eed8e8ba9e6d27609ea884c731f1902fb20a086fdb01529e8708102203451f164e7c2188c931ab6577e3845c0987c4
+EBUILD findutils-4.7.0.ebuild 1680 BLAKE2B 16cf86e12deadfe2330649598d14624b3cafe6dad9113b4174dda5bcedd5dd83689ef1ed6b8bdeddd892bf1c5d46dca17605d38a6bdb39cc12354db9fc97ce71 SHA512 02a79af5c8046552e071529a50c9f2a956db6014e8b72578d2e6fb7cc8844a107adc28d5b2a651b85c7678955d88a87014313153682db19c048639f9c7506394
 MISC metadata.xml 332 BLAKE2B 80d4fb8b79e20a96fe0b5f718c3ee4028ce08811b5cb935b77e526edc576c15c292a048424b55b1198d7848b4500e4195912e5044025a234e83b6ae858d7d031 SHA512 35951bfca173276d17ced243bd870ca62804bf3db766f964cad94f8b100ab33bc0a3b157547527451bae42fc9ea4d414e56ef06f424638e9ab4b5319c6ee8b00
diff --git a/sys-apps/findutils/findutils-4.7.0.ebuild b/sys-apps/findutils/findutils-4.7.0.ebuild
index c52ff404f16c..d708ec6f23ca 100644
--- a/sys-apps/findutils/findutils-4.7.0.ebuild
+++ b/sys-apps/findutils/findutils-4.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit flag-o-matic toolchain-funcs python-any-r1
 
diff --git a/sys-apps/firejail-lts/Manifest b/sys-apps/firejail-lts/Manifest
index 8984ba16e316..88950ca9d405 100644
--- a/sys-apps/firejail-lts/Manifest
+++ b/sys-apps/firejail-lts/Manifest
@@ -1,4 +1,5 @@
 AUX firejail-lts-fix-compressed-manpages.patch 604 BLAKE2B 64888a91da1b6c512cfe7923e6db1bad7b414054c1c83842a23cf56b4f3b51878bfbd37cb8bdbbf8c1890a72e37082d834a4d9b51539045030df97a94edf05fa SHA512 c43f5872a50d73febbfba0daeb815b42796ca241faeb3c9262c861b02e5952e5f3c65d84c041275172d87ff831f44dd47c2cd0031901c020090a84e1654ef983
 DIST firejail-lts-0.9.56.2.tar.gz 934289 BLAKE2B ff8b27f57da90cd94d3ec9b83c8398b7c569b09008f61094bd9aca15e996cd7a4d559e87168228271ccba4c9fe8e1ce97fa5045596f950f3ac2d8593b9ea5838 SHA512 75edc0405fa3fd7f2f5d7831f7f4e838ed63bacadd7f9a869a1611908c716a333251b602ff0bd70e3f98627418e84541b26790d34e644f60d97e84e9c33f873a
 EBUILD firejail-lts-0.9.56.2-r1.ebuild 1217 BLAKE2B 1d7dcd7ebfee4c51d441a80dd59c1043b4accd6acdc95c7aaab747f79f4ded5ccd6bd7dbd7a687e09d8920b80f0cb179d56a6e9701d6839425051e3bd2080251 SHA512 d71262d24137f1f7f9f31e5f9a163c95a94b8680958d74e1729a7171197d6459e9e359994591201a469b110dd1da7ad51f9453296cb461534cdb5138bebe491a
+EBUILD firejail-lts-0.9.56.2-r2.ebuild 1405 BLAKE2B 059e7678dfb94f9049d3976f3d5ba2b9bb42b53875627257641627532e86ef4831d6bdda25f62b4557f6a4c596a478a637a70d3866d664d58e59c9fab87628b9 SHA512 6e44b5f8b4517762389320628a5c3b573df23288263eaa1b0cf6f3ad98fff7dd0ed55d6c1d738a9296cbb8ea4fe0e63c77417ca07c90ca928d360fd02bfc9dab
 MISC metadata.xml 1400 BLAKE2B 437e79721042570066912df3b69a81848ec3fa969eacf8a9b82140faef658b0607a97114426ec426c68cb26e7e76acd1c4be09c81f8f9e96bc67987f9a637302 SHA512 51128fc3ef400e9f80e2bf2ae87420c8187c33b4944827ed35fcb15d81c2213bde726902e77396f1d93331456e8bc94ab7b1386c80f46385c2a9553ae6a970c1
diff --git a/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r2.ebuild b/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r2.ebuild
new file mode 100644
index 000000000000..6cc506086b86
--- /dev/null
+++ b/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Security sandbox for any type of processes; LTS version"
+HOMEPAGE="https://firejail.wordpress.com/"
+
+MY_PN=firejail
+
+SRC_URI="https://github.com/netblue30/${MY_PN}/archive/${PV}-LTS.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="apparmor +globalcfg +network +seccomp +suid +userns test +whitelist"
+RESTRICT="!test? ( test )"
+
+RDEPEND="apparmor? ( sys-libs/libapparmor )"
+
+DEPEND="${RDEPEND}
+		!sys-apps/firejail
+		test? ( dev-tcltk/expect )"
+
+S="${WORKDIR}/${MY_PN}-${PV}-LTS"
+
+src_prepare() {
+	default
+
+	find -type f -name Makefile.in | xargs sed -i -r \
+		-e '/^\tinstall .*COPYING /d' \
+		-e '/CFLAGS/s: (-O2|-ggdb) : :g' || die
+
+	sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die
+
+	# remove compression of man pages
+	sed -i -e '/gzip -9n $$man; \\/d' Makefile.in || die
+	sed -i -e '/rm -f $$man.gz; \\/d' Makefile.in || die
+	sed -i -r -e 's|\*\.([[:digit:]])\) install -c -m 0644 \$\$man\.gz|\*\.\1\) install -c -m 0644 \$\$man|g' Makefile.in || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable apparmor) \
+		$(use_enable globalcfg) \
+		$(use_enable network) \
+		$(use_enable seccomp) \
+		$(use_enable suid) \
+		$(use_enable userns) \
+		$(use_enable whitelist)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 62f50af96ffd..399b57043888 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,7 +1,6 @@
 AUX firejail-compressed-manpages.patch 598 BLAKE2B d9b39a043a4d9219e1a8413c04aa77ec971d572b43112d6d2481796f237f00bf3927ea77fd84f15cb0c3c8c4e60549c7cbe0e26181b348408a9b873f1ae03154 SHA512 3f488582ff46ee8e87a4752c073b8f8ae4c07b2262e7bdbc9b5dc54f6b94323fbbebb7fadcbb112bc7d0d9a4a29a8f898209e8940c78127749e1006569120230
-DIST firejail-0.9.60.tar.gz 1067102 BLAKE2B c5fd9a9c60fe17fc7ae24946ae5ea2f666d1dd20d982c540783dd2e56d30859a24258c4f3426e2bafaff3530557f5865bc73af9573e399039e8d5b097e5cddee SHA512 cb3eeff2f77801b4593a719a6b63da09cdc6c7f96f8ea8ea1aaa7e8538b080421a284441c6e43ce036fdf8510e08a73816c58d22f0af048344b8752f4a02759a
 DIST firejail-0.9.62.tar.gz 918477 BLAKE2B 8654539a6a115b6f69ea94a0b699c9129cfcecaf3d478409eaf288b953563768716eae9b9a83ddc538249322daa62a764bc2eb286eddaa14fc0e5fa887c0e319 SHA512 dfdbfbffdcb9a239e071983035d57350440eb58d79bb4375bc1fe585471a260c8b090bea59ac939739ac3daddf296c041ab4cc47ebbf718b0c9deae47f16af9f
-EBUILD firejail-0.9.60-r1.ebuild 1739 BLAKE2B 42e3ab59089ac04bd56768985de0ecdff1a1c4aa81a5bafc98409b0d15c3f1a85676d28149da9acff3c0df416327cff3f3cf2396ce036fd3f03809236c482593 SHA512 7c24163c7742575152ba862fd5cb0e33144fc7072bc914c9f102fffb4b939078ce6193f0de626d38da0dbd0ae306fd251038f3e762058e0064af2b6936c58977
-EBUILD firejail-0.9.62.ebuild 2163 BLAKE2B 9a1b8a0925982dc0e4f47f7aa767ab7c3c8f3b917c8931053182bd8132d8ecfce87a25ca3a76d6af834b262fff2abb12fccd6567fa777284a791a5fefc6594a1 SHA512 e0511928163c3ef42a46b31aa14a9f347388ef27e5f429cbda9294f7d5966092ebbf6a3a22d4cbf329058d9326bfe3566c93bd6aa5972aab0c4b923647d41a5a
+EBUILD firejail-0.9.62-r1.ebuild 2102 BLAKE2B d30a3fa1db880a665b7f3754b14046d3e82e6a53fe9aa059dbfe6dfe48d97ece348efec04c94bba3f13961663bd39686a863039cd03a1ee2789a16511db3fe9d SHA512 6b6657dedcfea70e330e9240e0ee66c6658635bae9e10f58e07e0aa428803b8c4ece403f6530defca9782c2fe83972c223c9d1b7287445e6e88427e02884c679
+EBUILD firejail-0.9.62.ebuild 2162 BLAKE2B fbeced554b46369107e56846ebb4d8b4accd3c81996f81222a145a4d054ff1426f3514c59c4558c2f517cbc7a1f5035005c10fe778f152fa56a51c752eaaa40d SHA512 449e60bf793afa228f106e3b8913e8d7ba24e31f6e09da141750d0e607b91cd4dcdfa0092c88dcc16e593907182ada3fe20491df850e09cc95895ec1cb75a6c3
 EBUILD firejail-9999.ebuild 2163 BLAKE2B 9a1b8a0925982dc0e4f47f7aa767ab7c3c8f3b917c8931053182bd8132d8ecfce87a25ca3a76d6af834b262fff2abb12fccd6567fa777284a791a5fefc6594a1 SHA512 e0511928163c3ef42a46b31aa14a9f347388ef27e5f429cbda9294f7d5966092ebbf6a3a22d4cbf329058d9326bfe3566c93bd6aa5972aab0c4b923647d41a5a
 MISC metadata.xml 1685 BLAKE2B dad0274bfdc82a077e254d7659d66a6070e538205f7bb5dba600096a3771404071a60f571e556065bd15bbc4f0d6a12562a9e43ca39b8cbdc32bb19813bfeb0c SHA512 0ce8e6291fbebfb9d80232b414838eaa2e00842880084276caec236338b60886047ae3a936646466bdd6ee6d8079038a59b34785ba559207fc7bebe3b93f392e
diff --git a/sys-apps/firejail/firejail-0.9.60-r1.ebuild b/sys-apps/firejail/firejail-0.9.62-r1.ebuild
index 888368183f58..0521f812dbf4 100644
--- a/sys-apps/firejail/firejail-0.9.60-r1.ebuild
+++ b/sys-apps/firejail/firejail-0.9.62-r1.ebuild
@@ -1,42 +1,53 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit toolchain-funcs
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="amd64 ~x86"
+	SRC_URI="https://github.com/netblue30/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/netblue30/firejail.git"
+	EGIT_BRANCH="master"
+fi
+
 DESCRIPTION="Security sandbox for any type of processes"
 HOMEPAGE="https://firejail.wordpress.com/"
 
-SRC_URI="https://github.com/netblue30/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
 IUSE="apparmor +chroot contrib debug +file-transfer +globalcfg +network +overlayfs +private-home +seccomp +suid test +userns vim-syntax +whitelist x11"
-
-DEPEND="!sys-apps/firejail-lts
-	apparmor? ( sys-libs/libapparmor )
-	test? ( dev-tcltk/expect )"
+RESTRICT="!test? ( test )"
 
 RDEPEND="apparmor? ( sys-libs/libapparmor )"
 
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${PN}-compressed-manpages.patch" )
+DEPEND="${RDEPEND}
+	!sys-apps/firejail-lts
+	test? ( dev-tcltk/expect )"
 
 src_prepare() {
 	default
 
 	find ./contrib -type f -name '*.py' | xargs sed --in-place 's-#!/usr/bin/python3-#!/usr/bin/env python3-g' || die
 
-	find -type f -name Makefile.in | xargs sed --in-place --regexp-extended \
-			--expression='/^\tinstall .*COPYING /d' \
-			--expression='/CFLAGS/s: (-O2|-ggdb) : :g' || die
+	find -type f -name Makefile.in | xargs sed -i -r \
+			-e '/^\tinstall .*COPYING /d' \
+			-e '/CFLAGS/s: (-O2|-ggdb) : :g' || die
+
+	sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die
 
-	sed --in-place --regexp-extended '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die
+	# remove compression of man pages
+	sed -i -e '/gzip -9n $$man; \\/d' Makefile.in || die
+	sed -i -e '/rm -f $$man.gz; \\/d' Makefile.in || die
+	sed -i -r -e 's|\*\.([[:digit:]])\) install -c -m 0644 \$\$man\.gz|\*\.\1\) install -c -m 0644 \$\$man|g' Makefile.in || die
 }
 
 src_configure() {
 	econf \
+		--disable-firetunnel \
 		$(use_enable apparmor) \
 		$(use_enable chroot) \
 		$(use_enable contrib contrib-install) \
@@ -52,6 +63,10 @@ src_configure() {
 		$(use_enable x11)
 }
 
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
 src_install() {
 	default
 
diff --git a/sys-apps/firejail/firejail-0.9.62.ebuild b/sys-apps/firejail/firejail-0.9.62.ebuild
index 8dfef8571888..1b6e14740a13 100644
--- a/sys-apps/firejail/firejail-0.9.62.ebuild
+++ b/sys-apps/firejail/firejail-0.9.62.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	SRC_URI="https://github.com/netblue30/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 else
 	inherit git-r3
diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index 273304be8e7b..f32ef55a8d98 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -1,4 +1,6 @@
+AUX flashrom-1.2_make-libflashrom-usable.patch 3230 BLAKE2B ddf5677e8a6b931d372059bf270b74a1dcd6ebfdfb1cf3e7c976e647fdc8180d005f19416ee15bb0b25f1f2b891348a42a83f8e6d44c528864947cd4be78e0da SHA512 dd60f4e25ab519f6b5f03c4e80be2fe24ab2c5c206c78aff2802f91026d5ef3889d2376f88bc4baa32de5c48951afe0cb1d62dbfc65c4965058caccfadff65d1
 DIST flashrom-v1.2.tar.bz2 366995 BLAKE2B 091e01a91e12b486154ace334a5e74bccbb5f5311ad76e37f43a28167080757873d8c78b8f549d2e77eb984922c830895ba955b23eb6ee4fc24f1ffed259954b SHA512 8e01395a54d0d1344bc55e7e4975f43bb8e59ebe83fb5f2766d14f76756d718b487254ce9a19ef4093aed04fb9d40fff5fe8f709b18c512f6e6fad894f83d7b8
 EBUILD flashrom-1.2-r1.ebuild 4520 BLAKE2B d00007833d23c42b7b59cc1503565e75037d7f4dc835f79c280299a2818bb5ff2f48868958940a237ef52721f971a1c055f0ef35c0167ef263b5ef36232266d9 SHA512 9c7a87c29bf7f57ff9878127c8b38d21d97f3019e0a350e64d7271a208253d85091addff5799e6e947182490a8494f6743e2e2029d3b4ae6d5ab9c9b14900d3f
+EBUILD flashrom-1.2-r2.ebuild 5077 BLAKE2B 920633ca2e0139be61131b1ae752bd65584ec9d0c4d887ed6d99f8fdbcab07752aee64b44df46c7abd71006e24a922ad93a02fa138ca1da8bc33666efd086633 SHA512 c80d1ee1d91f3c06e23a6be41472561853d5ee9a4fca263190be3731f05b4abeb210e7e9cd46e61687c0b26f91260809cc320038f5c798203dcf5774b11f7841
 EBUILD flashrom-9999.ebuild 4423 BLAKE2B fc758295685fea683f2b7bdc07dc307525571b00745ced19910a95117a033964d037da53b86ddca9482c96b8dcb6f54e46eb6401e17e5268f2b565ed89bf6ee6 SHA512 b2ef614c5bee6c83a510306823ae34b2e32e8d03726479b6ceb89f29e51c2f9d6a91f7e6c1f24166fe572094299b3bbc49047ae4c865d3ca994be233cfa7d90e
 MISC metadata.xml 4595 BLAKE2B 0a7c4f212c57dccca72a7da1172b8eb36a7027703fea6137be5eefbadf5592abaa6e9841befa3e8f8ef65b1b5057af3c0f162584f0db65addd362a0a8880e648 SHA512 25b118e1150b405d34081add86fa02c04094ada970ea2a121bf21a3047d1df2566383549df7d0138883bcfed31c2574a420e9357dccce993c93179e3e769b8ef
diff --git a/sys-apps/flashrom/files/flashrom-1.2_make-libflashrom-usable.patch b/sys-apps/flashrom/files/flashrom-1.2_make-libflashrom-usable.patch
new file mode 100644
index 000000000000..ea15a4230592
--- /dev/null
+++ b/sys-apps/flashrom/files/flashrom-1.2_make-libflashrom-usable.patch
@@ -0,0 +1,70 @@
+1. Add an (extremely primitive) rule for generating a pkgconfig file
+   for libflashrom, as fwupd cannot find it without one. Note that this
+   rule depends on several variables to be passed to make, see ebuilds
+   using this patch for details;
+2. Tweak the way library dependencies are passed around a bit to make it
+   easier to inject them into said pkgconfig file;
+3. Move print.o from CLI_OBJS to LIB_OBJS - it contains the array
+   'boards_known' which is used in library code. Upstream have already
+   fixed this in Meson files but not in the Makefile.
+
+diff -urN a/flashrom.pc.in b/flashrom.pc.in
+--- a/flashrom.pc.in	1970-01-01 01:00:00.000000000 +0100
++++ b/flashrom.pc.in	2020-07-28 22:47:01.928679346 +0200
+@@ -0,0 +1,9 @@
++prefix=@PREFIX@
++libdir=${prefix}/@LIBDIR@
++includedir=${prefix}/@INCLUDEDIR@
++
++Name: libflashrom
++Description: library to interact with flashrom
++Version: @VERSION@
++Libs: -L${libdir} -lflashrom @LIBS@
++Cflags: -I${includedir}
+diff -urN a/Makefile b/Makefile
+--- a/Makefile	2019-12-31 18:25:41.000000000 +0100
++++ b/Makefile	2020-07-28 23:18:41.019492448 +0200
+@@ -570,12 +570,12 @@
+ ###############################################################################
+ # Library code.
+ 
+-LIB_OBJS = libflashrom.o layout.o flashrom.o udelay.o programmer.o helpers.o ich_descriptors.o fmap.o
++LIB_OBJS = libflashrom.o layout.o flashrom.o udelay.o programmer.o helpers.o ich_descriptors.o fmap.o print.o
+ 
+ ###############################################################################
+ # Frontend related stuff.
+ 
+-CLI_OBJS = cli_classic.o cli_output.o cli_common.o print.o
++CLI_OBJS = cli_classic.o cli_output.o cli_common.o
+ 
+ # versioninfo.inc stores metadata required to build a packaged flashrom. It is generated by the export rule and
+ # imported below. If versioninfo.inc is not found and the variables are not defined by the user, the info will
+@@ -1130,11 +1130,16 @@
+ 	@+$(MAKE) -C util/ich_descriptors_tool/ TARGET_OS=$(TARGET_OS) EXEC_SUFFIX=$(EXEC_SUFFIX)
+ endif
+ 
++ALL_LIBS = $(LIBS) $(PCILIBS) $(FEATURE_LIBS) $(USBLIBS) $(USB1LIBS) $(JAYLINKLIBS) $(NI845X_LIBS)
++
++flashrom.pc:
++	sed -e "s#@PREFIX@#$(PREFIX)#" -e "s#@LIBDIR@#$(LIBDIR)#" -e "s#@INCLUDEDIR@#$(INCLUDEDIR)#" -e "s#@VERSION@#$(VERSION)#" -e "s#@LIBS@#$(ALL_LIBS)#" < $@.in > $@.tmp && mv $@.tmp $@
++
+ $(PROGRAM)$(EXEC_SUFFIX): $(OBJS)
+-	$(CC) $(LDFLAGS) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LIBS) $(PCILIBS) $(FEATURE_LIBS) $(USBLIBS) $(USB1LIBS) $(JAYLINKLIBS) $(NI845X_LIBS)
++	$(CC) $(LDFLAGS) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(ALL_LIBS)
+ 
+-libflashrom.a: $(LIBFLASHROM_OBJS)
+-	$(AR) rcs $@ $^
++libflashrom.a: $(LIBFLASHROM_OBJS) flashrom.pc
++	$(AR) rcs $@ $(LIBFLASHROM_OBJS)
+ 	$(RANLIB) $@
+ 
+ # TAROPTIONS reduces information leakage from the packager's system.
+@@ -1149,7 +1154,7 @@
+ # This includes all frontends and libflashrom.
+ # We don't use EXEC_SUFFIX here because we want to clean everything.
+ clean:
+-	rm -f $(PROGRAM) $(PROGRAM).exe libflashrom.a *.o *.d $(PROGRAM).8 $(PROGRAM).8.html $(BUILD_DETAILS_FILE)
++	rm -f $(PROGRAM) $(PROGRAM).exe libflashrom.a flashrom.pc *.o *.d $(PROGRAM).8 $(PROGRAM).8.html $(BUILD_DETAILS_FILE)
+ 	@+$(MAKE) -C util/ich_descriptors_tool/ clean
+ 
+ distclean: clean
diff --git a/sys-apps/flashrom/flashrom-1.2-r2.ebuild b/sys-apps/flashrom/flashrom-1.2-r2.ebuild
new file mode 100644
index 000000000000..ae710e470315
--- /dev/null
+++ b/sys-apps/flashrom/flashrom-1.2-r2.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://review.coreboot.org/flashrom.git"
+	inherit git-r3
+else
+	MY_P="${PN}-v${PV}"
+	SRC_URI="https://download.flashrom.org/releases/${MY_P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
+HOMEPAGE="https://flashrom.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+# The defaults match the upstream Makefile.
+# Note: Do not list bitbang_spi as it is not a programmer; it's a backend used
+# by some other spi programmers.
+IUSE_PROGRAMMERS="
+	atahpt
+	+atapromise
+	+atavia
+	+buspirate-spi
+	+ch341a-spi
+	+dediprog
+	+developerbox-spi
+	+digilent-spi
+	+drkaiser
+	+dummy
+	+ft2232-spi
+	+gfxnvidia
+	+internal
+	+it8212
+	jlink-spi
+	+linux-mtd
+	+linux-spi
+	mstarddc-spi
+	+nic3com
+	+nicintel
+	+nicintel-eeprom
+	+nicintel-spi
+	nicnatsemi
+	+nicrealtek
+	+ogp-spi
+	+pickit2-spi
+	+pony-spi
+	+rayer-spi
+	+satamv
+	+satasii
+	+serprog
+	stlinkv3-spi
+	+usbblaster-spi
+"
+
+IUSE="${IUSE_PROGRAMMERS} +internal-dmi static tools +wiki"
+
+LIB_DEPEND="
+	atahpt? ( sys-apps/pciutils[static-libs(+)] )
+	atapromise? ( sys-apps/pciutils[static-libs(+)] )
+	atavia? ( sys-apps/pciutils[static-libs(+)] )
+	ch341a-spi? ( virtual/libusb:1[static-libs(+)] )
+	dediprog? ( virtual/libusb:1[static-libs(+)] )
+	developerbox-spi? ( virtual/libusb:1[static-libs(+)] )
+	digilent-spi? ( virtual/libusb:1[static-libs(+)] )
+	drkaiser? ( sys-apps/pciutils[static-libs(+)] )
+	ft2232-spi? ( dev-embedded/libftdi:=[static-libs(+)] )
+	gfxnvidia? ( sys-apps/pciutils[static-libs(+)] )
+	internal? ( sys-apps/pciutils[static-libs(+)] )
+	it8212? ( sys-apps/pciutils[static-libs(+)] )
+	jlink-spi? ( dev-embedded/libjaylink[static-libs(+)] )
+	nic3com? ( sys-apps/pciutils[static-libs(+)] )
+	nicintel-eeprom? ( sys-apps/pciutils[static-libs(+)] )
+	nicintel-spi? ( sys-apps/pciutils[static-libs(+)] )
+	nicintel? ( sys-apps/pciutils[static-libs(+)] )
+	nicnatsemi? ( sys-apps/pciutils[static-libs(+)] )
+	nicrealtek? ( sys-apps/pciutils[static-libs(+)] )
+	ogp-spi? ( sys-apps/pciutils[static-libs(+)] )
+	pickit2-spi? ( virtual/libusb:0[static-libs(+)] )
+	rayer-spi? ( sys-apps/pciutils[static-libs(+)] )
+	satamv? ( sys-apps/pciutils[static-libs(+)] )
+	satasii? ( sys-apps/pciutils[static-libs(+)] )
+	stlinkv3-spi? ( virtual/libusb:1[static-libs(+)] )
+	usbblaster-spi? ( dev-embedded/libftdi:=[static-libs(+)] )
+"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	sys-apps/diffutils"
+RDEPEND+=" !internal-dmi? ( sys-apps/dmidecode )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2_make-libflashrom-usable.patch
+)
+
+_flashrom_enable() {
+	local c="CONFIG_${2:-$(echo "$1" | tr '[:lower:]-' '[:upper:]_')}"
+	args+=( "${c}=$(usex $1 yes no)" )
+}
+flashrom_enable() {
+	local u
+	for u ; do _flashrom_enable "${u}" ; done
+}
+
+src_prepare() {
+	# To make libflashrom.a actually useful
+	append-flags -fPIC
+
+	default
+}
+
+src_compile() {
+	# Help keep things in sync.
+	local sprogs=$(echo $(
+		grep -o 'CONFIG_[A-Z0-9_]*' flashrom.c | \
+			LC_ALL=C sort -u | \
+			sed 's:^CONFIG_::' | \
+			tr '[:upper:]_' '[:lower:]-' | \
+			grep -v ni845x-spi))
+	local eprogs=$(echo ${IUSE_PROGRAMMERS} | sed -E 's/\B[-+]\b//g')
+	if [[ ${sprogs} != "${eprogs}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "IUSE set to: ${eprogs}"
+		eerror "flashrom.c : ${sprogs}"
+		die "sync IUSE to the list of source programmers"
+	fi
+
+	# Turn USE flags into CONFIG_xxx settings.
+	local args=()
+	flashrom_enable ${eprogs}
+	_flashrom_enable wiki PRINT_WIKI
+	_flashrom_enable static STATIC
+
+	# You have to specify at least one programmer, and if you specify more than
+	# one programmer you have to include either dummy or internal in the list.
+	# We pick dummy as the default because internal requires libpci.
+	if ! use internal && ! use dummy ; then
+		if [[ ${#args[@]} -ne 1 ]] ; then
+			ewarn "You have to specify at least one programmer, and if you specify"
+			ewarn "more than one programmer, you have to enable either dummy or"
+			ewarn "internal as well.  'dummy' will be the default now."
+			args+=( CONFIG_DUMMY=yes )
+		fi
+	fi
+
+	tc-export AR CC PKG_CONFIG RANLIB
+	# PREFIX, INCLUDEDIR and LIBDIR are injected into the libflashrom pkgconfig
+	# file, which is why we pass them here even though src_install() puts all
+	# files in correct locations without employing make.
+	# VERSION too goes into the pkgconfig file, and we override the upstream
+	# value to get rid of the prefix 'v'.
+	emake \
+		INCLUDEDIR="include" \
+		LIBDIR="$(get_libdir)" \
+		PREFIX="${EPREFIX}/usr" \
+		VERSION="${PV}" \
+		WARNERROR=no "${args[@]}" \
+		all libflashrom.a
+}
+
+src_install() {
+	dosbin flashrom
+	doman flashrom.8
+	dodoc README Documentation/*.txt
+	dolib.a libflashrom.a
+	doheader libflashrom.h
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+
+	if use tools; then
+		dosbin util/ich_descriptors_tool/ich_descriptors_tool
+	fi
+}
diff --git a/sys-apps/frandom/Manifest b/sys-apps/frandom/Manifest
index d75e6a1e1fc8..6700bc20e8f8 100644
--- a/sys-apps/frandom/Manifest
+++ b/sys-apps/frandom/Manifest
@@ -1,3 +1,3 @@
 DIST frandom-1.1.tar.gz 8146 BLAKE2B a18a97c4650376cb2e3c6abfa8b6043c69426f83c9607c36614007426b7734f89a537206e7656b3fd901d69111683592e4511d0c94c7b111c8e77e6fbe660323 SHA512 f64bd1bc1482d223f84f344554b04a4a413be32cf6c348e006b831e68eea0165f1231e194536bb6867450dfc901e80e765e71ba6369209ce579597ad1cdfdeaf
-EBUILD frandom-1.1.ebuild 669 BLAKE2B ec5bfb43c42491a03795df37a16592591bed1d5db5961be570b82dffdb147da72e3e1a4a74ee0dbb1180e46fe2ff4fce98483973b783073d194f71809589d5a0 SHA512 a0358410b4d7d58df1d6fecb7bf628f17c3ec3acce8ff0e2b3de4f5f574addd39dbb573acaaeeef84809758f4a4695bfebc4f8112d759d8e496346527ae9d5d9
+EBUILD frandom-1.1-r1.ebuild 666 BLAKE2B a8cca754a2eb1443b5bbe1126543a15db028ddc7b83ecb1aeeaa8b948d2007c83ff56b4b119a87d26ab7a2666add988cd2184afce79706d5fc3693a2b4b328f2 SHA512 ce20ec724ccc68f9967abc0dd5072d743e8d8c355138a8333e4f23bdf975f0980bdd5ff234b441c2c953001d1f0e0c3c960eb11a72169e831006153ef9d2a51a
 MISC metadata.xml 334 BLAKE2B b93b75e593a2b4c531b5c9210b752fdb20cc7e0394d4a683d267937a96ad92c9fe07a11143cadb37613d5aacc1240d40761acdb849bb9163bf618b8b48435b4d SHA512 94b5fa15925b1a85b0fe1d52f35323acd3a900666283a346283a7745f88b35380e3424668f7651f78e4039de2f00a4affcb461b3a9a72ba671bff8b1634bd4f3
diff --git a/sys-apps/frandom/frandom-1.1.ebuild b/sys-apps/frandom/frandom-1.1-r1.ebuild
index 50c0b257f584..45a10e79afc5 100644
--- a/sys-apps/frandom/frandom-1.1.ebuild
+++ b/sys-apps/frandom/frandom-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index b4d0a5994f0d..5b633731bfae 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,14 +1,12 @@
 AUX fwupd-1.3.9-logind_plugin.patch 281 BLAKE2B 237c6d6f8a43408186c6707f1c373b2600bae6ad6ef750c579b7d51023615fc7f0569011aa88e73cb72030c4112f1d26e924676bc6fd1cb9e9c9a7fef76f8800 SHA512 148a5af93d2c3554239c5529d63e5f85ed70192856ca375ce0126c183babda7d7de5cf345e875f7cd88c6cce52f409f05f1689625ea6dde14bf330c9e11d98b9
 AUX fwupd-1.4.4-help2man_var.patch 2642 BLAKE2B c0a8f9f5a79c84a1521fc85feb9cd8afbb58a44b9af69726c86d4c1720a202d1721d74a83e35bb431b2c4e6e56281249353975954a69145a80f8e8b9b0152eea SHA512 f9b72f1ca470ac2e33428e03d3287420877d20597a83bf8db21510e3ab4980a26f1832091a087888f38891be4e912cf29e1568fc67d2e604622c28303cb5701e
 AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb
-DIST fwupd-1.2.11.tar.gz 1945646 BLAKE2B 4eb6d5008d0e515880147a94b2632ed70b5f7ab1891775ac121347653c06bf4403ab7f4a1fe160000a6195d360fe06d64c8971dd53c1538aeac40d155f59979a SHA512 a8d6a76ac59937547c6866d414e95a67779574901b0a15ecfde763f49b434b284be2ade1194179225785006e5f93836667469d08f32d4c87fc85927aa0bfe9de
 DIST fwupd-1.3.10.tar.gz 2255394 BLAKE2B 39f517b7648236f39df6f41b5950fcba45a1184f269e533facd752f8e132bb979b32a1420ce4bfcad5bb5d5546ea3f28b357603f7754267550fc02c2125642c5 SHA512 a30ef2933fc01136a9296e99a0b1b9220f952a058aa28339ff944633a8966678b374f479b3a93a1e63bd97491679d3ce304cb621f6e63b86238a8746768daac2
 DIST fwupd-1.3.11.tar.gz 2255359 BLAKE2B 0f91c32602459d31e53c63647762307cfe2313c553e16836cc646eb04e3ac54ebd53d2e8615afb7f43b8cd79b7e6315ed688ae04b57de851be62ed6065579ebf SHA512 e300a84a1c2d7e44e2a1d5d86300487783fc3990b20b540065f9899705569bee8996eae951f32b6fac559e76955ff9b661aa9b181e4dc0211a33a514613ffddd
-DIST fwupd-1.4.2.tar.gz 2304086 BLAKE2B 9a725cc49479984c3a98b75e9c52211a26f81d4a7ecec3b261ff4486201a967a6c82df9a1dbd591b91d9cd6eb9d1a8cd8cccfd2c8dd98d5bb3f82cb03bbd0a52 SHA512 b092eedf3e5e84874de1fddb7f14ca87975d5895721ac4f87b6c88ec7c7b2367e573b30906588f9adad4cea52da5ebbaaa4a9c38a2273e8f31d26399e719166e
 DIST fwupd-1.4.4.tar.gz 2311975 BLAKE2B 04ba05e157a1662dcd5fa8a3835701ff6c39935aa5e2d91e2aad3f7c7f5449ce56ac8f85bd4df4c3f4901c1d55d036f159eaf761761086bb1eda770021d38160 SHA512 9ce2ee8963789b99e43ebd3a76ba2851339bde6bda0c85198bbac11ebca76525385f41223956410bc1cff72318de463031f7e38b784fc5a4bf9bc2a85788db1a
-EBUILD fwupd-1.2.11.ebuild 3782 BLAKE2B f71c26237f656c291c63a2c7e46f220fbb56751ad0b2742acaf65672acd8060850f654962a26b52210a05e638ec408ff780488d83b1e23f8333b8c81a6f08417 SHA512 3b3a7897e737afc5a7bef4e8743a5a3abd67ca9d6b0a75fa1f7af65879188d1f72b5bdfdf8c46f945a8bf7b0189efec169cd3547cf9253df74d6ca6e7dba07bd
-EBUILD fwupd-1.3.10.ebuild 4243 BLAKE2B f63442887f7a35f5f05685d6dbadcde090b7675d779f6c52948185869f350da9b2f9c4eba30aa4beea665f205118a5ae05d8e70b5f9df8dfaba5f934320f54c4 SHA512 11bcc863f703c3b088048c8eacf76c8884bdb1f3d26185401bab429f749bc7cddc2ac95a60fa25e84d62c973e868bbbd0f1f5c8aa3f50a5ced7b126c74b0dd93
-EBUILD fwupd-1.3.11.ebuild 4245 BLAKE2B 75efc10a9e44325023bfe1d6fb592212706bedefe8ec280037f72d8bb795c5390487f37ef041e1826ebe17e13ff94c1b9730314150bedbde44177f79747480bb SHA512 3b382666d78b12041c741fae3f98bee7e86419d71fea4aa0373921cf360caa93f2aee6c17cfbcada993b115f15c65d9d315807302dd881de9e8cf6b547eaa786
-EBUILD fwupd-1.4.2.ebuild 4128 BLAKE2B ace5e8027fd34eacf1b00a0cf590d7798648eb58294ff6bfe207855ad61da7d2b11bb16f8fec2d96741c53c551ea4c5a45d300defc387d512a287c796973eba2 SHA512 94f38bdf066856e532a96075cdddf0411b3d908d7081555963c66f50770dcd73c49444c24c40ff4e16a83caed9fe8318ca3528e616a379067a73933f99ba5def
-EBUILD fwupd-1.4.4.ebuild 4157 BLAKE2B ea26874d1710453706f9c1b9a841a6be3dad35a77db919593917769704883dc2fb575dd49bd00b0a959711f378262ab824f50abd4d4d98519c1884b97e433b6c SHA512 805ea1460d6ed6d655e9bce86c41866241c41217eb4f197d69e4e71088da724fe2164114d059a0a7074d9b9c083dc15a1780523a4f18f0a0937ab71a85ac939e
-MISC metadata.xml 1282 BLAKE2B 1c24fd3a7c2fce83628937b30dad0a9144bfcef23688ec0ef26e61bcb82252bd0ac8d339c179ea6ff22d7f4578dfc4484d87c5f1508216bf8898b6ad6de720f3 SHA512 96ee8309fc1c3cdee219428aff411e0c68f2702488f202f749a49ec51307ca604e27cbf131908b477afc9d10ee045e53f4511369bd5fd601894e507be398ad73
+DIST fwupd-1.4.5.tar.gz 2318208 BLAKE2B 1e46137f5b72ff104d920771e54e3123bd0665cafd20c75327682a7e4284be93f8e284947db91892c29a153803013bab8ac45e5a0263fcda33b7491c53dd5558 SHA512 47eb40e8d84dc49af783b661db0fce0fb800c4581929becffb03b79c41ed8bfb0987f40fbb8262292b24af85b7f91978a6979ea7458058ee2bfc1a4353d0bd31
+EBUILD fwupd-1.3.10.ebuild 4245 BLAKE2B c010711add27bf1c2526f4d3663d01b7cc0326f0099234f50c06f2e792eb59c59dcf510ee18354c5f4f214cf66f8b41faa2f535573400f07f1f16a266010fe07 SHA512 d99af54dc6d51b030d1515db64a8c3d13311fa6cedd8ac3b367b86671aa86205ac2cdac1219da2a27c555679764b6182fd3e2cb76752dc07a8fb750462bca523
+EBUILD fwupd-1.3.11.ebuild 4247 BLAKE2B 61bf6e25d7217e6025669d98086ad77d774ff310662f3335e711e60f6521ab40d1ba2de37058c0630174cb4d7c81ca79d8857c5b49addeb2c73da899ee6daa91 SHA512 94abbbfc2ab9265b0feda0e2e7d67206abff0a2938a11b08ef5e5c861d88e942c034dd0a5dcfa894cb53cb9dabed0106fcd364e643bfe1ce753757c88703560e
+EBUILD fwupd-1.4.4.ebuild 4159 BLAKE2B 36ec02aeb790d9be563a14b22c99cf725d103100e379872dd4dd3e7fc5f46893c161e0e4497d099bb93635e9559ede0c0e118520270f7bd3ff05fe153f7f7d7e SHA512 0e7cff54bc091018f9fa92c2e8c9d03b65bae73906fdfb5ac69920522d8ca7819164376f81864c217338bbeb44accd6662559bdc776cbbcd85aeeca2ab2a3515
+EBUILD fwupd-1.4.5.ebuild 4157 BLAKE2B bf0ffae31ef8c9d1e79f0f108f6f457722ed0c8c5791ba27964d09e6fd9a9867d18cc0aec12604666099ab3ccb3228186326053000184616f872fa326c3b047c SHA512 1535f9a7d1361322bedb87e1668aa8f95385f221e4eb4170739c5aa8f7ae505ede416b06fa0747d6ff423de585e557a5ed4ec1bc8b0daae37b8b45a5ab31a098
+MISC metadata.xml 1183 BLAKE2B 1d98b79674b3d37f961dfa5f783d12f024865d2f29e53bb5e3de3daa47dbbc7993d0371ac93a7f1fd4411cee9dd0187a31d5904df23ea03ef4cd61e7a75f22dd SHA512 5357a5c7dd3e6578d5eb37296d484b8f5c89b0c619f0da783f642237cb00e72e8c6adc4c463c825959f2dcf58f52fe2f56623a4864b0bd41f26f530b7af51d42
diff --git a/sys-apps/fwupd/fwupd-1.2.11.ebuild b/sys-apps/fwupd/fwupd-1.2.11.ebuild
deleted file mode 100644
index 7239b28afeae..000000000000
--- a/sys-apps/fwupd/fwupd-1.2.11.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit meson python-single-r1 vala xdg-utils
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="agent colorhug consolekit dell doc elogind +gpg +man nvme pkcs7 redfish systemd test thunderbolt uefi"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( consolekit elogind systemd )
-	dell? ( uefi )
-"
-
-RDEPEND="${PYTHON_DEPS}
-	app-arch/gcab
-	app-arch/libarchive:=
-	dev-db/sqlite
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/json-glib
-	dev-libs/libgpg-error
-	dev-libs/libgudev:=
-	>=dev-libs/libgusb-0.2.9[introspection]
-	>=dev-libs/libxmlb-0.1.7
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
-	')
-	>=net-libs/libsoup-2.51.92:2.4[introspection]
-	>=sys-auth/polkit-0.103
-	virtual/libelf:0=
-	colorhug? ( >=x11-misc/colord-1.2.12:0= )
-	consolekit? ( >=sys-auth/consolekit-1.0.0 )
-	dell? (
-		sys-libs/efivar
-		>=sys-libs/libsmbios-2.4.0
-	)
-	elogind? ( sys-auth/elogind )
-	gpg? (
-		app-crypt/gpgme
-		dev-libs/libgpg-error
-	)
-	nvme? ( sys-libs/efivar )
-	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
-	redfish? ( sys-libs/efivar )
-	systemd? ( >=sys-apps/systemd-211 )
-	uefi? (
-		media-libs/fontconfig
-		media-libs/freetype
-		sys-boot/gnu-efi
-		>=sys-libs/efivar-33
-		x11-libs/cairo
-	)
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	x11-libs/pango[introspection]
-	nvme? (	>=sys-kernel/linux-headers-4.4 )
-	test? ( net-libs/gnutls[tools] )
-"
-BDEPEND="
-	>=dev-util/meson-0.47.0
-	virtual/pkgconfig
-	doc? ( dev-util/gtk-doc )
-	man? (
-		app-text/docbook-sgml-utils
-		sys-apps/help2man
-	)
-"
-
-# required for fwupd daemon to run.
-# NOT a build time dependency. The build system does not check for dbus.
-PDEPEND="sys-apps/dbus"
-
-src_prepare() {
-	default
-	sed -e "s/'--create'/'--absolute-name', '--create'/" \
-		-i data/tests/builder/meson.build || die
-	sed -e "/'-Werror',/d" \
-		-i plugins/uefi/efi/meson.build || die
-	vala_src_prepare
-}
-
-src_configure() {
-	xdg_environment_reset
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dagent="$(usex agent true false)"
-		-Dconsolekit="$(usex consolekit true false)"
-		-Dgtkdoc="$(usex doc true false)"
-		-Delogind="$(usex elogind true false)"
-		-Dgpg="$(usex gpg true false)"
-		-Dman="$(usex man true false)"
-		-Dpkcs7="$(usex pkcs7 true false)"
-		-Dplugin_dell="$(usex dell true false)"
-		# Requires libflashrom which our sys-apps/flashrom
-		# package does not provide
-		-Dplugin_flashrom="false"
-		# Dependencies are not available (yet?)
-		-Dplugin_modem_manager="false"
-		-Dplugin_nvme="$(usex nvme true false)"
-		-Dplugin_redfish="$(usex redfish true false)"
-		-Dplugin_synaptics="$(usex dell true false)"
-		-Dplugin_thunderbolt="$(usex thunderbolt true false)"
-		-Dplugin_uefi="$(usex uefi true false)"
-		-Dsystemd="$(usex systemd true false)"
-		-Dtests="$(usex test true false)"
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \
-		"${FILESDIR}"/${PN}-r1 \
-		> "${T}"/${PN} || die
-	doinitd "${T}"/${PN}
-
-	if ! use systemd ; then
-		# Don't timeout when fwupd is running (#673140)
-		sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
-			-i "${ED}"/etc/${PN}/daemon.conf || die
-	fi
-}
-
-pkg_postinst() {
-	elog "In case you are using openrc as init system"
-	elog "and you're upgrading from <fwupd-1.1.0, you"
-	elog "need to start the fwupd daemon via the openrc"
-	elog "init script that comes with this package."
-}
diff --git a/sys-apps/fwupd/fwupd-1.3.10.ebuild b/sys-apps/fwupd/fwupd-1.3.10.ebuild
index a2f37ba6f6b0..f0c9fd71429f 100644
--- a/sys-apps/fwupd/fwupd-1.3.10.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.10.ebuild
@@ -44,7 +44,7 @@ CDEPEND="${PYTHON_DEPS}
 	dev-libs/libgpg-error
 	dev-libs/libgudev:=
 	>=dev-libs/libgusb-0.2.9[introspection?]
-	>=dev-libs/libxmlb-0.1.13
+	>=dev-libs/libxmlb-0.1.13:=
 	$(python_gen_cond_dep '
 		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
 		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
diff --git a/sys-apps/fwupd/fwupd-1.3.11.ebuild b/sys-apps/fwupd/fwupd-1.3.11.ebuild
index 660c7a1e2280..dd8d595a5892 100644
--- a/sys-apps/fwupd/fwupd-1.3.11.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.11.ebuild
@@ -44,7 +44,7 @@ CDEPEND="${PYTHON_DEPS}
 	dev-libs/libgpg-error
 	dev-libs/libgudev:=
 	>=dev-libs/libgusb-0.2.9[introspection?]
-	>=dev-libs/libxmlb-0.1.13
+	>=dev-libs/libxmlb-0.1.13:=
 	$(python_gen_cond_dep '
 		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
 		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
diff --git a/sys-apps/fwupd/fwupd-1.4.4.ebuild b/sys-apps/fwupd/fwupd-1.4.4.ebuild
index 96c9a88bdd6a..16576fceb82f 100644
--- a/sys-apps/fwupd/fwupd-1.4.4.ebuild
+++ b/sys-apps/fwupd/fwupd-1.4.4.ebuild
@@ -45,7 +45,7 @@ CDEPEND="${PYTHON_DEPS}
 	dev-libs/libgudev:=
 	>=dev-libs/libgusb-0.2.9[introspection?]
 	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
-	>=dev-libs/libxmlb-0.1.13
+	>=dev-libs/libxmlb-0.1.13:=
 	$(python_gen_cond_dep '
 		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
 		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
diff --git a/sys-apps/fwupd/fwupd-1.4.2.ebuild b/sys-apps/fwupd/fwupd-1.4.5.ebuild
index 3ee2fcebdfb6..246c5406ba15 100644
--- a/sys-apps/fwupd/fwupd-1.4.2.ebuild
+++ b/sys-apps/fwupd/fwupd-1.4.5.ebuild
@@ -9,7 +9,7 @@ inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
 
 DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
 HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
@@ -45,7 +45,7 @@ CDEPEND="${PYTHON_DEPS}
 	dev-libs/libgudev:=
 	>=dev-libs/libgusb-0.2.9[introspection?]
 	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
-	>=dev-libs/libxmlb-0.1.13
+	>=dev-libs/libxmlb-0.1.13:=
 	$(python_gen_cond_dep '
 		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
 		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
@@ -121,6 +121,7 @@ src_configure() {
 		$(meson_use gtk-doc gtkdoc)
 		$(meson_use man)
 		$(meson_use nvme plugin_nvme)
+		$(meson_use introspection)
 		$(meson_use redfish plugin_redfish)
 		$(meson_use synaptics plugin_synaptics)
 		$(meson_use systemd)
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index 5543dd01883f..9ff465d6aed9 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -8,7 +8,6 @@
   <use>
     <flag name="agent">Enable update notification agent</flag>
     <flag name="amt">Build and install Intel AMT plugin</flag>
-    <flag name="colorhug">Enable ColorHug support through<pkg>x11-misc/colord</pkg> package</flag>
     <flag name="consolekit">Use <pkg>sys-auth/consolekit</pkg> for session tracking</flag>
     <flag name="dell">Enable Dell-specific support.</flag>
     <flag name="gpg">Enable GPG support.</flag>
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 3c167fb4579a..9527b6ef8d45 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -2,6 +2,6 @@ DIST gawk-4.2.1.tar.xz 2985412 BLAKE2B ea0635904ae8af8943d545b21affbfad64de5a688
 DIST gawk-5.0.1.tar.xz 3136004 BLAKE2B 1dd8a9bca2488f2d3c946406b01fcbdce0487922ece49fe2121c39d6d10bcfcb6a056edbbf88ba6c22772ef88a250fc8ffcba33ead399c0d7c8f5d19d0e896d3 SHA512 ff9842a91035f843482d93eac8a35cddf2ce16acaa43a0112c1efff08802aebf705ee70d47eff74a190dca7be330c31f7204ad27cb63bdee65333f9b9c984212
 DIST gawk-5.1.0.tar.xz 3154564 BLAKE2B a969b03f45e1d830d2b3760d75530de97eb521a35ac448cf441d7fd2d1a8c1059bd9240cb9571f58ef6ec122864ced3d274a07453c3138177deda895ac3433d9 SHA512 971e6a7617eb051d587984f64be2ff830e49eb60721c3401e8944401e3c3a7cd3334f0334b6e28bfc9283aaff15d83b0933f1fd77b0f8c7059068fa3f94c3cb4
 EBUILD gawk-4.2.1-r1.ebuild 2164 BLAKE2B 09cbe472e3e9d6bcd194c27ead1d1d96f4c7eed3e5fb5ab68f0301b33cff378424c4caa92aa910c14675294d504a22cfb30067b70eb78121be681c640a4396b3 SHA512 f26f73852c3c26f7efcfb69bf11b6738e0bd4a9e03b22df753477160285675e35654c38f6777551f8607f8680b087a91948d2089e83c00e7474ef8645952cd65
-EBUILD gawk-5.0.1.ebuild 2224 BLAKE2B 1f393d6a908ccb2253426edd54254a8bde7c2d9ccf5a607a53a29c61ea896691901cf5e6ba6b72ddb255650f9942443cc54d5c7d1e8f7725e89f475b4df1c856 SHA512 ced61e17c22b7bbc3753898bab6036be08b3256d234518f76287556987a891f33ddeced6a21992bb04fc1c15aa2e28b76b96cd0b16038f81a2dc3ddefee01dc3
-EBUILD gawk-5.1.0.ebuild 2280 BLAKE2B 29352fd90acca40f4986842737909e282d1d082685e49ba35c125ccc0d30c575ed439e833100d3673d398c9c74b8c6955137d03e9afa93ceb605930e1aed6f54 SHA512 6249b492dc57bdbf408395711dabd0a1787372803d81b5852a78599dc1fba228a2c8acd2ca43862be17bdbd95829213c7ab1702061b0a4ef33cf20ebb9397e95
+EBUILD gawk-5.0.1.ebuild 2222 BLAKE2B e219e0676f2990b4a93f319f88971b5833d4df05e568b0fda47c607dc1889f90ece07ba64e67cd92f40dbd9c3184f45a4e8da83adff6bfaab08ef76cf8be2b94 SHA512 6f05586b66b986c7e0d65362afef1cc5aafb094242df50962fdcfc01e68decaef61b2f55e73b9b5ae88164a05e30ca203c83bfaeb19e7c9364e61c66871dd330
+EBUILD gawk-5.1.0.ebuild 2279 BLAKE2B 9174b18e45710bcfaad27e70858f8b58befe6d568b652091dc3122a7d604e86cdd5f90ae3fbaf4f147ec77de6eeb22569d4dec537425865525c85552e0ad3d27 SHA512 69181df51ff2e2e99e96729b82d43ce1fd21aa657bddbebe9ad3cee6b69ff857fb29a9b3f17b207ebb4d0cc64f9e76ba1a5008cfa1f6c63d55bf4caa7efdef2a
 MISC metadata.xml 347 BLAKE2B 3b0515d5ca37d12fbced19fc573e31fee27137e618aea3db03395a6bdecd8ad89d0d231fd3bb566ee993704a57b090a32697016885456e386b2c33ec37761b64 SHA512 1150e37d64393f26ef81056ff25e9720a4bc82dd28c9cffd164d144bb6d2f660f802a31d5ebf4fd121a01b36a4a5073893ebec6b735d3eb570da36705d5f446e
diff --git a/sys-apps/gawk/gawk-5.0.1.ebuild b/sys-apps/gawk/gawk-5.0.1.ebuild
index a26f77d0a7ac..8ae898e71e82 100644
--- a/sys-apps/gawk/gawk-5.0.1.ebuild
+++ b/sys-apps/gawk/gawk-5.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="mpfr nls readline"
 
 RDEPEND="
diff --git a/sys-apps/gawk/gawk-5.1.0.ebuild b/sys-apps/gawk/gawk-5.1.0.ebuild
index 850ebc1769ed..d3395ec104a2 100644
--- a/sys-apps/gawk/gawk-5.1.0.ebuild
+++ b/sys-apps/gawk/gawk-5.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="mpfr nls readline"
 
 RDEPEND="
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index 47452c6b8d81..85bac692fa78 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,6 +1,6 @@
 DIST gentoo-functions-0.12.tar.gz 11514 BLAKE2B 88f626a977b6f7b7cde2df452b91ef9570d29f3e6488d23859077b4d31a441dd0eb9cc473263e06a67dd90b714e24cbcfc09d4c4003f9cd29c8b7aeb0f3c91f9 SHA512 181e09216e1ed78f590e0bb50c60cfb0295bfeef335ed6c957ea7f2a1d6145d91c0a6dc4377bd6cd538fb4e5871e9a5ef8332d91bc91931792d5f05f62bc4705
 DIST gentoo-functions-0.13.tar.gz 11334 BLAKE2B 740e6d950b62b777e533d16b707cbf6f9ab0e9de4c92c5e755af186571539949017aadcd7d428b1e635f43052a575f89787b3e92087675b600a6b7350fda24a6 SHA512 61185197e1eb4155d0db9ba024dcb1b9eb0d272e3369f986668634012e35b57c3cdcd7beecd4714b9b48a0e44e8bb73472713949e16827aa05c055ec83d537dd
 EBUILD gentoo-functions-0.12.ebuild 835 BLAKE2B 8a36036b3bbc80261820214473955d90a06618b295535fc21d1937e6a1c30bea64805fb30ef1e07ea8b4d948abb34d317a668b3c6c0a076ead1da2428f2029b2 SHA512 f6b248792bc780986c247deff38d2bf5e58a659379a1394c7e46a7eb9ffa5d83e56d107b68bfeda3edc53e111e0c114d64084a79c63fb0b03f35f85ea7c70c25
-EBUILD gentoo-functions-0.13.ebuild 895 BLAKE2B 0e9cb57058a2d4141cd57c169ced43ee6f9afd33c0214e3303e01572b3667df7b5634a40ef78087b3e2333ada242f010f33042abd7e030848a3044a85a83d792 SHA512 dad2d0c9786786eca6dd55156599f1c2db030a15556ede83d03a170317f3f25d9226bba805575d82e46041759763e7972de05a6c34808e2b2e0ee6f8853701f2
+EBUILD gentoo-functions-0.13.ebuild 892 BLAKE2B 718c20c2155d5e94c745143ef3b405651ebf1de6bda5433644eed93cc7d75ed590dc4bf687caf8c4f7a8b4be5ba7abb022a8b46d638a8bf8e06515ebc7d22a83 SHA512 23741b4b42878a27274162ba3cdcf4a6ee57e8b84e8830e1e0ddac230a927cafde8bd3367c0818a62e3da4dfbc1cda2a08bef23c5d3eb61ad96b981cc6761db2
 EBUILD gentoo-functions-9999.ebuild 895 BLAKE2B 0e9cb57058a2d4141cd57c169ced43ee6f9afd33c0214e3303e01572b3667df7b5634a40ef78087b3e2333ada242f010f33042abd7e030848a3044a85a83d792 SHA512 dad2d0c9786786eca6dd55156599f1c2db030a15556ede83d03a170317f3f25d9226bba805575d82e46041759763e7972de05a6c34808e2b2e0ee6f8853701f2
 MISC metadata.xml 626 BLAKE2B 1ce5e077ad0857f9a7bd975429c8964dde8a340ed31d345439f8e1d8769873e8f36a5ce3fd9d611ae67478dacf2f9b6451e6bd93219532e32dc9a5840e1c03b9 SHA512 c63b4d51b0cd8ae662f66870ca15a26300005fd683a4a16643aa553128b2ded5ee0542a8185ae09b989040f602f2f42f79e02574e44bb1ce63457b5c0d8b4dd2
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
index 04f1a329e9ec..75d64323a8c9 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 inherit toolchain-funcs flag-o-matic
diff --git a/sys-apps/gentoo-systemd-integration/Manifest b/sys-apps/gentoo-systemd-integration/Manifest
index b8b6c9bbe570..bffe3cde4d66 100644
--- a/sys-apps/gentoo-systemd-integration/Manifest
+++ b/sys-apps/gentoo-systemd-integration/Manifest
@@ -1,6 +1,6 @@
 DIST gentoo-systemd-integration-7.tar.gz 64243 BLAKE2B 389c6627af6eca9b4a0854d35751a8cb45cdb2795c7b621e96e9d5bcc13a80fe1cb109c0cb2bfd9d33f7642fd08198a0afbd5b4e5956ea6ba8dc89cf4635d9c0 SHA512 cd47caa01d73da57998b6b37d89cbeb53fa722c7f4a31bb03d03762350490cde1db3ce06090df6b6ff25c1cafb40f6c2186efbd52156ebc6d078b4a59d6fef52
 DIST gentoo-systemd-integration-8.tar.bz2 53734 BLAKE2B 711f1f6603fa40e81fe32809a32f61486ab068b1f636502ac36d58e4c204b5f0d46f51a6624f134a457f246b520614213cf45cc5397de769b315e01e32720bcf SHA512 373892ca9ae8845673f9ddad74e0be0b71af944e109adf0d2ce8e54a9c24ffff5e90cfa92e74b7abc1e7d7b1598404258b90b549697bde28a1025a2d974e991f
 EBUILD gentoo-systemd-integration-7.ebuild 794 BLAKE2B 7f33bc671174599f5a855a93522f7888f2a818a2a45f47742ed61f05f05708b976ee566625df20cfd422dd6f9f9ba4ebd21fcefd51e9bbb2059d48b542e795cc SHA512 fdef060281bf6c98ac0236a6e111bf8f36746fe80c335b4b2fec453502f903effd7ff261593a60a836beb1e333812102061165c9e1f86a340c9bf3db3729bf1c
-EBUILD gentoo-systemd-integration-8.ebuild 735 BLAKE2B a1d3366124cc457a5537ae08cde3d0005a9d5cf47f0015743b759e9f0f5cf550f31f6380d4b6f515a3f28812acf2d8a64a3f47ebad413a2609326c58757e1130 SHA512 8045e9fe159ccbb4640c69a0986cb46094bb7358e0b0ed6b6b1d262ccd01f6a9e4be9862fd0213cb1b26fcab005aaa5ebb30df80f47424ccc76d2001e2f6939a
+EBUILD gentoo-systemd-integration-8.ebuild 744 BLAKE2B e44671d3e34f7665747b9d1fa10b10eee13c8d35a78dc786c993aa2d804dc2bdcf17b6a57edec0e1ef1fbaf3d2a397e01fc67e3c743fa32363b60a8432ef1532 SHA512 8bc93f6602fcc7736c8572318097577bec74e9096fc40dbb548ce14d32b154d1749391889fd242a099eb7022f533ddaab39a0032beaab04b9ddce27ef65500da
 EBUILD gentoo-systemd-integration-9999.ebuild 729 BLAKE2B 24adcb67d253b61a09eee0df7ee78cbcafc01c3e60f5d114351204f456cdd4c138f5c27c311e72ef80e976458424266c2b9d979aa1c8022887e7b01936975841 SHA512 bd37d55941397bf4aefda23375d58892a480d4348548a543d5a0d5139acfba677082e4c14eb839a9e9b77952fb86dd32623e0b9f255a36cc32ad9327d32ce345
 MISC metadata.xml 355 BLAKE2B e2e7d95fe4d4f671d0b8a24bee9db8c458232ceed374b7ed902f724ca5971cebb81acc19fe62a6d53bf98cff4c7b999d3dbcf674426e46accda3d591d6009545 SHA512 b590b927b555441da6f665dbf637ffaa27651f074a62d1738959c5913f45ee648146f9054e07ade42d5f28f93cb350b43c94299a50506d01d446de22ebacdbc0
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild
index 9ad1ea02babe..4c95169bb84b 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,8 +23,8 @@ IUSE=""
 RDEPEND=">=sys-apps/systemd-207
 	!sys-fs/eudev
 	!sys-fs/udev"
-DEPEND=">=sys-apps/systemd-207
-	virtual/pkgconfig"
+DEPEND=">=sys-apps/systemd-207"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 4b731d95d2b0..901c95c2d5ab 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -1,3 +1,7 @@
 DIST gnome-disk-utility-3.34.5.tar.xz 1385256 BLAKE2B d13202abf77c62cdbf483486d7ed8204016111042f29fc810f0a55a9cd3dd48553d523523348e73a5d3dc3c3133939577b14227f2f5122471076cd93482dde15 SHA512 04c1ba0865b3947cfc332e479faae7b404f70907d04446bfe471d8fa2f8f5c921b1d59ab0f82fad13f4183401dacf3a516ee7ec439e94dc3e073a8dd62021a51
+DIST gnome-disk-utility-3.36.1.tar.xz 1370848 BLAKE2B 02f642de5f0d320396bb5d9a258ab184955c412cc4351a77f60fe65a55818ea82a7f702b6646428f6aa44a88a08327aae4efda742956971c30aea10925cda169 SHA512 7565ef3647b4ae562af60e0cc70577268bb2baa54ece3859e5dfbd5e661a963788598768d591592d1dee3541673331f99c2bdb947a2a0af09cb6096887dc71fd
+DIST gnome-disk-utility-3.36.3.tar.xz 1373276 BLAKE2B 445aeaf68aa6b56dd6731e69e8fecdd1ca0385ba481bd0c8cd2ed411f7b117261f7acf47651f5354d0832141c479a6cd1b0727257d6f533159dd2d437edc59db SHA512 160283e1b0864e08ba6feb9368791e4cd3b287dc628553a69a1c276fa66252b37b1d906451b4342d953504a4669056aed0ebb3233ff61cbb761e612258ca078f
 EBUILD gnome-disk-utility-3.34.5.ebuild 1384 BLAKE2B 37135b54a03394ffb218821ade9332fb528994772bfcb69a0e665376ee4ce8107906ad865e2ace1db9949ba48be319b4297f9383bfb27945da3bb1839dca1283 SHA512 024bbfe9275316bd5e6beac2fca0bddbf1450310c9df2724ac6f67aa4cf1c1f00899dfd1a6ddbafd5ac8acb13e633ecb7fa44bfc0441e9efc68e6bad700ff52e
+EBUILD gnome-disk-utility-3.36.1.ebuild 1386 BLAKE2B 42ca1790d80525ac95924c17301247fd26471628fcaf92402510268b6fa5adbb85023ee440784b1ddab167462e8fa893ecbece2279d98aff97715ad21ae61c03 SHA512 0cf9e3572d9587c8ec4f5483670a7c2494c9b4043e759340e08ea513204b89023e10e365b4b5146b7d602570dfc7fef1e8e957a3db2efd3008cc1cc71fdc9cee
+EBUILD gnome-disk-utility-3.36.3.ebuild 1386 BLAKE2B 42ca1790d80525ac95924c17301247fd26471628fcaf92402510268b6fa5adbb85023ee440784b1ddab167462e8fa893ecbece2279d98aff97715ad21ae61c03 SHA512 0cf9e3572d9587c8ec4f5483670a7c2494c9b4043e759340e08ea513204b89023e10e365b4b5146b7d602570dfc7fef1e8e957a3db2efd3008cc1cc71fdc9cee
 MISC metadata.xml 597 BLAKE2B 6a1f81b2d7758158e8469a0544ce2ca45af42d24379391870b55fd97fd6dd963228136329af658851ecead1c14bf5a92658e6fde18223842451a9d85ccd628de SHA512 40904280037c0754d3481458bf024f83382e65122188f8fece8cd361cab57e01dfbc7b85da631b4265aaa6107567e376f4291e9f6e60e5e89bc747908c8e496c
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.36.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.36.1.ebuild
new file mode 100644
index 000000000000..6f3bb0f36d10
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.36.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Disk Utility for GNOME using udisks"
+HOMEPAGE="https://wiki.gnome.org/Apps/Disks"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="fat elogind gnome systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+	>=media-libs/libdvdread-4.2.0:0=
+	>=dev-libs/glib-2.31:2
+	>=x11-libs/gtk+-3.16.0:3
+	>=media-libs/libcanberra-0.1[gtk3]
+	>=app-arch/xz-utils-5.0.5
+	>=x11-libs/libnotify-0.7:=
+	>=app-crypt/libsecret-0.7
+	>=dev-libs/libpwquality-1.0.0
+	>=sys-fs/udisks-2.7.6:2
+	elogind? ( >=sys-auth/elogind-209 )
+	systemd? ( >=sys-apps/systemd-209:0= )
+"
+RDEPEND="${DEPEND}
+	x11-themes/adwaita-icon-theme
+	fat? ( sys-fs/dosfstools )
+	gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
+"
+# libxml2 for xml-stripblanks in gresource
+BDEPEND="
+	dev-libs/libxml2:2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dlogind=$(usex systemd libsystemd $(usex elogind libelogind none))
+		$(meson_use gnome gsd_plugin)
+		-Dman=true
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.36.3.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.36.3.ebuild
new file mode 100644
index 000000000000..6f3bb0f36d10
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.36.3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Disk Utility for GNOME using udisks"
+HOMEPAGE="https://wiki.gnome.org/Apps/Disks"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="fat elogind gnome systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+	>=media-libs/libdvdread-4.2.0:0=
+	>=dev-libs/glib-2.31:2
+	>=x11-libs/gtk+-3.16.0:3
+	>=media-libs/libcanberra-0.1[gtk3]
+	>=app-arch/xz-utils-5.0.5
+	>=x11-libs/libnotify-0.7:=
+	>=app-crypt/libsecret-0.7
+	>=dev-libs/libpwquality-1.0.0
+	>=sys-fs/udisks-2.7.6:2
+	elogind? ( >=sys-auth/elogind-209 )
+	systemd? ( >=sys-apps/systemd-209:0= )
+"
+RDEPEND="${DEPEND}
+	x11-themes/adwaita-icon-theme
+	fat? ( sys-fs/dosfstools )
+	gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
+"
+# libxml2 for xml-stripblanks in gresource
+BDEPEND="
+	dev-libs/libxml2:2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dlogind=$(usex systemd libsystemd $(usex elogind libelogind none))
+		$(meson_use gnome gsd_plugin)
+		-Dman=true
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 444a1110a915..98488b1a21df 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,5 +1,5 @@
 DIST grep-3.3.tar.xz 1473056 BLAKE2B e1592b623d1f32d1b21d127b0d28f8f6501d4b854ff2de810d12d43292c00e6af887b038f22d0c4c45c314b6e9d73a82dec6d737519c674bb139c2ef70511aa0 SHA512 e4805dbddf7cd0f0faf412557d408509650c1ccf703bc450f10a3f727c690dbfaa1235aa81939a0e4b7ac6190f88c15ea1fcc562b343d4b4c7550f967aeb15db
 DIST grep-3.4.tar.xz 1555820 BLAKE2B 4e1924d6d5eb66faca93b405cce9784d726a476f26a384c3b44375cb09f817008aeedaa701a30b6c1f21c030902d603a80ec80105b2d5d76eadf09b910d573a7 SHA512 0f1506bd19971fbdcb47a111277ca63e8ad045456f096980852fd0a61c860f29f4b369bbaaa5cbce4b0a81718e3e3274d9a078b491f2109baa9a02ce600ee206
 EBUILD grep-3.3-r1.ebuild 1463 BLAKE2B 2592d406868784921685aa21b321caf12126627c935d729a8827048532779e7deeee21598f699ea6f9d238d945dfbca59b72555064a5ac32d5ab7fb93720bc47 SHA512 86392996c511087c09c2822dd861d6c223482ebe97b7c77a53673f003447b393cfee09647a302a939ca98cf5e7b123012323ff0dad00e9df0563d86f575f9693
-EBUILD grep-3.4.ebuild 1522 BLAKE2B bcfd24d3219eb4daa64894084e592d277dae2cbebda55ed2c7cc71688cf4630766e5529ef9c04cd2ca4a57af7ad9cf49c88a0e04c7ec72a5ea76ab4e5da1cb40 SHA512 e2654150a88cb90c194e9cc20828ababa8290fbfabe98ab93c95c41fc80c0b29800b93bb415c0b5a9194705f1a7b518ff77b33cc16489057311435742cb9db69
+EBUILD grep-3.4.ebuild 1517 BLAKE2B ba4ebc6d4a72db390bcaaecc05e0e024338d268a33cad53ed6763507c8b59330bdc7d651fa2f76f9ca024dc0c12b864e568b0a480003b40a1ce70d2ee7e9c9bc SHA512 7aa92373a0550d84875d5b6be09a11044226925762a08393def1a753db1b59c94074c53915182807a743f086fe46755e8e46feef2a3f6699a754898d4736ac07
 MISC metadata.xml 327 BLAKE2B 4b377e001da15ee2ba05c41866d06eb3e9833f46b6985c38adb405842fb434bdfb49d944557787f4ed68d8e7194036d298b662973c480043ac841ff628a57f53 SHA512 394c0bd736594ec5ef916f1bd0b4b1d8b5547132bb375fe04f67da49fd0cdaec184206e8255f054b8cb5656dc5426e92a51781758cc1b6373200f31bd3152d6f
diff --git a/sys-apps/grep/grep-3.4.ebuild b/sys-apps/grep/grep-3.4.ebuild
index a581969446e1..8bd9ca9acf66 100644
--- a/sys-apps/grep/grep-3.4.ebuild
+++ b/sys-apps/grep/grep-3.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls pcre static"
 
 LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index 2874c71c601d..fa3fd7be1ee1 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -1,11 +1,4 @@
 AUX groff-1.19.2-man-unicode-dashes.patch 582 BLAKE2B 73e0868465b5372376e5bb5b382f2a4918fb9227208ad001f35ae041af93fda494a9be355e732697d264ec974d6e9528f9f91e0d26b2ecd82a41508222f1e439 SHA512 7d9f88c8bcc1b220c82c214f2f638601e8b44bd3933df03c74a2ef51b555773734c92044a3162bf5815932ddaae08158994a7c5106098de3e9f3bf202975de97
-AUX groff-1.22.2-parallel-mom.patch 3903 BLAKE2B ae706b988d0236f32d981239749aeaf27fd0353173e54566f481492dd93c583d75123a26132fdad54fa09ca2ed035ae28df4eb6cd3e9bccd8d8f348a6cbcd28f SHA512 314fe3d619dc7dd373f1d9ea75d4d8cb365fc7278a958a3dec09e95ba3bf75180edb5f4ec3d43b4791b0252b733f9916e6189794b098b09171f45eb65bee713f
-AUX groff-1.22.3-parallel-mom.patch 378 BLAKE2B 46d38a599ec073bddd24a31562960ed86c764679090c72ffe64024944c03d7c556313397c3244adf1d15dc79b75a900a5f627276e28435bff4dea5788b1a9d18 SHA512 29330641fcdcc052cc1760dd69c523f2cfaf4264110b7471ac3dfc00e12a371fa69f3a6902221a575da3b89fb7acc5b161234c95e5a4c4d105bf46d7ffd5d038
-DIST groff-1.22.1-japanese.patch.bz2 52968 BLAKE2B 8064ff973c9507536c4e6edb6146c33c6c3a994598f0bb925bd23307a5ed407af9fe744990735d640ea69def4a6aed69ee87b7abbacca401c0059cf63e6eb147 SHA512 883d15dd2f1420a067d35737c45431f33f05bbe3c7e7edab0e119416117b5d096972d71452eae94bfd3df23aa7d6595fc6e65208bd4fba86815162bdf9af8bef
-DIST groff-1.22.2.tar.gz 4019913 BLAKE2B 904a2a6064cc70cf088224d6f608389eb56842142802636b94fef30f5e20b5c62db03087878d0e04e22c65754e0fd253aa7cfd23c1354057862f70e17db43366 SHA512 ea34db53f075b6816827b07ac3d6a19ed50529c939044337eb3124575ac3b41363e1d81bbd5bf552a7a10f6b1dd233d6e7acaf646e18cfe94464c59dc20ffe80
-DIST groff-1.22.3.tar.gz 4188772 BLAKE2B 28c380d33719f4eb0c91a9761e76beb9a2f1f6fb632c731bb6b26f76fee1857e7340d62a2239b360e049351e2e291c420db18a4f6bf8f50221bf249457872693 SHA512 c526ab203d13a9c9d110bcd3149fe50d1cd0d309437e9e2731a7ce90d890507ebc0a2331899ecf4dba2938daa756b6094cf76fd347a0ded59797c70ccfd0c95c
 DIST groff-1.22.4.tar.gz 4137480 BLAKE2B cdda8a7e8e42b8d8991656ecfbffe0cd0ed5d8932467cab2f3c1eecb3365f4a5c03321b6ed929d451c3dfb00a46046a781303a1c55c4aa65eb7d178fb36b1cbc SHA512 1c42d3cd71efaf067b5850945d9097fa1f0fadd5e2b6ba7446bd9d4f439fe1ad058e4ddb0d4e0f503682137dfc7c822944ce1e3e5cf981673f8ba197ea77126d
-EBUILD groff-1.22.2.ebuild 2792 BLAKE2B 0319d0b38341ca672e408b4c5ff2d92e71c2d6adcd0f282a1e128328e3af485f74737ca7b7d5b48ab227a04911bbabe153671dd548e3af2dd84924bc77aa0cdb SHA512 8903afe4bbc5ddbce88b85f3098c2d0172aee6b2da98196b7bf913eedcde939720b2fb0d16276817097bc3d1da6d350e38599bb452d0f9d1165539a76ecb9d33
-EBUILD groff-1.22.3.ebuild 2506 BLAKE2B c72c5bbfb1fc6b733be04ca30862c42367b67417547b602f955807e5ad1ea5af8535bdf8188b68949d7f1a59e07427ff17011b8a45454f3fe9fc50436f97f996 SHA512 b79e10a91f4a4af83bb24f39a7265dd72a986d3a1aa400e2829b7a5b4fc4beca1b9dcf9099f5c263260ef15da006eaa7f5e2b0ecf91dd94a004c24ee24fcc550
-EBUILD groff-1.22.4.ebuild 2555 BLAKE2B a5697a196faf1923d3e14e0a6ceb8df48926972296895cb483b091d97f8429b6bdd23c2c94c1cd691f7c7eddf4c0c900f0d10ffca606da6e0fbe2f4b00aa830e SHA512 209f5592785df2a50c21196f49e4ce87859e718f864aa715df5bd07129aec40a6257d2fe3ee1480032bdf5af04f60e55c0a68518cc32909028aa24e462f195e3
+EBUILD groff-1.22.4.ebuild 2554 BLAKE2B b23c96acb3a55f7fb564e63c9fe3a3c3cf6dff46d53801f7a030df8749f08bc71bec43e9ad99044b4384644f2cbfd7420146f6dfed9d48c363a05d1a34f03098 SHA512 de9d128515e920c41450583ecea715cf79dc358c26213adf27fc875c92cdc3d3178b619e185923073b0720c500fbe65babdab6096571f99cd06ab0b710fb484b
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/groff/files/groff-1.22.2-parallel-mom.patch b/sys-apps/groff/files/groff-1.22.2-parallel-mom.patch
deleted file mode 100644
index 7cf3c22295d5..000000000000
--- a/sys-apps/groff/files/groff-1.22.2-parallel-mom.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 9f3af719383ab525c86ee0f514e268ef8494330a Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Fri, 6 Dec 2013 20:40:10 -0500
-Subject: [PATCH] fix parallel build w/gropdf and mom examples
-
-The contrib/mom/examples/ directory uses the helper script from
-src/devices/gropdf/.  Currently though, parallel builds might fail
-like so:
-
-...
-make[2]: Entering directory `.../groff-1.22.2/contrib/mom'
-GROFF_COMMAND_PREFIX= GROFF_BIN_PATH="`echo .../groff-1.22.2/src/roff/groff .../groff-1.22.2/src/roff/troff .../groff-1.22.2/src/devices/grops .../groff-1.22.2/src/devices/gropdf | sed -e 's|  *|:|g'`" PDFMOM_BIN_PATH=".../groff-1.22.2/src/devices/gropdf" .../groff-1.22.2/src/devices/gropdf/pdfmom -F.../groff-1.22.2/font -F.../groff-1.22.2/font -M.../groff-1.22.2/tmac -M.../groff-1.22.2/tmac -M. examples/letter.mom >examples/letter.pdf
-GROFF_COMMAND_PREFIX= GROFF_BIN_PATH="`echo .../groff-1.22.2/src/roff/groff .../groff-1.22.2/src/roff/troff .../groff-1.22.2/src/devices/grops .../groff-1.22.2/src/devices/gropdf | sed -e 's|  *|:|g'`" PDFMOM_BIN_PATH=".../groff-1.22.2/src/devices/gropdf" .../groff-1.22.2/src/devices/gropdf/pdfmom -F.../groff-1.22.2/font -F.../groff-1.22.2/font -M.../groff-1.22.2/tmac -M.../groff-1.22.2/tmac -M. examples/mom-pdf.mom >examples/mom-pdf.pdf
-/bin/sh: .../groff-1.22.2/src/devices/gropdf/pdfmom: No such file or directory
-make[2]: *** [examples/letter.pdf] Error 127
-/bin/sh: .../groff-1.22.2/src/devices/gropdf/pdfmom: No such file or directory
-make[2]: *** [examples/mom-pdf.pdf] Error 127
-make[2]: Leaving directory `.../groff-1.22.2/contrib/mom'
-make[1]: *** [contrib/mom] Error 2
-...
-make[2]: Entering directory `.../groff-1.22.2/src/devices/gropdf'
-sed -f .../groff-1.22.2/arch/misc/shdeps.sed \
-	-e "s|@VERSION@|1.22.2|" \
-	-e "s|@PERLPATH@|/usr/bin/perl|" ./pdfmom.pl >pdfmom
-
-The top level makefile tries to account for this in general with OTHERDIRS,
-but looks like src/devices/gropdf/ was added to this variable (which holds
-contrib/mom/ too) because gropdf installs a shell script, and the other
-prog vars require it to be a dir of things to compile.
-
-Declare a new prog var for holding shell scripts.
-
-URL: http://crbug.com/324116
-URL: https://bugs.gentoo.org/487276
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-
-2013-12-06  Mike Frysinger  <vapier@gentoo.org>
-
-	* Makefile.in (SHPROGDIRS): Declare.
-	(PROGDIRS): Add $(SHPROGDIRS).
-	(OTHERDIRS): Delete src/devices/gropdf.
-	($(SHPROGDIRS):): Add to existing rule.
-	($(OTHERDIRS):): Depend on $(SHPROGDIRS).
----
- Makefile.in | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index a794de7..8e478af 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -602,12 +602,15 @@ CCPROGDIRS=\
-   src/utils/addftinfo
- CPROGDIRS=\
-   src/utils/pfbtops
-+SHPROGDIRS=\
-+  src/devices/gropdf
- PROGDEPDIRS=\
-   arch/misc
- PROGDIRS=\
-   $(PROGDEPDIRS) \
-   $(CCPROGDIRS) \
-   $(CPROGDIRS) \
-+  $(SHPROGDIRS) \
-   $(XPROGDIRS)
- DEVDIRS=\
-   font/devps \
-@@ -637,7 +640,6 @@ OTHERDIRS=\
-   contrib/glilypond \
-   contrib/hdtbl \
-   contrib/pdfmark \
--  src/devices/gropdf \
-   font/devpdf \
-   contrib/mom \
-   contrib/gdiffmk
-@@ -778,7 +780,7 @@ $(CCPROGDIRS): FORCE $(LIBDIRS)
- 	  -f $(top_srcdir)/Makefile.ccpg \
- 	  -f Makefile.dep $(do)
- 
--$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS)
-+$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS) $(SHPROGDIRS): FORCE $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS)
- 	@$(ENVSETUP); \
- 	if test $(srcdir) = .; then \
- 	  srcdir=.; \
-@@ -809,7 +811,7 @@ $(GNULIBDIRS): FORCE
- 	  $(MAKE) ACLOCAL=: AUTOCONF=: AUTOHEADER=: AUTOMAKE=: $(do) ;; \
- 	esac
- 
--$(OTHERDIRS): $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS)
-+$(OTHERDIRS): $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) $(SHPROGDIRS)
- 
- $(INCDIRS) $(PROGDEPDIRS) $(OTHERDIRS): FORCE
- 	@$(ENVSETUP); \
--- 
-1.8.4.3
-
diff --git a/sys-apps/groff/files/groff-1.22.3-parallel-mom.patch b/sys-apps/groff/files/groff-1.22.3-parallel-mom.patch
deleted file mode 100644
index 10661ac27f2c..000000000000
--- a/sys-apps/groff/files/groff-1.22.3-parallel-mom.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- groff-1.22.3/Makefile.in
-+++ groff-1.22.3/Makefile.in
-@@ -864,7 +864,7 @@
- 	  -f $(top_srcdir)/Makefile.ccpg \
- 	  -f Makefile.dep $(do)
- 
--$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE \
-+$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS) $(SHPROGDIRS): FORCE \
- 		$(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS)
- 	@$(ENVSETUP); \
- 	if test $(srcdir) = .; then \
diff --git a/sys-apps/groff/groff-1.22.2.ebuild b/sys-apps/groff/groff-1.22.2.ebuild
deleted file mode 100644
index e3b6ed2c8069..000000000000
--- a/sys-apps/groff/groff-1.22.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="Text formatter used for man pages"
-HOMEPAGE="https://www.gnu.org/software/groff/groff.html"
-SRC_URI="mirror://gnu/groff/${P}.tar.gz
-	l10n_ja? ( https://dev.gentoo.org/~naota/patch/${PN}-1.22.1-japanese.patch.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples X l10n_ja"
-
-RDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXmu
-		x11-libs/libXaw
-		x11-libs/libSM
-		x11-libs/libICE
-	)"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	l10n_ja? ( virtual/yacc )"
-
-DOCS=( BUG-REPORT ChangeLog MORE.STUFF NEWS PROBLEMS PROJECTS README REVISION TODO VERSION )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.19.2-man-unicode-dashes.patch #16108 #17580 #121502
-	epatch "${FILESDIR}"/${PN}-1.22.2-parallel-mom.patch #487276
-
-	# Make sure we can cross-compile this puppy
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e '/^GROFFBIN=/s:=.*:=${EPREFIX}/usr/bin/groff:' \
-			-e '/^TROFFBIN=/s:=.*:=${EPREFIX}/usr/bin/troff:' \
-			-e '/^GROFF_BIN_PATH=/s:=.*:=:' \
-			-e '/^GROFF_BIN_DIR=/s:=.*:=:' \
-			contrib/*/Makefile.sub \
-			doc/Makefile.in \
-			doc/Makefile.sub || die "cross-compile sed failed"
-	fi
-
-	local pfx=$(usex prefix ' Prefix' '')
-	cat <<-EOF >> tmac/mdoc.local
-	.ds volume-operating-system Gentoo${pfx}
-	.ds operating-system Gentoo${pfx}/${KERNEL}
-	.ds default-operating-system Gentoo${pfx}/${KERNEL}
-	EOF
-
-	if use l10n_ja ; then
-		epatch "${WORKDIR}"/${PN}-1.22.1-japanese.patch #255292 #350534 #450796
-		eautoconf
-		eautoheader
-	fi
-
-	# make sure we don't get a crappy `g' nameprefix on UNIX systems with real
-	# troff (GROFF_G macro runs some test to see, its own troff doesn't satisfy)
-	sed -i -e 's/^[ \t]\+g=g$/g=/' configure || die
-}
-
-src_configure() {
-	econf \
-		--with-appresdir="${EPREFIX}"/usr/share/X11/app-defaults \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_with X x) \
-		$(usex l10n_ja '--enable-japanese' '')
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	# The following links are required for man #123674
-	dosym eqn /usr/bin/geqn
-	dosym tbl /usr/bin/gtbl
-
-	if ! use examples ; then
-		# The pdf files might not be generated if ghostscript is unavailable. #602020
-		local pdf="${ED}/usr/share/doc/${PF}/examples/mom/mom-pdf.pdf"
-		if [[ -e ${pdf} ]] ; then
-			# Keep mom-pdf.pdf since it's more of a manual than an example. #454196 #516732
-			mv "${pdf}" "${ED}"/usr/share/doc/${PF}/pdf/ || die
-		fi
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/sys-apps/groff/groff-1.22.3.ebuild b/sys-apps/groff/groff-1.22.3.ebuild
deleted file mode 100644
index 0e33f70c4c41..000000000000
--- a/sys-apps/groff/groff-1.22.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Text formatter used for man pages"
-HOMEPAGE="https://www.gnu.org/software/groff/groff.html"
-SRC_URI="mirror://gnu/groff/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples X"
-
-RDEPEND="
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXmu
-		x11-libs/libXaw
-		x11-libs/libSM
-		x11-libs/libICE
-	)"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-DOCS=( BUG-REPORT ChangeLog MORE.STUFF NEWS PROBLEMS PROJECTS README REVISION TODO VERSION )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.19.2-man-unicode-dashes.patch #16108 #17580 #121502
-	epatch "${FILESDIR}"/${PN}-1.22.3-parallel-mom.patch #487276
-
-	# Make sure we can cross-compile this puppy
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e '/^GROFFBIN=/s:=.*:=${EPREFIX}/usr/bin/groff:' \
-			-e '/^TROFFBIN=/s:=.*:=${EPREFIX}/usr/bin/troff:' \
-			-e '/^GROFF_BIN_PATH=/s:=.*:=:' \
-			-e '/^GROFF_BIN_DIR=/s:=.*:=:' \
-			contrib/*/Makefile.sub \
-			doc/Makefile.in \
-			doc/Makefile.sub || die "cross-compile sed failed"
-	fi
-
-	local pfx=$(usex prefix ' Prefix' '')
-	cat <<-EOF >> tmac/mdoc.local
-	.ds volume-operating-system Gentoo${pfx}
-	.ds operating-system Gentoo${pfx}/${KERNEL}
-	.ds default-operating-system Gentoo${pfx}/${KERNEL}
-	EOF
-
-	# make sure we don't get a crappy `g' nameprefix on UNIX systems with real
-	# troff (GROFF_G macro runs some test to see, its own troff doesn't satisfy)
-	sed -i -e 's/^[ \t]\+g=g$/g=/' configure || die
-}
-
-src_configure() {
-	econf \
-		--with-appresdir="${EPREFIX}"/usr/share/X11/app-defaults \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_with X x)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	# The following links are required for man #123674
-	dosym eqn /usr/bin/geqn
-	dosym tbl /usr/bin/gtbl
-
-	if ! use examples ; then
-		# The pdf files might not be generated if ghostscript is unavailable. #602020
-		local pdf="${ED}/usr/share/doc/${PF}/examples/mom/mom-pdf.pdf"
-		if [[ -e ${pdf} ]] ; then
-			# Keep mom-pdf.pdf since it's more of a manual than an example. #454196 #516732
-			mv "${pdf}" "${ED}"/usr/share/doc/${PF}/pdf/ || die
-		fi
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild
index f97de5f3c1ba..78724e949eac 100644
--- a/sys-apps/groff/groff-1.22.4.ebuild
+++ b/sys-apps/groff/groff-1.22.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/groff/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples X"
 
 RDEPEND="
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index 2be8628cfaf6..cfe2c0c0fb2a 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -6,7 +6,7 @@ AUX service.gentoo 322 BLAKE2B 302a1506492e5122a03ea616de11dea493637d904cde1415a
 DIST haveged-1.9.13.tar.gz 495737 BLAKE2B 5a8c154d27ca7dc71e7d34051a5e24ec2bd49be7a68175c351293958261083f2cfb0b318daaf005cc95f6a9b76664df63d4c41d28d4276f6906081d21097475a SHA512 dff0f4273643ed6b2fea26f1ba5c17be3d655d27ab0b96091bcd23e1cb984fc440cc81e694cc7bcc84a9a667d96f3c04a73675f79ecae525ee56390940cce576
 DIST haveged-1.9.2.tar.gz 494682 BLAKE2B a972d128b19fecc3d01e17bd4cf6d5ec03ae716c4b4934c73193e03f3d3f9ff3461a8280ec0a20885499fd334343deb193ddc98b0697b2b14f92fff897bbf59b SHA512 65f70950fb90ef9c24ff3bf1b26e19a9cde2bec4749e2e64d5461a51646a20cf610efa2a5014219b8605957afa0084abd2ba11c7dc15f9379afce784971627b8
 DIST haveged-1.9.8c.tar.gz 494470 BLAKE2B 840aa0b985107feb38a7b5823f94de3473e79f75542565e571c4ec9b2640dddcabb09d598e101678defbdd2eb04fe2fc1fb1f8466157e53d7c41272131450dec SHA512 24167e8a9773d96b3c57cd3e57def7e291f3de86873e796cafc1a59d3f89818c6cb8d46d05e5ae4eb2683fc86b313b1acaed7f210724dadb7df3939e1b3900aa
-EBUILD haveged-1.9.13.ebuild 945 BLAKE2B 8dad88810d8e0bafe8655c51e8c5cfe98955ff6712f884254302c22655f880ad94481a4041454f2a1599eb8c25d36ba09ba914764fe6ee735dfa6d4b622bebc2 SHA512 ac291a8be5d047d7965817580e1131ed7ef067893275cb27fa50af48dcc601f9c9eec56009e7230a1679ba34d0b3fb5801af9ab18452de591662ca6ee50aba4c
-EBUILD haveged-1.9.2-r1.ebuild 960 BLAKE2B ca6650ea624b8ca6a372ace436bdef5c2a956fc627a16a2ccf8083a0ea3e147f5cec9571b560a5e423e1a4abd36337d632d74ac4365aa7c141a8fe81d214d79b SHA512 e18f627765762c3b64f34319bd3756bda5963cb861f6fd04a3d2e31a736bd19d99d9ab4dc3690563dbf9fbd11b750431cc808c9252c5f043c6dda4b0654c2a28
-EBUILD haveged-1.9.8c.ebuild 1007 BLAKE2B 17ea013ddb1531b3890c510404467204545b38feedc14b46eabe5ea6bee101012610acfd389823023c403c87e082be5ef778549551da134cca69ccea6284743c SHA512 3280473cbc0efc70ad1b0ff942cec564481c77768025153d94377a377ed463a2d0e29513a0b7381bb192e0c20f98e0874a5f48145d440ccd13eab07cc5ec4f26
+EBUILD haveged-1.9.13.ebuild 951 BLAKE2B 8cb8eacf9227fd0d68cab0f612145c806eddbd02dac0420bb20355a2aa685b0180a518a83faff6768e0026405e5979a62cf820217ada046ca863ed6137593686 SHA512 b0427a8e45ba0dea92e0395dd1de5c9cc6a6a14f97fd0456891080401b6bcdc76024f9dba965b672ce9cde979c35a998c33698b3e427b202ae81be28f0510a41
+EBUILD haveged-1.9.2-r1.ebuild 963 BLAKE2B bf2f2452d79d16443399910a5e21867b76ee3ba1199018b866419bf33b75b7b02dcca985b26cc062a8871160382a83d24aa151188e0eba03c2fec80df127aefa SHA512 3322e6668948ce18dc1857fb8f72521ce348f0590fd81e6fc945e37724653b8e4e856ad403e7bc4f6dfca17ac69221a57dd29227d123987caa91c857625fd52b
+EBUILD haveged-1.9.8c.ebuild 1013 BLAKE2B c6bd3c7abed9f3689ae5963510e90e2e8d313e9de6df1e1923685b5ed149997251982af5f4180c0003644d9eb37759e7e1d680403d6fea2f43ec3042b60d34d5 SHA512 e497acb97c2086916b9c9876926493805cc5873ba253ec9a2549383db3696a51301633b2d73ff86d24b0b134cf24c2519c42b1fdcd9142cae3cdb16324310404
 MISC metadata.xml 371 BLAKE2B d44d1873136cfff8c9c1ae42ee0ded780af875987caecc98494afba60017c3da105423642f10f2475d344636d54c71885607649ceb4f285a477698b40449d2ef SHA512 640e188a0829d4408d9bc7ca0c7558222ed8148afef25a88a136c0ae5bb44531bc8352c9c1da1c13e395cb54d67c62a485fa4f6329ad7b76255def9d979b70d0
diff --git a/sys-apps/haveged/haveged-1.9.13.ebuild b/sys-apps/haveged/haveged-1.9.13.ebuild
index c439fda13266..e312af7ae69d 100644
--- a/sys-apps/haveged/haveged-1.9.13.ebuild
+++ b/sys-apps/haveged/haveged-1.9.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE="selinux static-libs threads"
 
 RDEPEND="
diff --git a/sys-apps/haveged/haveged-1.9.2-r1.ebuild b/sys-apps/haveged/haveged-1.9.2-r1.ebuild
index 65f4ac487086..c3429c8d4723 100644
--- a/sys-apps/haveged/haveged-1.9.2-r1.ebuild
+++ b/sys-apps/haveged/haveged-1.9.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.issihosts.com/haveged/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc x86"
 IUSE="selinux static-libs"
 
 DEPEND=""
diff --git a/sys-apps/haveged/haveged-1.9.8c.ebuild b/sys-apps/haveged/haveged-1.9.8c.ebuild
index 689b8fc67141..52a76b0dcb25 100644
--- a/sys-apps/haveged/haveged-1.9.8c.ebuild
+++ b/sys-apps/haveged/haveged-1.9.8c.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 IUSE="selinux static-libs threads"
 
 RDEPEND="
diff --git a/sys-apps/hd-idle/Manifest b/sys-apps/hd-idle/Manifest
index 50bc4bfedf46..46f89cd74544 100644
--- a/sys-apps/hd-idle/Manifest
+++ b/sys-apps/hd-idle/Manifest
@@ -2,6 +2,5 @@ AUX hd-idle-conf 1530 BLAKE2B a67f5d13a3a204c0e49e66c91c1503d1b9cb191d35def96f3e
 AUX hd-idle-init 296 BLAKE2B e4d2b4a7f7ff816198c7e9b1b5289ec3abb1a928d4bfe50175af2d25d4333a661ad7beaa0c6a6a6fc73775a2e61408e7b6ea2721239648d1e4142be09e07c9cd SHA512 aa26ad5f4d0e97197801ca3e791301a88bcf86f094b338f2c9f7b5000de7fbb91efb9cab8e3b142039b17d5dfb47bf07465a85d12a3ed3594a9d0f38e6e518f2
 AUX hd-idle-service 349 BLAKE2B 1bf8fe9941f3ab861263047742f9275c7481a4198f9b20261b98b0e343ee95d725affb61b931e5a54a74e5494e5b47d0c7ac4221e1ebbc599b19f05fa0d4dfa3 SHA512 a819a6150b7a83928112f9088effc99c2ed1c91fd792ed5d79f4da3c85a2660a4a756f247ab286cb2fa30b34d4901ef395c73c73ea933cc24765050f9f26602c
 DIST hd-idle-1.05.tgz 17951 BLAKE2B f99dd25d41f2ac4391025ff652827a8687db19df2dafe0f07eeeea700eaf0d67a255ee67017123510a3b89f3aba2f50de7204923d9ab85e80138f657f5e120d3 SHA512 8636d8bf2bce40f380afdea859aef7d142258071c62f87884a9af55c7c84310d89de712f56dff2bd825f0c7d79b04356df92e3012d8f683d8c41ebb23cd3920b
-EBUILD hd-idle-1.05-r1.ebuild 618 BLAKE2B 6d2d8cf50cfc8c8e62e3ce35bf05d837668cfc4c945cd080dfd4155908e9e6de3d0a90954fd57b018735c0b63457d74345257ddf10c52f3acf15fecefeee5fe4 SHA512 ca7f08037f17977fd15a259137a7475910970565c37d50298c78099f46dc9f19ca3a10237b47041254f756da38cd7bfb4efd11522d1b3bdf918d420adce83693
-EBUILD hd-idle-1.05.ebuild 562 BLAKE2B 491e107b32545f79f9ecf3db8c7873acc275f7546d3bbf2a7d880423666b9c682a9ed7550e875e075e743cb20e8c5aef29d1feaa87022bb50992b162b72bad4e SHA512 2b2f7393bb8acb0e217946b9ba08389084d5a615d719d4664abf5cf746aaed32ec786b84b381aca393098e4f0b1cbfbcc36a339b2e761df355ec24c25b5001fd
+EBUILD hd-idle-1.05-r1.ebuild 616 BLAKE2B 4d613a67dd4a3addd5bda95bd914bff5b206c6faf0c2d94da67405fe1c8aea477ab09435a89c8ed14597fe703933ff2d0a49fdd3ddd294e1ef7e0aaa7883e0f7 SHA512 08a4da1b4409dd71707366db50d9e1daf84c5c58bc60472c596c9842197145b5d1ba27150b5287db0c73cc2771ab601949932d8211c803e4ec9707d70d606f56
 MISC metadata.xml 470 BLAKE2B 4f25dbde41f691405a8290671c9c39baf0cf2fb08cbc5b1fb35307fb37f8dbfeb80a8cdffb8ab3fd58857eae738ba8af3465f1db2789d9f7899fd13a6d467303 SHA512 0f6483a0a6f8a89d8de21ae2506854221b7e5077a69ec70238451efbb2c15690c46296d493f0da5e348b1f7eaa75711bbef669d6d913b7f15e231d159d081945
diff --git a/sys-apps/hd-idle/hd-idle-1.05-r1.ebuild b/sys-apps/hd-idle/hd-idle-1.05-r1.ebuild
index 2700e28dab59..d65adc91bc74 100644
--- a/sys-apps/hd-idle/hd-idle-1.05-r1.ebuild
+++ b/sys-apps/hd-idle/hd-idle-1.05-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/sys-apps/hd-idle/hd-idle-1.05.ebuild b/sys-apps/hd-idle/hd-idle-1.05.ebuild
deleted file mode 100644
index 0650f006a7d5..000000000000
--- a/sys-apps/hd-idle/hd-idle-1.05.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info
-
-DESCRIPTION="Utility for spinning down hard disks after a period of idle time"
-HOMEPAGE="http://hd-idle.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-S="${WORKDIR}/${PN}"
-
-CONFIG_CHECK="~PROC_FS"
-
-DOCS=( debian/changelog README )
-
-src_install() {
-	default_src_install
-	newinitd "${FILESDIR}"/hd-idle-init hd-idle
-	newconfd "${FILESDIR}"/hd-idle-conf hd-idle
-}
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index a89b1cfcac39..b9cbd9e39940 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -3,6 +3,6 @@ DIST help2man-1.47.10.tar.xz 202176 BLAKE2B 57c19072b1fb696b8ae1fc269d4c44672e69
 DIST help2man-1.47.15.tar.xz 202776 BLAKE2B 3f06bc254fc8e0e8884d9b8bd63b53f23ea4f9a9e1d16f7f7f2ba83ee052f35a85489ffad7b59bb41277ef68b22caa35790513115d5af43fb09cc8d5cdf4ebb0 SHA512 2ab835610545f37eef2d77887371378decbac622196426a3444c5fb495596371d0151a92c79d3e3040e93acf3dbeefbc431dac1e76a370fdb5063b43192545ad
 DIST help2man-1.47.16.tar.xz 203036 BLAKE2B 8e06c2c2e90adfc2ab8345908516b15ae50b02a7a9554d5d9beee4373b71c131aeaa0c148b9a988c531bbfe2149c25069af56a79101a4248b6c1adfeb734a132 SHA512 b427e60a9e3d2e805caf1ae84c337b09c7ca6f92b7ff14771f946c4a1bf7adf177df99b9c1c223ad76df99756005ababf5b548ff8e08d4746702ff7f8150b544
 EBUILD help2man-1.47.10.ebuild 1023 BLAKE2B b19c59b3453733e9d1eb6a88ba2a62d526c975222c1a2d4ea58c0d1a5bfb3aa3a39f943aa99c3ae18a65213b640f1d52de90bbb820eb5c39d079b3d2ce9e6198 SHA512 8798779819277de34b892a71395504cee115c1310dbab921a2fe4866967e16d0f40f34e5b13a31496b69b462bd5b944fd1470dd87b425fc21fdbec8372b1a38c
-EBUILD help2man-1.47.15.ebuild 1074 BLAKE2B 3d3642c022ccc23972017a3a7427b04c25de4c8082381c293ac2e3da6eaa1f057cad1efa203836f680b8cdd24c6c5f46b859e51dc2b4451acb411d045b023e02 SHA512 78e07687855df5c806cf74bd7c230f2e487f27d0585f9976861e2d385ba9fd8a2e25b0d4969cc7e1bd1b345fad2dbf715a030d4ab0fc810d1a95c90af057b326
-EBUILD help2man-1.47.16.ebuild 1074 BLAKE2B 3d3642c022ccc23972017a3a7427b04c25de4c8082381c293ac2e3da6eaa1f057cad1efa203836f680b8cdd24c6c5f46b859e51dc2b4451acb411d045b023e02 SHA512 78e07687855df5c806cf74bd7c230f2e487f27d0585f9976861e2d385ba9fd8a2e25b0d4969cc7e1bd1b345fad2dbf715a030d4ab0fc810d1a95c90af057b326
+EBUILD help2man-1.47.15.ebuild 1065 BLAKE2B 5b9e08ece924027563088cdcf9d0312f9fc200d3ee6e147cb7f5f0e279f8f1d5cf7533dc40e308a5fb146247ca1950673f5937621829216beada81061ca88f74 SHA512 fd52cabb54f98186e31eb20ef05eea28d89415bca7ae439fb36710d8047e2218841768ad9a3b6994d4ba50d6a1845977e5f554a12bc6b3c21dbbbaae374eee6d
+EBUILD help2man-1.47.16.ebuild 1071 BLAKE2B d0c3b8b809bf5ead38fcb75188ee8fccf52170cd816761396ec60d82be297b6e7b970b020d436b45d3efd10b1ddd5a255fef5505e98220e50a41c8df75f13ca5 SHA512 bff68ae4d10baa5c42b5d0bf81c173605bc50a24dff73003cf14a157fdce0da5f917f512c567a060b3f821fc02968f950f7d6a0d582e3b1ea97442928e0b15e1
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.47.15.ebuild b/sys-apps/help2man/help2man-1.47.15.ebuild
index 79ed067d1855..0600e090e0c0 100644
--- a/sys-apps/help2man/help2man-1.47.15.ebuild
+++ b/sys-apps/help2man/help2man-1.47.15.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/help2man/help2man-1.47.16.ebuild b/sys-apps/help2man/help2man-1.47.16.ebuild
index 79ed067d1855..32c4baa0be5e 100644
--- a/sys-apps/help2man/help2man-1.47.16.ebuild
+++ b/sys-apps/help2man/help2man-1.47.16.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/hw-probe/Manifest b/sys-apps/hw-probe/Manifest
index fa7338cb4b28..1600e951a4bd 100644
--- a/sys-apps/hw-probe/Manifest
+++ b/sys-apps/hw-probe/Manifest
@@ -1,4 +1,6 @@
 AUX README.gentoo 301 BLAKE2B c352d3f7e0038ef8f71f6e95376e91513c45914f7d4c31ec0390a0e9745360d7114b3c4e2743d2cb5872241073a3a4087a3240f2f0ef89e3203b5500520d7eb2 SHA512 a20a1a910a7f852844bfd8f03e824e74760c49c5bf7171f1dbfb16976805179ed79a3ae892ba70e99bcd93182bb1d83f491b9a5f7b64e94478172a424c00350e
 DIST hw-probe-1.5.tar.gz 113996 BLAKE2B 59f6fc27e2cbb99a4b7dd9428e32a93dce2ffcc1133e82539b8836a694e6c5634fe2e172732675acf0d83504907a750c63f138d6dec236039eb7c805010a8383 SHA512 80dd2484bd317ac1e86d7f434626f288648aebf110a4bf81c0c05548abcb19d990119c1690fcb5796384a6c32fd5c1e827698a31165bfc41ef6df9fc7fdd368d
+DIST hw-probe-1.6_beta2.tar.gz 143569 BLAKE2B fc7b7562f86eb1b26fef32a8ed9b4a8d01c5621bedbc7e810d5a011c53d528b000ff9df312cf5e3f0ab455558e08e2b9a3ddcd543cd6856208466721f9a0e13c SHA512 2727e7b0fe449cbb6dd21fc112660df4ec666be845bbfd21037b41372a499dfb80c8c2dc37bd222032c68faadff91192a6d6f5229353cb0fc63b8e3dbd715f5d
 EBUILD hw-probe-1.5.ebuild 2210 BLAKE2B 8ff9c34cfbc97dedca047482c09dca307dec3656aa2e571b79b188e22524df50328736842dc6cfc871c36fd7618add95d6e95e5efa6bd5c906d492b15b996d54 SHA512 3590836c0a90a7d5684ae2b888ddf45ccdeee702fcbfdb2ef842a8ac4bbdd9a0f3458ccefda8ccbf98b9777dc67271c346d290c1157fca6d98a901688b696221
+EBUILD hw-probe-1.6_beta2.ebuild 2377 BLAKE2B f5c5d89f9d74a834b07d999c75e897a5e54c7251b4aebfab6b71efe6eb685b45a394668d1340d5f839f64a22b1de675e42f577040420831d7f55ccda64b41f0c SHA512 8b006d8e8d171707ac97c5fe90a7c997aa12c84b55ae6eb100988070e2a6c5d8c5a2b96fa960541d00f48ac2222b8bc005f0af0ebfa3043c6c16c74614bddf6b
 MISC metadata.xml 646 BLAKE2B 1cc93bfb0e3544c4c746e80ff21675fa22d3103e14a040ffedfcfd24e73d8d968decc318e4523a03815e85de4ef85926ac20d4dfdf7cde5a3445ca29f11f6de7 SHA512 2ea8a211186b71ebc008c9999225edef063c8c8e0317d6e4c6149cc6ec6281a84065bef3dc93b4308f8567860fb75c19287aa91b5ab41e6a68229fcbf1c5a474
diff --git a/sys-apps/hw-probe/hw-probe-1.6_beta2.ebuild b/sys-apps/hw-probe/hw-probe-1.6_beta2.ebuild
new file mode 100644
index 000000000000..e6accc081c3f
--- /dev/null
+++ b/sys-apps/hw-probe/hw-probe-1.6_beta2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="${PV/_/-}"
+MY_PV_BETA="${MY_PV/2/}"
+
+inherit eutils readme.gentoo-r1
+
+DESCRIPTION="A tool to probe for hardware, check it's operability and find drivers"
+HOMEPAGE="https://github.com/linuxhw/hw-probe/"
+SRC_URI="https://github.com/linuxhw/hw-probe/archive/${MY_PV_BETA}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/perl
+	dev-perl/Digest-SHA1
+	net-misc/curl
+	sys-apps/dmidecode
+	sys-apps/edid-decode
+	sys-apps/hwinfo
+	sys-apps/pciutils
+	sys-apps/smartmontools
+	sys-apps/usbutils
+	virtual/perl-Data-Dumper
+"
+
+S="${WORKDIR}/${PN}-${MY_PV_BETA}"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	default
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	optfeature "showing Machine Check Exceptions." app-admin/mcelog
+	optfeature "showing additional I/O statistics." app-admin/sysstat
+	optfeature "showing display data channel (ddc) information." app-misc/ddcutil
+	optfeature "showing smart card (reader) information." dev-libs/opensc
+	optfeature "showing Vulkan GPU hardware information." dev-util/vulkan-tools
+	optfeature "showing information of attached scanners." media-gfx/sane-backends
+	optfeature "showing GPU information provided by MESA." media-libs/mesa
+	optfeature "showing zeroconf statistics." net-dns/avahi
+	optfeature "showing HP printer statistics." net-print/hplip
+	optfeature "showing status about rfkill switches on communication devices." net-wireless/rfkill
+	optfeature "showing additional CPU capabilities." sys-apps/cpuid
+	optfeature "showing hard disk (HDD, SSD, ..) capabilities." sys-apps/hdparm
+	optfeature "showing available I2C sensors." sys-apps/i2c-tools
+	optfeature "showing additional hardware and system information detected by inxi." sys-apps/inxi
+	optfeature "showing information about tested memory for faults." sys-apps/memtester
+	optfeature "showing 'Plug & Play' devices." sys-apps/pnputils
+	optfeature "showing systemd boot process information." sys-apps/systemd
+	optfeature "showing ACPI statistics and tables." sys-power/iasl
+	optfeature "showing information about NUMA." sys-process/numactl
+	optfeature "showing additional GPU information provided by MESA progs." x11-apps/mesa-progs
+	optfeature "showing available Xinput devices." x11-apps/xinput
+}
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index 35cdb8b46cf8..2b406fa8fdc8 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -1,12 +1,8 @@
-DIST hwids-20190316.tar.gz 3312959 BLAKE2B d9f4c7170979c404a69ca0b51903af34db01a6150ec70dc1416dcb507dfa4d8ad9ce325204791a24e5646dee67aea0c1566c15dcddb65a5d9dddbbbb9b896398 SHA512 6db50577b5d29d73f1dc0a44d0b74320cb0df186b9850160b15a6e8f2bcbdbf8193bae4146f81a5afc6b0e05706b5286b4b5858eb028d6c58ea4582df61d232e
-DIST hwids-20190818.tar.gz 3407208 BLAKE2B c2a0098cba4a34210461a2781f325a95f18696c1917ff3a1c26a2f56383e9edd087ab6b3a1a173a92df829fc250cf460d915a98298f9c38a71396bf232916245 SHA512 74086f96152482af3c9caabc729f34d193cc619aae88d44aa0472d674b7533ab806b13243c95bfa04417bdd40e3bb7069b766c2c0824f19d0c62385b043a01c2
-DIST hwids-20191025.tar.gz 3443988 BLAKE2B 0352f1568d7ceeb2c599d789f96a3175703f3c86240188beb9a080eabb6e7659aeeadf193f15050519fb64c58ee8d8832919cf6922b5017861b32be543235a03 SHA512 6f637ca8c4d6b1261c5c2eccd8d1a64ab750f4c36f3d435b50b75949c15e571d83bc61dd6a14e777b53d383d7d02c34f616cc6a62d005db3d965b33b4121deca
 DIST hwids-20200204.tar.gz 3495191 BLAKE2B 23075b6728d9b0e020be45729d0df4cef95cac5e912e646b612266337d1add59c87a1031e6672c5b6eb23e13c26e6299b62a5886aa25017242a86fd474c1e9ae SHA512 1d2a9baaa7ab64575a3d9b98ae4df9060cb8593ae752365296dd53b18bc5996170bbfe1c5b4b1ffc24b28e3dbaa7c321c4fa333bbf91449a6ca7b187cbe23741
 DIST hwids-20200306.tar.gz 3512152 BLAKE2B 6a6ee48598e72f97a90bff8f45aacb699218570ede5b60ed119ebae78de6cd4b92e02f96cf57c83710da699be9a7dcdfdef8d404539e04b664298874b35e54ce SHA512 eff1d2783925ca459b387fbaa5cf68a98aa4209ab8509ad92a902b4d02cc7f4a47e5506c2beed4c792d24a8ab636ad77b376a92b59ae4f605d1b5258350ff250
-EBUILD hwids-20190316.ebuild 1752 BLAKE2B 3465f5b3c58a50e39a2ec4d87fbd3a2c212f3660f0c3aa6a028d375b2564ccc5c4e736a2f95f5647fb1e6b0587bbb41f7289e0ae4cb2d932a308386a76e2b1d9 SHA512 26896ec3ea64c472f739dc7de88a1fa912cbad79d59a3140605654dcecf7133ab8f6140fc96662f8d4ce38ad21fddb060bb4377838402e3e29b266da2bda9b3c
-EBUILD hwids-20190818.ebuild 1727 BLAKE2B 9be9c7376ef6b5471ed5d5f4526760d2af5780aa8d8a4a348bd0782562bce71b371670d2758a4af998fcdb226fe9d0aa8dd0879a2b1b7a9cd2258279b1d8d425 SHA512 7786878102e783d12a7ad034ca41c27d6090331eda92f02f7600dbd1e260d939528433764040bffba7eb2b1e73ea275cd4c4c49f78dcae4cbccfbbb536fbc8f9
-EBUILD hwids-20191025.ebuild 1736 BLAKE2B 9c6790f94021cde5b51edb9add5a4a798d9957cdfbd8bc71f6ead04e9a9556221101faa0fd22b5f01155475df118a680b8a0c2704dae7fa17baa680a6fe1d299 SHA512 15a575949a9bf95bb61a24d987d87604de643507fe6560f7ca6860985643615282781771b1d878103d1ca8c8c9a006fdfea374b24c955544382c963be72fff21
-EBUILD hwids-20200204.ebuild 1727 BLAKE2B 9be9c7376ef6b5471ed5d5f4526760d2af5780aa8d8a4a348bd0782562bce71b371670d2758a4af998fcdb226fe9d0aa8dd0879a2b1b7a9cd2258279b1d8d425 SHA512 7786878102e783d12a7ad034ca41c27d6090331eda92f02f7600dbd1e260d939528433764040bffba7eb2b1e73ea275cd4c4c49f78dcae4cbccfbbb536fbc8f9
-EBUILD hwids-20200306.ebuild 1736 BLAKE2B 9c6790f94021cde5b51edb9add5a4a798d9957cdfbd8bc71f6ead04e9a9556221101faa0fd22b5f01155475df118a680b8a0c2704dae7fa17baa680a6fe1d299 SHA512 15a575949a9bf95bb61a24d987d87604de643507fe6560f7ca6860985643615282781771b1d878103d1ca8c8c9a006fdfea374b24c955544382c963be72fff21
-EBUILD hwids-99999999.ebuild 1736 BLAKE2B 9c6790f94021cde5b51edb9add5a4a798d9957cdfbd8bc71f6ead04e9a9556221101faa0fd22b5f01155475df118a680b8a0c2704dae7fa17baa680a6fe1d299 SHA512 15a575949a9bf95bb61a24d987d87604de643507fe6560f7ca6860985643615282781771b1d878103d1ca8c8c9a006fdfea374b24c955544382c963be72fff21
+DIST hwids-20200813.1.tar.gz 3680906 BLAKE2B 652cf4b05ead42a750c6f41ad78650ea8b0125f90563dec37bfa8388d021ceab12e94fd2f949b3f7b3b7c09a356d279b91e62164af2cf066cfee07ab583f8b83 SHA512 5ba15067969fa19d3218f523c1a0186568841466de4d18c563b5f09202ab7185c4df02b962f70eb6d3e99915caad8a743fc6c6349f49b666db742f9ced8053fc
+EBUILD hwids-20200204.ebuild 1669 BLAKE2B 8e070debcc0dcd428d49726af36a640642e699e7811706694cbfcd6f03d07251e7dcef29759eb5b9da36ff8c72a33fb50fdf365c81304b179e155b2307e73707 SHA512 d32cc90225945dc8a6f4b9dace7e99fcec8369116f1e9e04a447c6dc83ba7ada6054c5bcad706ea554b2836f1eb4d91c237a0a31123f4bed52eefdc614188dfe
+EBUILD hwids-20200306.ebuild 1678 BLAKE2B 15d252b1a9090d3b744a463c42a4d5e46c27df4c57807ae03acc5b524d4fb5f00a3e7acc01900a00eb17618d4685b606ed89abbc678c80c371fb7ff36e0b15b3 SHA512 d953589f15789952126486fb5f5eac733e33bc8c8c88e888887f7c92717efbdf8b716dc100bb7467226f8a0d762566a05ccac0ed2cf5d35e477c5d3fdaa4990e
+EBUILD hwids-20200813.1.ebuild 1678 BLAKE2B 15d252b1a9090d3b744a463c42a4d5e46c27df4c57807ae03acc5b524d4fb5f00a3e7acc01900a00eb17618d4685b606ed89abbc678c80c371fb7ff36e0b15b3 SHA512 d953589f15789952126486fb5f5eac733e33bc8c8c88e888887f7c92717efbdf8b716dc100bb7467226f8a0d762566a05ccac0ed2cf5d35e477c5d3fdaa4990e
+EBUILD hwids-99999999.ebuild 1679 BLAKE2B 6f3c0dc51d9598239348f1abfaf3f2c691b5c060dd21ab31fb79ccf4d9c240791a7ea061ae31aae201b15456459981ce1e06d15838b5dc136526c940dfc5c4d2 SHA512 f3a949dbda15206076e48d996bcbf6d9b1568a4338511dfbc05e87d6102eb5b08dffedf23cc24f06d2f9f17bc7247802e6229f01e23c5098b49b3768c0eb9c58
 MISC metadata.xml 647 BLAKE2B 88b205060dbd1c22edb25b740b5b84d0b36e8746a8bfd5793ab385afa2afd34e54626c2b09e59dc2cf91d838ae44dea878be26cd9cab83a98054a3d0b4bfbd52 SHA512 b05dbd41c2a839d2ac8baaf8ee2352ee999d48deb123c54e048da44cccb06f64729620983848a6b16ada8af50e6fb68adf15323ff362f230b7213f485b1ec27c
diff --git a/sys-apps/hwids/hwids-20190316.ebuild b/sys-apps/hwids/hwids-20190316.ebuild
deleted file mode 100644
index e772a64910d9..000000000000
--- a/sys-apps/hwids/hwids-20190316.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2012-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit udev
-
-DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
-HOMEPAGE="https://github.com/gentoo/hwids"
-if [[ ${PV} == "99999999" ]]; then
-	PYTHON_COMPAT=( python3_{6,7} )
-	inherit git-r3 python-any-r1
-	EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
-else
-	SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="|| ( GPL-2 BSD ) public-domain"
-SLOT="0"
-IUSE="+net +pci +udev +usb"
-
-DEPEND=""
-RDEPEND="
-	udev? ( virtual/udev )
-	!<sys-apps/pciutils-3.1.9-r2
-	!<sys-apps/usbutils-005-r1
-"
-
-if [[ ${PV} == 99999999 ]]; then
-	DEPEND+="
-		net-misc/curl
-		udev? ( $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') )
-	"
-	python_check_deps() {
-		if use udev; then
-			has_version --host-root "dev-python/pyparsing[${PYTHON_USEDEP}]"
-		fi
-	}
-else
-	S=${WORKDIR}/hwids-${P}
-fi
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	if [[ ${PV} == 99999999 ]]; then
-		git-r3_src_unpack
-		cd "${S}" || die
-		emake fetch
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e '/udevadm hwdb/d' Makefile || die
-}
-
-_emake() {
-	emake \
-		NET=$(usex net) \
-		PCI=$(usex pci) \
-		UDEV=$(usex udev) \
-		USB=$(usex usb) \
-		"$@"
-}
-
-src_compile() {
-	if [[ ${PV} == 99999999 ]] && use udev; then
-		python_setup
-		_emake udev-hwdb
-	fi
-	_emake
-}
-
-src_install() {
-	_emake install \
-		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
-		MISCDIR="${EPREFIX}/usr/share/misc" \
-		HWDBDIR="${EPREFIX}$(get_udevdir)/hwdb.d" \
-		DESTDIR="${D}"
-}
-
-pkg_postinst() {
-	if use udev; then
-		udevadm hwdb --update --root="${ROOT%/}"
-	fi
-}
diff --git a/sys-apps/hwids/hwids-20190818.ebuild b/sys-apps/hwids/hwids-20190818.ebuild
deleted file mode 100644
index a62015c85539..000000000000
--- a/sys-apps/hwids/hwids-20190818.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 2012-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit udev
-
-DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
-HOMEPAGE="https://github.com/gentoo/hwids"
-if [[ ${PV} == 99999999 ]]; then
-	PYTHON_COMPAT=( python3_{6,7} )
-	inherit git-r3 python-any-r1
-	EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
-else
-	SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="|| ( GPL-2 BSD ) public-domain"
-SLOT="0"
-IUSE="+net +pci +udev +usb"
-
-RDEPEND="
-	udev? ( virtual/udev )
-	!<sys-apps/pciutils-3.1.9-r2
-	!<sys-apps/usbutils-005-r1
-"
-
-if [[ ${PV} == 99999999 ]]; then
-	BDEPEND="
-		net-misc/curl
-		udev? ( $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') )
-	"
-	python_check_deps() {
-		if use udev; then
-			has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
-		fi
-	}
-else
-	S=${WORKDIR}/hwids-${P}
-fi
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	if [[ ${PV} == 99999999 ]]; then
-		git-r3_src_unpack
-		cd "${S}" || die
-		emake fetch
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e '/udevadm hwdb/d' Makefile || die
-}
-
-_emake() {
-	emake \
-		NET=$(usex net) \
-		PCI=$(usex pci) \
-		UDEV=$(usex udev) \
-		USB=$(usex usb) \
-		"$@"
-}
-
-src_compile() {
-	if [[ ${PV} == 99999999 ]] && use udev; then
-		python_setup
-		_emake udev-hwdb
-	fi
-	_emake
-}
-
-src_install() {
-	_emake install \
-		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
-		MISCDIR="${EPREFIX}/usr/share/misc" \
-		HWDBDIR="${EPREFIX}$(get_udevdir)/hwdb.d" \
-		DESTDIR="${D}"
-}
-
-pkg_postinst() {
-	if use udev; then
-		udevadm hwdb --update --root="${ROOT}"
-	fi
-}
diff --git a/sys-apps/hwids/hwids-20200204.ebuild b/sys-apps/hwids/hwids-20200204.ebuild
index a62015c85539..13c9146d0919 100644
--- a/sys-apps/hwids/hwids-20200204.ebuild
+++ b/sys-apps/hwids/hwids-20200204.ebuild
@@ -22,8 +22,6 @@ IUSE="+net +pci +udev +usb"
 
 RDEPEND="
 	udev? ( virtual/udev )
-	!<sys-apps/pciutils-3.1.9-r2
-	!<sys-apps/usbutils-005-r1
 "
 
 if [[ ${PV} == 99999999 ]]; then
diff --git a/sys-apps/hwids/hwids-20200306.ebuild b/sys-apps/hwids/hwids-20200306.ebuild
index bbe6c639f9b4..c964e6ebfa16 100644
--- a/sys-apps/hwids/hwids-20200306.ebuild
+++ b/sys-apps/hwids/hwids-20200306.ebuild
@@ -22,8 +22,6 @@ IUSE="+net +pci +udev +usb"
 
 RDEPEND="
 	udev? ( virtual/udev )
-	!<sys-apps/pciutils-3.1.9-r2
-	!<sys-apps/usbutils-005-r1
 "
 
 if [[ ${PV} == 99999999 ]]; then
diff --git a/sys-apps/hwids/hwids-20191025.ebuild b/sys-apps/hwids/hwids-20200813.1.ebuild
index bbe6c639f9b4..c964e6ebfa16 100644
--- a/sys-apps/hwids/hwids-20191025.ebuild
+++ b/sys-apps/hwids/hwids-20200813.1.ebuild
@@ -22,8 +22,6 @@ IUSE="+net +pci +udev +usb"
 
 RDEPEND="
 	udev? ( virtual/udev )
-	!<sys-apps/pciutils-3.1.9-r2
-	!<sys-apps/usbutils-005-r1
 "
 
 if [[ ${PV} == 99999999 ]]; then
diff --git a/sys-apps/hwids/hwids-99999999.ebuild b/sys-apps/hwids/hwids-99999999.ebuild
index bbe6c639f9b4..fdc4a456ddd5 100644
--- a/sys-apps/hwids/hwids-99999999.ebuild
+++ b/sys-apps/hwids/hwids-99999999.ebuild
@@ -8,7 +8,7 @@ inherit udev
 DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
 HOMEPAGE="https://github.com/gentoo/hwids"
 if [[ ${PV} == 99999999 ]]; then
-	PYTHON_COMPAT=( python3_{6,7} )
+	PYTHON_COMPAT=( python3_{6..9} )
 	inherit git-r3 python-any-r1
 	EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
 else
@@ -22,8 +22,6 @@ IUSE="+net +pci +udev +usb"
 
 RDEPEND="
 	udev? ( virtual/udev )
-	!<sys-apps/pciutils-3.1.9-r2
-	!<sys-apps/usbutils-005-r1
 "
 
 if [[ ${PV} == 99999999 ]]; then
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 1ad9e01efffe..2c317a684131 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -5,7 +5,7 @@ DIST hwloc-1.11.2.tar.bz2 4019136 BLAKE2B 29a959c48b3be347b5816333c3f9948ddafc6c
 DIST hwloc-2.0.4.tar.bz2 6057001 BLAKE2B 0d73c2ec544263bb36404d8112412b6b308935b9b8b4ba37cac05d8bdc525763fa862c63d387545cb0e02e1bd8f1c931e034381dede83b7119f30928f4e54bf4 SHA512 c7bb69f0e536188921138d003f3854a12f942a4f625e665d5ce6d32c1c4a884e0a91f9125de33dd292f522032b759e6240df3f3e53534033567ea0d829feefce
 DIST hwloc-2.1.0.tar.bz2 6272755 BLAKE2B 3ab13bd5cd00c4c19a1c4b1de21fb799038bd0afaa86520696478eada8d0ac11a4f4de11b96b0d92495b431f4b49ccb4185b176ad5abb9372ba6c5c9794ef21c SHA512 3fda7c4152c3f1b701c3da0fcbbe7e1dffb502042cb86e9a44ce6df8e227c005333e61d5459407f88efbd56816db0ab90b19f75d047e0c77b3b7f5c6405ea501
 EBUILD hwloc-1.11.10.ebuild 2170 BLAKE2B 60cdea9ee071aa1610a48085e9b6dcb2f38a8cd473095df9d6db3d804f8d84a82e5d576d90687c09a224274999e652bff2e153b513c948bd83f4be11ad6512df SHA512 bf49f0c3c7d95de2ff4d707655e87f13b64848e19f5db9f46eaa0f015c13dd9272c357fad4bffb220eed964f439fd655b43a21e2ca731a49dd9ce7ed4b6988a4
-EBUILD hwloc-1.11.13.ebuild 2151 BLAKE2B cff35093263a6d6f14076b1ecef088bac4f822f20128a1a3a6e0ec9441cf45a353159a79d38e219fad958457efcd3f0f1dabbed5c9b9dd2911c264c2bccd9135 SHA512 2d4285d3dc899f4138de3347b919e332535af05a199773a49dac7b06a643e3af107b35e11ddede47026e204f9f85e1080f171cbfcfd0e7fd195ca3a5d94bc276
+EBUILD hwloc-1.11.13.ebuild 2143 BLAKE2B ae73d12b60c54e7160e789cb72e3cf939135dad7f22b17443e6093b58c6bc8dfe2f27df7bdcca4cbe70e58ff965c8d0860fea2a81461eaf485e1bff08e0a2240 SHA512 41bd54a082baf04b224abffaf420af5760da2d1eeea68968bc21715c70537ab67e9d1de937435e57e4d7f9bfd817a596377e888d0985949988d90e659e3479dc
 EBUILD hwloc-1.11.2-r1.ebuild 2115 BLAKE2B d79a58930fc0bc95065af6d3f2344ae2678f61e87d962668400a00f7118697e13e49d58c8a48215518af17dd477c282ea9551ad5d31d6f17e329e7006cb050d6 SHA512 775dc6c380f2bd41ef012abd1fb7efbe486f6e7489d08cdda3e79da3d640248950349120d699b19651d60eeb61dd05ca4a0a9a3e8c76535746a6390064eedc2b
 EBUILD hwloc-2.0.4.ebuild 2022 BLAKE2B 81e1daf91440f2cff13e3301915b0a2069396b98ff5ba33a06ea418d07ae606e0b6de85632e356a81b142978143d22e1fe11fb9d33343cf6da99d551d116d286 SHA512 bcbb4c5e522983c39ede9b6ee5723d359118a599a2b2c22351d80d59fbe67987a592a82d04513ac5e78e37847187dbc20bd903ddd94204c60bf0de8a9b733f77
 EBUILD hwloc-2.1.0.ebuild 2399 BLAKE2B 962fac7338357c0a66e239f0ceb05f7906cdc2dddd459f48191cd998c2d79f2666a5f1356443fb4d13922e5448c7ebb70f2b498e98a80a30fb931ccda946d9dc SHA512 62575ccd7482649ac50f78b6bddfe19016d8f7387d8f3de603f374e7cdef29d7babc2066be26c5386c5f2f7b91fddae22ebaca17aca9c7758991dafd49192bb1
diff --git a/sys-apps/hwloc/hwloc-1.11.13.ebuild b/sys-apps/hwloc/hwloc-1.11.13.ebuild
index 6d4a1f6d1025..ad6e57460544 100644
--- a/sys-apps/hwloc/hwloc-1.11.13.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.13.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
 
 # opencl support dropped with x11-drivers/ati-drivers being removed (#582406).
diff --git a/sys-apps/inxi/Manifest b/sys-apps/inxi/Manifest
index 0e6545bb15c2..6511454a50b1 100644
--- a/sys-apps/inxi/Manifest
+++ b/sys-apps/inxi/Manifest
@@ -2,8 +2,10 @@ DIST inxi-3.0.33.1.tar.gz 306370 BLAKE2B 9ebd8d6e00fe241d5fdf52ddbfc01bdb03682f1
 DIST inxi-3.0.34.1.tar.gz 308373 BLAKE2B 290a0887a7885b040f614140a99cbd7e0a8f8b89943e2f39cf00f033fb88fbe6a65dd4b5848f4ff7758f5fe81112404abef6102c44f4732308cda0e4ce887766 SHA512 cfc221ce5cd87dd2418ef0a6f916b17ed4a90aa9c6485ffc40a37d87d337f18d1ad98ae53fa366dc56b5250f2e95dc14c528b14d8f796b6d1b26b982cbf0b22b
 DIST inxi-3.0.36.1.tar.gz 311680 BLAKE2B 95c9ab57a9af50ace8fdacebb42a94017b1506a9215f8f70ff35f281dd207685d570fe257abc5446b57dd9b9a7ce28e568a4ebf9d664731dde437a6cfd64647f SHA512 1b242878b9a5180ed63dedcac7381ce41380a1bd95ba7f85bfb2c97b635fdc7700162373078963ef708fa5cd47084aa6f5c71b212042fe1acd87e01a85599296
 DIST inxi-3.0.38.1.tar.gz 320672 BLAKE2B 9c486ee07db4abad47c767c2f0d27d5e7c30e6640c50062c986f36201dce5217babd487a2d8f516be2d9bc41b8a06137d94ccb560fa0996d9a660a26004ef18d SHA512 44f97474a130f2b932c0ee54658673846712305bf2fb738c293514f62df1ca2c5d11688e2557a3f6eaeb933db0fed904e818e3dda28b839baa3ac89e6385d3a2
+DIST inxi-3.1.06.1.tar.gz 357819 BLAKE2B e6eb8a34807323d7f46ff029af797e3a13229813bf0cff4b8b874cd21ff1d38459e2181ddf3882b4ee0d29e8c788e2fce1c01f5c295911493292082192c56c2b SHA512 6621252048e95132cfec30e341f72f5942188f273488509614aab28e55ee9987b8f3820e1298c4d9a16b4f3464f1f270fb4c1d5e5a7bf0d2f616b4180193ab6b
 EBUILD inxi-3.0.33.1.ebuild 812 BLAKE2B 45822e1ef6a20bf7680aa2b271ce51b7188bf36f30258a537cb57e31edc2e1dc93d12461c038cee37d8484d1d82d5883399c0dcd681a9b7a6b34e805fb4f3415 SHA512 2c43a3b5264058f0854603c3cdf149549749940daeed273da814422435d58fecd7227c22f2947dec52401348c4dd1a60f9b5adf144eb9a7a42c561e1364a0053
 EBUILD inxi-3.0.34.1.ebuild 940 BLAKE2B a0df1d5c79accdfa98e336565fcd56b617fdac1f3620db6eb37656641eec27994152b9c69c857b2ffd0400d11e8ad564f3605ba6c80cb8aea2f82870b0f5c11e SHA512 9db372af1f597c3ecd81d2a2c17094931ea0c634b0adaf88973ce8cee5bf272ae870219a83252eb0e8c325f562ba60900d512e94043ee7b3f71c1e79487df597
 EBUILD inxi-3.0.36.1.ebuild 940 BLAKE2B a0df1d5c79accdfa98e336565fcd56b617fdac1f3620db6eb37656641eec27994152b9c69c857b2ffd0400d11e8ad564f3605ba6c80cb8aea2f82870b0f5c11e SHA512 9db372af1f597c3ecd81d2a2c17094931ea0c634b0adaf88973ce8cee5bf272ae870219a83252eb0e8c325f562ba60900d512e94043ee7b3f71c1e79487df597
 EBUILD inxi-3.0.38.1.ebuild 940 BLAKE2B f2f06922cb8611498da30d4db171dd501ae8683eba8ab713a74c02f6f7436fa9932a38562474d3f546649bc04e81392658bd8c7ad9fe945f0c246b5aedf51454 SHA512 866ea34a2b6434afb6eed6fac2ae246c7b10d9d2d3dfac5fbcec911c57fd44ed2d5eeedc440a1a59dc488127aad0e2c89a104a7c56e0317743d3d79eb666d631
+EBUILD inxi-3.1.06.1.ebuild 812 BLAKE2B 0c38afc8334a4156fd717220bb647dba7912f4830d06b18338b665de33428225dacfbc86544d392cf9ffa100dc2e3353f9566bb807df56ad9c80cf2ff32f7cb2 SHA512 b51a09d8257c6916e34c89e0be713d5f33413da7b451b588c9796cb9e3e3578d9421c803e0293a2e27b4eae013e4bd96d79fdb8f9bfbac0e782e818a7e134ee1
 MISC metadata.xml 612 BLAKE2B e09803ea44365da79b2cec697d9800d5fcabf1e55f9ae8818fe8dad0657ac9c6e0dae7d1943d93c2a1609f84d71b8d27479a1ba72455ea5a15c3d48bb575b875 SHA512 a6b52b63caef73e7028a9d03f1bda2cc6ab24d492f41f2fe6ccc9f254dfa8e0f611ff7d08ec4f111b44dd96d6dcc8f647bda4777d53603f788c7f599ecc5dc05
diff --git a/sys-apps/inxi/inxi-3.1.06.1.ebuild b/sys-apps/inxi/inxi-3.1.06.1.ebuild
new file mode 100644
index 000000000000..9f446bf4dc90
--- /dev/null
+++ b/sys-apps/inxi/inxi-3.1.06.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=$(ver_rs 3 '-')
+# 2.3.56 was the last version with no tagged release.
+# It was also the last Bash based release. Later versions are Perl based
+
+DESCRIPTION="The CLI inxi collects and prints hardware and system information"
+HOMEPAGE="https://github.com/smxi/inxi"
+SRC_URI="https://github.com/smxi/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="bluetooth hddtemp opengl"
+
+DEPEND=""
+RDEPEND="dev-lang/perl
+	sys-apps/pciutils
+	sys-apps/usbutils
+	bluetooth? ( net-wireless/bluez )
+	hddtemp? ( app-admin/hddtemp )
+	opengl? ( x11-apps/mesa-progs )
+	"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+}
diff --git a/sys-apps/ipmicfg/Manifest b/sys-apps/ipmicfg/Manifest
index 98767597fa09..3bed08581adf 100644
--- a/sys-apps/ipmicfg/Manifest
+++ b/sys-apps/ipmicfg/Manifest
@@ -1,3 +1,3 @@
-DIST IPMICFG_1.31.0_build.200205.zip 1972548 BLAKE2B e6d16907bad2c85618087f770621bf8335bbe38eb5b1a2466ee5b998ab13613aa96dd44e395a05e5b183597d4e5d5f775685bc810cd7d904f57eccecc8474ba1 SHA512 c46414b3504fe357f3b7df0f0c5f8cd4ada5ffa0541a1e49f282a187b8257d6c278cda099cce034eb9a25ad47bfd531255ec88ef6e2495a80f281888374441eb
-EBUILD ipmicfg-1.31.0.200205.ebuild 957 BLAKE2B e8e2d344e033730a1ab3b9baed2286af44d786df695f05651e96d0a3c92cbc96005575cf25cce9ba81f8dba9719df53bccb0aced7012651906e13df5afce7bb5 SHA512 d668cbb32b804a2ba0ae80e747802a063b823c9d1b594a074c18a3a28d57b3a43a6f0633bd8eb7cf1f7c493a649a870bf248dcceaf68b2c5f6ae56e90f66a865
-MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
+DIST IPMICFG_1.31.1_build.200623.zip 1755988 BLAKE2B d9f851d9f9aa2edd51427e4b03bc09e62cc848079507995aefc9c115fe72b6727747e1739a71a56f7909c67d66150d32d89d7163130b9e23c9bd8f9f07b24d70 SHA512 b138d05ad8d2441be6ee3aa97975a998c5d0863e4b8d46d7841693aaeddece058940327fe57a6407df22204ee838325a19b90caec247f7fe8231cb0ab4058474
+EBUILD ipmicfg-1.31.1.200623.ebuild 1060 BLAKE2B 57eb760774c9c09a4cc3aa8bf7e147cfbb5d3af67f24e5416a31cdd70e5f7498d114c8705da66e7cd93bd10d138e7d37ce5a398e9c1c9ce97ec387ac51ac3441 SHA512 9b724058ae4dca4bcc80a0b70d84eed416b59f538d2372536468c590052a2c3bc2578a2f847d8dcfc912df97094113da3fff8600bf603927f812e535729528bd
+MISC metadata.xml 331 BLAKE2B 5f6297bfe1e48c20819f052322f825018f8ba39434a23fbb69e5f5630e92fafa43b3bb5e991175f69673baf79d8b4bcdeb95404502593faad8819c5a2c152871 SHA512 379175cdb1d7b9f18f80349817a8a46bcc75c4fd7d7cadd938b9630c341dec359328462072c4f72661af379c054a237a95d0dfb6937d49661cb8203108de0c80
diff --git a/sys-apps/ipmicfg/ipmicfg-1.31.0.200205.ebuild b/sys-apps/ipmicfg/ipmicfg-1.31.1.200623.ebuild
index 6c3e2af0a83a..15d16ef5e366 100644
--- a/sys-apps/ipmicfg/ipmicfg-1.31.0.200205.ebuild
+++ b/sys-apps/ipmicfg/ipmicfg-1.31.1.200623.ebuild
@@ -11,9 +11,10 @@ DESCRIPTION="An in-band utility for configuring Supermicro IPMI devices"
 HOMEPAGE="https://www.supermicro.com"
 SRC_URI="ftp://ftp.supermicro.com/utility/${MY_PN}/${MY_PN}_${MY_PV}_build.${MY_DATE}.zip"
 
-KEYWORDS="-* ~amd64 ~x86"
 LICENSE="supermicro"
 SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="uefi"
 
 BDEPEND="app-arch/unzip"
 
@@ -32,6 +33,11 @@ pkg_nofetch() {
 src_install() {
 	newbin Linux/$(usex amd64 '64bit' '32bit')/IPMICFG-Linux.x86$(usex amd64 '_64' '') ipmicfg
 
+	if use uefi; then
+		insinto /usr/share/ipmicfg
+		newins UEFI/IPMICFG.efi ipmicfg.efi
+	fi
+
 	# Install docs
 	local DOCS=(
 		"IPMICFG_UserGuide.pdf"
diff --git a/sys-apps/ipmicfg/metadata.xml b/sys-apps/ipmicfg/metadata.xml
index 3e3880cf1051..1da025bfee6b 100644
--- a/sys-apps/ipmicfg/metadata.xml
+++ b/sys-apps/ipmicfg/metadata.xml
@@ -5,4 +5,7 @@
 		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
+	<use>
+		<flag name="uefi">Install compatible UEFI file for boot.</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-apps/ipmitool/Manifest b/sys-apps/ipmitool/Manifest
index 1714252e6e6d..ec54f2f54a2a 100644
--- a/sys-apps/ipmitool/Manifest
+++ b/sys-apps/ipmitool/Manifest
@@ -1,10 +1,8 @@
+AUX ipmitool-1.8.18-fno-common.patch 595 BLAKE2B 7134e86b3c5fb0381eeb1d413b72abf409b57a7f4cf7849b1e52e0c0a6b56a5f3c777186b5fbbb2df555c924974850e9af65a0a3a3a8e6e58b542318a18ab35b SHA512 4f51aab99809d3c64ed47e61c8de6b93b8a788c3cfa6e87faf17894cda85aa5b7293e1d29813dcf1335a3c5eb64dc1f8f1657ca09adb248cf3aaffe64f5d3cb5
 AUX ipmitool-1.8.18-openssl-1.1.patch 3838 BLAKE2B 4664bdf8c5ec0f40389f9773043cec0821b5a6e031f7d5cd6be7cd5195f45e9bb5fff5ed9da1d01ca5b510601be8054763236f65b180891b65db8b7ffa68ff0a SHA512 361d52bb966a8dfaa3592d8ca2f0e7083030b81b1ed84667d5bb1c68671a810802e2d4e77808fa9d44e45a04f74998cc6c6ac5182a169f175adc328636073418
 AUX ipmitool-1.8.9-ipmievd.confd 518 BLAKE2B 98d9a8e5de576242e81aa7dbfcfde7063b25448c5a50780d4e70410c1fba4adcca81abfcd48ea1a5cf5a55006c59678bc112bb86422571b82a0fb8c517f3292f SHA512 6253f218b22fc98768d3a26aec60da8b80229f3f4e2137cf6b34cefb465a420400e451fb07e6f3f626d88904644e4e2bddd280e01bf6d6cacd06cf6b59f20fe4
 AUX ipmitool-1.8.9-ipmievd.initd 584 BLAKE2B 6632466d88006f6623ae81722b2f2726ede5b99141f794829c1cff5808bbb2851e29858beb96b40061de019be08f8179d90f8008b74221cd058a34586b3f5680 SHA512 5d42774486a0edaf1dcece16fbad0cca531a91559ba8dd4259f05787e1964fbfec4d11c9427dbe8cb46ba0cc1a447120bfa82254aac4850d9acc632834daa669
-DIST ipmitool-1.8.17.tar.gz 976189 BLAKE2B 62ca530b2a9fdc0e8071d02b7f903530f223bdf07d75278eb9dafeb167b9ec347b0fbf199e2e7cf8f258463abfc8887c8b9b4df80509758ae8588ca73bbaf68a SHA512 929cf0087d3d712caf845eb62771aa96d034c2222170850b0d8bfdbb41d0b0aee05c14aa48e82368f4494606781c6639ada348fd086907c21b817d95dd36a3f6
 DIST ipmitool-1.8.18.tar.gz 995313 BLAKE2B 4aee2b1488a8a97348954dd1555baf3d576d70f22fd17f11ba6147595b07ef52059ac8ab6775afa0ad956355eefbf3e2b0300cf87bb373d2f82b585de807412d SHA512 274d424fff079f7628c0f9fe06580937cb9717c809a71b2f5ef97266c6b6c89983b662fbb1f090e2f94861f1799677c8fc6536013828a8a5e6cb239af53e45ab
-DIST ipmitool_1.8.17-1.debian.tar.xz 18252 BLAKE2B 6219d81b6b54354e8e412850fc1ee673e2dead153076d55c67fad0518e7230642934a52ba0abea29d8b1f47eb7beef10cbe25a7b8a4df158d4b44b1f1e229f4d SHA512 e1133262020e8fabe47e7aa308956078bc9fb3bb7033413230f1cf76aca1d4733bac64e52039365f24fe54a1bf8e271071bdaa1722720fca62f1c9e8888777a8
 DIST ipmitool_1.8.18-1.debian.tar.xz 19140 BLAKE2B 255c4da005946f3b118a127f96fc5daad02a170ea079d7a765a0c7650e1eb7e50ad49b31fca95312b49e5a524e04a8a21215cafb1a8451e5b2af2aaec22cda75 SHA512 8aede337d07987decfd032898f194d32730eced443630ac3956676533d693fb2d17a175ef14218cbcd55da44f6b17714f676a912a1d5124a15a995e01d2828ef
-EBUILD ipmitool-1.8.17-r1.ebuild 2443 BLAKE2B 4204805a6f363de5f658168821d8293b20ec61f68447c31c3448c28701e6246bc0cff63a78acbe655bb0ae529a637dda89b917b2f9a949ed43630f248990c97c SHA512 8824e25c00e9b9406fddec2caa638fabbcc1a1d8207a7784e2b6bf7d8c59bc6a668edeaf199a3a347d4be2e046b4efc5ab5198c242fdf9395ee825d6e2df8f2d
-EBUILD ipmitool-1.8.18-r1.ebuild 2569 BLAKE2B f72611c58ca80d27154b4ea8089538e31f4a86019409ee437da202fbc99e87b32194a48cd7340da49167b3d018a7bdf4ed568f4fb4cc45fa878081da3aa738d3 SHA512 d954614117f756f65553c51791a9a152129782142a61b846b213fff619fdb6ce75338a09a5a33eabb8b10da719253809be7dacc21a105e0d0daca8a38947e282
+EBUILD ipmitool-1.8.18-r1.ebuild 2624 BLAKE2B 9baa3c566fe553602f3c5e53e165d1fa6a0adc93943cbb61a292e8ca5d6993b9f4f343105faebd126b8bc2808af0c9ac76b6ed992798908b68374f7b9fc767f4 SHA512 2b6f7dc4f51ba3a523a929481f4e6e72cc444687385a7588bcd59e22f39ba63ef79b9a33e39e96d8b89f129bc91a40a55673f9346e6cbeb0724da3c7eb6ea63c
 MISC metadata.xml 570 BLAKE2B 2211290e4ac3a12d1a05528925d3c69534073c2624023244ed263aa312de28e5cfd76ff284870777508fd6818fcde18f9d740f9499cc5819078aaa84f46fd07a SHA512 16820cee9cff78b0137cbfcd179cdf78a503c583e8ca3e2ebf13094e21419770eb94205371b61c74c2e75f351d95ed74e6eaf060d748554c6602552ffa9151b8
diff --git a/sys-apps/ipmitool/files/ipmitool-1.8.18-fno-common.patch b/sys-apps/ipmitool/files/ipmitool-1.8.18-fno-common.patch
new file mode 100644
index 000000000000..5ca554961ca6
--- /dev/null
+++ b/sys-apps/ipmitool/files/ipmitool-1.8.18-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/include/ipmitool/ipmi_hpmfwupg.h
++++ b/include/ipmitool/ipmi_hpmfwupg.h
+@@ -800,8 +800,6 @@
+ 	char descString[HPMFWUPG_DESC_STRING_LENGTH + 1];
+ }VERSIONINFO, *PVERSIONINFO;
+ 
+-VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
+-
+ #define TARGET_VER (0x01)
+ #define ROLLBACK_VER (0x02)
+ #define IMAGE_VER (0x04)
+--- a/lib/ipmi_hpmfwupg.c
++++ b/lib/ipmi_hpmfwupg.c
+@@ -52,6 +52,8 @@
+ # include <config.h>
+ #endif
+ 
++static VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
++
+ /* From src/plugins/ipmi_intf.c: */
+ uint16_t
+ ipmi_intf_get_max_request_data_size(struct ipmi_intf * intf);
diff --git a/sys-apps/ipmitool/ipmitool-1.8.17-r1.ebuild b/sys-apps/ipmitool/ipmitool-1.8.17-r1.ebuild
deleted file mode 100644
index 0e6967bb3a2c..000000000000
--- a/sys-apps/ipmitool/ipmitool-1.8.17-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-DESCRIPTION="Utility for controlling IPMI enabled devices."
-HOMEPAGE="http://ipmitool.sf.net/"
-DEBIAN_PR="1.debian"
-DEBIAN_P="${P/-/_}"
-DEBIAN_PF="${DEBIAN_P}-${DEBIAN_PR}"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	https://launchpad.net/ubuntu/+archive/primary/+files/${DEBIAN_PF}.tar.xz"
-#IUSE="freeipmi openipmi status"
-IUSE="libressl openipmi static"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc x86"
-LICENSE="BSD"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	sys-libs/readline:0="
-DEPEND="${RDEPEND}
-		openipmi? ( sys-libs/openipmi )
-		virtual/os-headers"
-		#freeipmi? ( sys-libs/freeipmi )
-# ipmitool CAN build against || ( sys-libs/openipmi sys-libs/freeipmi )
-# but it doesn't actually need either.
-
-src_prepare() {
-	default
-	[ -d "${S}"/debian ] && mv "${S}"/debian{,.package}
-	ln -s "${WORKDIR}"/debian "${S}"
-	for p in $(grep -v "^#" debian/patches/series) ; do
-		eapply debian/patches/$p
-	done
-
-	eautoreconf
-}
-
-src_configure() {
-	# - LIPMI and BMC are the Solaris libs
-	# - OpenIPMI is unconditionally enabled in the configure as there is compat
-	# code that is used if the library itself is not available
-	# FreeIPMI does build now, but is disabled until the other arches keyword it
-	#	`use_enable freeipmi intf-free` \
-	# --enable-ipmievd is now unconditional
-	econf \
-		$(use_enable static) \
-		--enable-ipmishell \
-		--enable-intf-lan \
-		--enable-intf-lanplus \
-		--enable-intf-open \
-		--enable-intf-serial \
-		--disable-intf-bmc \
-		--disable-intf-dummy \
-		--disable-intf-free \
-		--disable-intf-imb \
-		--disable-intf-lipmi \
-		--disable-internal-md5 \
-		--with-kerneldir=/usr --bindir=/usr/sbin
-
-	# Fix linux/ipmi.h to compile properly. This is a hack since it doesn't
-	# include the below file to define some things.
-	echo "#include <asm/byteorder.h>" >>config.h
-}
-
-src_install() {
-	emake DESTDIR="${D}" PACKAGE="${PF}" install
-
-	into /usr
-	dosbin contrib/bmclanconf
-	rm -f "${D}"/usr/share/doc/${PF}/COPYING
-	docinto contrib
-	cd "${S}"/contrib
-	dodoc collect_data.sh create_rrds.sh create_webpage_compact.sh create_webpage.sh README
-
-	newinitd "${FILESDIR}"/${PN}-1.8.9-ipmievd.initd ipmievd
-	newconfd "${FILESDIR}"/${PN}-1.8.9-ipmievd.confd ipmievd
-	# TODO: init script for contrib/bmc-snmp-proxy
-	# TODO: contrib/exchange-bmc-os-info
-}
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild
index 3838cd1bd338..314005e456a4 100644
--- a/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild
+++ b/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 #IUSE="freeipmi openipmi status"
 IUSE="libressl openipmi static"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 hppa ~ia64 ppc ~ppc64 x86"
 LICENSE="BSD"
 
 RDEPEND="
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${P}-openssl-1.1.patch
+	"${FILESDIR}/ipmitool-1.8.18-fno-common.patch"
 )
 
 src_prepare() {
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 32553b17cc72..440d21641108 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,20 +1,13 @@
 AUX iproute2-3.1.0-mtu.patch 1649 BLAKE2B cbecd9770391ca7c7f25b860a95bb5b2783073b333084874b18de85f5a9072ab3922e083f726ab1e6f58f0334b515968b1e3651abcd7fc6f603def0492da79cb SHA512 5479c2085b4aca958a89d3e265ebc3763c9e7cb273bd4046d7b7585209739f75ff04cc9b84d8eb9e3afae821ff788f0f0c7ab443260ab07943b6fad6946403e1
-AUX iproute2-4.11.0-no-ipv6.patch 1360 BLAKE2B 43881c76622159e6ae7f7499eddfc251b0cf1e0a8fa077d3099c509706b056c51685c3dff66e3381a2ca0839dd32d1534a310dff4acf329836ddd1bec6eb8241 SHA512 8e548f19079eea1d3a5a91bb657bba961c9e9206147e0e0aea1aaf04d74b46e2687c906b78561d939f53f4a33ecb9e08ad8237f401068076df5842c78bc3b577
-AUX iproute2-4.17.0-configure-nomagic.patch 5654 BLAKE2B b56f7a3a02822c99a1f2c7ca1bcd0af633dc2f57d454c44dabd81b923f43afee1dfdfffda1d1293c101041316c8496275d773c2495f73817fb4ff90d0a85daed SHA512 97f35b0e8a93e5570fdade6a47864518686a358c9c6b5a55832d66baae628140015a90418b49b8426f66011c8b8a9dc7713d89c3e0e45938b3dc948a92350d42
 AUX iproute2-4.20.0-configure-nomagic.patch 5835 BLAKE2B e21e79a5f804b4f3ebd82334541dd6d9e931308cfa218dfd7743f5a807126d6bf52d63e9e84f7683be41b2249ea8aa13991ea3f4d486702d3d4d2c4e9a51b238 SHA512 a41b87a11d71120c3f3df9f9dbecc789df0355de517700749ea0b9bb4fb9ffeb94dd9218f9b2edc75ffc865e63a9a00af381816b36b0a929c0c9c7828c949660
 AUX iproute2-4.20.0-no-ipv6.patch 1334 BLAKE2B 612fa64a897fe8c601aca529a09508cc865f2f0fb7cb865ba28f3369748086622b6910f25052047c972f495b5e20014cdf6e9f73b230124f372cfe6301bc0bf2 SHA512 f4b42667d4433225b2e4272b6e629fc43b73ede02ac0e706d2e46d81ffcecd19ca45b8b9789904b4bd6d10d34c82239f9b3c33cfcf3f9e5b309d828a3494c864
 AUX iproute2-5.1.0-portability.patch 1117 BLAKE2B 8e3a2f275ffb774a30165f46d85ad01f7cd3a932085519255f661dd898462ccb5e8f11c2a57e015d6c19d8c917c82eb76f4b9c779ff91b4cfb7b874fcdda3088 SHA512 5e46e5870e41c15213f04582f40bef18c081f5058f8b530c844fab4f42f56935386f461f0d46f33d17352eebd79a167bb9b6f1edc93bb62b805283cc3872f4f9
-AUX iproute2-5.2.0-fix-sys-queue-h-on-musl.patch 2579 BLAKE2B 86e81152b51a2566060469d4585ab092be0f5a62bad11a24e086bf2cdea78db7494dc5c4692e3c71ed108732ad3a59e444c423eaffd356c919ca82445de75f6a SHA512 9b0875781f20c0a3773d9c0b0f051ce455fcbf3cedb92a411ce9c873f162ca6b25ea8c564fa971d7c56e6e3effa3a9cb0a3057518a16de264b100b7b73a7d64c
 AUX iproute2-5.7.0-mix-signal.h-include.patch 213 BLAKE2B ad6def6d017ff1d78587d1bfb9d92379983d989d9d4a396e773f02c655ac14c57cc25c5d4e37fbdb0e0d1cb1d35fc94ee70077b81d1285ac2d58cb1b19fa69db SHA512 09a9d450179b06c434a41b7bdd8d4a47b8ca2303de3d08b2b101e8695aec28e5d1e454a8c62e1b71d66b6e776dc6975f2837acc0a0f8a2a3f1e31b1eb56b71e3
-DIST iproute2-4.19.0.tar.xz 720408 BLAKE2B 2d0ece5dd8f1beb7912d025c269a9edd2ecd87aea04971a28eca9f9b7ea82d0e4aa397c9338c0cb6cb463887678a541a5407644e82244ffbbae0eb8f6ac088e8 SHA512 47c750da2247705b1b1d1621f58987333e54370d0fff2f24106194022de793ff35dfd67fd1be127ce019008705702092d31dac49abf930a7c0dc5c7e7c0665b8
-DIST iproute2-5.2.0.tar.xz 729540 BLAKE2B 72d082b4f39b6b9f0040149ea14d3c5c6d999eb4955b708ef49a3276f3c574eab757e2c81f10a11e2ce5f709c7849bbf6556e40c7f261fc72d498046f73eade4 SHA512 82bbeae29d98129d822c95ff7523186569e32c66132b8d781d501d61f396b04d122e3d13057dd4236455264008e5bfac7cb63c325908fc1c46d416cbde6ac7e1
 DIST iproute2-5.4.0.tar.xz 741328 BLAKE2B 8c7b74aa64526180e793165eb3d0f1ee07d4589fa982aa91e4e0775595c096d73677e85bb7f073cbe14e6de6b166d31efba94554f8c7df3320b168341818fcba SHA512 26d1230e10d9ba4466edd3fe95cb6f595df691eeb27b87ae845ceb9da09fe11c2e0daa8d67187121320413f9ee7131fd426182055eb285be7c4de558d9e47051
-DIST iproute2-5.6.0.tar.xz 754812 BLAKE2B 5232c206052dcbc489284cb5a4169bf2555f9bdf7c122e23be07f7a5a18e0c828f5b4f3bb4afb6d33919919d211c67a20626ad10556e4ae41f90619d6eed445f SHA512 e52c6c8b676ab79401ae815fe3f80268c1edb490c0a00826e0f7181a816e9bf6549df9e77a40b0d56855db8ad312179b3a40002a2dd6f66c807039cff0cdfb6c
 DIST iproute2-5.7.0.tar.xz 764436 BLAKE2B 842229730139f8931c4ff3d548fe56c7c86b6bb7be5cc1a7dd896ddce34c039467fb90d0c258cdc91276edc59b9b19f53c39a36c79b54b15a78436b44c595eed SHA512 d5ef68e0eb8e84fbff68c2e7dd4097b9ceb438c928d17ede4130876802dfeafe8bf08d82b4fd39005314e0679c0b261aaa3d6a0a2ff364074a43a043a855a634
-EBUILD iproute2-4.19.0-r1.ebuild 4372 BLAKE2B 3ee6b85303fea1bb9cc680022001baba11e7e557d4ab40e3f5da24ced78311da9ef650fffa9cc318de056cf01aa272ce6c32a64ef52de0f9361dd2f28e840dfd SHA512 bd17caa6b2f4f5068fc23e8a60a856c4af42290d61eae9560638a58271fe10d05b69e189db72a6249697e2a4f7a9eadecc629252fb34193516ebc81627637c43
-EBUILD iproute2-5.2.0-r1.ebuild 4480 BLAKE2B 9ce5e16fd42e39f9539a0ebeb5b626ad10f8b814414039b35c424fef64b3434fbddd37d0e11f9021cd90967f14b2c1bcdbf96b18f64d15915b7cb943ea86f7aa SHA512 f81aad4109e869d1628d8425bc09bc7c285463719dc600a89f4ce5dd855fe38715349d80aebb0011190bc003fccad8744a345826e8789a0f3e6e7f584409a997
+DIST iproute2-5.8.0.tar.xz 780612 BLAKE2B 5d86af8d981f5e9582d5eb0aaffbe15891964a86f3a1da408ce2f46101b1bb6beac8d4492dab1865391c212ef596c9256b680bdcb346d440e38cbb636a23cdc1 SHA512 f2a3f7dcf5cb39ca7cd14f0e40e45641eccf4b93427c527a09fd789ac8621c5c3359769ca61fcc8bab7e915edd943c39b7c3e15cbfc497187aa6271eed0a9152
 EBUILD iproute2-5.4.0.ebuild 4423 BLAKE2B a52726d1e562962789fe3f8ebfa2d8ae7e9c65a4355e45a0d8351a31cbf46e7361daa9dc103235052a9cd9754b815d12b924f5aeee96406bea4a41c8d164a5a6 SHA512 6814b86e90dab9cb3600ff58b1dbb43197f2696051802639cc4602245ca96db28b1e4e117935504a4acf1c52d6ca9a8599162dfdebe5799b1a6930a95a0039ea
-EBUILD iproute2-5.6.0.ebuild 4540 BLAKE2B 5a56182135bb0e83de820d889b40b7c0ba12a6c3b3c783c871d50b0fa98dcacdfaacb9e6345fb79ea788e026838086e4aa940a8ec1ac560ed4bc3451b237cae6 SHA512 ba67ace9de9fe1d6d2cae65161dfabc77942896a4ec5f7a600342cfd7479c909aee13526efdf2edfb4648ebfa02d98df8b6d04b6e0361c44f8ca432293ee7242
-EBUILD iproute2-5.7.0.ebuild 4495 BLAKE2B a6924b4ba1fc0323026a130d820b5dccc9d81aafaedf20154b320a744327bd3e273431b8e5a95d30e5cd34d7708cb3e2dbf0e0181bde0c9d1e9bc01328c3f426 SHA512 e4c9a3b718cdbe1893749a8669e119e2e1e4a68612cf657fb00c3778e53598cdf150497651eb77e13d8eade420413f0e5f663156f70a03dd6af4513a27e4c75b
+EBUILD iproute2-5.7.0.ebuild 4488 BLAKE2B f7767f4d9b3c1aa8a1a099b92e4045bf3738b59dd3ec6a6e830a924c856f960f33b24fcad334f81c6e03e91362ea0ad3e932d6aa450f7a3b3c01420f89ca160f SHA512 df360350991cfaecc24f7048adb1cd5ee3394ba9927b87f0f533a72f28be1d740abec88c2aa4c96d1ce22b6b08207727da4560277903a042bce73dc9a9bc1caf
+EBUILD iproute2-5.8.0.ebuild 4495 BLAKE2B a6924b4ba1fc0323026a130d820b5dccc9d81aafaedf20154b320a744327bd3e273431b8e5a95d30e5cd34d7708cb3e2dbf0e0181bde0c9d1e9bc01328c3f426 SHA512 e4c9a3b718cdbe1893749a8669e119e2e1e4a68612cf657fb00c3778e53598cdf150497651eb77e13d8eade420413f0e5f663156f70a03dd6af4513a27e4c75b
 EBUILD iproute2-9999.ebuild 4441 BLAKE2B a5ad7bbdd8f462eaa1cd5fb8d49ea8941743db34652609c36b5add05c383d2cd6584970df34047b074309414c5c52ca687b23cc8ea432514e0435ee1caa71513 SHA512 eb7fe8565a30aa2864364fdc556dbcd3e20d613992921cff2b46772e17c96ec8aede27017fa992b59c1cd122b267acc6ef222706cd1f62aca88c64a04b982ae6
 MISC metadata.xml 672 BLAKE2B d27b6af84b177e8b12f64470dbac0e8fdcf45091681ced6d5ebd02414849c221e608a6a4bb8ce6aae305475e086cf140836b943a9e5380f10c368ac359397a98 SHA512 d71c5077fcf769520048a46b0fdd3563b974b65afdc68eb73fc0816d2c87dd9a73bca72e25d7e8f3c9f2ceb23c473bb92a1a92d8d5f43a7e15f965669226f0a2
diff --git a/sys-apps/iproute2/files/iproute2-4.11.0-no-ipv6.patch b/sys-apps/iproute2/files/iproute2-4.11.0-no-ipv6.patch
deleted file mode 100644
index fc855dcf2209..000000000000
--- a/sys-apps/iproute2/files/iproute2-4.11.0-no-ipv6.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- iproute2-4.11.0/ip/ipmonitor.c
-+++ iproute2-4.11.0/ip/ipmonitor.c
-@@ -114,7 +114,6 @@
- 	}
- 	if (n->nlmsg_type == RTM_NEWPREFIX) {
- 		print_headers(fp, "[PREFIX]", ctrl);
--		print_prefix(who, n, arg);
- 		return 0;
- 	}
- 	if (n->nlmsg_type == RTM_NEWRULE || n->nlmsg_type == RTM_DELRULE) {
---- iproute2-4.11.0/ip/iptunnel.c
-+++ iproute2-4.11.0/ip/iptunnel.c
-@@ -589,13 +589,6 @@
- 		break;
- 	case AF_INET:
- 		break;
--	/*
--	 * This is silly enough but we have no easy way to make it
--	 * protocol-independent because of unarranged structure between
--	 * IPv4 and IPv6.
--	 */
--	case AF_INET6:
--		return do_ip6tunnel(argc, argv);
- 	default:
- 		fprintf(stderr, "Unsupported protocol family: %d\n", preferred_family);
- 		exit(-1);
---- iproute2-4.11.0/ip/Makefile
-+++ iproute2-4.11.0/ip/Makefile
-@@ -1,6 +1,6 @@
- IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \
--    rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
--    ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o iptoken.o \
-+    rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
-+    ipmaddr.o ipmonitor.o ipmroute.o iptuntap.o iptoken.o \
-     ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o iplink_dummy.o \
-     iplink_ifb.o iplink_nlmon.o iplink_team.o iplink_vcan.o \
-     iplink_vlan.o link_veth.o link_gre.o iplink_can.o iplink_xdp.o \
diff --git a/sys-apps/iproute2/files/iproute2-4.17.0-configure-nomagic.patch b/sys-apps/iproute2/files/iproute2-4.17.0-configure-nomagic.patch
deleted file mode 100644
index 30b5db3bc3c1..000000000000
--- a/sys-apps/iproute2/files/iproute2-4.17.0-configure-nomagic.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets
-a variable as well as modifying CFLAGS & LDLIBS.
-
-If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks
-are still in place.
-
-Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they
-are only passed when correctly needed.
-
-Prior Gentoo testcase for reproduction:
-USE=minimal ebuild ... compile.
-- Linking with libelf, libmnl & libcap based only on presence.
-- Links based on libselinux based only on presence.
-
-Closes: https://bugs.gentoo.org/643722
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@gentoo.org>
-Added libcap to v4.17.0 by Lars Wendler <polynomial-c@gentoo.org>
-
---- iproute2-4.17.0/bridge/Makefile
-+++ iproute2-4.17.0/bridge/Makefile
-@@ -2,6 +2,7 @@
- BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o
- 
- include ../config.mk
-+include ../config.include
- 
- all: bridge
- 
---- iproute2-4.17.0/config.include
-+++ iproute2-4.17.0/config.include
-@@ -0,0 +1,26 @@
-+# We can only modify CFLAGS/LDLIBS after all the config options are known.
-+ifeq ($(IP_CONFIG_SETNS),y)
-+	CFLAGS += $(IP_CONFIG_SETNS_CFLAGS)
-+endif
-+ifeq ($(HAVE_ELF),y)
-+	CFLAGS += $(HAVE_ELF_CFLAGS)
-+	LDLIBS += $(HAVE_ELF_LDLIBS)
-+endif
-+ifeq ($(HAVE_SELINUX),y)
-+	CFLAGS += $(HAVE_SELINUX_CFLAGS)
-+	LDLIBS += $(HAVE_SELINUX_LDLIBS)
-+endif
-+ifeq ($(HAVE_MNL),y)
-+	CFLAGS += $(HAVE_MNL_CFLAGS)
-+	LDLIBS += $(HAVE_MNL_LDLIBS)
-+endif
-+ifeq ($(HAVE_CAP),y)
-+	CFLAGS += $(HAVE_CAP_CFLAGS)
-+	LDLIBS += $(HAVE_CAP_LDLIBS)
-+endif
-+
-+# Rules can only be declared after all variables in them are known.
-+%.o: %.c
-+	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
-+
-+# vim: ft=make:
---- iproute2-4.17.0/configure
-+++ iproute2-4.17.0/configure
-@@ -212,7 +212,7 @@
-     then
- 	echo "IP_CONFIG_SETNS:=y" >>$CONFIG
- 	echo "yes"
--	echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG
-+	echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG
-     else
- 	echo "no"
-     fi
-@@ -257,8 +257,8 @@
- 	echo "HAVE_ELF:=y" >>$CONFIG
- 	echo "yes"
- 
--	echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
--	echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
-+	echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
-+	echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
-     else
- 	echo "no"
-     fi
-@@ -272,8 +272,8 @@
- 		echo "HAVE_SELINUX:=y" >>$CONFIG
- 		echo "yes"
- 
--		echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
--		echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
-+		echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
-+		echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
- 	else
- 		echo "no"
- 	fi
-@@ -286,8 +286,8 @@
- 		echo "HAVE_MNL:=y" >>$CONFIG
- 		echo "yes"
- 
--		echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
--		echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
-+		echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
-+		echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
- 	else
- 		echo "no"
- 	fi
-@@ -343,8 +343,8 @@
- 		echo "HAVE_CAP:=y" >>$CONFIG
- 		echo "yes"
- 
--		echo 'CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
--		echo 'LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
-+		echo 'HAVE_CAP_CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
-+		echo 'HAVE_CAP_LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
- 	else
- 		echo "no"
- 	fi
-@@ -426,7 +426,3 @@
- 
- echo -n "libcap support: "
- check_cap
--
--echo >> $CONFIG
--echo "%.o: %.c" >> $CONFIG
--echo '	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<' >> $CONFIG
---- iproute2-4.17.0/devlink/Makefile
-+++ iproute2-4.17.0/devlink/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- TARGETS :=
- 
---- iproute2-4.17.0/genl/Makefile
-+++ iproute2-4.17.0/genl/Makefile
-@@ -2,6 +2,7 @@
- GENLOBJ=genl.o
- 
- include ../config.mk
-+include ../config.include
- SHARED_LIBS ?= y
- 
- CFLAGS += -fno-strict-aliasing
---- iproute2-4.17.0/ip/Makefile
-+++ iproute2-4.17.0/ip/Makefile
-@@ -15,6 +15,7 @@
- RTMONOBJ=rtmon.o
- 
- include ../config.mk
-+include ../config.include
- 
- ALLOBJ=$(IPOBJ) $(RTMONOBJ)
- SCRIPTS=ifcfg rtpr routel routef
---- iproute2-4.17.0/lib/Makefile
-+++ iproute2-4.17.0/lib/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- CFLAGS += -fPIC
- 
---- iproute2-4.17.0/misc/Makefile
-+++ iproute2-4.17.0/misc/Makefile
-@@ -5,6 +5,7 @@
- TARGETS=ss nstat ifstat rtacct lnstat
- 
- include ../config.mk
-+include ../config.include
- 
- ifeq ($(HAVE_BERKELEY_DB),y)
- 	TARGETS += arpd
---- iproute2-4.17.0/netem/Makefile
-+++ iproute2-4.17.0/netem/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- DISTGEN = maketable normal pareto paretonormal
- DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
---- iproute2-4.17.0/rdma/Makefile
-+++ iproute2-4.17.0/rdma/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- TARGETS :=
- 
---- iproute2-4.17.0/tc/Makefile
-+++ iproute2-4.17.0/tc/Makefile
-@@ -4,6 +4,7 @@
-        emp_ematch.yacc.o emp_ematch.lex.o
- 
- include ../config.mk
-+include ../config.include
- 
- SHARED_LIBS ?= y
- 
---- iproute2-4.17.0/tipc/Makefile
-+++ iproute2-4.17.0/tipc/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- TARGETS :=
- 
diff --git a/sys-apps/iproute2/files/iproute2-5.2.0-fix-sys-queue-h-on-musl.patch b/sys-apps/iproute2/files/iproute2-5.2.0-fix-sys-queue-h-on-musl.patch
deleted file mode 100644
index 6bc129fa31f6..000000000000
--- a/sys-apps/iproute2/files/iproute2-5.2.0-fix-sys-queue-h-on-musl.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 33267017faf1a188d1286f5c423454a060517e39 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Fri, 26 Jul 2019 22:01:05 +0100
-Subject: iproute2: devlink: port from sys/queue.h to list.h
-
-sys/queue.h does not exist on linux-musl targets and fails build as:
-
-    devlink.c:28:10: fatal error: sys/queue.h: No such file or directory
-       28 | #include <sys/queue.h>
-          |          ^~~~~~~~~~~~~
-
-The change ports to list.h API and drops dependency of 'sys/queue.h'.
-The API maps one-to-one.
-
-Build-tested on linux-musl and linux-glibc.
-
-Bug: https://bugs.gentoo.org/690486
-CC: Stephen Hemminger <stephen@networkplumber.org>
-CC: netdev@vger.kernel.org
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
----
- devlink/devlink.c | 15 +++++++--------
- 1 file changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/devlink/devlink.c b/devlink/devlink.c
-index bb023c0c..0ea401ae 100644
---- a/devlink/devlink.c
-+++ b/devlink/devlink.c
-@@ -25,7 +25,6 @@
- #include <linux/devlink.h>
- #include <libmnl/libmnl.h>
- #include <netinet/ether.h>
--#include <sys/queue.h>
- 
- #include "SNAPSHOT.h"
- #include "list.h"
-@@ -5981,13 +5980,13 @@ static int fmsg_value_show(struct dl *dl, int type, struct nlattr *nl_data)
- 
- struct nest_qentry {
- 	int attr_type;
--	TAILQ_ENTRY(nest_qentry) nest_entries;
-+	struct list_head nest_entries;
- };
- 
- struct fmsg_cb_data {
- 	struct dl *dl;
- 	uint8_t value_type;
--	TAILQ_HEAD(, nest_qentry) qhead;
-+	struct list_head qhead;
- };
- 
- static int cmd_fmsg_nest_queue(struct fmsg_cb_data *fmsg_data,
-@@ -6001,13 +6000,13 @@ static int cmd_fmsg_nest_queue(struct fmsg_cb_data *fmsg_data,
- 			return -ENOMEM;
- 
- 		entry->attr_type = *attr_value;
--		TAILQ_INSERT_HEAD(&fmsg_data->qhead, entry, nest_entries);
-+		list_add(&fmsg_data->qhead, &entry->nest_entries);
- 	} else {
--		if (TAILQ_EMPTY(&fmsg_data->qhead))
-+		if (list_empty(&fmsg_data->qhead))
- 			return MNL_CB_ERROR;
--		entry = TAILQ_FIRST(&fmsg_data->qhead);
-+		entry = list_first_entry(&fmsg_data->qhead, struct nest_qentry, nest_entries);
- 		*attr_value = entry->attr_type;
--		TAILQ_REMOVE(&fmsg_data->qhead, entry, nest_entries);
-+		list_del(&entry->nest_entries);
- 		free(entry);
- 	}
- 	return MNL_CB_OK;
-@@ -6116,7 +6115,7 @@ static int cmd_health_object_common(struct dl *dl, uint8_t cmd, uint16_t flags)
- 		return err;
- 
- 	data.dl = dl;
--	TAILQ_INIT(&data.qhead);
-+	INIT_LIST_HEAD(&data.qhead);
- 	err = _mnlg_socket_sndrcv(dl->nlg, nlh, cmd_fmsg_object_cb, &data);
- 	return err;
- }
--- 
-cgit 1.2-0.3.lf.el7
-
diff --git a/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild b/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild
deleted file mode 100644
index 64947b8ac529..000000000000
--- a/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux"
-
-# We could make libmnl optional, but it's tiny, so eh
-RDEPEND="
-	!net-misc/arpd
-	!minimal? ( net-libs/libmnl )
-	caps? ( sys-libs/libcap )
-	elf? ( virtual/libelf )
-	iptables? ( >=net-firewall/iptables-1.4.20:= )
-	berkdb? ( sys-libs/db:= )
-	atm? ( net-dialup/linux-atm )
-	selinux? ( sys-libs/libselinux )
-"
-# We require newer linux-headers for ipset support #549948 and some defines #553876
-DEPEND="
-	${RDEPEND}
-	app-arch/xz-utils
-	iptables? ( virtual/pkgconfig )
-	>=sys-devel/bison-2.4
-	sys-devel/flex
-	>=sys-kernel/linux-headers-3.16
-	elibc_glibc? ( >=sys-libs/glibc-2.7 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
-	"${FILESDIR}"/${PN}-4.17.0-configure-nomagic.patch # bug 643722
-)
-
-src_prepare() {
-	if ! use ipv6 ; then
-		PATCHES+=(
-			"${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849
-		)
-	fi
-
-	default
-
-	# echo -n is not POSIX compliant
-	sed 's@echo -n@printf@' -i configure || die
-
-	sed -i \
-		-e '/^CC :\?=/d' \
-		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
-		-e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
-		Makefile || die
-
-	# Use /run instead of /var/run.
-	sed -i \
-		-e 's:/var/run:/run:g' \
-		include/namespace.h \
-		man/man8/ip-netns.8 || die
-
-	# build against system headers
-	rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
-	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
-	use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
-}
-
-src_configure() {
-	tc-export AR CC PKG_CONFIG
-
-	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
-	local setns
-	pushd "${T}" >/dev/null
-	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
-	${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
-	echo 'int main(){return 0;}' > test.c
-	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
-	popd >/dev/null
-
-	# run "configure" script first which will create "config.mk"...
-	econf
-
-	# ...now switch on/off requested features via USE flags
-	# this is only useful if the test did not set other things, per bug #643722
-	cat <<-EOF >> config.mk
-	TC_CONFIG_ATM := $(usex atm y n)
-	TC_CONFIG_XT  := $(usex iptables y n)
-	TC_CONFIG_NO_XT := $(usex iptables n y)
-	# We've locked in recent enough kernel headers #549948
-	TC_CONFIG_IPSET := y
-	HAVE_BERKELEY_DB := $(usex berkdb y n)
-	HAVE_CAP      := $(usex caps y n)
-	HAVE_MNL      := $(usex minimal n y)
-	HAVE_ELF      := $(usex elf y n)
-	HAVE_SELINUX  := $(usex selinux y n)
-	IP_CONFIG_SETNS := ${setns}
-	# Use correct iptables dir, #144265 #293709
-	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
-	EOF
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	if use minimal ; then
-		into /
-		dosbin tc/tc
-		dobin ip/ip
-		return 0
-	fi
-
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}"/$(get_libdir) \
-		SBINDIR="${EPREFIX}"/sbin \
-		CONFDIR="${EPREFIX}"/etc/iproute2 \
-		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		ARPDDIR="${EPREFIX}"/var/lib/arpd \
-		install
-
-	dodir /bin
-	mv "${ED%/}"/{s,}bin/ip || die #330115
-
-	dolib.a lib/libnetlink.a
-	insinto /usr/include
-	doins include/libnetlink.h
-	# This local header pulls in a lot of linux headers it
-	# doesn't directly need.  Delete this header that requires
-	# linux-headers-3.8 until that goes stable.  #467716
-	sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die
-
-	if use berkdb ; then
-		dodir /var/lib/arpd
-		# bug 47482, arpd doesn't need to be in /sbin
-		dodir /usr/bin
-		mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die
-	fi
-}
diff --git a/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild b/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild
deleted file mode 100644
index a42b969cc0b8..000000000000
--- a/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux"
-
-# We could make libmnl optional, but it's tiny, so eh
-RDEPEND="
-	!net-misc/arpd
-	dev-libs/libbsd
-	!minimal? ( net-libs/libmnl )
-	caps? ( sys-libs/libcap )
-	elf? ( virtual/libelf )
-	iptables? ( >=net-firewall/iptables-1.4.20:= )
-	berkdb? ( sys-libs/db:= )
-	atm? ( net-dialup/linux-atm )
-	selinux? ( sys-libs/libselinux )
-"
-# We require newer linux-headers for ipset support #549948 and some defines #553876
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-3.16
-"
-BDEPEND="
-	app-arch/xz-utils
-	>=sys-devel/bison-2.4
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
-	"${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722
-	"${FILESDIR}"/${PN}-5.1.0-portability.patch
-	"${FILESDIR}"/${PN}-5.2.0-fix-sys-queue-h-on-musl.patch
-)
-
-src_prepare() {
-	if ! use ipv6 ; then
-		PATCHES+=(
-			"${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849
-		)
-	fi
-
-	default
-
-	# echo -n is not POSIX compliant
-	sed 's@echo -n@printf@' -i configure || die
-
-	sed -i \
-		-e '/^CC :\?=/d' \
-		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
-		-e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
-		Makefile || die
-
-	# Use /run instead of /var/run.
-	sed -i \
-		-e 's:/var/run:/run:g' \
-		include/namespace.h \
-		man/man8/ip-netns.8 || die
-
-	# build against system headers
-	rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc
-	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
-	if use minimal ; then
-		sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
-	fi
-}
-
-src_configure() {
-	tc-export AR CC PKG_CONFIG
-
-	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
-	local setns
-	pushd "${T}" >/dev/null
-	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
-	${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
-	echo 'int main(){return 0;}' > test.c
-	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
-	popd >/dev/null
-
-	# run "configure" script first which will create "config.mk"...
-	econf
-
-	# ...now switch on/off requested features via USE flags
-	# this is only useful if the test did not set other things, per bug #643722
-	cat <<-EOF >> config.mk
-	TC_CONFIG_ATM := $(usex atm y n)
-	TC_CONFIG_XT  := $(usex iptables y n)
-	TC_CONFIG_NO_XT := $(usex iptables n y)
-	# We've locked in recent enough kernel headers #549948
-	TC_CONFIG_IPSET := y
-	HAVE_BERKELEY_DB := $(usex berkdb y n)
-	HAVE_CAP      := $(usex caps y n)
-	HAVE_MNL      := $(usex minimal n y)
-	HAVE_ELF      := $(usex elf y n)
-	HAVE_SELINUX  := $(usex selinux y n)
-	IP_CONFIG_SETNS := ${setns}
-	# Use correct iptables dir, #144265 #293709
-	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
-	EOF
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	if use minimal ; then
-		into /
-		dosbin tc/tc
-		dobin ip/ip
-		return 0
-	fi
-
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}"/$(get_libdir) \
-		SBINDIR="${EPREFIX}"/sbin \
-		CONFDIR="${EPREFIX}"/etc/iproute2 \
-		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		ARPDDIR="${EPREFIX}"/var/lib/arpd \
-		install
-
-	dodir /bin
-	mv "${ED}"/{s,}bin/ip || die #330115
-
-	dolib.a lib/libnetlink.a
-	insinto /usr/include
-	doins include/libnetlink.h
-	# This local header pulls in a lot of linux headers it
-	# doesn't directly need.  Delete this header that requires
-	# linux-headers-3.8 until that goes stable.  #467716
-	sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
-
-	if use berkdb ; then
-		keepdir /var/lib/arpd
-		# bug 47482, arpd doesn't need to be in /sbin
-		dodir /usr/bin
-		mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
-	fi
-}
diff --git a/sys-apps/iproute2/iproute2-5.7.0.ebuild b/sys-apps/iproute2/iproute2-5.7.0.ebuild
index 6a78d7f40fb6..0c4b0ec7e4b1 100644
--- a/sys-apps/iproute2/iproute2-5.7.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.7.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/iproute2/iproute2-5.6.0.ebuild b/sys-apps/iproute2/iproute2-5.8.0.ebuild
index 622ac0d68948..6a78d7f40fb6 100644
--- a/sys-apps/iproute2/iproute2-5.6.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.8.0.ebuild
@@ -48,6 +48,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
 	"${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722
 	"${FILESDIR}"/${PN}-5.1.0-portability.patch
+	"${FILESDIR}"/${PN}-5.7.0-mix-signal.h-include.patch
 )
 
 src_prepare() {
@@ -70,12 +71,6 @@ src_prepare() {
 		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
 		Makefile || die
 
-	# Use /run instead of /var/run.
-	sed -i \
-		-e 's:/var/run:/run:g' \
-		include/namespace.h \
-		man/man8/ip-netns.8 || die
-
 	# build against system headers
 	rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc
 	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
@@ -120,7 +115,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake V=1
+	emake V=1 NETNS_RUN_DIR=/run/netns
 }
 
 src_install() {
diff --git a/sys-apps/irqbalance/Manifest b/sys-apps/irqbalance/Manifest
index eaf248ad1897..86ebcf8a82a9 100644
--- a/sys-apps/irqbalance/Manifest
+++ b/sys-apps/irqbalance/Manifest
@@ -1,7 +1,7 @@
 AUX irqbalance.confd-1 577 BLAKE2B 2744f203cb1d20ec44bec2f4cd2adc92209575a4742c601f45780cc55ff44434248987c31faf6ae2205ae02b2ecfdbd914f271169cb345e403f41376e3bc48b8 SHA512 90e7ed187b4dccd6f6c4383ba54d6e1aed1645240e44aaf02db1b70b56594b1a828644d671e6db91212417981b1d5e53d1ecfd4b366496dbcb484d1064d7d24c
-AUX irqbalance.init.4 524 BLAKE2B 473ee234adf186f620ec022cf20d61b3aaec368611659ce29be47e1038a0d54e4c353264326353cfbca9e43486e4b9bff17086c8484357512dbd9dc74997ff06 SHA512 3b438b142915139d403f6162271e00807db6f0e9432798b3f2955e798dd58ecb07a6c8920cc85032e65cc5a6d4c16fc65402119d6334920ea6715c4f918f6cbc
-DIST irqbalance-1.5.0.tar.gz 55150 BLAKE2B b111e9fd4cfec968b261f6ae8a6876d15845849ebf28d7304fd8af3bdeb93b8b9a626888c5728b69925f02a5e472c3512f5862726c6ae9a4d378c46ebcf39069 SHA512 343421fd533d7d161fd05a0edfadaddf1da6ced854a19e9f10ea6c12b97b2ef1629aad855214d9700d31d056bb816bf3ec90cdf7c643a1b6e8af1de5befa64f5
+AUX irqbalance.init.4 555 BLAKE2B a90aa453f6d59ec8da954d47a386cfcc2395e36b3b7f9b0cef74714e348e23b091aa00d8db586593e2e85a01f8fc2d97be7a8c754d44a6f5728f7e2e98393df1 SHA512 0252900f183a714f2c1c9f57bca7b26e2c2b3d12e6ca46085203b4b04aff41cc97c6a54b1f0e66b37d7f214f127633c0179cede8deee57dcc1f3635ec17c337c
 DIST irqbalance-1.6.0.tar.gz 55310 BLAKE2B 67589a40541e9034a0ac09d60a2293dde7a0cf524620794e25b60b4d78f2c91270252f6cebc2c91c66aed105536a211d51aeb29305fc1235112d96b714dc80bd SHA512 ce89dc41eb3aab5950a56b4b1c817aae5e87eaa84bc69bf88618caf53386513e488bb0b4724a600ae175c96be509367cfc418c7f85531007f80e02f7de549b16
-EBUILD irqbalance-1.5.0.ebuild 1322 BLAKE2B b7c9fdaeef6a657caa89f3f1cdd641b55c82657bfb8a81d9cb7ec16387c5bc0e6629f655fc675f7485931a5480276aa56d959e81d22ab11c51343e54a7f29f02 SHA512 0557b7a96c9a1b23ee82e524b90d9253699cd2b3c31b566db027838cf7b33b01b55ebfd3a8bd49ee9001110e2aca6058cbdf2604f56f5311ce5143c0b360a7e6
-EBUILD irqbalance-1.6.0.ebuild 1328 BLAKE2B e5964f3030ca33c236e2418b506b7c24154308fee412680d36e85a29aeb1346ce191711d5fd9a8c36f346c1a1bc3e541b65b024da3c22416cfd4838fbcf431b7 SHA512 8084138972ac5c3a7d2191caea86e3cabd86358a8f63c8430ef75a16543419a86fe0987cb861c3299cb1249a3287a552390e6571967a8a19c3693ff90dc2b86b
+DIST irqbalance-1.7.0.tar.gz 54209 BLAKE2B 1213b21c7d3979c9ba7d2298c21f7f0b75217d251ecfa02660ea0602a032d62c9c9b0254bf158e07e0fdcf55b35f332f5a17f929c7393dfdb894ca952dad52b4 SHA512 2fa29c738275dda2fac38d78ca0ec4619826b72529e8eda7ad8ddcda5768bbf282e2260dddc16a8b46d4296289b25dc59684575ae1badca0c6c6ae30b1e9b5ea
+EBUILD irqbalance-1.6.0-r1.ebuild 1328 BLAKE2B e5964f3030ca33c236e2418b506b7c24154308fee412680d36e85a29aeb1346ce191711d5fd9a8c36f346c1a1bc3e541b65b024da3c22416cfd4838fbcf431b7 SHA512 8084138972ac5c3a7d2191caea86e3cabd86358a8f63c8430ef75a16543419a86fe0987cb861c3299cb1249a3287a552390e6571967a8a19c3693ff90dc2b86b
+EBUILD irqbalance-1.7.0.ebuild 1331 BLAKE2B ec6b59c62465b5713acee225bbf802062f93eb08a68ce9f86133911ecd26bac091a4a38e29d55d265396d53bd0b2095a9cafafd7b07cb77bd7864c25b124d4b5 SHA512 b5b5d23c92ed1748d3b084734e6571893ee17784f1e1fd3a2be6255c622c03b0c6363b548c412998fafd3274f0b53cd9762f62731a6d8d3f8286c1c7c8f4ca8c
 MISC metadata.xml 546 BLAKE2B 9c510c79c069672f2fdd1ccd7d2bd08917b692779904237650fbf8262bed2a6a40af805179d9f265534e761f074cb4d533fe89e46533880edae9c30f9a118a7f SHA512 6510fd0c07b1b59b79037b05a482554b3934c8d19acc8f4d54058ac5bc605c5adde426d3c12b7f618dd87381435467ecbab7baafcfb27166981f83cb56b72a04
diff --git a/sys-apps/irqbalance/files/irqbalance.init.4 b/sys-apps/irqbalance/files/irqbalance.init.4
index 1fb9eeb11f4a..8b2d63143c39 100644
--- a/sys-apps/irqbalance/files/irqbalance.init.4
+++ b/sys-apps/irqbalance/files/irqbalance.init.4
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2 or later
 
 depend() {
@@ -17,4 +17,6 @@ start_pre() {
 		eerror "You need to update your kernel."
 		return 1
 	fi
+
+	checkpath -q -d /run/${SVCNAME}
 }
diff --git a/sys-apps/irqbalance/irqbalance-1.6.0.ebuild b/sys-apps/irqbalance/irqbalance-1.6.0-r1.ebuild
index 918aff3e877a..918aff3e877a 100644
--- a/sys-apps/irqbalance/irqbalance-1.6.0.ebuild
+++ b/sys-apps/irqbalance/irqbalance-1.6.0-r1.ebuild
diff --git a/sys-apps/irqbalance/irqbalance-1.5.0.ebuild b/sys-apps/irqbalance/irqbalance-1.7.0.ebuild
index 53f92ac50ce8..0d1fd414c8aa 100644
--- a/sys-apps/irqbalance/irqbalance-1.5.0.ebuild
+++ b/sys-apps/irqbalance/irqbalance-1.7.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit autotools systemd linux-info
 
@@ -11,19 +11,19 @@ SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="caps +numa selinux tui"
 
-CDEPEND="
+DEPEND="
 	dev-libs/glib:2
 	caps? ( sys-libs/libcap-ng )
 	numa? ( sys-process/numactl )
 	tui? ( sys-libs/ncurses:0=[unicode] )
 "
-DEPEND="${CDEPEND}
+BDEPEND="
 	virtual/pkgconfig
 "
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-irqbalance )
 "
 
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 6d7a9c8bde93..10bb835a002b 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -3,10 +3,10 @@ AUX kbd-2.2.0-cflags.patch 990 BLAKE2B 2512eccfd4e2eea843e176951f6e6fa1f74d2fd28
 AUX kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch 982 BLAKE2B 6a52de79d927cb67420a257d5becbe50027c838878e1baecf860e30feb59a1913101e1f650974c5bca08f579c1dd4312cc60f77c12a6c860281b3fcb0fdbf072 SHA512 caeef9531f8bd926c655a7002b4b96b9d49aa94b7d7e063347d920bc869751059fbcf4578338bbb9e910f936b62485bbe51713d4956577dcd6828ad075b4f6ed
 DIST kbd-2.0.4.tar.xz 1031864 BLAKE2B 10c2bded89befda1f1d7ab199796e082a4e3b2333cf29a2abbbe843191dce41a7289d5bc3b7e55d8b25c7144ae4b4977e4321b38896917d0083af8ddd4924a3e SHA512 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f
 DIST kbd-2.2.0.tar.xz 1115220 BLAKE2B d4218f3a8f9212d16e8a14011f0e136f6aebd18f13f8d5da2bd63296e0aa857fc5e7fe927200345fca3b723bc879f87511b02c152824a73ae5743cc8175991e6 SHA512 5f407c20739487e423e8390e429d30838a1a69a0a50db083803ce56da919e25ce480b63fd1bcfac9eb362095f17e575783b09eaa55e26b442bfa3ed838e04f13
-DIST kbd-2.2.90.tar.gz 1636546 BLAKE2B 8bfdd3d09e38a0b91684fee481f63e8118b2a37568f2e9ac28c164256033449fc035c2f2179b0a15d4e1e4c28a5fc00c1906c1b47e97bb9b76cc7eae81f453d7 SHA512 dbbbd0bd0d293ce7fa9f6a03b5ea2213e6beb01917137a13f507939657afcab8b69b759691755d85925c87276b4e43637ff840c24b1de4ca4e2c4a301e050926
+DIST kbd-2.3.0.tar.xz 1099660 BLAKE2B 20044b942cc2568acc9c4616bc38cc0bacb6773ba397327e9e23c87f0473cfdb1a165b9905039fc60b69001d99f799c48491ca098b64961cf5821f7d4b954df7 SHA512 6d7ba496a963c29abf1f514831c47e6bc73797b04021115879cbdb203c879c5abfae9f8fcaeec52d8891cad848240d39f5293452d26c7f0a84fb58499ad6e927
 EBUILD kbd-2.0.4-r1.ebuild 1536 BLAKE2B 3bf3fb6e985557b4ac62a75fc64d9e9608716e5914ff151ab11af68bf16f499e06216bb26da494b39f93d032d57fc8b9a74680196659d76d48b8ff5460f26d7f SHA512 a0e5b222f7321d5094a3dc67737b09d6ac1e3881029bbc402feeb58a4e269d3dfb103cff0fddd5c962b0c0cbe8345e986ead373b1592b1a1a82c7e2520f34257
 EBUILD kbd-2.0.4.ebuild 1374 BLAKE2B 604d3d89c6a4a5f579607bdb03563edc51f3d29731dab80e1b202ceaa1658c70c48f84bcf09c8de958ce3acfcdae79224718897f21ef07803eadf07d900428be SHA512 f568ee8f7d27ee59b2c3e408c602a2d4daf8281964dc509ce251b7dd6b3fc35e6babae2c0f5023d6bd0453a1fe842c992366cf7cc633c21145ded70706d80384
-EBUILD kbd-2.2.0-r2.ebuild 1601 BLAKE2B 4164b0070547959848ef4b8adc05f8ec1ae3e8785bd1d4c9801f9f3ad77a3e515afa51c3e5eb86ec60d4877c14cf4d2d89d7473b1b2d31caafdb04b0f5aae9e7 SHA512 c323e91149fa0842e5b7587db49759e3bb61e6d36fcf74d7df17f3f6fe0c69877abdb50502bc04cd2f3a5878c52eff36f8586f96c04aa15349081454c11bf2f2
-EBUILD kbd-2.2.90.ebuild 1699 BLAKE2B 652e68d5c215b1a8c72f69aa50d338f3e859fb35e1b3c3b8f684909adfc8fad17d528bd4a6990cabe87177b7bdfd0fa1391a4a50d71792457900cbb0667777a6 SHA512 7b757726aac91df126742c41da5230d00a2f712b2b38edc193926c98b98a7acc57982dff33b530df86780b0839d57593e4cbcf9f2d1afe1ac3d979047d076eec
-EBUILD kbd-9999.ebuild 1699 BLAKE2B 652e68d5c215b1a8c72f69aa50d338f3e859fb35e1b3c3b8f684909adfc8fad17d528bd4a6990cabe87177b7bdfd0fa1391a4a50d71792457900cbb0667777a6 SHA512 7b757726aac91df126742c41da5230d00a2f712b2b38edc193926c98b98a7acc57982dff33b530df86780b0839d57593e4cbcf9f2d1afe1ac3d979047d076eec
+EBUILD kbd-2.2.0-r2.ebuild 1598 BLAKE2B 9bb3f2f83246815e5f0f6835c32f823d5ed9ca87986b953b9d63322df2ebf8c1ee9aa411dc044c5b47cd8b97e4fb3fe855ea331f4475bd1de662317fb9cf7919 SHA512 cd644fabd032ee93c783d197bade61cb14e0a99e9cedfb83b4284de6f7c3eadce8a83489f6e715f73fe8ca45a7b1f22c47b377bc8cfef57d4372961764edc01a
+EBUILD kbd-2.3.0-r1.ebuild 1922 BLAKE2B 38bcdddab72b5783e128c56636c482a601582fbb5898e7908b3752c56f29aa4aebed8233a7854f5f8c3bb028c47365e7f801d83c0dc1b56f013ae7cf19f2f14f SHA512 fa572d7cbd83873e600b7c9632bb15d4601efd9380c35b976ddade9df9da765baa5b5fe4422cbc1ad2999570c928e085444114c2faedf0b0e72ba95b3abaa61a
+EBUILD kbd-9999.ebuild 1922 BLAKE2B 38bcdddab72b5783e128c56636c482a601582fbb5898e7908b3752c56f29aa4aebed8233a7854f5f8c3bb028c47365e7f801d83c0dc1b56f013ae7cf19f2f14f SHA512 fa572d7cbd83873e600b7c9632bb15d4601efd9380c35b976ddade9df9da765baa5b5fe4422cbc1ad2999570c928e085444114c2faedf0b0e72ba95b3abaa61a
 MISC metadata.xml 321 BLAKE2B 608f4a02a31f6c1590d7c237516a00cefa06f641febb7b479b7b0a276e9b59c0b7a88bbc6f4bdaca942ae83b85ebad6c6e84097916315eb985ebc2d98a70b171 SHA512 f00b80d88f4647f210c28f95f8dc81fc8ff3bcbe74e6429e9d5dd92e57588297aafee968b8a3cad2db3b2010fd9ebc400975ca59ffcd62370afa799745dda641
diff --git a/sys-apps/kbd/kbd-2.2.0-r2.ebuild b/sys-apps/kbd/kbd-2.2.0-r2.ebuild
index 2b5350ae8b23..ad709279f2d4 100644
--- a/sys-apps/kbd/kbd-2.2.0-r2.ebuild
+++ b/sys-apps/kbd/kbd-2.2.0-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Keyboard and console utilities"
diff --git a/sys-apps/kbd/kbd-2.2.90.ebuild b/sys-apps/kbd/kbd-2.3.0-r1.ebuild
index 32395a108a73..3cb9fb4edd0d 100644
--- a/sys-apps/kbd/kbd-2.2.90.ebuild
+++ b/sys-apps/kbd/kbd-2.3.0-r1.ebuild
@@ -26,7 +26,9 @@ HOMEPAGE="http://kbd-project.org/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="nls pam test"
-RESTRICT="!test? ( test )"
+#RESTRICT="!test? ( test )"
+# Upstream has strange assumptions how to run tests (see bug #732868)
+RESTRICT="test"
 
 RDEPEND="
 	app-arch/gzip
@@ -65,6 +67,8 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
+		# USE="test" installs .a files
+		--disable-static
 		$(use_enable nls)
 		$(use_enable pam vlock)
 		$(use_enable test tests)
@@ -77,4 +81,7 @@ src_install() {
 	docinto html
 	dodoc docs/doc/*.html
 	use pam && pamd_mimic_system vlock auth account
+
+	# USE="test" installs .la files
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/sys-apps/kbd/kbd-9999.ebuild b/sys-apps/kbd/kbd-9999.ebuild
index 32395a108a73..3cb9fb4edd0d 100644
--- a/sys-apps/kbd/kbd-9999.ebuild
+++ b/sys-apps/kbd/kbd-9999.ebuild
@@ -26,7 +26,9 @@ HOMEPAGE="http://kbd-project.org/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="nls pam test"
-RESTRICT="!test? ( test )"
+#RESTRICT="!test? ( test )"
+# Upstream has strange assumptions how to run tests (see bug #732868)
+RESTRICT="test"
 
 RDEPEND="
 	app-arch/gzip
@@ -65,6 +67,8 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
+		# USE="test" installs .a files
+		--disable-static
 		$(use_enable nls)
 		$(use_enable pam vlock)
 		$(use_enable test tests)
@@ -77,4 +81,7 @@ src_install() {
 	docinto html
 	dodoc docs/doc/*.html
 	use pam && pamd_mimic_system vlock auth account
+
+	# USE="test" installs .la files
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/sys-apps/kcheck/Manifest b/sys-apps/kcheck/Manifest
index fce85523dcc7..1286520eeecc 100644
--- a/sys-apps/kcheck/Manifest
+++ b/sys-apps/kcheck/Manifest
@@ -1,4 +1,4 @@
 DIST kcheck-0.0.2.tar.gz 8519 BLAKE2B bc1a4355e1d55118386b34d6f5aca0f11cbf519c0f7d3bb0cf143cca4682af782e6728585fa6dd36c21fc6cea73d21d0ab35571f93096b9eba4a9b461808f2b0 SHA512 98e3ad4835f8c1bacf68f98e112c05788394feb00683b7a02aa92cc2b5f8b4edeebe2b962c07a171b06bdfe7324e715d58057f6c8550004acc52cc0d9105ba9e
-EBUILD kcheck-0.0.2.ebuild 717 BLAKE2B 0793e11208a90c5191c3fe69acc39e390e018408f8ef4494a24efb66bbbe1485f15bfc6b943f5e5eb5c229a28d4f947639d4bb043d6ef419e3902a51cd320357 SHA512 21c316176669b7edd8b1922324a81501e1de2ee1f3f4d10f90baeca21aeb376412c050ebc5edef4f85bdf8ae1225fe6a33bb698904a72182a8e813fc59605362
-EBUILD kcheck-9999.ebuild 717 BLAKE2B 0793e11208a90c5191c3fe69acc39e390e018408f8ef4494a24efb66bbbe1485f15bfc6b943f5e5eb5c229a28d4f947639d4bb043d6ef419e3902a51cd320357 SHA512 21c316176669b7edd8b1922324a81501e1de2ee1f3f4d10f90baeca21aeb376412c050ebc5edef4f85bdf8ae1225fe6a33bb698904a72182a8e813fc59605362
+EBUILD kcheck-0.0.2-r1.ebuild 779 BLAKE2B 06f85f01ba4c0210229f43bc9b11558ccd86eed015df6e0df22224ef1684564d47f942e6fc192d1f06a129cc37eed2335aa5668ff06b7a4b47fac91dde3834ff SHA512 74ed09a8a581905f3de3b2d45597c8dbef6bf9a993d68acf74e6eecab00870d693da016c41b580cd3e2d940b3786d41b77546939aa32705b5e932131a602d29a
+EBUILD kcheck-9999.ebuild 779 BLAKE2B 06f85f01ba4c0210229f43bc9b11558ccd86eed015df6e0df22224ef1684564d47f942e6fc192d1f06a129cc37eed2335aa5668ff06b7a4b47fac91dde3834ff SHA512 74ed09a8a581905f3de3b2d45597c8dbef6bf9a993d68acf74e6eecab00870d693da016c41b580cd3e2d940b3786d41b77546939aa32705b5e932131a602d29a
 MISC metadata.xml 454 BLAKE2B 702bb365aaf1973836df525f21ce379cae10843934cf3c7d8544e66f95853c2b337a259415893261cd3099d43a0e3e73a506b39d48be33f2031417cb8df0882e SHA512 a77c738e7cc92789a2e857e6bf540c516e44358a2b87fa2448ab237f576d0ad674dff645361737d834f4c94d7904f1f8408ebbcf101aaea71c9827f4117ee1ea
diff --git a/sys-apps/kcheck/kcheck-0.0.2.ebuild b/sys-apps/kcheck/kcheck-0.0.2-r1.ebuild
index 2d83fb1a653b..d28b7022b350 100644
--- a/sys-apps/kcheck/kcheck-0.0.2.ebuild
+++ b/sys-apps/kcheck/kcheck-0.0.2-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -20,11 +21,13 @@ HOMEPAGE="https://github.com/wraeth/kcheck"
 LICENSE="MIT"
 SLOT="0"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/configargparse[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/configargparse[${PYTHON_USEDEP}]
+	sys-apps/portage[${PYTHON_USEDEP}]"
 
 src_install() {
 	distutils-r1_src_install
-	mkdir "${D}"etc || die
-	mv -v "${D}"{usr/,}etc/kcheck.conf || die
+	mkdir "${D}"/etc || die
+	mv -v "${D}"/{usr/,}etc/kcheck.conf || die
+	rmdir -v "${D}"/usr/etc || die
 }
diff --git a/sys-apps/kcheck/kcheck-9999.ebuild b/sys-apps/kcheck/kcheck-9999.ebuild
index 2d83fb1a653b..d28b7022b350 100644
--- a/sys-apps/kcheck/kcheck-9999.ebuild
+++ b/sys-apps/kcheck/kcheck-9999.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -20,11 +21,13 @@ HOMEPAGE="https://github.com/wraeth/kcheck"
 LICENSE="MIT"
 SLOT="0"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/configargparse[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/configargparse[${PYTHON_USEDEP}]
+	sys-apps/portage[${PYTHON_USEDEP}]"
 
 src_install() {
 	distutils-r1_src_install
-	mkdir "${D}"etc || die
-	mv -v "${D}"{usr/,}etc/kcheck.conf || die
+	mkdir "${D}"/etc || die
+	mv -v "${D}"/{usr/,}etc/kcheck.conf || die
+	rmdir -v "${D}"/usr/etc || die
 }
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 3bfe3b029ae9..0e7a1f477811 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,14 +1,14 @@
 AUX 90_kexec 199 BLAKE2B 37bcd66beccc32a884b0c2fca9cbba14784b8e6bc7238c14397f0ded788b503df1f7d6fff01c9b9a6bc159c1a6e01821c4c78c144091a7e13bb2bbe88ab5a98c SHA512 31837eb7df9b5c9b63c5f500e55fb584e315ac20f328490ff812a265f1a01604724bf4699f142255f7c5fa78cb2d8f2d6220a91961ac90df644b5d545d47ca39
 AUX README.Gentoo 937 BLAKE2B 88a8912015e1cab0d382661d6bdc82689c91970d6d84c949e99a932b4d153b0753183380930b753d23d1c40ab7f44cae784f716e54bc3609a28741ab0b5b1348 SHA512 f082763692def43a97866b88443daf08a2bc1b0dccdc90160d12effa16e1293d8db6935c72ca9dd5502f844078241cbecdfde15b6e8f67a2cca8f3e89f14e654
+AUX kexec-r2.init 4061 BLAKE2B 40e0f89db9a1b95c8b389e093aee055402ca6ac450344c53de4e6e44127020bb51d33b41f4ec4a749303cbd67f873088aff151599c046f4fcb268da9397baa83 SHA512 9974ec312647dce2213bfaa80820ebf1571ce4d95daa8668a0626444e7d768a2dddc984f1a3b79df956b870e99e2f82ae970f11fc146baf7926fec45048a9e7c
 AUX kexec-tools-2.0.20-build-multiboot2-for-i386.patch 3095 BLAKE2B 1e8019d09f3c90f801dd5cd4d2c02b5104a663c1bb1cd7c88ce98f6a934db7e427907a7df26e285bf481dd589f19f65b69862450d3ca81fc78bf00a828b7fed7 SHA512 0d47425508307e6614c618b54953e7c6259587a9519441910236c299950fb75ddaf1829870194da32acefff680034925135306e9b8df4f082ddeb2042f0f89bf
 AUX kexec-tools-2.0.20-remove-duplicated-variable-declarations.patch 3661 BLAKE2B 5f0f31b40475a049157a51797127a882d50ee435f1fbf3b2dea5a423f104fdec2c234324e2cd7a56b9f066148f382cb8582a3d988ee2fce40e0dc75ae6d159c7 SHA512 5ad9036ba28bdc8c319c71af5352e60b0a9ea2bd9153723e2256b6365417c0a43225dbed3c80809792318eda0eff86042ef32f5259d5ff733f0d55df4c45dd28
 AUX kexec-tools-2.0.4-disable-kexec-test.patch 473 BLAKE2B ad62ae055cd4443ee4dcb4d9a5be1c918a9e1337545f60c683a1a47b848020d0f8fbdc38c7111e505424783191faf3e221ffa642169d2d055d5e17e6b19b9d0d SHA512 c7fe9176db7c3f9c84add1c263c5a695684bf1db55d47152534f0bbb97c084ad5d3f2090307d0bdfcf5622fa810aca3c104f81b3d24baa76f42d3f32d1d4bbad
 AUX kexec-tools-2.0.4-out-of-source.patch 816 BLAKE2B 88dc0a8f01c65a32b6ae081ea222760845fe243aad1057e3620ed4c932a32edebf943f9557b2f67751bbcea1f91778c0c065e246d419d5725eb68edcb1e58ced SHA512 4839800f99e2bdb7dfbf3aa1f3ad795feb63b4e493812a50d4baa839a27b5e96319c4e848969cbcedf627a32ed5fbfb312461c2ac89b73daaa7f8f680f35f504
 AUX kexec.conf 340 BLAKE2B a65aa0f402c712c10f6095b37b620dacfe883ad621f5403d8190febf582f3ab7e8b821091321036bff104ee5cebab21062830c774778ca17a34a2df76065cfb8 SHA512 66beb57ee13dba70f75f12326643270a0c888e178fdfca8ba7a566a874707aebe2afebb6ceae976dfb0aaf3135048daad6277e70580e4c7911b9ddbf74e4f00a
 AUX kexec.conf-2.0.4 1013 BLAKE2B 7594bf8c150d1165f30449526b658c78feab82526e649aa8cce35b6a47b2abd5a208b7ae4376f0330ea2194ae63f786bf0c30682f734f1b604be131e6e63570e SHA512 96db2834454aa4d038061e9b1f918932da3d3054021487425d0f70c6ad32096b9433ae2f3921e83196b23af901c32e591df3d6a84a6d14e064608d8ad895a599
-AUX kexec.init-2.0.13-r1 3688 BLAKE2B b0bfb8e94a1cf03c95c8a4b20164345a0ae46830ab59659e469854105d4d7665c77983414fb7fdd069c91002fd4d4f6a215da9dbb395c700a379483d720d9b22 SHA512 ff515de615fc2eb377b8235b33a3c047f9fe63f070181844bcf77761c464b557d9ecfcde2c631e5f09cb3f4a0dfb545485f02a4671c2d0cdf8943fc508250bd2
 AUX kexec.service 407 BLAKE2B 7854172c36f550fece58b6cb351a6bd8b4ab8b5a11da0fd629048f8cc2866baa11ee7311424f998360f02dc2c1210be32222283c2bd2f93e1bf4bf65ec903203 SHA512 9f0fa6d39c67048fe774fee0f2e8ed10e9e12a2468e7dda193cd8c5bd8b4cf49819d14703efad35c91265cd4e03c6f5460934b5fe92efd06eab8dc619920b1e3
 DIST kexec-tools-2.0.20.tar.xz 297476 BLAKE2B 7e29e7f7d85296dd3e614c45f14c27eca74ce4426d5de2d20387d89f2f63afed318d6157cc4001849a04bb83505bbae87c43d34683ebaf9a70f5f29e3979ade3 SHA512 3112b6202c1030705c53e3f65a2b58aec14d65333a35aad681d48b9f2bd1c51a2e05c985a1e5e867ab02f8a9c97708483d9d225619db7c6993676f1a242e2d99
-EBUILD kexec-tools-2.0.20-r1.ebuild 2725 BLAKE2B cf29a8a41a98aab6402d1321ebb1f72a64b8cbc7677d8c81a241e89ccea062df0481d5a1b980cb7216db628bd7be5cf779714a027720234acfee4bb3f1bd89f8 SHA512 e98fabbba216a0051e4d2182d9e7ba5bf3d1e302b433d90bc8c0e46d84ab26c9682ce601786fe0cb776d36d106938868aa4a13e321ce74f6f0e88fc2700d242f
-EBUILD kexec-tools-9999.ebuild 2609 BLAKE2B 4f8fa08ade4962b5b6c73c3ea2006f8c69d742a9856509672fc26e141bb0a9a3920dbd0c6d0f4e094738766fb9628713229fd69274b9bbcbc09097e17a60360c SHA512 49eb9295420913d3edaee5c050ed8f4c430a7f3eee2bdb325243bfb8c0b6fe97f9633b785e765a114625ca8d2b3cfb4bffbd7fea526949d789e3f3bd600a251d
+EBUILD kexec-tools-2.0.20-r3.ebuild 3381 BLAKE2B 67e203cd4ea7fea5a7c100a5acf8dfa7376f96e98fadd48a3e0a2de430e6ae4092cf29a48b6d56b0a2bac7bb437d402fc8f2b370b9141dbd3eb5d6eac7d03673 SHA512 621707548ff183ed90b5d47531528954894bcde436e1f3beeb93a70e58a5018d3f9d0353d4654b9e57be9ef6cb4ab6f2168511a46106dcc86b9c24b6981b77ba
+EBUILD kexec-tools-9999.ebuild 3265 BLAKE2B 1f5c5356f79113a1956d1b57dcb570f4bd0327ab03aef0917e06cac9cd6e7c1ae02ca530dd9e95b1f8e8f1b9277dd5c96397efb8881cffedf2a8096107e6ccb0 SHA512 163fd666f3f892d80c12bb809f5ef8a5494ba6a3f13bb5e1679b89795d943c19735c631bddc0f3ab51abf417413c20d24af47143941bd35fec747dc1d500d246
 MISC metadata.xml 490 BLAKE2B 87c80e53801415341290c29dbc0728a4d084519c38f5c5d14bedde32596111f4cbb91c72ed36b6a8fe3f63ad715df57d59b2a61730ebe08ff7f2bc868c8ff916 SHA512 6f4b25178cc6b8ff3fea664f2717eb7268d9e71c4ca46c170887eb836f9d78dff7e64067968175d018dc22bbcc2bb8cd6fd5f44edba0966fa568f9fd827a1cff
diff --git a/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1 b/sys-apps/kexec-tools/files/kexec-r2.init
index 167b792de85d..0578f51aea19 100644
--- a/sys-apps/kexec-tools/files/kexec.init-2.0.13-r1
+++ b/sys-apps/kexec-tools/files/kexec-r2.init
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Set up some defaults.
@@ -14,16 +14,16 @@ depend() {
 auto_prefix_bootpath() {
 	# Only auto-add prefix to relative paths.
 	case $1 in
-	*/*) echo "$1";;
-	*)   echo "${BOOTPART}/$1" ;;
+		*/*) echo "$1";;
+		*)   echo "${BOOTPART}/$1" ;;
 	esac
 }
 
 get_genkernel_arch() {
 	case $1 in
-	  x86_64) echo "amd64" ;;
-	  i[3456]86) echo "x86" ;;
-	  *) echo "$1" ;;
+		x86_64) echo "amd64" ;;
+		i[3456]86) echo "x86" ;;
+		*) echo "$1" ;;
 	esac
 }
 
@@ -34,12 +34,13 @@ image_path() {
 		return
 	fi
 
-	local x kver="$(uname -r)" karch="$(uname -m)" 
+	local x kver="$(uname -r)" karch="$(uname -m)"
 	local gkarch="$(get_genkernel_arch $karch)"
 	for x in \
 		"bzImage" \
 		"vmlinux" \
 		"vmlinuz" \
+		"kernel" \
 		"bzImage-${kver}" \
 		"vmlinux-${kver}" \
 		"vmlinuz-${kver}" \
@@ -67,6 +68,7 @@ initrd_path() {
 	local gkarch="$(get_genkernel_arch $karch)"
 	for x in \
 		"initrd" \
+		"initramfs" \
 		"initrd.img-${kver}" \
 		"initrd-${kver}.img" \
 		"initrd-${kver}" \
@@ -117,12 +119,22 @@ load_image() {
 		fi
 	fi
 
+	local is_rootpart_autodetected=no
 	if [ -z "${ROOTPART}" ]; then
 		ROOTPART="$(readlink -f "$(sed -n '/^\/[^ ]* \/ / s,^\([^ ]*\).*,\1,p' /proc/mounts)")"
+		is_rootpart_autodetected=yes
 	fi
 
+	local is_reusing_cmdline=no
 	if [ -z "${KPARAM}" ]; then
 		kparamopt="--reuse-cmdline"
+		is_reusing_cmdline=yes
+	fi
+
+	if ! yesno "${is_rootpart_autodetected}" || ! yesno "${is_reusing_cmdline}"; then
+		# Only append root when explicit set in config or
+		# if we aren't re-using kernel cmdline
+		KPARAM="${KPARAM:+"${KPARAM} "}root=${ROOTPART}"
 	fi
 
 	if [ -n "${initrd}" ]; then
@@ -135,7 +147,7 @@ load_image() {
 	ebegin "Using kernel image ${img}${msg} for kexec"
 
 	kexec ${KEXEC_OPT_ARGS} ${kparamopt} \
-		-l "${img}" --append="root=${ROOTPART} ${KPARAM}" ${initrdopt}
+		-l "${img}" ${KPARAM:+--append="${KPARAM}"} ${initrdopt}
 	local ret=$?
 
 	${mounted} && umount "${BOOTPART}"
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.20-r1.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.20-r3.ebuild
index 480260001a5e..89aebbb29179 100644
--- a/sys-apps/kexec-tools/kexec-tools-2.0.20-r1.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.20-r3.ebuild
@@ -89,7 +89,7 @@ src_install() {
 
 	dodoc "${FILESDIR}"/README.Gentoo
 
-	newinitd "${FILESDIR}"/kexec.init-2.0.13-r1 kexec
+	newinitd "${FILESDIR}"/kexec-r2.init kexec
 	newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
 
 	insinto /etc
@@ -107,4 +107,20 @@ pkg_postinst() {
 		elog "   /etc/kexec.conf"
 		elog "Please adopt it to your needs as there is no autoconfig anymore"
 	fi
+
+	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
+	local has_rootpart_set=no
+	if [[ -f "${EROOT}/etc/conf.d/kexec" ]]; then
+		if grep -q -E -- '^ROOTPART=' "${EROOT}/etc/conf.d/kexec" 2>/dev/null; then
+			has_rootpart_set=yes
+		fi
+	fi
+
+	if [[ ${n_root_args} > 1 && "${has_rootpart_set}" == "no"  ]]; then
+		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
+		ewarn "This was probably caused by a previous version of ${PN}."
+		ewarn "Please reboot system once *without* kexec to avoid boot problems"
+		ewarn "in case running system and initramfs do not agree on detected"
+		ewarn "root device name!"
+	fi
 }
diff --git a/sys-apps/kexec-tools/kexec-tools-9999.ebuild b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
index 77c5d7c6e590..86b8d9fc9789 100644
--- a/sys-apps/kexec-tools/kexec-tools-9999.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
@@ -87,7 +87,7 @@ src_install() {
 
 	dodoc "${FILESDIR}"/README.Gentoo
 
-	newinitd "${FILESDIR}"/kexec.init-2.0.13-r1 kexec
+	newinitd "${FILESDIR}"/kexec-r2.init kexec
 	newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
 
 	insinto /etc
@@ -105,4 +105,20 @@ pkg_postinst() {
 		elog "   /etc/kexec.conf"
 		elog "Please adopt it to your needs as there is no autoconfig anymore"
 	fi
+
+	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
+	local has_rootpart_set=no
+	if [[ -f "${EROOT}/etc/conf.d/kexec" ]]; then
+		if grep -q -E -- '^ROOTPART=' "${EROOT}/etc/conf.d/kexec" 2>/dev/null; then
+			has_rootpart_set=yes
+		fi
+	fi
+
+	if [[ ${n_root_args} > 1 && "${has_rootpart_set}" == "no"  ]]; then
+		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
+		ewarn "This was probably caused by a previous version of ${PN}."
+		ewarn "Please reboot system once *without* kexec to avoid boot problems"
+		ewarn "in case running system and initramfs do not agree on detected"
+		ewarn "root device name!"
+	fi
 }
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index cad6830bdf70..8356c355f47f 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -4,5 +4,7 @@ AUX keyutils-1.6-endian-check-1.patch 1152 BLAKE2B 7614e1b72ae012f1d3126a2edfd26
 AUX keyutils-1.6-makefile-fixup.patch 756 BLAKE2B 8e4e187859933ca4359adff5307bba833cae1a5e4b7c6975fc88e6848ba76ee30e0c59a42ee2110b9874da5db8e60880265f93798abe55f6a12e71346a6b01de SHA512 4becdbc7b1a68b3e6e8e32b2d08005e435f838d02a3406757216717ec82712f181ff0a32397c995b36264469e29cf39fe9311a762e62427f4507f94418c9400b
 AUX keyutils-1.6.1-silence-rpm-check.patch 594 BLAKE2B b2c44db4cd57f07eb2450bcd8ff4c259ff9ef8ce775f350765cc20bd9b990a2eadedd60745e1c3c31e682b12af0d945b9422f8c2a989f72ccdc56b67b60f8244 SHA512 cd6b0472475089e522c796a33eb1dffe8a6fcf4e3a515d4e379e46b4a82c8b92216ec00fe9a6f4c88e318f6e397aca625040537eed83e0ce30278b9e810fedc9
 DIST keyutils-1.6.1.tar.gz 119065 BLAKE2B b0c65d8a1ee8cab1ac712820a8bf073777eacd558ddd007fa0fd50467d1de86cff238c1c0e6b33b5ff4da7dfd7e2fd673ce5706c39780e1a4fbee7d9653f3bc9 SHA512 a717d9bc6142edefc02da9e92242db352e0bc835483c303629c236e6d9cc51fb495b03fdf9e0e9f0864d7e755c92b7a67f018e806a5de1944673e60e317134a2
+DIST keyutils-1.6.3.tar.gz 137022 BLAKE2B b5620b1b6109415fec1268963c2c65d774f3ef7a69eb1ce8d5d8e78b4b807e4fdfda861662a1b5556975ef867add8f985362a31b6608ac2dc198c8d0395d516b SHA512 f65965b8566037078b8eeffa66c6fdbe121c8c2bea7fa5bce04cf7ba5ccc50d5b48e51f4a67ca91e4d5d9a12469e7e3eb3036c920ab25e3feba6e93b4c149cf9
 EBUILD keyutils-1.6.1.ebuild 3878 BLAKE2B d86332485aa58d81586b9f4abcaa050b62076225d23828c6cd0f1c288a147f5a898db3dc9ac53c504939edec240e774335d3dec9d8089c285d3322a4e6e48521 SHA512 4f36a474a9062524acb5437884a96f7ad96cfb0fb57ec5eabcf387a6736e04d41e0a4ef1ecedb5ecbd450b5c4f9e734d9d267d0bc93fea3503381eed86dc09ea
+EBUILD keyutils-1.6.3.ebuild 3786 BLAKE2B 4c9ea1e6a0df38009e35bd67838edb161690b81ee552a674005da215c3cc87f86012ea5519a59e270fc88845e63d69fe64b637138d2fbb4e2e0e07aa7698d31a SHA512 b017e18f118abf50c16f100a86dd8b152c64e233c44f90b7b7a0d561af2393ded77fd400bb3118e5107ffaf29ddc48051624161d8b86bbe9944e3c42ff7a4b2c
 MISC metadata.xml 424 BLAKE2B f4eb452bb90bf6b62f39d726bae137111c6fca619076888bb475bd2fb042e23db8f5d94240901d36a0c2f15a5774728429e2db2689dbad9ef4bb6d54b0a19b1f SHA512 211515865fbe17798b072bde0c699b67ec10e0716bad11224a3f1e00a729feea67b015cec4e8d870fa708179884176ee0799aee6d237cb4f2798f54a28c8042e
diff --git a/sys-apps/keyutils/keyutils-1.6.3.ebuild b/sys-apps/keyutils/keyutils-1.6.3.ebuild
new file mode 100644
index 000000000000..127ba037b76b
--- /dev/null
+++ b/sys-apps/keyutils/keyutils-1.6.3.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib toolchain-funcs linux-info multilib-minimal usr-ldscript
+
+DESCRIPTION="Linux Key Management Utilities"
+HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/1.9"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6-makefile-fixup.patch
+	"${FILESDIR}"/${PN}-1.5.10-disable-tests.patch #519062 #522050
+	"${FILESDIR}"/${PN}-1.5.9-header-extern-c.patch
+)
+
+pkg_setup() {
+	# To prevent a failure in test phase and false positive bug reports
+	# we are enforcing the following options because testsuite expects
+	# that these options are available. I.e. testsuite only decides based
+	# on kernel version which tests will be called, no feature checking.
+	if use test ; then
+		CONFIG_CHECK="KEYS"
+		ERROR_KEYS="You must have CONFIG_KEYS to run the package testsuite!"
+
+		if kernel_is -ge 2 6 10 && kernel_is -lt 4 0 0 ; then
+			CONFIG_CHECK="${CONFIG_CHECK} KEYS_DEBUG_PROC_KEYS"
+			ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!"
+		fi
+
+		if kernel_is -ge 4 7 ; then
+			CONFIG_CHECK="${CONFIG_CHECK} KEY_DH_OPERATIONS"
+			ERROR_KEY_DH_OPERATIONS="You must have CONFIG_KEY_DH_OPERATIONS to run the package testsuite!"
+		fi
+	else
+		CONFIG_CHECK="~KEYS"
+		ERROR_KEYS="You will be unable to use this package on this system because CONFIG_KEYS is not set!"
+
+		if kernel_is -ge 4 7 ; then
+			CONFIG_CHECK="${CONFIG_CHECK} ~KEY_DH_OPERATIONS"
+			ERROR_KEY_DH_OPERATIONS="You will be unable to use Diffie-Hellman on this system because CONFIG_KEY_DH_OPERATIONS is not set!"
+		fi
+	fi
+
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# The lsb check is useless, so avoid spurious command not found messages.
+	sed -i -e 's,lsb_release,:,' tests/prepare.inc.sh || die
+	# All the test files are bash, but try to execute via `sh`.
+	sed -i -r \
+		-e 's:([[:space:]])sh([[:space:]]):\1bash\2:' \
+		tests/{Makefile*,*.sh} || die
+	find tests/ -name '*.sh' -exec sed -i '1s:/sh$:/bash:' {} + || die
+	# Some tests call the kernel which calls userspace, but that will
+	# run the install keyutils rather than the locally compiled one,
+	# so disable round trip tests.
+	rm -rf tests/keyctl/requesting/{bad-args,piped,valid}
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export AR CC CXX
+	sed -i \
+		-e "1iRPATH = $(usex static -static '')" \
+		-e '/^C.*FLAGS/s|:=|+=|' \
+		-e 's:-Werror::' \
+		-e '/^BUILDFOR/s:=.*:=:' \
+		-e "/^LIBDIR/s:=.*:= /usr/$(get_libdir):" \
+		-e '/^USRLIBDIR/s:=.*:=$(LIBDIR):' \
+		-e "s: /: ${EPREFIX}/:g" \
+		-e '/^NO_ARLIB/d' \
+		Makefile || die
+
+	# We need the static lib in order to statically link programs.
+	if use static ; then
+		export NO_ARLIB=0
+		# Hack the progs to depend on the static lib instead.
+		sed -i \
+			-e '/^.*:.*[$](DEVELLIB)$/s:$(DEVELLIB):$(ARLIB) $(SONAME):' \
+			Makefile || die
+	else
+		export NO_ARLIB=$(usex static-libs 0 1)
+	fi
+	emake
+}
+
+multilib_src_test() {
+	# Execute the locally compiled code rather than the
+	# older versions already installed in the system.
+	LD_LIBRARY_PATH=${BUILD_DIR} \
+	PATH="${BUILD_DIR}:${PATH}" \
+	emake test
+}
+
+multilib_src_install() {
+	# Possibly undo the setting for USE=static (see src_compile).
+	export NO_ARLIB=$(usex static-libs 0 1)
+
+	default
+	use static || gen_usr_ldscript -a keyutils
+}
+
+multilib_src_install_all() {
+	dodoc README
+}
diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index 1704afa815b7..9a25eac64d29 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -1,10 +1,8 @@
 AUX logwatch 125 BLAKE2B 93e0bb2e65dda3a81e1bf560c06a3739fc2226488492219fab478326e8a05051077cfd6ee604d3ebd7aaa2329687a0f3facdb2741e99bf9ea4207a939a16f885 SHA512 20cdf61fe9e9bfe336c6b7e1f33c982c34e61370431179a2f766da8e1b56f8452c85d75fbba4f459f9c4761a7a932c309d0ba7253aeb6e3b31b220c00106e504
 AUX logwatch.tmpfile 39 BLAKE2B 9b1df0ad28bdc16373e71eedb05e8962bf4eda5d564ba8e2632af8158fa3346e8784db2a6bf9aa90c04768743aee6eaefae517feb9f7066d748cae894c1a2299 SHA512 7902aab160b5fd6e1bb1573777f9fab065ed33b0df19da2b5dad31ca962eaea93f9d46e57efca2d76df26c55b48e0578fddf4136e36ed565d8a2b5258dc34afd
-DIST logwatch-7.5.1.tar.gz 469715 BLAKE2B 706352c60370d13b4f72047d08965ab0dd36837194a03bf44e08ec43641eddb8d80d655c783d4f25c8fa757853a4e069997b80676b781561c5e0a23b44a393c9 SHA512 945e66192a9e198169426497f7b5167fcbec2af9565dfead728aa91bfdac5f7e1b2ce2f5f404b6f03841fe6b978f70fb969b47d4f60f02f9a8ccea865c5c782c
-DIST logwatch-7.5.2.tar.gz 475277 BLAKE2B e3d841749af4776da84646444dd90bb084dc33712c1a6eeab87d46cb267656527008505f78506168b7ded40f3d0f8209c205249c2f953e6ee8af7a6cd82833d9 SHA512 157486143ba12167f6c50c778372a4295db3744878607bceba8e0813357651bffd8924ef5ef41a4fbd20811c020dcc031eb354a0f52b8eb6d9aac197087c2bc5
 DIST logwatch-7.5.3.tar.gz 495110 BLAKE2B b28d7381d259a132de7d9fd347ac4bafb44440b187aa811f3d3f65d7b1ccbb00c6b5bb660229cd8155fa5d7bc9668e7b4dd1ebe7bbb909b48367c6a6dd6793e5 SHA512 ad404f031fe016599a8f8d8c0820b23db61a9ad102815d3713e5d13e9a810c819ca7ad9cea50891852982e073ef033dbe7595fde8846971336148e32cbbe29ca
-EBUILD logwatch-7.5.1.ebuild 2412 BLAKE2B 59184da01772304868fadea2e53dfd4a8537b85c0579e856bb4588414e3b0ab9f1d06ad24291219f12ab53e26e7ba6b0b67a9a1e31dddd65b734c00e1f5d81ae SHA512 6019b71457100568fe2732f57d9c22059e211f48067a33c1064bd20f78274ede06670834b70125a5a617596091145af449d4e70200f11b1e68e7f953447442dd
-EBUILD logwatch-7.5.2.ebuild 2420 BLAKE2B ffa1af49cd9de0c37962d6d7a8f51f962a8e123081302b574f8600f399867f66dd15ba8ad2768914e5a88226cac739c1ad52ca326e9aebea5eb2a229600dcbb3 SHA512 a8dfdb266f4bc360a591da1fd4572ece32dd57a33af7bb7d2359754e6ffc004c773111a42e3ec3ed5d5d04ae61e788b78b09286fbd487b3a8ac9005149d3fbdd
-EBUILD logwatch-7.5.3.ebuild 2420 BLAKE2B c00b1d25242a17fadbe9198e107222c948948f5074fa6ed7cb37db75f50cdf46416d88ed5ba20cf8f5357f3e67b81f51f6b2370854175167648b3c2b6d6d68a5 SHA512 0df1c77fcd5568d99fe5395c32cedc997f62e8535e1368c05fe21b05d619dc6eb43c7eb15f26addc19327e3f4a275c8159352e037a436bc5711de77eb597e188
-EBUILD logwatch-9999.ebuild 2420 BLAKE2B ffa1af49cd9de0c37962d6d7a8f51f962a8e123081302b574f8600f399867f66dd15ba8ad2768914e5a88226cac739c1ad52ca326e9aebea5eb2a229600dcbb3 SHA512 a8dfdb266f4bc360a591da1fd4572ece32dd57a33af7bb7d2359754e6ffc004c773111a42e3ec3ed5d5d04ae61e788b78b09286fbd487b3a8ac9005149d3fbdd
+DIST logwatch-7.5.4.tar.gz 481766 BLAKE2B d86ae3afc33a100fc353948be3591cd13566568d47cad02fa5f390882a223ca9d4d78692214f2f0898fa8bf8687314f60ad9ce02f0987bb86dd7136150a1d2b9 SHA512 6e6a5e8b7ae977244ea97895e06cccde320fce3dfbd2b1c58c945fc8872325a9676c8afe122b1f7230cb6617b64813caf90ef37fc472a1b200eb0b24ea72fa9b
+EBUILD logwatch-7.5.3.ebuild 2430 BLAKE2B 2c9d264ee0bb0f2f85a7a2f6d7856c25d4dbe714f38215ddc0608c1bc7596eeb0c5ea55405d002d0913d128faa0788cdb752e4cdc19d87e01a4b792bb73cd98e SHA512 e4bda7b798c5f26c9dc46d9c5211aca91e90046776a8d6b9af9d0d886e388476cf5259c446d70949a34d442a71c59e4c55232ac16116be8c69eb7a8af8f39532
+EBUILD logwatch-7.5.4.ebuild 2438 BLAKE2B 257d42e1e27297affbf91e91375ed1c3c759dee0159a63f8bea3b3d0448d27b8bc0c852434f4278df89636c5fcfd40c8eb8184d099491c5dace1f1b49bfaf326 SHA512 acfcdb3949bbcb72caab77a5843d2e46635bbfb1f88d262325488317e216c7b6c4fb07ecc48ea98b9cb14a97ffbe9745385ebaf8b66e9801dfdc6bfa6fcc5258
+EBUILD logwatch-9999.ebuild 2438 BLAKE2B 257d42e1e27297affbf91e91375ed1c3c759dee0159a63f8bea3b3d0448d27b8bc0c852434f4278df89636c5fcfd40c8eb8184d099491c5dace1f1b49bfaf326 SHA512 acfcdb3949bbcb72caab77a5843d2e46635bbfb1f88d262325488317e216c7b6c4fb07ecc48ea98b9cb14a97ffbe9745385ebaf8b66e9801dfdc6bfa6fcc5258
 MISC metadata.xml 328 BLAKE2B 623e92420ca1fde8b78ac6142444544897284af5e74b610d2e6cac823b97355fc91bcad0ea3bc7ced3286e1bdf6cc2b340a34143b31529424ba9d90209b7898a SHA512 5feb78397d5abc4fc758c61c2c972032eca10f9fcbdbb6efcbae764c5ab1aaa09fd4f9a31082682dfd8e0ff865147fff22787b8d116bc7a954a4fdc42cf7b3e7
diff --git a/sys-apps/logwatch/logwatch-7.5.1.ebuild b/sys-apps/logwatch/logwatch-7.5.1.ebuild
deleted file mode 100644
index 82d7ba396df6..000000000000
--- a/sys-apps/logwatch/logwatch-7.5.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit tmpfiles
-
-PATCHES=()
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.code.sf.net/p/logwatch/git ${PN}"
-	inherit git-r3
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
-fi
-
-DESCRIPTION="Analyzes and Reports on system logs"
-HOMEPAGE="http://www.logwatch.org/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="virtual/cron
-	virtual/mta
-	virtual/mailx
-	dev-lang/perl
-	dev-perl/Date-Calc
-	dev-perl/Date-Manip
-	dev-perl/Tie-IxHash
-	dev-perl/Sys-CPU
-	dev-perl/Sys-MemInfo"
-
-src_install() {
-	dodir /usr/share/logwatch/lib
-	dodir /usr/share/logwatch/scripts/services
-	dodir /usr/share/logwatch/scripts/shared
-	dodir /usr/share/logwatch/default.conf/logfiles
-	dodir /usr/share/logwatch/default.conf/services
-	dodir /usr/share/logwatch/default.conf/html
-	keepdir /etc/logwatch
-
-	# logwatch.pl requires cache dir (bug #607668)
-	newtmpfiles "${FILESDIR}"/logwatch.tmpfile ${PN}.conf
-
-	newsbin scripts/logwatch.pl logwatch.pl
-
-	exeinto /usr/share/logwatch/lib
-	doexe lib/*.pm
-
-	exeinto /usr/share/logwatch/scripts/services
-	doexe scripts/services/*
-
-	exeinto /usr/share/logwatch/scripts/shared
-	doexe scripts/shared/*
-
-	insinto /usr/share/logwatch/default.conf
-	doins conf/logwatch.conf
-
-	insinto /usr/share/logwatch/default.conf/logfiles
-	doins conf/logfiles/*
-
-	insinto /usr/share/logwatch/default.conf/services
-	doins conf/services/*
-
-	insinto /usr/share/logwatch/default.conf/html
-	doins conf/html/*
-
-	# Make sure logwatch is run before anything else #100243
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/logwatch 00-logwatch
-
-	doman logwatch.8
-	dodoc README HOWTO-Customize-LogWatch
-
-	# Do last due to insopts modification.
-	insinto /usr/share/logwatch/scripts/logfiles
-	insopts -m755
-	doins -r scripts/logfiles/*
-}
-
-pkg_postinst() {
-	# Migration from /etc/cron.daily/logwatch -> /etc/cron.daily/00-logwatch (bug #100243)
-	if [[ -e ${ROOT}/etc/cron.daily/logwatch ]] ; then
-		local md5=$(md5sum "${ROOT}"/etc/cron.daily/logwatch)
-		[[ ${md5} == "edb003cbc0686ed4cf37db16025635f3" ]] \
-			&& rm -f "${ROOT}"/etc/cron.daily/logwatch \
-			|| ewarn "You have two logwatch files in /etc/cron.daily/"
-	fi
-
-	# Trigger cache dir creation to allow immediate use of logwatch (bug #607668)
-	tmpfiles_process ${PN}.conf
-}
diff --git a/sys-apps/logwatch/logwatch-7.5.3.ebuild b/sys-apps/logwatch/logwatch-7.5.3.ebuild
index 6b03d4907f51..4118164aa813 100644
--- a/sys-apps/logwatch/logwatch-7.5.3.ebuild
+++ b/sys-apps/logwatch/logwatch-7.5.3.ebuild
@@ -12,11 +12,11 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
 fi
 
 DESCRIPTION="Analyzes and Reports on system logs"
-HOMEPAGE="http://www.logwatch.org/"
+HOMEPAGE="https://sourceforge.net/projects/logwatch/"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/sys-apps/logwatch/logwatch-7.5.2.ebuild b/sys-apps/logwatch/logwatch-7.5.4.ebuild
index 73de997ba96e..247b3915d881 100644
--- a/sys-apps/logwatch/logwatch-7.5.2.ebuild
+++ b/sys-apps/logwatch/logwatch-7.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -16,7 +16,7 @@ else
 fi
 
 DESCRIPTION="Analyzes and Reports on system logs"
-HOMEPAGE="http://www.logwatch.org/"
+HOMEPAGE="https://sourceforge.net/projects/logwatch/"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/sys-apps/logwatch/logwatch-9999.ebuild b/sys-apps/logwatch/logwatch-9999.ebuild
index 73de997ba96e..247b3915d881 100644
--- a/sys-apps/logwatch/logwatch-9999.ebuild
+++ b/sys-apps/logwatch/logwatch-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -16,7 +16,7 @@ else
 fi
 
 DESCRIPTION="Analyzes and Reports on system logs"
-HOMEPAGE="http://www.logwatch.org/"
+HOMEPAGE="https://sourceforge.net/projects/logwatch/"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 459c7fc69a7c..7aac28ec358c 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -2,6 +2,6 @@ AUX lshw-02.18b-gentoo.patch 4819 BLAKE2B 54e08c0373308bccc39c9217da4152fcb853a1
 AUX lshw-02.18b-gettext-array.patch 924 BLAKE2B 0ebb872cff09b1578026bb9026ca895fe70cbf93ed6d648478f6ef6332af8f56a58b687425f70ac95a40b57b84de9045e916c6ac4a3e35de2199a26acd6ae762 SHA512 60f09dcfbb6813fdeb06e7ca3161c768e4b138a65a2a1c27a19d241ddabbc8e511e31922a998c15e944056bf79eafd907073e419e0887c09180b87de24f4d5ee
 AUX lshw-02.18b-sgx.patch 842 BLAKE2B b1c9b676f8875ef312bcc55e6cf07be21500d50185e25075e61811a8342d4c1e165a75916cb3cf1a2a58ca5a062079dbadf314437c543a0792867d7828d92453 SHA512 face0b384e84379297b18b0efd106f59604a76ff526f3995038d8e261409f5117f456332f357c7c559a24980750779ae40757920b25bdf6b38588620966bc5a9
 DIST lshw-B.02.18.tar.gz 2322176 BLAKE2B 66183895fcdd5b47bfaa044c10f7b561b3310829b53828444a20f078ce63e166a878595c8a8a79e22f1e4ab726e98165a1b31225997785d2bfc3ad5d7b0c5214 SHA512 4385db86101178b8bd33a80e991718e14f83277c66b3d63ae97cb4339196873b6e9b31a174024bf43d16fe66e1d7f8cf5cea56076697878087880c8821b11e47
-EBUILD lshw-02.18b-r1.ebuild 1772 BLAKE2B eeebcc9bbaea72ccdb360f5c0eaffea3eaba63c0ee6327439197de86daff602c3b9f7205c53b3a95616572d3fefc54991b539095f3580122e4f8f7e407148046 SHA512 28b6891ae1fef0a663151075522fa0dd73e064c90f2354b7cc6abe9b5eb3e3aa6e65ecebf5ff04925d2714ef098f1cebc2c4019f2b74fcdec7e5b23667d129be
+EBUILD lshw-02.18b-r1.ebuild 1771 BLAKE2B d9311ae55206c46040936247e2d694ce82a146a723b39f91681f673d4a89cc5d4616b2c45166e5f9527b0ffc2b881f0fcf8fc425918903b1415b6775e02a0ed3 SHA512 4436b699f636d06a00a739f857905ce893222fa41d1815505c9fa2c17e9e41f992e7fa2c9c0e95893f25001cff2ec002fedc86ac1e0a1e6b825a708c10dc9371
 EBUILD lshw-02.18b.ebuild 1720 BLAKE2B 19caa4b5a9206a08da746fa4804f3bbd6235812767e93b3285144e2f5a47490c8a191f87990a49b40fdeadff6aef0ee04814c3897afb851466b649959088ff50 SHA512 cbd71c5ef62fdf99c27240e53491aa2b1c5976e06b08cd54c72bff4d32122789fcc488132871c3ddeb1de5f2d95331a33fb201940ef71d060e77172d6232f8e7
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/lshw/lshw-02.18b-r1.ebuild b/sys-apps/lshw/lshw-02.18b-r1.ebuild
index 41b2314f46f2..bd4bc8ff6db2 100644
--- a/sys-apps/lshw/lshw-02.18b-r1.ebuild
+++ b/sys-apps/lshw/lshw-02.18b-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk )"
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 900e041b606b..c1b15e3cb83a 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -4,6 +4,6 @@ DIST man-db-2.9.2.tar.xz 1885484 BLAKE2B 46778ebdecffcdefedd062e3f6a01a54054b57a
 DIST man-db-2.9.3.tar.xz 1885840 BLAKE2B 6163660af60a2900220d7b1de74caa9cb9e5764cc5da20469a8fb08e19ee1948937916664fdc493b89da8fd829aa512877892245fabc00fb586c7754c0da3d53 SHA512 ca1c1214753483f6e22efe69a9df9852e0de01a9ad3b9950dcbbc9f38e6060100b98a84333256f8c734002e66e2fd6256bc017a31bd9acfc42002dca2c0f879b
 EBUILD man-db-2.8.7.ebuild 3458 BLAKE2B f3096c090cfe4f5d6926389d0e3e1d8d417c7cdfd0cee59d9d4182d9c1a602b8a2a4c57fd3b92e110e8a1e9c6c4922160fda8f24bf54fca20797defa6443af42 SHA512 3b38dfae452716e3a68e1ae6dd5c74ba92ab130e25c8bd77d9e5802e3cda8dedbf5c7e7af8613e0e62c9f337b0ddb2c1a6fd69058967d3ed774c639897278f9d
 EBUILD man-db-2.9.2.ebuild 4023 BLAKE2B ff89a69281aadbff8dda8687cb1466cd0b6216f705f946c5e44b4ea296e2460517dd12b6e1891bb56cbca2eff7ce252cd5314a9c5df1d4ca675a92e88241beee SHA512 f79e6ac596356ab4d8ed48d1c77a7ac7d5237fdc3893b6698a5df5e8d783684fff6a666228512dbec620e2ec783472c5211c924bd9d93398ed0825460e1028a4
-EBUILD man-db-2.9.3.ebuild 4023 BLAKE2B ff89a69281aadbff8dda8687cb1466cd0b6216f705f946c5e44b4ea296e2460517dd12b6e1891bb56cbca2eff7ce252cd5314a9c5df1d4ca675a92e88241beee SHA512 f79e6ac596356ab4d8ed48d1c77a7ac7d5237fdc3893b6698a5df5e8d783684fff6a666228512dbec620e2ec783472c5211c924bd9d93398ed0825460e1028a4
+EBUILD man-db-2.9.3.ebuild 4022 BLAKE2B 87c16cfe03fac6c5a08e993090d33912f7103e8828637475d6d499c51784ddbf7f9e7ba5863db264768f3d5f46dcbf430c46dd745895218377e9cacd8b4925fa SHA512 2144a92a4f1d33b53b36cac35e436feb295f64928cdb2106668d7b897b0e5193581f58ecebd3e2c4da5744b71b27025bd0e9efea9e393a3b8bfcfbe8c9291793
 EBUILD man-db-9999.ebuild 4023 BLAKE2B ff89a69281aadbff8dda8687cb1466cd0b6216f705f946c5e44b4ea296e2460517dd12b6e1891bb56cbca2eff7ce252cd5314a9c5df1d4ca675a92e88241beee SHA512 f79e6ac596356ab4d8ed48d1c77a7ac7d5237fdc3893b6698a5df5e8d783684fff6a666228512dbec620e2ec783472c5211c924bd9d93398ed0825460e1028a4
 MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79
diff --git a/sys-apps/man-db/man-db-2.9.3.ebuild b/sys-apps/man-db/man-db-2.9.3.ebuild
index 8ad0f47c8564..eb6d7bfa69ed 100644
--- a/sys-apps/man-db/man-db-2.9.3.ebuild
+++ b/sys-apps/man-db/man-db-2.9.3.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" = 9999* ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index bd17a97202e3..a8ade92a7e71 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,8 +1,6 @@
-DIST man-pages-5.05.tar.xz 1687960 BLAKE2B 68d1391e9517837f55e1516f5c8f869d43ea4e7a01faef62ea27c740ecb73726d66a582b1f5b6bb8674173146035eed8d811d4923351d99bf9363a0ee6297e4a SHA512 4f1b9f69c44fb054de9834ad4356fc633416ce98285d137fc616967129f326c8dd28eba05d4fe12a385aced9ff478ed42dde777631be124b2ddc7569ee27a395
-DIST man-pages-5.06.tar.xz 1703140 BLAKE2B ff123efe4534321d0646e1ce275ec9e9543f4c35d0e2ee89354181f7ac5def3ca8fc403847b19222179b37604064ad2f5453d611bc25df5460bdf0bfb86f0b5a SHA512 2d321ae88be662712293e9b054e5cec3d817836fc154924cbd6a0b759992463a586ec01dc3292fcee6d8146c60e63ef505b223fd955ce71fcbd8760cc60512ed
 DIST man-pages-5.07.tar.xz 1716544 BLAKE2B f9320aea51c81720f3b77275dbd3ce4b0a2405c3bf0fc43569d42b2ccc848850adf281bd7c213eb9f821c12d627ac61fc43ca169c154df700b774cbd807d3aa9 SHA512 701837b6a8dd3bf9e0fa3d0234384bcc8af4ba8b6a4fdce01a441a146c5101bb14b96cfd68b48613c2ddd2237d01c63fb24a8478c4fff5482265f6605bcbe2f5
+DIST man-pages-5.08.tar.xz 1721672 BLAKE2B 7a912d4581ab734f7f3859d2b6553f470f4a38dfccc3ce42263d3733e1bfe5aabd478ad7137dff03f93ee031fba53f439b0c4cf5a369c442ce9302d0b7a6688b SHA512 fbd54c96c3ef1272f856a27d2258fefd3934d9f6ef60c243a824377769c4784b65aba54d680bb382371b0ce35fd4d065b17980cb535118e7986844f19afd7932
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
-EBUILD man-pages-5.05-r2.ebuild 1611 BLAKE2B 8821b0fa219762e01c49131b98176268840ad41f5911ec553f28a93e20f01aa20cce9261a6e5c506c91bad77bd6a74a0f1e93ab1e70b75304f6b217301774f7a SHA512 2d4af5da5306a64f3c80e40a11a343a461070d95218f97c2a54f29a829671b2ff7f57d8330ca1c5ba7cb1d904ae08894a189ee380b6feeba8f306624b54a211f
-EBUILD man-pages-5.06.ebuild 1615 BLAKE2B aef12c4bd4190869ac6ea8ea15728370fcbd536efd75b1e6e746585909d401cbf62fb14644d34a0c456645d750e59600fbd5c5ecae734b1297466ea701e6ba98 SHA512 e18aa04a42cb95b926c076605d1d594faa999a46fa6f680f65364e91a31f061fd9ff058707adaef7f91c5098d27ea2e4006e87714cf35007b200ac04fb622634
-EBUILD man-pages-5.07.ebuild 1624 BLAKE2B 3ce3c687f162b8926bf9969e167a5e21571b0648e02505c334f0d63c1dcace21ee85f85e4dd6fc74e50e17e36bc80ade2c8f7275b31b45b5e21c97ecb1a43820 SHA512 7de0828430ec97feff671e2343bbabe86e4d4caa08dae068018e742c72def53e20e7b3b9244c27cdec6b62a38ee4113d399fe543b1de5eb313f4ad4dd0e54155
+EBUILD man-pages-5.07.ebuild 1615 BLAKE2B aef12c4bd4190869ac6ea8ea15728370fcbd536efd75b1e6e746585909d401cbf62fb14644d34a0c456645d750e59600fbd5c5ecae734b1297466ea701e6ba98 SHA512 e18aa04a42cb95b926c076605d1d594faa999a46fa6f680f65364e91a31f061fd9ff058707adaef7f91c5098d27ea2e4006e87714cf35007b200ac04fb622634
+EBUILD man-pages-5.08.ebuild 1624 BLAKE2B 3ce3c687f162b8926bf9969e167a5e21571b0648e02505c334f0d63c1dcace21ee85f85e4dd6fc74e50e17e36bc80ade2c8f7275b31b45b5e21c97ecb1a43820 SHA512 7de0828430ec97feff671e2343bbabe86e4d4caa08dae068018e742c72def53e20e7b3b9244c27cdec6b62a38ee4113d399fe543b1de5eb313f4ad4dd0e54155
 MISC metadata.xml 276 BLAKE2B db75e173038497d8042224c9688330289e32f45997677daba5a31b4bbc3b3107f952801840a593cee563aa9bfe69c106aa9ac02bb0a1a724852da00aa26b0033 SHA512 c21ecc4f65303ae346b382f4158fc932401e49297d2dd9c55047ffe7e74283783e21a7b58de649bd97bb77cf920306734daf0ff70ed313505c999efa566fe574
diff --git a/sys-apps/man-pages/man-pages-5.05-r2.ebuild b/sys-apps/man-pages/man-pages-5.05-r2.ebuild
deleted file mode 100644
index fe9e0aa37627..000000000000
--- a/sys-apps/man-pages/man-pages-5.05-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_PATCH=2
-
-DESCRIPTION="A somewhat comprehensive collection of Linux man pages"
-HOMEPAGE="https://www.kernel.org/doc/man-pages/"
-SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
-	https://www.kernel.org/pub/linux/docs/man-pages/${P}.tar.xz
-	mirror://gentoo/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2
-	https://dev.gentoo.org/~cardoe/files/man-pages-gentoo-${GENTOO_PATCH}.tar.bz2"
-
-LICENSE="man-pages GPL-2+ BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE_L10N=" de fr it ja nl pl ru zh-CN"
-IUSE="${IUSE_L10N// / l10n_}"
-RESTRICT="binchecks"
-
-# Block packages that used to install colliding man pages #341953 #548900 #612640 #617462
-RDEPEND="virtual/man
-	!<sys-apps/keyutils-1.5.9-r4
-	!<dev-libs/libbsd-0.8.3-r1"
-PDEPEND="
-	l10n_de? ( app-i18n/man-pages-l10n[l10n_de] )
-	l10n_fr? ( app-i18n/man-pages-l10n[l10n_fr] )
-	l10n_it? ( app-i18n/man-pages-it )
-	l10n_ja? ( app-i18n/man-pages-ja )
-	l10n_nl? ( app-i18n/man-pages-l10n[l10n_nl] )
-	l10n_pl? ( app-i18n/man-pages-l10n[l10n_pl] )
-	l10n_ru? ( app-i18n/man-pages-ru )
-	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
-	sys-apps/man-pages-posix"
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	emake install prefix="${EPREFIX}/usr" DESTDIR="${D}"
-	dodoc man-pages-*.Announce README Changes*
-
-	# Override with Gentoo specific or additional Gentoo pages
-	cd "${WORKDIR}"/man-pages-gentoo || die
-	doman */*
-	dodoc README.Gentoo
-}
diff --git a/sys-apps/man-pages/man-pages-5.07.ebuild b/sys-apps/man-pages/man-pages-5.07.ebuild
index c17bf4553435..5095446eeaad 100644
--- a/sys-apps/man-pages/man-pages-5.07.ebuild
+++ b/sys-apps/man-pages/man-pages-5.07.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
 
 LICENSE="man-pages GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE_L10N=" de fr it ja nl pl ru zh-CN"
 IUSE="${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
diff --git a/sys-apps/man-pages/man-pages-5.06.ebuild b/sys-apps/man-pages/man-pages-5.08.ebuild
index 5095446eeaad..c17bf4553435 100644
--- a/sys-apps/man-pages/man-pages-5.06.ebuild
+++ b/sys-apps/man-pages/man-pages-5.08.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
 
 LICENSE="man-pages GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE_L10N=" de fr it ja nl pl ru zh-CN"
 IUSE="${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
diff --git a/sys-apps/mawk/Manifest b/sys-apps/mawk/Manifest
index 2cad7d0dae84..a7f81e18f4c3 100644
--- a/sys-apps/mawk/Manifest
+++ b/sys-apps/mawk/Manifest
@@ -3,5 +3,5 @@ DIST mawk-1.3.4-20190203.tgz 466481 BLAKE2B f647c52872ff510f02ab44f13f6c51497abd
 DIST mawk-1.3.4-20200106.tgz 468031 BLAKE2B b125eecf780f0658d3a1c06875fdac221ffe5999e38646d71b15159c50271a7bbfb594fb6347442239c3eab6703f9c782739bd2a5a055e1ff8cd44a0e8a6545d SHA512 f6f65f3b73965f520a6f9bb7e2b6ad2a3c532c0768461744e6cfb2e72e2c718dacd1c5eea995dfa267facfc4e0ee71d337809cd45d5c75cfbc65294b45280ff9
 EBUILD mawk-1.3.4_p20161120.ebuild 858 BLAKE2B 538082458c682fa329e576527df38d8bac43a73a7d680c59b0e2e73d343df61b91ec557dde525c263b3ac25c0bca52ba26819041010b095bb7b1377f79f07774 SHA512 988366417da4caefbfa19f5f77ec4b0bfc9824e31a140d459d92cb4a60ffde3afed56988d617a041596e00e366e128a6e6b87752eb424b8a7aefeff569fc0aca
 EBUILD mawk-1.3.4_p20190203-r1.ebuild 870 BLAKE2B 6807ee81efefa0b20bf167339f9d41666deea695335f1aa0aa4c027fb72c1c0cb24e100a5da8744d166397063c106beda877c018f89a2d6adfff59f0d1798c0a SHA512 e243b88614393657de85748fd449fbbd08d7bd2541fa00a3297566b8934b882026b3a4d0153405f36844632ef2a5ce76a63e351d6cb8eb73f8c674d271a5152f
-EBUILD mawk-1.3.4_p20200106-r1.ebuild 878 BLAKE2B 9ea1062423e2e93323595c5c9f164ef4953977765d444d3b6b0d36740d065fef48ffd32059796ad791ff6ff5dac4966584f920db4745ab9e46d9034e2f751108 SHA512 999bf4050651e251ed52f1886d2f3e0fde46a7d979772c5088a9403ce881faa5ba152160b975e747710ef3cc14b9c7f7ff7435c5cc0c3e6709c48d368dceee8d
+EBUILD mawk-1.3.4_p20200106-r1.ebuild 874 BLAKE2B df44970b25357b4ed16555d958991488fe3e512fb5b0fbe090e508855799d906bd37da3a6be5fef88ea9701c98a83c7c2958e95d8cf03bbf197d8b6489a2af65 SHA512 d4676e6ae145631798ee7b7915a7975855f8e7694be4ccef8f84e91812faa9c507f336f25b0c21887ba1bcfe1817e9df2284ca9e45a5eb673b218a1b9c96f5ee
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/mawk/mawk-1.3.4_p20200106-r1.ebuild b/sys-apps/mawk/mawk-1.3.4_p20200106-r1.ebuild
index 03a7db27a514..9df26d1d6857 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20200106-r1.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20200106-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://invisible-mirror.net/archives/${PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND="app-eselect/eselect-awk"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index 2676416d481f..aa9576d9bd7e 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -1,4 +1,4 @@
 AUX moreutils-0.63-respect-env.patch 657 BLAKE2B 2f33bb68f3d23f0fa45849fd5d5fb63f8cdbb27b3c28eb92e132d632aa0b9487ecf85c9b9cdfa2bcebc009be4a5ce5da2407742b02f52352dd00a88f84ba1eff SHA512 e9cffcba65d224daa5bba7f15d9e8b39cd18ac2f0e25b91aae6e49017b8c6edb4eff1458c68832e207ec5ed4bca193df3f01ddf4851639509c70cdc967befa8a
 DIST moreutils_0.63.orig.tar.xz 80468 BLAKE2B 39efa522c5bf9b982b70c1180f622a7d5a489cabbeb741f2a1a0674dfe9907ef85bccccf9f9cc4ae8d3c81442b1513f0692c070b4c00f052135528dc0e47eb6f SHA512 71bd5ec4d265dff708db372189146acb067c4edaf62888755d245ccb3f4b5bb54f6c31bda68991f78c27ab231de8ea7126f947834f3604b60d7142d0357cb66b
 EBUILD moreutils-0.63.ebuild 1506 BLAKE2B 279f0854c3238f533262718720f4e7cdccd69ea46b95095e81787f982418910384de1c202cf6be8404ef657eb1eba6fa60ca8df535a6c594f93c0ccb75b57394 SHA512 fce87829894fb3c5f55e82563568a280c010237e8fb011f1528e5e7660dbd421b2eced669a6ac9458e1eb62fd0041bb488d88f7a0bcbe8a563f688451749bd8a
-MISC metadata.xml 427 BLAKE2B 311360aef2c49094822392ff35feb4bcbf03f16a909e6047a89c6280094d51b2347817dcd6938df998909101d53b8a14ee847f0eea5568bae6326ff01ebe2fee SHA512 d535b7f684ce284bf60ff162383773df08a753e9b2e80bcfe271cf39f0765719f8a00cffb46fed0c948e971875286bc9c3ca5972debfc3ed3653fcc33ac6a2a0
+MISC metadata.xml 313 BLAKE2B d0cd446eb7516dec44ac4eb8a73d268652317a7dd1b3531f9e69341ae5a768a2dbc554fb577d499d139a684d190c400c08b5a14023c1a0db03cc599321c651e5 SHA512 07345c6cea216cf9e7043eab1a33cdc9bd9bf52adb5a4019afa401faddfbf0129f2297d01e2a9595cf9963e55ba53c4496b7ab79a9c33be85fac18ca60220a3f
diff --git a/sys-apps/moreutils/metadata.xml b/sys-apps/moreutils/metadata.xml
index 7780744d4f50..a547cb41ebd7 100644
--- a/sys-apps/moreutils/metadata.xml
+++ b/sys-apps/moreutils/metadata.xml
@@ -2,14 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>sam@cmpct.info</email>
+		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-<use>
-	<flag name="perl">Install scripts written in Perl</flag>
-</use>
+	<use>
+		<flag name="perl">Install scripts written in Perl</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-apps/onerng/Manifest b/sys-apps/onerng/Manifest
index a9d49c5b5fcf..a74b5c384231 100644
--- a/sys-apps/onerng/Manifest
+++ b/sys-apps/onerng/Manifest
@@ -1,3 +1,3 @@
 DIST onerng-3.6.tar.gz 108126 BLAKE2B 717fc2b795aa991fdca28e2032da0a7729c487cb684361799421f806f60ae4cb70e8d29cd72de2eec9bdf38e4bf1d530261fc19bfbee6e95360a7648b8a45858 SHA512 d2f2bceb458e1441c4321526e5477ecb26df9f84e8554df723b97c3f09ad4c04149ac844bb88a182abf5350566cd5762c35137ba3c6b71685671a69ba12ccc58
-EBUILD onerng-3.6-r3.ebuild 826 BLAKE2B 2e5ce15810e7244d5c1205c990a81f1e7b375fa471eb0aa8d703171dc437b85d03e8cd389987cfe19631e08cfdaa18fda3c34298afc15369419174b6273e592e SHA512 1235cb0306d1815652c5b6f5559f78718057898692e02305aa50dd33d1f35a3f8bf8732808fb883b71c8a2fb28ab4d186ccbe3a592d3474b5dfbf83eaf37aeb3
+EBUILD onerng-3.6-r3.ebuild 825 BLAKE2B 4be553caba0802dc000274fd7de2f9e5dcc8c58351b6c20fbc0ad10d7b3cf36c843f76af0464cc3e9569f2f14cdbe37393ed64cfd708f51db2b15cb4250e652e SHA512 3526cab6f3095ba34f6cbbfe2f15fd43e47592b038af384daedf57b9cf15104dfc385079d9e20275a292e8edd6bd2dd82752e55b20a2d6a8822b5df9d5f4f1a7
 MISC metadata.xml 715 BLAKE2B 2d4b842c0ea11b2633764e385898ce8df514a289b482c5e528b962ce00d97289abbd666acc367b1f170f95b785409712950b44b284a550fc796a3017fdbd10a9 SHA512 4f004de8fd56338d850d2fbcb4c8bd94f695f55b2c16eff687f1985a22f86094b4f01f63599029f52d0056a8e6f214f7f0396413093ea8cd01970be29d0092ee
diff --git a/sys-apps/onerng/onerng-3.6-r3.ebuild b/sys-apps/onerng/onerng-3.6-r3.ebuild
index 391e3ca0b0cf..e1b2fddab395 100644
--- a/sys-apps/onerng/onerng-3.6-r3.ebuild
+++ b/sys-apps/onerng/onerng-3.6-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit python-single-r1 udev
 
diff --git a/sys-apps/osinfo-db-tools/Manifest b/sys-apps/osinfo-db-tools/Manifest
index 2cc8f0d56156..9d67a04cff47 100644
--- a/sys-apps/osinfo-db-tools/Manifest
+++ b/sys-apps/osinfo-db-tools/Manifest
@@ -1,3 +1,5 @@
 DIST osinfo-db-tools-1.6.0.tar.gz 547189 BLAKE2B 38db3118d618d620a137b12021fbcf9caffe1e0f67252d2eb7c514d4f25969b152679f55b493bb64abc0925ff07ccea897acfd809d17d7257db2b33a690f4878 SHA512 a3bdf9d913b388b0f567a14245f57c4f1da9dae40d723f8e76096ffdae9d7a8e587ed4832e3e59c820bc01bbb2b74815b3fefd8e1f47cebd903091457fdee951
+DIST osinfo-db-tools-1.8.0.tar.xz 57428 BLAKE2B daaacd6c2facb7cd8e090ff8aa028b4651d1036399810342f01369ad308fa240b76ca209dc6f8fd30527f27178a1d29d0b5fd44c0efc050a0dc20397afc33e11 SHA512 181531bcc8b644718411b09cd3f0971520a2df8f86c87deb34a8664e03c9b10ec73a0904cde004f045641ce8d087bbe7337c6a124e422c94b93de21088767a7f
 EBUILD osinfo-db-tools-1.6.0-r1.ebuild 1293 BLAKE2B 107343796bd9fd0647d3ed78b08c7b99945a5f73f70508a57b5eb295943949a2b3b3d8a61920f43072f068ce039b9243ae939d46a2a5ed4cd60c0ca7961e9905 SHA512 40c37b7492eb21c64e074f6832e4729167a9a36a7bc41680e7ce1665cbdb3f69e2341f734b54ca8f78906ed99d94102479655a2a9b5fa7d43d1ebfe25222521f
+EBUILD osinfo-db-tools-1.8.0.ebuild 1151 BLAKE2B 372eecb0bbc7666960d83fc1b9f20c59381390e0e6e87abd2980ee4589d19b4d9363d05f30151bc0bfd118a6a99cdf76173ea8ddab5829bc12ef4651de8d9a86 SHA512 32c9d4e1320475bd85ac42689a3407a824bf637caafe693f701779387eeb15e6856a20cd6a3b1cfc8abe20e409a8f290341778fca76fb43a0626054143e659ab
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.8.0.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.8.0.ebuild
new file mode 100644
index 000000000000..aa5926379ff7
--- /dev/null
+++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.8.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit meson python-any-r1
+
+DESCRIPTION="Tools for managing the osinfo database"
+HOMEPAGE="https://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Blocker on old libosinfo as osinfo-db-validate was part of it before
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	dev-libs/json-glib
+	>=app-arch/libarchive-3.0.0:=
+	net-libs/libsoup:2.4
+	>=dev-libs/libxml2-2.6.0
+	!<sys-libs/libosinfo-1.0.0
+"
+# perl dep is for pod2man (manpages)
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.19.8
+	dev-lang/perl
+	test? (
+		$(python_gen_any_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+python_check_deps() {
+	use test && \
+		has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/requests[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index a9438743f7fc..cde0a588d6de 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,3 +1,5 @@
 DIST osinfo-db-20200325.tar.xz 100124 BLAKE2B 89bc55dc4af0943abc59bdf0cbba070bb133129900269477dbb598e623b41b313cc41283d5e22c6a3277a7cf420baf294bf275c2c3e6f11ca98451c0ffa5b16b SHA512 c192a3814063f60d7ece0b912035e15d98c8363ff10e5c5ea5aae97ab10d95b85c5837c496f3dc4a26d3626df06559960b138986d9f4727b3d0477015e29cfa0
+DIST osinfo-db-20200529.tar.xz 104668 BLAKE2B cb5b980cfc7753ad76aeb80d79108b125c3f1d3bec8a8878d2e562ce6b11b4369b8f9b0a03f5720ad58aa09abe8e140633652f19a4dc6f40e941e626d918e4aa SHA512 27efed4680d80432541c9e3dc692a381b479811ebce39e9b42382bd8b499d2782b59323a6c29517f38fa63061720d26c87e3c7ca806414adddfb9e4294ee106b
 EBUILD osinfo-db-20200325.ebuild 668 BLAKE2B 5bd9f45c5745d97052e35df92fd9a6d7dd413816f28112c7574f310e792e905ab0b64f8198e968435d9c48c2d3b599edd0a9bf220be99f073ce7669042e9c79b SHA512 27ba85e90d6ec6079ef998b26cf86263345944644b93d86411e029ad8366b3e4570e349abe7579c27c31e5b4200f1b5885ce6dd9ccb7dc46701590b35571990e
+EBUILD osinfo-db-20200529.ebuild 671 BLAKE2B 1a1edab17c338bbc4067cbf99b89e362307a142f5c53c2ad2dd72bec89b88a13843b66a0552156bc1c7d3437641cefd767d6c3877d93cd7216fadc2b1c3c3da7 SHA512 a46832e3fbb2f8e5eb6632632896faeb184da58a01a1297fcfee5151b6235578a13ae413a2a48031399da2be31f050607cf7d71c32a65fbc944eb9d45d14a04a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db/osinfo-db-20200529.ebuild b/sys-apps/osinfo-db/osinfo-db-20200529.ebuild
new file mode 100644
index 000000000000..ee488fdf635f
--- /dev/null
+++ b/sys-apps/osinfo-db/osinfo-db-20200529.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="osinfo database files"
+HOMEPAGE="https://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	sys-apps/osinfo-db-tools
+"
+# we don't depend on intltool here, contrary to README, as the tarball already
+# contains the processed results with translations in XML files
+
+src_unpack() { :; }
+
+src_install() {
+	osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
+}
diff --git a/sys-apps/pacman/Manifest b/sys-apps/pacman/Manifest
deleted file mode 100644
index d18e56f7cbc2..000000000000
--- a/sys-apps/pacman/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX pacman-5.0.2-CVE-2016-5434.patch 3938 BLAKE2B 67ef2e348502753df10f7dbc9235401dcc8fe1e304a718592fafb6e84e7e045635890aeffe5ab808808f02392c6a141add8d97370957cef8fce357c8dd17b90b SHA512 432922e485a2aa1d82d7654c615333bfd8ff74c89fcb3fa5728618d8947175172e043ae231c7bf04387a0770421ccf96bb0d492a061b4da12ea7f212fe07ca30
-DIST pacman-5.0.2.tar.gz 3361701 BLAKE2B 499041cb9914991c12c21383aaf36465189ced456ca8b2908d3c036acc3ef9dde0fba1efd823580c12e6d8dbdcaa5e53a7b1329cac347208d1de21702e8f3efa SHA512 94a8cce1a52d2365a993c72f16537f4dbea6100feb8f22e8782cc7d2c1ef8a525a63f3c40bb183294c0faedcc743e3d806d2fc3c50a21ab9b03df2910039d628
-EBUILD pacman-5.0.2-r2.ebuild 2890 BLAKE2B 3f00cc60a36af6b6b4529dd19dc4f31951736bcf9b9db09d119373df2fec73cac515e9f8e867d1e170961f22f01a85a2c6f5f4e7d0a617052430fc21af0a0a0f SHA512 2f05d4cadabb3a37711d94465b9031d441158ca563724e65e2641f986193492bef5012b47997bb3b5b08874ef357157196e20c57cbb4bf0ad78238497405b032
-MISC metadata.xml 675 BLAKE2B 4019b589f7cc08897c958654944004864bebf838e50d32fa18b295ecbf99d137431402dffbda17b9578f3b0c005e46ef0295d8edc73f01f840d5822c478595fc SHA512 52987ad9ce090732316a0fde96b26cfe3a21cdf1f4ba7b4dc661d21568d22a8972e8dbd90afd7a183fca64a13051c2723f2732fafc56413dfeb156fa7d7d0886
diff --git a/sys-apps/pacman/files/pacman-5.0.2-CVE-2016-5434.patch b/sys-apps/pacman/files/pacman-5.0.2-CVE-2016-5434.patch
deleted file mode 100644
index c245cb78dcbc..000000000000
--- a/sys-apps/pacman/files/pacman-5.0.2-CVE-2016-5434.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From bf84fd00d3ac1ae2a43dac57f7ef689ef2e8b8aa Mon Sep 17 00:00:00 2001
-From: Nils Freydank <holgersson@posteo.de>
-Date: Fri, 20 Oct 2017 22:30:33 +0200
-Subject: [PATCH] Fix CVE-2016-5434 (DoS/loop and out of boundary read)
-
-This is a rewrite of Tobias Stoeckmann’s patch from June 2016[1] using
-functions instead of macros. (Thanks to Tobias for explanations of his patch.)
-A short question on Freenode IRC showed that macros are generally discouraged
-and functions should be used.
-
-The patch introduces a static size_t length_check() in libalpm/signing.c.
-
-[1] Original patch:
-https://lists.archlinux.org/pipermail/pacman-dev/2016-June/021148.html
-CVE request (and assignment):
-http://seclists.org/oss-sec/2016/q2/526
----
- This patch is provided to upstream, but not merged (2017-10-25).
-
- lib/libalpm/signing.c | 48 ++++++++++++++++++++++++++++++++++++++++++++----
- 1 file changed, 44 insertions(+), 4 deletions(-)
-
-diff --git a/lib/libalpm/signing.c b/lib/libalpm/signing.c
-index 95cb3280..51b11df6 100644
---- a/lib/libalpm/signing.c
-+++ b/lib/libalpm/signing.c
-@@ -986,6 +986,19 @@ int SYMEXPORT alpm_siglist_cleanup(alpm_siglist_t *siglist)
- 	return 0;
- }
- 
-+/* Check to avoid out of boundary reads */
-+static size_t length_check(size_t length, size_t position, size_t a,
-+		alpm_handle_t *handle, const char *identifier)
-+{
-+	if( a == 0 || length - position <= a) {
-+		_alpm_log(handle, ALPM_LOG_ERROR,
-+		_("%s: signature format error"), identifier);
-+		return -1;
-+	} else {
-+		return 0;
-+	}
-+}
-+
- /**
-  * Extract the Issuer Key ID from a signature
-  * @param sig PGP signature
-@@ -1022,16 +1035,25 @@ int SYMEXPORT alpm_extract_keyid(alpm_handle_t *handle, const char *identifier,
- 
- 		switch(sig[pos] & 0x03) {
- 			case 0:
-+				if(length_check(len, pos, 2, handle, identifier) != 0) {
-+					return -1;
-+				}
- 				blen = sig[pos + 1];
- 				pos = pos + 2;
- 				break;
- 
- 			case 1:
-+				if(length_check(len, pos, 3, handle, identifier)) {
-+					return -1;
-+				}
- 				blen = (sig[pos + 1] << 8) | sig[pos + 2];
- 				pos = pos + 3;
- 				break;
- 
- 			case 2:
-+				if(length_check(len, pos, 5, handle, identifier)) {
-+					return -1;
-+				}
- 				blen = (sig[pos + 1] << 24) | (sig[pos + 2] << 16) | (sig[pos + 3] << 8) | sig[pos + 4];
- 				pos = pos + 5;
- 				break;
-@@ -1059,7 +1081,16 @@ int SYMEXPORT alpm_extract_keyid(alpm_handle_t *handle, const char *identifier,
- 
- 		pos = pos + 4;
- 
-+		/* pos got changed above, so an explicit check is necessary
-+		 * check for 2 as that catches another some lines down */
-+		if(length_check(len, pos, 2, handle, identifier)) {
-+			return -1;
-+		}
- 		hlen = (sig[pos] << 8) | sig[pos + 1];
-+
-+		if(length_check(len, pos, hlen + 2, handle, identifier)) {
-+			return -1;
-+		}
- 		pos = pos + hlen + 2;
- 
- 		ulen = (sig[pos] << 8) | sig[pos + 1];
-@@ -1072,30 +1103,39 @@ int SYMEXPORT alpm_extract_keyid(alpm_handle_t *handle, const char *identifier,
- 				slen = sig[spos];
- 				spos = spos + 1;
- 			} else if(sig[spos] < 255) {
-+				if(length_check(pos + ulen, spos, 2, handle, identifier)){
-+					return -1;
-+				}
- 				slen = (sig[spos] << 8) | sig[spos + 1];
- 				spos = spos + 2;
- 			} else {
-+				/* check for pos and spos, as spos is still pos */
-+				if(length_check(len, pos, 5, handle, identifier)) {
-+					return -1;
-+				}
- 				slen = (sig[spos + 1] << 24) | (sig[spos + 2] << 16) | (sig[spos + 3] << 8) | sig[spos + 4];
- 				spos = spos + 5;
- 			}
--
- 			if(sig[spos] == 16) {
- 				/* issuer key ID */
- 				char key[17];
- 				size_t i;
-+				if(length_check(pos + ulen, spos, 8, handle, identifier)) {
-+					return -1;
-+				}
- 				for (i = 0; i < 8; i++) {
- 					sprintf(&key[i * 2], "%02X", sig[spos + i + 1]);
- 				}
- 				*keys = alpm_list_add(*keys, strdup(key));
- 				break;
- 			}
--
-+			if(length_check(pos + ulen + 1, spos, slen, handle, identifier)) {
-+				return -1;
-+			}
- 			spos = spos + slen;
- 		}
--
- 		pos = pos + (blen - hlen - 8);
- 	}
--
- 	return 0;
- }
- 
--- 
-2.14.2
-
diff --git a/sys-apps/pacman/metadata.xml b/sys-apps/pacman/metadata.xml
deleted file mode 100644
index 0a733cd836dd..000000000000
--- a/sys-apps/pacman/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<upstream>
-		<bugs-to>mailto:pacman-dev@archlinux.org</bugs-to>
-		<changelog>https://git.archlinux.org/pacman.git/tree/NEWS</changelog>
-		<doc>https://www.archlinux.org/pacman/</doc>
-	</upstream>
-	<!-- maintainer-needed -->
-	<slots>
-		<subslots>Reflect major ABI of libalpm.so.</subslots>
-	</slots>
-	<use>
-		<flag name="doc">Install extended documentation using <pkg>app-doc/doxygen</pkg>. (Man pages are included by default.)</flag>
-		<flag name="gpg">Enable GPG signature verification using <pkg>app-crypt/gpgme</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/sys-apps/pacman/pacman-5.0.2-r2.ebuild b/sys-apps/pacman/pacman-5.0.2-r2.ebuild
deleted file mode 100644
index 59c237525513..000000000000
--- a/sys-apps/pacman/pacman-5.0.2-r2.ebuild
+++ /dev/null
@@ -1,117 +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 autotools
-
-DESCRIPTION="Archlinux's binary package manager"
-HOMEPAGE="https://archlinux.org/pacman/"
-
-PATCHES=()
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.archlinux.org/pacman.git"
-else
-	SRC_URI="https://sources.archlinux.org/other/pacman/${P}.tar.gz"
-	# Do *not* re-add ~x86!
-	# https://www.archlinux.org/news/phasing-out-i686-support/
-	KEYWORDS="-* ~amd64"
-
-	PATCHES+=( "${FILESDIR}"/${PN}-5.0.2-CVE-2016-5434.patch )
-fi
-
-LICENSE="GPL-2"
-SLOT="0/10"
-
-IUSE="curl debug doc +gpg libressl test"
-COMMON_DEPEND="
-	app-arch/libarchive:=[lzma]
-	gpg? ( >=app-crypt/gpgme-1.4.0:= )
-	curl? ( net-misc/curl )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	virtual/libiconv
-	virtual/libintl
-"
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	doc? ( app-doc/doxygen )
-	test? (
-		sys-apps/fakeroot
-		sys-apps/fakechroot
-	)
-"
-
-# workaround until tests are fixed/sorted out
-RESTRICT="test"
-
-src_prepare() {
-	# Remove a line that adds "-Werror" in ./configure when
-	# "--enable-debug" is passed:
-	sed -i -e '/-Werror/d' configure.ac || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		--localstatedir=/var
-		--disable-git-version
-		--with-openssl
-		# Help protect user from shooting his/her Gentoo installation
-		# in its foot.
-		--with-root-dir="${EPREFIX}/var/chroot/archlinux"
-		$(use_enable debug)
-		# full doc with doxygen
-		$(use_enable doc doxygen)
-		$(use_with curl libcurl)
-		$(use_with gpg gpgme)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	emake -C contrib
-}
-
-src_install() {
-	dodir /etc/pacman.d/
-	# contributed parts, i.e. not pacman itself, but useful helpers and some templates and basic docs
-	dobin "${S}"/contrib/{bacman,checkupdates,pac{cache,diff,list,log-pkglist,scripts,search},rankmirrors,updpkgsums}
-	newdoc "${S}"/contrib/README contrib-README
-	dodoc "${S}"/contrib/PKGBUILD.vim
-	# create /var/chroot/archlinux
-	# see bug #631754
-	dodir /var/chroot/archlinux
-	keepdir /var/chroot/archlinux /var/lib/pacman
-
-	default
-	find "${D}" -name '*.la' -delete || die
-
-	# avoid creating stuff inside /var/cache/
-	# see bug #633742 for more information
-	rm -r "${D}"/var/cache/pacman
-	rmdir "${D}"/var/cache
-}
-
-pkg_postinst() {
-	einfo ""
-	einfo "The default root dir was set to ${EPREFIX}/var/chroot/archlinux"
-	einfo "to avoid breaking Gentoo systems due to oscitancy."
-	einfo "If you prefer another directory, take a look at"
-	einfo "pacman's parameter -r|--root)."
-	einfo ""
-	einfo "You will need to setup at least one mirror in /etc/pacman.d/mirrorlist."
-	einfo "Please generate it manually according to the Archlinux documentation:"
-	einfo "https://wiki.archlinux.org/index.php/Mirror"
-	einfo ""
-}
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 530c10123e41..b4927ce83284 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -5,6 +5,6 @@ DIST pciutils-3.5.6.tar.gz 442190 BLAKE2B 9f1237828436f0566caa13e49a154b40fcc41d
 DIST pciutils-3.6.4.tar.gz 497675 BLAKE2B 45bbfafbf9ad6aea09fd17fe235bbb11bfe00fff2f31f1223d739eacf3db1a66ba0cd05f0df29349b01cc0a4fc598aeafb6fcf276e2edf2d557b9c21f25a0382 SHA512 001b2f722ee9f5fd57307aa4e8894c97ed3eee42f8b17caba2f29b191ab2fe98dcbfb76438f97dcaa343ea90011f6f6277ab367f361bc45e20d7ed848b439f86
 DIST pciutils-3.7.0.tar.gz 516418 BLAKE2B fca6720cff73ec20559c666c76fdcd3b59cdf0e33e2c3894a82590d77c5d51cf22e667fe65d9f66a248a624c2b9c868f6e9b69f45f4b6d704b637afe55041e6a SHA512 8a8fb9dc44a8dd31f80e45a48f6693452c11d343b9dfed87dd5cea6846f38d001f294e4010cd7c0545e238fde45b0e9a8e88c67a43d80676a585336e3665a631
 EBUILD pciutils-3.5.6-r1.ebuild 2863 BLAKE2B 9712b7edece076efc56ca7c9c4ea562dc40891a53bde96c6588bd01045f6e8e68ac2eb27c53c79c45a0bc2df524da14e601fc27294b608ce86f7abc4fddf9560 SHA512 9f765ae9ffef2c09a3f58f823b1bd6dc9d035d40a2e86ec3991933e9d78d29b4c9123fcf865a468b7f3f6e65e17ac361143c5b6ede913072ab6204fea86bc93e
-EBUILD pciutils-3.6.4.ebuild 2862 BLAKE2B a23eb3655cd36b4e5ad5fb9c1c9ef3f1002032b55afe5a030f1f2ce832781a53c3c28a059218511fa26bbf31eb858b774dcbb2e9029cafeb495ebc64fd0ff484 SHA512 abda8c7ac9c539388f80bb4963759a8f33e3509e2dea00c4d3f49c49c50a9a2d533763730ebb1c314201d6e617d9849cc9f3ac5560374b882492ce15e899532a
-EBUILD pciutils-3.7.0.ebuild 2862 BLAKE2B a23eb3655cd36b4e5ad5fb9c1c9ef3f1002032b55afe5a030f1f2ce832781a53c3c28a059218511fa26bbf31eb858b774dcbb2e9029cafeb495ebc64fd0ff484 SHA512 abda8c7ac9c539388f80bb4963759a8f33e3509e2dea00c4d3f49c49c50a9a2d533763730ebb1c314201d6e617d9849cc9f3ac5560374b882492ce15e899532a
+EBUILD pciutils-3.6.4.ebuild 2840 BLAKE2B 658741ae8199d1f97826c611ed1ae9546bd1487b96fc7b48c5d0b2654aa00fbe9ca1e37d73579dc2d31619d441c5eaa9511a89ff75a2c781c0f9af27408fd9c8 SHA512 447bbfb900c17d6d06f3a1206e3920385380862894ce62d580b374c727840c23903aa4cb598cc49c9eca335bcc65c5f29d339249e4dad62166cfd150dd226432
+EBUILD pciutils-3.7.0.ebuild 2849 BLAKE2B 0023904d2c9df91807ec223276dfb87c73e738f631f98eef1d61a8b3474d02be8ec7cc3026b6b58a6ec035ce847e2f83e80168ab8a435c3a1165e82b533c6024 SHA512 9d96996e6cf4d83884021282f142bd0e904d7205f3e4bb246fdfd3621ca706cdac088f391b26b69a26afff642201f0371ac3460b34b4094e28689e15ced67aff
 MISC metadata.xml 524 BLAKE2B c000b3995b57cf87ea92270e4e2d9b8463e5db65dea3a3aeef50a72a153ff3320a1ab1825cf0a2dcac3569d32f6d17015debb79d567c22d7c6891ce48211d661 SHA512 881e7cb9a71e1ccbf84be8cbaab54cfd0258a782aa1e4def6f3398444f4c28790a23eb194c3facc6e7c77437c06e4c17db01e0360debb1f01349cbca69dd8020
diff --git a/sys-apps/pciutils/pciutils-3.6.4.ebuild b/sys-apps/pciutils/pciutils-3.6.4.ebuild
index cc2e5824111f..0669046026a1 100644
--- a/sys-apps/pciutils/pciutils-3.6.4.ebuild
+++ b/sys-apps/pciutils/pciutils-3.6.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,
@@ -29,10 +29,7 @@ RDEPEND="
 	${DEPEND}
 	sys-apps/hwids
 "
-DEPEND="
-	${DEPEND}
-	kmod? ( virtual/pkgconfig )
-"
+BDEPEND="kmod? ( virtual/pkgconfig )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.9-static-pc.patch
diff --git a/sys-apps/pciutils/pciutils-3.7.0.ebuild b/sys-apps/pciutils/pciutils-3.7.0.ebuild
index cc2e5824111f..5f2028a86005 100644
--- a/sys-apps/pciutils/pciutils-3.7.0.ebuild
+++ b/sys-apps/pciutils/pciutils-3.7.0.ebuild
@@ -29,10 +29,7 @@ RDEPEND="
 	${DEPEND}
 	sys-apps/hwids
 "
-DEPEND="
-	${DEPEND}
-	kmod? ( virtual/pkgconfig )
-"
+BDEPEND="kmod? ( virtual/pkgconfig )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.9-static-pc.patch
diff --git a/sys-apps/pcmciautils/Manifest b/sys-apps/pcmciautils/Manifest
index f302467054ff..eadecbc980a4 100644
--- a/sys-apps/pcmciautils/Manifest
+++ b/sys-apps/pcmciautils/Manifest
@@ -1,5 +1,5 @@
 AUX pcmciautils-018_p8-flex-2.6.3-fix.patch 593 BLAKE2B bff765ae6c80daf3d2413528c4d42aefb7af7e3823590d33315c7089a5221d99c82802378cf9b51502b53bd920e0b5b4b68aaa82d50a92e83f5dfe7207c39a49 SHA512 b96f9bc3176f1eeb936a31f8fab5a495ce14218e92fbae2350aa970328b53bd6732ade90721f1ca55d80a94436189773f83a300aa8af7c43ecc5ed62c95f3557
 DIST pcmciautils_018-8.debian.tar.gz 11213 BLAKE2B cf28ecf71ebfd5c4ad7d882cbadab71b787f407adb2d20258cdc1157ca7d542bf398ff09207037d1d6e933d43e477b50b28ca3f0ac0e557fbaefb9f31656843e SHA512 8a00d776e208b43d01fe22b9d4e889bc1b2c5982aa1bf225bdd613ffb0f5b37f5266ccc1cb91df9ac49c4ee3e3653ebb29807b61fff53c585e2cfed5aa2cd9e9
 DIST pcmciautils_018.orig.tar.gz 48516 BLAKE2B 0b197cdd7d0940e5c0eee2da961f0f4dd972a3178ba5d07a6492185d0ab156cd61f5343c8f9d812cff402f04af76a15baa3db564d14317d3817e5325dd8811fb SHA512 f0af1fc6155686ae61c1c85a6451b032088a3880dfbc05c1d1ed33ca8e975745f9d4bedb0f3ee0a1252461aa008bed8014c73ff850cddd89d930524a6d68d47d
-EBUILD pcmciautils-018_p8-r1.ebuild 1548 BLAKE2B 2f91a5e313c4f22e8aaa60cf8a624668626607522c9ab46443e7e16379acb8bda814aaa9db0a6ce6259bb3ee98238d74abddc9e5db7721f0f078110012cf5c0c SHA512 447e810a8a51d9fc091f330a10bef2920ec9bf57b717226ef18515da6833ff9ac2b1cf7a7cd5821410d4920f83e247a9c733e6f2b81be78664c0f4f7fa74c06b
+EBUILD pcmciautils-018_p8-r3.ebuild 1552 BLAKE2B ab756adb42aeb06fd23b022b0a9c064204808dfb5f2f4d396e622634686cc881b8a53d760ee4638b66ec8d46cea3e9252126a8bb993813099f10ec99b98968ce SHA512 0ed8d900a3ba3ea65bf4a7666f8be2f04eea1507bf9f296dbd41e90e7f375461e73fdb643e4d41eaa4f0ed61a933868d7e1bf6c6187b1ad2d0282178390864fe
 MISC metadata.xml 244 BLAKE2B 98282e1c41cb6f5c3e984cc3d0558218b91a7eaf13774ab9f7e3eec7351fb18831088c0ecf1422ec6bac434b1c46654cf253f41bd3a748f4c724bfed2b35e82f SHA512 5c9aa921d361b670fdacbc49e93fb5e3a8ed161e0866ebc08ec0940c480a6bed654059642675e37596d1ede56f0ca5b55ae31ed96040fcf8d01f9f683ce444f6
diff --git a/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild b/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild
index 798f57159009..6ba72087ffb2 100644
--- a/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild
+++ b/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="amd64 arm ppc x86"
 IUSE="debug staticsocket"
 
-RDEPEND="virtual/modutils"
+RDEPEND="sys-apps/kmod[tools]"
 DEPEND="${RDEPEND}
 	virtual/yacc
 	sys-devel/flex"
diff --git a/sys-apps/pcsc-tools/Manifest b/sys-apps/pcsc-tools/Manifest
index 5fd939036e40..b6d343a14962 100644
--- a/sys-apps/pcsc-tools/Manifest
+++ b/sys-apps/pcsc-tools/Manifest
@@ -1,6 +1,6 @@
 AUX smartcard.cron 319 BLAKE2B fac8c4360b802de32ff5b0fc5c2ef41aacc28186001ee6f4f3a1cd878ed75cae3f7f78aaad58580d11a695b3fd624fdd412669c743b951818de1aef6d9d4cdf0 SHA512 cb34e75090ff0fde349b81867383ed776b4c89672039f42426e27d2fce77ba0575827d2627b82fc9c435d6091b26e7c2a0e51dbcd1bdd1c883b8c37000ed516e
-DIST pcsc-tools-1.5.5.tar.bz2 287752 BLAKE2B dd0563f75c2b1cd05f21916287ff98c8b5f0c444b71ac7cda4da3a9dbf2db58f92555d54029a73feffd651b42ccae820670df1a90c8541eab188bf66b51ad114 SHA512 b34eaea663274e03790e409909ddb9819b20882795af2618068f59532e2f79973b22b4d0c468a0bb4338c74d1ceca310e8c60005fb1d15ab4f34053125ece3bf
 DIST pcsc-tools-1.5.6.tar.bz2 289691 BLAKE2B 35dd50a3a8babff89f9e5d769ef70a573e58b2780d680c82dfa07177a3daaf527b5ccca665c901f9667ca4a81719916bd5aebb2e9b1b4d0301001498fe587832 SHA512 94076ed5af698afcec05da9645d7108c02c110fd0ee5efecbd8e0c7eb5ed9a55ee857d23b79ab2ccb93847f8a36f996fa9d521d999395f63274d4bf1d9cf3d26
-EBUILD pcsc-tools-1.5.5.ebuild 1332 BLAKE2B 501081f01c52942be7cb2bf59f944dce21d3a1dbdbe0ed66bfb1dd24699344e9dcbc6fe5e6d72ab76ba52a213835d4552f51731183709284d43ecc5344b39d7c SHA512 b04fac13c8113d3214b978592c89d21ada84300e626515ac8b2364218fb5cb2e38ab6c0a8f68446c44f736be09e9046e9f217b9ec406240055c9470543797fbf
-EBUILD pcsc-tools-1.5.6.ebuild 1336 BLAKE2B 575bb3247d69c2c6f6ae2e60a357c0df38b9b0d7e2ec28fd1706b0fc15483ed82cbe6094c67ad51a2c611d2a8fd7ceac01524168fb5d62076f6be11006ef2595 SHA512 69d537562db9dd93ff01ea5300422337270496f1e853ccd5e8741fcab0540286d001021c7fa2bb51cc14d226371b5b5f132313c3121d3013348cdf38f61c68c9
+DIST pcsc-tools-1.5.7.tar.bz2 292637 BLAKE2B f0bfa9f680a2f2b348d2baef4b4b4567008163f47d7d7e6cec694cdc424626c5c6f18c475f0e8d4c5cd49111315b3c8a934fecf30afe90bbebc0a15f8d6f4a1d SHA512 58d70f41c5815297def7d8b64807e960db85719996771ecb43a4320d3f3fc82e2deb133d9ca97b3a4e8e76267294b3339d8883ba4770bdd0071566e1ce457501
+EBUILD pcsc-tools-1.5.6.ebuild 1332 BLAKE2B 501081f01c52942be7cb2bf59f944dce21d3a1dbdbe0ed66bfb1dd24699344e9dcbc6fe5e6d72ab76ba52a213835d4552f51731183709284d43ecc5344b39d7c SHA512 b04fac13c8113d3214b978592c89d21ada84300e626515ac8b2364218fb5cb2e38ab6c0a8f68446c44f736be09e9046e9f217b9ec406240055c9470543797fbf
+EBUILD pcsc-tools-1.5.7.ebuild 1382 BLAKE2B 3211dd397c7d103f75652f6807f4efa702ea75d5ef450461a4f0a206797d64f3dadfc2d1b1e14bd1f654433c4125c48fbaa1430e4e1c42ea7a0ee8921641b206 SHA512 e152bc516c62bb9bd924796f36d99aa37f17956ec6cae9744e237251a91ab6fd23514b223c0af7c071dfef514b60f407444c2259ded074403e3e4a1b10ce35bd
 MISC metadata.xml 356 BLAKE2B f2a71004d252e6d78f05b74f6d6f6568cec05e7b28460ae12a73f7d4cc0a42028f21553161b64c689902a4a4366243b0b112fbb69909a7f020fa283f3943b585 SHA512 e541ab4d7c75e0ecbc34ec540ed771dbfe7c99f4068adfae5142010b28b60b18770883a47b5c9da2410482cb9beb26713b3b876a091dcf326be7132d0dbb0aa4
diff --git a/sys-apps/pcsc-tools/pcsc-tools-1.5.6.ebuild b/sys-apps/pcsc-tools/pcsc-tools-1.5.6.ebuild
index aae8a0221d7e..add6360afa55 100644
--- a/sys-apps/pcsc-tools/pcsc-tools-1.5.6.ebuild
+++ b/sys-apps/pcsc-tools/pcsc-tools-1.5.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ludovic.rousseau.free.fr/softwares/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE="gtk network-cron"
 
 DEPEND=">=sys-apps/pcsc-lite-1.4.14"
diff --git a/sys-apps/pcsc-tools/pcsc-tools-1.5.5.ebuild b/sys-apps/pcsc-tools/pcsc-tools-1.5.7.ebuild
index add6360afa55..d3b2711916dc 100644
--- a/sys-apps/pcsc-tools/pcsc-tools-1.5.5.ebuild
+++ b/sys-apps/pcsc-tools/pcsc-tools-1.5.7.ebuild
@@ -6,12 +6,12 @@ EAPI=7
 inherit desktop toolchain-funcs xdg-utils
 
 DESCRIPTION="PC/SC Architecture smartcard tools"
-HOMEPAGE="http://ludovic.rousseau.free.fr/softwares/pcsc-tools/"
+HOMEPAGE="http://ludovic.rousseau.free.fr/softwares/pcsc-tools/ https://github.com/LudovicRousseau/pcsc-tools"
 SRC_URI="http://ludovic.rousseau.free.fr/softwares/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE="gtk network-cron"
 
 DEPEND=">=sys-apps/pcsc-lite-1.4.14"
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 4bb69fd87e57..a3320ff2c4a1 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,4 +1,6 @@
 DIST pkgcore-0.10.12.tar.gz 646922 BLAKE2B f3251b1a0d773e83d60f15598c2c5679a48a1e1dd81b82956ffb26ef72c25296903d64deeb0e91d95ae26832d0e08e3cdfcb68b95bbcd87acf8ed448a4f4ae56 SHA512 f6f900fc7f77a683c398c874c51eddb387f9aed572d5fce38f4856faa71f4f8e870b1bc276a87f15967733fa6ec7c8345f2d6b777897694537fa1e9165b1433c
-EBUILD pkgcore-0.10.12.ebuild 1091 BLAKE2B 0ec2dc4f6c16cbaf1994caa3b3db77578a95a972d719f7694b443d5b15d0f3b9a69897bd1dae8fa448e0f4083b8eb5d8906aed43c1136ebceb46242e96a0332b SHA512 108771ffbb3001b6f22b0d033b2391688c8afbc5ee5a7ce3114a9324f021998d0043089de4f7536f8fad0c89a9dd5a25f078ba8ca66a0ce2e9ce442d81bab459
-EBUILD pkgcore-9999.ebuild 1084 BLAKE2B 31eaaa22bfc8d1e25c87f41355da880725604fb4d1053e02c208f93b91777bc98575e8437dd295d231d8ac100d987154dc28755ce70023927481e632f5d2a6d0 SHA512 cad4a1f868b36237eaaf778b82e5c68a4562137474d16335868ae0bdde39dedffab9c161c4caf7e8dcb9708307370550f9fbdc618cb7b31c89c7e8f37246c51f
+DIST pkgcore-0.10.13.tar.gz 647320 BLAKE2B ef80320a0a8d35ed68b1d77d52a3cfb2ffbadae2fe9f11efe3f42c68f55388074b5c4b2857f265f1add4cfe479cba9716d45afaf141d113b0874d409955269c7 SHA512 acc5ee2cc6fd0f897129f311e0484e28a1c8f374c5a2e56a29d228fee74b7be0cb6059171b743e0db35544b5b5779d35efcda21e46e65285653ba4155205281f
+EBUILD pkgcore-0.10.12.ebuild 1087 BLAKE2B 26681f82be0b812d29256283224c2724e75c87f7276065925751ea2bec9214b8c8e6d2051a56c5bd902a786296547d3c64541ea263ba542f4ed5c2700cf71e6c SHA512 c539820725887d1e07656d226f0362b1bc00a050ea9e78e498ad64f2d891ac22c52896d0ce9f66073d75b15f90851e2053b32c50f0911b8573d86ae7cc651978
+EBUILD pkgcore-0.10.13.ebuild 1091 BLAKE2B 0ec2dc4f6c16cbaf1994caa3b3db77578a95a972d719f7694b443d5b15d0f3b9a69897bd1dae8fa448e0f4083b8eb5d8906aed43c1136ebceb46242e96a0332b SHA512 108771ffbb3001b6f22b0d033b2391688c8afbc5ee5a7ce3114a9324f021998d0043089de4f7536f8fad0c89a9dd5a25f078ba8ca66a0ce2e9ce442d81bab459
+EBUILD pkgcore-9999.ebuild 1091 BLAKE2B 0ec2dc4f6c16cbaf1994caa3b3db77578a95a972d719f7694b443d5b15d0f3b9a69897bd1dae8fa448e0f4083b8eb5d8906aed43c1136ebceb46242e96a0332b SHA512 108771ffbb3001b6f22b0d033b2391688c8afbc5ee5a7ce3114a9324f021998d0043089de4f7536f8fad0c89a9dd5a25f078ba8ca66a0ce2e9ce442d81bab459
 MISC metadata.xml 337 BLAKE2B 8980bf734cb1f95d4089aed57ac9ac0538b12aff969f37fe298581b5af005a805027962c343fcd88f7b828fc4e837f9bd47478fad7fb9bfd7a8e3bc3bc7a432c SHA512 1c1e68deab3ccdb8a2c80d0d13a9c3ed481f84bcaeae4a9e593c9f0080e9ed0762051d195ea9206ddeca4e60687a39210483aba3f51004031afd1b6bd2e7e5b5
diff --git a/sys-apps/pkgcore/pkgcore-0.10.12.ebuild b/sys-apps/pkgcore/pkgcore-0.10.12.ebuild
index 4d3887960e30..f9dfb8c228af 100644
--- a/sys-apps/pkgcore/pkgcore-0.10.12.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.10.12.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/sys-apps/pkgcore/pkgcore-0.10.13.ebuild b/sys-apps/pkgcore/pkgcore-0.10.13.ebuild
new file mode 100644
index 000000000000..4d3887960e30
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.10.13.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="a framework for package management"
+HOMEPAGE="https://github.com/pkgcore/pkgcore"
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND+=" >=dev-python/snakeoil-0.8.7[${PYTHON_USEDEP}]"
+fi
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index 66a8a5020abd..4d3887960e30 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/sys-apps/pmount/Manifest b/sys-apps/pmount/Manifest
index 2172742057ca..f794144b32f8 100644
--- a/sys-apps/pmount/Manifest
+++ b/sys-apps/pmount/Manifest
@@ -1,6 +1,8 @@
 AUX pmount-0.9.19-testsuite-missing-dir.patch 1360 BLAKE2B 3a44bfe3de89169f5666886b9c192e0f530b3a3785c8a64fbfbdbbbc93331a9c74cbc19cab25ebcc0f5e3fb64d23348f1dd8deaf028545d444000a64d6a5b45a SHA512 3bc940550f59d62106c610d7846ddea09cab674b176cd7361848d283b0f19a0fda5573c6bafb99abe99c806651493ed07ac21f92d32f7dc30d0ccb77a4c1928e
+AUX pmount-0.9.99_alpha-exfat-support.patch 499 BLAKE2B 11045f138c9b20c03f39760d2da8c36600f1be539b2fdfba6e5ba9f97b953945fed7fd9d127ed0f1874cf9f36efe455c32a726e52bf8274c381da476a64e723d SHA512 d2b0024a73343646d688212749ef4e1b6b01f93e2e5059eb1a94b3e0a84a1c2491551c80d295fa62815e609c5f7c442920cfa832fa74a836904b6cef1048c847
 AUX pmount-0.9.99_alpha-locale-regex.patch 753 BLAKE2B a79805f883143f6beea9597ab88059e15ccde83d08ce69625c8c3387b419e46f8a6ea3c3937c17adfdbaeaa4dd5c3f9ad7aef8d67cc5dd406e79dbc250196c1b SHA512 423d52a372c7cdd73206a9001fcc717b50b834023130cc77e4e063ac2b62ae5c84698d127646e3658ae44e3a47f2c77522d007664cf0c4277dc49b47413c8563
 AUX pmount.bash-completion 2935 BLAKE2B 8d89d6098764dbbbddcdc45e3aaac377eb71ead5ca0ea3f44b9eda1dbe1573e3cde154d51b9486903c6fe104948af1ad29031837375953239956651efff7dfad SHA512 b57a37afc2a124c6a4f19924a367d03b315e93575d0b152acde06e43c7dcd1b3d5df46c02d2e5ceef35911edb4f96d1d4113fb6d7cd1e9531fd9840c3729f924
 DIST pmount_0.9.99-alpha.orig.tar.bz2 364282 BLAKE2B a023d75623374186fb2de07bf1a41b01b2fc2570f9560b8bddec04441ffd083c6a0ece32b53db4e6067d181269f74cb7044f2c60bffece4b0e4c8dba9f1611b5 SHA512 12105674f099afb82302c0960f4f50a4bc75382071940e897d9c65b57a0f4de1fafdaa2a4c05f0fa5cba55453ae0c21376b9891353cad1afa88e5fbd9f63d5e9
 EBUILD pmount-0.9.99_alpha-r5.ebuild 2012 BLAKE2B ed8abd0d3019487ad93411c907372fba7b7c6379d8fd51903cb5286ce5fa44a494085e07dc04da9fd83176ad7d831fb5c0c6abc2fc09676a553ebcef9b64d85d SHA512 cae67f0708ee111a1cf10df16a4cb65ebeaf4cd678508f0cf18988114088bceda11655311e7c302409cf81bbd7784e5fcbbba9d3f27612c7cdad3f7d6c3c8d18
-MISC metadata.xml 321 BLAKE2B 014d83434739678d62884604e7e4e56cc52123ddd326250068ed4fd2f5db2b439a75e29c5dc3699599db3c640df414f9407cc772e302796a34eec58e21ebf1a2 SHA512 be1e96e34fcb9d2c433c6d67280840adb13b8771860e6314fff1b716814b120c4d31574333052e54fb788f76c8990d0bd1bdb4c725fde28b174bbd5a918bdc6e
+EBUILD pmount-0.9.99_alpha-r6.ebuild 2060 BLAKE2B c600dc42adc54ef9717ad647be529e08006c7583c9db4f826e2cb8f1b6d2a994a819c8d09cddf781768e509123783b98186bea9faca6028fca13b65888f0c633 SHA512 790b86b7699b0c74ce73a9f284b9fb3dd7ef4250662e951fe402088a81963c7fb183d930d3cb440c61b2f284af59a2b890068a1c0481b0da0149db2f92b07d19
+MISC metadata.xml 434 BLAKE2B 4e7b5746a0ec1a037eb91e0fe55a2fdd14e70320bf2b30ac8640e77f4c005cc533cee3a50ef2907a4e863987bcbf9aedca9e8be51210cffd2ddcf570a05a7714 SHA512 a11a466c6b52b576d55120fd5a142918ed4fc942656f13c923c210ee19dda00867cf66e9e4a6074caac4e1f7683ecdbbae5a72ebe4035300af8bcd41dc4e4f93
diff --git a/sys-apps/pmount/files/pmount-0.9.99_alpha-exfat-support.patch b/sys-apps/pmount/files/pmount-0.9.99_alpha-exfat-support.patch
new file mode 100644
index 000000000000..b5f1074e24bc
--- /dev/null
+++ b/sys-apps/pmount/files/pmount-0.9.99_alpha-exfat-support.patch
@@ -0,0 +1,12 @@
+diff --git a/src/fs.c b/src/fs.c
+index 65ea0c7..2a12b60 100644
+--- a/src/fs.c
++++ b/src/fs.c
+@@ -21,6 +21,7 @@
+ static struct FS supported_fs[] = {
+     { "udf", "nosuid,nodev,user", 1, "000", ",iocharset=%s" },
+     { "iso9660", "nosuid,nodev,user", 1, NULL, ",iocharset=%s" },
++    { "exfat", "nosuid,nodev,user", 1, "077"},
+     { "vfat", "nosuid,nodev,user,quiet,shortname=mixed", 1, "077", 
+       ",iocharset=%s",",fmask=%04o,dmask=%04o"},
+     { "hfsplus", "nosuid,nodev,user", 1, NULL, 0 },
diff --git a/sys-apps/pmount/metadata.xml b/sys-apps/pmount/metadata.xml
index a96b123d31d7..a5051c481241 100644
--- a/sys-apps/pmount/metadata.xml
+++ b/sys-apps/pmount/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild
new file mode 100644
index 000000000000..8336e554d75d
--- /dev/null
+++ b/sys-apps/pmount/pmount-0.9.99_alpha-r6.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1
+
+DESCRIPTION="Policy based mounter that gives the ability to mount removable devices as a user"
+HOMEPAGE="https://launchpad.net/pmount"
+SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV/_/-}.orig.tar.bz2"
+S=${WORKDIR}/${P/_/-}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt"
+
+RDEPEND="
+	acct-group/plugdev
+	>=sys-apps/util-linux-2.17.2
+	crypt? ( >=sys-fs/cryptsetup-1.0.6-r2 )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.19-testsuite-missing-dir.patch
+	"${FILESDIR}"/${P}-locale-regex.patch
+	"${FILESDIR}"/${P}-exfat-support.patch
+
+)
+
+src_prepare() {
+	# Restore default value from pmount <= 0.9.23 wrt #393633
+	sed -i -e '/^not_physically_logged_allow/s:=.*:= yes:' etc/pmount.conf || die
+
+	cat <<-EOF > po/POTFILES.skip || die
+	src/conffile.c
+	src/configuration.c
+	src/loop.c
+	EOF
+
+	default
+}
+
+src_configure() {
+	econf --disable-hal
+}
+
+src_test() {
+	local testdir=${S}/tests/check_fstab
+
+	ln -s a "${testdir}/b" &&
+		ln -s d "${testdir}/c" &&
+		ln -s c "${testdir}/e" ||
+		die "Unable to create fake symlinks required for testsuite"
+
+	emake check
+}
+
+src_install() {
+	# Must be run SETUID+SETGID, bug #250106
+	exeinto /usr/bin
+	exeopts -m 6710 -g plugdev
+	doexe src/{p,pu}mount
+
+	dodoc AUTHORS ChangeLog TODO
+	doman man/{{p,pu}mount.1,pmount.conf.5}
+
+	insinto /etc
+	doins etc/pmount.{allow,conf}
+
+	keepdir /media #501772
+
+	newbashcomp "${FILESDIR}/${PN}.bash-completion" "${PN}"
+	bashcomp_alias pmount pumount
+}
+
+pkg_postinst() {
+	elog
+	elog "This package has been installed setuid and setgid."
+
+	elog "The permissions are as such that only users that belong to the plugdev"
+	elog "group are allowed to run this. But if a script run by root mounts a"
+	elog "device, members of the plugdev group will have access to it."
+	elog
+	elog "Please add your user to the plugdev group to be able to mount USB drives"
+}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index fed71ac8f6f6..e6e5e74d8db6 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,17 +1,11 @@
 AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a747313021bb85c37b20327ab2feb9b2cc715849245875e7d8a5ae6ceee84b4a33d532996cb793bd SHA512 0df49e479e551648519ea4db0986584463eed498f77b133bd0e517389e71f4ff4069f1a5017c39f349bae62baa2ac32d968048c396261a9045ff00a0e5aa8bf4
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
-DIST portage-2.3.100-bug-719810-escape-percent-signs.patch 1486 BLAKE2B 809e3897ffbcba32bdb209bad56e32f10c550bf00e74aa48e518c35d697447d88cb110652cb621a67b3fc9d3b97afeb0c593afd1212854623445899254a851de SHA512 37d5d67194ff2dbeb637da59e20d6fe2f75a69334189e751db3329b76b3e0ac42c6d87a0f1fdeeecf9e17288948e5d5b8415c53035f0f60d81f00c4e76e26b7d
-DIST portage-2.3.100.tar.bz2 1051559 BLAKE2B 32ee47c2d3e28dd7530c4d6518c264f01621677b5d8872c98088117de3bde21bb05f144935b1c035157953814573473a9ac0216595138d804dd30cf8a7c5b4a9 SHA512 b784ced00676020700a27a622a7a10162b8775185e28d639473243949ca32210458523e94960cafa908ca4a97cd8731d3515f768e2512c519c54598316ecf3c9
-DIST portage-2.3.101-revert2-bug-709746.patch 25365 BLAKE2B 84a451b3af5c6a79a99f7548fa920a888b76d31d4248d11592bf5e8ec8f26bd8e62f813cb69a684ff2816942c49a8661744c7ec9d0944aa256527cfa3b20323d SHA512 49a1f7e38cec1e06373154024a980eedf5bfacc9cc66e1f8c70e8cbb77c68b94a934b4cffe039acdc86179a8f44bd463771c3acecaab6ced3387fd47a312f69a
-DIST portage-2.3.101.tar.bz2 1052483 BLAKE2B 8abf5a0f5c3aace92fd5e74692240558b9fd6cc27f5030409289519edb5287e6b49a0e8c33d11d7b1427a8463fe98f6041de37638451fe639b295d7b595328f3 SHA512 e5d373fc435a9f7535c9bdc202bd0aa9a534ac9991987e21fbfd43492940210312b817284a2484cb4e98854050bb559aa49daef7f5d555e637a37eb312ccbe61
-DIST portage-2.3.102.tar.bz2 1051616 BLAKE2B e9158cd941d65575dab51e2f8cd768c5706ce2f7e6f37fb4c77bc615501b3b3893fdee0917780fe172307bf647a1e4e56e3d88a7c479e103b095fc295fe274e7 SHA512 08024707c552b5b5174a66825cc53bc459a3db2fbb36740713a4ac5834429550200bc458e1f4a2ea921aaf04f0632dc885ef9ab5ba2c3a22d48c031667ed23ca
 DIST portage-2.3.103.tar.bz2 1051807 BLAKE2B 6a05997ea8b87627523642664956f822b76bbc41511659abfa6ede12b5f9ecaf9d253ac816b0e1dc6b6a118d9efc80593b429ef179d9d01200333585498d44d9 SHA512 e5595ca3b12c35fb696dd86ed2f1a72e56c7bc6955a63e555e1f0a795415473e38363541495496464bdc4192e2708c8bff4192bd0c7dad7a527fac96deec2a4c
 DIST portage-2.3.89-bug-718578.patch 1325 BLAKE2B 7a3bc520274617736eac2e3d078e90d151bdb5d8615f6217a499c0f5d4c80813f2c753e7902cf34482df0725ad0b43a38707764c8be14aae9f7ca34f0bd8721f SHA512 6f1c5d7b42beb8078c45cccbad2bd65374b69af92521d9be3beb6784477ca5bcdd75d8e762b239e44e3121e6fe5e3a040c92c9b61521e4a9b1d6bafee10d4c88
 DIST portage-2.3.99.tar.bz2 1051210 BLAKE2B dd3f990dbc87e655a767ce01e1ee3f0b1d5226fa818949408e54b81a2f96e50a4215a79af42b00dc795792858c4f86453b238b14baef4f0793c937b5617534b8 SHA512 176842318a4134ce54c5aa6485fef296f5a14edd2a72421c2011973a0f1a6af39bc5398f1e9eb3b8666d5fc307589c5b91ab93c219bdedb2d307357d8ddefbf5
-EBUILD portage-2.3.100-r1.ebuild 8506 BLAKE2B c28cf46a4b962d3cc63c8b2761830ec23102b2fd2bb62812e93323307449bb2e40e5ff89e28addfa19f99da7e29fb8c11ff262d0b2a129e1d7d14b55ebcd5a10 SHA512 d3b5ae4297c201177d831c50df9e5d78475025fcac3fab8a07970363f60da72ad6850fe74996791040eb24518617b915bf01b74ef3ebfb172ec72f6fc79d91a2
-EBUILD portage-2.3.101-r2.ebuild 8524 BLAKE2B 66747258d25a467f7672574c132983ee7d00107fa0d435511d8c7b70e44c2e949485f0ef461c5b232aedfe55c5afecbdd3b1ffa76bbc67cf23ccc6272fc7cb99 SHA512 1b4a33f9b134b69c48ebdd71bc4c30bcc8c2d4968ac4fa9eec087cfd0f753aa1a34751789f225b0ea7d07ec7276c3c6739dc22ce9b60d5b379c1fbd76bbc262f
-EBUILD portage-2.3.102.ebuild 8277 BLAKE2B ce6f538d3810a507e6532cd5ffcec56fefdf536c427e83464b38c8e68cc886ed67fc0e80721b6b07dc946e2e38365e961fd04683e6335e29ac429c74f2e9867d SHA512 a39ad1a46a3e965a6c0a829470f236419860d67613d4a289178688044d40bc985c2bb1db488cd8ea37b6ba8a6a2d3463aa16fe6f88d331ce937280c0dc174832
-EBUILD portage-2.3.103.ebuild 8277 BLAKE2B ce6f538d3810a507e6532cd5ffcec56fefdf536c427e83464b38c8e68cc886ed67fc0e80721b6b07dc946e2e38365e961fd04683e6335e29ac429c74f2e9867d SHA512 a39ad1a46a3e965a6c0a829470f236419860d67613d4a289178688044d40bc985c2bb1db488cd8ea37b6ba8a6a2d3463aa16fe6f88d331ce937280c0dc174832
+DIST portage-3.0.4.tar.bz2 1042654 BLAKE2B 6f869b2eb24f9e590bf8e01172050105a1bd9ea88657db5893133b4620231a0ddcda871d6fcc10623f7f2ef809116310c76355263819be6c3734b0ca184d5fc0 SHA512 7a0c39cd4ed65aebd84ff8bbadba29760b3aa392a0d606c5b29a1112fd0845c42f74eebb0728a069b2b097a6eb7eec2d18af615fd9edcc38f1018ae6ff686812
+EBUILD portage-2.3.103-r1.ebuild 8273 BLAKE2B 34b93c759e7ac7894ed9881245e682962d6254c0a61189962e5f38edcd110275312804e2ec98113635afb66ba5f00d80a12181f440b253981cb1a2db618511ee SHA512 f3607091262144d8376f63328822fff78feb908a0afc3dd84293672fe2e86ed9b2ca415ef7740a616a6b2fb376e34dc22559c1ca8c2771ab0d2ad0cdf237b6a8
 EBUILD portage-2.3.99-r2.ebuild 8464 BLAKE2B 4d8dd4abded851e705f4a5dc7fe7692acecf16f0a47a08086589e7d6443ed28c4adc97d94a2cbbd7e5a3e36e4a04d80402502739d4a2b75b7d6ebc2ad20f50ff SHA512 884218ac0eb74afe5bf9fb618164e0fd5fe368afeedcd93d5bb50e50b473f98c8b5b890cd44a8610b08e0d557c2ca5faf5842bef0fc3ce44ea5777a974588058
-EBUILD portage-9999.ebuild 7423 BLAKE2B ea03765f419e9450349cb5cf956f6f86f73a2ecdd95be109edee4713de5d57fb38f1da502f6d5aa0ba3bcea28ee1985efcb252a40af83982aa36fcfecfb92c73 SHA512 4494b11c180586cf6b1f268a2f9c54926ad57a4d41f74841b2644026ce8f18b8044ec5bd0048678bcd3a8c97cb1a9a1b6c5b63cbb637c2af948fa6fcd13ac0d7
+EBUILD portage-3.0.4-r1.ebuild 8454 BLAKE2B a0f1f519c4f509cb42d7074cef10aa058fda0ce5b53b6df3557c9857b53ff342ae5e80aca71d74f166768ea413402b97ee1c42e952e98b722dfc2d7824b599dc SHA512 7fee4a1f35284cc834dd31aecc9a775347d14800c39481aabd23f9ff7311a2bbfb894bcc30c1ec263519342b7e29aba915f155892967c4ecc270f145b8dc7f12
+EBUILD portage-9999.ebuild 7424 BLAKE2B e30a2c85a5c17151fa9fbb35a7b32d24718e68f6dbba06b6efec623ce88f4df2ede6cc9cc5119ecb8197692853e0564803e4b60b7f413bfa73102bffcc7ac83f SHA512 fa5b9addd1aa287e5aa42cd1d335400ab780a37b02ed9c4473571e7a3a63d8dc79c25ff73a84573cea1dac4558084cb515207287d08446c8ca0c1721f2656411
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
diff --git a/sys-apps/portage/portage-2.3.100-r1.ebuild b/sys-apps/portage/portage-2.3.100-r1.ebuild
deleted file mode 100644
index 60c322495ccc..000000000000
--- a/sys-apps/portage/portage-2.3.100-r1.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_{6..9} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 epatch linux-info systemd prefix
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	apidoc? (
-		dev-python/sphinx
-		dev-python/sphinx-epytext
-	)"
-# Require sandbox-2.2 for bug #288863.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	app-arch/zstd
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		rsync-verify? (
-			>=app-portage/gemato-14[${PYTHON_USEDEP}]
-			>=app-crypt/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/gentoolkit-0.4.6
-	!<app-portage/repoman-2.3.10"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
-	https://github.com/gentoo/portage/commit/c238d5f7ed264179c263f5a2da983c4ee50b4f00.patch -> portage-2.3.100-bug-719810-escape-percent-signs.patch"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-	check_extra_config
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	epatch "${DISTDIR}/portage-2.3.100-bug-719810-escape-percent-signs.patch"
-
-	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i lib/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-			-w "/_BINARY/" lib/portage/const.py
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f ! -name etc-update -print0)
-
-		einfo "Adjusting make.globals, repos.conf and etc-update ..."
-		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
-
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use apidoc && targets+=( apidoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use apidoc && targets+=(
-		install_apidoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	python_setup
-	local sitedir=$(python_get_sitedir)
-	[[ -d ${D%/}${sitedir} ]] || die "${D%/}${sitedir}: No such directory"
-	env -u DISTDIR \
-		-u PORTAGE_OVERRIDE_EPREFIX \
-		-u PORTAGE_REPOSITORIES \
-		-u PORTDIR \
-		-u PORTDIR_OVERLAY \
-		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
-	env -u BINPKG_COMPRESS \
-		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
-		elog "The emerge --autounmask option is now disabled by default, except for"
-		elog "portions of behavior which are controlled by the --autounmask-use and"
-		elog "--autounmask-license options. For backward compatibility, previous"
-		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
-		elog "Users can get the old behavior simply by adding --autounmask to the"
-		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
-		elog "change, see https://bugs.gentoo.org/658648."
-	fi
-}
diff --git a/sys-apps/portage/portage-2.3.101-r2.ebuild b/sys-apps/portage/portage-2.3.101-r2.ebuild
deleted file mode 100644
index e3ec6c3b452b..000000000000
--- a/sys-apps/portage/portage-2.3.101-r2.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_{6..9} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 epatch linux-info systemd prefix
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	apidoc? (
-		dev-python/sphinx
-		dev-python/sphinx-epytext
-	)"
-# Require sandbox-2.2 for bug #288863.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	app-arch/zstd
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		rsync-verify? (
-			>=app-portage/gemato-14[${PYTHON_USEDEP}]
-			>=app-crypt/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/gentoolkit-0.4.6
-	!<app-portage/repoman-2.3.10"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
-	https://github.com/gentoo/portage/compare/1079f2d13cfe575e243b76b2f5128c0c4e222f51...ca763549507d995e91a49753b13bcca8748fae6c.patch -> portage-2.3.101-revert2-bug-709746.patch"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-	check_extra_config
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	epatch "${DISTDIR}/portage-2.3.101-revert2-bug-709746.patch"
-
-	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i lib/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-			-w "/_BINARY/" lib/portage/const.py
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f ! -name etc-update -print0)
-
-		einfo "Adjusting make.globals, repos.conf and etc-update ..."
-		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
-
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use apidoc && targets+=( apidoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use apidoc && targets+=(
-		install_apidoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	python_setup
-	local sitedir=$(python_get_sitedir)
-	[[ -d ${D%/}${sitedir} ]] || die "${D%/}${sitedir}: No such directory"
-	env -u DISTDIR \
-		-u PORTAGE_OVERRIDE_EPREFIX \
-		-u PORTAGE_REPOSITORIES \
-		-u PORTDIR \
-		-u PORTDIR_OVERLAY \
-		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
-	env -u BINPKG_COMPRESS \
-		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
-		elog "The emerge --autounmask option is now disabled by default, except for"
-		elog "portions of behavior which are controlled by the --autounmask-use and"
-		elog "--autounmask-license options. For backward compatibility, previous"
-		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
-		elog "Users can get the old behavior simply by adding --autounmask to the"
-		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
-		elog "change, see https://bugs.gentoo.org/658648."
-	fi
-}
diff --git a/sys-apps/portage/portage-2.3.102.ebuild b/sys-apps/portage/portage-2.3.103-r1.ebuild
index 6e1a8152761f..f35ebfa2822c 100644
--- a/sys-apps/portage/portage-2.3.102.ebuild
+++ b/sys-apps/portage/portage-2.3.103-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
@@ -40,7 +40,7 @@ RDEPEND="
 		app-shells/bash:0[readline]
 		>=app-admin/eselect-1.2
 		rsync-verify? (
-			>=app-portage/gemato-14[${PYTHON_USEDEP}]
+			>=app-portage/gemato-14.4-r1[${PYTHON_USEDEP}]
 			>=app-crypt/openpgp-keys-gentoo-release-20180706
 			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
 		)
diff --git a/sys-apps/portage/portage-2.3.103.ebuild b/sys-apps/portage/portage-3.0.4-r1.ebuild
index 6e1a8152761f..9fc28acb0589 100644
--- a/sys-apps/portage/portage-2.3.103.ebuild
+++ b/sys-apps/portage/portage-3.0.4-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( pypy3 python3_{6..9} )
@@ -40,7 +40,7 @@ RDEPEND="
 		app-shells/bash:0[readline]
 		>=app-admin/eselect-1.2
 		rsync-verify? (
-			>=app-portage/gemato-14[${PYTHON_USEDEP}]
+			>=app-portage/gemato-14.4-r1[${PYTHON_USEDEP}]
 			>=app-crypt/openpgp-keys-gentoo-release-20180706
 			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
 		)
@@ -56,7 +56,8 @@ RDEPEND="
 	) )
 	!<app-admin/logrotate-3.8.0
 	!<app-portage/gentoolkit-0.4.6
-	!<app-portage/repoman-2.3.10"
+	!<app-portage/repoman-2.3.10
+	!~app-portage/repoman-3.0.0"
 PDEPEND="
 	!build? (
 		>=net-misc/rsync-2.6.4
@@ -89,6 +90,9 @@ pkg_pretend() {
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
+	# Apply b0ed587308eb3cbfafe9abcb1c59f24f48b97cdc for bug 738766.
+	sed "/scheduler.wait()/d" -i lib/portage/util/futures/iter_completed.py || die
+
 	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
 
 	if use gentoo-dev; then
@@ -222,24 +226,24 @@ python_install_all() {
 	dodir /usr/sbin
 	for target in ${sbin_relocations}; do
 		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+		mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
 	done
 }
 
 pkg_preinst() {
 	python_setup
 	local sitedir=$(python_get_sitedir)
-	[[ -d ${D%/}${sitedir} ]] || die "${D%/}${sitedir}: No such directory"
+	[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
 	env -u DISTDIR \
 		-u PORTAGE_OVERRIDE_EPREFIX \
 		-u PORTAGE_REPOSITORIES \
 		-u PORTDIR \
 		-u PORTDIR_OVERLAY \
-		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
 		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
 
 	env -u BINPKG_COMPRESS \
-		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
 		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
 
 	# elog dir must exist to avoid logrotate error for bug #415911.
@@ -247,8 +251,8 @@ pkg_preinst() {
 	# portage:portage to root:root which happens after src_install.
 	keepdir /var/log/portage/elog
 	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
 	fi
 
 	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 4c546564cf0c..18b40afe2889 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( pypy3 python3_{6..9} )
@@ -40,7 +40,7 @@ RDEPEND="
 		app-shells/bash:0[readline]
 		>=app-admin/eselect-1.2
 		rsync-verify? (
-			>=app-portage/gemato-14[${PYTHON_USEDEP}]
+			>=app-portage/gemato-14.4-r1[${PYTHON_USEDEP}]
 			>=app-crypt/openpgp-keys-gentoo-release-20180706
 			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
 		)
@@ -216,24 +216,24 @@ python_install_all() {
 	dodir /usr/sbin
 	for target in ${sbin_relocations}; do
 		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+		mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
 	done
 }
 
 pkg_preinst() {
 	python_setup
 	local sitedir=$(python_get_sitedir)
-	[[ -d ${D%/}${sitedir} ]] || die "${D%/}${sitedir}: No such directory"
+	[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
 	env -u DISTDIR \
 		-u PORTAGE_OVERRIDE_EPREFIX \
 		-u PORTAGE_REPOSITORIES \
 		-u PORTDIR \
 		-u PORTDIR_OVERLAY \
-		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
 		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
 
 	env -u BINPKG_COMPRESS \
-		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
 		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
 
 	# elog dir must exist to avoid logrotate error for bug #415911.
@@ -241,7 +241,7 @@ pkg_preinst() {
 	# portage:portage to root:root which happens after src_install.
 	keepdir /var/log/portage/elog
 	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
 	fi
 }
diff --git a/sys-apps/qdirstat/Manifest b/sys-apps/qdirstat/Manifest
index edc39c621c97..3cfcefee8dd7 100644
--- a/sys-apps/qdirstat/Manifest
+++ b/sys-apps/qdirstat/Manifest
@@ -1,3 +1,5 @@
 DIST qdirstat-1.6.1.tar.gz 7708491 BLAKE2B e6a92f93c76de0f602a66409a2701cd06f1744ab67c3c829938695f1d59b7244998d3a6ddd9d6cfc6408db3ac98d355f4496348ebd198c93ea345b33414c3048 SHA512 fd4c6a3582184785d935e96e884cc3e2033e3ee174ea893816b14524c5c5c62923c5a8c5869969fb8b1d0e84bbffd9dc707a68bdb53898c55dfd14fe16946110
+DIST qdirstat-1.7.tar.gz 8057173 BLAKE2B 7de2d74933dcce190240569ca043faf76925592576016090498ae21d2074a79aa9b1313fa491c270d5a841238cb35007a85ca3de9c343a353b3de9235f9e5032 SHA512 9af03c110663eab0df48f69f7d949421feebfdca1299205d25a216587cf2c9e472cbe99ad98f3cd6c783be2b02e0308cdbc2f5549bf662b3061ff5e059317b01
 EBUILD qdirstat-1.6.1.ebuild 888 BLAKE2B da8431858fe360acbe63f7718543318e69e1baaf6db4f245b3bf702aa4c875739f95b1138fbb20d3a11e45eca732d77ccfad8ee15b5de5a34f32140819191f1c SHA512 dd7f0e026558f3a30cc01c076bb4651d019fe62bc31a5ffd1e98a53df4f3c823ead8328c6a2cc346eb5a0ecc3e201d5684587ef6489f4da3aebc257f15fe17a3
+EBUILD qdirstat-1.7.ebuild 890 BLAKE2B d5cfa2cb6e00b037ab1c4a4636a3762430d267679a84c136b27a0b96f8991fdd2bef3ab5f4da1877787abdc7b0f072307babf613bd990a233f79c9813951f294 SHA512 5d861861b1e133c032dacb7cae0e8a705136c118f4c25a5f2c037969de2f94f02344c301068b1c596db6c3b38fbab1c299dd9a8196883347fc9cb422ef9a0941
 MISC metadata.xml 882 BLAKE2B 9ed3f6470fd94b9376ea810069b63aefae3a0347a7f46be4f1c7c17425082b4b464fc2a5e4b4246d0e6a7a0d0e88f74173593b94ef01721b85990ea59f9ad145 SHA512 606dbdffa7732dbafde3151554b62d7879de5861c0647d21876d6ce4198d63c9413256af2c380ca517e6b148f9e0ecee0c092aa6e3bb47bc972124043508edbf
diff --git a/sys-apps/qdirstat/qdirstat-1.7.ebuild b/sys-apps/qdirstat/qdirstat-1.7.ebuild
new file mode 100644
index 000000000000..e4bae2ee165e
--- /dev/null
+++ b/sys-apps/qdirstat/qdirstat-1.7.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils xdg-utils
+
+DESCRIPTION="Qt-based directory statistics"
+HOMEPAGE="https://github.com/shundhammer/qdirstat"
+SRC_URI="https://github.com/shundhammer/qdirstat/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-qt/qtgui:5
+	dev-qt/qtcore:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+"
+
+RDEPEND="
+	${DEPEND}
+	dev-lang/perl
+	dev-perl/URI
+"
+
+src_prepare() {
+	default
+
+	# Fix QA warning about incorrect use of doc path
+	sed -e "/doc.path/s/${PN}/${PF}/" -i doc/doc.pro doc/stats/stats.pro || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}" install
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/sys-apps/razercfg/Manifest b/sys-apps/razercfg/Manifest
index eb3f2ade643d..8bed512d7edf 100644
--- a/sys-apps/razercfg/Manifest
+++ b/sys-apps/razercfg/Manifest
@@ -1,5 +1,7 @@
 AUX razercfg-0.39-unit-variables.patch 712 BLAKE2B 2aeea04ea744bb6ed708d6d1128026ffc5112f9a0611d6eff9fbf2aacb9660bd3698727da5812da5b8937205246d70a20a5f876156b6ebe46638289c0e6cabd9 SHA512 c34c7f314420a1597b0c5aa44f6ae3b55e212d1bb9c00498f5e1525390bb2e62d68ebbe5dabc48468e79f0fe8f2f30b81459a5e9cc0b3e837239d39230fd7238
 AUX razerd.init.d-r2 447 BLAKE2B ea72b6e9fa2f32ecede29e910f76f75a0de538c84271245eb8cf4f0715aa36c954e05cedb31c8af8a39b222c001bcdbd738ec5163c18eb58730b8868ae8da592 SHA512 8c9e307bd2a76086f9fa462f04019c9c840681232f1833292d4f64ed030ce83392cf039919f9f830abb4b61e0be65e2637c6bfdb7551291f68626c876ec92af1
 DIST razercfg-0.39.tar.bz2 178142 BLAKE2B cf2d92d24a0dbfdae4045c2dab30a64bc4de64d730c075a4d852790ff62bcbadd714953fac925e69b671355cbdfdec7ce9db5693fbfa8e2aab69de6247c95c1a SHA512 165fee898a01b7f0086eb6705ef9f24fd8b8836025c071f7851a493181b8d193d0db70fc1731a8586de1f1c795aab4d20bb4ee8526b612c66ba3c434c6e10137
+DIST razercfg-0.42.tar.xz 103300 BLAKE2B 83f9432edf4deda78514dd1e2a65e04981d3646c543ebf3b74060f5d6ee5f9c3ddec5b0c544c11c9968c790172ae2bd4d4503adaf1428ca31337fdcd33d8545c SHA512 3856f4133b620fb639a46a5bb02fe8e6c47ae3928a04fe9d1bbef2792a44fdd4f5dff2efa43a1e43d75312025d3c65c626e331e723092e4e0b8d6622657fb197
 EBUILD razercfg-0.39-r2.ebuild 2137 BLAKE2B deb76d7fe520261d6eeec1d702720300f4b273b1be7aa19ebfcd4a80594b643ecf8c833e5a775fe82d0e9aeb44f11239d4f9943335a183ec770da3e92fda59e3 SHA512 e2bfdfb681cacb1a6db032803125c9e24329958de2e1a50dfa769a158a5329fb12875a6d55c28c1040376ba05645079fd130932bb80b504280a1d233c2e9a3e1
-MISC metadata.xml 805 BLAKE2B 6be95bde1f31d215ead8de0546bcae9860c5ea24109803d44dcb889e7b39aa21972813893da53ea0817a77f9158d18be4fccd166cb2fe8d82627411f25b1d975 SHA512 bf8d583f50967b6a2a77e3db46595286a717eef57e61bb3f8aa230c0b0fbc5fce265fc95bdb57c25b44564b22e8ac2940986a04f9c0f8a6d378e027612ab478d
+EBUILD razercfg-0.42.ebuild 2104 BLAKE2B 8df76bfa80b77d7eebb18259a276d9d3288f413968f6ffc68233fc42c28bf27618d0022522ca32786dc63b39ee94b48a7cd7c530391e606a45dc213b2afde0db SHA512 dea989d25ca21c475d5c6a27f2e200e6aa3c62768087c2a2be63c4e71a4781b91bd34f48bb28994034acf69055a2c277b2f4995319647171c917ff6ee8b0e995
+MISC metadata.xml 1090 BLAKE2B 0c79721466fc628fb2f9da2e1806c4cac06b80cb135e15131e4a28e61f5a611a93ee715c399ac5def942cd5fdf847e272e93dc9aceb3d511093d0e885966d282 SHA512 5c5f26fe807250d22a5390ecdc12fd79d1c9eb39ebc35d1a31f4034faac5b2add3321287ece338d201b6eaa2bb585e636b9b26f37ef8a4f9a21e3f56c2933489
diff --git a/sys-apps/razercfg/metadata.xml b/sys-apps/razercfg/metadata.xml
index 77b7acea528e..e10f5181e6fe 100644
--- a/sys-apps/razercfg/metadata.xml
+++ b/sys-apps/razercfg/metadata.xml
@@ -1,18 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<longdescription>
-Utility to for advanced configuration of the following Razer mice: Copperhead
-Lachesis (Classic), DeathAdder (Classic, 3500 DPI, Black Edition, 2013), Taipan
-Naga (Classic, 2012, 2014, Hex), Krait, Boomslang CE. The tool architecture is
-based on "razerd", which is a background daemon doing all of the lowlevel
-privilege hardware accesses. The user interface tools are "razercfg", a
-commandline tool; and "qrazercfg", a QT4 based graphical device configuration
-tool.
-</longdescription>
-<!-- maintainer-needed -->
-<use>
-	<flag name="pm-utils">Installs the pm-utils hooks for suspend/resume and
-		requires <pkg>sys-power/pm-utils</pkg></flag>
-</use>
+  <maintainer type="person">
+    <email>kaikaikai@yandex.ru</email>
+    <name>Alexey Korepanov</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <use>
+    <flag name="pm-utils">Installs the pm-utils hooks for suspend/resume and
+    requires <pkg>sys-power/pm-utils</pkg></flag>
+    <flag name="gui">Installs GUI configuration utility and status bar applet.
+    Requires <pkg>dev-python/PyQt5</pkg></flag>
+  </use>
+  <longdescription>
+    The next generation Razer device configuration tool bringing the Razer gaming
+    experience to the free OpenSource world.
+    The tool architecture is based on "razerd", which is a background daemon doing
+    all of the lowlevel privileged hardware accesses. The user interface tools are
+    "razercfg", a commandline tool; and "qrazercfg", a Qt based graphical device
+    configuration tool.
+  </longdescription>
 </pkgmetadata>
diff --git a/sys-apps/razercfg/razercfg-0.42.ebuild b/sys-apps/razercfg/razercfg-0.42.ebuild
new file mode 100644
index 000000000000..1236531897a3
--- /dev/null
+++ b/sys-apps/razercfg/razercfg-0.42.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake python-single-r1 systemd tmpfiles udev
+
+DESCRIPTION="Utility for advanced configuration of Razer mice"
+HOMEPAGE="https://bues.ch/cms/hacking/razercfg.html https://github.com/mbuesch/razer"
+SRC_URI="https://bues.ch/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gui +udev"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	virtual/libusb:1
+"
+BDEPEND="virtual/pkgconfig"
+RDEPEND="${DEPEND}
+	gui? (
+		$(python_gen_cond_dep '
+			dev-python/PyQt5[${PYTHON_USEDEP}]
+		')
+	)
+	udev? ( virtual/udev )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-0.39-unit-variables.patch" )
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -i librazer/CMakeLists.txt \
+		-e '/ldconfig/{N;d}' \
+		-e "s:DESTINATION lib:DESTINATION $(get_libdir):" \
+		|| die
+
+	sed -i ui/razercfg.desktop.template \
+		-e '/^Categories=/s/=.*$/=Qt;Settings/' \
+		|| die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPYTHON="${PYTHON}"
+		-DSYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)"
+		-DUDEV_DIR="$(get_udevdir)"
+	)
+	RAZERCFG_PKG_BUILD=1 cmake_src_configure
+}
+
+src_install() {
+	RAZERCFG_PKG_BUILD=1 cmake_src_install
+
+	python_optimize
+
+	newinitd "${FILESDIR}"/razerd.init.d-r2 razerd
+	dodoc README.* HACKING.* razer.conf
+
+	if ! use gui; then
+		rm "${D}"/usr/bin/qrazercfg{,-applet} || die
+		rm -r "${D}"/usr/share/icons || die
+		rm -r "${D}"/usr/share/applications || die
+	fi
+
+	# sys-power/pm-utils is deprecated, so we delete related files
+	# (they contain a hook for resume from suspend)
+	# TODO: test resume from suspend
+	rm -r "${D}/etc/pm" || die
+}
+
+pkg_postinst() {
+	if use udev ; then
+		udevadm control --reload-rules
+		udevadm trigger --subsystem-match=usb
+	fi
+
+	xdg_icon_cache_update
+
+	tmpfiles_process razerd.conf
+
+	if [[ -e "${ROOT}/usr/bin/pyrazer.pyc" ]]; then
+		eerror "A stale ${ROOT}/usr/bin/pyrazer.pyc exists and will prevent"
+		eerror "the Python frontends from working until removed manually."
+	fi
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/sys-apps/renameutils/Manifest b/sys-apps/renameutils/Manifest
index 7c2066c7a13c..e8edeac6c82f 100644
--- a/sys-apps/renameutils/Manifest
+++ b/sys-apps/renameutils/Manifest
@@ -1,5 +1,5 @@
 AUX renameutils-0.12.0-autopoint.patch 250 BLAKE2B f8fb26fc51762e36db1d0450a8c8a61b45059cbc0ae547980609890e56dea12a46fe7993e91f5af48ce813d98f84f6962e24f8489141f9fbcffe1f508d6ef7f5 SHA512 a9cff62242da7d71f05e57bcbd7b10b563c4a0e6262c0ded6c6890ce0f78796bb1b865f66a91dd01db29d5b7d645175e8509d76b30e9c4f60103a6ca9fd9c8b0
 AUX renameutils-0.12.0-typo.patch 659 BLAKE2B a32f67a159e5c213d09d6a70a5b46ba527b618f897d4845efd2b5e12b0c973534de4adcd1f47a2d25a11c081e0873ba9e9bf8ed7bbd54ad44934cc00b1559761 SHA512 0c8a84ec8cbc40c5f51e0a0066ae451ce2f44a2a7d13f73429c60a90dbf02ba0982f00280b16e38125763eeabc850d03f9c8c6f35bd924bd4fac54be85d7ea7d
 DIST renameutils-0.12.0.tar.gz 954114 BLAKE2B 7c65138d9a6de355a72f8e07a6d9b8c1921a8925f7662a26521dcbb37862161ea866e24246cf2a2b3e4c2910231242883bfcea2acef9dda48556faa1d385baae SHA512 8aae157e6ead86a2fbf970ecdb27d6067c2d35c04058ead9a3c0af3d99d466d37d8c4f1da0562ef2bea9cf9bd5f8de4d14340906427df421dba1a5c234c63bd6
-EBUILD renameutils-0.12.0.ebuild 588 BLAKE2B 92b0e16d16d0761f656368b38fd87849d8a0d11ebff8847ad9a3b2a0711e0327403261c11ba41edd56e3c9a635adebefe2949133a729b433868c10a500e72f14 SHA512 54589c8db5da6a8b88c0d39182c079d88d7d304810ce74bd3f2a3bb231068da33ac6bdfd1bba801450e21747b57a2f81c4b3e3179e935062da5c6c15ff5f312a
+EBUILD renameutils-0.12.0.ebuild 595 BLAKE2B 74ec9fcce45cccb1c8d84920dda067d4ee43b279aba6f45e214e14d23abfe14fbf50c3aa84d821a4bf1daa0c427b3e0b04495e7eb06655f7a44951713f9f8761 SHA512 57c29f87e8801d57cc791c3e992b559788a8527ccd4272d9267f43d6a475c4ead94ece0415929f9af05c1c6ed833ed0efe0a8028f5c6768a50914fc440ce5454
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-apps/renameutils/renameutils-0.12.0.ebuild b/sys-apps/renameutils/renameutils-0.12.0.ebuild
index 7d0f5dfb332c..80ed8c2901f8 100644
--- a/sys-apps/renameutils/renameutils-0.12.0.ebuild
+++ b/sys-apps/renameutils/renameutils-0.12.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://savannah.nongnu.org/download/renameutils/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~arm64 ppc x86"
 IUSE="nls"
 
 DEPEND="sys-libs/readline:="
diff --git a/sys-apps/rescan-scsi-bus/Manifest b/sys-apps/rescan-scsi-bus/Manifest
index 34f812e90714..064b520bd565 100644
--- a/sys-apps/rescan-scsi-bus/Manifest
+++ b/sys-apps/rescan-scsi-bus/Manifest
@@ -1,3 +1,3 @@
 DIST rescan-scsi-bus.sh-1.57 22575 BLAKE2B 71737a9b2df22d8aecc756bb690cc401343c7951f0e809804eee43e01566e9f5377d5fd2c1d3628602ed64536402a71770dfe8e6514ab2d36851c7f0827f0c7c SHA512 93a061af852e5f9dd3d64ad62692809a11d8ffaac68f5ce08ba1a4fd9201fc66a0a5482d3e6da6e5c36fb00805fa4f7483fc2c85c5aaf6bfc190690ccf7bc733
-EBUILD rescan-scsi-bus-1.57-r1.ebuild 850 BLAKE2B b5e86a8d25a78771b7117c4a28045ba5d4b5290bef3454bdd3ad87db45202c13572bbb4ed1c0a17285bddb7faa8c57f262e1a6d137d5f161eb4ad3834dc8c803 SHA512 4eefad22b9d62625289991a4bc415fd07ead2032303d7a7d21e0cfe14524b0ff46553f72d363bc2e1393a31675be073a3763ec66f7581af58d886cfaf3c498e6
+EBUILD rescan-scsi-bus-1.57-r2.ebuild 854 BLAKE2B e4c3b2c44b7c3e272084a253415a32a9e903e9cacb378a75985622597f2120480ff4f14877bf59e568d5c719ce0030554cafaf767052a4442d72cba25c4b065a SHA512 95015a1b84cbe02824e27690a04a0e854e6dd8ee6f5c139819896e48fff3a7543fb578470a9869e6854dd1c5cf96c76164147ecded538d67dbf2e96afbf55dc6
 MISC metadata.xml 329 BLAKE2B d3b79b0a53a4a98cf288ff1ee8ae8cb477b90dad4529cedf04a52b25a3fc359121851c2cea28d703b2d2a42c5813bfe9b84398786e9045521eaff01b94f543c4 SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4
diff --git a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r2.ebuild
index b224dbcac390..e3307ae4400b 100644
--- a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild
+++ b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r2.ebuild
@@ -16,8 +16,8 @@ KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 RDEPEND=">=sys-apps/sg3_utils-1.24
 	<sys-apps/sg3_utils-1.44
 	app-admin/killproc
-	virtual/modutils
-	app-shells/bash"
+	app-shells/bash
+	sys-apps/kmod[tools]"
 
 S=${WORKDIR}
 
diff --git a/sys-apps/ripgrep/Manifest b/sys-apps/ripgrep/Manifest
index 031209b2d221..049e142a691a 100644
--- a/sys-apps/ripgrep/Manifest
+++ b/sys-apps/ripgrep/Manifest
@@ -1,142 +1,59 @@
 DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c122507a88e781d7c2d5c9175d1788aeef8d21e0487c7c449e28fbbdaae8203fe68627d23ac0a58d30dc70befd26ac9af32f SHA512 e8a1cb252015435009883662ca23408f1491d8f01461f3a81082feabeeff72ec61beb4f1f3271fc8a87f1379899ecfc38036ac208dca17889f70ddaca2406a9b
-DIST aho-corasick-0.7.4.crate 55480 BLAKE2B 61f8913da203106380d20f8ae4eab2bce453557ae5745522ec1647deb04c0173f96279aa64e3ebf4f8bcdb6f34a31a0f37345e4a4b7baad750971088b301760a SHA512 06863d85a3183c7ace014d6a8345d47147df53475c194030607314b80e00890625ae88e3e669d15e54704f2d3132dd6bf56dc057b87dab7f06c5deaf50d29b79
-DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
-DIST base64-0.10.1.crate 41988 BLAKE2B 6e28a70cc0d5e426d9a3944825952851928ec2e32fa2543a8e1d1b886ad306f38fd6e673da62e96581e56613f133265feeff5b0d2f1e2e34593e58c0424eee9e SHA512 674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535
-DIST base64-0.11.0.crate 48362 BLAKE2B 90d2a64496e20c4bcca6f21c2546474ec88283679ccae95303ea7521133414eba021810e64e5916e3980b6878f90281f09295ebadcc12324fc9a9060ac41a707 SHA512 31b5f56d4907a5e4ae40e92ef1629a446126525186f5236afc2475829bf2e5e067554db200a18f7b3ab741d0cc9c01e20612e77cc0cbc1bc2a4a8d11c0fdbf33
 DIST base64-0.12.1.crate 56378 BLAKE2B 90a948eebbae820ced325055b2d49feebdc3b178a271fa7508356d7e44d9f81f586822b6512169f3c1e9901da491b1728783182796c14e6b2c8c647e57202ed1 SHA512 06c73723c4364ac8bcf4204a943893080d1752dd925a13da800889f486b1ebf97bccae79b7b04cbe758afc95bb1d61464276365d4721689896fa641a8e55b660
-DIST bitflags-1.1.0.crate 16322 BLAKE2B 01931976111840ca69b58e77e2c18b26ebabe4ef71ebdbe83565fbef42ffbb9512ad376192c085070485cd344b8614f260aafe0614fb20342cca5a15e9616385 SHA512 e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
-DIST bstr-0.2.12.crate 344435 BLAKE2B b55a55be4875d9aefcff0091be82d80a19c1c92d5d6e17b751dd41bebd37f6a5f72d884fa8a70e829905baf3526ce4d854b162d10d894573dd2801ed030460e9 SHA512 2d14ac85274814bb29439acf67c3aaf84ac32ad361dd6d2cbca58bf571c968f594eeb1443a632b625296929b84047652fc60ec39983c110737ba1950d88bce89
 DIST bstr-0.2.13.crate 345445 BLAKE2B 9a17fa04d55e5d053b115aef2a075b58cab0fb84c574df61eec7c3ab6f06e17d156991b1c070ad357599de5455af78982eecb8632336d53792958800ecafe839 SHA512 f1f778262269dfea6ba1cf953a5177107c2e1e838248a67588283ee11efa81adfa30498c7cfb20422e0955544a07d2a8f86c4eefc78e9f407a92be9591e26fe5
-DIST bstr-0.2.6.crate 336014 BLAKE2B cfb2eb6ecff2e0e18f26b05fc284cfb9db31f022984243b9d8fbb25d03371588a829a73cd312f0e54daae1f49216fcbd0193385ba7183a73b992a94b619a07b8 SHA512 e5a4dd8061208bd153052fc991d827e96f5d3358ffde84c68d4fcee4ef5ec65de4482795f4d4fcdd5b2b4cea4b69a7e35e369f09a476ab536ecec54aa8d051d4
-DIST bytecount-0.5.1.crate 11888 BLAKE2B e7e72cd64f12315f6883c013ae4d309948cf6a577d653238742332d166d8072d30967b134a59fe22f14104e1764db3e9ff855a7e85511fca71b6e40eb120802d SHA512 9017ed0545266c1f55cc9cd65fb63906bc50ea28c8de30770cb618029a605744a5234487766d52c77ded01a8b08c91d08264175eb4f4352e6777ad5d152670a9
 DIST bytecount-0.6.0.crate 11905 BLAKE2B 7d935f86f0ab82c6c3d4974cd25ec3e193cdbea68b9534b1a461007d1486adc27274b43febd645db045cdd9b8101f93fb4b985ceb076c99a8f6efdc5e69ae855 SHA512 8e675f20b204d5828e79ba50012744b2f1b83f9d5d6355e6acb7d24cc4f7b1080ac120b94e65b6ea1d7604464ea0c6ad4f29880ff14895610889e4396f87062b
-DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
 DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
-DIST c2-chacha-0.2.2.crate 13766 BLAKE2B 0b963b7a4ac64d71d75ab542a23585cd7bb99995b923c52edf99c49a76222978d0a96c020a5a1199c971133fc1f8629b562088b34fd283b7b5da7800848f85ab SHA512 d8edeff2f4eefb9504160d7f4d3c450661d10905c23cc4950736ab76e73bd1e88127c006bc762d63694847f2cc981ceeb0727ecf18e8fad7c89209d7a9e70f14
-DIST cc-1.0.38.crate 45503 BLAKE2B 19d8be59f639c200e43021eda8174dd2b6714d6a8756e1a87d01dc5d3876d11ceccdb5874cc0d2f94da3bba1b576f31409f660dd120a1ecdfe63adc6bff72dac SHA512 0d08ddd3f30c52eaca8195f9cd473ce3fdde6c6788481a33a8970c842781ce1eeb521023291f75d7c03279f524e8739abf3cc66f51ebf6e68945626589f37d30
-DIST cc-1.0.50.crate 49792 BLAKE2B 25ec14fd42536c381babcf697cf96fe8be61417a61ba5875a2461bb40bf3ffd9c9d03e1d9df83e2dabfc9472de3db97b08fdffb710e89b868a5e115d0463a9cd SHA512 34a721d9352f8b59cffb8cc0b9c520b972b65d6c23e83d9c6f6e88d6a6845c53ec89350a4aacd0444a5d6b03b867b97aedaf418b483afead209a7ae6d3885f5d
 DIST cc-1.0.54.crate 51972 BLAKE2B f3760987ea93e71254939a42bc795cfd68b994494c2d5820fbd6bda29e31b3a28d55ed9aaddb35f720b26b1bfc01f3369af81990b68da06a7c46c17eb014636c SHA512 4562c89b52786cd16a66c1970a4005485299ff0c21c61fd22a08fada933e5ecf3fcc1686f6e4f5a8ec4827ac00ed24c1c4ab4931ec5e9a12d2e5c283f6096b77
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
-DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
-DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST clap-2.33.1.crate 201567 BLAKE2B 7bb63b6a243eb33050e5354622fb544ba6db3b859005d857b198af4c3f34dbda22d605326e80a274a12f73fb2c13aea99ec6652584a02d0a3092841f4e119d91 SHA512 31209da6a0ac987f7e1b2504a2fb7738c3aba4ddee4cc2bc22cc37d4d2b0feeff41ece557d4960d51564fd31cb23e413bf180eb60102a872caf623bf55c6f089
-DIST crossbeam-channel-0.3.9.crate 86771 BLAKE2B d0898ecfa5aaccd03ed714b657aee7a3279f4242516c2943073e75d23f23437f34bf63b465bdfef6567030c998e7b3c6bd4f5fe2e0ee4b50a03d8a15396a2090 SHA512 4cc876bab2bd8874cee4b96bc490e77778f10e99ab624ed7a8b73be94b59a40bcb340fdb81a1d14242f6a795557c9f8bcdcf17d6bf6829aff85c7c1e8bf00919
 DIST crossbeam-channel-0.4.2.crate 87419 BLAKE2B 721013134069abc8f01ae5e98e1e6f10981d4892881339d3bf87f1bcb58b362348dad92e702a6b2367075dd41d860d62cca0ac8b3691954c454ca70bb5158000 SHA512 19b0ed2b5ed0fb1fe7c809e08483152fc36cf46f465c8571ca0fb9ebb1cb4b2b8f5860a303c932f336f434dafa9776ce6026ea2e64457147fb540766dc6da2ce
-DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
 DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
-DIST encoding_rs-0.8.17.crate 1401378 BLAKE2B 95c7e545bdc14ba2870432e0c884f14cf56a43d3c5d9c063cbd1dcd9d18e70ddba5632bb1cdf42cef846eb86a901943c50af246b32fba478d2b60a9a44f2642f SHA512 db7a7d469d34feaa899195c336fb9211ee358c226597d0900850fbafac2ee39a89bff253663744ec737a055bf7582e96b9825e96e679da4bb9fb3b0cc59d1453
-DIST encoding_rs-0.8.22.crate 1403758 BLAKE2B b18eb34df4ddaf43c30ddfb5f531aaf30047bc1753d93512013854e8702f7834c463d4098b90c11be5df3f5c8f67bb785ea02d7e2f21d0e925361cb15bd68e14 SHA512 355b98e964ad126d94ecff2777c2f8592c74212a566b7162fb484e594d13cf9c60acabde291f244f8df5d5430d21813f951ae7fd503ed2fd35bfbce58aea88fb
 DIST encoding_rs-0.8.23.crate 1403543 BLAKE2B 1ab7da7a4313dc3e0613a077bd9d036e91eec75913cb9b742879eab17e0af7dd76b69d7a17133f0c0c35a1f8c0628058415751105c95b63e2f578e9a57cbb71e SHA512 7036f64c0f26b3d993c1ffb64ccdf95a122ae93a9ef691f9903f90925b222b3aabaf379e951b5e9fc40726a1ed52ba54f3eededbc1e6b68385c99cf2c34d5ba5
-DIST encoding_rs_io-0.1.6.crate 16392 BLAKE2B cc3be4956c2bd26ae063757e815c9360f382a358ddec640361267b6abcd882129e924f59601e30eebf2b1e2e2025ece727de06ce11c8fb1907de35452705a8a5 SHA512 ef8e9d93ff5395c0a5dc0f777907632cd2d38cdef4d0b9d4ee0697701a1e4320221605ff699d6c66c0d80c582378ad7ca10a56c3914e8466192189a47c3cd9f9
 DIST encoding_rs_io-0.1.7.crate 16969 BLAKE2B 8d51835dc0882d0e0512f0a177f10da3a1c384f38cb4eb163f957cc134ef5b7aee65d951cf65c99cc80b087e0e92ca4dae431e3a8987fe6b86bbf0dd1bfa8ef8 SHA512 0c7d33616e96fcdf225599dbf469232d150fa4bef5809346c4003ff7fa0362a1cded8f3392fb5945f4950e2b2cd71b60c93025d73ecfdd2ba4fda5e03a16902c
-DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
 DIST fs_extra-1.1.0.crate 29292 BLAKE2B ea1b787484218733a2c107ff059f3e89357afc51c510da0f5f30e4c9289c722a7c810a0a08138673aa454445dfcb08caa986ac64165ac27476d9b709d819308f SHA512 c001a37a23a614f1752a45fbf392694911c8d06bb5af8b8a40f2dcba9c80c67ab634de0dd4fa951007072204b162430fed2c89bbb11ac2fca62dfa5cd4cbd46a
-DIST getrandom-0.1.7.crate 21488 BLAKE2B 70bc3a4a4b4c624f5df8dd73954de3b77feb897406b7907f88357f6b4aec919fa72560e219933e744f909f3408478dd93f59cb28d53f7d608b7b6edc3204ad90 SHA512 e38e82ef3d3613e69e2ac38c63a16e6a4f0a7d54f8b894c45e1c9cb2b1d4f8d9a7bbf087c3561d5482fe45ecd51f3d4b2fdc61638df2c380e3c9c3d8fcc03eb3
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
-DIST globset-0.4.5.crate 22830 BLAKE2B e4e1c4924577cc8ad14f3c76e49821b2f6050395e7673cdf4d118e7025e59e6df1be807762a484ee80739121b14bee8833c10b52ba69a13537ff9919f1bd2e3f SHA512 8fca9a19953370aa5d13b876a254f71ad6ecf0df218d8f5598ff2328eec9676be56b3a44d898dd031c8d4328bda939ee198f9b8dc7e03b45a1609b6f693a9088
-DIST grep-0.2.5.crate 7137 BLAKE2B acd9dbe588693a96da75dbd66fee019a5fb959a5bd16b8e5c25b75111b9168317fbfbd9ba6a157f4e12dda73c27b99260cbd4feaf7032b06ad974753c62fa586 SHA512 11bc94251db60666c5ab585b03df16ef15d064d85da57e03204311a8b346d91c172ac34b2f4b100bee6546f7672cacc5ceb3e8053099d3b287646b523882e584
-DIST grep-cli-0.1.4.crate 16923 BLAKE2B aec2c54ce1a6677d9afb22c2df85578bec6cb486b2e6173b539a4ba99eb423b42d79c7b8c2ef631c1e08bc4e5338afac88dcba7d1255aa7deee94f4cb03c4f3f SHA512 77d0898c51824604025663cfb2b7ac9731e48c73c791a70ac13c8365cc42be8a30316ec2bfb2121fb3907e1227c1497d852142022f7145fbc840a255826bb377
-DIST grep-matcher-0.1.4.crate 15569 BLAKE2B 31681aa4536e5d12d17b3eabd3da054f1597df659878c79d21f587b17590eb7049b2f20d74acdedc86257c68125cd32c670dff20fd72b466f5b51926b671aab7 SHA512 6bb8fa1914cd34e61340d86a0ca09556f117ff638264875800fe2516662b4e8560e8d68e79333a0c19b6bc48e8d453dfc36b901747348c633233ce4b026339e4
-DIST grep-pcre2-0.1.4.crate 7811 BLAKE2B 69c875087623e7631cfba1e28b19d7d382dd8903da07495b588570cc4aeff83248d107d0c5174907b28fc1ab730409406c06723283d7203a643f7f764e3a1258 SHA512 607453d7f5c80a4cc431c9ec8a14c647ddf96cd785158c2a554482b6f37964a8508a0e64300eab1bb2f789360bd92687b83fd6c757bd0cad7542bc0b49cfb678
-DIST grep-printer-0.1.4.crate 43337 BLAKE2B 94f17cf7b3e04b7cad4bee7a98fe5aabbbfcfcebf8e585f7e2f5e6cea0b5cfb93aac95418eb30f6c92074333d47ece9ff751fb33f509dde863d027f1b4ff7819 SHA512 611d825c0648620a13178beb6e3fe24fd1b592b233901cee009dc7b882237923a188501bf4ac9eb1fa276c665300389443e3f30574cb9bc81745cda7cd7005be
-DIST grep-regex-0.1.7.crate 29021 BLAKE2B 8359f4f42a1cc310ba1bd27fda671549d70a955ea4050039c791025460c2a303844f59b0243b689a8d85854a949a76604be4118c2312943c9aa59af7ad7948bf SHA512 6f0e0708aecfbad9da598cbd1deb1ffa455caaad13e540b14f127eb0bf8dbc5f085124f45701e8db753242d34e3b0d1a507e2abe7ae7981e1994c6f93c054774
-DIST grep-searcher-0.1.7.crate 44320 BLAKE2B 1876e0523c99c6ed7c85f3291af76063677af09e62d94fb414b18142732981631afe31052480183ad52bf7cc44cb14afc144099045f3efd3f13b4883b1977f55 SHA512 2c32ac1fca430b0ec740c6f60d92954af81f30349865a04affa83959ba2ed04285aac31c4ec1913a03913037469b49bfe2607c887315ac32390d2f293876cc33
 DIST hermit-abi-0.1.13.crate 9230 BLAKE2B 9591171d6f303a4a462d23edc2f8d493bdc23b6c2da4b464444718bfc89078e5a627e1543b7ab5be9d4e05f16c3508e55642360bb8d2cbd5edc2ce39b28d022e SHA512 ac424683ee3cfff9c63c735ac91008df722a2709d12744f009466574098433677266799e8ca817d3d3cad8f10f3c02e8081c67ff479701eabdc4543c0a79bd25
-DIST hermit-abi-0.1.9.crate 9032 BLAKE2B e9e314be938aa0cd1405b480ace091d8b0b33be559df3ba1323972f1de1b1b2b7a4b77140ad7273efd54a1066c162e5ea0f25b281dedd8e100cd83e1f6315b51 SHA512 6dee8ac600da02564f95762837c85f3f458b6167a930f9a214642aff3d8c6cedd8c862a0512a8bbcd170a325b55925c43c34e81cb59a21c58f9d3ca9a73c93c8
-DIST ignore-0.4.14.crate 51922 BLAKE2B d93eeaf945fa5165461979e2f54969b9e2ccf2f4986bbe465fba8a1f0f750ce66e82c1cc48d526e2115c8ed302daf37aa368503bd56d627ebdc9609a3136576d SHA512 eea97e9a80c9ae67b2f8e970e6d4362e8b2ed2067b6c94f8de51f851133db5e782fa0cedca835d342bc66af4ede3716a4ad97c9e0129bd5b78f8f6aacbfe23c6
-DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
 DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3
 DIST jemalloc-sys-0.3.2.crate 1344660 BLAKE2B c530eed197673dd515b41d504127c6c7abf75bb2dd0063b0a693be9502e3b5ae9db6d97dbf7fdd4bbab626ba1f788bf6b8e6804a476e109f22737bd2a79dcdff SHA512 b718dd98474d16fa5448bba62ac5e18a9e9798f31fce19dbeb4a12526c63e78f306454e0d9e2c6c5a3fd95660bfe82bb5fb09e4091cd8b43706eca2c4872b647
 DIST jemallocator-0.3.2.crate 16393 BLAKE2B 03c190b2f4c6cf01957a4e11d13a230dd55593e1845ae4179b60c62fa28eaed4dd27efb3113039ddab1e66a28c102d4d9c64169d0c10a1945bac162d2f613a79 SHA512 e3fd9d377d6465519e73a91d5639d47bfd6cdf5898d551c49e3efd3269d14a75bb9163980e13ff429e7dc637b8430cdfdb1f5d6ec52993fcf7b6247a69850ac6
-DIST lazy_static-1.3.0.crate 10616 BLAKE2B caa2af77f69c96b5f35dbb2aad7e73784544e6baa5e1fcc2272738fcd3d5f0576480c8169cdddc665a953eb9b6b7ddeb69e93cfa60401458afbe783fff82d1b1 SHA512 08288790139876765b6d4a5988f47fd2a4bfc77c2f2406ad44e64920a471b5655c7f54cb197e5a40c29ee8b42aecbbefaac2b6f4a7dd2b5e24dd92c46cb9b822
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.60.crate 409744 BLAKE2B 1d2dfb912a0a01d93ef10d57ee7d2259c0b82ec29b34a0f1c4065c6be080685f556407cee896bd74b01136a59d9c583258818118c81e9ecec5a6387569affe77 SHA512 649bb508f5e2800712618e76686c12dd3e7956ce2197d620b1b53427496296889f2743cf060e53400b33ea86982dff2c7d7c85b151fc1233895fb4c7f786b39c
-DIST libc-0.2.68.crate 468882 BLAKE2B c313ba0ed94de22abf2a764edaf1ca5dc4b86e98e004c3c23d53c7684996d68a4c5499fecd0afdabc4af3e1308e5e089a66cbac81d243f432ec1a9ca5b1856a2 SHA512 3f501182e814a2e4eef3a574bf5830a9ba633018164acdac115e7d8d809bc4308b08e657869206d4e5cc73d4ec4944ea98504b708201802b1b021f854a36159c
 DIST libc-0.2.71.crate 474209 BLAKE2B e380a6936248992b1b1f63ef0cc3d3de410d414bb19350a2327da3947ae0e8e700e82f0f4a802cc485e37571b3a6a68bd773f964496f572a721294623d135c1c SHA512 b6f6eebc42817107aa2f94d426154c2449a2558646414464a31ee9d9dcf714e641fe6613b95ecf9e751d77102c0cedb74b35ca1f76c6df2231a5bad168de5e16
 DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
 DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
-DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
 DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
 DIST memmap-0.7.0.crate 15214 BLAKE2B 44a5bde9b85b2c378fd4c6ebfaa322ef8d0076472d6c7322f7aa95b8aba3514fd5212b4429eb369d30d0327377e36c626de474ea5e1f764bd4fae595680a04f8 SHA512 3a7c7f963111c2afeaa0381aaa6a57f0f57600392693ee1807d54771bc058ea0f86ac6e8afbe858e45f9f17b685430bf256dba1126b8074ace3aafc07bc14bfa
-DIST num_cpus-1.10.1.crate 11151 BLAKE2B c1328d409d552c2323999a76ed5bed3382752c50091f68feae9b4cc56d28919a51672794122ba23d51a26e6241fe94d36a0a6c843e460ef9c36b734fe474fcc5 SHA512 f1f7408dc1cfe7c718928d8e3e219e3001ce4207467a0a129546f2729ba43a7bf334cd5d328a7f8f8b1c276382c8a0f9d7abf60a3ae2c32f4adafa96c6ea62cd
-DIST num_cpus-1.12.0.crate 11867 BLAKE2B 49ba476ebd14f2894dcd3e017921a865ceafe62ebf990a27874d264588f5e45fc8d6c3a3e82717e661434daca8b134faafeaf55f44e6ac447b81f162a9cbc695 SHA512 502cb7c7abdaaa42e849847313e6e12b34d9d619b58dccf7f3e80458b5b7778657f352828481daa21d482c247cfbf6d167f9ada8bbf0c3186b82d30a93a6e381
 DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
 DIST packed_simd-0.3.3.crate 97485 BLAKE2B 50d9c18099a75d8529ec8687d47b4b04dea280ae75967ad40fb778b39a2303ebc2b835de257072ba3fb6b339524a128f26df8d2106ef82e89d2655177065e7fd SHA512 f0198f5c589be082053ae156372ea826c66e31aad993f64af097faf36045f1d1b6cc4b4b46d9cc8a1c7a28e11f707026df6c419a42e2011b1c4a34f579018826
-DIST pcre2-0.2.1.crate 19394 BLAKE2B 49444b1cdae33b96bdb8bd40c94a7e57edfff0f733683ed7202d764df59952de4c3c70231caac87b6be63ad739dc615389486ee0ddfbe36c432dd3115a1fed1e SHA512 6e9a0d60c8bc633d4f19fbbb3934f86bd95e34dcfec8aad55dae5ebe4ed854dcb42ad265f4b0ed5c1a8683a032268bb38b2c3899d25428311cebf97789c62d0a
 DIST pcre2-0.2.3.crate 19605 BLAKE2B 6fcf5f37b5f37d77b5c3568392ac056c0dfc58e16c1d9cdf2f6cb6c2c712619d1ac75d89e1ae49086e9c0c7d9128140ae57cbe065ef0ae21b91e2aec1c2a7249 SHA512 6771b27b800e3eebc34ae5dda48ca8bf60d5c3fd46fb424a669341909491ef476427b23f0aec3ec606aa03ed9606e46daf76010a7b9e3ffe1a76faab3314e74f
 DIST pcre2-sys-0.2.2.crate 2184376 BLAKE2B 7247cfd843a74de8f2486d9e029afdf3eddfae6307983f14ab0d9c48ec487c3eeb710ae0485eab10b5ef200f8e3d8743ac9f151a5f8e07cdf3c67651e73fb1d9 SHA512 cae12d44a43c05b2303f230112f8cce349141a697a0ed7ab8b9acc1a812f8ae8db156dfdcf40eae3b51c143b31cbf842dddcb133eb7e0430ef78cf36906ff652
-DIST pkg-config-0.3.15.crate 14087 BLAKE2B 39ef9b5d573b8eaf15cfa779ecf877b7de785bf8adf9b3fa20e5bedebb958f950da7b69e69b0e135f46379ba370f51a2bb951d5959553f878ff6f5c4505d5e79 SHA512 645aed8e24ce99085e4f152eac511df50646f17705d57bd8566e70e17c18bd6b05001479c94b2425e45c67d4f84797784053a8299957a1492289853755a7867d
 DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
-DIST ppv-lite86-0.2.5.crate 20606 BLAKE2B aeded44b0a0fc59073d358b565c6241ce537a29967fe8f95eadc4cce420752e619023b0f813d1f157756dabc640351de61e7da9bd030c91a14b70d34e300a217 SHA512 281ea3479c4a8996aac643b707e75ca0a079681b1f182a074de0d9989ff9f1df6922cb8e4152af76025ebb4c2d00e6889aecc2a4f0fa66531eceb732aef62243
-DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
 DIST proc-macro2-1.0.17.crate 35654 BLAKE2B 8728993d92facb86d5884a5716f697447d636ba28a3ac84e1ac7971fbe53b7fd960a5516989882eecccde20abfc9f1915c523277333ae98323b7dbc198c0fee6 SHA512 de34066c8f07ad5edaf2a7fb9b0e0e2b4d31e110a2280dce9960b20871cd69c4510ad7669634e734b3d4f06447277b62de028aad826f5a94697261a8bec2a0a9
-DIST proc-macro2-1.0.9.crate 35576 BLAKE2B 16c687cfd21bc3b97113f32293c1e06ca5811df6c8f279e1c5661a501c230b430f1e8bc983a2ba30d097acd01df8701a5a90ed02a93feff83a1f6f33ffa1e8d6 SHA512 005d1d31ec62a25fcf3cb0e62063d5fb53a3b15fce8fa597ab09cac5ac404a7eb441ae44c2d3acc295e24e814a413d0664a3d142155495674c4713f489ec79dc
-DIST quote-0.6.13.crate 17475 BLAKE2B 985287f3e619c46b052e704c6da78565fe5d8e4f9a0d503aa0e8818f595fbef32a437d67228c35cd02d817ee3e19efc03e75239013a87a79553bb252f15c8ac5 SHA512 bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e
-DIST quote-1.0.3.crate 22939 BLAKE2B c50e47b647fe1ac1930544d20b2b78ad98e6398a32c98460701d93f93fa1437c6d12c632386ab9eb733cbe64cad57e02dd201686885d0a951cb013fc10a95a9c SHA512 b4867554b86d119251db67f9d0949bf8c3cd7c64f006c76531398ebb7478cb93805b9bcafe159d921ba1a32e92773853b56685cff0e1ebdc6aadaefd3b932ef3
 DIST quote-1.0.6.crate 24225 BLAKE2B e8706bf2e19b89855d5636704253d674fc9804e0d9713d1c1dccd5fe06af273f8604f80b6727f788de6416e62dde67a13abc2f3aa81cd5ea45eb0c73069ee300 SHA512 1febd6748602d4d96fbacb1f37bbc93c71d9fbeb9be7e9c6be2e871614048a1b2921c1ae702bd8db5d449308e7946ebff095689ef0bafe52af37c04936a8115e
-DIST rand-0.7.0.crate 104208 BLAKE2B 61e0f8ba3a3be58fd43df55feae3bd571a2c758e6e36f7ffcb42af1ced067338b6baf9b9d3b097c3d9037a440ca961aec87267fa5147e59c1e34f3a8210e2a95 SHA512 20c82ed8edf0bd203ac6f04f746b80abf5ad5716b307cd76fda399f26519ccc3b757f390058e7d8826508ed8a2b524c49ebad56a79fa77416b386f2b9a854352
-DIST rand_chacha-0.2.1.crate 11475 BLAKE2B 698f830845e24b85fe52b11e9a1c621dcdbe4232bc22f3dc0b1d2fcd4427045f302f74134d9b451fc5b4f9ac559fb2bc06f3d0eec5eddb6fd6cf3e6d3030855e SHA512 30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6
-DIST rand_core-0.5.0.crate 19736 BLAKE2B cd0b6212ef01e703510ff0131c9745bf5da4f55d96e321f943527a39e57c8403d1b37bc790f6a09addaa85947f0c431a3001ff14beebe67193c5628d4270f393 SHA512 e98f9b93cf5a80c40c11e7e8faee351ef567ae7cf9db1b7789a61eea41d6509e83684da00284e6e3d0f52af08ce2a834339e652f1fd39d818a2827f6236f5d6a
-DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
-DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
-DIST regex-1.2.0.crate 245604 BLAKE2B 68951a1e686a4e7c1ba059e8d4c68bc44f59cf824d416d9430ca226c9bd52de42568a4ba041733a6f508711a94bf6f17fcf052683c2744885c98ca1c672ec0da SHA512 ed4317e4b91b91b4807daa56d8070a5cba5f99ecbaa23b78b92438d19415f38dc1befb11e8b5ade63cd1b392fb83778350583cf531c374303c6f3405e6b4784d
-DIST regex-1.3.6.crate 235465 BLAKE2B 18c6fa529f82fc9ea874605bdfb8d0306a22c88bd74a2473f3cf71b8df46b63133a0a9d3f7401b53a85ceecb6f3eda1d5d37ce5982d7d8e8b6cfa1c6206cfc5a SHA512 05dbc0f355bd1f3ee659a8ff888b37242f780500b76d153a100c21c12278db2429ccdd47f8dc182c708dd70d47fcfd5acd6eefb397c03e08cbdff701f6346628
 DIST regex-1.3.9.crate 236683 BLAKE2B 29bd39b138a8168015bb7a6b36bb5f7f9918b7c00bca28a720f3dffd5b805d3374a6648a04792585e85922e099faf547e5d02aeb23008b7802424351633ea23a SHA512 425713d3eeb4132d4056e6c1a08bc2fa5032b9971987c531b5707a9b5670ae15f037bd68921f1545580801957d1ea283eff87e533477364c7f76823800202f74
-DIST regex-automata-0.1.8.crate 92234 BLAKE2B eb26c91f5c2ed5b08ff68d316a55a6a23e8b8392d74fd9de5850df38c39304aa3ccb1dca1271ea906602798b132ec49be0623c20f4f2cdb41ce699967dd8815a SHA512 41ad4ad05b0147e663f63e4bdab8281d3dc15f76663bb9eb3d9f6a230350b71e7f3f42bd18e6628a7cd971655a6b13aea2308d7f124bccca24d01ea9ed15d61a
 DIST regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f74fda72178068c3b5e599b466899692fba8ff3ce8cd30f1f978a944a0df98f466f3d4bd340bf595d6f7048ba6f648a8 SHA512 53323733dc2f8c47ec33b5b3aefacac3a0042cff80c59c3a05ee02b581671dd9a6ebf6b0b5eeddf9cd249662731cabf5a684553daeff440bf8d1d4d296afbeb0
-DIST regex-syntax-0.6.10.crate 276985 BLAKE2B 6cf614eff1c3db35fb60f206c927cbd8caf4ec4942089c9356414b0239f3fa060859cfcf48e18184ad8f3a0aeac71193ba0878f3179653fa626dcb3d40de5206 SHA512 30b5cc9887210c5594d57be7f05e25475b56732c9a0be02452aacf80b456f12450b63f4acbb67badb3ad16f22d244431f5bcf5ee30b9ce8f35dcdeddf3972175
-DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
 DIST regex-syntax-0.6.18.crate 294440 BLAKE2B 355d6a2704e1267064719927269facce1f1c8897566d41e54741183969cde5e56c38d0c0b610b99dea3635de20fa00ebfb8748ceea331af6984198d927a93b73 SHA512 9cd999837890a87d0cc6bc351029a422bd52e5c621763e5c11ae9dcf1ba5edebabcd9e6d70db0b1656072a6109d439101412b3aab0d6ad357ae02ee7039a010e
-DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
-DIST ripgrep-11.0.2.tar.gz 461565 BLAKE2B 5a9bcb423c470e99cd9e9299fcb9f2cb2f663ad1e3b406f1abc6671e68d876e8cda1866983d96fc498498e796c1f3af16838799741ce87b0d5b400e440ca741c SHA512 62b5bcceac2ca4899e797799e67a8e45730f1bcb5115b48e9ebfe12d3b0e43921020f368e4328b0f5060ccdf0dedb8935857ece7126e05d9cbcca535cee68a92
-DIST ripgrep-12.0.1.tar.gz 475088 BLAKE2B de1298e5961babcd0e902acecc7a1a16d816bdbd7ab0e28db1b98c2614cd9433bd6f7a3eaadacb3779864db43a1960d35d1b5a2dafd6798715522424fff011b3 SHA512 2f05a60585e522ac900103c31990032429c6652647efc022ee0ff401019a4dc75614b6e0ac0779736398fe067bc326b3ec97e166fb5a58d09765f9b145414b4b
 DIST ripgrep-12.1.1-x86_64-unknown-linux-musl.tar.gz 2211756 BLAKE2B 1c97a37e109f818bce8e974eb3a29eb8d1ca488e048caff658696211e8cad23728a767a2d6b97fed365d24f9545f1bc49a3e2687ab437eb4189993ad5fe30663 SHA512 814a6aa826f1183f40c5b74e66665b26e1377fe95d8b2cafceffa0b7ebf26ec89a515c74f5dbc2b9af441b2daacd239c7393047d8a75e944e42792ba451a77f9
 DIST ripgrep-12.1.1.tar.gz 480607 BLAKE2B f324a7966641843a95e7d4930507167844db2629e4b12e738df56d43edc68a707fdcc38eaa6f2445e3ddbafd13ec8888543866534b7a04724451e1457f589bba SHA512 9e2a16043be6c7727d49a44f6db7fdb41413efc869139186729985ff86dee5c6531c663352f4019b730eb3a6c46f26d46df3738d4a0cbbc39ab773f320eb9e59
-DIST ryu-1.0.0.crate 40170 BLAKE2B 5938a70fe991ac71974a38172acff9e559ec457aa12775ac53305742696a7ccf8f4619734b1d7b0e2db01b548ef2945aaebca605c186dd0b599f47dfb3fbf536 SHA512 b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0
-DIST ryu-1.0.3.crate 41983 BLAKE2B 32f2b9e8b7aacee3fb86acf405efc86b44c564b4da4310567a0e1b22d09fa51e5ed8278f6b2c38c220ba235de39c596b15db8958aa413ff822c0876ebed56515 SHA512 53ee61ef116594829849b417feb02d415305783b08d3e45656a467aaf272899e4ed46ac0415cefdf3102f61faa666f21f3237244b2711ad10b528a3773aa8414
 DIST ryu-1.0.4.crate 42039 BLAKE2B a1cd38c85ff105a0aea5e0cf09aa2be15d07e5344fb4a52b00bcbee6c6f966276aed1163b480b2acf669276368f04217eb7c0a6c279140f34bb54b1802e1ca06 SHA512 a1b28c07b32374757019f93eae30f82ae00682d5e9838f50864dd4ca898b8220b9bdb0f5df55d23d6bfc7386a3ac93697a18c82215f2e946e06c079962123703
-DIST same-file-1.0.5.crate 9861 BLAKE2B 3f65c5cfa1ba526157f838ce10695c56dc9241b044890629a3bd7f589f3049b04944d70ce10f371f6844343222954fbed5674c04eb6a7b934a3a6761fc897825 SHA512 33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
-DIST serde-1.0.105.crate 73358 BLAKE2B ef75efaa654a5980648e8418553af18508f95b29fa1441f0804c78d9f8fe91764a3565ee1138c96c9245c28ed2ed8082d08c50f8ff36b9d40b12456a758ee289 SHA512 e8b471769b696b0c7f3b673879dfd056279fb49dad0228bc2ec459a2aa8bd26073d40ac1809a42c0b5ab3e9abfd32252f812c6493d17979c10796e7ab78a795f
 DIST serde-1.0.110.crate 73947 BLAKE2B ceb9896bd205026825767951c6dd4c11aa5ce485ecded75eeae2f88627f4851c378c311d7ad8d06395f2ed976e342d31e11787ddf926dfeb0643ca0575b32ccf SHA512 508fc3195ba0deb75980a758a4392462068fdde9a87fe2f379ab9b28c573c5af45617b82e5fdd1e34cefa075888da7f533675b05d57757f0c0200b4fa5698863
-DIST serde-1.0.98.crate 72417 BLAKE2B f0a49162951fe9e69b02dcd1f24ddf37aee08e23128de15e4a4490f07bda9f1c56d9abe3b90422152989d4485e78ce9e0da2ac8800d401922fe4732640755845 SHA512 a949d803c7c66312f280483c532c705f8b3a2b4d058b717195ffc539ce9e92bff707a585cb9e2f52c16152107edab40ff8bc4cf825c06f6b73f1fa189cb9dba7
-DIST serde_derive-1.0.105.crate 49700 BLAKE2B bbbb3a54b7eb4ca87b667c75dab007745a1e163b90c793258aa9f78b9bacd067262e3443d27c4d941b6c4ae0ad217779a4fe5ff79aaa84bb30fbac06252c5289 SHA512 1a39820708a609b3941ce6ff669068f67d65d446e208c904ffc59808ff7bb1d82148357515056fd4856e10cfdb2cfffbd968dbfba870ed23fddf1076e3f6e543
 DIST serde_derive-1.0.110.crate 49751 BLAKE2B 14f3ffe6d6ce5aed13a800c2802459bca54546d3a77dd05c4c095f10ffabec8e66195cd69994b46162a96bd95fc5fb0d78a08864b7709a8f6c32643183cb90be SHA512 b02a831fced998388a39ad5e8ec12de5c7d09e18b69f15b112870d1e5976f74e0cfcd28a68dbcaef87c4be30001bd2cae076de234a59e8f39ea0be3014a395a5
-DIST serde_derive-1.0.98.crate 49046 BLAKE2B beff0012254085fcbe0a73dad9b8f9bb650270c1dc0900cea98e816650ac3f0e12931560a2a36de9a589cbff767ebb65c11a8746646899b3ac3328292b8530b5 SHA512 16313a0fade030fce860f02daffd47febfe3c470b5ecf3a8a53d88eae42b251fba56dab7caceb3560f562860957be4fc66ece06d176757c61b8497f5508a1ece
-DIST serde_json-1.0.40.crate 69695 BLAKE2B ad156577b557ffffac9a7f75e6e0f6f6b86c82e33db1e674fd00dffd6f9c33a13f838f062a4bb39ab9dfac63199717f96bbbd53e107ce8231aa88665fd7a2eda SHA512 d09bc95c963f510686106d9885f3420b9eabba8bf32626597dafd43ffbe91ea72ee4a3fedfca922794a727214d73929970acced8eccaa23616cde33dfde9f842
-DIST serde_json-1.0.50.crate 72229 BLAKE2B dcf9ea24386a103f5b5ccc3e9eb3f0c3a083cb46f795b2ffc2da1fcc1d965c56885a417a64c3ad15c58aa79225f4f89895b90b56048cb9e1ee22bac15c296e84 SHA512 e1ca850d059a357ea9de29fed42b3945701b2b130a6b40e708b926088501652c8426e272ff754534f972f68dbb8845583df7e0887de139304245aefecce7388d
 DIST serde_json-1.0.53.crate 73130 BLAKE2B 28f118648c77c8ada5a434416ec6b28615d8a9b677da7f34c8ba1104730087ac6d93e010a767199a98208ebe5dbde1203a47f28a2394a3ecb75b3d115a3b27b4 SHA512 8932a9f9f783b7124c7a41c9c3c0c1934c0e5b8b628fc9bab5ae0f78370231649f17de8015f9d6facf4ccd0305c68d8c648799e239bf32558c6be9bbe3819e22
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST syn-0.15.42.crate 185561 BLAKE2B 1c9bdd974393f020b6c56d78608349e52be836ca3a0f34f68a9c24107eafae02a32e998ceb5aa710be5f2b7101df71efba0bc9baaac36bc5c3ff156db5f879d4 SHA512 b2feecfb9d05e2d2a184d92ae78f873147e4950641dfc9300988d6974a85a63690c41bf22ecede2a2ac8e45ffe41b13011e5eaa82be5ce6037b40b9b247bd989
-DIST syn-1.0.17.crate 198158 BLAKE2B 7093cc8aab4ae2f435aa70a54c8c2b8e4f6928ea76186059942bf5c74e2ad25d73608f469cb0f1d97071a5dc2e3d048a155084bbc28647ca39032f06bcd5a3a3 SHA512 5acf5bafb32f780e08495e1e0782c170eae54baabd72c45a1d350aa41aa4ff2e5fa84b23d088fbb8522f430526e938c459087f89e3372690bde7bd0cb8c4750f
 DIST syn-1.0.27.crate 202231 BLAKE2B 8fe663765f40cfb611e6eae5d51744adfb22adeb43da799c000b9ba856117631428341ad352608334bd57ac18aad6076e4574591ce7aa7908af90637ee363dc9 SHA512 3a3f2f6e55edf003ce13dfa35c5d1a03d875335ddb3d0093fd20c86231a246a61655e6f74f751a9265a6be18af20e794522b7b83d303ee363b891ac9a89c72ae
-DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
-DIST termcolor-1.0.5.crate 14526 BLAKE2B c799a73787fdc764ce634731c5cb7232a4696a88797aedad8d2bce72d9d193b099ed80240a03259dccffc5ac2df8b4acc8b60f916dce6ddf63913e2cf0eaec84 SHA512 d729ef6da68be8e2ce19ef02336193d8baea97a28cc8789806587da829471222a0c7669b4485ef81b1d52e85096d787dcfd4f064c894904602b595aa024fcdca
 DIST termcolor-1.1.0.crate 17193 BLAKE2B c3a1a80269195f6bc92d141fce0885413c031980a4ad2f0f6e5a9051acfac10bad8a484362bfcaf3a60851a97d930e9602df4c00aec39431ea5a8a20d40a55c2 SHA512 41b05b047cbfdd5e3990eb36f635dc8ccf26a42bd5403d6d14a9f3c341e92b61c3b8d4d5f4fcd29071a97b3d96280ed59b4557b63a769390e2729fc82ab39702
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
 DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
-DIST ucd-util-0.1.5.crate 26284 BLAKE2B 229c82089b0b070a812df63122e1413d59662c24e02c81a4b4d2c6a71eadf7f09505ff47376f9aafab3abb47eea1c7d28be9eb9377338a63839a3285a0468cd0 SHA512 14de9b370a49fe6fcce871e223daa257ca5e50e3d8cdfa3c6800db89ec4a0e6bac55e2b73990768fbc2a13a16d77c8b59015c4c4fe413735e7c893ac3651f5b3
-DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
 DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
-DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
 DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
-DIST utf8-ranges-1.0.3.crate 8496 BLAKE2B 835ab4083ad965c8b17a1571a1629802b9f081a2c7a0fb1fdd55a2734b36c3e2397f7da708d8d8d81c10761a624d95acefb44d423ec7fee672da2c17ea1c015b SHA512 24907ad7ae1a02713e6ecc62e0c73488abea338f0dd3b49291b914ca907b3a220cb90f8ca409c6aa57d2e0e5d8ca8c44cd310081ffe7be9208952d73ec53b9f8
-DIST walkdir-2.2.9.crate 22423 BLAKE2B 7c5f1aa4a2078d4821a1fffc57751950295c99706b48198c70556461aa42b2535d93fd95804a6c5003ea906848accee510fe5bc6148c4155e6de074ba324da2a SHA512 43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b
 DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
-DIST winapi-0.3.7.crate 1075776 BLAKE2B 694cea6d0d14fbe85ba718c0ca7b9db79ba8f943b44f4741d77000617de43314a2c657285736a032c138b5d2095b06146a2ac8d84b8efe2307ef44bb7073c604 SHA512 6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134
 DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
-DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
-DIST winapi-util-0.1.3.crate 9913 BLAKE2B d310b3fbe45bf4a25971c4396f945119efbe8f5bd497f03ae04eaee7643d9d022af69c4d511ed6e89fd10bc56d4448b8b3a624491a67a87dcab4f156c31ab104 SHA512 55ed7996a8f63e2218e74e778e47450863b19170bf1f5375a36b094c5e34bb41b19f093157e40190e105a40cd1cd9bf90e95966fc3a7de71f6b74e272723a1b8
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
-EBUILD ripgrep-11.0.2.ebuild 2568 BLAKE2B 869b9ce5a3a053b87e2ac721e98364fa0244cd8f42f255ccefa91a3628d75d70064caecbe90401e4e6108f3acded31643f374d4c10f71e46e09e2d0dd3baa1c9 SHA512 2120f89f201965787bae5f545aec9fce473196fe5b81a382cb65772eee36f4e6facc73a4738fa3f9d6c2a4b2a8ecd9b9a02a8f8baa8f5a6966570e62222ace93
-EBUILD ripgrep-12.0.1.ebuild 2555 BLAKE2B 1d85acb5c43ebf76a790fec45e522ca3c43900ac9ce99ba17f7d577fedbd27fb995652f65d9e35262dd0377e6dba3fddfbbb7472c91daf87e3e71bbab2d90e61 SHA512 5b155013323f28a06a34948d1f2e687f09dc0ab455e2fa87c509b56e2a4e76a06cb26935272a00ab487aeac9bfc3377205484b04fd103f01cebbfa1279e73429
 EBUILD ripgrep-12.1.1.ebuild 2547 BLAKE2B 2f203154921a9852b6fdbba8c1f80298babeac2f35fef9afd7f771bc8ae3b8207926525ef48fbdc517dd3f516f41524f0549e6704abc5bef71aabfe246ab9800 SHA512 63fa804553bf1e8dbe861b3c5d392dca85ac66da8879f9497575f27d75e9f3d7ad5983f5c2ff45d94bc51b0506938a929c8a3fc57237c21bc45b37d999a174c6
-MISC metadata.xml 730 BLAKE2B 0355062074dfce2208602756187dad5d57f281271fb156c7cabceba38b3097b21b9ca46c713c7aac661249676de4e79fef92c9111c58e4dec70f0f9ae8618ee0 SHA512 683936fa04bc52eed49d0c8c64b15d22cc2583abff4d4549abd6b9156e33a0a80a5088802e5b321c40debd30ea70e1f93877f8caaedb164ae6c8a703fe961460
+MISC metadata.xml 610 BLAKE2B 73fe0df1821000783c6f7faf7750e8078c29f760e81a82c36f3a29da53c1aeb195af6eaf3ff347eb3116c6f625bd011e8567e5157ad72d9b9669d6da212d1a56 SHA512 3c30cdd2c10f26d840ab64c8c76e6cf1124a9b3222393b76713f9babf5a066669386268a2c7b727abc1bf1acdb51d509d9a17f657bd54a7cf2572cf2bdf8fbe2
diff --git a/sys-apps/ripgrep/metadata.xml b/sys-apps/ripgrep/metadata.xml
index e4eeb0a8f7c6..73f11257589b 100644
--- a/sys-apps/ripgrep/metadata.xml
+++ b/sys-apps/ripgrep/metadata.xml
@@ -9,11 +9,6 @@
 		Line-oriented search tool that recursively searches your current directory for a regex pattern while respecting your gitignore rules.
 		ripgrep is similar to other popular search tools like The Silver Searcher, ack and grep.
 	</longdescription>
-	<use>
-		<flag name="man" restrict="&gt;=sys-apps/ripgrep-0.10.0-r1">
-			Build and install man pages.
-		</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">BurntSushi/ripgrep</remote-id>
 	</upstream>
diff --git a/sys-apps/ripgrep/ripgrep-11.0.2.ebuild b/sys-apps/ripgrep/ripgrep-11.0.2.ebuild
deleted file mode 100644
index 641ce42111de..000000000000
--- a/sys-apps/ripgrep/ripgrep-11.0.2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.7.4
-atty-0.2.13
-base64-0.10.1
-bitflags-1.1.0
-bstr-0.2.6
-bytecount-0.5.1
-byteorder-1.3.2
-c2-chacha-0.2.2
-cc-1.0.38
-cfg-if-0.1.9
-clap-2.33.0
-crossbeam-channel-0.3.9
-crossbeam-utils-0.6.6
-encoding_rs-0.8.17
-encoding_rs_io-0.1.6
-fnv-1.0.6
-fs_extra-1.1.0
-getrandom-0.1.7
-glob-0.3.0
-itoa-0.4.4
-jemallocator-0.3.2
-jemalloc-sys-0.3.2
-lazy_static-1.3.0
-libc-0.2.60
-log-0.4.8
-memchr-2.2.1
-memmap-0.7.0
-num_cpus-1.10.1
-packed_simd-0.3.3
-pcre2-0.2.1
-pcre2-sys-0.2.2
-pkg-config-0.3.15
-ppv-lite86-0.2.5
-proc-macro2-0.4.30
-quote-0.6.13
-rand-0.7.0
-rand_chacha-0.2.1
-rand_core-0.5.0
-rand_hc-0.2.0
-redox_syscall-0.1.56
-regex-1.2.0
-regex-automata-0.1.8
-regex-syntax-0.6.10
-remove_dir_all-0.5.2
-ryu-1.0.0
-same-file-1.0.5
-serde-1.0.98
-serde_derive-1.0.98
-serde_json-1.0.40
-strsim-0.8.0
-syn-0.15.42
-tempfile-3.1.0
-termcolor-1.0.5
-textwrap-0.11.0
-thread_local-0.3.6
-ucd-util-0.1.5
-unicode-width-0.1.5
-unicode-xid-0.1.0
-utf8-ranges-1.0.3
-walkdir-2.2.9
-winapi-0.3.7
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.2
-winapi-x86_64-pc-windows-gnu-0.4.0
-wincolor-1.0.1
-"
-
-inherit cargo bash-completion-r1
-
-DESCRIPTION="a search tool that combines the usability of ag with the raw speed of grep"
-HOMEPAGE="https://github.com/BurntSushi/ripgrep"
-SRC_URI="https://github.com/BurntSushi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 BSD-2 Boost-1.0 || ( MIT Unlicense )"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 ~x86"
-IUSE="+man pcre"
-
-DEPEND=""
-
-RDEPEND="pcre? ( dev-libs/libpcre2 )"
-
-BDEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=virtual/rust-1.34
-	man? ( app-text/asciidoc )"
-
-QA_FLAGS_IGNORED="usr/bin/rg"
-
-src_compile() {
-	# allow building on musl with dynamic linking support
-	# https://github.com/BurntSushi/rust-pcre2/issues/7
-	use elibc_musl && export PCRE2_SYS_STATIC=0
-	cargo_src_compile $(usex pcre "--features pcre2" "")
-}
-
-src_install() {
-	cargo_src_install $(usex pcre "--features pcre2" "")
-
-	# hack to find/install generated files
-	# stamp file can be present in multiple dirs if we build additional features
-	# so grab fist match only
-	local BUILD_DIR="$(dirname $(find target/release -name ripgrep-stamp -print -quit))"
-
-	if use man ; then
-	    doman "${BUILD_DIR}"/rg.1
-	fi
-
-	newbashcomp "${BUILD_DIR}"/rg.bash rg
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins "${BUILD_DIR}"/rg.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins complete/_rg
-
-	dodoc CHANGELOG.md FAQ.md GUIDE.md README.md
-}
diff --git a/sys-apps/ripgrep/ripgrep-12.0.1.ebuild b/sys-apps/ripgrep/ripgrep-12.0.1.ebuild
deleted file mode 100644
index 0e8ed3224c7d..000000000000
--- a/sys-apps/ripgrep/ripgrep-12.0.1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.7.10
-atty-0.2.14
-autocfg-1.0.0
-base64-0.11.0
-bitflags-1.2.1
-bstr-0.2.12
-bytecount-0.6.0
-byteorder-1.3.4
-cc-1.0.50
-cfg-if-0.1.10
-clap-2.33.0
-crossbeam-channel-0.4.2
-crossbeam-utils-0.7.2
-encoding_rs-0.8.22
-encoding_rs_io-0.1.7
-fnv-1.0.6
-fs_extra-1.1.0
-glob-0.3.0
-globset-0.4.5
-grep-0.2.5
-grep-cli-0.1.4
-grep-matcher-0.1.4
-grep-pcre2-0.1.4
-grep-printer-0.1.4
-grep-regex-0.1.7
-grep-searcher-0.1.7
-hermit-abi-0.1.9
-ignore-0.4.14
-itoa-0.4.5
-jemalloc-sys-0.3.2
-jemallocator-0.3.2
-lazy_static-1.4.0
-libc-0.2.68
-log-0.4.8
-maybe-uninit-2.0.0
-memchr-2.3.3
-memmap-0.7.0
-num_cpus-1.12.0
-packed_simd-0.3.3
-pcre2-0.2.3
-pcre2-sys-0.2.2
-pkg-config-0.3.17
-proc-macro2-1.0.9
-quote-1.0.3
-regex-1.3.6
-regex-automata-0.1.9
-regex-syntax-0.6.17
-ryu-1.0.3
-same-file-1.0.6
-serde-1.0.105
-serde_derive-1.0.105
-serde_json-1.0.50
-strsim-0.8.0
-syn-1.0.17
-termcolor-1.1.0
-textwrap-0.11.0
-thread_local-1.0.1
-unicode-width-0.1.7
-unicode-xid-0.2.0
-walkdir-2.3.1
-winapi-0.3.8
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.3
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo bash-completion-r1
-
-DESCRIPTION="a search tool that combines the usability of ag with the raw speed of grep"
-HOMEPAGE="https://github.com/BurntSushi/ripgrep"
-SRC_URI="https://github.com/BurntSushi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 BSD-2 Boost-1.0 || ( MIT Unlicense )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="+man pcre"
-
-DEPEND=""
-
-RDEPEND="pcre? ( dev-libs/libpcre2 )"
-
-BDEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=virtual/rust-1.34
-	man? ( app-text/asciidoc )"
-
-QA_FLAGS_IGNORED="usr/bin/rg"
-
-src_compile() {
-	# allow building on musl with dynamic linking support
-	# https://github.com/BurntSushi/rust-pcre2/issues/7
-	use elibc_musl && export PCRE2_SYS_STATIC=0
-	cargo_src_compile $(usex pcre "--features pcre2" "")
-}
-
-src_install() {
-	cargo_src_install $(usex pcre "--features pcre2" "")
-
-	# hack to find/install generated files
-	# stamp file can be present in multiple dirs if we build additional features
-	# so grab fist match only
-	local BUILD_DIR="$(dirname $(find target/release -name ripgrep-stamp -print -quit))"
-
-	if use man ; then
-	    doman "${BUILD_DIR}"/rg.1
-	fi
-
-	newbashcomp "${BUILD_DIR}"/rg.bash rg
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins "${BUILD_DIR}"/rg.fish
-
-	insinto /usr/share/zsh/site-functions
-	doins complete/_rg
-
-	dodoc CHANGELOG.md FAQ.md GUIDE.md README.md
-}
diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 64064308d206..93a2a210a531 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -5,5 +5,5 @@ DIST s6-linux-init-1.0.3.1.tar.gz 48888 BLAKE2B 0633b66840396029686c32e132235274
 EBUILD s6-linux-init-0.3.1.1.ebuild 1472 BLAKE2B b2d10b719f4668df01bbf241390d6203cf489786e0129e4076336a5a5ef6e44de370749313e06e008984ea78b0f07014d68288fb33912902bee21f2bfb59c887 SHA512 57607c57abc5adb22a22c1aa3d24545d591d83c9a7bfb87931a394229fd4ace887b5a5e859983c5b30fb6d08d151bc76f6cc88b69d31154d218b258221aebb89
 EBUILD s6-linux-init-0.4.0.0.ebuild 1472 BLAKE2B b68c06f32c2f3482ba1f4bb38e70bc0fcde3d8523d74c77867811231e1126e26a042bffc3aa7b6a98e1d39fbf3d37f4a39f604e02e397d085a43e85a795ad58f SHA512 2cdfdb084ab008bd5ae29b63eaca26be3e8d6e40520e2d6c266f4072cf98709872ef0d79bf39d22a62a144c50c413e95eea6016ec3999286b7db75ea1d50a0a9
 EBUILD s6-linux-init-1.0.2.0.ebuild 1670 BLAKE2B 8232e58ef6708936d98b6b3ed12ca25155174c7307cf7dd5cdd245625a89d74f2361ee2cbba1f5811f509c1fe2591343f6625bf51b3b481ade8fb9f86fd777d9 SHA512 ffef1f4e994d727ec80bb23fe2f2fb42b2950010753d83ba459071984c8880f5085bb083c623f39289a93604231014d9d8a02cf0faeae923477915e0f5fe513c
-EBUILD s6-linux-init-1.0.3.1.ebuild 1670 BLAKE2B 44ebba5c2c178321335dd0d9ace64c3b9c0afb759058f5e4dd753e6f70e4a3e973aa6598d4165588b7a188b7c7316cea76993a44f2f6daa38efab3d928a2815f SHA512 448bc4a1680f3c01dec7c8841d38e5f70c7deeb3f8640e11100b66604fc9b1e38541cd9355f1e270498d68e66052341db038e2bb80d66169a46aa08c278cff43
+EBUILD s6-linux-init-1.0.3.1.ebuild 1675 BLAKE2B b2ba090a18a25b3469153fb2f480d81529baf33ae7e002e595a89f3f303b532ed68cf3d7371c501f0d98cb871e8adf7ac6d6f0aa838f0bde4f6f1c1d97bca64c SHA512 ff438cdc3b7393689f8e1088a10323eb372813adbe5f5f1b3317139cf42b10d7ef7b688a214aa63438dd179bcea043694cb966b2b989a1e0314697131318f49b
 MISC metadata.xml 496 BLAKE2B e80d42ffadfc225ac5c6e6bc7470e136057a25c73effd1e0510740631bebec02a5df7b405977aa6be9a9a23cf2af7d5c03c74ca2882164e2394585f01dd6498f SHA512 98e0969469c67f17e91add2fdc82ecc31316e93a597e748119ce44340b81efca9548f3845f8abe9888855d711e2e573e5c8f97ee566ec0ded81a033e410a1d83
diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.3.1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.3.1.ebuild
index e8370a330209..c68f5e1a426b 100644
--- a/sys-apps/s6-linux-init/s6-linux-init-1.0.3.1.ebuild
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="static static-libs +sysv-utils"
 
 REQUIRED_USE="static? ( static-libs )"
diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index 5cacbfea53c7..372a7b1c20e7 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -5,5 +5,5 @@ DIST s6-linux-utils-2.5.1.1.tar.gz 35513 BLAKE2B 7b5e613b3ec7a8104cd53ce2a6db921
 EBUILD s6-linux-utils-2.4.0.2.ebuild 1149 BLAKE2B 9bde0a49a4d14c1be0642e590f568a0ab15c7a29f51480779f96ff25799494f73e268d6ca9e8ccbd82c3259b6df1dba770d29f94459b9c4d2fe97b1eba27eab1 SHA512 bfd9bba07e7071baa00df31f5980952f6312b370d4f9762650afb1dfce909f8d6d50029bd7d7d78f2cafafc8ac7e3162bdc31c68b13d610394730be35ebc429a
 EBUILD s6-linux-utils-2.5.0.0.ebuild 1111 BLAKE2B 929e7af3a4579360a9eae8292c1e8ea840b7d347f3c350b44e5699674bbc7e0c86ac4d7e5a8bb68e2232882cea8e93f94e104b0875b339d22946575d3a0c3b5b SHA512 cff3803a8525bd6760d8c1a3fec8aedb945b68a70228d30cd235a5bdb914d436979759cdba79c12606d58e29319754968510e4f1e8167421139810b9d32e1f09
 EBUILD s6-linux-utils-2.5.0.1.ebuild 1001 BLAKE2B 6e51048a2b8a083a9c6ecba5e7a8b468b6658c5d131aa502f5e8c608afef6a6a925df26598ea25fdf81944dc907a45141c28ba75f1feed0db8f5027da2f289fd SHA512 7d153190ebd07dd9a6e907cc96a748e24edbd8e75d5eacde8153bb5d4acee5d4ac3d048f93c92bed51ca77a6db0bd9f6dee634c9c9edf90baad7fa3fba5f4c69
-EBUILD s6-linux-utils-2.5.1.1.ebuild 1001 BLAKE2B 8edd153ce678780a00bd117f705a87fa4cedab230abeb264849c070371e58d7d3fa1994e80081c8d92910f9b01fa48f1ed29d8e4f4e51742aa488c6d11d4b74e SHA512 ac74fa279c62cc0befb15560d2bf104eea0a8881cc3aa60874b830466eafa295bd1b683cda01b338e2475201f158d8666217ffd67cc237c1889503ce498d2774
+EBUILD s6-linux-utils-2.5.1.1.ebuild 1006 BLAKE2B 9cf302ee56e750aecc9c11b1b5bc0a8c47ea3f1fa5b97c7c2ded615f5eea59bd2793aebca3f58cee10a5cf16fbc5d8a507cce344c9cc32e71980d2d38d0cd020 SHA512 11ce68e1a66e0b13d47c0403c428c0885813ed2004ec3bd7d0520069caed21888106f8b52a826daf2e3253775b67e359320f31fb284b90db4b26a0f93ec07363
 MISC metadata.xml 358 BLAKE2B 72f9eca473cb01fe5918501748cad79671e3f9a5dfe84632534be79e40a1ba8d4d41c3ce150e72535922b3725aeb991f89154604f444acbbb245dd473f0f6126 SHA512 11cc54c20904ab322f16937d31731adba9bc8bd15a17ea37b85bddeeadd9a122b0c81602d1b156a1cc8f1c2f98f094f889111a45c950c0d4e3502452b47b0406
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.1.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.1.ebuild
index 0b6a0b68b301..68fbddbb8813 100644
--- a/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.1.ebuild
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.5.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="static"
 
 RDEPEND="!static? ( >=dev-libs/skalibs-2.9.1.0:= )"
diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest
index e10c9c556cba..5f6e138e85a3 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -5,5 +5,5 @@ DIST s6-portable-utils-2.2.2.1.tar.gz 47874 BLAKE2B e1a9677c304d256f8a890da9c357
 EBUILD s6-portable-utils-2.2.1.1.ebuild 1165 BLAKE2B 2606b82a595387a09d74f1295ca6bf89428f339f55827290cdbaa185adb62982247fc61346adc75025c0d0312d0292c7364105cc787b550e52bac09dc4e9db1d SHA512 e29fc657d3088c4d160a0526ed09d6377d777ee3b9c4c5ff23db7eeb174e0ed52f14f08d7a02e3a72249391d0c91f038e1d348763071ed100a200b4611ccc5f3
 EBUILD s6-portable-utils-2.2.1.2.ebuild 1127 BLAKE2B 2b392e393616de97b9cceb711a5e9af725f580a66d9c945513f95724735b46c3ab83287b836b4915813b344cc66fe459ca50d1b7979792132fd1b8afc80ff9cd SHA512 456b6f9cbcccef87307f1fec2ec2302acccca5d362b81e56b1dbab1d32488391275959c9bfac9cb1e7b997c8e6fb1e8d8403cc63b55ab65fba78ea60ae88b260
 EBUILD s6-portable-utils-2.2.1.3.ebuild 1012 BLAKE2B 9f4d5751b9dd487f2ff35452fec88f33e54ecc9712dc9ed8cde0185620c06bb8ee99ab982ca141ddb52494c86880a1a6176a8637dc1851cd276ba2f90531f453 SHA512 9d4700fc09c15238d0a8d6662ce0538268fd9d6471400d4e1c595a9221f59bd8871a76325af162f2607a365938f9690985307ef38ef7160fa9da732ac047322a
-EBUILD s6-portable-utils-2.2.2.1.ebuild 1012 BLAKE2B 56f98bdec67327b48cb116f3ff1277032a9104b619ea9987094dd252f07589932e30418f7beab8d73cfef5fe59da8331b94b6eea10c304dda53ac13874cf4651 SHA512 efea2a361175ca896ff3ba4653149d43c703c8aa9481c817ecb4497b558cc6df8800cac5bc19b6dbf4d0c94b4f3519898b864bcf53ef36b588cf6dccecaaaa58
+EBUILD s6-portable-utils-2.2.2.1.ebuild 1017 BLAKE2B c8bf282a83274cd985fbcd41b530fa42d619a4021602a438d4b08daa23bc840cd8054b720a66cca29254e65cadd768925a2e187ddd14e5ac16a83403ff411d2b SHA512 3708099d6318515bc2746b738ed3dbbc8314ba58a7f81e5548f3bffc8cce18c16b6933199a6b64cc6c8fdf0de740a5aeefa924a864e4b8018d93d7ed4fdf38d9
 MISC metadata.xml 358 BLAKE2B 72f9eca473cb01fe5918501748cad79671e3f9a5dfe84632534be79e40a1ba8d4d41c3ce150e72535922b3725aeb991f89154604f444acbbb245dd473f0f6126 SHA512 11cc54c20904ab322f16937d31731adba9bc8bd15a17ea37b85bddeeadd9a122b0c81602d1b156a1cc8f1c2f98f094f889111a45c950c0d4e3502452b47b0406
diff --git a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.2.1.ebuild b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.2.1.ebuild
index e414a001fc50..445d1805af88 100644
--- a/sys-apps/s6-portable-utils/s6-portable-utils-2.2.2.1.ebuild
+++ b/sys-apps/s6-portable-utils/s6-portable-utils-2.2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="static"
 
 RDEPEND="!static? ( >=dev-libs/skalibs-2.9.1.0:= )"
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index e1d2ee6d349c..723b38afdfc8 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -9,5 +9,5 @@ EBUILD s6-rc-0.4.0.0.ebuild 1866 BLAKE2B bdb83058265bfbeca41faf995b796c042f7b4f2
 EBUILD s6-rc-0.4.0.1.ebuild 1866 BLAKE2B 85c17232f071f38901f70e762f74ef89dda79d75f506b99321467f408978d23bc1bd568911357c2e5a76da03681e62ab62e58f5df95df961caac4b4d10a448f3 SHA512 30168528ecf7f8ab574c981f57fddc37d8b10b0f7985e789ecf3baa1f6f63575018aa7bf468f1439804db32f1b608b727c8d1bc7a79ef105c1abb5a3beb13035
 EBUILD s6-rc-0.4.1.0.ebuild 1671 BLAKE2B 610a7c4282a400632a26529f9d426e371c2b7c846ab06d021839797131ec3555084783e697d1247fb40494ea753d0f5ab71da60ae3a629baabe9a1e87583ca9e SHA512 f6a038ad6168aa2338ec492befe8fe8eb6d566bc9c46e87099f472b04d62b68d91527176b4aad3f4658ad9705d17855f693fb1a0101061b0bb9e8326872cd8db
 EBUILD s6-rc-0.5.0.0.ebuild 1491 BLAKE2B cab89c66165305a92494a0bbd1dda32d7a10b1559e9cd4b9c7e869733422833b11b872383d4311dd444e993e0650a071ae87dbbbe60ff8ff5f6a5e501aa16e21 SHA512 f47f93080b5d3bf1ab8001b20d45cea34bc4b0fa86d34dcb27b07f63fc49bccdb3fd69af649a7419e52d4e381aebb39a640cb3f56767f68044aca8b12fe0a2e2
-EBUILD s6-rc-0.5.1.1.ebuild 1491 BLAKE2B 165a756e77a0df7585de298f715c6aa57112f025fce0daacdad0ce348bd297010d21e27488c81c0acb719d1723acb6417d7a15801f3d912947d6d6bf8288e183 SHA512 d6a433d0be0d444e01cdffb82b269369423e1046fa088608df19d1dae26078b2149dcaf7b504b860f535fe4f1f95f633dc693c79ad85190e0a3e7cb852c156ce
+EBUILD s6-rc-0.5.1.1.ebuild 1496 BLAKE2B 55776ae5839593d33b77504e5f78bceac60c007647dee1124532360173cbaf23220c8071012b5da755bca90752226f6ae2c32449104cf7c9c45ebfd8eafbcf41 SHA512 d1fcc1adcfb715d48cbb79db91d6b76114d7e150a4fc5e5e1d80ae64ef4c329f5b25da60590925daaf730393b791fc7081ae8e8037c525d71fae55ac7193caa8
 MISC metadata.xml 358 BLAKE2B 72f9eca473cb01fe5918501748cad79671e3f9a5dfe84632534be79e40a1ba8d4d41c3ce150e72535922b3725aeb991f89154604f444acbbb245dd473f0f6126 SHA512 11cc54c20904ab322f16937d31731adba9bc8bd15a17ea37b85bddeeadd9a122b0c81602d1b156a1cc8f1c2f98f094f889111a45c950c0d4e3502452b47b0406
diff --git a/sys-apps/s6-rc/s6-rc-0.5.1.1.ebuild b/sys-apps/s6-rc/s6-rc-0.5.1.1.ebuild
index bef467c011f0..80578304da7f 100644
--- a/sys-apps/s6-rc/s6-rc-0.5.1.1.ebuild
+++ b/sys-apps/s6-rc/s6-rc-0.5.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="static static-libs"
 
 REQUIRED_USE="static? ( static-libs )"
diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest
index 20757ac0eeeb..d1cb5888ba33 100644
--- a/sys-apps/sg3_utils/Manifest
+++ b/sys-apps/sg3_utils/Manifest
@@ -4,6 +4,6 @@ DIST sg3_utils-1.42.tgz 1219231 BLAKE2B dd9ea2c324cb6f4c0ce770c90b7980da5e998bdd
 DIST sg3_utils-1.44.tar.xz 922152 BLAKE2B 8596ef78fbb7ade5a969f485b0f4ff63863dc8a5ff58fe630cffa91900ba9946b47ddf857346aa3904da8502afa4928f54baf99428344d2e561a90e52c8533ed SHA512 4f4d5536ebed62f2c81c55741043d9ac3f4610a4dd6ef2e3125f041afd57aae03a32c2affe84a960c9f61fb6f84784bc901c756a8c36c1bc97082fa61e73ae8d
 DIST sg3_utils-1.45.tar.xz 989864 BLAKE2B 2d0a9e0edf514c8c7a566798f8087fc27d15d31cc8df39073dd97cff569da396b24236e0c231781625379b2ecefe7c99716d5d9c7dc104b15e150cb4e3c43e75 SHA512 fa25dedc447154d33937248a856af9a7ef380dda282a681d465a57d7dfc24b6c0409fa06aabf8cc28ba191e91db80fed0757b45212eddf713855574b48a97868
 EBUILD sg3_utils-1.42.ebuild 1033 BLAKE2B 244e7b5a07f24593fcfef020ffad820926be28547fdc5d0067b65add39cc892db96e4c8d3ef473cccf8a2a031d9e2f88a9a44b49aefa879f5c36985a2e76f6ed SHA512 e43306e506e102d42ba7d675a537667e10b90d1399671226f7ddc905c02ec571022c0a4956940a246f330a3f8d4b19b1d840071954bb775b67b8072376e8bece
-EBUILD sg3_utils-1.44.ebuild 1045 BLAKE2B ac44106a8406085b68c2a4cb972a8a65f9d70fe47a8dc5d52377ecf291f877ab3fa3233eed1cb8ad5591bd34479f954e659e5926604056aaded8329e85a9f464 SHA512 a9eb796dc1063ee9c883b847a198f26cda04c4bd2602a96d1b09b8e47b5f6608b257bd3fbeb81012920f234bcd1d1525f5e4c48b24e6c5deb7069135656ce0dc
+EBUILD sg3_utils-1.44.ebuild 1044 BLAKE2B f53df138561b8a6957745cdf71eb1f839402bcb5600ad9a67d538440024c6268d4859d1c70a5e1e20bfc8ad9261c853534305cc953cd9e65f9a5b3ca2fc3f803 SHA512 57fba1bea05d3c0731fd8bfebfc0db6c620f1efcb12bcd81678df7388d6c4a4ba985c10d5d5d2a888b9c7ee094398af8944d69e7e780e8afbc6ca89c62c09cd9
 EBUILD sg3_utils-1.45-r1.ebuild 1067 BLAKE2B 22eefc8e13dca6c86abdc10c160b833c16c53cbd423e95597becd131a05aa24897d1c1185482a3c4cf47b96f707d3ca412c10df4750647b8230f380eb3d852c5 SHA512 1c7391ab95673a97bf8c24f13dfe27de724fbecb4208cc5c9bd6121114811a35d51a19124d78dfcaab11cb30a3d485de9c6d31f85a55fe05997b2d567a39f916
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/sg3_utils/sg3_utils-1.44.ebuild b/sys-apps/sg3_utils/sg3_utils-1.44.ebuild
index dcf3452fa05f..e6db1e1866e2 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.44.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.44.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://sg.danny.cz/sg/p/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="static-libs"
 
 DEPEND="sys-devel/libtool"
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index ad1cf516dc8f..80179a30a322 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -7,6 +7,6 @@ AUX shadow-4.1.3-dots-in-usernames.patch 302 BLAKE2B a83f463be9267c3a704997b98d6
 AUX shadow-4.8-revert-bin-merge.patch 305 BLAKE2B 2fb6407ed60251b3367931c2c7eb9b2bdaaff565ff5338fb6ffddc9b618963e7835925c07fea0cbaeeee90a03b7e0c571f0e1b9e1844fe9397f4e74672edb080 SHA512 bd821f6af288ac4a3cf9b0de30753626db90d187ece7d53ee7e0d6b7c61dbfecda84bd9ae60958120cc8ddce48055878c9daaa668dd88392bb70b73c7ad4fb01
 DIST shadow-4.8.1.tar.xz 1611196 BLAKE2B 952707cdd55dc6c00dcbc60dbc3bf84ac618dbe916b36d993802b3ce42594de332a9bc22933a28881af3d317a340eab017ada55511b4e4fbc3ca6b422c4bc254 SHA512 780a983483d847ed3c91c82064a0fa902b6f4185225978241bc3bc03fcc3aa143975b46aee43151c6ba43efcfdb1819516b76ba7ad3d1d3c34fcc38ea42e917b
 DIST shadow-4.8.tar.xz 1609060 BLAKE2B 9d0b515e40f45c0baf420ef7ffaf5b6dd7989b26c93fc6dd610876263ac22e61fbc2821649d347c28055ae84f64cd5ab5c2435450c55339c80b4ae5062ccc44f SHA512 1c607aec541400fc179d6cbbac7511289c618ab2ce6ee9d7c18a8bfda00421c62d4b9e58aff52b5f82d485468e7db955c186ea0faad9a08003ffc01bdf2ccece
-EBUILD shadow-4.8-r4.ebuild 5919 BLAKE2B 5441c3c87cad36d5d699dc9550773a0dbada6f7d9611e5f5c4257dbe7ce4bbdc9897462f83fa716697e29d9b41b4a0a9013150e1345c8a977df54513d0c6d3a6 SHA512 60213de331d25a1e3460c2f3534185949be43c88dacfce11c3e90f7e56c54eae42f63ddbea24ceef155511593edc1f6e6abd719701ac675b4482c7244817240d
-EBUILD shadow-4.8.1-r2.ebuild 5905 BLAKE2B cea5476aaf7a100ca61170bcae7c051c6b53ef4ff0e076ade433a391710e4724575c28ca9984fa6e9c81511c36e62894cf42de27c3570567d518b137e780eb07 SHA512 91dbacdb37c7ab338a3e6d570cf0c19b2e04e80a89afc9f0773141cabdacc6cad9d4c11432b7d72ef0c41efd4a216a6026c5dd1b4b5baaf30d236a3509879c7e
+EBUILD shadow-4.8-r5.ebuild 5944 BLAKE2B 8d9a693741a2ef27ff6f0d0e5e953a0d79ee53a700955437513189cc245c668ee6f9e899e843792261c303b5723b5267cac9fb64e58797f27badfe8af21b2910 SHA512 4a730bbd30f5c279ec264ea17ea251ddf21afb2e8389b891d9df69eea39de32ee1698569744b553b24320ac0f67fc57ea7f67700859f170b59f0975a71addc93
+EBUILD shadow-4.8.1-r3.ebuild 5930 BLAKE2B d276959cc82554d053f44de668d2f8b940ae6b75fdc8ba6a067dd96f3d7f0b4150b802c07d11d4fa3bc4de5c3c2fc49a11fc8400dff62923f16a2576336045ad SHA512 328a6fcc140248693f7e5ff2051618442da79572bab18b4a6b2a086c560ce48ab173cdac8300544f89a0450488a7c22577f22de1bc5892b5201ace2d6404676f
 MISC metadata.xml 562 BLAKE2B 7ea54e53f53a91898e5cb5975e9f1aa37639b0ca887213e389c85e0b46cc2dcdf6a1a80795ecd3a74ecc1c4b76d600af563b8d26ce618de1030914ae04f4b152 SHA512 35e207e3d5e3de3f93c8c4a580ec7109bbb778d2d424eef76c5c6b25f8b47d68480a55e9d2b15f9be4f27a273443d6220752337eb538dc05517c0c5a004722e7
diff --git a/sys-apps/shadow/shadow-4.8-r4.ebuild b/sys-apps/shadow/shadow-4.8-r5.ebuild
index 9fe70f6c898a..b04fd057bc5e 100644
--- a/sys-apps/shadow/shadow-4.8-r4.ebuild
+++ b/sys-apps/shadow/shadow-4.8-r5.ebuild
@@ -12,10 +12,12 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="acl audit bcrypt +cracklib nls pam selinux skey split-usr +su xattr"
+IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr +su xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
 
+REQUIRED_USE="?? ( cracklib pam )"
+
 BDEPEND="
 	app-arch/xz-utils
 	sys-devel/gettext
@@ -141,7 +143,7 @@ src_install() {
 	if ! use pam ; then
 		set_login_opt MAIL_CHECK_ENAB no
 		set_login_opt SU_WHEEL_ONLY yes
-		set_login_opt CRACKLIB_DICTPATH /usr/$(get_libdir)/cracklib_dict
+		set_login_opt CRACKLIB_DICTPATH /usr/lib/cracklib_dict
 		set_login_opt LOGIN_RETRIES 3
 		set_login_opt ENCRYPT_METHOD SHA512
 		set_login_opt CONSOLE
diff --git a/sys-apps/shadow/shadow-4.8.1-r2.ebuild b/sys-apps/shadow/shadow-4.8.1-r3.ebuild
index 956699aaf996..019710fb27cd 100644
--- a/sys-apps/shadow/shadow-4.8.1-r2.ebuild
+++ b/sys-apps/shadow/shadow-4.8.1-r3.ebuild
@@ -12,10 +12,12 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar
 LICENSE="BSD GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="acl audit bcrypt +cracklib nls pam selinux skey split-usr +su xattr"
+IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr +su xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
 
+REQUIRED_USE="?? ( cracklib pam )"
+
 BDEPEND="
 	app-arch/xz-utils
 	sys-devel/gettext
@@ -141,7 +143,7 @@ src_install() {
 	if ! use pam ; then
 		set_login_opt MAIL_CHECK_ENAB no
 		set_login_opt SU_WHEEL_ONLY yes
-		set_login_opt CRACKLIB_DICTPATH /usr/$(get_libdir)/cracklib_dict
+		set_login_opt CRACKLIB_DICTPATH /usr/lib/cracklib_dict
 		set_login_opt LOGIN_RETRIES 3
 		set_login_opt ENCRYPT_METHOD SHA512
 		set_login_opt CONSOLE
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index 1e8e300131f7..8f266eb92b5b 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -3,7 +3,7 @@ AUX smartd.confd 107 BLAKE2B fe687733a13f7a9c32aee16a759feef798fe7db158783497c6c
 AUX smartmontools-update-drivedb 42 BLAKE2B d3a501dc6a3855bd665a16ce0f105269754a29450201f312369acdbf429c8e0c7c4162de8854ca945b2082cb734dbbbb1326df39e4fb1adf271f215329bd2105 SHA512 8ad70fc85ab67b7c32eda95dd37517382c2447862df08b810a54dcdedb1eb8148f3a0e29f402a54adff31d1e88d80d09a258ed9e1e13b597ab2a358ebeda0ce8
 DIST smartmontools-7.0.tar.gz 944925 BLAKE2B 41b3894efa05471bf358fca4ba87a765e3a54df68c9a617804a9e0853752c57b68fdbaa9d55fa1462a8fa7de1d6cb5630c66929dfe521be38b180944cb80acc9 SHA512 96e18a201182579f699d541539ce393e7bc2191e027cfdf7f87455a63da3a14451574f8fe391232047ac941ace453a017193d0a4987a4edb8f7ed9d5007f0512
 DIST smartmontools-7.1.tar.gz 971468 BLAKE2B de3e1b10997903cb9bf6107f1bd1be9587b66af08a94e368dc9ed3aa6d69ba93d6b41d1ba60076275603702d9d0b47b26e376d3c9f020eb18fde5af4b686485b SHA512 440b2a957da10d240a8ef0008bd3358b83adb9eaca0f8d3e049b25d56a139c61dcd0bb4b27898faef6f189a27e159bdca3331e52e445c0eebf35e5d930f9e295
-EBUILD smartmontools-7.0-r1.ebuild 4047 BLAKE2B 499dc7d4be6557972e6d044c0c415be92f01700f77342aaada838c17a9d1eb76deccf32bdf02b167055a7e050b6606426fc9c96dc63bbb5e30a04f7384c69607 SHA512 c0297cee77d43c07b2dc79f2f30f7a9497c84e6b4e5cf095dde46d4b1e8fad1af49465fe80be6378efa5b9e85fbcb6d44eac99159a3655bd8426d945e12235e7
-EBUILD smartmontools-7.1.ebuild 4054 BLAKE2B a78d722564e51cc81c9eedeabd98ab7f8394e44ed8717552dfd17e07302bc9987c92491c335164d1adc0a62e26fe105870f6f2838a1cb9f2f7a3b0a3eaed972e SHA512 63c2600e615e4cc178ea1533dd16e0b38ab2650f31688c1ab23cd8ba61b9e37caf969098476a9f314c72dd23b0cb14f57b732bdbba98236650e748c3da556f4b
-EBUILD smartmontools-9999.ebuild 4054 BLAKE2B a78d722564e51cc81c9eedeabd98ab7f8394e44ed8717552dfd17e07302bc9987c92491c335164d1adc0a62e26fe105870f6f2838a1cb9f2f7a3b0a3eaed972e SHA512 63c2600e615e4cc178ea1533dd16e0b38ab2650f31688c1ab23cd8ba61b9e37caf969098476a9f314c72dd23b0cb14f57b732bdbba98236650e748c3da556f4b
+EBUILD smartmontools-7.0-r1.ebuild 4043 BLAKE2B aa6843fd2cd9786c924dea796f049d0a42f48ce729edc0943ec14e8423324b9e4e47c1bc7466eabb1229b4549986d5095eb9bd86e8c312abb759413205941ac5 SHA512 832a7a4c357a1cf035692bc86f5f4ddf16b86f4c218fa02edc49aa2c62020c7a2709329e81ccdd67dc84c430d286a5a53c02ced25bc021864fec806cb0f83718
+EBUILD smartmontools-7.1.ebuild 4046 BLAKE2B 84e3a6679bfcbd5137b5cf237a4dd7f37177226dab84471dd23447e8c936d7811c5e255dda4666d3a0a803598ca1d46f6fde0ed224fbf5374e1216964a53a6db SHA512 93c8f1774da3305de557886d333b3cb6f9bcf9d8944524f767909540e0b034a7c23d34402535bb6e16b3fb7538473d4aba7e0f2352db5db7191ca335f2c116e5
+EBUILD smartmontools-9999.ebuild 4050 BLAKE2B a8ce8d55bcf3dda65d4e31f71feedc4f867a985e74dccdb4da9aff8e7cbfc80db1bbd7aeacb3809f154507ac4aa05b40fde8e865182169733cdb6dd1fc3dd058 SHA512 b84bddbec5e896f9fa60600d5a60c142ec6b23482fbf8239bb74297eab20c231850aa2c63cfd6b2a3be29db7f278417d7eed72e0f43cf4556628a53d1051220f
 MISC metadata.xml 628 BLAKE2B 1998d18fb38795b682ec935d8e994a93176e6bff49db77adcfc6a168e297515b7ac6a121b1acbb0743182d7dd4696b898cf6a8eeda0a290e0c75598036ef4951 SHA512 86ac56fbb2b15c7c4fa4e80607b5a3ceefd7300ade482d6d6adaf8e22c7a95797e10b1a03aacb34cf07c02e7d0fbd8437954d1c94c395afedc1c61c24202e3d6
diff --git a/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild b/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild
index 285822cc66a6..bca8212f62bd 100644
--- a/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild
+++ b/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild
@@ -114,8 +114,8 @@ src_install() {
 
 pkg_postinst() {
 	if use daemon || use update_drivedb; then
-		local initial_db_file="${EPREFIX}/usr/share/${PN}/drivedb.h"
-		local db_path="${EPREFIX}/var/db/${PN}"
+		local initial_db_file="${EROOT}/usr/share/${PN}/drivedb.h"
+		local db_path="${EROOT}/var/db/${PN}"
 
 		if [[ ! -f "${db_path}/drivedb.h" ]] ; then
 			# No initial database found
diff --git a/sys-apps/smartmontools/smartmontools-7.1.ebuild b/sys-apps/smartmontools/smartmontools-7.1.ebuild
index 984b82cc76d4..fb41bdc784b5 100644
--- a/sys-apps/smartmontools/smartmontools-7.1.ebuild
+++ b/sys-apps/smartmontools/smartmontools-7.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit subversion
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
@@ -114,8 +114,8 @@ src_install() {
 
 pkg_postinst() {
 	if use daemon || use update_drivedb; then
-		local initial_db_file="${EPREFIX}/usr/share/${PN}/drivedb.h"
-		local db_path="${EPREFIX}/var/db/${PN}"
+		local initial_db_file="${EROOT}/usr/share/${PN}/drivedb.h"
+		local db_path="${EROOT}/var/db/${PN}"
 
 		if [[ ! -f "${db_path}/drivedb.h" ]] ; then
 			# No initial database found
diff --git a/sys-apps/smartmontools/smartmontools-9999.ebuild b/sys-apps/smartmontools/smartmontools-9999.ebuild
index 984b82cc76d4..9c4544209c16 100644
--- a/sys-apps/smartmontools/smartmontools-9999.ebuild
+++ b/sys-apps/smartmontools/smartmontools-9999.ebuild
@@ -114,8 +114,8 @@ src_install() {
 
 pkg_postinst() {
 	if use daemon || use update_drivedb; then
-		local initial_db_file="${EPREFIX}/usr/share/${PN}/drivedb.h"
-		local db_path="${EPREFIX}/var/db/${PN}"
+		local initial_db_file="${EROOT}/usr/share/${PN}/drivedb.h"
+		local db_path="${EROOT}/var/db/${PN}"
 
 		if [[ ! -f "${db_path}/drivedb.h" ]] ; then
 			# No initial database found
diff --git a/sys-apps/smc-sum-driver/Manifest b/sys-apps/smc-sum-driver/Manifest
index 04b3d9772fcc..0297f4f7c180 100644
--- a/sys-apps/smc-sum-driver/Manifest
+++ b/sys-apps/smc-sum-driver/Manifest
@@ -1,4 +1,4 @@
 AUX makefile 298 BLAKE2B 58431440f52821bf8f1a6070075eace33f173dc1cbe19722c033cc6525b2ae4a6890aec2870f68b282368c9722b87796a14b53d364ce3e7002dfac452480e74e SHA512 862b6a2ae684da3b864eacef8b645c27ef4a6ccc4f577ccc9c5d88cd0426ce66a6462bcaaf01bdd0082898f7e3801cd6a00bc1c702af83faf7ca31b9de1c14e9
 DIST sum_driver_V1.6.0_20151201.tar.gz 1423921 BLAKE2B 76e2439148749b708a51e0d9c95545b53762f03793e6b2ea6e63e9f79aaad77432f728e94713e0cfd4085e8b090b6e0ff8e779e2627764e71794453cb7e02b49 SHA512 809fdf164e29aabde74306d966de7e07488d8dacc01963b56486477f23bdf3a469d059bc5d302aedbfd4b8dc854a82357747add2626cc22d0ab3898c7bc0a625
-EBUILD smc-sum-driver-1.6.0.20151201-r3.ebuild 943 BLAKE2B 1c24eee001edb3e38528d07adc76ac7afa8b8e8fbcffb5c10c16f1b6b2f0997ad0c3c6f96ca614e2bfa14dfc4514d95836b1c9e62f767560087bf3d512ff2399 SHA512 cc243884ae3ab64d0eb6abcfed56c8f2ee852b13d24facdd5907139a961473a7a79f5a3f0ccf594c5ee691836259f8f03bff1b4f84effc00152115ed6e0a6ddf
+EBUILD smc-sum-driver-1.6.0.20151201-r4.ebuild 943 BLAKE2B 0a4f85340c020b1cf16650b29aa2e47b5a97b799e1098f1e79a8f49b5bcf43ab94b317a92d24fb935b37f6c68c6648d8d258d6eeed5ca012a045cc0db0c0e100 SHA512 6099a317e30dab6d8d39a4b637c0fca1a5a99ca6d09851042c246627c880cd76747cf3b30998510326c33e6f47f3d435c868f091066d5d637288f2a341ee1736
 MISC metadata.xml 483 BLAKE2B 05700b3332f81f8a53b82a02445e38d56f8b0acc47d97e076a5b61ebeec2b0dab3d0f9f1c1af6918368da82b2ae5f3f6c0bce808738bd5885e54debba00afebe SHA512 e3da2424e8433f449b9a713a19bd8ce3492c9d80f7d523e68ec7647348b98d163df27b2eb2ebda199f965c4b827ee3dd6e40e726c44ab5d262d408218c7b7492
diff --git a/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r3.ebuild b/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r4.ebuild
index c8dba118df71..7b9e68795b4a 100644
--- a/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r3.ebuild
+++ b/sys-apps/smc-sum-driver/smc-sum-driver-1.6.0.20151201-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index c5109b40a67f..62189e1b6447 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,15 +1,19 @@
 AUX 245-clang-gnu11.patch 3167 BLAKE2B 4d254ae7ffc906d282580805a041ac2c11552ff6e7569cc06709faf6fe0894d9c9856ba54783e141341c512a401428390f7233050921e5e045b867f7e517f298 SHA512 6261c71cb4afbbbe5189f7ac01bf7cc50139edca4175f6f821941e012f5f4335835eef518e187996612e174159947a4fc2fec70fdbb16c8cdfa82369c7f4c814
+AUX 245-libmicrohttpd-0.9.71.patch 2545 BLAKE2B f07b4181e4ee2dafa7b6801ea266b135aa82e1c52521cd03f36305667b412fbbdbb7b03f597e0a9840d89453fb12e348d16069b06db448b3e000fdbbe4c51110 SHA512 f161e2d28f22bfd720c3dae5af163aa9ed88c7d9a052d5e7c9b47fcc09041a762ec4ffd4c41041e1ff03cdf1558877d37022216f91e8b6ee53bfd77494109357
 AUX gentoo-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6b66ee6e0a4cc1ada49d41ab758c788cf12534fffb67bd7370b8558a6af56572d7f2b73cf47db255fef105e56362c15f0a426f80b256 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0
 AUX gentoo-generator-path-r1.patch 1037 BLAKE2B 5eb80521a6726c9b4693f9b0f56d3e68fca1a49f5f5eb5a1576329d30c93d2fe7c121920099d74962eacf7ed1d3747250f103a57e4be246320a99871521a3b6a SHA512 1b0d1c2f96cb4aa95adfa5940efaeb2bd940110720399358317906d21d08b0caf625474980e101bba001afd626f8ad64367b09b40bec0b2d46b977021c4adfc5
 AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747351a26f6ffd842628298787b74d4ec562bacaa9fc5365f7e854f695dab5f74bc06883fefc1f210dce4fd415926817ac SHA512 98054222ea232e120625573b6a532c312eccc02fe657152610b7d056b964bb2165fffae9d17fd986cf547af885d44c26b117fe68df5b24e2607d37f3729d0ada
+AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed68272fcfa9cc34a309ff5d4cc2230f71a6f7fed42c79afb1c96605df141e8e40b2d8290d12ad3c18038269814f2df8 SHA512 d77d4dae9f8a7819c6d4855476f3163ee19f52b20f66a93e25818f0747404462c47e3cafbd82ba85ce1b3d2fdbabdd96a0398b71149b318c540d82403f8ad0ad
 AUX gentoo-systemctl-disable-sysv-sync.patch 784 BLAKE2B b2a1a931e1fa0c41d5610dba624e3f168a7bd7a54f83eb2e208b9d596645819e4e4d977876d032c5b98d392c846736b7be3e758aa53cf7b724eeda8d02c19ce5 SHA512 043a7bba0fac81a4a5eb1217cdfdd90cbdc7b2f01327d96b6f2cc12f3e8be4976e55e40a1dfbcc94d8ec35230c7e02a10e85e593a6faa355e675e202073991b3
 AUX gentoo-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
-DIST systemd-245.tar.gz 8993479 BLAKE2B be0b1fca5ba8585978f570868bc9135c1fee78ea64dcdf8b1a3419e856a83da90104ed2f86e5f3e5b0b6f29d4b34f603bfe1e4cbc61ccf71bedce547db62ff35 SHA512 1b80d0e02472dfc4197f11dab4f56cf90e8a6e105ce19f837cb11335b6d8577ed49031dad94cdb41aa9bdc06ec8eec62c8e9246272b83935e7bb9dcd3cd8c012
+DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
 DIST systemd-stable-244.3.tar.gz 8484735 BLAKE2B 25125ecdae59c852e8ceb45b7ed0b76631b301ab4026c4e389c4bc12090fe41f5918411a75bd20f38b6b3993445df93c850ba98f8d9b30fd24fc4e25f8355a3d SHA512 f8e83fa3e57ac8fdbed61b66bb45fd0eafa6fb36eda26f10690d93f34b03daab6ce4e7eff45b79dcaf59f11f41c1b022d1d9314f576c50ad28f6bb5901f1b18d
 DIST systemd-stable-245.5.tar.gz 9020836 BLAKE2B 7753eecceffa86c9208c3e71df2037b58b445f9090b73c6ff499b4170b94488a1fd1cabcd17cbb98506a692875a3eef07a40a54d23e09c331a01319f8d03d13d SHA512 47de4a59980643002f325c499eeb4dd76fa9f1d1267686e7564f103690487bf85974590d7cb3e3641409e5bfba567fe2a66efa80320e7e8adc48af4461e2e172
+DIST systemd-stable-245.7.tar.gz 9171465 BLAKE2B 77117360155ef6358244a382ebd521fe180d8dd982cc2edda18790105933cd5e8880030572eb50d5405b9afdab519b06e0721f48c57394d3d1043a123169ccb1 SHA512 306b3a9cd1d8985a05be259f8a08efb5e9f7102a657eccdef58e082822b61a6e82246dc4f3b6e0bd33eedbd550af54e0029af9d0d2b70416e27626ec43921449
 EBUILD systemd-244.3.ebuild 14561 BLAKE2B f7361cfed800988cd2d2ff70eadc3f75c15d7d1a3d12a9934574abd9c4b948207d69f25aa6326b3c90cc17274e80d70ba74c23361acc7a1b2749a25752f4db49 SHA512 4f08e146c380e8b14fa449ef11c8c33ddab8e358e7cb8efe7e39b6b2858828824405b70c223097a3dba3ceb06a2efc47cd957e2c0d5afdc2d620ad558f161c3c
-EBUILD systemd-245-r5.ebuild 15231 BLAKE2B e9b5e4089aab548c6682605b2cda91c678ed45377196478f874aaea0f83ae3c23b9f390ad6775da1630ad15a7f35fab4341518e6e5c20f390b40349f9d1bf8df SHA512 5caad65472b77c17767f18512dbb6107d9c250b6beceabeaba24e3e42d6e5bdeaf325ef38d633b92cad52ef5ab743e2502d012adc6f450b2deddfa0fe70340f8
-EBUILD systemd-245.5.ebuild 15193 BLAKE2B 0a5548b066365acbcee84c9ba3396daff507ebd05865d0f179fb58037a3948132d2c719313854fc92dc457d22c4be796a3d17e1a1d8e6b7fb5fc3ac11589835d SHA512 a7d81528779a398196dc1ffe4795973df5f99cd5803349952ab0fb61b80bac1b4e7129070e98d663beffe0e3e6be292c8bfad12367de604f56b5623b8b7854ee
-EBUILD systemd-9999.ebuild 15087 BLAKE2B 58340aa7becaffe670c0fd0ba820733bed96feb5c0ed0de9374ba1410831331501095a7c860fcf6d73617649a8d2e63a66f998f52a2342924ff9b1c1aa637986 SHA512 3347cf91a050f86c2d6adbdf50813e22e2af3a0e5adf074da5f6990b3b0edd82a0220edd06f47b0556e90ce880a00ac9efbfa7061b0c8890a37a46fd401f6e9d
+EBUILD systemd-245.5.ebuild 15237 BLAKE2B 7b1931325551b46fe73ebfbe29b3dbfb466cbb638fc58e7f3c182554ad9f53c7c8d904ec903e20abe0ab9721167c27d8b14726eec5616ed7891880a0153d45ab SHA512 8f5759721f9f76f2a7a0514adb7de7479debabd1d88c48b8fd3b05d99be8cc458bc48f175e8baef0834c7bc439009428b17f0e9fd11f4cf6e25c54eecd80fbcc
+EBUILD systemd-245.7-r1.ebuild 15132 BLAKE2B a2ef9aa85d106a0773f4bd54b312fdb554aa43c5376abcc55f0f716eb75ec9bf76a4ac1022aa2326863e82675428116ba751609e7388c041ce3e345e37c5fed8 SHA512 748a6dd92c6aecda087aec741c59a23a085c58d4256348272bdf58046a0be0418d424b25b5f4af271041c87f08332ca9bcc41a7c93ee07396530f98d5e5b4d23
+EBUILD systemd-246-r1.ebuild 15132 BLAKE2B 6ae118e2c2dafc000f7c076cd39f6dc29f94723eedbcf26422ab914e78f1b96f421958e9e067b55559c32a18ad9abe8b2a3f8f7f831cfd312c73a3c3ee2b8d2a SHA512 6930805067f4c884a816b12d82e877ff94a458a1286cec5c7a3cf64fd3db0f7a2da949a39f3821d85b8f3603a8b29f2d5276437522a8eb420790500f62dc30bc
+EBUILD systemd-9999.ebuild 15132 BLAKE2B 6ae118e2c2dafc000f7c076cd39f6dc29f94723eedbcf26422ab914e78f1b96f421958e9e067b55559c32a18ad9abe8b2a3f8f7f831cfd312c73a3c3ee2b8d2a SHA512 6930805067f4c884a816b12d82e877ff94a458a1286cec5c7a3cf64fd3db0f7a2da949a39f3821d85b8f3603a8b29f2d5276437522a8eb420790500f62dc30bc
 MISC metadata.xml 2373 BLAKE2B fac7a9db4c217998f84bcbb5bc490eee748a35f9d991962d5aa21c6ec562d494af06b67fe35879ee2b245445d22ea7eadc4db6305215f393c4565b86665b3130 SHA512 e2d999684255f6c6509af7dca1b9e1411eac9a4cde6f30d9631c5b9d2bbe749a40f3d08c067d2cad5eb1cdd8ad823c3afb6844cc5e3c1d455fbd8cd20d87a696
diff --git a/sys-apps/systemd/files/245-libmicrohttpd-0.9.71.patch b/sys-apps/systemd/files/245-libmicrohttpd-0.9.71.patch
new file mode 100644
index 000000000000..08affa501700
--- /dev/null
+++ b/sys-apps/systemd/files/245-libmicrohttpd-0.9.71.patch
@@ -0,0 +1,67 @@
+From d17eabb1052e7c8c432331a7a782845e36164f01 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
+Date: Tue, 30 Jun 2020 09:56:10 +0200
+Subject: [PATCH] =?UTF-8?q?Fix=20build=20with=20=C2=B5httpd=200.9.71?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The return type of callbacks was changed from int to an enum.
+---
+ src/journal-remote/journal-gatewayd.c    | 4 ++--
+ src/journal-remote/journal-remote-main.c | 2 +-
+ src/journal-remote/microhttpd-util.h     | 6 ++++++
+ 3 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
+index 5177e0d1577..3ab7c98b0b5 100644
+--- a/src/journal-remote/journal-gatewayd.c
++++ b/src/journal-remote/journal-gatewayd.c
+@@ -349,7 +349,7 @@ static int request_parse_range(
+         return 0;
+ }
+ 
+-static int request_parse_arguments_iterator(
++static mhd_result request_parse_arguments_iterator(
+                 void *cls,
+                 enum MHD_ValueKind kind,
+                 const char *key,
+@@ -796,7 +796,7 @@ static int request_handler_machine(
+         return MHD_queue_response(connection, MHD_HTTP_OK, response);
+ }
+ 
+-static int request_handler(
++static mhd_result request_handler(
+                 void *cls,
+                 struct MHD_Connection *connection,
+                 const char *url,
+diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
+index 69a111afead..f82d188a8c6 100644
+--- a/src/journal-remote/journal-remote-main.c
++++ b/src/journal-remote/journal-remote-main.c
+@@ -253,7 +253,7 @@ static int process_http_upload(
+         return mhd_respond(connection, MHD_HTTP_ACCEPTED, "OK.");
+ };
+ 
+-static int request_handler(
++static mhd_result request_handler(
+                 void *cls,
+                 struct MHD_Connection *connection,
+                 const char *url,
+diff --git a/src/journal-remote/microhttpd-util.h b/src/journal-remote/microhttpd-util.h
+index d90c6bbd4f1..4ca9a5c4f16 100644
+--- a/src/journal-remote/microhttpd-util.h
++++ b/src/journal-remote/microhttpd-util.h
+@@ -47,6 +47,12 @@
+ #  define MHD_create_response_from_fd_at_offset64 MHD_create_response_from_fd_at_offset
+ #endif
+ 
++#if MHD_VERSION >= 0x00097002
++#  define mhd_result enum MHD_Result
++#else
++#  define mhd_result int
++#endif
++
+ void microhttpd_logger(void *arg, const char *fmt, va_list ap) _printf_(2, 0);
+ 
+ /* respond_oom() must be usable with return, hence this form. */
diff --git a/sys-apps/systemd/files/gentoo-journald-audit.patch b/sys-apps/systemd/files/gentoo-journald-audit.patch
new file mode 100644
index 000000000000..088bceb7696e
--- /dev/null
+++ b/sys-apps/systemd/files/gentoo-journald-audit.patch
@@ -0,0 +1,40 @@
+From 593db1c78011ddce551051ce17eda6feac079b3d Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Fri, 21 Aug 2020 13:16:17 -0400
+Subject: [PATCH] journald: do not change the kernel audit setting by default
+
+Bug: https://bugs.gentoo.org/736910
+---
+ man/journald.conf.xml         | 2 +-
+ src/journal/journald-server.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/man/journald.conf.xml b/man/journald.conf.xml
+index bfd359a903..7e93d4050e 100644
+--- a/man/journald.conf.xml
++++ b/man/journald.conf.xml
+@@ -411,7 +411,7 @@
+         <command>systemd-journald</command> collects generated audit records, it just controls whether it
+         tells the kernel to generate them. This means if another tool turns on auditing even if
+         <command>systemd-journald</command> left it off, it will still collect the generated
+-        messages. Defaults to on.</para></listitem>
++        messages.</para></listitem>
+       </varlistentry>
+ 
+       <varlistentry>
+diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
+index 5865bf9809..163be685a8 100644
+--- a/src/journal/journald-server.c
++++ b/src/journal/journald-server.c
+@@ -2208,7 +2208,7 @@ int server_init(Server *s, const char *namespace) {
+                 .compress.threshold_bytes = (uint64_t) -1,
+                 .seal = true,
+ 
+-                .set_audit = true,
++                .set_audit = -1,
+ 
+                 .watchdog_usec = USEC_INFINITY,
+ 
+-- 
+2.28.0
+
diff --git a/sys-apps/systemd/systemd-245.5.ebuild b/sys-apps/systemd/systemd-245.5.ebuild
index 7ae8a3de58d6..ce5b95342570 100644
--- a/sys-apps/systemd/systemd-245.5.ebuild
+++ b/sys-apps/systemd/systemd-245.5.ebuild
@@ -16,7 +16,7 @@ else
 	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 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{6,7,8} )
@@ -201,6 +201,7 @@ src_prepare() {
 
 	# Add local patches here
 	PATCHES+=(
+		"${FILESDIR}/245-libmicrohttpd-0.9.71.patch"
 	)
 
 	if ! use vanilla; then
diff --git a/sys-apps/systemd/systemd-245-r5.ebuild b/sys-apps/systemd/systemd-245.7-r1.ebuild
index 6e765fe563b5..3da9bb72e33c 100644
--- a/sys-apps/systemd/systemd-245-r5.ebuild
+++ b/sys-apps/systemd/systemd-245.7-r1.ebuild
@@ -201,15 +201,13 @@ src_prepare() {
 
 	# Add local patches here
 	PATCHES+=(
-		"${FILESDIR}/245-clang-gnu11.patch"
 	)
 
 	if ! use vanilla; then
 		PATCHES+=(
-			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
-			"${FILESDIR}/gentoo-systemd-user-pam.patch"
 			"${FILESDIR}/gentoo-generator-path-r1.patch"
 			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch"
+			"${FILESDIR}/gentoo-journald-audit.patch"
 		)
 	fi
 
diff --git a/sys-apps/systemd/systemd-246-r1.ebuild b/sys-apps/systemd/systemd-246-r1.ebuild
new file mode 100644
index 000000000000..a3cf9676ba5f
--- /dev/null
+++ b/sys-apps/systemd/systemd-246-r1.ebuild
@@ -0,0 +1,527 @@
+# Copyright 2011-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb"
+
+REQUIRED_USE="
+	homed? ( cryptsetup )
+	importd? ( curl gcrypt lzma )
+"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0="
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+	curl? ( net-misc/curl:0= )
+	dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	homed? ( ${OPENSSL_DEP} )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
+		>=net-libs/gnutls-3.1.4:0=
+	)
+	idn? ( net-dns/libidn2:= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( app-crypt/p11-kit:0= )
+	pcre? ( dev-libs/libpcre2 )
+	pwquality? ( dev-libs/libpwquality:0= )
+	qrcode? ( media-gfx/qrencode:0= )
+	repart? ( ${OPENSSL_DEP} )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	acct-group/adm
+	acct-group/wheel
+	acct-group/kmem
+	acct-group/tty
+	acct-group/utmp
+	acct-group/audio
+	acct-group/cdrom
+	acct-group/dialout
+	acct-group/disk
+	acct-group/input
+	acct-group/kvm
+	acct-group/render
+	acct-group/tape
+	acct-group/video
+	acct-group/systemd-journal
+	acct-user/systemd-journal-remote
+	acct-user/systemd-coredump
+	acct-user/systemd-network
+	acct-user/systemd-resolve
+	acct-user/systemd-timesync
+	>=sys-apps/baselayout-2.2
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	sysv-utils? ( !sys-apps/sysvinit )
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-auth/nss-myhostname
+	!sys-fs/eudev
+	!sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	hwdb? ( >=sys-apps/hwids-20150417[udev] )
+	>=sys-fs/udev-init-scripts-34
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	sys-devel/m4
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test && has pid-sandbox ${FEATURES}; then
+			ewarn "Tests are known to fail with PID sandboxing enabled."
+			ewarn "See https://bugs.gentoo.org/674458."
+		fi
+
+		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	# Do NOT add patches here
+	local PATCHES=()
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	# Add local patches here
+	PATCHES+=(
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-generator-path-r2.patch"
+			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch"
+			"${FILESDIR}/gentoo-journald-audit.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+meson_use() {
+	usex "$1" true false
+}
+
+meson_multilib() {
+	if multilib_is_native_abi; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dsupport-url="https://gentoo.org/support/"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in PATH
+		-Dsplit-usr=$(usex split-usr true false)
+		-Dsplit-bin=true
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Dima=true
+		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+		# Optional components/dependencies
+		-Dacl=$(meson_multilib_native_use acl)
+		-Dapparmor=$(meson_multilib_native_use apparmor)
+		-Daudit=$(meson_multilib_native_use audit)
+		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
+		-Dlibcurl=$(meson_multilib_native_use curl)
+		-Ddns-over-tls=$(meson_multilib_native_use dns-over-tls)
+		-Delfutils=$(meson_multilib_native_use elfutils)
+		-Dgcrypt=$(meson_use gcrypt)
+		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+		-Dhomed=$(meson_multilib_native_use homed)
+		-Dhwdb=$(meson_multilib_native_use hwdb)
+		-Dmicrohttpd=$(meson_multilib_native_use http)
+		-Didn=$(meson_multilib_native_use idn)
+		-Dimportd=$(meson_multilib_native_use importd)
+		-Dbzip2=$(meson_multilib_native_use importd)
+		-Dzlib=$(meson_multilib_native_use importd)
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dlz4=$(meson_use lz4)
+		-Dxz=$(meson_use lzma)
+		-Dlibiptc=$(meson_multilib_native_use nat)
+		-Dpam=$(meson_use pam)
+		-Dp11kit=$(meson_multilib_native_use pkcs11)
+		-Dpcre2=$(meson_multilib_native_use pcre)
+		-Dpolkit=$(meson_multilib_native_use policykit)
+		-Dpwquality=$(meson_multilib_native_use pwquality)
+		-Dqrencode=$(meson_multilib_native_use qrcode)
+		-Drepart=$(meson_multilib_native_use repart)
+		-Dseccomp=$(meson_multilib_native_use seccomp)
+		-Dselinux=$(meson_multilib_native_use selinux)
+		-Ddbus=$(meson_multilib_native_use test)
+		-Dxkbcommon=$(meson_multilib_native_use xkb)
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+		-Dcreate-log-dirs=false
+
+		# multilib options
+		-Dbacklight=$(meson_multilib)
+		-Dbinfmt=$(meson_multilib)
+		-Dcoredump=$(meson_multilib)
+		-Denvironment-d=$(meson_multilib)
+		-Dfirstboot=$(meson_multilib)
+		-Dhibernate=$(meson_multilib)
+		-Dhostnamed=$(meson_multilib)
+		-Dldconfig=$(meson_multilib)
+		-Dlocaled=$(meson_multilib)
+		-Dman=$(meson_multilib)
+		-Dnetworkd=$(meson_multilib)
+		-Dquotacheck=$(meson_multilib)
+		-Drandomseed=$(meson_multilib)
+		-Drfkill=$(meson_multilib)
+		-Dsysusers=$(meson_multilib)
+		-Dtimedated=$(meson_multilib)
+		-Dtimesyncd=$(meson_multilib)
+		-Dtmpfiles=$(meson_multilib)
+		-Dvconsole=$(meson_multilib)
+
+		# static-libs
+		-Dstatic-libsystemd=$(usex static-libs true false)
+		-Dstatic-libudev=$(usex static-libs true false)
+	)
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	meson_src_test
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
+	fi
+
+	rm "${ED}"/etc/init.d/README || die
+	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
+
+	if ! use sysv-utils; then
+		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+	fi
+
+	if ! use resolvconf && ! use sysv-utils; then
+		rmdir "${ED}${rootprefix}"/sbin || die
+	fi
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/kernel/install.d
+	keepdir /etc/systemd/{network,system,user}
+	keepdir /etc/udev/rules.d
+
+	if use hwdb; then
+		keepdir /etc/udev/hwdb.d
+	fi
+
+	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+	keepdir /usr/lib/{binfmt.d,modules-load.d}
+	keepdir /usr/lib/systemd/user-generators
+	keepdir /var/lib/systemd
+	keepdir /var/log/journal
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	if use hwdb; then
+		rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
+	fi
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+
+	gen_usr_ldscript -a systemd udev
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+save_enabled_units() {
+	ENABLED_UNITS=()
+	type systemctl &>/dev/null || return
+	for x; do
+		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
+			ENABLED_UNITS+=( "${x}" )
+		fi
+	done
+}
+
+pkg_preinst() {
+	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
+
+	if ! use split-usr; then
+		local dir
+		for dir in bin sbin lib; do
+			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
+				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
+				eerror "One of them should be a symbolic link to the other one."
+				FAIL=1
+			fi
+		done
+		if [[ ${FAIL} ]]; then
+			eerror "Migration to system layout with merged directories must be performed before"
+			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+			die "System layout with split directories still used"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${EROOT}"
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	systemd_reenable systemd-networkd.service systemd-resolved.service
+
+	if [[ ${ENABLED_UNITS[@]} ]]; then
+		systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if type systemctl &>/dev/null; then
+			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+		fi
+		elog "To enable a useful set of services, run the following:"
+		elog "  systemctl preset-all --preset-mode=enable-only"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
+		ebegin "Reexecuting system manager"
+		systemctl daemon-reexec
+		eend $?
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 8dd6eec99550..a3cf9676ba5f 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -120,7 +120,7 @@ RDEPEND="${COMMON_DEPEND}
 # sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
 PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
 	hwdb? ( >=sys-apps/hwids-20150417[udev] )
-	>=sys-fs/udev-init-scripts-25
+	>=sys-fs/udev-init-scripts-34
 	policykit? ( sys-auth/polkit )
 	!vanilla? ( sys-apps/gentoo-systemd-integration )"
 
@@ -207,6 +207,7 @@ src_prepare() {
 		PATCHES+=(
 			"${FILESDIR}/gentoo-generator-path-r2.patch"
 			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch"
+			"${FILESDIR}/gentoo-journald-audit.patch"
 		)
 	fi
 
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 8b4bb01118ed..ffe53bbc423f 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -8,9 +8,9 @@ AUX sysvinit-2.92_beta-shutdown-h.patch 2341 BLAKE2B 255f9831d59721fb3f59f6caeb9
 AUX sysvinit-2.94_beta-shutdown-single.patch 1261 BLAKE2B 571b7cf40ccdbb27e65b31e507ea8331ae1e9b8b012570cdc4099a15c864f2abc92f84c44ef9dbd35dfe43c68e491d347266abaa0156536edae4c35231f17ccb SHA512 2f26201e8634b380dafdf42678cd0241a93f0e473f5c8680d4206d97dfe3510c2ceeb4cd066d1af3ae97fe411f7a5452a9586f8f5c5e65653bf9241fea1edaf0
 AUX sysvinit-2.95_beta-shutdown-h.patch 2752 BLAKE2B a7174eaf34d5f9547d5d79c16bf2d8129e71c9564fc0b60e5adb3f2dda998dbdea7a3ee9fbfd3f7bc29ec977f8d47de4581d77abd6e1cdb6feeab9633946251e SHA512 682e6afd6443ffef2cbac9898eca42546b0614a82b2a0c370015cf5373229c00170a22adabf54d10a0f85da7b19de39334b05ef69874fa4003a9c74b7e416974
 DIST sysvinit-2.93.tar.xz 117580 BLAKE2B 2e771b00dbdc73e76df9e78659aaa5e5fcbfda36290a1b5aa20a5a6fe3540c4616f2a235a668de30d33c620e2d2516da303537eda47b83b29b0844ad7aa77df4 SHA512 c80d07a674253d15ec6382cfaf792f47486e2e84ab9c913d3c9e03b590cf211177a3a14e168f4d1c9c2e97737221f7ac70a75633d90502837a6d29bdc4c48d72
-DIST sysvinit-2.95.tar.xz 124576 BLAKE2B 1b0770e3bc7c5a32b8a634ab70d16854446816f9c22f57befb2602a8680d5d4a4adc51747b6199867ba73a3ac5118073a8bfa9ea4317de86b3b42867ae0cf6e7 SHA512 367990d166ec6dcc4de81e748f15035e2a4c2838da7336b064aeadac2db95ca77e8d11fb6aa7e7745874ef3e27118c9a68070062fffb16a886f32d6ab2529d28
 DIST sysvinit-2.96.tar.xz 122164 BLAKE2B 10c28d3bb57fc744b66c3a7ac78912fb6a9d987e9f6f32f82953d23a9884020daa6fa8c7722e6d8145d9899f7f7dc623f69f885d3d8fbbcd313d0e69ffb66497 SHA512 1388398568ebfe53460796f8ab75a3ead6111612888ea36e8f1c0db4d41ef6f45fc217abb7804519ff1143a78d97c95b24e42c8c22c95a47b9436484bfb6f45d
+DIST sysvinit-2.97.tar.xz 126848 BLAKE2B dd2612de531a89f1fdbfaeb8b5975aeba9541a6b570587a881bdb11406991c1a9b254d1802725298eb13362d625d3859b520ee964782a0fe43d3f038a28b49e6 SHA512 89950080a120b62bdd297f3a59898dd11e10c7438cf18774bad16c65ce5fb2e190726e601c6f263def32cff59867c0984edcd99d527eb80297901085afbb2e90
 EBUILD sysvinit-2.93.ebuild 3565 BLAKE2B b299bb15ec4a6525f033f74b1a853d351545fe34807bf1b17716e92736582adb023ef0e4c5b8f745d37699a51067c1577e8b06cdd11e3f50b2f7eea445001f6d SHA512 e390b9560cf58f6f25ab9586dc5203ee8232eba0073348cda085f091216675458e4f5c0203013ffc93a8641697bf8827ffbdf382cc3243f118e081e84a43e974
-EBUILD sysvinit-2.95-r1.ebuild 3836 BLAKE2B 98170deb30dd93b9d371f0e83270c7a7b6b6841edc8df2285741dcff0685b764fea116c9f6b04cc184b9052ef33276b1a04cb74db48e008132f79ee795a03759 SHA512 2ed847ab673652cd4471c9bb68f0ca74f78450ae4ecbac89c00bc1afcff867cc5fad460bdf80a33ac11ef025e5b50db56930c9708222a2cced55fd9463f51931
 EBUILD sysvinit-2.96.ebuild 3836 BLAKE2B 98170deb30dd93b9d371f0e83270c7a7b6b6841edc8df2285741dcff0685b764fea116c9f6b04cc184b9052ef33276b1a04cb74db48e008132f79ee795a03759 SHA512 2ed847ab673652cd4471c9bb68f0ca74f78450ae4ecbac89c00bc1afcff867cc5fad460bdf80a33ac11ef025e5b50db56930c9708222a2cced55fd9463f51931
+EBUILD sysvinit-2.97.ebuild 3966 BLAKE2B b67700ccaf3eb933e9c5c7e9789a4ef2a9870a6d2cfd45dc674a1f1f94776389f7649b2eb2f9d2a9b3038fd4ab570a029283315d59f534a6af0d8f5eb28419af SHA512 9663f286473cf9b9bb8779d82ab8ebee48aca39dd6e2158468ee574751ab55fa4be862ab0da06425fd7c2cf13c469692b38732accb1e8723f35f1bb39722b4cf
 MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f
diff --git a/sys-apps/sysvinit/sysvinit-2.95-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.97.ebuild
index adf3f15ec1e7..4dd4d992de92 100644
--- a/sys-apps/sysvinit/sysvinit-2.95-r1.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.97.ebuild
@@ -115,6 +115,10 @@ src_install() {
 	newinitd "${FILESDIR}"/bootlogd.initd bootlogd
 	into /
 	dosbin "${FILESDIR}"/halt.sh
+
+	keepdir /etc/inittab.d
+
+	find "${ED}" -type d -empty -delete || die
 }
 
 pkg_postinst() {
@@ -122,8 +126,9 @@ pkg_postinst() {
 	# This is really needed, as without the new version of init cause init
 	# not to quit properly on reboot, and causes a fsck of / on next reboot.
 	if [[ ${ROOT} == / ]] ; then
-		if [[ -e /dev/initctl && ! -e /run/initctl ]]; then
-			ln -s /dev/initctl /run/initctl
+		if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then
+			ln -s /dev/initctl /run/initctl \
+				|| ewarn "Failed to set /run/initctl symlink!"
 		fi
 		# Do not return an error if this fails
 		/sbin/telinit U &>/dev/null
diff --git a/sys-apps/tas/Manifest b/sys-apps/tas/Manifest
index 39593aef8f90..0702a2bccbcf 100644
--- a/sys-apps/tas/Manifest
+++ b/sys-apps/tas/Manifest
@@ -1,6 +1,6 @@
 AUX tas.ini 81 BLAKE2B 2dd7bc87d72d00d7dd73e496d253810dfe110aa1d754f1fe923f4bf0bafa79c516bf24eaa684822155afd88d9067a6106ee49f7bc8847c75a2a436cf72e893da SHA512 d1e555341bf1aa5e0f4097c948e32cf274d788821eb9bbbc62f15107dbf5893cc14f41ab47f2a59fb6cb5df4b3e431b403f643743eaf7fd3c121d4ee458a8d99
 AUX tas.initd 422 BLAKE2B af394bb87952d7e5ddb20e3b688372f7e526ebde59a3862112a8c723252575683e8218297b801b0ef027b3953e8e78898407f6d85b7bec4f166fad4469d114ed SHA512 0cced493bd7a451bb8a76be1b24171fbc72c0571fb6337e52fe0140184a0990baac9a95e512738366433c3516b859f1958546a8e0ca8f718f7fc48b32f95c792
 AUX tas.service 162 BLAKE2B f9f8d8f9e8dbe1b6aa6e7c531cb69b3e6f39e563cc64f2630a0db2b48cc0425806b166f39d7b2dc356c55b4771da7023ab5c0f10dd2d2857beaff7699fa1a0a7 SHA512 53a6ad9f0d42b26f2a2e9462a5f14a31e4bbde4d8badf7beb9e96e2a916d81ccda96be9bad80fbcc1a8f9e4a72ac5cfb1e13112785de8fe978823d97de145efd
-DIST TAS_1.5.2_build.180622.zip 12434740 BLAKE2B 9017aee7512b6d467d2922dc9db3f3cc58046beb4f48838748ac806da1c0c84f99984e2b29867a36db4bcb58a90f3e23c29dbfd8d73e1049cac4bf82ac88d021 SHA512 166483fe514f09c2fbfd27a05072f0bfa0d2cc8f92428451e055ddd9fbc24dfa3e912de224775d16dbb8880391c79ddc2ee9ff55c1e31e0fcf2daa3b05eb7d60
-EBUILD tas-1.5.2.180622.ebuild 1592 BLAKE2B bb9283f667558351830f427b499685769c8d2c14ffe150189e75c35990d94fa11a355b5df24dddb82683aaea6aeede6a13827ac5ce1882434f1c051a2f0aa1fb SHA512 9f83615cad5fe5c83441609020cdd715ecee5a5635b303457256cf8082a3b9887c5ba50189add216d2e9ae6e50080605a208f34bb2639b9aa0a0814e69432015
+DIST TAS_1.6.0_build.200601.zip 15528952 BLAKE2B f2514180c1335c2c8afd5cf0234da8dd22563086cf2c85e38b8dc2bc28b27fd3dac6a09123a0d4f57354cf729ad5050a6253608d15682577c75b551c921aa1b0 SHA512 725e8134a51a75b23f566f1321e87faf44f96603d63b4a253f03c262ec2c40c339e024162ba84da37647cd301a039ca4aa34e42936d1a47303c7fa68e1e5f2f3
+EBUILD tas-1.6.0.200601.ebuild 1732 BLAKE2B c4fae8c96d0592cfea9a17aab541f3d8bb342b838e32e623d55ffafaa83520b1676ef27f2bbbd190663cf4ab184cba2d526b890b4f369b6fa99d7158f8dd2e5b SHA512 895167e4030520bc44e37587821e850d893ff3718087a5a8bdbd3fd1adcc32558dc83913941a4eba16e08035bab4fc971b2e07245eca24d14e58b7cf8af499b7
 MISC metadata.xml 871 BLAKE2B c8666715b4e9c7704f8f5464c95a9a3411cb4f97fe6631eccb4bb2a1ae70c987e858a4d32d3f6eef3ddc77d4ff1d8e441877da198e17f47fa65bec7bd915a565 SHA512 6b9b63a492af33946ac54c3a46fb6c27a48e8bd65472e10ab79510722a5a7bcdbd6cbded8f8182773e7fbd478e99d2a520a968e080996aa567289aa14ffe01ed
diff --git a/sys-apps/tas/tas-1.5.2.180622.ebuild b/sys-apps/tas/tas-1.6.0.200601.ebuild
index 182dd6d61afb..f6d0fe8f8aa7 100644
--- a/sys-apps/tas/tas-1.5.2.180622.ebuild
+++ b/sys-apps/tas/tas-1.6.0.200601.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit eapi7-ver linux-info systemd
+inherit eutils linux-info systemd
 
 MY_DATE="$(ver_cut 4)"
 MY_PN="${PN^^}"
@@ -17,7 +17,8 @@ KEYWORDS="-* ~amd64 ~x86"
 LICENSE="BSD supermicro"
 SLOT="0"
 
-RDEPEND="net-misc/networkmanager
+RDEPEND="
+	net-misc/networkmanager
 	sys-apps/ethtool
 	sys-apps/net-tools
 	sys-apps/smartmontools
@@ -25,7 +26,8 @@ RDEPEND="net-misc/networkmanager
 	sys-devel/bc
 	sys-fs/lsscsi
 	sys-fs/mdadm"
-DEPEND="app-arch/unzip"
+
+BDEPEND="app-arch/unzip"
 
 RESTRICT="bindist fetch mirror"
 
@@ -54,7 +56,7 @@ src_unpack() {
 }
 
 src_install() {
-	dobin $(usex amd64 '64' '32')bit/IPMITAS
+	dobin TAS/$(usex amd64 '64' '32')bit/IPMITAS
 
 	insinto /etc/supermicro
 	doins "${FILESDIR}"/tas.ini
@@ -62,7 +64,7 @@ src_install() {
 	dodir /var/log/tas
 	local logfiles=( {starttime,tas,tas.com}.log )
 	for logfile in ${logfiles[@]}; do
-		touch "${ED%/}"/var/log/tas/${logfile} || die
+		touch "${ED}"/var/log/tas/${logfile} || die
 		dosym ../../var/log/tas/${logfile} /etc/supermicro/${logfile}
 	done
 
@@ -71,3 +73,8 @@ src_install() {
 
 	einstalldocs
 }
+
+pkg_postinst() {
+	optfeature "Broadcom controller management" sys-block/storcli
+	optfeature "LSI controller management" sys-block/sas3ircu
+}
diff --git a/sys-apps/the_silver_searcher/Manifest b/sys-apps/the_silver_searcher/Manifest
index bf4bfd9bb3e0..20280ba6f535 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -1,8 +1,9 @@
 AUX the_silver_searcher-2.1.0-lzma.patch 16900 BLAKE2B 80b7ed6ca050e155c07236c318e1acba7c701880c441e2701146bf289872c353308d791e7f36a85106a901c416725d108e6c9012bd5c0e77adde00dd831df97c SHA512 51067853b604d7f2eb5272dbb960888d70002d58a61dff5c4748031d92a61b6b06aa02b09e29babac47e7fff872bb51fbe8929ac2d3fdef0a6ddbb29ffb18052
+AUX the_silver_searcher-fno-common.patch 3785 BLAKE2B 860a2ee021e29e3c1729363a574eab5e58d02922634cf778729f70631396e4dbae0ba968d8d7828fefca7dbd618138dab3ad7094727a851ba254a460f216cf13 SHA512 14352a4e44a7a07d832a2192be2f22aa7446984d90dafc8d637610b9a13f79adb91e1489a4439a25ec453b29b18d696e41797bee77f4465e2fe9a864a8f12459
 DIST the_silver_searcher-2.0.0.tar.gz 160093 BLAKE2B 1955772c6f71cf7839270cdcaf73f917a69966afa69e781a81ff1926946d9e61a7229e5eb4981b21879b6d2ad46232563285b083de77b8fbf42d3070792b26bd SHA512 2587b9958fadcf5d95bc472f901904edb0d3d9bbc652dc6bb3801b77e7dfa744a97869bed4699776cc3fdcd7b0319fcecbe4b08ccfda617d1c2aa4ea8e9f990d
 DIST the_silver_searcher-2.1.0.tar.gz 163139 BLAKE2B 0112489e9e8c965708f2526aa5141bc700cb86bc1bc5a63ad9b2505234595f673b6e163546fdec7e5066d00789042ab1acdf02db926170bb823112847f304944 SHA512 9b49b1666bbb915b122eae45dbe5dbdba18539257b59f1dee9ba9ec86dbe73c7c8ecde1eff9d3e06951295685161fc4594fcdbfa5d19d7b466f2a7f95021e631
 DIST the_silver_searcher-2.2.0.tar.gz 163686 BLAKE2B ca81f701336ff463b6dc783ac8bc615a05e048c35b653a80c3fb74b053bb71f4822990b699a9e3741c7ffdd2581b65faa5439824189a9d8e36025d248201f814 SHA512 b635165fa3259475027986dd49c0786545cc2e3037695aec70f6ee54eaa768ab0e25af78d4bfd3754c4eb8352464cebf64324ed4a68a4b3de60a6889473da26e
-EBUILD the_silver_searcher-2.0.0.ebuild 938 BLAKE2B 330c2b8aa97db09698e066d58972f12d007c4827d78a88d0d727ec837aae8166c67f387b8566bf484b16c6e8114564386ae43bd2447585f74f97d21fbfd5f590 SHA512 86652ef0807858107f43ab1134cc323f4826c352590b318b42357ce4e46a86aa72b238ebfe3fe075b6dffee4ed12211c648d54a0b5a6ca64ec0026151e3c70ea
-EBUILD the_silver_searcher-2.1.0.ebuild 1010 BLAKE2B d5beee0a626a06341c13f64a34fc5175cc040d30666351b944289d2cad4418943c32082ff80d31d2cfd4456b2c7570cf2ab2466052d6b71709fd74b2df311b30 SHA512 9c0b82db7481d7d26e575c3465db09936b35440a3a214c5a022157ed5e2ade93153d8e4062cea08c9e6fce77e2ffe15f3f30e09d97c728c56978aa4323dfce30
-EBUILD the_silver_searcher-2.2.0.ebuild 1010 BLAKE2B d5beee0a626a06341c13f64a34fc5175cc040d30666351b944289d2cad4418943c32082ff80d31d2cfd4456b2c7570cf2ab2466052d6b71709fd74b2df311b30 SHA512 9c0b82db7481d7d26e575c3465db09936b35440a3a214c5a022157ed5e2ade93153d8e4062cea08c9e6fce77e2ffe15f3f30e09d97c728c56978aa4323dfce30
+EBUILD the_silver_searcher-2.0.0.ebuild 988 BLAKE2B ad8291bda658214118139b25e298b994f308d93a99d5aead2a3937f34533bba0ea382f1ecd00817670171cfd97f94d768680fcbb7e1b73a3b332b83f06eb8ca8 SHA512 ff4ef60e0e27173d65fd50579a66b21a93cebe98417dbc86e7db898d5059a89f5a717ea799a27ec7469895cb9e0c604a2999db742d63f90f1739a1e448430d5e
+EBUILD the_silver_searcher-2.1.0.ebuild 1049 BLAKE2B 6764ac8a4a66826a6db93de31fc60cb7e5fe5719b662c25e5d2e3888bf460cf2177d7a24fc1ff5bbe71f88c8043ccfaf958c10e5c6dadd9c94a1ba71f38ef2e1 SHA512 e5b2d03888ae5a07dbc2b708a828a48f8237922af123b108db0816e01db9c252e49b436e6e7de4dd840bc4c2bfc5c54dd87ef9804ff1b0e8a07ed6a604c64d8f
+EBUILD the_silver_searcher-2.2.0.ebuild 1049 BLAKE2B 6764ac8a4a66826a6db93de31fc60cb7e5fe5719b662c25e5d2e3888bf460cf2177d7a24fc1ff5bbe71f88c8043ccfaf958c10e5c6dadd9c94a1ba71f38ef2e1 SHA512 e5b2d03888ae5a07dbc2b708a828a48f8237922af123b108db0816e01db9c252e49b436e6e7de4dd840bc4c2bfc5c54dd87ef9804ff1b0e8a07ed6a604c64d8f
 MISC metadata.xml 343 BLAKE2B 21afa71f55c3a250d73910c6f8a96fcb5164b921758c8969b8fad8ac95e45f86d114742738d6f6f192a33be057b28440390b52719ee71755c3ba04a4f1a0cc0d SHA512 a2dd33c75fde978e49227132e7579e8c3d3b77989228f34f43e5611fafb6999320991f4bdb683426a30595771d2afebc5487487b890a9f399df086fe3946a39b
diff --git a/sys-apps/the_silver_searcher/files/the_silver_searcher-fno-common.patch b/sys-apps/the_silver_searcher/files/the_silver_searcher-fno-common.patch
new file mode 100644
index 000000000000..49861018e3ad
--- /dev/null
+++ b/sys-apps/the_silver_searcher/files/the_silver_searcher-fno-common.patch
@@ -0,0 +1,164 @@
+--- a/src/search.h
++++ b/src/search.h
+@@ -31,9 +31,9 @@
+ #include "uthash.h"
+ #include "util.h"
+ 
+-size_t alpha_skip_lookup[256];
+-size_t *find_skip_lookup;
+-uint8_t h_table[H_SIZE] __attribute__((aligned(64)));
++extern size_t alpha_skip_lookup[256];
++extern size_t *find_skip_lookup;
++extern uint8_t h_table[H_SIZE] __attribute__((aligned(64)));
+ 
+ struct work_queue_t {
+     char *path;
+@@ -41,12 +41,12 @@
+ };
+ typedef struct work_queue_t work_queue_t;
+ 
+-work_queue_t *work_queue;
+-work_queue_t *work_queue_tail;
+-int done_adding_files;
+-pthread_cond_t files_ready;
+-pthread_mutex_t stats_mtx;
+-pthread_mutex_t work_queue_mtx;
++extern work_queue_t *work_queue;
++extern work_queue_t *work_queue_tail;
++extern int done_adding_files;
++extern pthread_cond_t files_ready;
++extern pthread_mutex_t stats_mtx;
++extern pthread_mutex_t work_queue_mtx;
+ 
+ 
+ /* For symlink loop detection */
+@@ -64,7 +64,7 @@
+     UT_hash_handle hh;
+ } symdir_t;
+ 
+-symdir_t *symhash;
++extern symdir_t *symhash;
+ 
+ void search_buf(const char *buf, const size_t buf_len,
+                 const char *dir_full_path);
+--- a/src/search.c
++++ b/src/search.c
+@@ -2,6 +2,19 @@
+ #include "print.h"
+ #include "scandir.h"
+ 
++ size_t alpha_skip_lookup[256];
++ size_t *find_skip_lookup;
++ uint8_t h_table[H_SIZE] __attribute__((aligned(64)));
++
++ work_queue_t *work_queue;
++ work_queue_t *work_queue_tail;
++ int done_adding_files;
++ pthread_cond_t files_ready;
++ pthread_mutex_t stats_mtx;
++ pthread_mutex_t work_queue_mtx;
++
++ symdir_t *symhash;
++
+ void search_buf(const char *buf, const size_t buf_len,
+                 const char *dir_full_path) {
+     int binary = -1; /* 1 = yes, 0 = no, -1 = don't know */
+--- a/src/log.c
++++ b/src/log.c
+@@ -4,6 +4,8 @@
+ #include "log.h"
+ #include "util.h"
+ 
++pthread_mutex_t print_mtx;
++
+ static enum log_level log_threshold = LOG_LEVEL_ERR;
+ 
+ void set_log_level(enum log_level threshold) {
+--- a/src/log.h
++++ b/src/log.h
+@@ -9,7 +9,7 @@
+ #include <pthread.h>
+ #endif
+ 
+-pthread_mutex_t print_mtx;
++extern pthread_mutex_t print_mtx;
+ 
+ enum log_level {
+     LOG_LEVEL_DEBUG = 10,
+--- a/src/options.h
++++ b/src/options.h
+@@ -91,7 +91,7 @@
+ } cli_options;
+ 
+ /* global options. parse_options gives it sane values, everything else reads from it */
+-cli_options opts;
++extern cli_options opts;
+ 
+ typedef struct option option_t;
+ 
+--- a/src/options.c
++++ b/src/options.c
+@@ -16,6 +16,8 @@
+ #include "print.h"
+ #include "util.h"
+ 
++cli_options opts;
++
+ const char *color_line_number = "\033[1;33m"; /* bold yellow */
+ const char *color_match = "\033[30;43m";      /* black with yellow background */
+ const char *color_path = "\033[1;32m";        /* bold green */
+--- a/src/util.h
++++ b/src/util.h
+@@ -12,7 +12,7 @@
+ #include "log.h"
+ #include "options.h"
+ 
+-FILE *out_fd;
++extern FILE *out_fd;
+ 
+ #ifndef TRUE
+ #define TRUE 1
+@@ -51,7 +51,7 @@
+ } ag_stats;
+ 
+ 
+-ag_stats stats;
++extern ag_stats stats;
+ 
+ /* Union to translate between chars and words without violating strict aliasing */
+ typedef union {
+--- a/src/util.c
++++ b/src/util.c
+@@ -15,6 +15,10 @@
+ #define getc_unlocked(x) getc(x)
+ #endif
+ 
++FILE *out_fd;
++
++ag_stats stats;
++
+ #define CHECK_AND_RETURN(ptr)             \
+     if (ptr == NULL) {                    \
+         die("Memory allocation failed."); \
+--- a/src/ignore.c
++++ b/src/ignore.c
+@@ -22,6 +22,8 @@
+ 
+ /* TODO: build a huge-ass list of files we want to ignore by default (build cache stuff, pyc files, etc) */
+ 
++ignores *root_ignores;
++
+ const char *evil_hardcoded_ignore_files[] = {
+     ".",
+     "..",
+--- a/src/ignore.h
++++ b/src/ignore.h
+@@ -29,7 +29,7 @@
+ };
+ typedef struct ignores ignores;
+ 
+-ignores *root_ignores;
++extern ignores *root_ignores;
+ 
+ extern const char *evil_hardcoded_ignore_files[];
+ extern const char *ignore_pattern_files[];
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild
index d993a7bb70b8..6e62890da072 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,6 +26,8 @@ DEPEND="${RDEPEND}
 
 DOCS="README.md"
 
+PATCHES=( "${FILESDIR}"/${PN}-fno-common.patch )
+
 src_prepare() {
 	sed '/^dist_bashcomp/d' -i Makefile.am || die
 
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
index f6cfa25db0a5..9643faccd4af 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,10 @@ DEPEND="${RDEPEND}
 
 DOCS="README.md"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.1.0-lzma.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-lzma.patch
+	"${FILESDIR}"/${PN}-fno-common.patch
+)
 
 src_prepare() {
 	sed '/^dist_bashcomp/d' -i Makefile.am || die
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild
index f6cfa25db0a5..9643faccd4af 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,10 @@ DEPEND="${RDEPEND}
 
 DOCS="README.md"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.1.0-lzma.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.0-lzma.patch
+	"${FILESDIR}"/${PN}-fno-common.patch
+)
 
 src_prepare() {
 	sed '/^dist_bashcomp/d' -i Makefile.am || die
diff --git a/sys-apps/ucspi-ssl/Manifest b/sys-apps/ucspi-ssl/Manifest
index 68125987b9c1..e43153d55c67 100644
--- a/sys-apps/ucspi-ssl/Manifest
+++ b/sys-apps/ucspi-ssl/Manifest
@@ -7,5 +7,5 @@ EBUILD ucspi-ssl-0.94-r1.ebuild 1216 BLAKE2B 16f75a1835b7ccb6a5726b9125f6fba24a7
 EBUILD ucspi-ssl-0.97.ebuild 1284 BLAKE2B 909f26fb66bda9f2b963d7d125496eb29d15ad6a50cc50713ff5a171c1cc8ce6a7adeb8902ab4307dae07e7eb4a42b142907a05c2fbb7400efbdb8eea6b43395 SHA512 473dbba22b26f7167e97ffb91773a85f5bceb3545dd9648d365a758543d7d1afa0e128bd3bb67a5489dc1d8cbccec18664fa39cde4afa5f264bfc6d442938d36
 EBUILD ucspi-ssl-0.98b.ebuild 1254 BLAKE2B 343c3a29a1034913840a1e73427a71bf589afd22625fe5b4f9407a0625e92c66cd189c3b1ef866c3601e943734653b91487daa5ae76ea7a74490aedd5f3bff4c SHA512 5a05bdbec11af831d8e921722425a757acbd944877b474bcb5f7f62351efa60988bc84130ab41c63a3ff707b9b0d30dd32a26b9a6da312d6e65a0f4ddb73aa3a
 EBUILD ucspi-ssl-0.99.ebuild 1254 BLAKE2B fb0dc76802a85bf458c05104f2c7550bc57fff52db5edd82862866864e8705f93f237419820a9016714118bb32bd9bc445e672b273b264ebf6b4b5064e8a8c7f SHA512 efda666c5a18c291cabc933e2e59b396775d957a30a5249472d7ca21902a06437c198fde858679722e3d5cc559aabc88756c5b1e509e05be245bc95d0098fc9d
-EBUILD ucspi-ssl-0.99e.ebuild 1557 BLAKE2B f3a531cdfdc93002109f5ffa321761c6e02881720c204676847a79e0f013d77a50980ee608f412f109aca5202f820e07ebb617a4a735c39d72e400d3ec1f75d7 SHA512 29d2ec99ad7718cd980d2fc059c9dc4d663a8ce99e93ae2b694039702b14bb9f1f0c1abda2ae501a1997180c48ada32f3f2865564cabae42841162c401b6d1ae
-MISC metadata.xml 749 BLAKE2B 3b6d6b29627fdd626bffc49b35d559c21436b0e31fb0ea037f872a5f3bcd114902ef91eb2c4be5d78100b16622c8b8cabd745fd82cb41570085b70ae6c4f9c8d SHA512 3e9e1026800839e5ca908831406d77e5aca076edfaa62588c9b966767d690ff6ed1c396ee3cb2457259c26b10e5160a10ac38f70a0be1cad0bf262adfd661366
+EBUILD ucspi-ssl-0.99e.ebuild 1549 BLAKE2B dc61f2fffffd151c6c4c248ab2d3464341ecba67cf26abf0660d55c7c44f685d20997e8597537c6674824f5be3c71c47b3211ee588e7f4cb4812504fefe2d3aa SHA512 6b99d130f259e9a6ff046cbb5afcafa1bec42bdd1d3db2c604de40a9dbd80c476cfb18d12964425f9075f5e04ecfce25049a5d5d01e9fb2ef67316fc32680ffa
+MISC metadata.xml 550 BLAKE2B da79281578d7c1fcb0646eb789b7b12e431ae96f645e9fbd944b1c1089a9321c65a66570a0c9a32ff6502a06794422bcb1129a3edba5016ca3d7f14821058a05 SHA512 e4f99e1cb7f634dfe7252a62fca125bcdc1f7f1e868c8b9786bd4e4d7b857fb983f2567a2022fea697bb4694911807fc0099d0641cb3025558f7bf22c235d2d6
diff --git a/sys-apps/ucspi-ssl/metadata.xml b/sys-apps/ucspi-ssl/metadata.xml
index 32a4fcc2cbce..40544d04add2 100644
--- a/sys-apps/ucspi-ssl/metadata.xml
+++ b/sys-apps/ucspi-ssl/metadata.xml
@@ -1,17 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!-- maintainer-needed -->
 	<upstream>
 		<bugs-to>mailto:feh@fehcom.de</bugs-to>
 	</upstream>
-	<maintainer type="person">
-		<email>powerman-asdf@yandex.ru</email>
-		<name>Alex Efros</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		sslserver, sslclient, and sslhandle are command-line tools for
 		building SSL client-server applications. They conform to the UNIX
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
index 50b5ef4f3c93..ddb3b08ee588 100644
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86"
 IUSE="bindist perl libressl"
 
 DEPEND="libressl? ( dev-libs/libressl:0= )
diff --git a/sys-apps/usbredir/Manifest b/sys-apps/usbredir/Manifest
index 0cbc710d3283..14b8cdc36a0d 100644
--- a/sys-apps/usbredir/Manifest
+++ b/sys-apps/usbredir/Manifest
@@ -4,6 +4,6 @@ DIST usbredir-0.7.1_p20180211-patches.tar.xz 12508 BLAKE2B 57479444752070147583a
 DIST usbredir-0.8.0.tar.bz2 331349 BLAKE2B 0190b4ab35cd554c13b65d30756b7b018e7ce82c72e7dddbaf05b8a704bd8a25724c4ac4759e1b86dfadb64ad7ade75c05365ab9ae3152f8fa60e909bc5e183b SHA512 976274adf08f8691b0961f5238021e988a4347873d0c67576038f44cbdaf25c2bb325d8cede0a507933b719f9715b1508ccd1d8f52fccd36f13a7640553dc108
 EBUILD usbredir-0.7.1_p20170503.ebuild 1003 BLAKE2B bb0837a9d6c069743bea46321fa5381cec6e0ecdab4d3cfa0a4a745a7ef0b388f399e6d4cfebc1d1a50a72e888360ef05edd7692d7ada755375973a3e60d75c5 SHA512 b8ec95d79b4761d79bde59f077057a33747c050df4388bcd94f8101afa288220be67ddb0d242cdadc897fb3e686685cba04e8a1c7b4c6f6d245a84d625a0c2ba
 EBUILD usbredir-0.7.1_p20180211.ebuild 1015 BLAKE2B 414cbca6d217eff50399838c4ecf2347cf21d9dd1e0db647f3226e29ef310acb23cebbf0cb070c04b576d24bc1319fdcb8287ad5d4dd844a966e37a41bbbf31f SHA512 9c0677daf7aad198167007d60b271af0a94f9d92315b2f3b9f0d1b2fa20c0a2960db10d6d4b10a07c73e3a9efc8d5843b06eed05d6a8a89d65882f2ae8f41d98
-EBUILD usbredir-0.8.0.ebuild 921 BLAKE2B cb5af912db31f71676d02ee218879c5376001f874679e06fd98a287eff3f35608699195f7f68cff955a93679acef691671b34b11fa77ca2f4bd7864a85a6da43 SHA512 dd32eda4402a98211b51ecbd28423f967228f2bc7cc095679feae79de84234fb0fd6d13fd1da59890b9773496c35077efc3feda028ba57c200ee4d349d0861b2
+EBUILD usbredir-0.8.0.ebuild 920 BLAKE2B 311afcb7250e8710026222309b4e5bfbe8cf2fa0e2d26f57c63ef882ae8b05137cbdab4594cb3afd5649d805ae302f8cb4cb17e3ffe4a1011da67c04759fc7fe SHA512 427f8d66cd133c2532512f3d1213cc2719214b0b6eea829ab3406996a4d87e84d29e5939601b20c5e93eac59098e40882907feec910a308fca9b3277df9a9555
 EBUILD usbredir-9999.ebuild 852 BLAKE2B e6a96cc5978957733801a69c92d4b47f39ddf81415bea571f88eb2c18e8b8f6a90af63f2cdc21c8d16112eecd941a997b8b5c70ade8fc17ab41cf5b94335ac9b SHA512 34ea35e062d41cce07d9985b3ffa6a0e666d1794f9cf964ed962eb809c9ae7da013d4e93bae501f3eabbe2e44c302e35e7c6ff0fb20309060caac6c9a1e7a54b
 MISC metadata.xml 381 BLAKE2B 63160ad268e74a23031e19d54e171504f751e2337e6dc059215942052518e09e945796ec6522828eee63fc872be396f9f47f85a8b1ad970904f764e7e5a222a7 SHA512 a4363c96453be6c53dff19c47739440d00f03b7994a2c993f9be0608f2a1b7a4ac8e9178a4784a74dd51b97cd0de37cf0aad209041f2b03c65864b2798f9684a
diff --git a/sys-apps/usbredir/usbredir-0.8.0.ebuild b/sys-apps/usbredir/usbredir-0.8.0.ebuild
index 26b14b7a324b..a62437dc2019 100644
--- a/sys-apps/usbredir/usbredir-0.8.0.ebuild
+++ b/sys-apps/usbredir/usbredir-0.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.spice-space.org/download/usbredir/usbredir-${MY_PV}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND="virtual/libusb:1"
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index 918eb5007f75..0e328397059c 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -4,5 +4,5 @@ DIST usbutils-010.tar.xz 308344 BLAKE2B 5f0ba85564acaf60faad0e187e7ed5c870056cf8
 DIST usbutils-012.tar.xz 98388 BLAKE2B a19d64edeb08bafe3e6a0d6be7cb5196cebb68623cfb5cd21941f109a3f3def774382bc6fe8b68398278e530417190030c8dd39ab982c088329c7acbb36cb672 SHA512 e26a60229e6eed5de670d6511dd1fa5ee3453cc5a848820531b46a1678b69378a2a45c29e24a218a8e7065c2c345356f03a2992f8298ddae6c8026d181f8de66
 EBUILD usbutils-009.ebuild 1140 BLAKE2B b2ab8316a9ba8533af0322eca801c939465dae972186d3ffb21cdd3ce351c6cc39264e113d095248df4509c489e1faed52e2f17477ddc71bd1924f4c1bce40d3 SHA512 c549f4aa39fa1755bdbd769647c27c33a7549b6c5540dc8271ae81106aaf5f245b25e72868b8d69389c1525bafab5b407c92053a944887ca8db7476caacae2d8
 EBUILD usbutils-010-r1.ebuild 1242 BLAKE2B 9cb5866ec3bcac85a2e3d90e24e231fa26e67f8b16c6ee25811c610d08d1775a3bb2be31478cccbfca6f1b47eb75844ab0edf5f3f8710416b530a9e0f2e7fc0e SHA512 1a39ed7991b7fca60df33a157e4d27f81acac49184bb7287579849e3bdba086f1187caa9bf6da63e2d85d8e0911a9803b2cfd6ab51f1027587dd0adc4e5d256a
-EBUILD usbutils-012.ebuild 1207 BLAKE2B 9ec24eb9d872c49bcb96f8cd374fb57acd92f6463e9195899d150a2c8ed93a7463c00c6381a200005e2d19d9897983177245f85418a5bcbef373c9227225c5ff SHA512 2285eb0553c0a6836da51f66b1b9841a97b0565694f7584681a110f4a53bf9024af522ad7d2577cef578c9e52d01f242911710f50c972f5d1ee26508a2333ad7
+EBUILD usbutils-012.ebuild 1198 BLAKE2B f0952377a3e94cde2e205ad0d47c78459ec7a623230233fd6c8d49f3925e9a4c163892e798008879cb51a8b0df99957bd58e94f8ee5518715879011e419e1d27 SHA512 f55e68020504640468567e54cf41fe8c526135f73c16f6c8b6dcb214a550c8f76412035739ddd2f1d62d5bece2d8ef25cfa5ddecb20e3f3aedfb8a79cfe69dbb
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/usbutils/usbutils-012.ebuild b/sys-apps/usbutils/usbutils-012.ebuild
index 0c6e2bbf194d..d70c22154812 100644
--- a/sys-apps/usbutils/usbutils-012.ebuild
+++ b/sys-apps/usbutils/usbutils-012.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 9dec8a43ad8b..2d6d9211e716 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -8,11 +8,11 @@ DIST util-linux-2.33.2.tar.xz 4707024 BLAKE2B fdeed0a236edd26d268bccca8cde2cf1b7
 DIST util-linux-2.34.tar.xz 4974812 BLAKE2B d26b2f74d490eaee0a40d4c75a1a351ba165b4a52f9bbf6cf9d1afd7ae1382a3a3dfe41180584e97e9aaad6950f604cad928f30747590e3e1e669c8797689758 SHA512 2d0b76f63d32e7afb7acf61a83fabbfd58baa34ab78b3a331ce87f9c676a5fd71c56a493ded95039540d2c46b6048caaa38d7fb4491eb3d52d7b09dc54655cd7
 DIST util-linux-2.35.1.tar.xz 5138360 BLAKE2B 08c16d4d9fd670b62c2d664feda2cfa53d0cecc36bbaa2c3ed5960bf70f905f11caa7a904c63f36e12b472f10b8e781351cca0cf2f858c2b66e4fd0204b1c456 SHA512 6e27e08bfc02378970f015decfea5a52d6c342c4c8f4ac48dd07d248485eb797e506d91d290dbbca344c3e5cfe1fc150db80a23d510367427232f5abeabe591a
 DIST util-linux-2.35.2.tar.xz 5150488 BLAKE2B 93eb90ab33db7795b46425ec4ec87f8a2d3d6e0dad671345375ea02efd654bf72041932d30b41bea494e4b62952e2fd14ea9f9e6c738d4eb4b050bd170b9bb0e SHA512 59e038ba71aa74c9af6f927b357483a965f675ab3ffcd25cf0c1b043656312d2d2d07c55659fd3da69ede165bec313e0ae7e1cd73758e49681ae610604b399a2
-DIST util-linux-2.36-rc1.tar.xz 5183900 BLAKE2B 5bdb0dd03835fc3e46585192aaf7320e388a01ec7bc2103104663882e81f2aa7313fce029a0e9ce848f114b06852a3d9a7166eda9246b4df72b65f8a557e9b68 SHA512 1a329d21dabe417940c637dc5653d35422e0c997eb044fc9b2e46b1606cb24bb19fee8a234c9c29d485affdf177d4d02f4d6e011349446394d8cee7015b1d2bb
+DIST util-linux-2.36.tar.xz 5242420 BLAKE2B a03b626a376815f37a17b3808d1d421c7ec27a133edf857116603de38f7e13f527687691d0c8aa68f4f6868be6f3bcc64573d759308d74731107e02067449ce6 SHA512 cbb4975da8d99a1edd45514171d59ea7b019ce0f77a81e88b447a733f725e91c53540d9dc78bc626dc011dca129b8b150aaf9e64ccf62a4202ae816581acf4fd
 EBUILD util-linux-2.33.2.ebuild 8417 BLAKE2B 3b6971e04a78a962f7bbd5e6b663ce3408d57befe412d40c6b4b05777f40aea034e9f5f52872aea7537393210a2127fa952ed548061e89c15ef627987d2cfcec SHA512 7a1e0c679a1c69f2e64b54c6897a5e7c430bd8ce1fde91f9b02a00dfec115ec0c2deccbc760c1280fa092f8782c48610366828b4ebdbbaa10b2a6741a1a65a03
 EBUILD util-linux-2.34-r3.ebuild 8450 BLAKE2B 84795217360708525a23bad91268d45c997fb0ae87215a7a0c9027e2245fb98decc6f523faff98855b101e380f49663e6f7b34bb82d18d93641326e91567edf2 SHA512 3444d77384f176ff6c1b3c7f023c90b021723a4158456b504fc927b141a1ad438dfe59802d297fc136cf55d08f01be002d8f136b85df50fa762d083abacb4857
 EBUILD util-linux-2.35.1-r2.ebuild 9020 BLAKE2B 85036f850b775f5474b32601392acf488b580cbeae534ed3715f87baf285c7b7a188d4a0621156c7baa68a228e77ccbde4d459a42863b020a36bfff1814c54f5 SHA512 7b7bf0a46658c32a83a96b4d4d9a1e7dd0ea325a1593689a9187ef00c55ffdedb4d786ba2ad96b488c40fe806dae143d5957c78f445bd70bbfd0ba179a0242a6
-EBUILD util-linux-2.35.2.ebuild 8898 BLAKE2B 8dfc5420167557be40ab8cc6570a847689af2f7aa9c26fbee34684970922e58fe49eb4d551a2918887e7c9d756d98a7aec81fde60240e43a4c9072c67b285329 SHA512 b302f3c8cb38ac8adfde110c17989d7f5ba9dc54e9cf89b0b5c9628b1835017c2d963f0bc34bec7d7195c9d06abdba36d087bffa301c58d65d749b6fc38b876b
-EBUILD util-linux-2.36_rc1.ebuild 8827 BLAKE2B 8d93a0b2f43af1cb3ec7c54e257f270ffd854a4f51181bfface98d800c75f8f38d40f3d91bcc8336ef0671698a0304da219947e02d4ebf3c1f7955a2a9ca4752 SHA512 8b9794bcbfaa4f653b1a4bfffaddf9a681f8de4e24feae4d890df4a01f55afdbc01021a5c06176470c07233c9fd34d67a93efc1116817c7f105dbd0741281368
+EBUILD util-linux-2.35.2.ebuild 8895 BLAKE2B b22b69d7c3ca75bff788a94c5e9c7c7122249a0f11906d26af5cc892333d2d24dbab458f208ec30bcb013115e204a64bff00d73f1dc2179c7b3a483b6c48a865 SHA512 4a39d8705ee55be0dc59582cc52e2b8f9095c0f130d069e9cd1bb74fbd51cbfcadebe370538b308fb769e3cdd378fc92bb8fa8ddc52e12a8627542bb57ab13da
+EBUILD util-linux-2.36.ebuild 8827 BLAKE2B 8d93a0b2f43af1cb3ec7c54e257f270ffd854a4f51181bfface98d800c75f8f38d40f3d91bcc8336ef0671698a0304da219947e02d4ebf3c1f7955a2a9ca4752 SHA512 8b9794bcbfaa4f653b1a4bfffaddf9a681f8de4e24feae4d890df4a01f55afdbc01021a5c06176470c07233c9fd34d67a93efc1116817c7f105dbd0741281368
 EBUILD util-linux-9999.ebuild 8840 BLAKE2B 98ec331609c6d1b2bde50590b97f32f9644299f71b264d79d31ae9568432188bac49b8c66855b70dac3afd022cee4e9188200ac9149ea468e46e69ad8c767729 SHA512 c3b65a0e43d738b6b36d27ead3a0daacb03360914757723b6017ef44a00fb592310f87fce7af0d31d390b00e70b7b5d4f047679f5d7d3549bf7e1ddfa9f0908b
 MISC metadata.xml 1364 BLAKE2B 0221b836433dfffc122d794272c554b6114862efb7d474e68507fb399e56cf32bc86f0dba0d519782634eb45638d2e15dd25c8147d7209f5a3de536ba7ecf38b SHA512 094e0b577f2322b73ace41db762ea88736650a3f3010fb8a26f649a51efc83d09a66bbdaf7a24b24164264b2dbbf7839be49b21e0a125c95ca39f1c4cd6201e4
diff --git a/sys-apps/util-linux/util-linux-2.35.2.ebuild b/sys-apps/util-linux/util-linux-2.35.2.ebuild
index f4a7cb79bb8a..ccb654848970 100644
--- a/sys-apps/util-linux/util-linux-2.35.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.35.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
diff --git a/sys-apps/util-linux/util-linux-2.36_rc1.ebuild b/sys-apps/util-linux/util-linux-2.36.ebuild
index 904c2e473118..904c2e473118 100644
--- a/sys-apps/util-linux/util-linux-2.36_rc1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.36.ebuild
diff --git a/sys-apps/xdg-desktop-portal-gtk/Manifest b/sys-apps/xdg-desktop-portal-gtk/Manifest
new file mode 100644
index 000000000000..00eacc253567
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal-gtk/Manifest
@@ -0,0 +1,3 @@
+DIST xdg-desktop-portal-gtk-1.7.1.tar.xz 369932 BLAKE2B 510652a0025fc27d447a0482552a0ae9c8e08f0471166466356043c026c922b1b0779053bcc7902f041f93ccd71e2e71882594eee7f4dda8cea295e419192941 SHA512 2a2326559a4ed7e44ffddc1a6881c25f14822465f5660bc806e7d8a120d66268e2987329f4bc9f7821329eea41ee96b15a39c5f7ac805a1e04d0604a88b31c08
+EBUILD xdg-desktop-portal-gtk-1.7.1_pre.ebuild 954 BLAKE2B 585d0c8aab3bd3da4367ef1a16a6f7fef458ae48197725a08e6984d3920159c0939a4a26aa3d6490e6bd78e44e6baaa073c748d639baac87cea7ecca0fcdfa7e SHA512 e1f4505340f25307ec7e4ac1ff572aba38df46e51580b738b9ed0c76a4758b2d75ab804f77a924d7cf3396d91302d0682997f90b95335943917aa243deda6a73
+MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/sys-apps/xdg-desktop-portal-gtk/metadata.xml b/sys-apps/xdg-desktop-portal-gtk/metadata.xml
new file mode 100644
index 000000000000..996e7cacd217
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal-gtk/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.7.1_pre.ebuild b/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.7.1_pre.ebuild
new file mode 100644
index 000000000000..ed07582361da
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.7.1_pre.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+MY_PV="${PV//_pre*}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="portal backend implementation that is using GTK+ and various pieces of GNOME"
+HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal-gtk"
+SRC_URI="https://github.com/flatpak/${PN}/releases/download/${MY_PV}/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+IUSE="wayland X"
+
+BDEPEND="
+	dev-util/gdbus-codegen
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DEPEND="
+	dev-libs/glib:2
+	gnome-base/gnome-desktop:3=
+	media-libs/fontconfig
+	sys-apps/dbus
+	>=sys-apps/xdg-desktop-portal-1.7
+	x11-libs/cairo[X?]
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[wayland?,X?]
+"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	local myeconfargs=(
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest
index a4dec3ada6b3..8405a5a73e60 100644
--- a/sys-apps/xdg-desktop-portal/Manifest
+++ b/sys-apps/xdg-desktop-portal/Manifest
@@ -1,5 +1,5 @@
 DIST xdg-desktop-portal-1.6.0.tar.xz 453516 BLAKE2B 13ffcb21de6b61ddeb0782dcfc7b684287e54f94b9494b19589178594d1383a15048b8f9aeed7fb1260c3a2c967b267061d1db401085a686938c8629de8824c3 SHA512 7a0c702851762a55326142cb6b470205775284e0f749620ae6b648f216afcd684f8b20500339680b42812f628634344c9e826ab7cf13dd918fdbf733381d44ce
 DIST xdg-desktop-portal-1.7.2.tar.xz 468140 BLAKE2B 6f2e92f79424f79e778db9c1bf94555332f1f88ef42f84e477c8784be74ce8e2cf924f34da5e17d78359bd493370dcee62aec77f60c9df5cf3475d745f3e4d8e SHA512 fac64281e89d8bf17c6f1b3751c159d9ca6c2896b71bb83622411bf2dc9b7813974d19902c81c3576b325c98edf4dae22ccc3fe290e32f717730b6aa3afbdc12
 EBUILD xdg-desktop-portal-1.6.0-r2.ebuild 1058 BLAKE2B cc38d747768e44535808c0b0b3305299a978eb73a62ab1864f967d80a38edd3ead4ee340a36345b955b1f1ff77a1f037c563c6ddc6c2eb5bd61eaecb065eaeec SHA512 fcabc1a7d2da0d0ddadd790156439d806608b0b8d917bb531c78e54ffdef745d20e7e7c61c61f606e1df6888ea17652c55afbc303b77cba3ec8c6ff2be849f49
-EBUILD xdg-desktop-portal-1.7.2.ebuild 1051 BLAKE2B c0287fb8e4dc90b2459c8755a4f4cd7b011f1f3c484a398429dca07910d656486670ecfa23060d90e174e0bdb0c6827fd99d9c9730ebf1e0ed11d96216989d16 SHA512 6cd390505de64d2c55a5c371fcab8ff3f2e9616681d53530b8a9b4862afe1c58a9d79950f840e36457b94a0f52353e015a169511844a361623a45b9ad22e4977
+EBUILD xdg-desktop-portal-1.7.2.ebuild 1020 BLAKE2B d3f2a4342dec9eda78075f9f883256a89ee8a528dc767aab1cc69f2bff64cf59fad5f2c4dea30a4d0cfe24deeb7dfb6bd87a360fb68e3d923c3b875f53fd5837 SHA512 96249acb7fac64ac9f95d9ac280cab1beee6f7ce6abe5b2cce96ab9ae06dbaa3d98456c030cdec79d07b4aa60a13f14f8e06e563feb249e5bd4ef9c82ba5048e
 MISC metadata.xml 360 BLAKE2B 1e3fae0173fab20df0be6a2bd8432477d2c0ab2b9c4272e72a9d8a9eee3255c56311364ea079d288f87032fbc2ec8cad69f32a6bc41b152d19e307ee84493b49 SHA512 4e7232bd03fad6442491ce16c155b0d447050dfc383bb2c16b51297c8c2dcc2793b6d9ce6703451e9516d5a3017fb9e20e85ed7208c94c0faa4489bcbd897e22
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.7.2.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.7.2.ebuild
index 5037ce682d40..e217ed6874fe 100644
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.7.2.ebuild
+++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.7.2.ebuild
@@ -11,17 +11,13 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="doc geolocation screencast"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="geolocation screencast"
 
 BDEPEND="
 	dev-util/gdbus-codegen
 	sys-devel/gettext
 	virtual/pkgconfig
-	doc? (
-		app-text/docbook-xml-dtd:4.3
-		app-text/xmlto
-	)
 "
 DEPEND="
 	dev-libs/glib:2
@@ -38,9 +34,9 @@ RDEPEND="${DEPEND}
 src_configure() {
 	local myeconfargs=(
 		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-		$(use_enable doc docbook-docs)
 		$(use_enable geolocation geoclue)
 		$(use_enable screencast pipewire)
+		--disable-docbook-docs # flatpak not packaged
 		--disable-libportal # not packaged
 	)
 	econf "${myeconfargs[@]}"
author	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
commit	3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree	c513fe68548b40365c1c2ebfe35c58ad431cdd77 /sys-apps
parent	05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)