gentoo resync : 15.06.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
commit: d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree: 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /sys-apps
parent: e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)
134 files changed, 1932 insertions, 2167 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index a4a0d3a39a3f..5a8cad03f6e3 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/ack/Manifest b/sys-apps/ack/Manifest
index 54da25079eb6..5fb2cecc505b 100644
--- a/sys-apps/ack/Manifest
+++ b/sys-apps/ack/Manifest
@@ -1,11 +1,6 @@
-AUX ack-3.0.0-gentoo.patch 428 BLAKE2B 331f35f3ee7ab8140110bd48f499894e344bdac8ea592b0da4f8b7a5ba3d911bc28158346f94ed062cea3a1fc5bed7140fd246d6d637b70bc2eb8d73b66d0780 SHA512 a88cec8b7b4c53bb6f176e5ff6d88ff3a7888ad23e025b527a98adf649df9ac205c14686bf1565555743bf84f46db3ecfd6bb42ef6f44d817698818d79eef938
 AUX ack-3.3.0-gentoo.patch 315 BLAKE2B 8fb44f3540a3567519f626c954f52c37945a48644de89e541685c37c3fed952802fd3cf25ebe9965f2e619ca405645bb7ec6b72dcc94756d9406b23becbcf2a1 SHA512 c889acf671232070b252c1ac3d041cf0f08d73bff14e76418433f7304d313faa8d50229c2b0ab4a11e3f0948f60590e8cfd3bbb93d094616c3db3967a15711da
-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 799 BLAKE2B e7e834930c8486c65253d08383544d41ad662fcff5b8617452b4736ad66935c2ea0545338382b267fd33f806c440e75ac260c439278d6fe2b06754cc495ee7ed SHA512 d1b580c7218c6ab3d8fffd6c486286bec34512f2cecef10ef073528a4d6f5f9a4e57c1e56a8b76d5acc8b70d6f107e501d2f32d441661f9d36e952da2dbc285b
-EBUILD ack-3.2.0.ebuild 801 BLAKE2B 2e8cfb420259f4738032d84d9b02021c9ea27ef7a57679ced10f9457c611935a1a7724dedd1fdc97ea71f62a4c453470a91a0998ecd686d1623b902f70a187d8 SHA512 21117f19bb5fe3da21042542d5f26e1959c22aea59fea2f44137da6a9398043a64934ee3ac4d5de1287a057952ef40dfd409ffdfdb5f2866e30160b53d157c7a
-EBUILD ack-3.3.1.ebuild 801 BLAKE2B 1ba6f048ecd103d8bed6aba66158336d3a6926376e51f5e0142396bd0ae8ccfc10ad2c45e8ee767c473c348ac0c7d8d77d2b4c2a3dad8b53db464943c90a1cf9 SHA512 bc0dfb7d5b4de1a61b59bee9654370ee6a6a121f09370af64b63e1b7717861122c15095fb9277936dfc2d01dcdf387644f5214e3367c14d41c3bf163d96e1c0a
+DIST ack-v3.5.0.tar.gz 249718 BLAKE2B dedd11b424f7274c45dabfd0ddf2c92ee9d15ccf40d251c79159aef6e93071c963291722a2024db1d4828ae02c1310d3fec366ca8bd5f249da2c0c73f7e303cb SHA512 f5b9321fc62cf2ab86fa7dc933dd44245314ebd26bee2d8769f85c15fc8b4493d0757ca4430708f0ebea5692f9c73ad17cc00bc46d1f611b8489b30811df307d
 EBUILD ack-3.4.0.ebuild 817 BLAKE2B 8c6ea1cbe26c32e24e89bc28da057ea62b8cfb39af9b2d47abd91b6468c42c2389e0cc81b4ba3e905128b3dd3fd5046f07639f5870385e01dff2ad23801d083d SHA512 c2b0cf0c6147bea5bf242e0041ce7156aa87ec6c4b3c82ae07694d6167b99570123da0aa581bd40369c4ff267fe0117556635f7462c5252b3e099e0e992eeb5a
+EBUILD ack-3.5.0.ebuild 819 BLAKE2B a7dd4fed8addd0eb46ee172fe2acad9c0441d5cb3de5606af4d2d6220bdadca87515cf785d42a5558b94d3b9b0bf14d74b20fc640b592b66fc2c6abc021457b9 SHA512 c839f2279a913f7386e8a2fc8fb76357957092a77c36094ba428ba9a89450954dc6dc119ff6f740dd08a928ed47556d461119a8ae170713b923115a48359dcc9
 MISC metadata.xml 1749 BLAKE2B c8803cd3161065885162a0a3c21a426e36914ff7796b3f99eb57f1e1db40be7cb789df331dde048e112f6ab691a30607100a521091ece034d2edabffc22751ee SHA512 91bee1d028fac56e397138f7db10742721a509c3ba1f7de21aebe5d9c334b2bc56736cbedf47df90f3dec5bc6193feacccceb45ad247e54fefdae5a06df65dac
diff --git a/sys-apps/ack/ack-3.0.0.ebuild b/sys-apps/ack/ack-3.0.0.ebuild
deleted file mode 100644
index 01badc0b6234..000000000000
--- a/sys-apps/ack/ack-3.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-perl/File-Next-1.160.0"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/IO-Tty )"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.0.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/ack-3.2.0.ebuild b/sys-apps/ack/ack-3.2.0.ebuild
deleted file mode 100644
index 4ae50c324a70..000000000000
--- a/sys-apps/ack/ack-3.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-perl/File-Next-1.180.0"
-DEPEND="${RDEPEND}
-	test? ( dev-perl/IO-Tty )"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.0.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/ack-3.3.1.ebuild b/sys-apps/ack/ack-3.5.0.ebuild
index cb79809565e6..fe8c7cc38c9b 100644
--- a/sys-apps/ack/ack-3.3.1.ebuild
+++ b/sys-apps/ack/ack-3.5.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://beyondgrep.com"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/ack/files/ack-3.0.0-gentoo.patch b/sys-apps/ack/files/ack-3.0.0-gentoo.patch
deleted file mode 100644
index 09972519ed89..000000000000
--- a/sys-apps/ack/files/ack-3.0.0-gentoo.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/lib/App/Ack/ConfigDefault.pm
-+++ b/lib/App/Ack/ConfigDefault.pm
-@@ -263,6 +263,10 @@
- # http://en.wikipedia.org/wiki/Fortran
- --type-add=fortran:ext:f,f77,f90,f95,f03,for,ftn,fpp
- 
-+# Gentoo
-+# https://www.gentoo.org/
-+--type-add=gentoo:ext:ebuild,eclass
-+
- # Go
- # http://golang.org/
- --type-add=go:ext:go
---- a/t/ack-filetypes.t
-+++ b/t/ack-filetypes.t
-@@ -26,6 +26,7 @@
- elisp
- erlang
- fortran
-+gentoo
- go
- groovy
- gsp
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index 353187705100..ede2a50e5abe 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -1,7 +1,3 @@
-DIST acl-2.2.53.tar.gz 524300 BLAKE2B a4c602b18ab1a7932dce38c8dacf3a3026a3100a8a7e61f0740886ec7154a7738ca641953dc1253b5574580815d7f547a99bdd0cc0ee87238a1995abe97eb9d8 SHA512 176b7957fe0e7618e0b7bf2ac5071f7fa29417df718cce977661a576fa184e4af9d303b591c9d556b6ba8923e799457343afa401f5a9f7ecd9022185a4e06716
-DIST acl-2.3.0.tar.gz 518155 BLAKE2B 8635e8616a94f6f62de7ece2ccbc789d48f081608493b759150f4bf9d1c98098f5660cc1ec95c8a54bbd0e7295245e1bf77f4afd17f8521172bed790ce217c88 SHA512 77c0f387955d98ee086020943ea5d50ddcf5a36981cb28d2e90c74c20c3893c13c3fa9bc5bc47f79957987ec19afd00ad0b144a1387562b887c1f5fb5e6850cc
 DIST acl-2.3.1.tar.gz 518292 BLAKE2B 82f88b1b2cafa81efa277ea9d1b4872864a9eb259839cf39a429fad8b702dc7158c24e62ca7dd0e72b028e63951798997caca7de9aa40e73f8adc462e7a31bdd SHA512 f101e27058c959f4c412f475c3fc77a90d1ead8728701e4ce04ff08b34139d35e0e72278c9ac7622ba6054e81c0aeca066e09491b5f5666462e3866705a0e892
-EBUILD acl-2.2.53-r1.ebuild 1346 BLAKE2B f216dbeb2516b42566e04192a4d81a63fcd073f3db1af286e060bce95d3f31179fba71cce208955562245bfdbc435889d65ee990ec92988bc96d8cff8450aa92 SHA512 875c37f2f9cfea1725ef3154be4d87119ef187d64d6e1139b1a831536603c5691574806f5c03bf8aedb422028da688b63a5fb4dc6a3d2ec2ee31d6022d7c0922
-EBUILD acl-2.3.0.ebuild 1354 BLAKE2B 6463639b3008515864594574eefde4ab927ba559087d8f989beb1dca1f928ff73a583e46b7f0415a8e6d7a21a4930b444db811ed8cbcd39b89f79364a3a6cba5 SHA512 de765bf94d376c2ba4ece69c9750b717304676639a145362ee598e0b218cad21f1dfb151aa82df6f338d0944a26900788950220dcaf60a5c33e4225241578a8e
 EBUILD acl-2.3.1.ebuild 1346 BLAKE2B f216dbeb2516b42566e04192a4d81a63fcd073f3db1af286e060bce95d3f31179fba71cce208955562245bfdbc435889d65ee990ec92988bc96d8cff8450aa92 SHA512 875c37f2f9cfea1725ef3154be4d87119ef187d64d6e1139b1a831536603c5691574806f5c03bf8aedb422028da688b63a5fb4dc6a3d2ec2ee31d6022d7c0922
 MISC metadata.xml 293 BLAKE2B 2b8092a768f4f905c414e9bde92180e659085a60fd6ec13cecb29b6a88471941e7c8e2ad86f2864f44fa4f74589b20433ce64c3e89c3e210838b9d997deda136 SHA512 1e61b3f2d76e95eca037de073678326400b069526c8a308ca4169ce67d3e47c8cd199cca59f83fa245bb5fcbaa9efe7f31e34cf8588d69383ed0da78ab54cfaa
diff --git a/sys-apps/acl/acl-2.2.53-r1.ebuild b/sys-apps/acl/acl-2.2.53-r1.ebuild
deleted file mode 100644
index 5ab955ac8363..000000000000
--- a/sys-apps/acl/acl-2.2.53-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic libtool multilib-minimal usr-ldscript
-
-DESCRIPTION="Access control list utilities, libraries, and headers"
-HOMEPAGE="https://savannah.nongnu.org/projects/acl"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="nls static-libs"
-
-RDEPEND="
-	>=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-
-	# bug #580792
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# Filter out -flto flags as they break getfacl/setfacl binaries
-	# bug #667372
-	filter-flags -flto*
-
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		$(use_enable static-libs static)
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(use_enable nls)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	# Tests call native binaries with an LD_PRELOAD wrapper
-	# bug #772356
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	default
-
-	# Move shared libs to /
-	gen_usr_ldscript -a acl
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}" -type f -name "*.la" -delete || die
-	fi
-}
diff --git a/sys-apps/acl/acl-2.3.0.ebuild b/sys-apps/acl/acl-2.3.0.ebuild
deleted file mode 100644
index 7ffef6cfc235..000000000000
--- a/sys-apps/acl/acl-2.3.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic libtool multilib-minimal usr-ldscript
-
-DESCRIPTION="Access control list utilities, libraries, and headers"
-HOMEPAGE="https://savannah.nongnu.org/projects/acl"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="nls static-libs"
-
-RDEPEND="
-	>=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-
-	# bug #580792
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# Filter out -flto flags as they break getfacl/setfacl binaries
-	# bug #667372
-	filter-flags -flto*
-
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		$(use_enable static-libs static)
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(use_enable nls)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_test() {
-	# Tests call native binaries with an LD_PRELOAD wrapper
-	# bug #772356
-	multilib_is_native_abi && default
-}
-
-multilib_src_install() {
-	default
-
-	# Move shared libs to /
-	gen_usr_ldscript -a acl
-}
-
-multilib_src_install_all() {
-	if ! use static-libs ; then
-		find "${ED}" -type f -name "*.la" -delete || die
-	fi
-}
diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index 355d74853c8d..3dd34918be42 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,7 +1,3 @@
-DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4 SHA512 d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651
-DIST apparmor-3.0.0.tar.gz 7780686 BLAKE2B a9d9edb4fd2cb32b3db322a3f145aac7cea40fac3401b82947b2c5183598cc326d70859466823e3ac0a2227483c7ed7ba0b2f727e9fb7fbf532468716ef8d18f SHA512 2465a8bc400e24e548b0589b7b022fb8325c53858429b9c54204f989d5589d7bd99c9507bde88a48f9965a55edcbac98efeeb6b93aeefe6a27afa0b7e851aea6
 DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
-EBUILD apparmor-utils-2.13.4-r1.ebuild 2225 BLAKE2B 03e025478bc9bf820f2713f46560977a896b8c13d9ad7a6d10d5275c65381dc8ba583029ccf55ce97edfe53de30e34221544748b55441f299cf4880453f71b85 SHA512 231dcfdfc50e8ad87f048f5da649833260078889901d42fe9755ad2ad5f40a9f182825249ae3b4e4fec26975f2000eb35beed09bfab06a1ba80807d104febb0b
-EBUILD apparmor-utils-3.0.0-r1.ebuild 2270 BLAKE2B 95fe0b156112e24ce36ddd845ebba2b39f2e46f9b2ebfeca8caf51c8677652f981fe96d59c67964c9302aa0d5347202581c95f8c816fc664547e6f4d2b6f4cc5 SHA512 9e7a204150878852efafee1c9d76d63ae247e5a110f779f2262e47eec0ec168489ad9fb6a14b3c0cb5e6c36357e64c06c326de453056530c150a2cdbbb9166ba
 EBUILD apparmor-utils-3.0.1.ebuild 2271 BLAKE2B 3f271bdaace473c8a1625f2655ff53e14c650072074fe9efdbea7809ec2b9faccdefe969505435f6acfe85f1763b53e6ff574132580f82f04d5cdcf0002386f6 SHA512 7464d7ce47e75ddfd4600306430ac26d25ced6f3a15874105c09e0749ddf80b17bd4ea9288f43cf05e7becd55ab7a9ab271361cd4b6f29ee7acafa5a3edc1689
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.13.4-r1.ebuild b/sys-apps/apparmor-utils/apparmor-utils-2.13.4-r1.ebuild
deleted file mode 100644
index 7e3b4f75a913..000000000000
--- a/sys-apps/apparmor-utils/apparmor-utils-2.13.4-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_7 )
-inherit eapi7-ver perl-module python-r1 toolchain-funcs
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="Additional userspace utils to assist with AppArmor profile management"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-	dev-lang/perl
-	~sys-libs/libapparmor-${PV}
-	${PYTHON_DEPS}"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
-	~sys-apps/apparmor-${PV}
-	dev-perl/Locale-gettext
-	dev-perl/RPC-XML
-	dev-perl/TermReadKey
-	virtual/perl-Data-Dumper
-	virtual/perl-Getopt-Long"
-
-S=${WORKDIR}/apparmor-${PV}
-
-src_prepare() {
-	default
-
-	sed -i binutils/Makefile \
-		-e 's/Bstatic/Bdynamic/g' || die
-
-	sed -i utils/aa-remove-unknown \
-		-e 's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
-}
-
-src_compile() {
-	python_setup
-
-	pushd utils > /dev/null || die
-	# launches non-make subprocesses causing "make jobserver unavailable"
-	# error messages to appear in generated code
-	emake -j1
-	popd > /dev/null || die
-
-	pushd binutils > /dev/null || die
-	export EXTRA_CFLAGS="${CFLAGS}"
-	emake CC="$(tc-getCC)" USE_SYSTEM=1
-	popd > /dev/null || die
-}
-
-src_install() {
-	pushd utils > /dev/null || die
-	perl_set_version
-	emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
-		VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
-
-	install_python() {
-		local -x PYTHONDONTWRITEBYTECODE=
-		"${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \
-			--root="${D}" --optimize 2
-	}
-
-	python_foreach_impl install_python
-	python_replicate_script "${D}"/usr/bin/aa-easyprof "${D}"/usr/sbin/apparmor_status \
-		"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined}
-	popd > /dev/null || die
-
-	pushd binutils > /dev/null || die
-	emake install DESTDIR="${D}" USE_SYSTEM=1
-	popd > /dev/null || die
-}
diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild
deleted file mode 100644
index 80e6fd6100d5..000000000000
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_7,3_8} )
-inherit eapi7-ver perl-module python-r1 toolchain-funcs
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="Additional userspace utils to assist with AppArmor profile management"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${MY_PV}/+download/apparmor-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-	dev-lang/perl
-	~sys-libs/libapparmor-${PV}
-	${PYTHON_DEPS}"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
-	~sys-apps/apparmor-${PV}
-	dev-perl/Locale-gettext
-	dev-perl/RPC-XML
-	dev-perl/TermReadKey
-	dev-python/notify2[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	virtual/perl-Data-Dumper
-	virtual/perl-Getopt-Long"
-
-S=${WORKDIR}/apparmor-${PV}
-
-src_prepare() {
-	default
-
-	sed -i binutils/Makefile \
-		-e 's/Bstatic/Bdynamic/g' || die
-
-	sed -i utils/aa-remove-unknown \
-		-e 's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
-}
-
-src_compile() {
-	python_setup
-
-	pushd utils > /dev/null || die
-	# launches non-make subprocesses causing "make jobserver unavailable"
-	# error messages to appear in generated code
-	emake -j1
-	popd > /dev/null || die
-
-	pushd binutils > /dev/null || die
-	export EXTRA_CFLAGS="${CFLAGS}"
-	emake CC="$(tc-getCC)" USE_SYSTEM=1
-	popd > /dev/null || die
-}
-
-src_install() {
-	pushd utils > /dev/null || die
-	perl_set_version
-	emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
-		VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
-
-	install_python() {
-		local -x PYTHONDONTWRITEBYTECODE=
-		"${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \
-			--root="${D}" --optimize 2
-	}
-
-	python_foreach_impl install_python
-	python_replicate_script "${D}"/usr/bin/aa-easyprof \
-		"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,unconfined}
-	popd > /dev/null || die
-
-	pushd binutils > /dev/null || die
-	emake install DESTDIR="${D}" USE_SYSTEM=1
-	popd > /dev/null || die
-}
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 52b6b667266a..54795177340e 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,15 +1,9 @@
 AUX apparmor-2.11.1-dynamic-link.patch 391 BLAKE2B a5326bd6d84b5ebe4a61067490b25c39a326c139437d73b3db5928332776b795b2405b4a1f6ee0b3aee3f496589b2d00b47cd4bba41f044c60fc8ad5d1a86102 SHA512 d0ef56293b556b0af74201321b01de5c763763ecfba8dac930f35c6f733667f148c59295c78edfab9d835893f5518a42aa38f16de7464e218fbd57727726713c
-AUX apparmor-2.13.1-makefile.patch 884 BLAKE2B 4400b00ab143c0ea3b1c14f996131fd023b66c01e694dcd9306d6e00f561f72a608df7a26e3692a8e851b0c91a227eb84d96fb5145b19535ee50ac61c37ec811 SHA512 c324d1dc2101e073df2bc6c3696396becb45e5c25e4c1d6797145554e0499c79353d3a2ad2cced18f42bb1cc315f8590ea2c1b7ee9a3882d5c483380f7c86c6d
 AUX apparmor-3.0.0-makefile.patch 653 BLAKE2B c14bef5b5dd471cfef24303097be44814782e9d533c7e12b4057db1bb3145b86f5f988798fa77dc97976556dbdccf9ee490372e2ce5ce450391841fdf194bcd5 SHA512 8cdd9a0c1489d50f891307b4a9dd13a320b9380b93990630723ae4a7d49766603db2a9568af2ce928d29cc01917b0f5f2e3d6fa0fd72476997fba4b07943b548
-AUX apparmor-init 1284 BLAKE2B 3329dadd3343ddbd9276b0a22a401d1cac6bea94abbd5bad897d9b9760742c1cc30dab5136d9a90e9f3068b6879d95d70376f5dec5fe1d13313dffc89a631fbb SHA512 4ee4747ec98a0828beb690bf5e01bc112d958bff4c68d60fc0cbb9f0707bd8daecc011dba3916aa6e6368f460eedce7f2ce42aad9ccea49a5d898dcae3d01148
 AUX apparmor-init-1 1235 BLAKE2B dbc333d8a90ec66303594db87b1865488813ad6698a3bcf47a509bdc41a93c886bb6cac60a126d9495e0825f9f76dd927b9b84a84154fc55f84bcfc9c934095b SHA512 06da247b62d6e612e0c48610c8c2e7831b9030659106482c8000758e591f3ce42b175210336b903e07b20eb5ef2cc3eb592424b06fe933449964e9c2262ebf35
 AUX apparmor.service 281 BLAKE2B 3d1ecfdc96ee2491e75e92dc3aae7c2aeeeef3bf6a7ae86f354126fd044e2da316303b3ba63ad6dbc747d59d423ea8e4df0f131090d0d7b405e0d303b3c32a71 SHA512 f6ba92053a93db0654a4290eb358afae4d7669cb89a02242544576d951fe57437c3570d92ac89ce4e9fd96c04c121f44523dd6bb136d58fea11424064375df31
 AUX apparmor_load.sh 84 BLAKE2B 05195286287d5cdf56a7f67e18073f75625cbfb1c9283a22c72ff60aa4a3fe4129b81702801ddd4045629558a022f084906464f8bb5325f31d43680c626a5ede SHA512 72bd10fdd32879854ee044941636d530453488596bab7aa6785b109f6cd7e2f822e9ff04b43c7c4265b2f42de13ec7f6649f9a58fed3d93b51dd1a2b541be3d7
 AUX apparmor_unload.sh 85 BLAKE2B 1559999897e288f452850080166dcdf67d15bd3cfa57f30aeddeba29bce2e1896126e8e4c82b41dd403f94d3f8ae9128448b0c5431c418ff82fd65df370653b5 SHA512 18a46176d043511af33fc77917e85dce5cb5deb30d2d86ea5261313a72c385b96c87fcd1fece9e555b6c424305d420876430a0a8fb11a5ec5edfef30f80dfd8d
-DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4 SHA512 d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651
-DIST apparmor-3.0.0.tar.gz 7780686 BLAKE2B a9d9edb4fd2cb32b3db322a3f145aac7cea40fac3401b82947b2c5183598cc326d70859466823e3ac0a2227483c7ed7ba0b2f727e9fb7fbf532468716ef8d18f SHA512 2465a8bc400e24e548b0589b7b022fb8325c53858429b9c54204f989d5589d7bd99c9507bde88a48f9965a55edcbac98efeeb6b93aeefe6a27afa0b7e851aea6
 DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
-EBUILD apparmor-2.13.4.ebuild 1501 BLAKE2B d71174bf84d654ec83b524f29a3b07005a0f635a26b39310c88a1d5a224f87bd51caa9ef6c3464a0ec5efc7fcaaef0501fbf35351995c27c4719285ce3b3dafd SHA512 3f6dc75808586ef5b50a62ac3a77aae2675b7551934b8909443246e41373a231212f6da8e34756b08da88a57deb9162f2bd141fc16d27a34fd7f94819558f919
-EBUILD apparmor-3.0.0.ebuild 1631 BLAKE2B 554f5fbdcdcde96debac49f3ecd615346c17f3f916f24b21ddec5970978d21e08450084cfd80135f273b153fe61596b96c55fd31b5eeef7f2b288c605d63c221 SHA512 4bd655a6fd9f99cfb1b53cba3a8441bccb864ff826f4e27c0bc91a84e7e35e3bd76a97b00f45c87aabf9d196be26b516a02d24f9ea22cccce43eb9ac77623451
 EBUILD apparmor-3.0.1.ebuild 1738 BLAKE2B cd4d8d6f808bb7c8475f24a8d1b36700d1ada1194105ff12d91da9d6e45cbb25479b3ccb6f41a08cc1473c2be2a78f12b017f357df003dd4572a04a4028c61af SHA512 0d2d0d9d17fdd4abc604d27fc4fcc5b62c3740186765ee6170967905996b00da5cb8b0543f5ca6f48e07f5d953fc8510fcb08981e55a21318a3f795ad3e8a4db
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-apps/apparmor/apparmor-2.13.4.ebuild b/sys-apps/apparmor/apparmor-2.13.4.ebuild
deleted file mode 100644
index a4c693e37c5c..000000000000
--- a/sys-apps/apparmor/apparmor-2.13.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-RESTRICT="test" # bug 675854
-
-RDEPEND="~sys-libs/libapparmor-${PV}"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/gettext
-	sys-devel/flex
-	doc? ( dev-tex/latex2html )
-"
-
-S=${WORKDIR}/apparmor-${PV}/parser
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.13.1-makefile.patch"
-	"${FILESDIR}/${PN}-2.11.1-dynamic-link.patch"
-)
-
-src_prepare() {
-	default
-
-	# remove warning about missing file that controls features
-	# we don't currently support
-	sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" USE_SYSTEM=1 arch manpages
-	use doc && emake pdf
-}
-
-src_test() {
-	emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check
-}
-
-src_install() {
-	emake DESTDIR="${D}" DISTRO="unknown" USE_SYSTEM=1 install
-
-	dodir /etc/apparmor.d/disable
-
-	newinitd "${FILESDIR}/${PN}-init" ${PN}
-	systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service
-
-	use doc && dodoc techdoc.pdf
-
-	exeinto /usr/share/apparmor
-	doexe "${FILESDIR}/apparmor_load.sh"
-	doexe "${FILESDIR}/apparmor_unload.sh"
-}
diff --git a/sys-apps/apparmor/apparmor-3.0.0.ebuild b/sys-apps/apparmor/apparmor-3.0.0.ebuild
deleted file mode 100644
index 36c5b717c4b8..000000000000
--- a/sys-apps/apparmor/apparmor-3.0.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-MY_PV="$(ver_cut 1-2)"
-
-DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
-HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${MY_PV}/+download/${PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-RESTRICT="test" # bug 675854
-
-RDEPEND="~sys-libs/libapparmor-${PV}"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/gettext
-	sys-devel/flex
-	doc? ( dev-tex/latex2html )
-"
-
-S=${WORKDIR}/apparmor-${PV}/parser
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.0-makefile.patch"
-	"${FILESDIR}/${PN}-2.11.1-dynamic-link.patch"
-)
-
-src_prepare() {
-	default
-
-	# remove warning about missing file that controls features
-	# we don't currently support
-	sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die
-
-	# bug 634782
-	sed -e "s/cpp/$(tc-getCPP) -/" \
-		-i ../common/list_capabilities.sh \
-		-i ../common/list_af_names.sh || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" USE_SYSTEM=1 arch manpages
-	use doc && emake pdf
-}
-
-src_test() {
-	emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check
-}
-
-src_install() {
-	emake DESTDIR="${D}" DISTRO="unknown" USE_SYSTEM=1 install
-
-	dodir /etc/apparmor.d/disable
-
-	newinitd "${FILESDIR}/${PN}-init-1" ${PN}
-	systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service
-
-	use doc && dodoc techdoc.pdf
-
-	exeinto /usr/share/apparmor
-	doexe "${FILESDIR}/apparmor_load.sh"
-	doexe "${FILESDIR}/apparmor_unload.sh"
-}
diff --git a/sys-apps/apparmor/files/apparmor-2.13.1-makefile.patch b/sys-apps/apparmor/files/apparmor-2.13.1-makefile.patch
deleted file mode 100644
index 239ff81f5cdc..000000000000
--- a/sys-apps/apparmor/files/apparmor-2.13.1-makefile.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -28,7 +28,7 @@
- CONFDIR=/etc/apparmor
- INSTALL_CONFDIR=${DESTDIR}${CONFDIR}
- LOCALEDIR=/usr/share/locale
--MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8 subdomain.conf.5 aa-teardown.8
-+MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8 aa-teardown.8
- 
- YACC	:= bison
- YFLAGS	:= -d
-@@ -371,11 +371,9 @@
- .PHONY: install-indep
- install-indep: indep
- 	install -m 755 -d $(INSTALL_CONFDIR)
--	install -m 644 subdomain.conf $(INSTALL_CONFDIR)
-+	install -m 755 -d ${DESTDIR}/usr/libexec
- 	install -m 644 parser.conf $(INSTALL_CONFDIR)
--	install -m 755 -d ${DESTDIR}/var/lib/apparmor
--	install -m 755 -d $(APPARMOR_BIN_PREFIX)
--	install -m 755 rc.apparmor.functions $(APPARMOR_BIN_PREFIX)
-+	install -m 755 rc.apparmor.functions ${DESTDIR}/usr/libexec
- 	$(MAKE) -C po install NAME=${NAME} DESTDIR=${DESTDIR}
- 	$(MAKE) install_manpages DESTDIR=${DESTDIR}
- 
diff --git a/sys-apps/apparmor/files/apparmor-init b/sys-apps/apparmor/files/apparmor-init
deleted file mode 100644
index 48877e4b6117..000000000000
--- a/sys-apps/apparmor/files/apparmor-init
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Load all configured profiles for the AppArmor security module."
-description_reload="Reload all profiles"
-
-extra_started_commands="reload"
-
-aa_action() {
-	local arg=$1
-	local return
-
-	shift
-	$*
-	return=$?
-
-	if [ ${return} -eq 0 ]; then
-		aa_log_success_msg $arg
-	else
-		aa_log_failure_msg arg
-	fi
-
-	return $return
-}
-
-aa_log_action_start() {
-	ebegin $1
-}
-
-aa_log_action_end() {
-	eend $1
-}
-
-aa_log_success_msg() {
-	einfo $1
-}
-
-aa_log_warning_msg() {
-	ewarn $1
-}
-
-aa_log_failure_msg() {
-	eerror $1
-}
-
-aa_log_skipped_msg() {
-	einfo $1
-}
-
-aa_log_daemon_msg() {
-	einfo $1
-}
-
-aa_log_end_msg() {
-	eend $1
-}
-
-. /usr/libexec/rc.apparmor.functions
-
-start() {
-	ebegin "Starting AppArmor"
-	eindent
-
-	if ! is_apparmor_loaded ; then
-		load_module
-		if [ $? -ne 0 ]; then
-			eerror "AppArmor kernel support is not present"
-			eend 1
-			return 1
-		fi
-	fi
-
-	parse_profiles load
-
-	eoutdent
-}
-
-stop() {
-	ebegin "Stopping AppArmor"
-	eindent
-	apparmor_stop
-	eoutdent
-}
-
-reload() {
-	# todo: split out clean_profiles into its own function upstream
-	# so we can do parse_profiles reload && clean_profiles
-	# and do a proper reload instead of restart
-	apparmor_restart
-}
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index a8f0077392cc..a16927a1edc8 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -1,12 +1,5 @@
-AUX attr-2.4.48-perl-5.26.patch 785 BLAKE2B 307e652d83c5d623415ae389f01df918c552004c7b7ce224898ffd8a362342703225e7015f896d2c97013194ea3a8e61768174265b42d6dc565187aaf1712062 SHA512 af131267a4cc22322df8234ce4abf8a27f917aeb801a423696a51f935ee40bf155206cf40b7f510849e1a276808502ab48ade0a520b3f06969c5df2415055fe1
-AUX attr-2.4.48-switch-back-to-syscall.patch 3889 BLAKE2B bc308b40781abd79e8a45bcd7509bbc7924d44e0109b521f52d07d705bdfed9f80badeb8ba2aae44fd5350c36f54ebb31ec7273abc5f388ca91cd60dcf148c2b SHA512 e0e8c6bb89a42e91ff0daf3bb2aa7e75bb26ebd6f59d549cc037db8d156e03cef195fa7ac813f8cd22325583cf9e81d6782ec06a8f5e5f8b4eeadc104a6c5492
 AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f3c26cda5df6c7bedf592df5c3d6f3163a6c7b7c9785c69111fe2e7f3d061bf64dcdcdf92e183a SHA512 cd8af81c90da01d2f7716d2fd5f9f6a81cfc36aa35b4d03cb04651cac0494def88a81bf8b862a3aeabf45e940ab1488aa49c97001ec09e0df289a7c4552802f8
-DIST attr-2.4.48.tar.gz 467840 BLAKE2B 8fa6a5013b927850868b6913d026f23f116b75da3925d5da5eea007e14f5d9e309f98290b7ffaa6c62f620ff8f3ec7bfb3a1fcb04f3c0c072fca5feacaf804c0 SHA512 75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923
-DIST attr-2.5.0.tar.gz 465575 BLAKE2B b50c6b741543140099e7f31fcc327d4547cda41f1b14159664096b571c5c14ed7279992e94fdd9bc23d5618715a7d4fe8d45ba8d5cc2941ac6a4d242bc80ee09 SHA512 900e66d13acd022f52986d4159925b23e60f9ef5d11983b16d9dfe4a98fd70eea5f78e18f3694d8adea1c422324772af4da6b5659d755ed37484b428e28bb5fc
 DIST attr-2.5.1.tar.gz 465714 BLAKE2B 05928f8274b0b4beee31b329c8459436c5b9019ebd2f937667b7beb8df7a455c48742a90d9c4faca5c0b38c9c3812043d3d66f9587108d3424c6184fef494b56 SHA512 8b4c043d61f8f3e0cd098e701181069f51117b85fd6ba18bfe9af77d894ea671232377d4793ffc822e9259ceee6ac71d75732eb93b2830c6cb5d0d918ba2d21b
-EBUILD attr-2.4.48-r4.ebuild 2353 BLAKE2B 47e89fd3a2737de71b9a526c816b24ad0dad2c38c333333b4217fcdefd46caaa0148ddbe27ffe0baeb3be1517839a146c0e564fb1a00c67e1c01df2a441508ee SHA512 e384c8cfb28af3885e2ed1e5813d14f95af2081c457efb14757d4ed9a9f40c2ce9d007c2f28f3473d4743597bfe236c966c55f0784ccfc402ad4ae8270e1005a
-EBUILD attr-2.4.48-r5.ebuild 2584 BLAKE2B 44947dccaf200cedddc154153a957793b6de341b00ac395aba99b5c047f116eaa8f049ed2185d054261bb917d992ffa8c0bf79a53d6549ed2e26be0e3e0dc17b SHA512 7a9dfb9696cc8c7a452b21462be7f1c319042ea78aaad6cdf31cae1f48b229f7c390fcae4dc2ed20b24f9724e50f298ce4c706a238538976871a43e688c046e7
-EBUILD attr-2.5.0.ebuild 2476 BLAKE2B 6d56f388398ce510fd63a12496d3ff25ab7f28fcd18afc3f428e9b5350c7cc362943e0022810afbef378d0e242e7d7dffc48eb82fc60ca53866ce0226dec20ba SHA512 b5ffc538b2d87b76900e748edf273a45b10e25af43f340f6297c4477a28ceda3b61f1186506f72b8856a203abce63770a1aa108921701bdc004bd748d746db41
 EBUILD attr-2.5.1.ebuild 2468 BLAKE2B 288f532b6b14be26f9bb2a0c0dd2076c0894fd50a424a11744aa142934bb2246c614a38a29c1bcded98b52fb7cf107eb3889181cd7a2e71fef23f57fe8e5098b SHA512 0c3d996b35bdb7ca12c29c14002ff9cc3b3c2dfdef46b1198b2fd212e4fe065da7a22086c5caef790ea0d866e9fae7dce66478ae372ec19462ba2639061637b1
 EBUILD attr-9999.ebuild 2476 BLAKE2B e5531eae4407b8ea7aa21a00a8eac0c63fb2f2f3745030b8acc20780c896660c67e470ff562940f55f6074b641b812be9aa455c0c6e6a7b4353fb82bc3ff044d SHA512 9fadedfc67e6f03d1ebcbb0b8bbf64a47cfcea0f8a1d4e7c3e42c1ad4de2bccf2309775eff8d473892867339da0afea98d88d009a31ece6ce809c8b3a29a82de
 MISC metadata.xml 336 BLAKE2B 228b1ca58194e3cb6b68721379b55f53c2676973b7fb626600ae4f1d5da4899d7d4dd6e5211704ff6f64f601fc456b4335c4f01233768d2512058ee63af60668 SHA512 0e68e3406c4e54082edd2b2be1fe8b5a2a73457331b133635c5b5ed9e0afb0fbeea2101ff17a0fae0be47c4e535af9cd084f1abc9c85fda05c18e2879a72d0bc
diff --git a/sys-apps/attr/attr-2.4.48-r4.ebuild b/sys-apps/attr/attr-2.4.48-r4.ebuild
deleted file mode 100644
index 02c33f7c1f4f..000000000000
--- a/sys-apps/attr/attr-2.4.48-r4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
-
-DESCRIPTION="Extended attributes tools"
-HOMEPAGE="https://savannah.nongnu.org/projects/attr"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="debug nls static-libs"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-perl-5.26.patch"
-	"${FILESDIR}/${P}-switch-back-to-syscall.patch"
-)
-
-pkg_setup() {
-	# Remove -flto* from flags as this breaks binaries (bug #644048)
-	filter-flags -flto*
-	append-ldflags "-Wl,--no-gc-sections" #700116
-}
-
-src_prepare() {
-	default
-	elibtoolize #580792
-}
-
-multilib_src_configure() {
-	unset PLATFORM #184564
-	export OPTIMIZER=${CFLAGS}
-	export DEBUG=-DNDEBUG
-
-	tc-ld-disable-gold #644048
-
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable nls)
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(use_enable debug)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	# Sanity check until we track down why this is happening. #644048
-	local lib="${ED}/usr/$(get_libdir)/libattr.so.1"
-	if [[ -e ${lib} ]] ; then
-		local versions=$($(tc-getREADELF) -V "${lib}")
-		local symbols=$($(tc-getREADELF) -sW "${lib}")
-		if [[ "${versions}" != *"ATTR_1.0"* || \
-		      "${versions}" != *"ATTR_1.1"* || \
-		      "${versions}" != *"ATTR_1.2"* || \
-		      "${versions}" != *"ATTR_1.3"* || \
-		      "${symbols}" != *"getxattr@ATTR_1.0"* ]] ; then
-			echo "# readelf -V ${lib}"
-			echo "${versions}"
-			echo "# readelf -sW ${lib}"
-			echo "${symbols}"
-			die "symbol version sanity check failed; please comment on https://bugs.gentoo.org/644048"
-		else
-			einfo "${lib} passed symbol checks"
-		fi
-	fi
-
-	if multilib_is_native_abi; then
-		# we install attr into /bin, so we need the shared lib with it
-		gen_usr_ldscript -a attr
-	fi
-
-	# Add a wrapper until people upgrade.
-	insinto /usr/include/attr
-	newins "${FILESDIR}"/xattr-shim.h xattr.h
-}
-
-multilib_src_install_all() {
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	einstalldocs
-}
diff --git a/sys-apps/attr/attr-2.4.48-r5.ebuild b/sys-apps/attr/attr-2.4.48-r5.ebuild
deleted file mode 100644
index 2de4d8189160..000000000000
--- a/sys-apps/attr/attr-2.4.48-r5.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git"
-
-	inherit autotools git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="Extended attributes tools"
-HOMEPAGE="https://savannah.nongnu.org/projects/attr"
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="debug nls static-libs"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/${P}-perl-5.26.patch"
-		"${FILESDIR}/${P}-switch-back-to-syscall.patch"
-	)
-
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles || die
-		eautopoint
-		eautoreconf
-	else
-		elibtoolize #580792
-	fi
-}
-
-src_configure() {
-	# Remove -flto* from flags as this breaks binaries (bug #644048)
-	filter-flags -flto*
-	append-ldflags "-Wl,--no-gc-sections" #700116
-	tc-ld-disable-gold #644048
-	append-lfs-flags #760857
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable nls)
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(use_enable debug)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	# Sanity check until we track down why this is happening. #644048
-	local lib="${ED}/usr/$(get_libdir)/libattr.so.1"
-	if [[ -e ${lib} ]] ; then
-		local versions=$($(tc-getREADELF) -V "${lib}")
-		local symbols=$($(tc-getREADELF) -sW "${lib}")
-		if [[ "${versions}" != *"ATTR_1.0"* || \
-		      "${versions}" != *"ATTR_1.1"* || \
-		      "${versions}" != *"ATTR_1.2"* || \
-		      "${versions}" != *"ATTR_1.3"* || \
-		      "${symbols}" != *"getxattr@ATTR_1.0"* ]] ; then
-			echo "# readelf -V ${lib}"
-			echo "${versions}"
-			echo "# readelf -sW ${lib}"
-			echo "${symbols}"
-			die "symbol version sanity check failed; please comment on https://bugs.gentoo.org/644048"
-		else
-			einfo "${lib} passed symbol checks"
-		fi
-	fi
-
-	if multilib_is_native_abi; then
-		# we install attr into /bin, so we need the shared lib with it
-		gen_usr_ldscript -a attr
-	fi
-
-	# Add a wrapper until people upgrade.
-	insinto /usr/include/attr
-	newins "${FILESDIR}"/xattr-shim.h xattr.h
-}
-
-multilib_src_install_all() {
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	einstalldocs
-}
diff --git a/sys-apps/attr/attr-2.5.0.ebuild b/sys-apps/attr/attr-2.5.0.ebuild
deleted file mode 100644
index 7465baca96b8..000000000000
--- a/sys-apps/attr/attr-2.5.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git"
-
-	inherit autotools git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="Extended attributes tools"
-HOMEPAGE="https://savannah.nongnu.org/projects/attr"
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="debug nls static-libs"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles || die
-		eautopoint
-		eautoreconf
-	else
-		elibtoolize #580792
-	fi
-}
-
-src_configure() {
-	# Remove -flto* from flags as this breaks binaries (bug #644048)
-	filter-flags -flto*
-	append-ldflags "-Wl,--no-gc-sections" #700116
-	tc-ld-disable-gold #644048
-	append-lfs-flags #760857
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable nls)
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(use_enable debug)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	# Sanity check until we track down why this is happening. #644048
-	local lib="${ED}/usr/$(get_libdir)/libattr.so.1"
-	if [[ -e ${lib} ]] ; then
-		local versions=$($(tc-getREADELF) -V "${lib}")
-		local symbols=$($(tc-getREADELF) -sW "${lib}")
-		if [[ "${versions}" != *"ATTR_1.0"* || \
-		      "${versions}" != *"ATTR_1.1"* || \
-		      "${versions}" != *"ATTR_1.2"* || \
-		      "${versions}" != *"ATTR_1.3"* || \
-		      "${symbols}" != *"getxattr@ATTR_1.0"* ]] ; then
-			echo "# readelf -V ${lib}"
-			echo "${versions}"
-			echo "# readelf -sW ${lib}"
-			echo "${symbols}"
-			die "symbol version sanity check failed; please comment on https://bugs.gentoo.org/644048"
-		else
-			einfo "${lib} passed symbol checks"
-		fi
-	fi
-
-	if multilib_is_native_abi; then
-		# we install attr into /bin, so we need the shared lib with it
-		gen_usr_ldscript -a attr
-	fi
-
-	# Add a wrapper until people upgrade.
-	insinto /usr/include/attr
-	newins "${FILESDIR}"/xattr-shim.h xattr.h
-}
-
-multilib_src_install_all() {
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	einstalldocs
-}
diff --git a/sys-apps/attr/files/attr-2.4.48-perl-5.26.patch b/sys-apps/attr/files/attr-2.4.48-perl-5.26.patch
deleted file mode 100644
index 49b4c1a57665..000000000000
--- a/sys-apps/attr/files/attr-2.4.48-perl-5.26.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 406eab7aa09da9df787a964d3c152c0bda6e23c4 Mon Sep 17 00:00:00 2001
-From: Troy Dawson <tdawson@redhat.com>
-Date: Mon, 24 Jul 2017 14:42:06 +0200
-Subject: [PATCH attr] test: escape left brace in a regex in test/run
-
-... to fix test-suite failure with perl-5.26.0
-
-Bug: https://bugzilla.redhat.com/1473853
----
- test/run | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/run b/test/run
-index 4b1f8d0d6134..07e916c41947 100755
---- a/test/run
-+++ b/test/run
-@@ -106,7 +106,7 @@ for (;;) {
-   if (defined $line) {
-     # Substitute %VAR and %{VAR} with environment variables.
-     $line =~ s[%(\w+)][$ENV{$1}]eg;
--    $line =~ s[%{(\w+)}][$ENV{$1}]eg;
-+    $line =~ s[%\{(\w+)}][$ENV{$1}]eg;
-   }
-   if (defined $line) {
-     if ($line =~ s/^\s*< ?//) {
--- 
-2.16.1
diff --git a/sys-apps/attr/files/attr-2.4.48-switch-back-to-syscall.patch b/sys-apps/attr/files/attr-2.4.48-switch-back-to-syscall.patch
deleted file mode 100644
index 5691b15420ce..000000000000
--- a/sys-apps/attr/files/attr-2.4.48-switch-back-to-syscall.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From 14adc898a36948267bfe5c63b399996879e94c98 Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <agruenba@redhat.com>
-Date: Fri, 17 Aug 2018 14:07:31 +0200
-Subject: Switch back to syscall()
-
-Switch back to syscall() for the *xattr system calls.  The current
-mechanism of forwarding those calls to glibc breaks libraries like
-libfakeroot (fakeroot) and libasan (the gcc address sanitizer; gcc
--fsanitize=address).
-
-Those libraries provide wrappers for functions defined in other shared
-libraries, usually glibc, do their own processing, and forward calls to
-the original symbols looke dup via dlsym(RTLD_NEXT, "symbol_name").  In
-our case, dlsym returns the libattr_*xattr wrappers.  However, when our
-wrappers try calling glibc, they end up calling the libfakeroot /
-libasan wrappers instead because those override the original symbols =>
-recursion.
-
-The libattr_*xattr wrappers will only be used when symbols are looked up
-at runtime (dlopen / dlsym).  Programs linking against libattr will
-directly use the glibc provided symbols.  Therefore, the slightly worse
-performance of syscall() won't affect any of the "normal" users of
-libattr.
----
- libattr/syscalls.c | 26 ++++++++++++++------------
- 1 file changed, 14 insertions(+), 12 deletions(-)
-
-diff --git a/libattr/syscalls.c b/libattr/syscalls.c
-index 3013aa0..721ad7f 100644
---- a/libattr/syscalls.c
-+++ b/libattr/syscalls.c
-@@ -22,6 +22,8 @@
- 
- #include "config.h"
- 
-+#include <unistd.h>
-+#include <sys/syscall.h>
- #include <sys/xattr.h>
- 
- #ifdef HAVE_VISIBILITY_ATTRIBUTE
-@@ -31,67 +33,67 @@
- int libattr_setxattr(const char *path, const char *name,
- 		     void *value, size_t size, int flags)
- {
--	return setxattr(path, name, value, size, flags);
-+	return syscall(__NR_setxattr, path, name, value, size, flags);
- }
- 
- int libattr_lsetxattr(const char *path, const char *name,
- 		      void *value, size_t size, int flags)
- {
--	return lsetxattr(path, name, value, size, flags);
-+	return syscall(__NR_lsetxattr, path, name, value, size, flags);
- }
- 
- int libattr_fsetxattr(int filedes, const char *name,
- 		      void *value, size_t size, int flags)
- {
--	return fsetxattr(filedes, name, value, size, flags);
-+	return syscall(__NR_fsetxattr, filedes, name, value, size, flags);
- }
- 
- ssize_t libattr_getxattr(const char *path, const char *name,
- 			 void *value, size_t size)
- {
--	return getxattr(path, name, value, size);
-+	return syscall(__NR_getxattr, path, name, value, size);
- }
- 
- ssize_t libattr_lgetxattr(const char *path, const char *name,
- 			  void *value, size_t size)
- {
--	return lgetxattr(path, name, value, size);
-+	return syscall(__NR_lgetxattr, path, name, value, size);
- }
- 
- ssize_t libattr_fgetxattr(int filedes, const char *name,
- 			  void *value, size_t size)
- {
--	return fgetxattr(filedes, name, value, size);
-+	return syscall(__NR_fgetxattr, filedes, name, value, size);
- }
- 
- ssize_t libattr_listxattr(const char *path, char *list, size_t size)
- {
--	return listxattr(path, list, size);
-+	return syscall(__NR_listxattr, path, list, size);
- }
- 
- ssize_t libattr_llistxattr(const char *path, char *list, size_t size)
- {
--	return llistxattr(path, list, size);
-+	return syscall(__NR_llistxattr, path, list, size);
- }
- 
- ssize_t libattr_flistxattr(int filedes, char *list, size_t size)
- {
--	return flistxattr(filedes, list, size);
-+	return syscall(__NR_flistxattr, filedes, list, size);
- }
- 
- int libattr_removexattr(const char *path, const char *name)
- {
--	return removexattr(path, name);
-+	return syscall(__NR_removexattr, path, name);
- }
- 
- int libattr_lremovexattr(const char *path, const char *name)
- {
--	return lremovexattr(path, name);
-+	return syscall(__NR_lremovexattr, path, name);
- }
- 
- int libattr_fremovexattr(int filedes, const char *name)
- {
--	return fremovexattr(filedes, name);
-+	return syscall(__NR_fremovexattr, filedes, name);
- }
- 
- #ifdef HAVE_VISIBILITY_ATTRIBUTE
--- 
-cgit v1.0-41-gc330
-
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest
index 5bd0925bde64..5901af1ee5f1 100644
--- a/sys-apps/baobab/Manifest
+++ b/sys-apps/baobab/Manifest
@@ -1,3 +1,3 @@
 DIST baobab-40.0.tar.xz 581744 BLAKE2B 12fc2023a19512117c235a54ac36045e1a733c4d64d8ff1ea77d6be624d442ed66bca83788ffc19be36855207cb693c8f1aa4793c8750e84d60c1b84e79b869b SHA512 31ab768f7e089c12717bc363111fe936f4a15986b69ee53b8f9aab19973ff5bf4970fdfa4d936af4d46673a9f08063518a6c314453e698e6068485152e400650
-EBUILD baobab-40.0.ebuild 812 BLAKE2B 282faed42f2340d0c0cec2dbe6976106f1a601d085c5b3948d9d6000f8505ee29ed3e5ca56576e1a500eaddf268c779393caa4bbe480bc12c76de05b419e717f SHA512 c95443f3a13b4ca58768d0833f14331892d8833696ce7431f7d34c5713ea780e7a60d601ca1c00493ee045adbdf9b57f2d27eedc56a39561e978eadcdafec2cd
+EBUILD baobab-40.0.ebuild 818 BLAKE2B 874599250b6bd9531edc0975f19502c23967056465d28324ed1f51d1749226822f849b75426d399020e2479065c793308362c213e92ce53d852034fbc7739d58 SHA512 f60ccd4685ad436dc6999d8976392153c2901ae96ae6cf37fea258de1bb1b148ba5934ad3b7499f520570ab6d649cc9b0a970832582e7f70c47cc260a42abc21
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/baobab/baobab-40.0.ebuild b/sys-apps/baobab/baobab-40.0.ebuild
index b594a695c112..0206746c4660 100644
--- a/sys-apps/baobab/baobab-40.0.ebuild
+++ b/sys-apps/baobab/baobab-40.0.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x8
 RDEPEND="
 	>=dev-libs/glib-2.44:2
 	>=x11-libs/gtk+-3.24.1:3
-	>=gui-libs/libhandy-1.0.0:1=
+	>=gui-libs/libhandy-1.0.0:1=[vala]
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 54e98e24d4cb..084f86444245 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,6 +1,7 @@
 DIST baselayout-2.7.tar.bz2 30317 BLAKE2B 7b7c284b7d0a9608a0d03dbde0d62d793829b61d5361f5062fdeb8880a2f792c142e20acf7fa92e713e2ebb0bd1609ca65bc8a4191f2bf2c5df4f474eaeef1ee SHA512 8b28d2dc20fd5887db5c0e6b67a4217c4d0730529023fc57fb1ee95a431e1f492fb21e3e66980bef766819e9f542dc7e4ad3ae25465390194bbf970c3653c88e
 EBUILD baselayout-2.7-r1.ebuild 10197 BLAKE2B 5e5f767f37bdf286cd77d21512a855e1e2f5f26fd794838e3cb21634f089b66cefc4e915c9e88148f0e1f2a0067a57bfb029833572614c0190d54f862ff15659 SHA512 847e2ddae301a856b7719fe9134635ea79f0059107188aad8c554fda4da428f970a2ad4daf56491050acacd822175fa8ae18f22402e19677df9d920c525ce737
 EBUILD baselayout-2.7-r2.ebuild 10184 BLAKE2B febfaf2d2a646358c20e12039cd3b224a2fbcf5c12b566e8b33927fa5549b3f0d5b76392bf36cdefe7b14f84bf89b5caff5004ce54b862d238d5928d69526e87 SHA512 a5a45b479dfeac5212291d3d8053c822d06a45d8f82d24f8937b15bd3bf5fd6953ec3520121df243cea2cea52ea8d56894d27b03a272c85ca21ff52190551d8b
+EBUILD baselayout-2.7-r3.ebuild 11291 BLAKE2B f2794d10f18c74e358ce1e6fc1a9c3e29b7ab7b0cb0d656a53f990781707b29b9e173b96044c9c9e9c8d35b7b020624ad8e9d1bec1cd6b72f287e8c8759dc1cb SHA512 3eaec1f7a1bfd85dd26ad62b3756a7460e890cc893c6967aded70d85df722865664235924c6cbdb7d9be3572e94d059cf1df6a2b240a1e9923b3533ac68906eb
 EBUILD baselayout-2.7.ebuild 10024 BLAKE2B 490416f9367b1236ac8879b273acc2920f77f1fb23edba5bc825358270f434e0facb8f2794baebce5841b2be2ee3a4da5fffa026585555902e582ff36ab37bd3 SHA512 6a629e68f58d23f8d9653bccca3ad6d52610bd87ab73c5d6b12c9b6e9762f34f2deb452d689c99ea4d66f1c4dbe88e13991f1b2ea900720fd8c8d92067aaca71
-EBUILD baselayout-9999.ebuild 9824 BLAKE2B 178bcbc1a2c0373d1c83b870034b879cc34a1a8f8aabcf2035d89a48824bf3d0765d4131a31496435b59aed37dd23b45810553471a6bdc9a13bfa82b2b483b6c SHA512 ceb10aabcc5fb25b27a224d126d5a7bac54fbe7cc38d98376a589ece84fc7e6daa6eb10953e54dc4b73e43cf1f7bc78b74c54e067b5be3ede63fe9ea7a1b55c9
+EBUILD baselayout-9999.ebuild 11291 BLAKE2B f2794d10f18c74e358ce1e6fc1a9c3e29b7ab7b0cb0d656a53f990781707b29b9e173b96044c9c9e9c8d35b7b020624ad8e9d1bec1cd6b72f287e8c8759dc1cb SHA512 3eaec1f7a1bfd85dd26ad62b3756a7460e890cc893c6967aded70d85df722865664235924c6cbdb7d9be3572e94d059cf1df6a2b240a1e9923b3533ac68906eb
 MISC metadata.xml 382 BLAKE2B 7c360eab19fc55da87cf2a432c1f2407918be3cf32ec581b974fea953aea00a51998cd05facd0c4b6d609e38bd1f243380a5c3a9effcb5e7bebbf22ec6d9418c SHA512 1a444b5b8fc6573fae97c6e0bf5e3dc69f9e18a42d2a7c91ac2742bca17580468be8b17ca6349451817b0087f619bad90a1050b1fd8511fc5e57b792b5006d72
diff --git a/sys-apps/baselayout/baselayout-2.7-r3.ebuild b/sys-apps/baselayout/baselayout-2.7-r3.ebuild
new file mode 100644
index 000000000000..c83d1da82dc4
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-2.7-r3.ebuild
@@ -0,0 +1,347 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib prefix
+
+DESCRIPTION="Filesystem baselayout and init scripts"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="build kernel_FreeBSD kernel_linux +split-usr"
+
+pkg_setup() {
+	multilib_layout
+}
+
+riscv_compat_symlink() {
+	# Here we apply some special sauce for riscv.
+	# Two multilib layouts exist for now:
+	# 1) one level libdirs, (32bit) "lib" and (64bit) "lib64"
+	#    these are chosen by us to closely resemble other arches
+	# 2) two level libdirs, "lib64/lp64d" "lib64/lp64" "lib32/ilp32d" ...
+	#    this is the glibc/gcc default
+	# Unfortunately, the default has only one fallback, which is "lib"
+	# for both 32bit and 64bit. So things do not break in 1), we need
+	# to provide compatibility symlinks...
+
+	# This function has exactly two parameters:
+	# - the default libdir, to determine if 1) or 2) applies
+	# - the location of the symlink (which points to ".")
+
+	# Note: we call this only in the ${SYMLINK_LIB} = no codepath, since
+	# there never was a ${SYMLINK_LIB} = yes riscv profile.
+
+	case ${CHOST} in
+	riscv*)
+		# are we on a one level libdir profile? is there no symlink yet?
+		if [[ ${1} != */* && ! -L ${2} ]] ; then
+			ln -s . $2 || die "Unable to make $2 riscv compatibility symlink"
+		fi
+		;;
+	esac
+}
+
+# Create our multilib dirs - the Makefile has no knowledge of this
+multilib_layout() {
+	local dir def_libdir libdir libdirs
+	local prefix prefix_lst
+	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
+	libdirs=$(get_all_libdirs)
+
+	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
+		prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
+		for prefix in "${prefix_lst[@]}"; do
+			for libdir in ${libdirs}; do
+				dir="${prefix}${libdir}"
+				if [[ -e "${dir}" ]]; then
+					[[ ! -d "${dir}" ]] &&
+						die "${dir} exists but is not a directory"
+					continue
+				fi
+				if ! use split-usr && [[ ${prefix} = ${EROOT}/ ]]; then
+					libdir="${libdir%%/*}"
+					dir="${prefix}${libdir}"
+					einfo "symlinking ${dir} to usr/${libdir}"
+					ln -s usr/${libdir} ${dir} ||
+						die "Unable to make ${dir} symlink"
+				else
+					einfo "creating directory ${dir}"
+					mkdir -p "${dir}" ||
+						die "Unable to create ${dir} directory"
+				fi
+			done
+			riscv_compat_symlink "${def_libdir}" "${prefix}${def_libdir}/${DEFAULT_ABI}"
+		done
+		return 0
+	fi
+
+	[ -z "${def_libdir}" ] &&
+		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
+
+	# figure out which paths should be symlinks and which should be directories
+	local dirs syms exp d
+	for libdir in ${libdirs} ; do
+		if use split-usr ; then
+			exp=( {,usr/,usr/local/}${libdir} )
+		else
+			exp=( {usr/,usr/local/}${libdir} )
+		fi
+		for d in "${exp[@]}" ; do
+			# most things should be dirs
+			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
+				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
+			else
+				[ -h "${d}" ] && syms+=" ${d}"
+			fi
+		done
+	done
+	if [ -n "${syms}${dirs}" ] ; then
+		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
+		ewarn "have these paths configured as follows:"
+		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
+		[ -n "${syms}" ] && ewarn "directories:${syms}"
+		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
+		ewarn "If things fail, you will need to manually create/move the directories."
+		echo
+	fi
+
+	# setup symlinks and dirs where we expect them to be; do not migrate
+	# data ... just fall over in that case.
+	if use split-usr ; then
+		prefix_lst=( "${EROOT}"/{,usr/,usr/local/} )
+	else
+		prefix_lst=( "${EROOT}"/{usr/,usr/local/} )
+	fi
+	for prefix in "${prefix_lst[@]}"; do
+		if [ "${SYMLINK_LIB}" = yes ] ; then
+			# we need to make sure "lib" points to the native libdir
+			if [ -h "${prefix}lib" ] ; then
+				# it's already a symlink!  assume it's pointing to right place ...
+				continue
+			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 || die
+				if rmdir "${prefix}lib" 2>/dev/null ; then
+					ln -s ${def_libdir} "${prefix}lib" || die
+				else
+					die "non-empty dir found where we needed a symlink: ${prefix}lib"
+				fi
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a symlink"
+				mkdir -p "${prefix}" || die
+				rm -f "${prefix}lib" || die
+				ln -s ${def_libdir} "${prefix}lib" || die
+				mkdir -p "${prefix}${def_libdir}" || die #423571
+			fi
+		else
+			# we need to make sure "lib" is a dir
+			if [ -h "${prefix}lib" ] ; then
+				# "lib" is a symlink, so need to convert to a dir
+				ewarn "Converting ${prefix}lib from a symlink to a dir"
+				rm -f "${prefix}lib" || die
+				if [ -d "${prefix}lib32" ] ; then
+					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
+					mv "${prefix}lib32" "${prefix}lib" || die
+				else
+					mkdir -p "${prefix}lib" || die
+				fi
+			elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
+				# make sure the old "lib" ABI location does not exist; we
+				# only symlinked the lib dir on systems where we moved it
+				# to "lib32" ...
+				case ${CHOST} in
+				*-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 || 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"
+						fi
+					fi
+					;;
+				esac
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a dir"
+				mkdir -p "${prefix}lib" || die
+			fi
+		fi
+	done
+	if ! use split-usr ; then
+		for libdir in ${libdirs}; do
+			if [[ ! -e "${EROOT}${libdir}" ]]; then
+				ln -s usr/"${libdir}" "${EROOT}${libdir}" ||
+					die "Unable to make ${EROOT}${libdir} symlink"
+			fi
+		done
+	fi
+}
+
+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 || die
+
+	# We need to install directories and maybe some dev nodes when building
+	# stages, but they cannot be in CONTENTS.
+	# Also, we cannot reference $S as binpkg will break so we do this.
+	multilib_layout
+	if use build ; then
+		if use split-usr ; then
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout
+		else
+			emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout-usrmerge
+		fi
+	fi
+	rm -f "${ED}"/usr/share/${PN}/Makefile || die
+}
+
+src_prepare() {
+	default
+	if use prefix; then
+		hprefixify -e "/EUID/s,0,${EUID}," -q '"' etc/profile
+		hprefixify etc/{env.d/50baselayout,shells} share.Linux/passwd
+		echo PATH=/usr/bin:/bin >> etc/env.d/99host
+		echo ROOTPATH=/usr/sbin:/sbin:/usr/bin:/bin >> etc/env.d/99host
+	fi
+
+	# don't want symlinked directories in PATH on systems with usr-merge
+	if ! use split-usr; then
+		sed \
+			-e 's|/usr/local/sbin:||g' \
+			-e 's|:/usr/sbin:|:|g' \
+			-e 's|:/sbin:|:|g' \
+			-e 's|:/bin:|:|g' \
+			-i etc/env.d/50baselayout || die
+	fi
+
+	# handle multilib paths.  do it here because we want this behavior
+	# regardless of the C library that you're using.  we do explicitly
+	# list paths which the native ldconfig searches, but this isn't
+	# problematic as it doesn't change the resulting ld.so.cache or
+	# take longer to generate.  similarly, listing both the native
+	# path and the symlinked path doesn't change the resulting cache.
+	local libdir ldpaths
+	for libdir in $(get_all_libdirs) ; do
+		use split-usr && ldpaths+=":${EPREFIX}/${libdir}"
+		ldpaths+=":${EPREFIX}/usr/${libdir}"
+		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
+	done
+	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
+
+	# rc-scripts version for testing of features that *should* be present
+	echo "Gentoo Base System release ${PV}" > etc/gentoo-release
+}
+
+src_install() {
+	emake \
+		OS=$(usex kernel_FreeBSD BSD Linux) \
+		DESTDIR="${ED}" \
+		install
+	dodoc ChangeLog
+	rm "${ED}"/etc/sysctl.d/README || die
+
+	# need the makefile in pkg_preinst
+	insinto /usr/share/${PN}
+	doins Makefile
+
+	# This is needed for https://bugs.gentoo.org/732142
+	dodir /usr/lib
+	mv "${ED}"/etc/os-release "${ED}"/usr/lib || die
+	dosym ../usr/lib/os-release /etc/os-release
+}
+
+pkg_postinst() {
+	local x
+
+	# We installed some files to /usr/share/baselayout instead of /etc to stop
+	# (1) overwriting the user's settings
+	# (2) screwing things up when attempting to merge files
+	# (3) accidentally packaging up personal files with quickpkg
+	# If they don't exist then we install them
+	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 || die
+	done
+
+	# Force shadow permissions to not be world-readable #260993
+	for x in shadow ; do
+		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 || die
+	fi
+
+	# whine about users that lack passwords #193541
+	if [[ -e "${EROOT}"/etc/shadow ]] ; then
+		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
+		if [[ -n ${bad_users} ]] ; then
+			echo
+			ewarn "The following users lack passwords!"
+			ewarn ${bad_users}
+		fi
+	fi
+
+	# whine about users with invalid shells #215698
+	if [[ -e "${EROOT}"/etc/passwd ]] ; then
+		local bad_shells=$(awk -F: 'system("test -e ${ROOT}" $7) { print $1 " - " $7}' "${EROOT}"/etc/passwd | sort)
+		if [[ -n ${bad_shells} ]] ; then
+			echo
+			ewarn "The following users have non-existent shells!"
+			ewarn "${bad_shells}"
+		fi
+	fi
+
+	# https://bugs.gentoo.org/361349
+	if use kernel_linux; then
+		mkdir -p "${EROOT}"/run || die
+
+		local found fstype mountpoint
+		while read -r _ mountpoint fstype _; do
+		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
+		done < "${ROOT}"/proc/mounts
+		[[ -z ${found} ]] &&
+			ewarn "You should reboot now to get /run mounted with tmpfs!"
+	fi
+
+	for x in ${REPLACING_VERSIONS}; do
+		if ver_test 2.4 -lt ${x}; then
+			ewarn "After updating ${EROOT}/etc/profile, please run"
+			ewarn "env-update && . /etc/profile"
+		fi
+
+		if ver_test 2.6 -lt ${x}; then
+			ewarn "Please run env-update then log out and back in to"
+			ewarn "update your path."
+		fi
+		# clean up after 2.5 typos
+		# https://bugs.gentoo.org/show_bug.cgi?id=656380
+		if [[ ${x} == 2.5 ]]; then
+			rm -fr "${EROOT}/{,usr" || die
+		fi
+	done
+
+	if [[ -e "${EROOT}"/etc/env.d/00basic ]]; then
+		ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout"
+		ewarn "Please migrate your changes."
+	fi
+}
diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild
index 9f4a53a1c184..c83d1da82dc4 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-9999.ebuild
@@ -23,6 +23,34 @@ pkg_setup() {
 	multilib_layout
 }
 
+riscv_compat_symlink() {
+	# Here we apply some special sauce for riscv.
+	# Two multilib layouts exist for now:
+	# 1) one level libdirs, (32bit) "lib" and (64bit) "lib64"
+	#    these are chosen by us to closely resemble other arches
+	# 2) two level libdirs, "lib64/lp64d" "lib64/lp64" "lib32/ilp32d" ...
+	#    this is the glibc/gcc default
+	# Unfortunately, the default has only one fallback, which is "lib"
+	# for both 32bit and 64bit. So things do not break in 1), we need
+	# to provide compatibility symlinks...
+
+	# This function has exactly two parameters:
+	# - the default libdir, to determine if 1) or 2) applies
+	# - the location of the symlink (which points to ".")
+
+	# Note: we call this only in the ${SYMLINK_LIB} = no codepath, since
+	# there never was a ${SYMLINK_LIB} = yes riscv profile.
+
+	case ${CHOST} in
+	riscv*)
+		# are we on a one level libdir profile? is there no symlink yet?
+		if [[ ${1} != */* && ! -L ${2} ]] ; then
+			ln -s . $2 || die "Unable to make $2 riscv compatibility symlink"
+		fi
+		;;
+	esac
+}
+
 # Create our multilib dirs - the Makefile has no knowledge of this
 multilib_layout() {
 	local dir def_libdir libdir libdirs
@@ -52,6 +80,7 @@ multilib_layout() {
 						die "Unable to create ${dir} directory"
 				fi
 			done
+			riscv_compat_symlink "${def_libdir}" "${prefix}${def_libdir}/${DEFAULT_ABI}"
 		done
 		return 0
 	fi
@@ -282,6 +311,18 @@ pkg_postinst() {
 		fi
 	fi
 
+	# https://bugs.gentoo.org/361349
+	if use kernel_linux; then
+		mkdir -p "${EROOT}"/run || die
+
+		local found fstype mountpoint
+		while read -r _ mountpoint fstype _; do
+		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
+		done < "${ROOT}"/proc/mounts
+		[[ -z ${found} ]] &&
+			ewarn "You should reboot now to get /run mounted with tmpfs!"
+	fi
+
 	for x in ${REPLACING_VERSIONS}; do
 		if ver_test 2.4 -lt ${x}; then
 			ewarn "After updating ${EROOT}/etc/profile, please run"
diff --git a/sys-apps/bleachbit/Manifest b/sys-apps/bleachbit/Manifest
index f4a7ccb17927..d2baf39921a0 100644
--- a/sys-apps/bleachbit/Manifest
+++ b/sys-apps/bleachbit/Manifest
@@ -1,5 +1,3 @@
-DIST bleachbit-4.0.0.tar.bz2 599756 BLAKE2B 05a4dbf9e0b6bbcba528875a82e36eb9f91ae84c5bdc6f8f69063a54bd192332f5dd1d22ee5a737243eb5fb74cf0362eace1b50a73f7c1d0557a8cba146dea01 SHA512 ce120239b411c6e177af0e22a16b583ac3ae8903ba13579878942492e4e221355da28f737d6c78811312bfcc888af7c8dba6c153673f4e1542cc2aceedf2d2c9
 DIST bleachbit-4.2.0.tar.bz2 606223 BLAKE2B c45a11db556b9c3e3a19583bfaa633244e2ea2e374ec8b883cba486126cfb33617cd7930af79d379711980ad4b56426b39a3e68532462be1918da1386369d137 SHA512 6d43da42c6a2a328c8fb766a3f00f4511e72a00836316c279c8dc3a24468abb4c2ce909b42c568ee0b8417c08827c7cb79ae197ae693b8d6ce60faf22422effb
-EBUILD bleachbit-4.0.0.ebuild 1480 BLAKE2B ef7caa1f0f56776df47511c805009d53d8078c6567ea2aa2aa21fae2ead5766ba93208e0eda3cc4a5e4a868e1f1d0d76109d8a440df1a952fdca45e149bad795 SHA512 da9661c2ed01f32902cc2524959540d3abfdda8c82240f7436681c288992deabbc85cf5fb2e67a3c1568567accbd489a466b8e27adb35ff39f22790ff174e175
 EBUILD bleachbit-4.2.0.ebuild 1654 BLAKE2B ba53ddfd1efaf007bb5233f4bd66eab1781a8da8f4ddcc4f25e439f0443594ec471a2b1b32ce633efeb9f40ca5eab12b3c8cf563c737149cacca17c2a64d0f39 SHA512 20671f4b91425aad8b8d602e119b1bc2dba34560bc1a20e138ad454effbb78313420fe188ff25ac4b7faf463456f8af678a41c676038a98a657d3ef89fff3055
 MISC metadata.xml 556 BLAKE2B 3d2e34427ddd2e3ba55b12f247feac62e522fea8f952e69af43eeeed04a246d851b04fdfa16e169f5804eff20938bc545f0040b9133a1622cb4fe5b764b549f1 SHA512 1e58cf757be397a69a57e4ede9feaed4ba495a9c094fbe690062ea5623cb955434e9926d12ddf5f0f651a40a0a2775d168e3f8343b64bac4efb514e403a3fe77
diff --git a/sys-apps/bleachbit/bleachbit-4.0.0.ebuild b/sys-apps/bleachbit/bleachbit-4.0.0.ebuild
deleted file mode 100644
index 5313459d551b..000000000000
--- a/sys-apps/bleachbit/bleachbit-4.0.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit desktop distutils-r1 virtualx
-
-DESCRIPTION="Clean junk to free disk space and to maintain privacy"
-HOMEPAGE="https://www.bleachbit.org"
-SRC_URI="https://download.bleachbit.org/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/chardet[$PYTHON_USEDEP]
-	dev-python/pygobject:3[$PYTHON_USEDEP]
-"
-BDEPEND="
-	sys-devel/gettext
-	test? ( dev-python/mock[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests unittest
-
-# tests fail under FEATURES=usersandbox
-RESTRICT="test"
-
-python_prepare_all() {
-	if use test; then
-		# avoid tests requiring internet access
-		rm tests/Test{Chaff,Update}.py || die
-
-		# fails due to non-existent $HOME/.profile
-		rm tests/TestInit.py || die
-
-		# fails on upstream Travis CI as well as on Gentoo
-		sed -e "s/test_get_proc_swaps(self)/_&/" \
-			-i tests/TestMemory.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	emake -C po local
-}
-
-python_test() {
-	virtx emake tests
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript ${PN}.py ${PN}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	emake -C po DESTDIR="${D}" install
-
-	insinto /usr/share/bleachbit/cleaners
-	doins cleaners/*.xml
-
-	insinto /usr/share/bleachbit
-	doins data/app-menu.ui
-
-	doicon ${PN}.png
-	domenu org.${PN}.BleachBit.desktop
-}
diff --git a/sys-apps/bolt/Manifest b/sys-apps/bolt/Manifest
index 3a2a6595195a..6851a06adf6d 100644
--- a/sys-apps/bolt/Manifest
+++ b/sys-apps/bolt/Manifest
@@ -1,6 +1,8 @@
 AUX bolt.openrc 362 BLAKE2B 1cefc0db24bcd6dca7483a582f89a68800e13651330d8873c2b9f3042c70e0f8d8a2b7c363ceeae5ec63fa4b736b42e129f9e90ea4a576e5419af7e0e26d848e SHA512 59616543c6cd101373249b06bcbc0b7dd13fb2c8e45d6dc61a56088434cdf0a6b57630471bd2d788dd6253b66bcbfc3ec60b11ba8442043e837119130344216e
 AUX bolt.openrc-r1 374 BLAKE2B 91dcbfb842166837d4a89c12e7c8b39db9810ba1ffd18eb1ee61798f3634952440b1bb79118d1486819c34916b266a8c47b4398df42ba8f0c3411d482e2e4874 SHA512 3731459efce91c89e5a601b649acc7ed4faee4d08d2a52a5784dc53b914a15113003516e8fed64e532dc703e019ed53b37ec9a4414b770165c1e46813392f9d3
+DIST bolt-0.9.1.tar.gz 250978 BLAKE2B a3b1ea51704e2b54abb0135013019b9cad6ed9c0acfdb56797e19c9b5a1abe9f921446cfcc5b664f73bbbff857cf8d420f588517d4c633d1b3776a35c37fc882 SHA512 c925c290de75d3fa2dfb9e86b2f14ea39279b3f2ab6bebeced72a7853c901d44de02157d684534af2b54edd3a2e0b2ba61e889579ab1b192f99e98a2d73685d9
 DIST bolt-0.9.tar.gz 238596 BLAKE2B 8032ecb83d39d6c3550c000eed400ee0451e5ed94f7c898ffe9c8fcf512af387cfd759bd94241a47623b5aac63615bcda40ddb3e9ae3ec4060da20e46d7e9b7d SHA512 427e9ad95a8d018dd22326cc4b458fc9149b001d3aa6e4bb8e4047eaf6c3cf04a4dc3be9396049734dc0bd54f990b3bce31b6eef4031e3b671a6202a588cfe78
 EBUILD bolt-0.9-r2.ebuild 1344 BLAKE2B 7742674b1eff6b2ed07b90a9ae76b94b4050b585b172609bd74597ee64b1bac3a9822fd7d9ff5a80966e5e931780bdbb2ccc86a703882c3d0a281285926edbbe SHA512 c1b0353b4d69d022fc570a5e38a01c56e72f3f48adab3e876ca9fadcf9eee9e35bde22db118418f2a6141b070614346a0c74a10ec30862260219fb65b14c656f
 EBUILD bolt-0.9-r3.ebuild 1347 BLAKE2B 28a3a9aadf5c1ce03b2ee4132e603de2f3e68051e2361bd984e3cb41aa62d1a4659bdc4c59002861c6ce51e5a8f8c68d39d37d35a7a8eb37e41eec9887533159 SHA512 e51fff67782fe10d9048d0feaefca084d481ccd3aee72a098d215750272e064bc3ea3059cf1adaaac917adcb3e664bd13bc95795948442258fe1d7d3b080722c
+EBUILD bolt-0.9.1.ebuild 1349 BLAKE2B 06096ee9038a236782116306126ec7838827788173da85f59debc72ff70cc1ff71ee3f48f0a5b293990609fca2d0770ec3a6e68eb6f3225b3fd06873f2c6d3e2 SHA512 1c207d5b6d983700e1d6bbf04c5e8339203a6ad1da70ec74644f67c6df0f8b0562b99af905ea744c14244917c74081c67bb0ada05a2c4d128ac68ef651ca037d
 MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
diff --git a/sys-apps/bolt/bolt-0.9.1.ebuild b/sys-apps/bolt/bolt-0.9.1.ebuild
new file mode 100644
index 000000000000..34cd766665ec
--- /dev/null
+++ b/sys-apps/bolt/bolt-0.9.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info 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"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc systemd"
+
+DEPEND="
+	>=dev-libs/glib-2.56.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}"
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is lt 5 6; then
+		CONFIG_CHECK="~THUNDERBOLT"
+		ERROR_THUNDERBOLT="This package requires the thunderbolt kernel driver."
+	else
+		CONFIG_CHECK="~USB4"
+		ERROR_USB4="This package requires the USB4 kernel driver for Thunderbolt support."
+	fi
+	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)
+		--sysconfdir=/etc
+		--localstatedir=/var
+		--sharedstatedir=/var/lib
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	newinitd "${FILESDIR}"/${PN}.openrc-r1 boltd
+	keepdir /var/lib/boltd
+}
diff --git a/sys-apps/bubblewrap/Manifest b/sys-apps/bubblewrap/Manifest
index 217236b4938e..e83c856101af 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 1136 BLAKE2B 098e423f64d05e1310ecc704fd1df29d6971058ef8a70731b4fd9cc3b701c868bbf60454d0ac390a994ff092ae56916a8638f9630f7df4bcd3d8d6702af9b707 SHA512 3bbf50f0ebe5c48f5ad1df668f5c067f6cb72e60e9765ed5ab521a0ea71848a9548b28e6f4a0f993cd684701c208a72651b51d80f358feabc0a7c1edaecf8062
+EBUILD bubblewrap-0.4.1.ebuild 1143 BLAKE2B c8c40f0826442f2bb172d447dc94cbecef5e2edad9e453aff70caaf2e013099bb6890f6134ed4d93c15ac037c5d410f8f3432597d56c704dcd9b27da636f9150 SHA512 bd1f3b217a33d8089b765bbb7b0f1ec1b823e40bf80ea1e614ea997c969376686594a464c07c8f34cc23518e767162d783ba0af3d52ff60a0a497cab059f5863
 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 8ed4a91e0e2f..431e9434907f 100644
--- a/sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild
+++ b/sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/containers/${PN}/releases/download/v${PV}/${P}.tar.x
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 IUSE="selinux +suid"
 
 RDEPEND="
diff --git a/sys-apps/cciss_vol_status/Manifest b/sys-apps/cciss_vol_status/Manifest
index c239cf4524f2..302640580ca1 100644
--- a/sys-apps/cciss_vol_status/Manifest
+++ b/sys-apps/cciss_vol_status/Manifest
@@ -1,4 +1,4 @@
 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
+MISC metadata.xml 325 BLAKE2B ee1113761d060c60c1a3218b3c59d8b40492ba0e4fa639f0369e7f5dd6c4ee8f1548e6714c316f68a5563ee37ba7d746b256da1cb6d276a442c4c7713b4259d1 SHA512 f5418a0739d903c243dfbdebe9f7a638483b7199a97790ebdbda2f2de46b1cbc869a6e9c3e6a570745f5cbbdc4f367917eb54751af59608384a0c78649407a86
diff --git a/sys-apps/cciss_vol_status/metadata.xml b/sys-apps/cciss_vol_status/metadata.xml
index de3e2e4eb2fc..38f082093413 100644
--- a/sys-apps/cciss_vol_status/metadata.xml
+++ b/sys-apps/cciss_vol_status/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>chainsaw@gentoo.org</email>
-</maintainer>
 <maintainer type="project">
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
diff --git a/sys-apps/cracklib-words/Manifest b/sys-apps/cracklib-words/Manifest
index 626ada029116..814ddc66c40f 100644
--- a/sys-apps/cracklib-words/Manifest
+++ b/sys-apps/cracklib-words/Manifest
@@ -1,5 +1,3 @@
-DIST cracklib-words-2.9.6.gz 5536645 BLAKE2B b0ac23e8777cb094cec565e9728ca8dd37359cd19c2e2d4cd215635f462e464fb27fc5a9e560895804df4e519c465845b381a8cd47fb4d6f9b9c62109ff661e6 SHA512 fc5bbe7699c9c9e3f39f5c82f53ec8a4ea85e08d5513188a2f6423f92779008b87d85cfcf87a9a5d13a49b04c30f73890cd4d3fa7cd4a6bdac5c1ebc18e18bc3
 DIST cracklib-words-2.9.7.gz 5537586 BLAKE2B 242afa5e3615b159c59d27c99b87f008f245351cc7e4bd8dc975e66b4ef98456841c6a213282744d39c221c8646dc8e0c5ad99f277f37ae3e64bc949f6b57187 SHA512 1fa34b0a2e16d6906982b248f1757bf5bf8154d8d7e8bab94a4ac25080c41434d3828a2c8dd5065e9be586f36480ab70375f09e0bb64eb495d96a460619e2bae
-EBUILD cracklib-words-2.9.6.ebuild 691 BLAKE2B ebaf95c113d6f944e92ee12a2da15ffc973f6b13921d1f7f376c0e2ca997b406bc64f01f05678e5f1d79eccb7dbcef8d57cb9ab357577b562589e20b550e7134 SHA512 735dacd08e0a25955cf5a40f6056d4b65846d3f92c4a206c0336a39db49c18acb03bda6be26cc7bfef6e8b08979059ca7b92014619bdf160510588c978a1e4bc
-EBUILD cracklib-words-2.9.7.ebuild 736 BLAKE2B 1cbf6d6590b6cecdb25f0f7c37be3c387c72970b89b9a60b268f5ddd8533af770b1338ffc77fd29d8476824b3e5004e219821f901e1f834a03879b63975faf65 SHA512 b6c9e8c1d745a2fb5d9218082e268526dc056849b8deef7a71272542d3b044b804c27f2a7b77ea97183cf56ef1effcccffb6f81b4c6efb7ac7a24977a70a4c84
-MISC metadata.xml 392 BLAKE2B d1898dad58458a8c73afff00e58272708e58bb52afe9904d035b052aeaf74bd105c864cd7ee50db6b9dbbb30973fd3ab7076f567f443b14b3360b6abbce69176 SHA512 760532a2c534bb34a6fe06d46ecd6dce13c1106e98ab92255f40502fd481dd12188d53c4caf0abad3d508d97ffd6db538a970f1a13e7174fa52e46826072d2e7
+EBUILD cracklib-words-2.9.7.ebuild 730 BLAKE2B bb11fba3622e072adb2a0b337ceeb58589bcbb871f256ae3c746e91307e61c964295c2bfb6ab9d22d7ba06baeb49a1d46847cb8cbcba0a3cb6feb237409da8d7 SHA512 e0a6feb971675e447e7cbf3f8f3ed8d3325fa54872103f39d810594ac47fab85ea87bca70def7d92e052c0c57cac88240be077c86e40f33a39b5e0c930b30007
+MISC metadata.xml 416 BLAKE2B b46144e5a02aad9c7f5a48d935b4364065407dd5635bea32997c3172642b4c7a734584a3ebfc0a9d3471111c00edf2479148df11fea1982dc455468d3da060ea SHA512 99808ae2c8b3897a6814093c524b87e959dd48ccda6fa4eb2e80a66ae5372b59acaa6e41c8bb301960ac7b447170eac3ea17583e149e8a16d85feb3d80671695
diff --git a/sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild b/sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild
deleted file mode 100644
index 4ead5b71c749..000000000000
--- a/sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Large set of crack/cracklib dictionaries"
-HOMEPAGE="https://github.com/cracklib/cracklib/"
-SRC_URI="https://github.com/cracklib/cracklib/releases/download/${P/-words}/${P}.gz"
-S="${WORKDIR}"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	insinto /usr/share/dict
-	newins ${P} ${PN}
-}
-
-pkg_postinst() {
-	if [[ -z "${ROOT}" ]] && create-cracklib-dict -h >&/dev/null ; then
-		ebegin "Regenerating cracklib dictionary"
-		create-cracklib-dict /usr/share/dict/* >/dev/null
-		eend $?
-	fi
-}
diff --git a/sys-apps/cracklib-words/cracklib-words-2.9.7.ebuild b/sys-apps/cracklib-words/cracklib-words-2.9.7.ebuild
index a0f525cb573b..8ec30d86f908 100644
--- a/sys-apps/cracklib-words/cracklib-words-2.9.7.ebuild
+++ b/sys-apps/cracklib-words/cracklib-words-2.9.7.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 src_install() {
 	insinto /usr/share/dict
diff --git a/sys-apps/cracklib-words/metadata.xml b/sys-apps/cracklib-words/metadata.xml
index 010992c6c80e..17b5bc7cf4ed 100644
--- a/sys-apps/cracklib-words/metadata.xml
+++ b/sys-apps/cracklib-words/metadata.xml
@@ -5,6 +5,7 @@
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="sourceforge">cracklib</remote-id>
 		<remote-id type="github">cracklib/cracklib</remote-id>
diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index a9b88e7377f3..eb074e618f38 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -1,20 +1,17 @@
-DIST c-dvar-70f0f21e86a34577e674e202d5d09ef167102f02.tar.gz 24719 BLAKE2B 817c03739f56a3b741120896f98089bd6a379395b2f8e99697a79a3a2bdc855358a73b079434428c416373821e0e134acf6e30ef9bb9a384d25438c633e02433 SHA512 6a237100e66eef2413bf498d97a8fe1ca1b568df1f99276603f0b1627437a7f5741c38068cbafc49664f2a0438785a0ef7fb1de0fdb6768741585f1606d094e2
+DIST c-dvar-c8ea9712a94186512c22c32f32c421d6a2db6feb.tar.gz 25212 BLAKE2B 37f02df4f0a4c7372826cd9db37de883cf40027b12f72f0d43cf08f08682d90e6c7e8c3756f90a9e6184713c98e331ad2b2c9cd3373a148b05e2a3a2305db413 SHA512 c134892b43a1b572c45f0f24d7c9c7e70b1326c8bc896995b491d86271a000e83707e5d5eeff631b66be31f3980df7146cd18c385263a3a8bd07f30840cf829c
 DIST c-dvar-eeb91604574f7c5b12b270f8355f7e6cf1720f4c.tar.gz 24723 BLAKE2B 5206b4e85cdeffabc91e0feca17762ce10bf69815bad8d739af5eacf499ee4fe03058db1d2f4b2fe06cd93fa48eb637e68b50726a40e8b431f0fc526f830f114 SHA512 21d793ae449290c21c98904a43482ce1cbdead9fd1cd857214feeedd2e04e829f6ec4a8372f6b237eeeb5fcb5f96901ef8374d497afe6f70316f6a944a385443
 DIST c-ini-204410a08d3a6c8221f6f0baf0355ce5af0232ed.tar.gz 13952 BLAKE2B 42c34e4ebe17d4c0904c395c72e56b0587c5f6b2cdf422cb800678844cf8516f9645718a04e9a10f6e747d1f56b2f1e563d1fa07db078e745761ae1e40ad395a SHA512 72eeaecbe0b9434b48d2ca9674dd1e722e612a730fd07ef27babb346a10ed7311b11c9d85f2aaf0cd84ddca7f926a78d76d066f453289bcbe849c4cacf72ec58
-DIST c-ini-867f06a12a702c6869924575503877caa0adde75.tar.gz 13950 BLAKE2B 2cec6d49f7e698ee7f9514f8726c7c01dc72d2c186832122efcabeea37e082d0922be742c83f69c1ef93a820575c05dc2bb10790b41c2491e8c3719afbe5a37a SHA512 a3e82a24dc8119d90d573d87f5d92f24029490cae1564f66030f6781c95fa50c2c720378a8fbd07511007f1f53debbf62ca9ea86fdd905c42f325f28f35bd876
-DIST c-list-96455db9f04a6c9101a00957161551aea700b6aa.tar.gz 9221 BLAKE2B 3caa352a7be8ece056e69afbf556530f0a134f4fda987f4b46ec26e8b97d220726853b532a0479019374e90c06c9e1ff82198b04805b48db0a240d7929b08590 SHA512 ed4deb39dde17a57f4c8c9c8320e0df0cefe9a761fe5d684ee9a982d2175c5fba50c9fa29059844e96f46b008a6dc1ac1d17c47b1b52fc057ccb55dc7bd85148
+DIST c-list-a0970f12f1f406a5578a5dedf3580cd682e55812.tar.gz 10124 BLAKE2B adb0face335aaa8206e597e404dcfea2b9d22035d4297442473918878ff9928ff5d614b20cb96de8a50c1418da83da5a49837c0677fe2a5f3db4e78cf3f2bfdb SHA512 51958b4c35acd84da89e694fc58a045b28d265f77043d302fe98f3507432363d20bfa611948fad37d0e5feb36b6232f742cde80e6243bafa3cd976c8b11cfc4e
 DIST c-list-f1eadf27377ef2f74b3cfd16185f54a219df2aae.tar.gz 9350 BLAKE2B c2db7f5e67f9575362c059545f3fa0bef4672e1195aeb57edbf50d8265e72f120540178cfaee8f49e0a9494e3ed56a4a10d23de237035d15b529dcfc47184da9 SHA512 c2a0f21bbf90b7dcfe9858aeb4f141202a7f5d7b980189f7ec6dec2eed9b70d78b82be5009ec7ae1a99911e2489a1734b8017cfb709d7625addda5b1a738dff6
 DIST c-rbtree-8aa7bd1828eedb19960f9eef98d15543ec9f34eb.tar.gz 25957 BLAKE2B 76b67a5efeafbf68fe3f1db732d1ad878cee7c23596dda096649c30205582f3d7fca99c5b99ced69b027cd3100351da03aacad00c3aa24d3a0604b09093ecb99 SHA512 57305a5a438a2dd69662dec02117d2636e50f901cb92a251c3844a343108ebeeaa208bb09dbeb22dc1b8d1171719442f4ccc248d89909cdd7310b7db6cfcd6cb
-DIST c-rbtree-a3b1f80548d1c736208c55e9251c49ada649dd62.tar.gz 25948 BLAKE2B 82e3692fd747191fc160ae5add4e037696f9209f7ef3003bcb72def18c96a7368b5e6408d38de6c0609ef27fa6762d9323a85e0ab5d1a50d8b10cca99b2930d1 SHA512 9ab0c6062e5cfb771c4f31a9c8d82f744762d2f9acf24849bcc6f04de57e85fc0f8487ef8c8484e2e0f0baec83a3011b1425ddd183c2836f90906636f1db8d94
 DIST c-shquote-83ccc2893385fcca1424b188f0f6c45a62f2b38d.tar.gz 10622 BLAKE2B 1c705c47ca22dfb3cb0a277ea96156806d1c0e9913da48a2baeea4e2e455e7f417f48db24c94770b7e471655a1c109a23679ce11ed802447e0b41ac3c60f822e SHA512 499fb764a2f72e1151c0007975720b56912f88f0ef92bb88c6b1870fcc8e815af8b377e1e6fb9829426757781134d9ec20cf04cda273ca2a5c128705b36dd3ef
-DIST c-shquote-95e4713a0de475688a5727a5d776dccbc69d3d28.tar.gz 10635 BLAKE2B 90dd5c343dcc7de13a7cc5a495052c058499fb7fcdf44d5463a45714ea8e330fc3c9756c84302f454cd46ef32801b74962d9e49ab930ebc6729cbdb1de9e8056 SHA512 494c55cb676998afc56e40f00661f49698e596a51019e9f227b111b4f16d7f2e65056adc57858c688957a07c972dadd217af2bbb95e390760ef758259e54a769
-DIST c-stdaux-346623b40eb8137cae7568a69ee42253ff098ff7.tar.gz 13046 BLAKE2B 19b22cc7cb6f4a5a970295a36ceecadf8d1fbd93524a39a22107c73df63516c643be711483aa0ca3fdb97941a9a41084802def7c6663824e7660908564f3ad96 SHA512 424512e8818ff56a9882806aa9879f4f5167ed02a19d01cffb42de620816318746898c27d9ccb857b466435d1a588d735ff51da45baa08f9b892dcef18ec34ce
+DIST c-stdaux-8652c488b8f1c29629a5179d4551d0a691ae5901.tar.gz 13075 BLAKE2B ef08451574ea695151cbfdad2060324423c8abcf46ac8a86b3216b85017c9b4dd8399d0561cb4f2c731e9eb2883481db59292769560cbcbfc3e96823ceb70e9a SHA512 bb669b659955ea62734f401c9745059349b23e6ddbca56e72437929b9527647ff7ac6bba4bb06506e4d8d35f3a1e7c4eacd2d5b1e7cb21098faa144c932f2bb0
 DIST c-stdaux-c5f166d02ff68af5cdcbad1bdcea2cb134e34ce4.tar.gz 13054 BLAKE2B 9a550b2eece549f9e7dbc6c69aa58b940e933106cca931a503c12220b3632bf1d48bcd1a2d6fa3a9f3e29e34fbd5bc11eba1751d05a9db40d0c2af21d8e1e066 SHA512 a138d9a8672d63537e6c082946777bdd62d651e837121bf180d5ad0591d12fe2b13fc63499da39a68d2e3ca8da6a0826701ae4807ea78d5a7604e9f2d28760ca
+DIST c-utf8-0837214a9780b7d771a3b3ce9a49196ac0a9d52f.tar.gz 9340 BLAKE2B 4bfa39c39aa8db8b7d797d78081b5f3104c659e2ceefef65aa2d3c03ffb5889d772cb78328473e3557c943b2487b7bcb7b68d7dc7f2b95940b0448b3479f1b23 SHA512 2df368af5023fac6c7f2e018c0cbfd73225bf1c4e0d0387931352909323175652bcd3739e9e6b76a099aea5d3f0290198aa70c69ecc5e9ef22df214f8c75da79
 DIST c-utf8-8a8f07d623492d4b45532527f945b118a2b4299b.tar.gz 9331 BLAKE2B f5b380da37ba0fcef7f8324777180683748639dbbcaf8b16dcc3432cf69b58caed7b93c2de0ef590876ae7c2ee9fa02a26d8ae94c1fc58281812ccd9b705eb17 SHA512 04a3e4e744ae50e9e06080b05d4ad8bb08ced945dc42625a4c47e47feccd2dbae1205555a8857c98f344357c28846cc5d7273bd5fe2e13f454c4d11ee1303b28
-DIST c-utf8-af5bf7f330078d285e5f58584abd6de01c4cfd7d.tar.gz 9331 BLAKE2B 32b6da3f92e25d3971abea08f336856f44e9180e73d776058c473a8140ad519b7b614177445f4e143e56276795d04127ec8c8c01561935683227fb2c391a51cd SHA512 84ee285d90d1a899a75e1fc63931d10ff1b652bb06b19b0916afd0a3af5c359628e2ec2951ca987a8a6e6cdfbe73a286bd5a664c24e9998ada6c29f3c34752ce
-DIST dbus-broker-27.tar.gz 215070 BLAKE2B d7f12c588b3f11434e33c9eec603f2d3f8caa5ae892aa7951f98b533cbd05bbfdab93dd639c64975e79ffd8c7ca19185bf3e8b8f9546237a3686aea0a9f734fe SHA512 e33e48d7d29cb16f5aa10c7b5b98d85b9055adedcb2c4bda63113daa52597f9b322eeb1e128b7e6077378953b41914316485373b614a9a3a7f21cbbfcf5bec2b
 DIST dbus-broker-28.tar.gz 216484 BLAKE2B 8d8dd9d15efa8c276d6db5c4f50320c7d18498c93205f9cda2bb849b781def17c387d5768ef62963024ee99f163ea1a72e457098612a9e6cac39238f3eac533e SHA512 d8b8e0c665e3c0e33f50da99330ff4cfba8107bff2c7e03a9653bd89f740e69ed1dce750c7f737c78454e07294821ff545007f3927f12d7f35f53339e4747791
-EBUILD dbus-broker-27.ebuild 1830 BLAKE2B 8b7e73a05cc9fd084ae5d75033f66c48d5fd8c7e5768e3bef49e76b327dfc9cae190e62b20c30e9810a3a53464d940462de5ebfed221a9138cad54d13e953f73 SHA512 c4402e82c3e4018141d0800f380858b6490529cfef94cf3dd8ebaa5cbc3197889896fbd513751a0d3e3b8608c36cec4f39e0cbe5bffaf41ef9afbd83c7aff80c
+DIST dbus-broker-29.tar.gz 216639 BLAKE2B 94c8b7ea01367eae176d9411af064a960a054d6fbeb2bdebe9ba983d0938443abeb521f32e0eb9ae28155d5c5ebcf461317223387ccfad624ddd24e6bc8e227b SHA512 4c31b8c15f5d1ada0eb9c63c905c9fc9b3b8336beb533974b9c2b2a6a89c306b77d029d1ddbccbad873f62cc0d02cc373a090907dd19eae1a8a7fc2e3a4c2113
 EBUILD dbus-broker-28.ebuild 1830 BLAKE2B b12f4e076b1744abfb216f5e37f6fd5f589d43546ad3b652fa181671d3ccbc865cf300cf720d4aa89ee72794c61650adaeab104c2b9340f51ad23ef65c580ae2 SHA512 9bc28978b7c72b6b22790cec8335ee9450c09a7cb73e3b4083227cbf9124eeebb7870c575f64dd133163fb81d9776dd264759111a315f96bdf940ed49296b7bf
+EBUILD dbus-broker-29.ebuild 1836 BLAKE2B 540f87666d77363175c649b9ddf09889a84ea100d141c3e7b4ffa0f4b8b1188b938ca0c1b263e06bd33506e16e3654b272159e41b554071efc74b300606330ea SHA512 8402b53054399a02940d077a4178a5a1072935f5e7be7063fc120eb815bb1e42124ce6d7a64b399495e035814a4ff4a11eb27ed22f9deec89a4ae0a0652e70db
 EBUILD dbus-broker-9999.ebuild 1830 BLAKE2B 092eea3b81cc65d389c477ed3c1c16473628b417bf262f6609ef62edab4ce1da2efab34a278b66b9704944f3f5e9ada19e37dac40a13051c3eac03094f543c5f SHA512 c6e8f582a8d26de067f0cea6399750c6b93cbc856282a09e76630d1614ea559117f513b7cc59dc2a1dcdd98800f9012d17f16be69f712dfc4d7673ffda43534f
 MISC metadata.xml 327 BLAKE2B baaa6c7be634d16ffbe1196a29bcc2254c77d857dd1b807d50dac7adbd3d20370bf55ac0ea8f60b0fb160bf9ae69d42a5002b4150c4b22c101b37ecab96028a2 SHA512 b350af1c8be6e227fb301fca4dc1d6c90a8ceaf1e4cbf3d83ea54a302a15baa9df560d9b728a66be843b3eb679fa9536ca2f531776ee5d09753233148a0cabe1
diff --git a/sys-apps/dbus-broker/dbus-broker-27.ebuild b/sys-apps/dbus-broker/dbus-broker-29.ebuild
index da12f461b58b..bd41cc4d1b87 100644
--- a/sys-apps/dbus-broker/dbus-broker-27.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-29.ebuild
@@ -12,13 +12,13 @@ else
 	KEYWORDS="~amd64 ~ppc64"
 	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz"
 	declare -Ag SUBPROJECTS=(
-		[c-dvar]=70f0f21e86a34577e674e202d5d09ef167102f02
-		[c-ini]=867f06a12a702c6869924575503877caa0adde75
-		[c-list]=96455db9f04a6c9101a00957161551aea700b6aa
-		[c-rbtree]=a3b1f80548d1c736208c55e9251c49ada649dd62
-		[c-shquote]=95e4713a0de475688a5727a5d776dccbc69d3d28
-		[c-stdaux]=346623b40eb8137cae7568a69ee42253ff098ff7
-		[c-utf8]=af5bf7f330078d285e5f58584abd6de01c4cfd7d
+		[c-dvar]=c8ea9712a94186512c22c32f32c421d6a2db6feb
+		[c-ini]=204410a08d3a6c8221f6f0baf0355ce5af0232ed
+		[c-list]=a0970f12f1f406a5578a5dedf3580cd682e55812
+		[c-rbtree]=8aa7bd1828eedb19960f9eef98d15543ec9f34eb
+		[c-shquote]=83ccc2893385fcca1424b188f0f6c45a62f2b38d
+		[c-stdaux]=8652c488b8f1c29629a5179d4551d0a691ae5901
+		[c-utf8]=0837214a9780b7d771a3b3ce9a49196ac0a9d52f
 	)
 	for sp in "${!SUBPROJECTS[@]}"; do
 		commit=${SUBPROJECTS[${sp}]}
@@ -36,14 +36,14 @@ IUSE="audit doc +launcher selinux"
 
 DEPEND="
 	audit? (
-		>=sys-process/audit-2.7
+		>=sys-process/audit-3.0
 		>=sys-libs/libcap-ng-0.6
 	)
 	launcher? (
 		>=dev-libs/expat-2.2
 		>=sys-apps/systemd-230:0=
 	)
-	selinux? ( sys-libs/libselinux )
+	selinux? ( >=sys-libs/libselinux-3.2 )
 "
 RDEPEND="${DEPEND}
 	launcher? ( sys-apps/dbus )"
diff --git a/sys-apps/duc/Manifest b/sys-apps/duc/Manifest
index 39935bad91b3..4c0f77d9e967 100644
--- a/sys-apps/duc/Manifest
+++ b/sys-apps/duc/Manifest
@@ -1,5 +1,5 @@
 AUX duc-1.4.1-tinfo.patch 751 BLAKE2B 2928f2a12dc8755c5b43ce8255958ceac4b85dadd716d989bf1472b31ef9ee32e799fb83f4c69b617ef80d7479c070fcf784fc9b6efcdf234547167cca4d2119 SHA512 d0bfa984cad2691106038392297ae3e9ccb0dbf83a45456f50918c88d93bbddd33f9c5359367e6348d161b639e03f6e5339a44842d7fd5edb0306e21df846b4f
 DIST duc-1.4.3.tar.gz 363507 BLAKE2B 8d4364d48c247d7a83c8c5dd900b1c36ec78c68fa7d090e178a0e3209583e433c2e459d192f65ac350038c7e0d5a57df2c5c0d649cc9f554d7af74ad960c8db5 SHA512 5eb3e862e7003838e012dd1faab507a9b58607b77bd2af70a662005b6e4008ac44d1fb2e17b99da8e42ddfadb1cede2a468144ace7a72c12d0825fc7df4d18cd
-EBUILD duc-1.4.3-r1.ebuild 1786 BLAKE2B ab3ff4a605e17af8e8684c95ca6fab309f321452119e7bfc1f8409346c1cffd37161138c61f65cd1b9f90683e9009a65f68cc4d68bd417fd8a55bbb1e8ed0fdb SHA512 b16673589ac327e782b8a98abb361c8aa732ab22d4e7306a0c87789c22a543b6018900ea68fab242238c20a6f3671feb2664992ec2a9a04f3bfe576d9940c7b7
-EBUILD duc-9999.ebuild 1786 BLAKE2B ab3ff4a605e17af8e8684c95ca6fab309f321452119e7bfc1f8409346c1cffd37161138c61f65cd1b9f90683e9009a65f68cc4d68bd417fd8a55bbb1e8ed0fdb SHA512 b16673589ac327e782b8a98abb361c8aa732ab22d4e7306a0c87789c22a543b6018900ea68fab242238c20a6f3671feb2664992ec2a9a04f3bfe576d9940c7b7
+EBUILD duc-1.4.3-r1.ebuild 1784 BLAKE2B 0afa7673942d072fd8b12db5ffb16118c734e24b5583dc5004553f0838fc65c9cc6c5883845eb44f7cfa74dda875a7eeb077f1fa6dadc252c8d2da71863a4c46 SHA512 e9cb9655ac3c0583ac79e5ac0b3f91a775d1f168cf8e957bccbe36174aa412a8cabf7160159b609eb49f199ead5ff843f6f65af5e3867b15c5017f9c390d5be9
+EBUILD duc-9999.ebuild 1784 BLAKE2B 0afa7673942d072fd8b12db5ffb16118c734e24b5583dc5004553f0838fc65c9cc6c5883845eb44f7cfa74dda875a7eeb077f1fa6dadc252c8d2da71863a4c46 SHA512 e9cb9655ac3c0583ac79e5ac0b3f91a775d1f168cf8e957bccbe36174aa412a8cabf7160159b609eb49f199ead5ff843f6f65af5e3867b15c5017f9c390d5be9
 MISC metadata.xml 838 BLAKE2B 79762b1423cc5de375cc7e4f9ed16749779db5cfd33b5c7f5c9819c2a00cdb162e023def10c4272064e42a5054cb033f4fa5eda6fd2e6045ed933b022fd239d0 SHA512 4e2f7fb47b98219402540be2c812f60aa6c1309b60cbe746855932287ed8fe4256dc3d555129f21dbc285d7d5332fda3d9c7dfaeb3984c47b598f8c05b06b8fe
diff --git a/sys-apps/duc/duc-1.4.3-r1.ebuild b/sys-apps/duc/duc-1.4.3-r1.ebuild
index 7425a6401b06..e3f8f9050fbe 100644
--- a/sys-apps/duc/duc-1.4.3-r1.ebuild
+++ b/sys-apps/duc/duc-1.4.3-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/zevv/duc"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="cairo gui -leveldb ncurses -sqlite +tokyocabinet X"
+IUSE="cairo gui leveldb ncurses sqlite +tokyocabinet X"
 
 REQUIRED_USE="
 	^^ ( tokyocabinet leveldb sqlite )
diff --git a/sys-apps/duc/duc-9999.ebuild b/sys-apps/duc/duc-9999.ebuild
index 7425a6401b06..e3f8f9050fbe 100644
--- a/sys-apps/duc/duc-9999.ebuild
+++ b/sys-apps/duc/duc-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/zevv/duc"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="cairo gui -leveldb ncurses -sqlite +tokyocabinet X"
+IUSE="cairo gui leveldb ncurses sqlite +tokyocabinet X"
 
 REQUIRED_USE="
 	^^ ( tokyocabinet leveldb sqlite )
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 6d6e9720bec4..6a502344b6b0 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -3,6 +3,6 @@ AUX file-5.40-seccomp-faccessat.patch 1006 BLAKE2B 80a33bec7dd36e146c713c8bb6397
 AUX file-5.40-seccomp-fstatat64.patch 727 BLAKE2B 164574b98126ad8804c7a3ef51c80567a83d89c609b731b84f2d5e0b8fe54d060f45b6db38258ece2e2af1e0d0674e4fdf5b62df6217695d06042bb86ad72f5b SHA512 5e5364659e2c96e438000e698f9099be1d2bee94890c51ed849f6e0d139ba637a8026d975200476636cd8282791b6c3e5b71326fb8519323d6c07604975b5b0c
 AUX file-5.40-xz_magic.patch 1277 BLAKE2B 3af2322360ab9d7b3340dd34a2190e249dac5d0dc91843efd07e9fdd92f48ebab0a67decae23e68d9dc6a5fae38880d56977dfa4b3a72d74e362c8f3aab42fee SHA512 4e9e64c1ac0e7e95a113577a32be0fe2f2c2d9acbbe323622c2409d2e1b9f9a6cb3e8572569bbef156ca06c6470ee7db38d2579582622f224919eb37243319e5
 DIST file-5.40.tar.gz 1004214 BLAKE2B 4e15a1ca62fe7c03c90b0e509dc899b87f4474f758ad3d08172b3d838dc3f7c2954ba1074eeeeb3da8c04b8df84eff2b8cdf3177da334a926914429df67f60bf SHA512 3b70df75fa4c9050d55b1ffdc28e5f3c8b8ef7d4efd1a06bf53f113b676d81114a85aae56e0897d32b53716662d64ad18ab251ca8c92c6405c69eb758bb99afb
-EBUILD file-5.40-r2.ebuild 3418 BLAKE2B 05d0f47c954197f1105e0ce284a0986f0352072caf98b4dd3af439e58cc6e1015786f1cd4196fbf5950d1def62717a5bbbf3a58aacf2a012d6bb4dd3b1d73842 SHA512 d9fd16e393b90d09edc074cb0f58f972e99f5f7a22d8a106ed74db95cd30f508a48aaf5a476f900d2914b6b3c6668c6a09a7fcb11ca46efaa61f65069414738b
-EBUILD file-9999.ebuild 3272 BLAKE2B d585df4df18b289e21ef901b9abcde83cbf99aa234107013fe896974018176cc78d02f92c49fe13785b2ee2f9350d017993f38a78897ef20617214f14c9dd481 SHA512 bf305f9f9e635cdf3edd8c33cad98c0cc05a6bbb190ffb3df9d8cb46517fb50b66089becf395fd44457c69f5ccf91dcb64979fcf4e1507bfc9488d26e21cf90b
+EBUILD file-5.40-r2.ebuild 3419 BLAKE2B 2d48c15c53d7e1fcf49d0a4fba5345ffdb60f70541cc7432461507974ede6846cb8608a81dd61865e895b4818a727a5b025fe12f31c45a256c1f5086b41b4102 SHA512 57d2bb5db419fe4708f502d3a33c13c934b148e47ccc6cee69c24229d02fd6200aeaefb1a8278f30f48eeb69bbd4cf831b5439a4585fa641d068aa0c05f95d65
+EBUILD file-9999.ebuild 3273 BLAKE2B 691dabede60ccb8f756ee3a03a5e2db17f58e556cc19f28493685996ac637e7343803a5667e591fc1b336611458b8550c222238983d797fa21e1fe66c60d1625 SHA512 20a7db1cd42cb5c47d5a0c7a607b3e547e1e76b6fe3effd8a456425929312981b47d940c4deee82f14b20e6be50416206aae4b32cbab80bbdf459cce76443347
 MISC metadata.xml 381 BLAKE2B 242f4a2403d0a4c69c7ff400fdbd447bb7fb8572dc57dc05f3edd0c875da68433217bec46d43467fa03c5e9ec69616e3450635ff2662ae3ed830a138521e23ab SHA512 f69d67890ecb0b574d414c432df12f6e8d31ceb7755055683941017563da8713d07728e49cd4a7277699a97cd3ba732c946ecf5435cee94778a0d5652e7d6857
diff --git a/sys-apps/file/file-5.40-r2.ebuild b/sys-apps/file/file-5.40-r2.ebuild
index 036079303892..74b875bde528 100644
--- a/sys-apps/file/file-5.40-r2.ebuild
+++ b/sys-apps/file/file-5.40-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 libtool toolchain-funcs multilib-minimal
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index 67c33d9f4859..9e1359cd588f 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 libtool toolchain-funcs multilib-minimal
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index 43b6bbef6456..28279eb56359 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -1,5 +1,7 @@
 DIST flatpak-1.10.0.tar.xz 1504300 BLAKE2B 213fb5449b075250cbec9f43ea5b02afae809b8e58d3be0afd39a70d78431f7efc7912462ce46061a53aa4dc2ef8f5e9504cdaffe4b39d2f53292736442ceb3d SHA512 8eaabd66cbd26f5288fb72cddcd195ea4702243e9f5ceff425836b5f305e2b7a4172e67d30cc0e74ad97937c007e8f4ab81080a7ada3f528d05f74845c923aeb
 DIST flatpak-1.10.2.tar.xz 1507856 BLAKE2B b19b04d536b43a7bbb7f479e495538137402ff46bee3be5d180d12983c4e69b8726628bb69aea64917163a4722a34987b631a073c94083cae50d79dd7d74db20 SHA512 c932b9aa2803aa5b453917174bf282d82924aca7341d72555e2557fc588ccefa0eaf32b956f75752c17cd8f73b687d4a688ebd64df36680b80b5ff5750468597
+DIST flatpak-1.11.1.tar.xz 1534700 BLAKE2B 811ac946fe6616d201ffc621881b396b6787ce435bdceb34c9fa3e162f20eba966d88695bcd6e3716b1f949976ac628a085249785c4e39989be5139cd89fdfaf SHA512 0121b4fcf159311c7480d1be29cd169a39ae61fcea9532f25b266b585038a07a930ff418a9c5b9645aab2510de78ad32c8ae8556991c8d2d7c08ab1e3cc819d1
 EBUILD flatpak-1.10.0.ebuild 2343 BLAKE2B ac0c0593efb4dd67708f92eb67b3d8967822e7052cea13bde89620b8548a9952e933a851a47dc4898994ad9c001088b4997730c7e32d4a104634a71567eecb99 SHA512 318b49b5bdd1ff3c0a84b3c23e1c27161a57a5a8e9e27cb483b28da4f2acc8f1566ce89c6c3bd9ffef44bb8b0478520f4a55a4095c0e6f85639f248a7a08fa5c
-EBUILD flatpak-1.10.2.ebuild 2346 BLAKE2B e74ae812d21e8d3eb73924c3b10818c502f5d072558206fcb8bda1e3491ca1f6bd52e7cdc1d51f222b7aeb5ec6bcc58dd1f3c890eae1e10508b686057bbd28f0 SHA512 01e277ddb3e6025dc856deb2f01d6ee50e4d2af37940b38fcea6c32a91c6b73a3590073880edc95bd18a3cc4d25d0c18e46ab9a11d6334737055d4aa1d9cec1e
+EBUILD flatpak-1.10.2.ebuild 2343 BLAKE2B ac0c0593efb4dd67708f92eb67b3d8967822e7052cea13bde89620b8548a9952e933a851a47dc4898994ad9c001088b4997730c7e32d4a104634a71567eecb99 SHA512 318b49b5bdd1ff3c0a84b3c23e1c27161a57a5a8e9e27cb483b28da4f2acc8f1566ce89c6c3bd9ffef44bb8b0478520f4a55a4095c0e6f85639f248a7a08fa5c
+EBUILD flatpak-1.11.1.ebuild 2346 BLAKE2B e74ae812d21e8d3eb73924c3b10818c502f5d072558206fcb8bda1e3491ca1f6bd52e7cdc1d51f222b7aeb5ec6bcc58dd1f3c890eae1e10508b686057bbd28f0 SHA512 01e277ddb3e6025dc856deb2f01d6ee50e4d2af37940b38fcea6c32a91c6b73a3590073880edc95bd18a3cc4d25d0c18e46ab9a11d6334737055d4aa1d9cec1e
 MISC metadata.xml 324 BLAKE2B edeb76b1ab3c052555564fdca397116a0ca48a7b2eafddf8958e080a7c8ccab9a04613fe67504c4c1d51d75eccc8cd25cc0d4223958f21e37f8ae056b3fd4686 SHA512 667951ea59e4871daf2508bdb4e56a68638d37bbf6fce0a56923cf3c0632a28d2eae3aedbc38e8db04e80c03fe06918569b1697e890bf20055add72ab0c7c15d
diff --git a/sys-apps/flatpak/flatpak-1.10.2.ebuild b/sys-apps/flatpak/flatpak-1.10.2.ebuild
index 6c69987f33c5..62dc9a6edd2e 100644
--- a/sys-apps/flatpak/flatpak-1.10.2.ebuild
+++ b/sys-apps/flatpak/flatpak-1.10.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://flatpak.org/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="doc gtk kde introspection policykit seccomp systemd"
 RESTRICT+=" test"
 
diff --git a/sys-apps/flatpak/flatpak-1.11.1.ebuild b/sys-apps/flatpak/flatpak-1.11.1.ebuild
new file mode 100644
index 000000000000..6c69987f33c5
--- /dev/null
+++ b/sys-apps/flatpak/flatpak-1.11.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit autotools linux-info python-any-r1
+
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+DESCRIPTION="Linux application sandboxing and distribution framework"
+HOMEPAGE="https://flatpak.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="doc gtk kde introspection policykit seccomp systemd"
+RESTRICT+=" test"
+
+RDEPEND="
+	acct-group/flatpak
+	acct-user/flatpak
+	>=app-arch/libarchive-2.8:=
+	app-arch/zstd:=
+	>=app-crypt/gpgme-1.1.8:=
+	>=dev-libs/appstream-glib-0.5.10:=
+	>=dev-libs/glib-2.56:2=
+	>=dev-libs/libxml2-2.4:=
+	dev-libs/json-glib:=
+	dev-libs/libassuan:=
+	>=dev-util/ostree-2020.8:=[gpg(+)]
+	|| (
+		dev-util/ostree[curl]
+		dev-util/ostree[soup]
+	)
+	>=gnome-base/dconf-0.26:=
+	>=net-libs/libsoup-2.4:=
+	sys-apps/bubblewrap
+	sys-apps/dbus
+	>=sys-fs/fuse-2.9.9:0=
+	sys-apps/xdg-dbus-proxy
+	x11-apps/xauth
+	x11-libs/gdk-pixbuf:2=
+	x11-libs/libXau:=
+	policykit? ( >=sys-auth/polkit-0.98:= )
+	seccomp? ( sys-libs/libseccomp:= )
+	systemd? ( sys-apps/systemd:= )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-devel/automake-1.13.4
+	>=sys-devel/gettext-0.18.2
+	virtual/pkgconfig
+	dev-util/gdbus-codegen
+	sys-devel/bison
+	introspection? ( >=dev-libs/gobject-introspection-1.40 )
+	doc? (
+		>=dev-util/gtk-doc-1.20
+		dev-libs/libxslt
+	)
+	$(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]')
+"
+
+PDEPEND="
+	gtk? ( sys-apps/xdg-desktop-portal-gtk )
+	kde? ( kde-plasma/xdg-desktop-portal-kde )
+"
+
+python_check_deps() {
+	has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	local CONFIG_CHECK="~USER_NS"
+	linux-info_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# This line fails because locales are in /usr/lib/locale/locale-archive.
+	sed -i 's:^cp -r /usr/lib/locale/C.*:#\0:' tests/make-test-runtime.sh || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-sandboxed-triggers
+		--enable-xauth
+		--localstatedir="${EPREFIX}"/var
+		--with-system-bubblewrap
+		--with-system-dbus-proxy
+		$(use_enable doc documentation)
+		$(use_enable doc gtk-doc)
+		$(use_enable introspection)
+		$(use_enable policykit system-helper)
+		$(use_enable seccomp)
+		$(use_with systemd)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 64354936a2e6..e5e47d0de32b 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,8 +1,11 @@
 AUX fwupd-1.5.7-logind_plugin.patch 265 BLAKE2B 7959a4cb059a2207b0048f474ff9e0a3e3ab625d6db5e7dacafb7b6190c9718bd8659760579c6ee16fe22fefcc9ec4837f7b2635b1ff5f555ffda36cefacab48 SHA512 a809831e307549f109fbc2c705b80535d885db92a96b72d07f9ef7a954e52ffa2204331e608bc719d41ad038888adfeb23f6ed708c6a769c436f81b4086fedbb
 AUX fwupd-1.6.0-gusb_deps.patch 2610 BLAKE2B 462e15359979cf1d4ea288161723a71f30ec6a027e4c191a78fa19446c86c6572d70d262b5475e5871f6481b2635be9fb2a2c4fe29a6132f026ac417572fcdef SHA512 9f659172b7125e7b8481e928ed7a20843f2772513e842350c57021fb8be114db0d2d7c5005ec6220eb2c8a434f3eb14cd3b8e06603366a33fc7f3a23be6191e7
+AUX fwupd-1.6.1-revert-Change-python-version-check-order.patch 1011 BLAKE2B 733c667528b52594ed7ab6ac19296ac71d961a2fdfdd45f1bc4af0540fc4b1cd520ab30ca6d7b0a48261a9966a49211f90875a6b0925d21bbdcc3c117fab3db3 SHA512 c4d1e61682f963f2c0465b49b1e944e800683003ad263e1dd7e61cf4e023f55f6bb010a51f87468aa0b4c1ea523f31a5f265e5fa0e70a10b4527243bc250f4bf
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
 DIST fwupd-1.5.9.tar.gz 3712637 BLAKE2B 17429bdc3073a92b94de9bc67ce1955e928e8d6aeefa5f0ad39a9d15457f96c562ce5cfbc47e1fc450c31c2b9334ca3902ed63ef809e8d2cb5b5459cc54dec28 SHA512 ccd1246ab5b3c876251924a14d1c2c553b2df5702c6673978b1d627ea1028c3950241f73dd54e2fecb5cc204a1dc77e6597f7514eff6467beb50be7874352d78
 DIST fwupd-1.6.0.tar.gz 3747361 BLAKE2B 6368089db78a512048268ef3cb0333c75bb95b0f62d023e3db7c854c3362b88db1b1676cc24b9a4a5fe854e7dea6c727ec3d645476ee323a0dae16caf7028478 SHA512 0f2342fba95d635348c4b153887f2ea27e4bf49972558716143051ba79c39948487eb6cc15f938738d83aa3ea3eef5ae2854c9756a60f59f52ac859d35e2a669
+DIST fwupd-1.6.1.tar.gz 3786336 BLAKE2B 429e41cad3acdcd9b245532a38126a8e3d366081aba16b9f3e04a2029980b8d6e3f4ac3f8c6d6cd1332c344526a7901c976d6fa0bc1c4011e54d5dc96a427d2d SHA512 6d795e9898de6097d0f1185fbc3a6864566f90fc504e5d9cf192e5dca50c659d39f43f1922c7506151bd1538a23db507e95893436de733b1335bd69dc56f3b1c
 EBUILD fwupd-1.5.9-r1.ebuild 4398 BLAKE2B 8c5e659230931788d337fa7b9b9d6f86e781819d2fd96f4f061690202a1b0483b7707c641264120da3b868e1a5d6dd469818c0be6ce7d1d81235bb137f55c682 SHA512 a6697293e77036d791d370c106e0bb9de354a2776db5eca6734e976d60f5d8b3fa89c767fb1a32453db4b260d725c38e5e5e6cf147ea39d851f5d2317a3eb77f
 EBUILD fwupd-1.6.0-r1.ebuild 4377 BLAKE2B 7761382860ace3b417be28363ee7684ca70093ce61caf9ad4f29fc39c5e0d49ef8673b37cd59559ebdd9577966d70f0897b38471f82b2ab258b7efc5e7a28190 SHA512 63a48ed1b558961540e4c634353f92edcd7f05e0e35f1b11c70dcbe5fcda6dfa5feaa0eae0adb7b2f74fd27ca6afaf185814f8c1a77236fa84a70efe65a089ae
+EBUILD fwupd-1.6.1.ebuild 4417 BLAKE2B 6c47be55cccbbd398ba0c84031c49247aca6bbe737d5d215e162eb196c1cafce858327171f13f0cd372c47674bec8e75a15eac50200dda8e2928d79991505d3f SHA512 4383a8b4f9d8dd2516afc5a7492680338dbe3b6359e9fcc331bf70396aba86896aec5f9ff978774beebf562eb6047dab0e8f66f2fa5cf7566c763a39624c5218
 MISC metadata.xml 1140 BLAKE2B 9e901230c53b487f05f290b46c53a5ee3ebd81b3aefcab2368bfc99f28e80d85554613de8cc4481047a49cf6719f1b1a442d87456ad21aecbadd573ab0959385 SHA512 93bd5bbe8a57219d825e0cc0a8ebd85534396922efcefa224d733bbd1190f201009a8223dfdf5fb2a2403439805c2205b0eef39e8a9e25d0df3733b1654b8f61
diff --git a/sys-apps/fwupd/files/fwupd-1.6.1-revert-Change-python-version-check-order.patch b/sys-apps/fwupd/files/fwupd-1.6.1-revert-Change-python-version-check-order.patch
new file mode 100644
index 000000000000..d1c1b1408303
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.6.1-revert-Change-python-version-check-order.patch
@@ -0,0 +1,25 @@
+commit 72a470fd607a40e8f23c1f2407faf69e91350783
+Author:     Thomas Deutschmann <whissi@gentoo.org>
+AuthorDate: Tue Jun 15 14:11:24 2021 +0200
+Commit:     Thomas Deutschmann <whissi@gentoo.org>
+CommitDate: Tue Jun 15 14:11:24 2021 +0200
+
+    Revert "meson.build: Change python version check order"
+    
+    This reverts commit 1b396215d9396680b1b6b5c14c6f57f2226ff0a9.
+    
+    This is causing a regression for Gentoo, https://bugs.gentoo.org/796143.
+
+diff --git a/meson.build b/meson.build
+index 5d507515..1e0e350a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -252,7 +252,7 @@ libm = cc.find_library('m', required: false)
+ libgcab = dependency('libgcab-1.0', version : '>= 1.0', fallback : ['gcab', 'gcab_dep'])
+ gcab = find_program('gcab', required : get_option('tests'))
+ bashcomp = dependency('bash-completion', required: false)
+-python3 = find_program('python3.8', 'python3', 'python3.9')
++python3 = find_program('python3')
+ 
+ if get_option('gnutls')
+   gnutls = dependency('gnutls', version : '>= 3.6.0')
diff --git a/sys-apps/fwupd/fwupd-1.6.1.ebuild b/sys-apps/fwupd/fwupd-1.6.1.ebuild
new file mode 100644
index 000000000000..5468692f74bd
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.6.1.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+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/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="agent amt archive bluetooth dell gnutls gtk-doc gusb elogind flashrom lzma minimal introspection +man nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	^^ ( elogind minimal systemd )
+	dell? ( uefi )
+	minimal? ( !introspection )
+	spi? ( lzma )
+	synaptics? ( gnutls )
+	uefi? ( gnutls )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(vala_depend)
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+	introspection? ( dev-libs/gobject-introspection )
+	man? (
+		app-text/docbook-sgml-utils
+		sys-apps/help2man
+	)
+	test? (
+		thunderbolt? ( dev-util/umockdev )
+		net-libs/gnutls[tools]
+	)
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-arch/gcab-1.0
+	dev-db/sqlite
+	>=dev-libs/glib-2.45.8:2
+	dev-libs/json-glib
+	dev-libs/libgpg-error
+	dev-libs/libgudev:=
+	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
+	>=dev-libs/libxmlb-0.1.13:=
+	$(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?]
+	net-misc/curl
+	virtual/libelf:0=
+	virtual/udev
+	archive? ( app-arch/libarchive:= )
+	dell? ( >=sys-libs/libsmbios-2.4.0 )
+	elogind? ( >=sys-auth/elogind-211 )
+	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
+	gnutls? ( net-libs/gnutls )
+	gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
+	lzma? ( app-arch/xz-utils )
+	policykit? ( >=sys-auth/polkit-0.103 )
+	systemd? ( >=sys-apps/systemd-211 )
+	tpm? ( app-crypt/tpm2-tss )
+	uefi? (
+		sys-boot/gnu-efi
+		sys-boot/efibootmgr
+		sys-fs/udisks
+		sys-libs/efivar
+	)
+"
+# Block sci-chemistry/chemical-mime-data for bug #701900
+RDEPEND="
+	!<sci-chemistry/chemical-mime-data-0.1.94-r4
+	${COMMON_DEPEND}
+	sys-apps/dbus
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	x11-libs/pango[introspection]
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.7-logind_plugin.patch
+	"${FILESDIR}"/${PN}-1.6.1-revert-Change-python-version-check-order.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use nvme ; then
+		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
+	fi
+}
+
+src_prepare() {
+	default
+	# c.f. https://github.com/fwupd/fwupd/issues/1414
+	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
+		-i plugins/thunderbolt/meson.build || die
+	sed '/platform-integrity/d' \
+		-i plugins/meson.build || die #753521
+	vala_src_prepare
+}
+
+src_configure() {
+	local plugins=(
+		$(meson_use amt plugin_amt)
+		$(meson_use dell plugin_dell)
+		$(meson_use flashrom plugin_flashrom)
+		$(meson_use gusb plugin_altos)
+		$(meson_use nvme plugin_nvme)
+		$(meson_use spi plugin_intel_spi)
+		$(meson_use synaptics plugin_synaptics_mst)
+		$(meson_use synaptics plugin_synaptics_rmi)
+		$(meson_use thunderbolt plugin_thunderbolt)
+		$(meson_use tpm plugin_tpm)
+		$(meson_use uefi plugin_uefi_capsule)
+		$(meson_use uefi plugin_uefi_capsule_splash)
+		$(meson_use uefi plugin_uefi_pk)
+
+		# Dependencies are not available (yet?)
+		-Dplugin_modem_manager="false"
+	)
+	use ppc64 && plugins+=( -Dplugin_msr="false" )
+
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var
+		-Dbuild="$(usex minimal standalone all)"
+		-Dconsolekit="false"
+		-Dcurl="true"
+		-Ddocs="$(usex gtk-doc gtkdoc none)"
+		-Defi_binary="false"
+		-Dsupported_build="true"
+		$(meson_use agent)
+		$(meson_use archive libarchive)
+		$(meson_use bluetooth bluez)
+		$(meson_use elogind)
+		$(meson_use gnutls)
+		$(meson_use gusb)
+		$(meson_use lzma)
+		$(meson_use man)
+		$(meson_use introspection)
+		$(meson_use policykit polkit)
+		$(meson_use systemd)
+		$(meson_use test tests)
+
+		${plugins[@]}
+	)
+	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
+	export CACHE_DIRECTORY="${T}"
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if ! use minimal ; then
+		newinitd "${FILESDIR}"/${PN}-r2 ${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
+	fi
+}
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index 90565c371b40..b8347856d941 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -1,6 +1,8 @@
 AUX gptfdisk-1.0.6.1-spurious_mbr_warnings.patch 2708 BLAKE2B 538ee3c542fc7d0cfbb8f5857afa19be417ac9f93cf3feb0c5800a813690e453266d560a934c7066ad2aae0a83b08554cfe59eeecfb60a6f64a5c8fed800311c SHA512 11d7d990d8068f1310ceefc3d59069d9e563125b02011b6b6d6833c2bbcb101c45163c9371d698ab8d489bac0621f5454030f27c70773d7f30daad7aabace682
 DIST gptfdisk-1.0.6.tar.gz 207017 BLAKE2B d00e0f00dc8dce3b6088250aa39e05f41c96bee2218eec1dca34a160e70129d1006abc4341031994c53e77068b5de510b923c69858903627ccf786f3cc848a86 SHA512 a3bf95c813f707d9d41513295c3419916301a0e88b4c6ade70ad7d9422a507d519e092e68a3868d53092428d159bdbb248817c4f40d8ac88b0175d5afbd79dbc
 DIST gptfdisk-1.0.7.tar.gz 207723 BLAKE2B cebb0375294b4ff8f8eb522a4ae23259714d07d670a7bfbf8664586c948c1c8bee2674649a181a7c5d22f9dfe177feb7a9648ca9936c388b419faf7b52e789d8 SHA512 8a2067523479e34c76392571692b36e6c9eadcd0aca979f1ba09904930ed92a709bfdcdfa3369230a5ab2b5a751682dc7fb4645fb5f7f1c361ee8d28e104214c
+DIST gptfdisk-1.0.8.tar.gz 208958 BLAKE2B 03c74c43fead13e90ff6cd42405e15db726f527801a9e3f1d5f6a83d3fa58f0f8e58b35edc1b12b0b2e6c7849b657ce4493ac67204d25309e6f63fe7f57f766b SHA512 0818a238e57cf6de893da7c161e8aaf2d30ad917a47750de09967ce1d83d1ab6666fa043465abaffdc293d058acc3fa87f8bc93a4b03c7c5d9a9ceb8f5b07331
 EBUILD gptfdisk-1.0.6-r1.ebuild 1308 BLAKE2B 494064be22ec49402cd5a884ea03a4d130fa6a66d565efa4187dde06e5cbf511961dea8f3abbad31b741e94453956c3d5b2531a404ec0cefa51e8b30cc35d1d2 SHA512 ddfb19466f938f5f6a58f19dccfd80de3dbdbe2e488e63e6338df4272f585be567a7a74c9d8a32dd83ba34822ac558166ece8b8ff029a8bfa3d74a673e773581
-EBUILD gptfdisk-1.0.7.ebuild 1252 BLAKE2B 31480c49e299e1dc5b3f533998d6a473c930cf18652a62ced07c6a0b27cf82d571972b47ca42f1402d4c30ae9b8b044ef3385d59a828920dc0c24c9255612375 SHA512 8392f645d7fa03a51a243bcb8c42dbee4dc7832ac32fb84d3c61016f96825dffffb2d440f1765d70da89ab498de38e874d9eaf890b922ae93b9090653b90d79c
+EBUILD gptfdisk-1.0.7.ebuild 1248 BLAKE2B 2046f80b5ed6322d855520dec795bd185fbe1c22b7f2bf26737de501708439840b0766c1dddea5639c97ecd5e756487afbb44137235dc49b32b8c4ae76377377 SHA512 8373b463fbd55f3070376b9884d04d9c81392145058433afa09f0ce3b1a05f20314b4dd6a614050554cdf13c4897ee463a93d0e9373fd3b0e10c91ec2749b112
+EBUILD gptfdisk-1.0.8.ebuild 1252 BLAKE2B 31480c49e299e1dc5b3f533998d6a473c930cf18652a62ced07c6a0b27cf82d571972b47ca42f1402d4c30ae9b8b044ef3385d59a828920dc0c24c9255612375 SHA512 8392f645d7fa03a51a243bcb8c42dbee4dc7832ac32fb84d3c61016f96825dffffb2d440f1765d70da89ab498de38e874d9eaf890b922ae93b9090653b90d79c
 MISC metadata.xml 339 BLAKE2B 3f08c8aa6a482a6d923388fcbf800cac3282c5c864b9fe27868491d10e7edb75ed04f8d7bc86f5295c90e338d99d59b275ae79813b4d549a04331992526c6979 SHA512 d8334a3e741adf97739f9fef66d7b38bfab9e2d189ac5fbc96ab27a7c1551938b6184ebb08b03ef8b6864f6e43d536836f373e03f3491cacc8f6ee3496f615b5
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.7.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.7.ebuild
index 253377c376a9..ff07845b09b6 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.7.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-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="kernel_linux ncurses static"
 
 # libuuid from util-linux is required.
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.8.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.8.ebuild
new file mode 100644
index 000000000000..253377c376a9
--- /dev/null
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.8.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="GPT partition table manipulator for Linux"
+HOMEPAGE="https://www.rodsbooks.com/gdisk/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="kernel_linux ncurses static"
+
+# libuuid from util-linux is required.
+RDEPEND="!static? (
+		dev-libs/popt
+		ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] )
+		kernel_linux? ( sys-apps/util-linux )
+	)"
+DEPEND="
+	${RDEPEND}
+	static? (
+		dev-libs/popt[static-libs(+)]
+		ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] )
+		kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
+	)
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	tc-export CXX PKG_CONFIG
+
+	if ! use ncurses ; then
+		sed -i \
+			-e '/^all:/s: cgdisk::' \
+			Makefile || die
+	fi
+
+	sed \
+		-e '/g++/s:=:?=:g' \
+		-e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \
+		-i Makefile || die
+
+	use static && append-ldflags -static
+}
+
+src_install() {
+	dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts
+	doman *.8
+	dodoc NEWS README
+}
diff --git a/sys-apps/grepcidr/Manifest b/sys-apps/grepcidr/Manifest
index 946e349b058f..0a0c2289b9a1 100644
--- a/sys-apps/grepcidr/Manifest
+++ b/sys-apps/grepcidr/Manifest
@@ -1,3 +1,4 @@
+AUX grepcidr-2.0-Makefile.patch 248 BLAKE2B dfc4918542b61ea19cd952c0c8ba5e7d5e3acdc4c4990efbc77df5fea5477eea77c427b0bd06e08e7d1a6c9c3059c4ae9689903d33165bcccd4e3683304a54ed SHA512 f34872363cc51d7715cf2695162e2a7a29582b62fa97e9d63b55c44cc6be68823f97b45aa914cf65f3d24c15ab55c5918734da00bb80ee895708ea16c687dbed
 DIST grepcidr-2.0.tar.gz 16557 BLAKE2B 48fcb67eea8c2cdb193fbc3d75373a4da215db64f7f865418bec55d98a74fba4c56a74729181bf1aacd7817268b94b943b2625b8ed81dce746992f2aa746d975 SHA512 c592c7a96e5e711cb5ee10ea1f63907411f69c0014c0bdc845f4b026766b6466db624063af1411b994b53aa7e694fe99ecb1120c11543c5ea1b11afc9558f7aa
-EBUILD grepcidr-2.0.ebuild 562 BLAKE2B 8ba4498f2e0d16546ac82211fa0d412c34354c6f7ae02d9e93e3810c2e81038e54319772c71b0f19a6a3c422fa47f23b3fc40fa9f06d0b0e79760113bf982df7 SHA512 df53bdaf07d496229843698b4842e5d7550c79f53e0b191c8778ff51b1b852db3a4a9727808679d9fe7517f1c6427dea76b1646a3027e24e4c2652c0d8676a1a
+EBUILD grepcidr-2.0.ebuild 635 BLAKE2B be3234f324a3dbeb63fd0c1d62392785f6036a977d409dd8e9988faedb7347e0c71f4e893f5bc495ed1cebf9ee08e6fa2585baf1e0b11265a1c0d0cba906c689 SHA512 32e4c455daa04c30345382bea67039fc644eede503121c5a584e89d2d6696316a21149e54f8583f671550ebce3b52aee0f11d87a0f4c4037a982b7b5a9292014
 MISC metadata.xml 249 BLAKE2B f870f9dc7bc1a515f782f4c1c544b6473b3ec16235b88a9930783ed8f7aa7f010838c37e225840b61a56c5f01c70ac3b50560fc2f5bc908418c341f51620ffe7 SHA512 1723b9b2663814b898832e18aea1a02520775e545e256fb70a8829e2b0515e59b5abab985c995b9ae2f509d95ea4601ac0085ab0d1653cdda0ebe90f775f6e5b
diff --git a/sys-apps/grepcidr/files/grepcidr-2.0-Makefile.patch b/sys-apps/grepcidr/files/grepcidr-2.0-Makefile.patch
new file mode 100644
index 000000000000..c1b0b56f2a11
--- /dev/null
+++ b/sys-apps/grepcidr/files/grepcidr-2.0-Makefile.patch
@@ -0,0 +1,12 @@
+Respect CPPFLAGS, LDFLAGS
+--- a/Makefile
++++ b/Makefile
+@@ -15,7 +15,7 @@ LDFLAGS=
+ all: grepcidr
+ 
+ grepcidr: grepcidr.o
+-	$(CC) $(CFLAGS) grepcidr.o -o grepcidr
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) grepcidr.o -o grepcidr
+ 
+ doc: grepcidr.1
+ 
diff --git a/sys-apps/grepcidr/grepcidr-2.0.ebuild b/sys-apps/grepcidr/grepcidr-2.0.ebuild
index 77b3863961fd..4b99fd34edbb 100644
--- a/sys-apps/grepcidr/grepcidr-2.0.ebuild
+++ b/sys-apps/grepcidr/grepcidr-2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,17 +12,21 @@ SRC_URI="http://www.pc-tools.net/files/unix/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0-Makefile.patch
+)
 
 src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="${EROOT}/usr" install
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
 
 	dodoc README ChangeLog
 }
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index abb6da17f041..ec2a4fe93131 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -1,9 +1,6 @@
-AUX hdparm-9.51-build.patch 1210 BLAKE2B cb35c2fa451a0746ffc2f431ef3857b313f1e8c1e0cac7297deb5113944cb642a38734f1ba7d8538c1c1b4b0ec322827f87eb8e91520623712f3db67379c8aae SHA512 d8efe50cc8ab963be2ace3e52e077e3be8d266b2c5c293febe344fc53760d53c1b52f7bbd1c7813f7a7979a6e4ebc52cb808dc3797f6e1ac7949ac5f9696239a
 AUX hdparm-9.60-build.patch 1153 BLAKE2B c3eb037e0576a066fe2a2c6e00406dcfd3e99e23b468a4fbc0f5ac545d8a1b214168769da94271242b2119d480e34dbcaa734b636231021c03e2a57f585426cc SHA512 d3f76575074806c7981aacdf7a5a4e1e97a2afbcd09e8821cf1c064f8960b397e2ccdd534fb95b91f43f35c481f94463fb1fe485189436bd5de8178823d7c9eb
 AUX hdparm-conf.d.3 872 BLAKE2B 15376fc6f37624e6a57c97b11101b190512db4493e4f7f0c1d9e3ba6fe77e013d4044197751696988c5ac7c96e38e9737bc3bd2e270274c94db85228d5c2eb98 SHA512 968c6b9d26a71bf724728c259d35a499a644496875eac255dcac3cb4a7e5cadb677a4f6e5e0f8bbd7e1826b6fb77cb39af15b11d1e59b3e9daf9ba442b9e6f02
 AUX hdparm-init-8 1360 BLAKE2B 779329470a9980621d6d25e44ecb9a830565f3501fa51a10d78f1134214b9a8e5cc88148e9d7536ade6af2b88aee9a1e2e40b8c8b38cd2c409d23b1ad673cf7d SHA512 0417168cf540d2385c5edc4e199c9c2318f97c397d4bbb8b0ac6d4dcadf153564a51a9a5da172442c75a670f79fdec84da5db777a1400cf3c8d8cf6a7066fcc8
-DIST hdparm-9.58.tar.gz 138845 BLAKE2B 29e2697afaedcfbb1d7dea2238f9477afd932d553166437abbf068b8b3f3a5445a0b8542714d8a15e3c64f42a794c2603fe626ed936b4dbdeb8e4fe63afc5f46 SHA512 42fb70f494aae4cc205ca68c3e883e1f4fc33e8ced1914e280e9f3faa7233d3f839e59178ec09ddb9d32e9d2bca122ce324645ecb5ac73defa284030ac7d3cea
 DIST hdparm-9.62.tar.gz 139976 BLAKE2B 83ea59e35eeec7fa2a9e2f9f4b7a9a0d44cd4366d95e529c08bf38b04f6d78862bfefdfb905d4fceadbb81453ee92a60aa55db8d4c0bd164ec67181b46f197bf SHA512 ac6c4d285d081ecd8c7b231192a5a0fc268d934eeeb59794ae9a9db01ecbdd0afa0cade6ed42a1fd26ad543c52a3b380ac4f1b679992d167becb4ed6251fd369
-EBUILD hdparm-9.58.ebuild 981 BLAKE2B 3cb2bcba7e7ab6de5188938cf8626461601e72a24c360e429fde43846da7402407354f89b382a378afa76ba0648d121d6d8b2508b9a14ee62f4ea2096e7beb86 SHA512 ba0df4eeefac220f82269c1bfb53c9524a93be8adcc19dbca499017f7b1e1565a7cf9930c7a5f94e428568531e0111ccfbf1c74a49314632a60d9efa5366766c
-EBUILD hdparm-9.62.ebuild 988 BLAKE2B fdc31e4932d872c2dfc8246a33ebcf7d517106940d237d1a664901b655fc4b520ea40d7e3ebc4f433b1bdece03063184a3663b7f629244b90251f15cd31701f0 SHA512 3fc00828d1727a695ec584002718b7fa0cef349dbf37f77c1943b5803eba91fdce3063db0a565dca079c46986aaad2afc698f4a05afbca68d55b8f992c781d3f
+EBUILD hdparm-9.62.ebuild 981 BLAKE2B e772c9056b19a13745f85a5f1da505c48b07c613c0100ad1ba38e145dd9da8812ff6c803d87e475a876fdf15c3cf5ee29026d079a407ca49c5d1591f42970dd1 SHA512 535236bceab117a401cec1298986c7a3dfa1a6d246c1c35aa7d5e807716233b9543927317d9c1f70cf12cb0064880ffaef571f993f11d3ff416af567ff96e6ff
 MISC metadata.xml 326 BLAKE2B 503d13af2b352e0b8d864559489f80ae98d7420c0a98ea46847126e792a93ffcbce3b524da7f6c3551702e07641cef62449c0c7f2ae6188d79df3f7e5a6b8685 SHA512 39219fcef0756910c51e804cf94170408208840e7b88d99b4583f8fcfb02e1664358f9d4bf4c3f1a1a619b6a87852bc4831c93f10215500842023132a85c2287
diff --git a/sys-apps/hdparm/files/hdparm-9.51-build.patch b/sys-apps/hdparm/files/hdparm-9.51-build.patch
deleted file mode 100644
index 2c6bdba68e3f..000000000000
--- a/sys-apps/hdparm/files/hdparm-9.51-build.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-* drop hardcoded -O2 flag from CFLAGS
-* drop hardcoded -s (strip) flag from LDFLAGS, and respect user LDFLAGS
-* fix hardcoded `make` and hardcoded -j2 flags
-* respect CFLAGS when linking
-
---- hdparm-9.51/Makefile
-+++ hdparm-9.51/Makefile
-@@ -13,9 +13,8 @@
- CC ?= gcc
- STRIP ?= strip
- 
--CFLAGS := -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
-+CFLAGS += -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs
- 
--LDFLAGS = -s
- #LDFLAGS = -s -static
- INSTALL = install
- INSTALL_DATA = $(INSTALL) -m 644
-@@ -24,11 +23,10 @@
- 
- OBJS = hdparm.o identify.o sgio.o sysfs.o geom.o fallocate.o fibmap.o fwdownload.o dvdspeed.o wdidle3.o
- 
--all:
--	$(MAKE) -j4 hdparm
-+all: hdparm
- 
- hdparm: hdparm.h sgio.h $(OBJS)
--	$(CC) $(LDFLAGS) -o hdparm $(OBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o hdparm $(OBJS)
- 	$(STRIP) hdparm
- 
- hdparm.o:	hdparm.h sgio.h
diff --git a/sys-apps/hdparm/hdparm-9.58.ebuild b/sys-apps/hdparm/hdparm-9.58.ebuild
deleted file mode 100644
index d03b4546236f..000000000000
--- a/sys-apps/hdparm/hdparm-9.58.ebuild
+++ /dev/null
@@ -1,43 +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
-
-DESCRIPTION="Utility to change hard drive performance parameters"
-HOMEPAGE="https://sourceforge.net/projects/hdparm/"
-SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
-
-LICENSE="BSD GPL-2" # GPL-2 only
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.51-build.patch
-)
-
-src_prepare() {
-	default
-	use static && append-ldflags -static
-}
-
-src_configure() {
-	tc-export CC
-	export STRIP=:
-}
-
-src_install() {
-	into /
-	dosbin hdparm contrib/idectl
-
-	newinitd "${FILESDIR}"/hdparm-init-8 hdparm
-	newconfd "${FILESDIR}"/hdparm-conf.d.3 hdparm
-
-	doman hdparm.8
-	dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig
-	docinto wiper
-	dodoc wiper/{README.txt,wiper.sh}
-	docompress -x /usr/share/doc/${PF}/wiper/wiper.sh
-}
diff --git a/sys-apps/hdparm/hdparm-9.62.ebuild b/sys-apps/hdparm/hdparm-9.62.ebuild
index f0bb282156d7..404b9f4a2dd3 100644
--- a/sys-apps/hdparm/hdparm-9.62.ebuild
+++ b/sys-apps/hdparm/hdparm-9.62.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
 
 LICENSE="BSD GPL-2" # GPL-2 only
 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="static"
 
 PATCHES=(
diff --git a/sys-apps/heirloom-tools/Manifest b/sys-apps/heirloom-tools/Manifest
index 402618fafe2a..b64fe0052e1a 100644
--- a/sys-apps/heirloom-tools/Manifest
+++ b/sys-apps/heirloom-tools/Manifest
@@ -5,5 +5,5 @@ AUX heirloom-tools-070715-glibc-2.31.patch 964 BLAKE2B c235d9c4d035c19617a1bdd40
 AUX heirloom-tools-070715-major.patch 2104 BLAKE2B 88a602e587dc8376e8eb8198308e64a05db642b596e89b8087b30a2d6d16102b18f0b033cce4c1a4711a8ebcbd4a508139a7fb098b1cdcc292ef63d183bbc576 SHA512 7cee022491768031d413a8854a05a34cdbb6061fe30fa8514072efd0056614218e989c3e03fe771ae79a022085460f8bcdbb147fac0dcc6d97ab49703eaa98de
 AUX heirloom-tools-070715-makefile.patch 581 BLAKE2B a74613af222aff0ec7e6e3e1c012bd444a0a1d74e9caa9ac6ee7b3175641f81966527d24dd2d67b88921943579b591e9f2f735bc427f0c8bfa66977078b2d537 SHA512 ab45b3feca27ad855e535ebae77537572b9d1b6b00bd7f973521d477e962691e56ec67ce5d900980b084758643d85db5af790447411374b488f6c440852cdf71
 DIST heirloom-070715.tar.bz2 1000080 BLAKE2B 8719e38b7e260b0ecb9d055672e0097954eee31acd6cde8c582f82055a3b7f66511bf3c876309d0e74a8c29ac334b58ed81c56df26d1b9c065994bd353affd20 SHA512 0b30b0f4c4c92a10ee2da263ea44666f445d96bac86ca4afb7bbb50d8278986e4145a7bcdf3ed9f75611bb956e93e16fc0e19874498ce3ae1a00e6fbb4f910c9
-EBUILD heirloom-tools-070715-r3.ebuild 2280 BLAKE2B 4f745ecafd918161a812924d8586577e980b9e672431e6dec45cda1b7b9c456c001be486e50e721bdd23a411744155c61abe758471b0883aaca9995e69a29683 SHA512 3532613bc0cb9ff60b5adc134e8a0e5492a44c468d04dca2bfa64d7928ded0fdfe831ef7421369652f1eff44da4126106d13fa64bebd6d046aa3c3b25bb0b205
+EBUILD heirloom-tools-070715-r3.ebuild 2264 BLAKE2B 91057791685a3fd9594095756c6fddfa4b4c6ef24e8dacf127f732b1c07e2a1c78383c84e395eb12010b912abc70bf7c9fa1534179e2847ab1e37bb8b1847510 SHA512 ea2a0ade758b1167d99c01d252e9ae23189c0e7fbd8cca93b73ad72c6129890b6995e63ec22da1e84c456456c8ee5fb01edc92e0e43f03417c8477de2e8843db
 MISC metadata.xml 245 BLAKE2B 47a82b79d52e71358e03914aba8d070a655449fec0e7a7285c93eae422f8b5f0e76cabd1decbf65192e4a3e4b97b677fe91d3ba89f26722a626b3f1927b91669 SHA512 33eb3d3f6130c2ddc9f443f89eea14440472c13e005e97ed283db7e365875d2b911b3e1d62f65f63eff15eade03d35f0874f123bdbd54ff4cd7df606a990639c
diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild b/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
index 1374a47e8583..1b9569f940fa 100644
--- a/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
+++ b/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Heirloom toolchest - original Unix tools"
@@ -53,7 +54,6 @@ src_compile() {
 		CPPFLAGS="${CPPFLAGS}" \
 		LCURS="$( $(tc-getPKG_CONFIG) --libs ncurses)" \
 		LDFLAGS="${LDFLAGS}" \
-		ROOT="${ED}" \
 		DEFBIN="/usr/bin/${PN}/5bin" \
 		DEFSBIN="/usr/bin/${PN}/5bin" \
 		SV3BIN="/usr/bin/${PN}/5bin" \
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index bfd083c08464..0d9989595d79 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -1,4 +1,6 @@
 DIST hwids-20201207.tar.gz 3749352 BLAKE2B a968e6daf5686c4f73d9d900fbe80a5b3844c006102ed8801f88e378dc43c1bb66aaeced42bc2703a9c8ad624a1a7167bba485b1bf0c0d0e6043920e015c9177 SHA512 ec638edd1bbf00bd66e9baa50e3b9c9a5004a96a359e6bea306f1509c69bb3c7ede3569174007ab8bde11d49300da452b06be96136cde6bd2d84a76cff9251c2
+DIST hwids-20210613.tar.gz 3867741 BLAKE2B 64c4b0a83058a2052f7b132241008a3cc75452e93a9a57a9159c357c23fd09ee256abc2b94e700b5d8e8bd4e231ae12932d2c2f32fb03853207739cb3387047d SHA512 4568f6b8c0ca80ec772bd2785d4dc169d1d13a721472a15399158d9a7f31abbe414c5c8cfdf1a3b81cce4e33742a4b6e005e97e3e907643d0afdc8e953624fea
 EBUILD hwids-20201207.ebuild 1671 BLAKE2B c7740e0c4a2b694af30d91f420052ee16c4fac29e6e632ca6d9cbfc9803b774c0c53e7ed8447d30f567e48215bf6cf5323d48cb74041465db14b0f67d603393b SHA512 c8fe09cb6e4523afca06a06fc271414062d89248fd56ae729dcdf513c34c3c9834cb64369a359d97df0b80f369b44b7fb711530b42666dfadbfeeb29147ee674
+EBUILD hwids-20210613.ebuild 1679 BLAKE2B de1de81c5d19bae11225bfaea5f981e439abffa93be1bdbb48bafb599690d200e77ad3ccd170af733dc63ee16bbee8926cac042fcf99aedf927ec4ef7c38a1ff SHA512 5522bb815f7631778194b329d7365e28969b3fc0ce005022cc01d7c7729fa278df2968e541b4217b0167e819ae784b296b63a62b24f08b8f06cf1f27d6750b96
 EBUILD hwids-99999999.ebuild 1679 BLAKE2B 6f3c0dc51d9598239348f1abfaf3f2c691b5c060dd21ab31fb79ccf4d9c240791a7ea061ae31aae201b15456459981ce1e06d15838b5dc136526c940dfc5c4d2 SHA512 f3a949dbda15206076e48d996bcbf6d9b1568a4338511dfbc05e87d6102eb5b08dffedf23cc24f06d2f9f17bc7247802e6229f01e23c5098b49b3768c0eb9c58
 MISC metadata.xml 647 BLAKE2B 88b205060dbd1c22edb25b740b5b84d0b36e8746a8bfd5793ab385afa2afd34e54626c2b09e59dc2cf91d838ae44dea878be26cd9cab83a98054a3d0b4bfbd52 SHA512 b05dbd41c2a839d2ac8baaf8ee2352ee999d48deb123c54e048da44cccb06f64729620983848a6b16ada8af50e6fb68adf15323ff362f230b7213f485b1ec27c
diff --git a/sys-apps/hwids/hwids-20210613.ebuild b/sys-apps/hwids/hwids-20210613.ebuild
new file mode 100644
index 000000000000..6f60de83bdb6
--- /dev/null
+++ b/sys-apps/hwids/hwids-20210613.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2012-2021 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..9} )
+	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 )
+"
+
+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/hwloc/Manifest b/sys-apps/hwloc/Manifest
index e7b6a13ef0f7..48f0afa89172 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,6 +1,8 @@
 AUX hwloc-1.8.1-gl.patch 542 BLAKE2B d0264d6ef139add1b76befd8f8b440dd6c4b994bea6187c4339eaf47b3fccfebc9598230914db17e21997f8d70c6a94dbfceaa01234a3090d68df35c4cf6f931 SHA512 1f281f338cef379963b374d7e656f90be98dfd0b0768fe12dc8e6d366b1c386c2ed50ed405d5dcd0b00c2bb57b12849a3b918712e38214fca45e2a3b1c584f33
 DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f SHA512 dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138
 DIST hwloc-2.3.0.tar.bz2 6414781 BLAKE2B 60bc80ae73d0ae9ff9a438474efe682dfff28149b843645c928d4c5531f25c7763311816d5c86028efa9e07aa86935dbb6cff56ec429ee607ce4e5b5b88d4bbe SHA512 ecb0950cd08eab7d97f7cbef9db0dc31cb5b4debedaae6f48814625ee5da0153fdc1f863fa84c5d59b76634e877a348fa556f3c8c29fc43bc6ae7211c313906c
-EBUILD hwloc-1.11.13.ebuild 2165 BLAKE2B e766b7fb29a3e4aa00b34459d5c816453f06e2e24bc37ad46c5200d937554c481d9a9b5cdde9551acd37d81ae2e21459e6aa1703ed673a4c3d8847779b8bf149 SHA512 178e36c137fa475c58f5748fef83794c23d4aecb1737d054f4146a5b25cc3fc732fe6166b2ac8645c916ed8addb60bef4a77f45853c54b3e6f3d3e1a8222e0bc
-EBUILD hwloc-2.3.0.ebuild 2924 BLAKE2B e3606ad4868f9efe244c7766c4a91ed373a51eebd37ceb97f4570796c38e9b5586341d9c3237030c77a1a7ac9ce31828084065bb58ff7e2c9368aa87f738a919 SHA512 78152bd3110ab168dcb067c875e8161001cdfc47825baa224fa6f3ba9dd5147d424bdc8e11dc14c3d9780577adaaff01573f2a171696330f645d626dc7becfea
-MISC metadata.xml 1758 BLAKE2B ba3810fe4f1739add73deff3e6557d5a4c8efae8ab855c587f506c3079b97a1eae245ab7c3fab984540b5bd2e8be4e72fa2e3a33fa1dbb8be296dd2ed5ec1d30 SHA512 bff4e0dbac83c2c1a1e01ad284936f56f79580f3c1dde11bbe75276dd6dda13490cbfad6183b7ad6a4962a4875488a291f090e8e05816973836fce5c257dae8a
+DIST hwloc-2.5.0.tar.bz2 6688349 BLAKE2B 684367afa5fc056b9bf04b3a95bd8239ec70127d5e582948ca16a09323614ad0ef77278a120544af0a740b456f1ba24bffc861b9f132293fafb7da0597d0b688 SHA512 9e8b829868cb9f5fd2fe84d8515d0dc8725ddc84c788a61c1e9e918eb2b29659eb73cf22a4189e6b887f5bfa3255c206f4ba924bd7fe2c88c185f4308c0949cd
+EBUILD hwloc-1.11.13.ebuild 2168 BLAKE2B bcab74bebc629a2749bbb6577dc73c2acde8bad4a356456b731f0898df24b8698e0cea6d388495b27934995fd298875e23cd54a7bd103771579166faddeaf31f SHA512 e7d42be1f8d54b9149d4ee105fc6e4e9097a6b488d9dbb4a4d9f04b9f2d4f8e3452eea6aa7706b991900f26b2f4ae08a6419e8267661648e494850de7be39fab
+EBUILD hwloc-2.3.0.ebuild 2926 BLAKE2B 42a8053f8baa463ccc1805d3586698d7e99e57498d14ff2c633148b258133a6ddd6f0370a15e6dc3d0ea87827f4229e40b23e1f21e8aaa1d1a9a282fa2883bae SHA512 8f855c6dca0daf997c37f0dac6f295698b2c3037c270ba12a20978ac61d82f98485bb082c68407c0609fdc1c585dabf491d653bb188ea9d4f90d82a931d55bb0
+EBUILD hwloc-2.5.0.ebuild 2926 BLAKE2B 42a8053f8baa463ccc1805d3586698d7e99e57498d14ff2c633148b258133a6ddd6f0370a15e6dc3d0ea87827f4229e40b23e1f21e8aaa1d1a9a282fa2883bae SHA512 8f855c6dca0daf997c37f0dac6f295698b2c3037c270ba12a20978ac61d82f98485bb082c68407c0609fdc1c585dabf491d653bb188ea9d4f90d82a931d55bb0
+MISC metadata.xml 1703 BLAKE2B c5f42e16f680cf88bd41907ab37ce4df2da9ee08a52a26559688df97ad92773830f084cc6f358862096f24930f69982cfa7f2fb1baa0ea1373b7359f96565f4e SHA512 590d0cb5b6819359159152dab18bc12c65c5f70c0a75658a760d7f2bb97ef4e18045130a6167f5ecc41f08e92a179f6dd51abe34f35db3338e4539948913daf0
diff --git a/sys-apps/hwloc/hwloc-1.11.13.ebuild b/sys-apps/hwloc/hwloc-1.11.13.ebuild
index f9b7aae544d1..151384ff11a5 100644
--- a/sys-apps/hwloc/hwloc-1.11.13.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.13.ebuild
@@ -43,8 +43,8 @@ src_prepare() {
 	eautoreconf
 
 	if use cuda ; then
-		append-cflags -I"${EPREFIX}"/opt/cuda/include
-		append-cppflags -I"${EPREFIX}"/opt/cuda/include
+		append-cflags -I"${ESYSROOT}"/opt/cuda/include
+		append-cppflags -I"${ESYSROOT}"/opt/cuda/include
 	fi
 }
 
@@ -53,7 +53,7 @@ multilib_src_configure() {
 
 	if use cuda ; then
 		local -x LDFLAGS="${LDFLAGS}"
-		append-ldflags -L"${EPREFIX}"/opt/cuda/$(get_libdir)
+		append-ldflags -L"${ESYSROOT}"/opt/cuda/$(get_libdir)
 	fi
 
 	ECONF_SOURCE=${S} econf \
diff --git a/sys-apps/hwloc/hwloc-2.3.0.ebuild b/sys-apps/hwloc/hwloc-2.3.0.ebuild
index 6167e28c6bfc..f98a08eb4cda 100644
--- a/sys-apps/hwloc/hwloc-2.3.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -14,7 +14,7 @@ SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2
 LICENSE="BSD"
 SLOT="0/15"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="cairo +cpuid cuda debug gl libudev netloc nvml +pci static-libs svg xml X"
+IUSE="cairo +cpuid cuda debug gl netloc nvml +pci static-libs svg udev xml X"
 
 # opencl support dropped with x11-drivers/ati-drivers being removed (#582406).
 # Anyone with hardware is welcome to step up and help test to get it re-added.
@@ -24,13 +24,13 @@ RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
 	cairo?		( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
 	cuda?		( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
 	gl?		( x11-drivers/nvidia-drivers[static-libs,tools] )
-	libudev?	( virtual/libudev )
 	netloc?		( !sys-apps/netloc )
 	nvml?		( x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] )
 	pci?		(
 				>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
 				>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
 			)
+	udev?	( virtual/libudev )
 	xml?		( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
@@ -48,8 +48,8 @@ src_prepare() {
 	eautoreconf
 
 	if use cuda ; then
-		append-cflags "-I${EPREFIX}/opt/cuda/include"
-		append-cppflags "-I${EPREFIX}/opt/cuda/include"
+		append-cflags "-I${ESYSROOT}/opt/cuda/include"
+		append-cppflags "-I${ESYSROOT}/opt/cuda/include"
 	fi
 }
 
@@ -58,7 +58,7 @@ multilib_src_configure() {
 
 	if use cuda ; then
 		local -x LDFLAGS="${LDFLAGS}"
-		append-ldflags "-L${EPREFIX}/opt/cuda/$(get_libdir)"
+		append-ldflags "-L${ESYSROOT}/opt/cuda/$(get_libdir)"
 	fi
 
 	local myconf=(
@@ -72,7 +72,7 @@ multilib_src_configure() {
 		$(use_enable cairo)
 		$(use_enable cpuid)
 		$(use_enable debug)
-		$(use_enable libudev)
+		$(use_enable udev libudev)
 		$(use_enable netloc)
 		$(use_enable nvml)
 		$(use_enable pci)
diff --git a/sys-apps/hwloc/hwloc-2.5.0.ebuild b/sys-apps/hwloc/hwloc-2.5.0.ebuild
new file mode 100644
index 000000000000..f98a08eb4cda
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-2.5.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools bash-completion-r1 cuda flag-o-matic systemd toolchain-funcs multilib-minimal
+
+MY_PV="v$(ver_cut 1-2)"
+
+DESCRIPTION="displays the hardware topology in convenient formats"
+HOMEPAGE="https://www.open-mpi.org/projects/hwloc/"
+SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0/15"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cairo +cpuid cuda debug gl netloc nvml +pci static-libs svg udev xml X"
+
+# opencl support dropped with x11-drivers/ati-drivers being removed (#582406).
+# Anyone with hardware is welcome to step up and help test to get it re-added.
+
+RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
+
+	cairo?		( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
+	cuda?		( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
+	gl?		( x11-drivers/nvidia-drivers[static-libs,tools] )
+	netloc?		( !sys-apps/netloc )
+	nvml?		( x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] )
+	pci?		(
+				>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
+				>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
+			)
+	udev?	( virtual/libudev )
+	xml?		( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+# 2.69-r5 for --runstatedir
+BDEPEND="
+	>=sys-devel/autoconf-2.69-r5
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
+DOCS=( AUTHORS NEWS README VERSION )
+
+src_prepare() {
+	default
+	eautoreconf
+
+	if use cuda ; then
+		append-cflags "-I${ESYSROOT}/opt/cuda/include"
+		append-cppflags "-I${ESYSROOT}/opt/cuda/include"
+	fi
+}
+
+multilib_src_configure() {
+	export HWLOC_PKG_CONFIG="$(tc-getPKG_CONFIG)" #393467
+
+	if use cuda ; then
+		local -x LDFLAGS="${LDFLAGS}"
+		append-ldflags "-L${ESYSROOT}/opt/cuda/$(get_libdir)"
+	fi
+
+	local myconf=(
+		--disable-opencl
+		--disable-plugin-ltdl
+		--enable-plugins
+		--enable-shared
+		--runstatedir="${EPREFIX}/run"
+		$(multilib_native_use_enable cuda)
+		$(multilib_native_use_enable gl)
+		$(use_enable cairo)
+		$(use_enable cpuid)
+		$(use_enable debug)
+		$(use_enable udev libudev)
+		$(use_enable netloc)
+		$(use_enable nvml)
+		$(use_enable pci)
+		$(use_enable static-libs static)
+		$(use_enable xml libxml2)
+		$(use_with X x)
+	)
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+	default
+	case ${ARCH} in
+	# hwloc-dump-hwdata binary only built on those arches, so don't install non-working unit.
+		amd64|x86)
+			systemd_dounit "${ED}/usr/share/hwloc/hwloc-dump-hwdata.service" ;;
+	esac
+	mv "${ED}"/usr/share/bash-completion/completions/hwloc{,-annotate} || die
+	bashcomp_alias hwloc-annotate \
+		hwloc-{diff,ps,compress-dir,gather-cpuid,distrib,info,bind,patch,calc,ls,gather-topology}
+	bashcomp_alias hwloc-annotate lstopo{,-no-graphics}
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-apps/hwloc/metadata.xml b/sys-apps/hwloc/metadata.xml
index b84a415e26af..05112b3f1798 100644
--- a/sys-apps/hwloc/metadata.xml
+++ b/sys-apps/hwloc/metadata.xml
@@ -18,7 +18,6 @@
   <flag name="cpuid">Enable the cpuid-based architecture specific support (x86 component)</flag>
   <flag name="cuda">Enable CUDA device discovery using libcudart</flag>
   <flag name="gl">Enable GL display device discovery (NVCtrl)</flag> 
-  <flag name="libudev">Enable the Linux libudev</flag>
   <flag name="netloc">Enable Netloc</flag>
   <flag name="numa">Add support for numa memory allocation</flag>
   <flag name="nvml">Enable the NVML device discovery</flag>
diff --git a/sys-apps/i2c-tools/Manifest b/sys-apps/i2c-tools/Manifest
index 7570aefc3882..a546a4d0bdc5 100644
--- a/sys-apps/i2c-tools/Manifest
+++ b/sys-apps/i2c-tools/Manifest
@@ -1,5 +1,5 @@
 DIST i2c-tools-4.1.tar.xz 83576 BLAKE2B 0a9ed3bb335b61f6c17a6b6c705502ff008b4fb8bab6a5fde63163a32528b5214d92affc4b8d6cca29676dc7ba82dfa84be5f14943b7e81c8612a7d9419ac628 SHA512 83262bcfd94c2adf74517cc50095dd78221fa4d16a62397245d4a538de7463272abf4f6727024be8ab1ca8ecbfe647af85ba2a553e5b5e68a53e50dfcad20248
 DIST i2c-tools-4.2.tar.xz 87600 BLAKE2B 89f84ad07f4c042f67c308d48a402aa9ed46352062ddad3456d048730019e099e6eef626d487d802e07b100ae2c836e9aa6b2345950ff8744cbc0fe1a22616fb SHA512 5e230be4983c5c9c5718491d3ce9ee2e6205edea75c4097735eb32a25e522e37a074ef4cb61d2492707efebf0cb1b75ff65f1b2ae8c0bc1684a169526809a096
 EBUILD i2c-tools-4.1-r1.ebuild 1950 BLAKE2B 5c926d1ab2f68669edb32c18afa7f850019fcfd442831b2bfb59c09119a81c6c03102a76eabd5f4a80c6f0998c861960a2a042c4a43d736051d6d8af1963154c SHA512 7dfef8c4f41023505161146cb6a9ec7dfc945d75a76615aab35d4de2f371240be173276d15b4c18f3819e2e0f5998712bb0df2586d819e22baa9852149978f0d
-EBUILD i2c-tools-4.2.ebuild 1720 BLAKE2B c47bfde08ea75f21db45bfbaf2d9183f655477e4ac50b06877c269677195e621eb2a0dae2235c27a7243873e7b6704a82da581ba938b315e9955d2af4fd7aa8b SHA512 5826397f6520c7db124b4e88cc053ed50f0024f70cbac4d17557884811a32cd13b289a4a6892c19ba12209cba2a3f15e54812b255d7db7dd6989679ce475e47c
+EBUILD i2c-tools-4.2.ebuild 1717 BLAKE2B 26f2438657fd46499dbbb94a69ac2bc8098a783a68a308366432be32a44e343b27ab65ea877341a3f87e49d9932bacced8a7c00036dd15501a9882e2f74f8dd6 SHA512 7a7262176f827ee466b3f8855821b02badb8b71b4d36981d83efc5fc1ffef27dade6f1c2fe4d0d7af1d51d81dfff0b01063322ca1dbfe2aa394bb9676bc7a694
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/sys-apps/i2c-tools/i2c-tools-4.2.ebuild b/sys-apps/i2c-tools/i2c-tools-4.2.ebuild
index 9ff18f3fae14..c78bd83767f1 100644
--- a/sys-apps/i2c-tools/i2c-tools-4.2.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="perl python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 90c12be2d8fc..f123f824d210 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,9 +1,9 @@
 AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674
 AUX lesspipe-r1.sh 8135 BLAKE2B f11727136a5235f07ad86c1811c5ef8489a48fc3d032b8840bc67eda70e1800f03505a534870a0ba73aa62e4df4315444c76fe8aa89ab47c8b2f1e08fab5b6e2 SHA512 e7820d0c925da4d217214e093c671d6c2da51da00dcec98bed80fe3e6d664cfd3baf1b850eb711e9ccf9a1d09f943e2fc2efc3e8061bbfa45724c5b623dafe94
 DIST less-581.2.tar.gz 349230 BLAKE2B 3f9d3c94f3d9eae5ecd033c5f16a575bd3a179ca335b0318e097a916c6713379cafbe6c57459e86866e890a432fb02be9102726b35c46d9bdd07ca1b35f83058 SHA512 b1189396c798d7cb8655175f31b1af6163dcf8e8d7a72531161cc8396e72e0cf5858ce7b39173be603f9f16eda498f2805cf42c2b92ec6970fd9d2b603fb7b92
-DIST less-586.tar.gz 351861 BLAKE2B fa3d4eadc740d751daf5303867c2ecf411663b64177e14544bdb30aa1b19c1414020b53e27a1a0666cc1922781a11c44ff1bac0adee4e784edf4ca82913596a4 SHA512 14579e1c682e0c30d614e85cdd969c007ecb613930376a46c0c5614e02c596ea0d0ab50211ed28095206ea70698fd1ccf6762888dfa149773d7b515cf3b2ca7c
 DIST less-589.tar.gz 352390 BLAKE2B d91eaf0e4a3c14bb8a1c1b820965922c9e795cc8c6489c04dad79d14bc634db1e8e20aae9578ca5375d4d1f1fb861a510527ee9433437457d653453eabf5dce9 SHA512 c2a610c894e98853e73d83cf2c7e94ff75a868280b2ab7fa01676c35d35fdbba808f3630fa4954eca40f0823e654df4c287885499bb24f4d0b7b4558fb91977e
+DIST less-590.tar.gz 352574 BLAKE2B 0f640f1b6b4d4925c4904ee77460e8becd2dae168fe5c1483bf6a9cfabe9eb0abdc4d4811507ba88a2b4cff6c238158bd8b4463b63d3d7863b44ce8538d32adb SHA512 426fa5840fd43c17bd5a452ad35ad24f2d6684623c6914403fd0059af62266bf2138e6828c7d73a1cef26a736c0d2b8ed4ab180eea8297281dae79a4228eb903
 EBUILD less-581.2.ebuild 1365 BLAKE2B ac3ce42ef03de320bfa0b82da8ae412239fe3428e6504168163303b88a733374005fc747a7b17ef2e155d953940ed6730f9f45601abb5285f15a8f503cfc28d2 SHA512 7b969667cf1a7e0a977b6aa460a99f2a27618b1a615dd90f84a3a9ed61d23e5ee4561e35bfca06015be65f48d6bd2f85f1363e73d86385410973e0f4278f9b53
-EBUILD less-586.ebuild 1373 BLAKE2B 0e90c4509da6284b81b1ee9a4421cc97289aa5e2d67532eafbe1da9c5cb151ae11f983578ea13a1e131e26d15a3b1305428f07713b270fe1ea8375d79e5e666c SHA512 caa47b488beb99d13dcbbad8550c633b5f80e0fb46838bc2244bde3a9e8cd38115a675a4e1be362041bd7c6b45f9fcc77cadf851ad9ce1d263852c668932b8a3
 EBUILD less-589.ebuild 1373 BLAKE2B 0e90c4509da6284b81b1ee9a4421cc97289aa5e2d67532eafbe1da9c5cb151ae11f983578ea13a1e131e26d15a3b1305428f07713b270fe1ea8375d79e5e666c SHA512 caa47b488beb99d13dcbbad8550c633b5f80e0fb46838bc2244bde3a9e8cd38115a675a4e1be362041bd7c6b45f9fcc77cadf851ad9ce1d263852c668932b8a3
+EBUILD less-590.ebuild 1373 BLAKE2B 0e90c4509da6284b81b1ee9a4421cc97289aa5e2d67532eafbe1da9c5cb151ae11f983578ea13a1e131e26d15a3b1305428f07713b270fe1ea8375d79e5e666c SHA512 caa47b488beb99d13dcbbad8550c633b5f80e0fb46838bc2244bde3a9e8cd38115a675a4e1be362041bd7c6b45f9fcc77cadf851ad9ce1d263852c668932b8a3
 MISC metadata.xml 383 BLAKE2B 5f11eeb30186e0e73c0c06f244a6eef420b756f60a15fc992cab99deebd2b0d0056d4a12628e9a5ef9494838b1a81efa11567a99182976d7bbe3db048c058d8d SHA512 cf7a569bd5f70879f8c5d8a732213295d53a49c288143523723d6970a176e90fe678e2c2bd76eca630a31deee69a386c498884ffc4b24f8622cf8a60a80848b4
diff --git a/sys-apps/less/less-586.ebuild b/sys-apps/less/less-590.ebuild
index c91345dc9f3b..c91345dc9f3b 100644
--- a/sys-apps/less/less-586.ebuild
+++ b/sys-apps/less/less-590.ebuild
diff --git a/sys-apps/lsvpd/Manifest b/sys-apps/lsvpd/Manifest
index a0d73a6ae268..95d7dda0a210 100644
--- a/sys-apps/lsvpd/Manifest
+++ b/sys-apps/lsvpd/Manifest
@@ -1,3 +1,5 @@
 DIST lsvpd-1.7.11.tar.gz 90366 BLAKE2B 2dfbbc92921106247580395ac663731bc4486d9380b052cfaa0867939a22b4c10d130adcb01260316e5c0fa5a093eb8c95c0d0b04a5ea17792e5891cb302a554 SHA512 68efdbee6bbfb4fd6673bc83d340aea6a121d48d1e75dcc4f9322521d8a3aa7b04fbe1acbb7e7343c5a7e2dd33f21ecf2e54a32ff5f6f2b9e1e5d6c34b8b25b5
+DIST lsvpd-1.7.12.tar.gz 90806 BLAKE2B 1b55c463602105c36654f7baaf5d7c8f27ec045f35a648e87327f5b0b1c19ec62f5701a48d51114435dc5edfc503b78c35eb109a7982d6e6c10df4dd0d20e4a1 SHA512 0a37a580432004c359080edd2b07ea44a68dcf81621e0ec3a89cf7c4ca0f64a29143cee154a8d39c1411f64bf229a8a19f10d9f2c95971374b97a4c05b1c1523
 EBUILD lsvpd-1.7.11-r1.ebuild 582 BLAKE2B 34afe81d81a3a2a012a8c3f54eeca008a2cf2b9dc14bf8aa0b2f43a65c9b068370bf57a25655a378e39e4c1878460c0fec4d8f21edbc698d1d0154d7ca24e230 SHA512 ae5640d4f8fca09cf00d23e7d1accb9bc80cf809cdff7febdd1185e99043273f206bdd6e75569153f1b680e45dca78d8e719aa2d80eb5c6d3d011f9916abc79e
+EBUILD lsvpd-1.7.12.ebuild 599 BLAKE2B 1ad60516626735e8d159892fdc8afdf1864d8ec468eb3c192a84d739d8cef983d853444a21c84b7b949bdad360bdb42b504e36d361ca26f7ac39f13abad5e6cb SHA512 01daa8ec44f644ae5dae5a4729a46858e72c55a2c79eb6ec91a0c5e92ae58b50d390cadba8ccde3d6624f9723a4a9f098763741cbaab83f25e0c543bb85312d7
 MISC metadata.xml 988 BLAKE2B 1029729819fe1c2f8b197e27a127de88fb0a72cd6671a27cb08effdb81108b2be892860bc97012f6cb903d509ca3eb9fe4bf0f59c0642f93b19e0f453e7f276f SHA512 f20dfdcc425ead51943d39d8a5dec0f38baa023cd204a446e63f0f50588d51519a83af3fb6004ede20aa0d0d63ef5d9523d491759fc849951fbceaf96bef254b
diff --git a/sys-apps/lsvpd/lsvpd-1.7.12.ebuild b/sys-apps/lsvpd/lsvpd-1.7.12.ebuild
new file mode 100644
index 000000000000..915b79c32135
--- /dev/null
+++ b/sys-apps/lsvpd/lsvpd-1.7.12.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Utility to List Device Vital Product Data (VPD)"
+HOMEPAGE="https://github.com/power-ras/lsvpd"
+SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~ppc64"
+IUSE=""
+
+RDEPEND="
+	dev-db/sqlite:3
+	sys-apps/hwids
+	sys-apps/sg3_utils:0=
+	sys-libs/librtas
+	sys-libs/libvpd
+	sys-libs/zlib
+"
+
+DEPEND="${RDEPEND}
+	virtual/os-headers
+"
+
+BDEPEND=""
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/sys-apps/mawk/Manifest b/sys-apps/mawk/Manifest
index 09c5c5319d71..698633acd267 100644
--- a/sys-apps/mawk/Manifest
+++ b/sys-apps/mawk/Manifest
@@ -1,5 +1,3 @@
-DIST mawk-1.3.4-20200106.tgz 468031 BLAKE2B b125eecf780f0658d3a1c06875fdac221ffe5999e38646d71b15159c50271a7bbfb594fb6347442239c3eab6703f9c782739bd2a5a055e1ff8cd44a0e8a6545d SHA512 f6f65f3b73965f520a6f9bb7e2b6ad2a3c532c0768461744e6cfb2e72e2c718dacd1c5eea995dfa267facfc4e0ee71d337809cd45d5c75cfbc65294b45280ff9
 DIST mawk-1.3.4-20200120.tgz 468855 BLAKE2B dd8bb8f66cb8bd67d8415ee25ce928113cf3f33f8135bc432a16f30b83df861cd2e29da9e0fac1dfb1a6796239d0c838ed72cf51467f8ed79b96068e3e1f1e93 SHA512 14d9a6642ce931bf6457d248fc2d6da4f0ea7541976ca282ea708b26df048f86fdf92c27f72d497501ccd43a244d1d1a606f1a2f266a7558306fea35dcc3041b
-EBUILD mawk-1.3.4_p20200106-r1.ebuild 863 BLAKE2B cc738e91b0d37e69e952c6ee68a94d2a7dd27de84066c090e3a7150dc3f8d65a4cb484b917c10e9ce38cf8e26a1d3037a8c611f12da84f07a2740ee4c11dfeb2 SHA512 770bce3376c7e8fa4e4997071722dbfd1311f4e2beddb4dfcbc03ae3a3558cd7948282a323ba6eb27478cdb108a947c75e0d24767599f88e34849d2527efc74d
-EBUILD mawk-1.3.4_p20200120.ebuild 867 BLAKE2B 7a29aba4a89baf83618a2804af073ed101c36d862930cb56c14c203403772d45a00043efd6ae5c263f5324cff2c69ee07b8c47ea96e4edb81d0eda5fa4afe433 SHA512 f48ec498618f979aa5f74e5b1e718b20f7e7906730337596b902128f9717ad0d13aa6576fc1cecca8fb93f52908e6e9e7eb41147234cfe72651dede31bc8ff5d
+EBUILD mawk-1.3.4_p20200120.ebuild 863 BLAKE2B 63a5bf377c2668dc7d166c885a8a61e2cd59a05441a8d85e8eeab7e907ee8a9eeff69dc9969254f113ec5216505037e0704ed21957574a33d7db64b55b6e2b3b SHA512 b1002e1739f0f988036856e4db1dd8b5b49f5c1a9a2c01f2c86dac38315740600415794519f35a6090a5522f55a2747e9d85af7e4129f757c4dd19a2bf96bc24
 MISC metadata.xml 354 BLAKE2B e8a003a587171e7313564e5b8f97a607fc26b434e5045426789dc5e8e1fd54fac9830fb7b262b5b116b9c46f2eaffb8d24cc84aa0efea8b2adba659629d55b19 SHA512 64ebb5869d73b897984a63747eacda76fd6ba1b374e4995df9b3ff4b4e4908570dd2e0e6028581983486b5eb4ce2f61743da737eb353b2822ab8d5e16fe49bed
diff --git a/sys-apps/mawk/mawk-1.3.4_p20200106-r1.ebuild b/sys-apps/mawk/mawk-1.3.4_p20200106-r1.ebuild
deleted file mode 100644
index e069f55819d6..000000000000
--- a/sys-apps/mawk/mawk-1.3.4_p20200106-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_P="${P/_p/-}"
-DESCRIPTION="an (often faster than gawk) awk-interpreter"
-HOMEPAGE="https://invisible-island.net/mawk/mawk.html"
-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"
-
-RDEPEND="app-eselect/eselect-awk"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( ACKNOWLEDGMENT CHANGES README )
-
-src_configure() {
-	tc-export BUILD_CC
-	econf
-}
-
-src_install() {
-	default
-
-	exeinto /usr/share/doc/${PF}/examples
-	doexe examples/*
-	docompress -x /usr/share/doc/${PF}/examples
-}
-
-pkg_postinst() {
-	eselect awk update ifunset
-}
-
-pkg_postrm() {
-	eselect awk update ifunset
-}
diff --git a/sys-apps/mawk/mawk-1.3.4_p20200120.ebuild b/sys-apps/mawk/mawk-1.3.4_p20200120.ebuild
index d5c01b2a942a..105d8f9933ed 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20200120.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20200120.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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="app-eselect/eselect-awk"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index 31a70a880c5d..dd754814159e 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,3 +1,5 @@
 DIST osinfo-db-20210426.tar.xz 118640 BLAKE2B 934e738ede6b261d59fcb30e3c12d64db86ece75977709cbd59b2e105297731e1bdb6687b0d4cda80972ba2a20cc445edeca289c49bc5d056668bee5066d1216 SHA512 b5c2ed444559dfd1903e16f6c29cfd55cd279a789db93e7b5a0dd450ee48a3bc07cf59ff057220b8ccf1097a04ca1be4cd77c10fea292570ac58893fd788c0fd
+DIST osinfo-db-20210531.tar.xz 118600 BLAKE2B 5068014ecfe5bf213e5dcdaca392701199362297bf7bea0793f7add21602285e53184a48a7743da3d02427bb5eb94062f222fc83e0b46d4052039b562a692d7f SHA512 59fed0d89865958338938b8129065f7416813602d190f41c06817c6ec7e634cede7a306f8cd3797cda37c276efb11598448fe1ce215a9ecb5df9135418cff932
 EBUILD osinfo-db-20210426.ebuild 646 BLAKE2B cb2303b33652d1a20a3a7daa6e09803d8f099e7d30bc6f6165c6627ec68547e15d381fb14e309584f9ea3cbba5995ac212969d49bee13b93e3702708217c8320 SHA512 91a69da519966c175e9ba3712ca281e5b1bd68f936c97c534207a7913bed8d105d9539f1af81fb2bfbbdce52917a32e4b3bdbb51ef404e2c59a872ddc092b91d
+EBUILD osinfo-db-20210531.ebuild 649 BLAKE2B 80c3a428f78561c85970aaa059ad466cd0d8e1a3c322b705fd42248a0ddbbc39f3b7949c671b67a93e746d1ec2b2fdd6b8a32b69bd143adee059a242d6c5ff1a SHA512 1b79aad1bba76087ea026480b9ff907aaec79701f0a2f2844a37590fedd7e55394759761ff948710acad4289db8e50c7a34c7cd3201e62d1b2abb2b84f4f6ffd
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db/osinfo-db-20210531.ebuild b/sys-apps/osinfo-db/osinfo-db-20210531.ebuild
new file mode 100644
index 000000000000..b76468286d57
--- /dev/null
+++ b/sys-apps/osinfo-db/osinfo-db-20210531.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+BDEPEND="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/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index cd64588b53ef..a539df74be77 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -7,6 +7,6 @@ DIST pkgcore-0.12.1.tar.gz 621918 BLAKE2B aa3bedaf4d58d8e604b19ce3e6f97242d29ead
 EBUILD pkgcore-0.11.6-r1.ebuild 1127 BLAKE2B 044d792557c997a47814f18ef40a27b4136df40247a7ccd11c20bdf4baf5b2ac3cbb287c185ded8709409ce5d709a5fd4bfde145f1dd1e5f9a9350b7efa2162e SHA512 8795d3194db29c36862dd4d1ecf46e323f163a331b5aae2182aeca4e68838b446e64a1be7653e03662af18cac10e9849d9d736693df771828cc435e25f18a106
 EBUILD pkgcore-0.11.8-r3.ebuild 1155 BLAKE2B 09ed92f9990d2e99b7eff0d5f3795a185ddd009bd4f03222f597dac5414c10e57705dc670804aac445cbf722a3f81d8bba1316da51d7353080354d0170f8e3c4 SHA512 19e75c4edab78c28189a321d5ed19fb4b1ba85f84de43e9b3e1d7f397ae5517259fe8e7c277f071fefe98362ff2eefdd86602c9b9ae28a4159cad61e7e1929b2
 EBUILD pkgcore-0.12.0.ebuild 1155 BLAKE2B 09ed92f9990d2e99b7eff0d5f3795a185ddd009bd4f03222f597dac5414c10e57705dc670804aac445cbf722a3f81d8bba1316da51d7353080354d0170f8e3c4 SHA512 19e75c4edab78c28189a321d5ed19fb4b1ba85f84de43e9b3e1d7f397ae5517259fe8e7c277f071fefe98362ff2eefdd86602c9b9ae28a4159cad61e7e1929b2
-EBUILD pkgcore-0.12.1.ebuild 1094 BLAKE2B 6ec36ecd65e23bd06903eebb6948bbbd1c663835d6d1663ade1b9918129b57324ae43b9b9d742c2d5ebc95ca789536b70b4296904fd8b60b64c1df71ecda84f3 SHA512 0ede3350b8b405e782b9a8371523af0de521bf10af6ac2dd4087d9b6729d23aa13a36a06e04253f63540a087d61cb5aee595f058674cce7bff18deea975ec6f6
-EBUILD pkgcore-9999.ebuild 1081 BLAKE2B f59f5bab0d4b3f26c2dddcdb8bebe550aa89462cbb9c4c7aadee461b17679dcd3fa39e37208a8853532592a235d959838af6c17bd6c807381db110a8c35a5205 SHA512 b6fb191a3d84a189f45f1ed6c4ebf2bc02fd729688b10ad98b7bc5767ac0dd16e07f052d015e93a84e21a0e3ed1d6c82f8328a926e24b21ee3204863a6ce1d07
+EBUILD pkgcore-0.12.1-r1.ebuild 1112 BLAKE2B 142795b861489cedd1abccd333803e814eda9356e32412dc5bcb6f68b17b5a5739f38eb53e9dd9faf2a2cdc170ccea9d0b1dcbca92b7dd196c1b16776a1d2199 SHA512 ce0e5e62ceb954ffe48ec510ddb658c2b43b3ce5b684c716a97ca9c2f61340bb1a1cbdace1fb2a24bb92fd4b7c7df5226814846195cbba3c6685fec18a89aa80
+EBUILD pkgcore-9999.ebuild 1095 BLAKE2B 917f74c8f372ca977fca3583b826c4be4133f6ee309974ccf5dbca85feaeedc4c60684a35e5ca181a8d704dbf893618b276f4dd4711d083766edc98c34d3104c SHA512 c092cd782306f476e1a71cb118a76fc53e8964b73b23a030eeb8c48ef73b12d69e2bda7803df6c356dacc6aff9b141b8c801e2739ac71875ec86780a2512da0f
 MISC metadata.xml 337 BLAKE2B 8980bf734cb1f95d4089aed57ac9ac0538b12aff969f37fe298581b5af005a805027962c343fcd88f7b828fc4e837f9bd47478fad7fb9bfd7a8e3bc3bc7a432c SHA512 1c1e68deab3ccdb8a2c80d0d13a9c3ed481f84bcaeae4a9e593c9f0080e9ed0762051d195ea9206ddeca4e60687a39210483aba3f51004031afd1b6bd2e7e5b5
diff --git a/sys-apps/pkgcore/pkgcore-0.12.1.ebuild b/sys-apps/pkgcore/pkgcore-0.12.1-r1.ebuild
index 864adb52ae14..05d8679fb96f 100644
--- a/sys-apps/pkgcore/pkgcore-0.12.1.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.12.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
@@ -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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
@@ -20,7 +20,9 @@ HOMEPAGE="https://github.com/pkgcore/pkgcore"
 LICENSE="BSD MIT"
 SLOT="0"
 
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=app-shells/bash-5.0
+	dev-python/lxml[${PYTHON_USEDEP}]"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index cdd33c35e9c6..be4a8d5836a1 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
@@ -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 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/sys-apps/plocate/Manifest b/sys-apps/plocate/Manifest
index cb618d0f1a5e..3059cb94ea52 100644
--- a/sys-apps/plocate/Manifest
+++ b/sys-apps/plocate/Manifest
@@ -3,5 +3,5 @@ AUX plocate-cron.conf 237 BLAKE2B 531d6461309b520db31ab8f682ebbe56f2cd425222ebbc
 AUX plocate.cron 1392 BLAKE2B 89f7eb05879c0c1a6c30376d36dc469dde0b94df3758ae659012cf9fb6e9fb2783a0d8e53ea5f79d99e2f00be72ef24a254f2d91038a30dc9e19cd2b250782f9 SHA512 b15583e98e253c2fcb658bd9c1c589bacddb8b033eb565333d9f990b1fd320fcfbe1d950657c8b5823d4cb034ccad369bdd2178ef955e42aa9c2f8e8a0268b3f
 AUX updatedb.conf 898 BLAKE2B de832ebc92e103ccaf8923b2eb872ad8e1ef36be2dfaa463a054e3e9fc256102db676ab0568501b695d943fcb74ae6ab01585bf7301cc6aa9ce6d709cc1690b5 SHA512 8b0b32e949636aef46c5439b0c963cc113306cedb1e5c84dbbfa2efba6562ca6dd602fdbfa0b3bc9095b0cf30a619ebb366535406cdb461f20d012ec1af7ff9d
 DIST plocate-1.1.7.tar.gz 71546 BLAKE2B 3ea93c7fcea243d60e61dd9956d4eaef3f09d017d5b2487466e4bccbfb6ff6d2e2e328c3df7809eac3ca5c5e0941e67178c1707f3e16154a9d2c756dab3aea00 SHA512 48ca7bcb439e6ddfbc11f0679bb44ee7173be7f7a856d51d56143bd86e219e19683312036bfa96434a0eaaf0b6df58a1843ecae917143f8f0fbac83b39cb0b4b
-EBUILD plocate-1.1.7.ebuild 1857 BLAKE2B b90e979dd6f7771a0ef4c481e0563f59208f35ab1032b61a3c9a1998dd987cd5793ab0d6d80110822c85abcbcc117ff12d5a613025e8185d1ec3f09c9aef341e SHA512 ed35405d72cc84b4c5469a681dc03869054ca6ea9b7a8155001b2d13361536375a9985c28caddf689d840ec24f2a497363957be9f9b7e15317531656943d2758
+EBUILD plocate-1.1.7-r1.ebuild 2057 BLAKE2B a84f97d14af3204e33a0b4dd144a6766baba0f429e8e1c4e66383dfa16bc2fe6e8a7c23d483bd644f5cea2155add9ac119b62fa3e0486f54f62d35bc3c9fb817 SHA512 e0d9c63f9e358e931ef2817c6ae1738a99c6c4442b61aca1c0d3905e4297f7dd06d3e670d479aed89229653df0442fde6cca7b82d4eb6a5d11358c3ed53c4fa5
 MISC metadata.xml 1285 BLAKE2B 778c722e0b5e673f97f22f3c60fb2ed5cd1ce18ceb6aec3426049010eaa930a51bb68c2bda2b9a3f471a9737dec406c52fc849cb674df913410868d3c9dd5479 SHA512 f558b515d2dabb31d11ace480ad94c8c2a925c5ffab618930bb3fecc29fb710f7ad3ff253955272930004ca96344950ce5aa743bece0862a3a6c1c1675be22ff
diff --git a/sys-apps/plocate/plocate-1.1.7.ebuild b/sys-apps/plocate/plocate-1.1.7-r1.ebuild
index 4aaa46baf9c4..a708c02300a6 100644
--- a/sys-apps/plocate/plocate-1.1.7.ebuild
+++ b/sys-apps/plocate/plocate-1.1.7-r1.ebuild
@@ -62,8 +62,11 @@ src_install() {
 	fperms 0644 /etc/{updatedb,plocate-cron}.conf
 
 	insinto /etc/cron.daily
-	newins "${FILESDIR}"/plocate.cron plocate
-	fperms 0755 /etc/cron.daily/plocate
+	# Ensure that the cron file has the same name as the
+	# systemd-timer, to avoid plocate being run twice daily on systems
+	# with a systemd compatiblity layer. See also bug #780351.
+	newins "${FILESDIR}"/plocate.cron plocate-updatedb
+	fperms 0755 /etc/cron.daily/plocate-updatedb
 
 	systemd_dounit "${BUILD_DIR}"/${PN}-updatedb.service "${S}"/${PN}-updatedb.timer
 }
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 3a7f2091f3fe..a5c534755fb3 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -6,9 +6,13 @@ DIST portage-3.0.17-bug-775239-_test_lock_fn-tempfile-leak-d8a12c.patch 733 BLAK
 DIST portage-3.0.17.tar.xz 970076 BLAKE2B 261d8d3b0da5bb77f37328219365a59d7ac56a22e887de59a6b702fcf895493f7a0aac1af744bc67b80c9e2aa730795e507764e9e1c807c247d1ccbe6f825d2f SHA512 6f4a50b005a67e6eea24600d10179fd48b4aa1de4cdf99bc310854dc303248408f8a31bca4135e4e530fcbd2b3d99c2f89644e4e4240e3a754fd97e949403ffc
 DIST portage-3.0.18.tar.xz 971692 BLAKE2B 0a8d2062fce1bf85a2f1025d17ddd3eafc987fd93c01f17bcc4487b23841e530451502417e24bbe58175b4fee871ceb528696775116a60f93b7b841d14ecf7a3 SHA512 d3f4b5258748fbef7b8ec000685b7e42804123a5c6b474bb6679666c2696a16e3bd202108df6e647770406539ff223bfd0deb1a3b4240e0a7ba1f2ec52aca2cd
 DIST portage-3.0.19.tar.gz 1347687 BLAKE2B 86eea08c2559b2d5a3eac39d8f7523380769710e7b4e3973463410bc291e746d9a36708e26d9b6456c06f67157fd04385c98ae28e25e48dba510fbaaab2d3536 SHA512 355153839219b93ae5d7c844ac5ed7ada10b2932d4a8e2b8208793fc33dfba3d46abe5ec7ecfbef9f16f23a6b21e57b7b14247f0b1fd85018a07e198bafa209c
+DIST portage-3.0.20-bug-777492-a4d8829-fix-055abe5.patch 5816 BLAKE2B 89c4be562de9be0d2a9c452a66500751a16db99a4069806cc767d358d56a0a787e0d9d872f95bd6c03fea7f543a19333a2b03f292009418b9da161065aa99aa9 SHA512 4cf114a7772baa8d37010d08d69dbb63a0b371c7369cff411663b545833f949b0c846d89793e38a61cd47ee5e3a7e8dd4335f03dd05f2b69fb6ff6299a446dba
+DIST portage-3.0.20-bug-777492-a4d8829.patch 4549 BLAKE2B 9023c7bd3d173b48e1bfcf6d48c87f6b01731d6ec154132797c820a4c24ffedcaaf2eabf380d08c43238b377cb33c1be090fe8d213f8aef39b813ba2fab25672 SHA512 5575015216534bc0ddc0aa79bd2c1a96180d40dd8b3df61bb95e49a2d86e60da10a5eb8d658bf616da3f3f15ff6f4377d82e72ceca770304d2d79f1f25a26a11
+DIST portage-3.0.20.tar.gz 1348818 BLAKE2B e8af0662d073110a921ef23865872b0440f5e549da92b828af3dc71010d0f49d98c429c52c90ed683407fcfee7bf17a504082166f2fcad9590d7435dd43dfb83 SHA512 69c1846dedf0cfa3f57b2748cf8e077ead05ab0185e785dfc6310439b8624cdd72449209a807f12f59a5175ba065f8cca1409d43bee6012900b2c8b1e7f9b7e9
 EBUILD portage-3.0.13.ebuild 8441 BLAKE2B 26181a21486c1bbe225c5fdc09989fe1f9bdfe9c35dcb4b1dce6ac27a9248eef59b5ad518a8b1b20e9debb61b7079d2b8e08e6c27a9431875fd64a5d56c2ae45 SHA512 e1d17faba9d4f2f8ae9506b119eb5ed5353f84e6d6bf583696d8d48722dbb539b88eb4d652fd68c29367cd1ddbdf721a0f470b4da3d45f21b8cca6e11a5a5291
 EBUILD portage-3.0.17-r2.ebuild 9209 BLAKE2B cacc19c415c8c8a7982752319f914c66cfcd6d49972e71056350ff6cce771b48ee39a41298510eb42e7a5d04d06a9a683f558166bfef3c4356fe4a529a3fe50c SHA512 f5764228b3d0503b28a3cf941712ce62bb0dffab044f2a7c3e7e7b4309d87286996a9be20e7db2da915ec8cd51f1761147e634de5a148cb00b2acd69bae05f6f
 EBUILD portage-3.0.18.ebuild 8756 BLAKE2B 27048b15c8fdcae36bd51d56edeb0838b43e77a284930071833901f1484e14617f06090cdd1ed2ce6a166a78d272d9a37193b4d52f93942e9df1203715e09ae2 SHA512 38525aed603cfc379ff01f48f3bf3aa040b5355576c46515724350401ff948772b9aeed2b088f7d93805776ef4a55d32e02afa24b47cdfc7f298437c9019920a
-EBUILD portage-3.0.19.ebuild 8511 BLAKE2B 9dbbc946749fe3a72a9349a2dcf9275f6a7c89605945347f3cc60acb74f2c5fe40dce2f276af2004e282c5d8727c40c09727a4b89358cf6800dd5f7cc53ffb44 SHA512 dfb2ef3fbbd814662f5745d2681b6c2113882c8480693d2487999aa4a7af044821c3980648c7052d5ac20cee6dba8cf104f3f517a128f800f0511dc0c530d974
-EBUILD portage-9999.ebuild 7776 BLAKE2B bef58d44947c861ca20767e5204ce67b51f7b63a7209b13e2761a97dce73b60ea153cee09b44769501796dcf50bc45943f3b3631f6c80f22a6545aee75de303d SHA512 0049bfc2225ee65073f56e498237b2862a688d083fdb6976bfe983b5c02722254f656e6571eb71c159b3e7b9daf400e513dea87bdb4001dbb55d2976a14458b8
+EBUILD portage-3.0.19.ebuild 8512 BLAKE2B cf8d97e8264830926303904e20b424a37f920d1431cbe3f4e352dd2416a1e7fc1546c8bca0b126da9ed1e111623557e4591b1c061df8a5aeabecaf94f90d74f9 SHA512 ff252978a99c5dc4fe7ab6cc8192eb9881d6b229d5933a0f10f57ca190b46c67f9899ff2ac16308b713ec43d3a01d4aac71bdc0f017d57e059c6c1a740c09083
+EBUILD portage-3.0.20-r2.ebuild 8983 BLAKE2B ce24083d90473e2eadffc9e4e6fb7502248c3c9c76a3a9a66981faddc9f836f302a3620b1e03ed82e6eefb71f74dd2e7c98fa58176a226ec4642c72bdaf82425 SHA512 c8e80caa5c839a232c81f48bdd2c6db6492f5a5085d5b9ce5736ed60d3397963d145bba1891286855b033f24fa42e2fb2a9ceca3f30e76e5d1db2278de1604ac
+EBUILD portage-9999.ebuild 7782 BLAKE2B 807fe6fe4aef995e67d2a1af8e51f1564bb6598be720600943adcf41dacce4f22f1f7c6eff9d6f2a0a817d893b983460eee1578b6da402acf6d69ed2e6e7c23a SHA512 e99bb356b89ae7d00cf97c76d2a03145465a75e191f4a6039a2f3a082e553ee4ce6065580beecc7d6ce7470e8236b773cf40c9fc372786033ed30694deb05b10
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
diff --git a/sys-apps/portage/portage-3.0.19.ebuild b/sys-apps/portage/portage-3.0.19.ebuild
index e6511cf77da8..224927214274 100644
--- a/sys-apps/portage/portage-3.0.19.ebuild
+++ b/sys-apps/portage/portage-3.0.19.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 TMPFILES_OPTIONAL=1
 
diff --git a/sys-apps/portage/portage-3.0.20-r2.ebuild b/sys-apps/portage/portage-3.0.20-r2.ebuild
new file mode 100644
index 000000000000..7f7c65e2f5a7
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.20-r2.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+TMPFILES_OPTIONAL=1
+
+inherit distutils-r1 linux-info tmpfiles 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 test xattr"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	app-arch/xz-utils
+	test? ( dev-vcs/git )"
+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="
+	acct-user/portage
+	app-arch/zstd
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/findutils-4.4
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		rsync-verify? (
+			>=app-portage/gemato-14.5[${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
+	!~app-portage/repoman-3.0.0"
+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_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://github.com/gentoo/portage/commit/a4d882964ee1931462f911d0c46a80e27e59fa48.patch -> portage-3.0.20-bug-777492-a4d8829.patch
+	https://github.com/gentoo/portage/commit/055abe523c2c3f6c8f1dccfb53565209222f90c1.patch -> portage-3.0.20-bug-777492-a4d8829-fix-055abe5.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
+
+	# Revert a4d8829 and apply 055abe5 for bug 777492.
+	eapply -R "${DISTDIR}/portage-3.0.20-bug-777492-a4d8829.patch"
+	eapply "${DISTDIR}/portage-3.0.20-bug-777492-a4d8829-fix-055abe5.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 ..."
+		> "${T}/shebangs" || die
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				echo "${REPLY}" >> "${T}/shebangs" || die
+			fi
+		done < <(find . -type f -executable ! -name etc-update -print0)
+
+		if [[ -s ${T}/shebangs ]]; then
+			xargs sed -i -e "1s:^#!:#!${EPREFIX}:" < "${T}/shebangs" || die "sed failed"
+		fi
+
+		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
+
+	dotmpfiles "${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 -u PORTAGE_REPOSITORIES \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+	env -u FEATURES -u PORTAGE_REPOSITORIES \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_multi_instance || 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-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 90088d7a92e7..43cd42a90737 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 TMPFILES_OPTIONAL=1
 
diff --git a/sys-apps/ppc64-diag/Manifest b/sys-apps/ppc64-diag/Manifest
new file mode 100644
index 000000000000..b76692980cc9
--- /dev/null
+++ b/sys-apps/ppc64-diag/Manifest
@@ -0,0 +1,6 @@
+AUX fix-systemd-unit-path.patch 1539 BLAKE2B 78865aea8745102e34a0f29884d21efd768b59de7cca660af4d9866edd4755ab18b3563a37d2e184e3ec75c81378e06df9b06f764af6e2e851b693c017a0f4bf SHA512 2091c4d553c57b2a23dcf02d477c379c1ece870f572cfa12478fd339b8b5272320cd53f63ca4a22a911689ad3de73b011f0937dd8da5810e32ce6be2dfb0714a
+AUX opal_errd.initd 374 BLAKE2B b463e484e60ea63afd2c4f27a4e8330ae6733ecd3e6925b4c1e7333022ff1bd895da29343a7dbf1e92a88c9b204b691d64450c3847dacc8329678f2c9b55cb21 SHA512 1e6e363dbf59d3ef96e724d37d9dd6e764a145cbaf3cc18007d9da50dc5c2ef4effef50282daea93db62ae6722cb6857060896ab5ff76b7348d42d09926b2b04
+AUX rtas_errd.initd 371 BLAKE2B a5367e20d7732fc0b778349e740351fbd55049a08e456a859fc5d8a2e06418bc865b7ef5d27fb3ba420bb008ca7ee5b4781fc41393716d6e502cb691f602805b SHA512 a92128d9b5e31d1206999123734924e8e24833beba4e39b067fbb38bb16cbf174d1dbd51a1d27f294ba95da849020fd60e737ada35db98a7b6210cd06375c1de
+DIST ppc64-diag-2.7.7.tar.gz 423357 BLAKE2B b32def540811f383e401d352d17f2edce6a998a91a7b27bcab981e42469f44aaa505104ed2d2ced8a85485c0886525ff5128b36cdbad3a8eed90e8002877498c SHA512 42d94214345ab8deb7bd9ee8b145052fc2f733ba13d1567dbe6592fe9306670e3cd0ab6122e515464f7050753a992061c056e009673c7f8f6e554e9eaf75c550
+EBUILD ppc64-diag-2.7.7.ebuild 1557 BLAKE2B f2625c84268207eb112f92318383567e347b4b4286da37d2c5c5e5ce24078e54430617176cb9e22f0170663e5a36d13309fd18c4c2f2e0eac6243cdc690dc225 SHA512 d4d3b3ecf072c68a2122ebeab58e724a0b497c1911591f4a5ebc30c84fad819d0f6eb5e4c5c8ba5891f1600ad936e9a6e9af77a3049710723dabfec75376050f
+MISC metadata.xml 695 BLAKE2B 12340096c077aee8e8263122e2efd0faa820a59176e2de793a33bc5c8fffbcea0b35c64f4cfff1ee1d512d65c0f3ea3ab4db1f763026273e2301e944096e577d SHA512 e9d9a9c0ce46172df609a0e3a195060527da44141ecef0e2eeaa9555b20bf7aaa37a359af47dfa34ce77f297a8cda1348da699b14081c45469de98c635b7257a
diff --git a/sys-apps/ppc64-diag/files/fix-systemd-unit-path.patch b/sys-apps/ppc64-diag/files/fix-systemd-unit-path.patch
new file mode 100644
index 000000000000..e11feca7a49c
--- /dev/null
+++ b/sys-apps/ppc64-diag/files/fix-systemd-unit-path.patch
@@ -0,0 +1,38 @@
+From 60a26c23d2d385e62a006d68074ca25479e10639 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Wed, 15 Jan 2020 20:27:31 -0800
+Subject: [PATCH] fix systemd unit path
+
+---
+ scripts/Makefile.am | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/scripts/Makefile.am b/scripts/Makefile.am
+index 29dcb78..36efcfb 100644
+--- a/scripts/Makefile.am
++++ b/scripts/Makefile.am
+@@ -16,8 +16,8 @@ install-exec-hook-scripts:
+ 	install -D --mode=644 $(CONFIG_FILE) $(DESTDIR)/etc/ppc64-diag
+ 	install -d --mode=755 $(DESTDIR)/usr/libexec/ppc64-diag/
+ 	install -D --mode=755 $(INIT_FILES) $(DESTDIR)/usr/libexec/ppc64-diag/
+-	install -d --mode=755 $(DESTDIR)/usr/lib/systemd/system/
+-	install -D --mode=644 $(SERVICE_SCRIPT) $(DESTDIR)/usr/lib/systemd/system/
++	install -d --mode=755 $(DESTDIR)/lib/systemd/system/
++	install -D --mode=644 $(SERVICE_SCRIPT) $(DESTDIR)/lib/systemd/system/
+ 
+ uninstall-hook-scripts:
+ 	rm -f $(DESTDIR)/etc/ppc64-diag/ppc64_diag_setup
+@@ -28,8 +28,8 @@ uninstall-hook-scripts:
+ 	rm -f $(DESTDIR)/etc/ppc64-diag/ppc64-diag.config
+ 	rm -f $(DESTDIR)/usr/libexec/ppc64-diag/rtas_errd
+ 	rm -f $(DESTDIR)/usr/libexec/ppc64-diag/opal_errd
+-	rm -f $(DESTDIR)/usr/lib/systemd/system/rtas_errd.service
+-	rm -f $(DESTDIR)/usr/lib/systemd/system/opal_errd.service
++	rm -f $(DESTDIR)/lib/systemd/system/rtas_errd.service
++	rm -f $(DESTDIR)/lib/systemd/system/opal_errd.service
+ 
+ INSTALL_EXEC_HOOKS += install-exec-hook-scripts
+ UNINSTALL_HOOKS += uninstall-hook-scripts
+-- 
+2.25.0
+
diff --git a/sys-apps/ppc64-diag/files/opal_errd.initd b/sys-apps/ppc64-diag/files/opal_errd.initd
new file mode 100644
index 000000000000..ee420f1f9aca
--- /dev/null
+++ b/sys-apps/ppc64-diag/files/opal_errd.initd
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="opal_errd daemon"
+description="Daemon to read/parse OPAL platform error(s)/event(s)"
+command=/usr/sbin/opal_errd
+command_args="-w ${opal_errd_args}"
+command_background=true
+pidfile="/run/${RC_SVCNAME}.pid"
+
+depend() {
+	need localmount
+	use logger
+}
diff --git a/sys-apps/ppc64-diag/files/rtas_errd.initd b/sys-apps/ppc64-diag/files/rtas_errd.initd
new file mode 100644
index 000000000000..213f91cf0022
--- /dev/null
+++ b/sys-apps/ppc64-diag/files/rtas_errd.initd
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="rtas_errd daemon"
+description="Daemon to read/parse RTAS platform error(s)/event(s)"
+command=/usr/sbin/rtas_errd
+command_args="${rtas_errd_args}"
+command_background=true
+pidfile="/run/${RC_SVCNAME}.pid"
+
+depend() {
+	need localmount
+	use logger
+}
diff --git a/sys-apps/ppc64-diag/metadata.xml b/sys-apps/ppc64-diag/metadata.xml
new file mode 100644
index 000000000000..2b33921f7f90
--- /dev/null
+++ b/sys-apps/ppc64-diag/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ppc@gentoo.org</email>
+		<name>Gentoo Linux PowerPC Development</name>
+	</maintainer>
+	<use>
+		<flag name="rtas">Add support for the Run Time Abstraction Services (RTAS)</flag>
+	</use>
+	<longdescription lang="en">
+		Various diagnostic tools for PowerLinux.
+		These tools	capture the diagnostic events from Power Systems platform firmware, SES
+		enclosures and logs serviceable event. It also provides automated responses
+		to urgent events such as environmental conditions and predictive failures.
+	</longdescription>
+</pkgmetadata>
diff --git a/sys-apps/ppc64-diag/ppc64-diag-2.7.7.ebuild b/sys-apps/ppc64-diag/ppc64-diag-2.7.7.ebuild
new file mode 100644
index 000000000000..9c94baecc1f4
--- /dev/null
+++ b/sys-apps/ppc64-diag/ppc64-diag-2.7.7.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Diagnostic tools for PowerLinux"
+HOMEPAGE="https://github.com/power-ras/ppc64-diag"
+SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~ppc64"
+IUSE="rtas"
+
+DEPEND="virtual/libudev:=
+	rtas? (
+		sys-libs/ncurses:0=
+		sys-libs/librtas
+		sys-libs/libservicelog
+		sys-libs/libvpd
+	)
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/fix-systemd-unit-path.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with rtas librtas)
+	# handle ncurses[tinfo]
+	sed -e "s:-lncurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
+		-i Makefile || die
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}/opal_errd.initd" opal_errd
+
+	if use rtas; then
+		newinitd "${FILESDIR}/rtas_errd.initd" rtas_errd
+		keepdir /var/log/ppc64-diag/diag_disk
+	else
+		# makefile installs it unconditionally
+		rm -rf "${ED}/lib/systemd/system/rtas_errd.service" || die
+		rm -rf "${ED}/usr/lib/systemd/system/rtas_errd.service" || die
+	fi
+
+	keepdir /var/log/opal-elog
+	keepdir /var/log/dump
+}
+
+src_test() {
+	# it assumes MKTEMP created dir in /tmp, add /var to the string.
+	# /varplatform.0x01 becomes platform.0x01, just as test expects
+	# so we sed a sed expression, don't judge me
+	sed -i 's%\/tmp/%\/var\/tmp\/%' opal_errd/tests/test-extract_opal_dump-000 || die
+	emake check
+}
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 6e97aa95f485..e03ca7ffdd1f 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -1,7 +1,8 @@
+AUX rng-tools-6.13-various-autotools-fixups.patch 2854 BLAKE2B f29fc73edbf7a14e92bde4bb18982ba688cf3f11ecd4dc9c19c058c5ccb66bf110ea270ac64bf5d7aff4b5411e8713fb94ba86df6a3f0a4959be5763e0ba99ee SHA512 5dc08943a0d1f267b595ddaec6fb7faa1f4a7554fea4ea2956123cb59d041bc7c7e1fab4a1d44041ea0cba57ab42b29bf7fdbb00a74dff2cebf0a6cd46944e96
 AUX rngd-confd-6.11 2321 BLAKE2B 6cdf4cf7d61e33415df1c41933d1c38c398fd96370cb4c4e257f60479a3e69428d3735802d480e1a25714854de9bc6ed997856c1c4dbbf289b7a014026522aea SHA512 32c52316ebdffef7ec07dd97b45f124c2ecced3d0f49d75ad8d226f6eff478739dab6b008e0b1f4e55bc81bf615feee9860c45f35f0994c7c65d4d439501621f
 AUX rngd-initd-6.11 1789 BLAKE2B 317c6d3d1b7ad10e137c6b5b615354ba7a6deb256da5ef9d75253a7f84c265536db1b70b290e0029cfaf40e565c8b280e3b1ec79ab93c8f659c969b5dedc7dab SHA512 60bf2c2d4984a1db8fcfaeaebd5249ed6d428c9ccb8412813ce97e146f3143efae23058475ac8baa1c2e88b00012fc119411bcfc14b04a0128696ee69641d98d
 DIST rng-tools-6.11.tar.gz 57366 BLAKE2B d613502bcb24560638c0abc956987e57ec54b6594bed414ce2b70086716f73a9a9eec4800c86097c4a14b91401f0f28be62f5182ee01c328c9a32cd79eaec561 SHA512 0058ca5d0c1ddb554284fe8e6b9c0b85f130e0b9e0b9f0f0219f434302766e07c321d4fc0c01bdeb59053d5cd14dab67dc1c306422ef35a62a267af9fbdf7deb
-DIST rng-tools-6.12.tar.gz 57309 BLAKE2B d7a12b50889065f885cb15cda9686d63950fcc1ac9099893ed9c9236a9a930627c9541980c410318b40104637df688f5622681ce1d80eee7d4aaaf696c6bc3c5 SHA512 56dd334b65dcec1456f8dbdbee5d83590de27cb6ee1b7715828b5316a913557fd178e264139dc92a82e09635ca15b1eb5f6169bfb4412fbe1b06ea28a5064c64
+DIST rng-tools-6.13.tar.gz 59311 BLAKE2B e4601a2fa8158775a8ef7188edbe61a5eb1df35dccc9e1a0ab6b31b559f2f11dd67b682cf9995f0a67834690417e283d443ae6fa54e99ab6462a1185f9b9e09b SHA512 def5f2dcdd1771e8fe5af9476de866ff89a225065416672165af6019cbb166f874fae936b3705221aa47dc13ae99fa63d054d7d49b612f3151cd922a0a129490
 EBUILD rng-tools-6.11-r1.ebuild 1793 BLAKE2B 07215f34a520bea511c8931960af5fccdf3b92cfcb5c2ba70881ae80cac1229a5cbd40a80ccc167dc0a248ac0712d47b2a9ec03fd9c314ce528bed3cc421e196 SHA512 ea1a99eb14f59c685c2d4ea8823051b807f36fd1573ccc66a6c3fe93fb10dc278a72af901767819759832549272be5de96afbac7b7d897ea72473e45b8fc8b47
-EBUILD rng-tools-6.12.ebuild 1780 BLAKE2B d68f962d287041b3c0d3b811479743efb47e38d187dfdb731439ee2b93a234d243a5ce0aa8a825206fcfeddb8f192d360ab1e5e26ababfa184b222be0d973fa2 SHA512 aa466ceaba148c0d322b9d8dc805083ca453a2a5322a1f46c66b30924d578500e4c6f800c19f6a94562cb9b47c44d157fd279ab29d94730f3548a2a615e70d2d
+EBUILD rng-tools-6.13.ebuild 1710 BLAKE2B 65df841cfeecdb4523b737c9d809a0b200514b0480c2210c062afbf131c5a2608dc6cab0c6e828bb974cc6e433ba90102e8712dfa097c63fc99cd085fa4b27f5 SHA512 8e8701bcdc62d91b61be93b5d98672540336882f75e4e48853bbf78abb15f5382f9bcb5ecd36c05083c1397de937cc4cfef1ff00222c9c99e3c1460d80351eb6
 MISC metadata.xml 713 BLAKE2B c05a29fb9b1c47eff6e8fbdf72bcd911bff431d72e1fb432e40f5ef760d82c26ec29322ccef9d06816b5d137708922b8c44df7ed0c1c60a07eba3b319fa0e1f5 SHA512 65b2454b2161f61cf187bb14b66f8cac59de3b023ed007e7780338533b8bc5c6aa0cff00d99d958f33b566b3fd9d2a597d698275c3a7914541233a9f9336cd64
diff --git a/sys-apps/rng-tools/files/rng-tools-6.13-various-autotools-fixups.patch b/sys-apps/rng-tools/files/rng-tools-6.13-various-autotools-fixups.patch
new file mode 100644
index 000000000000..4ad2348dad96
--- /dev/null
+++ b/sys-apps/rng-tools/files/rng-tools-6.13-various-autotools-fixups.patch
@@ -0,0 +1,78 @@
+https://github.com/nhorman/rng-tools/pull/132
+
+From 16b728f9a5bb138386fa770de817ec244a158be5 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Sat, 12 Jun 2021 22:15:06 +0200
+Subject: [PATCH 1/3] Use `AM_PROG_AR` over `AC_CHECK_TOOLS`
+
+* `AM_PROG_AR` is the canonical way to detect the archiver
+  and includes workarounds for Cygwin.
+--- a/configure.ac
++++ b/configure.ac
+@@ -62,10 +62,9 @@ AM_PROG_AS
+ dnl Checks for programs
+ AC_PROG_CC
+ AC_PROG_RANLIB
++AM_PROG_AR
+ AC_PROG_GCC_TRADITIONAL
+ 
+-AC_CHECK_TOOLS([AR], [ar gar], :)
+-
+ AX_PTHREAD
+ 
+ AM_CONDITIONAL([RDRAND], [test $target_cpu = x86_64 -o $target_cpu = i686])
+
+From 2ce93190cb0111fcab2f622a539689d70960643a Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Sat, 12 Jun 2021 22:15:09 +0200
+Subject: [PATCH 2/3] Build `randstat` binary
+--- a/contrib/Makefile.am
++++ b/contrib/Makefile.am
+@@ -1,3 +1,2 @@
+-
+-EXTRA_DIST = randstat.c
+-
++bin_PROGRAMS = randstat
++randstat_SOURCES = randstat.c
+
+From 3adf2613e262efbda0a3455e59c8cb3390271563 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Sat, 12 Jun 2021 22:15:12 +0200
+Subject: [PATCH 3/3] `AC_CANONICAL_TARGET` -> `AC_CANONICAL_HOST`
+
+* `AC_CANONICAL_TARGET` is the type of system for which code
+  will be produced, not on which it will run. This is a common
+  confusion with Autoconf's target triplet.
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,7 +20,8 @@ dnl Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA
+ AC_INIT(rng-tools, 6.13, [Neil Horman <nhorman@tuxdriver.com>])
+ AC_PREREQ(2.52)
+ AC_CONFIG_SRCDIR([rngd.c])
+-AC_CANONICAL_TARGET
++AC_CANONICAL_HOST
++AC_CANONICAL_TARGET dnl required for broken AX_PTHREAD
+ AM_INIT_AUTOMAKE([foreign])
+ AC_CONFIG_HEADERS([rng-tools-config.h])
+ AC_CONFIG_MACRO_DIRS([m4])
+@@ -67,14 +68,14 @@ AC_PROG_GCC_TRADITIONAL
+ 
+ AX_PTHREAD
+ 
+-AM_CONDITIONAL([RDRAND], [test $target_cpu = x86_64 -o $target_cpu = i686])
+-AS_IF([test $target_cpu = x86_64 -o $target_cpu = i686], [AC_DEFINE([HAVE_RDRAND],1,[Enable RDRAND])],[])
++AM_CONDITIONAL([RDRAND], [test $host_cpu = x86_64 || $host_cpu = i686])
++AS_IF([test $host_cpu = x86_64 || $host_cpu = i686], [AC_DEFINE([HAVE_RDRAND],1,[Enable RDRAND])],[])
+ 
+-AM_CONDITIONAL([DARN], [test $target_cpu = powerpc64le])
+-AS_IF([test $target_cpu = powerpc64le], [AC_DEFINE([HAVE_DARN],1,[Enable DARN])],[])
++AM_CONDITIONAL([DARN], [test $host_cpu = powerpc64le])
++AS_IF([test $host_cpu = powerpc64le], [AC_DEFINE([HAVE_DARN],1,[Enable DARN])],[])
+ 
+-AM_CONDITIONAL([RNDR], [test $target_cpu = aarch64])
+-AS_IF([test $target_cpu = aarch64], [AC_DEFINE([HAVE_RNDR],1,[Enable RNDR])],[])
++AM_CONDITIONAL([RNDR], [test $host_cpu = aarch64])
++AS_IF([test $host_cpu = aarch64], [AC_DEFINE([HAVE_RNDR],1,[Enable RNDR])],[])
+ AM_CONDITIONAL([JITTER], [false])
+ 
+ AC_ARG_ENABLE(jitterentropy,
diff --git a/sys-apps/rng-tools/rng-tools-6.12.ebuild b/sys-apps/rng-tools/rng-tools-6.13.ebuild
index b2e6591164cd..b4a1ee5c7006 100644
--- a/sys-apps/rng-tools/rng-tools-6.12.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.13.ebuild
@@ -16,36 +16,26 @@ IUSE="jitterentropy nistbeacon pkcs11 selinux"
 
 DEPEND="
 	dev-libs/openssl:0=
-	jitterentropy? (
-		app-crypt/jitterentropy:=
-	)
+	jitterentropy? ( app-crypt/jitterentropy:= )
 	nistbeacon? (
 		dev-libs/jansson
 		dev-libs/libxml2:2=
 		net-misc/curl[ssl]
 	)
-	pkcs11? (
-		dev-libs/libp11:=
-	)
-	elibc_musl? ( sys-libs/argp-standalone )
-"
+	pkcs11? ( dev-libs/libp11:= )
+	elibc_musl? ( sys-libs/argp-standalone )"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-rngd )"
-BDEPEND="
-	virtual/pkgconfig
-"
+BDEPEND="virtual/pkgconfig"
 
-src_prepare() {
-	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
+PATCHES=(
+	# backport, remove on bump
+	"${FILESDIR}"/${P}-various-autotools-fixups.patch
+)
 
+src_prepare() {
 	default
-
-	mv README.md README || die
-
 	eautoreconf
-
-	sed -i '/^AR /d' Makefile.in || die
-	tc-export AR
 }
 
 src_configure() {
@@ -61,9 +51,10 @@ src_configure() {
 
 src_install() {
 	default
+
 	newinitd "${FILESDIR}"/rngd-initd-6.11 rngd
 	newconfd "${FILESDIR}"/rngd-confd-6.11 rngd
-	systemd_dounit "${S}"/rngd.service
+	systemd_dounit rngd.service
 
 	if use pkcs11; then
 		local DISABLE_AUTOFORMATTING=1
@@ -75,7 +66,6 @@ reflects the correct PKCS11 engine path to be used by rngd.
 "
 		readme.gentoo_create_doc
 	fi
-
 }
 
 pkg_postinst() {
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 1f09a7f95e46..3fb58f81791b 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -1,10 +1,4 @@
 AUX 09sandbox 37 BLAKE2B 181213e2cc0bcfa328310cced40bfaba4530d8d2f80e892cb5649d5277c5d59d345ce96ca802a5529a22892c929bafac04c616458fa147a3bee5c89d31b0baf1 SHA512 4e8a9c58debde6480224a45559c5f2db4765213d151e47937f9142f110cac3681bf6402acaf21249a37bb17398e7bc00ae7feee68ecdb5b9363c432eac1b052a
-DIST sandbox-2.21.tar.xz 434540 BLAKE2B c9af3b44e65d96d20b98996a4b9e35cccf6b62020d49522b9fcf50b097d4ffe3719bb334405226c5ee650943bced365547a5d8b0f707ed26ef5f12a4d15dadba SHA512 42b85e230bc89d0e02f22a7ee81b4efbb2c37ff9db24982b4b39487664a095d384101b16a4689863bd32ea91349347980b1c7f8eecb09225bc65619829c6a5b2
-DIST sandbox-2.22.tar.xz 437872 BLAKE2B 248920733ffcb56422bf02711f1ae69e81a176ffb59a1a45266bb81779e2916841eee0d237be4010062693604603893973f1fb295276c25a59654dc56a2593b4 SHA512 9c83e7748aad99e14d43ad81e6f3a8d818b821467023bbb3059ce8cee248090583d31500c1278705110f1b62cad5e5bf7f23390c6548095df709521c7d842eba
-DIST sandbox-2.23.tar.xz 437980 BLAKE2B fd417ea88512e7716a7f075442f684dc67b6c7d991e4375b47de4411353abd52764e5b85709aef06d175ba492b73edf5162c03e66e456cedb8586add18c8b5ea SHA512 d25b27bfeb5f5b9a331029a453be93947f32870b84d0e11efc5bb82044de6005111959a4efef87f1055e7065f76deccce6338d44bb7ab32e3a5ec053a429dbd5
 DIST sandbox-2.24.tar.xz 438408 BLAKE2B 5e725d17da0abc06d56216f4df2f4034076f50163db1c3bbddbf4fd07dbd5b7d92ef2f1b2c01eb77ff6cf531c5cc6a05e60b028f585310ac56eef96240882843 SHA512 8df5414e334a15f367acfd218ba1b74ba618b93d7bdeca8a039b69cbd81ab048ec5a6cecb24df09fa9a5f4fe214d647acf5138004defd45e6396eec5ae7c93d0
-EBUILD sandbox-2.21.ebuild 1884 BLAKE2B 7fbf74c7bb4ed328c301f1f415b085f45b1e39992d730019fc598e8fe4864ca4b0ff570902b2ae970333c3e2af3e00f2d1d3258cd5372b0e3bf89a2a67f0f9ee SHA512 bb53ced577f1c449b84bf39fde7e2472a02df90d18ef1a2fef070dbc26d9cef995544c4289b2a9e0d49f876c2c0f970212a02e9e397ec22d45c4f790b939434d
-EBUILD sandbox-2.22.ebuild 1431 BLAKE2B 5776c78c88c2910d8754b7e519a18a67105482e236f24c51ef11d3322d8f2424a84d6a8465715da87be9af1ca3f63a2932f9b158891b97a473978c5dae8406b3 SHA512 d87cdc346748f0a94c26c88efeb74fc019d6b891f1c326816ab63a1ca828ac82cf13058831ae8edda3f007738a9a29057298efd5a32b5b4ca73917ac1a95cdd2
-EBUILD sandbox-2.23.ebuild 1431 BLAKE2B 5776c78c88c2910d8754b7e519a18a67105482e236f24c51ef11d3322d8f2424a84d6a8465715da87be9af1ca3f63a2932f9b158891b97a473978c5dae8406b3 SHA512 d87cdc346748f0a94c26c88efeb74fc019d6b891f1c326816ab63a1ca828ac82cf13058831ae8edda3f007738a9a29057298efd5a32b5b4ca73917ac1a95cdd2
-EBUILD sandbox-2.24.ebuild 1628 BLAKE2B 7457ec630192b03edde185b4a052e542c15913cf82d71e560ef273d6f7e2d9b5130d60293f843e53119c133df86922853bf1c94c23c3787f7d564abc1d0cf42b SHA512 b83eecd3347ee532591a51de2f7974e3615311c01750bb7613d24bbcc08c46d577c75e197abb05f9f6870d486958746cac444eef41af72a25249c46cf86cdb46
+EBUILD sandbox-2.24.ebuild 1620 BLAKE2B 14aae3cf980c2285e1dbf7c735e95801ae646cea389f585aa560bd016f860fd8936bc33ab2428168389910a06e76c20b0a20fe51071df62bd861be41a12c9f27 SHA512 443f9f99cc2e5e303c5c48686bd8f4c1647a39aca7515bc5f847f2cec4ca97cd2b240b221a07742dec94d7cb164075201c4cfbbcd711ade30f7a0a60c2666f16
 MISC metadata.xml 252 BLAKE2B d709f9b334b2810c5ffe7d73ef430f0f347f26f7649bca4bb8803c8e0be106534bcee6efae4f80b6fb1781b09284bb3dbc32d8dff4a3aa01a924fd3437b9da7c SHA512 de8b6a78dcc379d1d34960caecdab8da9fdb9a9f010ec8611cab79487b5f28f6ae80c8b0884731fa91c4ae98482a195faa8d1ec911b1d95fafdfe9cd622cc5d9
diff --git a/sys-apps/sandbox/sandbox-2.21.ebuild b/sys-apps/sandbox/sandbox-2.21.ebuild
deleted file mode 100644
index a49b3d6f0a4e..000000000000
--- a/sys-apps/sandbox/sandbox-2.21.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal multiprocessing
-
-DESCRIPTION="sandbox'd LD_PRELOAD hack"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Sandbox"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-DEPEND="app-arch/xz-utils
-	>=app-misc/pax-utils-0.1.19" #265376
-RDEPEND=""
-
-has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice"
-
-sandbox_death_notice() {
-	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
-	ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox"
-}
-
-multilib_src_configure() {
-	filter-lfs-flags #90228
-
-	ECONF_SOURCE="${S}" econf
-}
-
-multilib_src_test() {
-	# Default sandbox build will run with --jobs set to # cpus.
-	emake -j1 check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
-}
-
-multilib_src_install_all() {
-	doenvd "${FILESDIR}"/09sandbox
-
-	keepdir /var/log/sandbox
-	fowners root:portage /var/log/sandbox
-	fperms 0770 /var/log/sandbox
-
-	dodoc AUTHORS ChangeLog* NEWS README
-}
-
-pkg_preinst() {
-	chown root:portage "${ED}"/var/log/sandbox
-	chmod 0770 "${ED}"/var/log/sandbox
-
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		# 1.x was removed from ::gentoo in 2016
-		if [[ ${v} == 1.* ]] ; then
-			local old=$(find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*')
-			if [[ -n ${old} ]] ; then
-				elog "Removing old sandbox libraries for you:"
-				find "${EROOT}"/lib* -maxdepth 1 -name 'libsandbox*' -print -delete
-			fi
-		fi
-	done
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		# 1.x was removed from ::gentoo in 2016
-		if [[ ${v} == 1.* ]] ; then
-			chmod 0755 "${EROOT}"/etc/sandbox.d #265376
-		fi
-	done
-}
diff --git a/sys-apps/sandbox/sandbox-2.22.ebuild b/sys-apps/sandbox/sandbox-2.22.ebuild
deleted file mode 100644
index 3fcb495f4274..000000000000
--- a/sys-apps/sandbox/sandbox-2.22.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal multiprocessing
-
-DESCRIPTION="sandbox'd LD_PRELOAD hack"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Sandbox"
-SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-DEPEND="app-arch/xz-utils
-	>=app-misc/pax-utils-0.1.19" #265376
-RDEPEND=""
-
-has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice"
-
-sandbox_death_notice() {
-	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
-	ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox"
-}
-
-multilib_src_configure() {
-	filter-lfs-flags #90228
-
-	ECONF_SOURCE="${S}" econf
-}
-
-multilib_src_test() {
-	# Default sandbox build will run with --jobs set to # cpus.
-	# -j1 to prevent test faiures caused by file descriptor
-	# injection GNU make does.
-	emake -j1 check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
-}
-
-multilib_src_install_all() {
-	doenvd "${FILESDIR}"/09sandbox
-
-	keepdir /var/log/sandbox
-	fowners root:portage /var/log/sandbox
-	fperms 0770 /var/log/sandbox
-
-	dodoc AUTHORS ChangeLog* NEWS README
-}
-
-pkg_postinst() {
-	chown root:portage "${EROOT}"/var/log/sandbox
-	chmod 0770 "${EROOT}"/var/log/sandbox
-}
diff --git a/sys-apps/sandbox/sandbox-2.23.ebuild b/sys-apps/sandbox/sandbox-2.23.ebuild
deleted file mode 100644
index 3fcb495f4274..000000000000
--- a/sys-apps/sandbox/sandbox-2.23.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal multiprocessing
-
-DESCRIPTION="sandbox'd LD_PRELOAD hack"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Sandbox"
-SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-DEPEND="app-arch/xz-utils
-	>=app-misc/pax-utils-0.1.19" #265376
-RDEPEND=""
-
-has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS="${EBUILD_DEATH_HOOKS} sandbox_death_notice"
-
-sandbox_death_notice() {
-	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
-	ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox"
-}
-
-multilib_src_configure() {
-	filter-lfs-flags #90228
-
-	ECONF_SOURCE="${S}" econf
-}
-
-multilib_src_test() {
-	# Default sandbox build will run with --jobs set to # cpus.
-	# -j1 to prevent test faiures caused by file descriptor
-	# injection GNU make does.
-	emake -j1 check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
-}
-
-multilib_src_install_all() {
-	doenvd "${FILESDIR}"/09sandbox
-
-	keepdir /var/log/sandbox
-	fowners root:portage /var/log/sandbox
-	fperms 0770 /var/log/sandbox
-
-	dodoc AUTHORS ChangeLog* NEWS README
-}
-
-pkg_postinst() {
-	chown root:portage "${EROOT}"/var/log/sandbox
-	chmod 0770 "${EROOT}"/var/log/sandbox
-}
diff --git a/sys-apps/sandbox/sandbox-2.24.ebuild b/sys-apps/sandbox/sandbox-2.24.ebuild
index fe66e82819fc..2d94c2dde836 100644
--- a/sys-apps/sandbox/sandbox-2.24.ebuild
+++ b/sys-apps/sandbox/sandbox-2.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-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"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/servicelog/Manifest b/sys-apps/servicelog/Manifest
index 361f59ae110d..ad5aeb8c7eec 100644
--- a/sys-apps/servicelog/Manifest
+++ b/sys-apps/servicelog/Manifest
@@ -1,3 +1,3 @@
 DIST servicelog-1.1.15.tar.gz 29097 BLAKE2B a2ae131305ce466999536fca6734c006eafe70d8be16c5a8465f6ceb7ffb53cd06d82fe7229275f4e71ffddf7a572a214591aed59a6345f81c3f65dbe205cd1e SHA512 5d5142aeb947133fb8ae77d5021790ab530d4614a8becf018342e1feeded2f64302343189d4bd4d684b096888aad6f45e08861404bcc5437abeac078fbbb7ac6
-EBUILD servicelog-1.1.15.ebuild 520 BLAKE2B b94d9773d4dd5ae6a998b973e75411287fc2591a03178571375324b962b398ceab6c635773b8ab2a261306050f5f89796991af47cf35bd9de304c8e0f805e86f SHA512 4686394f0074f960c1e4d8d3ac0ca56e4c92ab7bf22ee748fdfaeb2695ff2d3bc2be315a41edcc52e25477beee8b99f8e0b8f4fb689038d59cb4bd0ca779c9e0
+EBUILD servicelog-1.1.15.ebuild 514 BLAKE2B 6c442aae127d952781ab50d1f460266b5f1e402bd68b1c0a3c446925d3d78d26d6b2b986a81d39d401c2e5eafee173085d89d249307f651c24941223abe5ee54 SHA512 64cd20c23a344df40306dfaf59b0278ee47519cbcd8fe11ba00768c798144efb1a755e480d4fcc5bcbba710001e548ab1290427e5a11b10286713526f46292a3
 MISC metadata.xml 343 BLAKE2B 88ff852b7b901d0f81c494ab49f283835edb7e312965526050fde66fcf0b259c197e0b1b312e09910a77257e4e1b8d8f3fd6c465b95a9fbe7288b8d64a4a6659 SHA512 42f1b8b76a107cfa61ae9db8b900aed22a3bc8e8d3573dbb3c507ebde688ef2c50f7f79847eb345e738365fbb99ba22d99aee56e302c6eed064379ddc1e3a710
diff --git a/sys-apps/servicelog/servicelog-1.1.15.ebuild b/sys-apps/servicelog/servicelog-1.1.15.ebuild
index 3cd80631048b..a5df5b06e685 100644
--- a/sys-apps/servicelog/servicelog-1.1.15.ebuild
+++ b/sys-apps/servicelog/servicelog-1.1.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools
 
 DESCRIPTION="Provides utilities for logging service-related events"
-HOMEPAGE="http://linux-diag.sourceforge.net/servicelog/"
+HOMEPAGE="https://github.com/power-ras/servicelog"
 SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest
index 437e2715b9c1..bfdc6be6bce5 100644
--- a/sys-apps/systemd-tmpfiles/Manifest
+++ b/sys-apps/systemd-tmpfiles/Manifest
@@ -7,5 +7,5 @@ DIST systemd-stable-248.3.tar.gz 10320940 BLAKE2B 725494e0197dd182de55e4967088f4
 DIST systemd-tmpfiles-246-musl.tar.xz 25860 BLAKE2B 87fc4ca37abec9c1a0cee48bf78c575bd53e16a50d427eff338159dc6d5474ffd328af533ccf90a0e1e160a16baa7378070f418f2be0d7f77e00907a5d07d30e SHA512 4a93d9f0cb2df2dd0a2f91820615dd3a95d19583f45dc0589e37ceaedfc2040112310a6e3fc525e28e222e96a91498af2fe8541b5bf86a635c0f52dd1a84deb7
 DIST systemd-tmpfiles-248.3-musl.tar.xz 22904 BLAKE2B a277ce86577644cecbca5dbfde34aec494e3e14075ab4f7fcbb02f9307d714a93ca63f38e346a1e98391ca9c55860c7e90789cd5edb9b196cf638d54bfe1153b SHA512 d3db6a90bed6b6c1a9f6bce138137554742d1bc60da142fbadbd49b64677a562e47d8140b9c413857106e053d740476744b7f7e05af9dd4a1329058c78cef940
 EBUILD systemd-tmpfiles-246.ebuild 4706 BLAKE2B 9cdf5cea7dc7e3984c81f2b706b078e5b3a0354d70e387b7df5df413ebf1c5fd6b60ba56b3cf202ca07b4c2e62733e522cfcfe23012216c0c092be5e1c6e7707 SHA512 6fd016811da2db42a7c7a418cc5c5807c84ac1b5b8a8f538c3810d1225d4a9de03a3c435b5f3b9dba7a7730a147b7efba8ca25a0d6e83818de877254e20eedea
-EBUILD systemd-tmpfiles-248.3.ebuild 5458 BLAKE2B c72526bd3f6d1cacb5a6365e357cba731c99ce0123b946e9219f46c4dfcc87f840fa61d7f82b5c927d5a84b04448b4fcf7d5b392e0aa95e8fdd03203fd747480 SHA512 4871258fb38aba79ce92d44af7fc27b1d0b8371b29032b10c3dacc17378cf01c99e09d15ecbde4c6127befb68ac9e56af27e66d76cc3c225a3b309aff7ca3c4c
+EBUILD systemd-tmpfiles-248.3.ebuild 5457 BLAKE2B ec6217051a2c813e739f2f740e4eb970c28b5efb46a6836dd738bae4abd596c9eb16fc496028589f741b4fd892508b716f31e67deb89364d8def309cb4aa5dac SHA512 3f112d52e5d3c4343d645769e6e79d9d33231e042493b21fdc3d86bc2dfa55962387aa3d20b8619016973b751a14a7fb60bcf667efbe4ba63fa43fa92d1f3f4d
 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild
index 1e8065ab5c17..5f813cc32f81 100644
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}-$
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="selinux test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index d134cbcac1b0..c68a9748a681 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -15,7 +15,7 @@ DIST systemd-stable-248.3.tar.gz 10320940 BLAKE2B 725494e0197dd182de55e4967088f4
 EBUILD systemd-246-r2.ebuild 15296 BLAKE2B 91f3b46502254f87a3238c58b44e8d9b3452e785ac7c03e27aed967aa1c5722d667df46fdba74becd72a94b69dffa4c929e19e01733e17146897a611e8944cec SHA512 6942d33e12f48006c7d2b11c491d30b60f69fcf2f847fa3e02a4d58506f4b9f3e76ec80c8eabe6635bcc92df03bc3df192471ff9d74dcba9f5d35fc0a65abd20
 EBUILD systemd-246.6.ebuild 15393 BLAKE2B 9e107dc2e511b55e338faa6706e1e5959a598afd44886a51ed9ee0be001944a5541fafe02dd818fbce0b679ffa47af58d0d2444c9757eb9aa4ce835a3a649ebe SHA512 17d667ce4ea662d94206c3b04d206f0b0f14d94ae9c19d969c9b235f3f32dc63b10ba5116c3e96dc59b873c495c3a2c4039e0de3a2bc64c7375c088979e1c592
 EBUILD systemd-247.2-r4.ebuild 15762 BLAKE2B 41d0aed008171bc05738adab0028dacf4a45b43345b534043a949392611b080e572673fbda0a0d0326ded33e03f12873a675ddd0a3c687f7bbdf7f068bde8348 SHA512 e2ffeae0abb0cbc363134f4d0184bb73e96200172cb82858e4ab775fedb256f5e6ec1e848d82e6f82b90634efc9ff9d0bdcd94088951c8a6a329bd8dac561759
-EBUILD systemd-248.3.ebuild 15359 BLAKE2B 1335bde6d963c17e6f59c8ed290eea05bd568f582d443fc7d115730b1c6b2004a19b8dc142a94a490642de19895ac81b997431c4608841fa198e567eeaf0297a SHA512 29fc15694ae9686f98820116263d15b3972a7ffe591d304307284d95d5f50a4b6b603ad0c4950df80c6a5b793c19875da71638536965a966328d36d73ea741f3
+EBUILD systemd-248.3.ebuild 15159 BLAKE2B d19e7cfb3f0fd95e605fe6546c791ab5a55b904ce39a65e2bad7c8a42bfabd9a357a8a332d58ba83714734a6c8f948272e7ebaadbe018834d53ac2b85294ec9b SHA512 318d13251b4bf5546972dfa61bfa3b0e3aaf1183c558c0cc2cffb975bc9d06025dd48565fe30a162019d6ab3a8235d2148dc3cfecf12327026cfcd181d7f55b7
 EBUILD systemd-248.ebuild 15858 BLAKE2B 53e11d0215eabdea015fb2e652d9889d247caa2dae3ebc905f9b92769002a57a95106b986ac96fdb8078ce11d62df54884a1b7fea28804794485565fb237f623 SHA512 3130c20e6ce32ba1e132fa245d4880d391ffc46b9de6d9f968621fb992802180f910043eec79185f404930ca117d1eb821bdea83dffe16ec3d79e63fb0cb6352
-EBUILD systemd-9999.ebuild 15478 BLAKE2B 92881d031f460f006651a21704d25bee301436d2f1195036be81087303285d4febf5984677dfb2e1e6a811cf171d257d72edb6ad49d001ac6de3c14633c9bcbc SHA512 4cfe9fca10e06835f596aab5c373893652fc1e3b8e1c0ba36c79d368d75bf2d51ff11d5e5648b97a8da72adc68913d659f170c1b4af2df290367caf0c7564f30
+EBUILD systemd-9999.ebuild 15285 BLAKE2B df9eb3ecb869f0814369ca2c0258f7d454e2ca9a003dafb8f88163bb1702487081456e309803e065e5db5cb840114889095c4ead9305396e67bdc061469cb511 SHA512 87af259ea658e1082372bb38ad9af5ac52c58215530e3dff99159ea60ec9fd88dd5914a2bc9681ec3312000cbf9cc4577c8e9a306dae194e4e84ade6e6b2f09b
 MISC metadata.xml 2418 BLAKE2B bec7b05950f495cd678359bca70723286c33d4943407fee45e1214a53d9bfbbb25d3612a5b1bb51d885c38ea63719b3de2f0341d2b8aeb5d5919a29459cb89e4 SHA512 46979fbafe3561a722efefeb82e283e221cb930e56e9f43c25a47c299712dac21f6ef4c970afed86cb390e21dc8dd86b23eea310d5dd7e66a7a6fde250b929d7
diff --git a/sys-apps/systemd/systemd-248.3.ebuild b/sys-apps/systemd/systemd-248.3.ebuild
index 1899e9f7640f..c05f93040c93 100644
--- a/sys-apps/systemd/systemd-248.3.ebuild
+++ b/sys-apps/systemd/systemd-248.3.ebuild
@@ -16,12 +16,12 @@ 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 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+inherit bash-completion-r1 linux-info meson-multilib 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"
@@ -237,26 +237,6 @@ src_configure() {
 	multilib-minimal_src_configure
 }
 
-sd_use() {
-	usex "$1" true false
-}
-
-sd_native() {
-	if multilib_is_native_abi; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-sd_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
 multilib_src_configure() {
 	local myconf=(
 		--localstatedir="${EPREFIX}/var"
@@ -265,7 +245,7 @@ multilib_src_configure() {
 		# avoid bash-completion dep
 		-Dbashcompletiondir="$(get_bashcompdir)"
 		# make sure we get /bin:/sbin in PATH
-		-Dsplit-usr=$(usex split-usr true false)
+		$(meson_use split-usr)
 		-Dsplit-bin=true
 		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
 		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
@@ -275,89 +255,81 @@ multilib_src_configure() {
 		-Dima=true
 		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
 		# Optional components/dependencies
-		-Dacl=$(sd_native_use acl)
-		-Dapparmor=$(sd_native_use apparmor)
-		-Daudit=$(sd_native_use audit)
-		-Dlibcryptsetup=$(sd_native_use cryptsetup)
-		-Dlibcurl=$(sd_native_use curl)
-		-Ddns-over-tls=$(sd_native_use dns-over-tls)
-		-Delfutils=$(sd_native_use elfutils)
-		-Dgcrypt=$(sd_use gcrypt)
-		-Dgnu-efi=$(sd_native_use gnuefi)
+		$(meson_native_use_bool acl)
+		$(meson_native_use_bool apparmor)
+		$(meson_native_use_bool audit)
+		$(meson_native_use_bool cryptsetup libcryptsetup)
+		$(meson_native_use_bool curl libcurl)
+		$(meson_native_use_bool dns-over-tls dns-over-tls)
+		$(meson_native_use_bool elfutils)
+		$(meson_use gcrypt)
+		$(meson_native_use_bool gnuefi gnu-efi)
 		-Defi-includedir="${ESYSROOT}/usr/include/efi"
 		-Defi-ld="$(tc-getLD)"
 		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-		-Dhomed=$(sd_native_use homed)
-		-Dhwdb=$(sd_native_use hwdb)
-		-Dmicrohttpd=$(sd_native_use http)
-		-Didn=$(sd_native_use idn)
-		-Dimportd=$(sd_native_use importd)
-		-Dbzip2=$(sd_native_use importd)
-		-Dzlib=$(sd_native_use importd)
-		-Dkmod=$(sd_native_use kmod)
-		-Dlz4=$(sd_use lz4)
-		-Dxz=$(sd_use lzma)
-		-Dzstd=$(sd_use zstd)
-		-Dlibiptc=$(sd_native_use nat)
-		-Dpam=$(sd_use pam)
-		-Dp11kit=$(sd_native_use pkcs11)
-		-Dpcre2=$(sd_native_use pcre)
-		-Dpolkit=$(sd_native_use policykit)
-		-Dpwquality=$(sd_native_use pwquality)
-		-Dqrencode=$(sd_native_use qrcode)
-		-Drepart=$(sd_native_use repart)
-		-Dseccomp=$(sd_native_use seccomp)
-		-Dselinux=$(sd_native_use selinux)
-		-Dtpm2=$(sd_native_use tpm)
-		-Ddbus=$(sd_native_use test)
-		-Dxkbcommon=$(sd_native_use xkb)
+		$(meson_native_use_bool homed)
+		$(meson_native_use_bool hwdb)
+		$(meson_native_use_bool http microhttpd)
+		$(meson_native_use_bool idn)
+		$(meson_native_use_bool importd)
+		$(meson_native_use_bool importd bzip2)
+		$(meson_native_use_bool importd zlib)
+		$(meson_native_use_bool kmod)
+		$(meson_use lz4)
+		$(meson_use lzma xz)
+		$(meson_use zstd)
+		$(meson_native_use_bool nat libiptc)
+		$(meson_use pam)
+		$(meson_native_use_bool pkcs11 p11kit)
+		$(meson_native_use_bool pcre pcre2)
+		$(meson_native_use_bool policykit polkit)
+		$(meson_native_use_bool pwquality)
+		$(meson_native_use_bool qrcode qrencode)
+		$(meson_native_use_bool repart)
+		$(meson_native_use_bool seccomp)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool tpm tpm2)
+		$(meson_native_use_bool test dbus)
+		$(meson_native_use_bool xkb xkbcommon)
 		-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=$(sd_native)
-		-Dbinfmt=$(sd_native)
-		-Dcoredump=$(sd_native)
-		-Denvironment-d=$(sd_native)
-		-Dfirstboot=$(sd_native)
-		-Dhibernate=$(sd_native)
-		-Dhostnamed=$(sd_native)
-		-Dldconfig=$(sd_native)
-		-Dlocaled=$(sd_native)
-		-Dman=$(sd_native)
-		-Dnetworkd=$(sd_native)
-		-Dquotacheck=$(sd_native)
-		-Drandomseed=$(sd_native)
-		-Drfkill=$(sd_native)
-		-Dsysusers=$(sd_native)
-		-Dtimedated=$(sd_native)
-		-Dtimesyncd=$(sd_native)
-		-Dtmpfiles=$(sd_native)
-		-Dvconsole=$(sd_native)
+		$(meson_native_true backlight)
+		$(meson_native_true binfmt)
+		$(meson_native_true coredump)
+		$(meson_native_true environment-d)
+		$(meson_native_true firstboot)
+		$(meson_native_true hibernate)
+		$(meson_native_true hostnamed)
+		$(meson_native_true ldconfig)
+		$(meson_native_true localed)
+		$(meson_native_true man)
+		$(meson_native_true networkd)
+		$(meson_native_true quotacheck)
+		$(meson_native_true randomseed)
+		$(meson_native_true rfkill)
+		$(meson_native_true sysusers)
+		$(meson_native_true timedated)
+		$(meson_native_true timesyncd)
+		$(meson_native_true tmpfiles)
+		$(meson_native_true vconsole)
 
 		# static-libs
-		-Dstatic-libsystemd=$(usex static-libs true false)
-		-Dstatic-libudev=$(usex static-libs true false)
+		$(meson_use static-libs static-libsystemd)
+		$(meson_use static-libs static-libudev)
 	)
 
 	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)
 
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 03cc0e7e2256..6c3c1ef813c4 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -21,7 +21,7 @@ fi
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+inherit bash-completion-r1 linux-info meson-multilib 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"
@@ -239,26 +239,6 @@ src_configure() {
 	multilib-minimal_src_configure
 }
 
-sd_use() {
-	usex "$1" true false
-}
-
-sd_native() {
-	if multilib_is_native_abi; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-sd_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
 multilib_src_configure() {
 	local myconf=(
 		--localstatedir="${EPREFIX}/var"
@@ -267,7 +247,7 @@ multilib_src_configure() {
 		# avoid bash-completion dep
 		-Dbashcompletiondir="$(get_bashcompdir)"
 		# make sure we get /bin:/sbin in PATH
-		-Dsplit-usr=$(usex split-usr true false)
+		$(meson_use split-usr)
 		-Dsplit-bin=true
 		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
 		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
@@ -277,89 +257,81 @@ multilib_src_configure() {
 		-Dima=true
 		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
 		# Optional components/dependencies
-		-Dacl=$(sd_native_use acl)
-		-Dapparmor=$(sd_native_use apparmor)
-		-Daudit=$(sd_native_use audit)
-		-Dlibcryptsetup=$(sd_native_use cryptsetup)
-		-Dlibcurl=$(sd_native_use curl)
-		-Ddns-over-tls=$(sd_native_use dns-over-tls)
-		-Delfutils=$(sd_native_use elfutils)
-		-Dgcrypt=$(sd_use gcrypt)
-		-Dgnu-efi=$(sd_native_use gnuefi)
+		$(meson_native_use_bool acl)
+		$(meson_native_use_bool apparmor)
+		$(meson_native_use_bool audit)
+		$(meson_native_use_bool cryptsetup libcryptsetup)
+		$(meson_native_use_bool curl libcurl)
+		$(meson_native_use_bool dns-over-tls dns-over-tls)
+		$(meson_native_use_bool elfutils)
+		$(meson_use gcrypt)
+		$(meson_native_use_bool gnuefi gnu-efi)
 		-Defi-includedir="${ESYSROOT}/usr/include/efi"
 		-Defi-ld="$(tc-getLD)"
 		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-		-Dhomed=$(sd_native_use homed)
-		-Dhwdb=$(sd_native_use hwdb)
-		-Dmicrohttpd=$(sd_native_use http)
-		-Didn=$(sd_native_use idn)
-		-Dimportd=$(sd_native_use importd)
-		-Dbzip2=$(sd_native_use importd)
-		-Dzlib=$(sd_native_use importd)
-		-Dkmod=$(sd_native_use kmod)
-		-Dlz4=$(sd_use lz4)
-		-Dxz=$(sd_use lzma)
-		-Dzstd=$(sd_use zstd)
-		-Dlibiptc=$(sd_native_use nat)
-		-Dpam=$(sd_use pam)
-		-Dp11kit=$(sd_native_use pkcs11)
-		-Dpcre2=$(sd_native_use pcre)
-		-Dpolkit=$(sd_native_use policykit)
-		-Dpwquality=$(sd_native_use pwquality)
-		-Dqrencode=$(sd_native_use qrcode)
-		-Drepart=$(sd_native_use repart)
-		-Dseccomp=$(sd_native_use seccomp)
-		-Dselinux=$(sd_native_use selinux)
-		-Dtpm2=$(sd_native_use tpm)
-		-Ddbus=$(sd_native_use test)
-		-Dxkbcommon=$(sd_native_use xkb)
+		$(meson_native_use_bool homed)
+		$(meson_native_use_bool hwdb)
+		$(meson_native_use_bool http microhttpd)
+		$(meson_native_use_bool idn)
+		$(meson_native_use_bool importd)
+		$(meson_native_use_bool importd bzip2)
+		$(meson_native_use_bool importd zlib)
+		$(meson_native_use_bool kmod)
+		$(meson_use lz4)
+		$(meson_use lzma xz)
+		$(meson_use zstd)
+		$(meson_native_use_bool nat libiptc)
+		$(meson_use pam)
+		$(meson_native_use_bool pkcs11 p11kit)
+		$(meson_native_use_bool pcre pcre2)
+		$(meson_native_use_bool policykit polkit)
+		$(meson_native_use_bool pwquality)
+		$(meson_native_use_bool qrcode qrencode)
+		$(meson_native_use_bool repart)
+		$(meson_native_use_bool seccomp)
+		$(meson_native_use_bool selinux)
+		$(meson_native_use_bool tpm tpm2)
+		$(meson_native_use_bool test dbus)
+		$(meson_native_use_bool xkb xkbcommon)
 		-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=$(sd_native)
-		-Dbinfmt=$(sd_native)
-		-Dcoredump=$(sd_native)
-		-Denvironment-d=$(sd_native)
-		-Dfirstboot=$(sd_native)
-		-Dhibernate=$(sd_native)
-		-Dhostnamed=$(sd_native)
-		-Dldconfig=$(sd_native)
-		-Dlocaled=$(sd_native)
-		-Dman=$(sd_native)
-		-Dnetworkd=$(sd_native)
-		-Dquotacheck=$(sd_native)
-		-Drandomseed=$(sd_native)
-		-Drfkill=$(sd_native)
-		-Dsysusers=$(sd_native)
-		-Dtimedated=$(sd_native)
-		-Dtimesyncd=$(sd_native)
-		-Dtmpfiles=$(sd_native)
-		-Dvconsole=$(sd_native)
+		$(meson_native_true backlight)
+		$(meson_native_true binfmt)
+		$(meson_native_true coredump)
+		$(meson_native_true environment-d)
+		$(meson_native_true firstboot)
+		$(meson_native_true hibernate)
+		$(meson_native_true hostnamed)
+		$(meson_native_true ldconfig)
+		$(meson_native_true localed)
+		$(meson_native_true man)
+		$(meson_native_true networkd)
+		$(meson_native_true quotacheck)
+		$(meson_native_true randomseed)
+		$(meson_native_true rfkill)
+		$(meson_native_true sysusers)
+		$(meson_native_true timedated)
+		$(meson_native_true timesyncd)
+		$(meson_native_true tmpfiles)
+		$(meson_native_true vconsole)
 
 		# static-libs
-		-Dstatic-libsystemd=$(usex static-libs true false)
-		-Dstatic-libudev=$(usex static-libs true false)
+		$(meson_use static-libs static-libsystemd)
+		$(meson_use static-libs static-libudev)
 	)
 
 	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)
 
diff --git a/sys-apps/the_silver_searcher/Manifest b/sys-apps/the_silver_searcher/Manifest
index d3e3729d6fbd..c6c7c19e6793 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -3,5 +3,5 @@ AUX the_silver_searcher-fno-common.patch 3785 BLAKE2B 860a2ee021e29e3c1729363a57
 DIST the_silver_searcher-2.2.0.tar.gz 163686 BLAKE2B ca81f701336ff463b6dc783ac8bc615a05e048c35b653a80c3fb74b053bb71f4822990b699a9e3741c7ffdd2581b65faa5439824189a9d8e36025d248201f814 SHA512 b635165fa3259475027986dd49c0786545cc2e3037695aec70f6ee54eaa768ab0e25af78d4bfd3754c4eb8352464cebf64324ed4a68a4b3de60a6889473da26e
 DIST the_silver_searcher-2.2.0_p20201217.tar.gz 165236 BLAKE2B eaf5e657b33d463048a83e08a90588448cb2fcd481b1f7f869e82c5e1ae1168a10dacb0d549dcc4acafb4323c96a9b67ff9e58de85f80bd2bd7e209ddc5ca6fa SHA512 96bc8da8ba10034bbb646bac71d479a21a68793e8af5377481da72c8dfa49ac99a1540c2b4193c4a95167127f1caa48fbd611ba367b8279bd2115549b6d8d126
 EBUILD the_silver_searcher-2.2.0.ebuild 1047 BLAKE2B 546d64df5130376827e3556a4c1ab8487d1c580f21682c4d0e954cff92d186f154d0f156cec508f65e7d77170230ce7cda7ca8128a4c62c8f59c3594d09b9950 SHA512 d0c7ccc383ea8ca8da7a81071106d6d9b2948292b65e3685406b1502fb16d6fec04527fb0887e6d9b97dc824e86358353173dbd06f03ed384794250f18ee89fa
-EBUILD the_silver_searcher-2.2.0_p20201217.ebuild 1079 BLAKE2B 84c10dac5ae7de65605d90b82cc92d3dedfbf04769e27fbdbf7f142123be061c3accb02cd1570cdc899808ed88981990a4f43ec70d5f242a7e521284513ae1d8 SHA512 c85b10b692e2887191d0bdd52d454cf9fff62c948af1f78b663d146528f6d775c0146863f584d1ad49665beb35bb3f1c7a9c3008ef4f2e0248c9fe25a8fb360a
+EBUILD the_silver_searcher-2.2.0_p20201217.ebuild 1086 BLAKE2B b4ee6367e752efd1256043f0fe8424fc27a8c2b9ff0cebf5279bc762ac8bfee08a52981a023168b0cec57482d4091b6a19fe40e58d2bd1875267dea5bb0eea9b SHA512 57b447da01d78940a1ab76e99b2783cde3a48a1d8ed09b72faf73b1e906ab6cb2184f563aa335edd1cff917eaf13eea50af10f8cd4a8766e9ffa5a2416e85191
 MISC metadata.xml 343 BLAKE2B 21afa71f55c3a250d73910c6f8a96fcb5164b921758c8969b8fad8ac95e45f86d114742738d6f6f192a33be057b28440390b52719ee71755c3ba04a4f1a0cc0d SHA512 a2dd33c75fde978e49227132e7579e8c3d3b77989228f34f43e5611fafb6999320991f4bdb683426a30595771d2afebc5487487b890a9f399df086fe3946a39b
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217.ebuild
index 1094502e22e0..d91cc784c825 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ggreer/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
 IUSE="lzma test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/timer_entropyd/Manifest b/sys-apps/timer_entropyd/Manifest
deleted file mode 100644
index 2fe87084221b..000000000000
--- a/sys-apps/timer_entropyd/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX timer_entropyd-0.1-syslog.patch 833 BLAKE2B f7b3aec1bd30185e8f5e8c5efded4c30a39fa7208ee6396a69b1e93053f3c5efc1904c4006b6e1989976b213edad29974e037650552b5c219ec119c7ae746946 SHA512 93eefcd75c2c61515d8304f13d196022d76a8244c9b74764247d330e518a2c06fd93e6c9859cde7d6be2ae7e50c05f9e45d5a0c68bf2aa057821b52f588187c7
-AUX timer_entropyd.initd.1 236 BLAKE2B 281b56e70175419ffe5bec4609ce75a48982103353ca88f866e5bd11b0a59cd771fd0ccc9d80466d105de93d467afa0c7ea37c0b9cab90a3d5e89888af73b451 SHA512 78f0ef265ec514a781e9c53d4938a56fd83196c4e923882aaa368c40545f59196cd74aa63be08d500db083603ab871434365583b23932e284fffcf7a4f897f1d
-DIST timer_entropyd-0.3.tgz 8329 BLAKE2B 96af82883eeb5a136e1f059afb067b6df46e5940fe0da5b4c161047c0e4e40a9885454e3faa926b864c2db64cb6b481d5dfed7d8ba4f28d5c8691959e41d26d2 SHA512 bdfedb594ee32daf7fb961a703842ca3479de158fc19bd75664b183e44bcf2ef3e74645cc6097f340834933db6f9133710df7d433ac062b2375494de5c052dcc
-EBUILD timer_entropyd-0.3.ebuild 963 BLAKE2B c902fcdfb5de30429d0711d99f0e4487bee0086ee86d13923fb7d09ef375690e504d51d1b25aec3dbe041e2eeffbe907012a0578040aff84998fbfc323c34fb1 SHA512 fa2892994f9ef2128682e59c66dad6a19ff9c9c1fa9b18a1d5e7624fdc4c8dd92ef7ed8c2da7c02f9ecda5618092e942236b1e450e2cff9ed7e3faff0ec28832
-MISC metadata.xml 359 BLAKE2B 1e5b2d1f60ba4e6380b3411f9ef4b0bbd0dcdf4a078bd4624a6359aec49304691b3c03d2c214f5661f75af82d02460ead441e117fac1dedfa8890977ec2411b1 SHA512 7f1472a20512fa60f4d81005efc7ef659176109e7b19c17db63ee4dead3e4c5a03c8e8b1ad1bca2124cf94776e6a41fccfbc4c15e42b6ad42591a9210602624e
diff --git a/sys-apps/timer_entropyd/files/timer_entropyd-0.1-syslog.patch b/sys-apps/timer_entropyd/files/timer_entropyd-0.1-syslog.patch
deleted file mode 100644
index 91be4a2ffdf0..000000000000
--- a/sys-apps/timer_entropyd/files/timer_entropyd-0.1-syslog.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 51dc916e4466d0033728dd14f318203f995b3ad0 Mon Sep 17 00:00:00 2001
-From: Jeremy Olexa <darkside@gentoo.org>
-Date: Tue, 5 Apr 2011 14:19:49 +0000
-Subject: [PATCH] Move syslog call to ifdef _DEBUG
-
-In order to prevent logfile spamming (once every 7 seconds), move the
-syslog call only be used if compiled with -D_DEBUG
----
- main.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/main.c b/main.c
-index 13b95dd..781b321 100644
---- a/main.c
-+++ b/main.c
-@@ -66,8 +66,8 @@ int main(int argc, char *argv[])
- 
- 				kernel_rng_add_entropy(bytes, sizeof(bytes), cur_n_bits);
- 
--				syslog(LOG_DEBUG, "added %d bits of entropy data", cur_n_bits);
- #ifdef _DEBUG
-+				syslog(LOG_DEBUG, "added %d bits of entropy data", cur_n_bits);
- 				printf("added %d bits of entropy data\n", cur_n_bits);
- #endif
- 
--- 
-1.7.3.4
-
diff --git a/sys-apps/timer_entropyd/files/timer_entropyd.initd.1 b/sys-apps/timer_entropyd/files/timer_entropyd.initd.1
deleted file mode 100644
index 57178ca4b36f..000000000000
--- a/sys-apps/timer_entropyd/files/timer_entropyd.initd.1
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command=/usr/libexec/timer_entropyd
-
-depend() {
-	need localmount
-	before net
-	use logger
-
-	provide entropy
-}
diff --git a/sys-apps/timer_entropyd/metadata.xml b/sys-apps/timer_entropyd/metadata.xml
deleted file mode 100644
index 748ac538a47e..000000000000
--- a/sys-apps/timer_entropyd/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
-	<use>
-		<flag name="debug">Enable printf debugging and logging to the syslog at DEBUG level</flag>
-	</use>
-</pkgmetadata>
diff --git a/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild b/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild
deleted file mode 100644
index 8fe1dd37e068..000000000000
--- a/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch flag-o-matic toolchain-funcs
-
-DESCRIPTION="A timer-based entropy generator"
-HOMEPAGE="http://www.vanheusden.com/te/"
-SRC_URI="http://www.vanheusden.com/te/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips x86"
-IUSE="debug selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-entropyd )"
-
-src_prepare() {
-	sed -i -e 's:-O2::' Makefile || die
-	epatch "${FILESDIR}"/${PN}-0.1-syslog.patch
-}
-
-src_compile() {
-	use debug && append-cppflags -D_DEBUG
-
-	tc-export CC
-	emake DEBUG=
-}
-
-src_install() {
-	exeinto /usr/libexec
-	doexe ${PN}
-	dodoc Changes readme.txt
-	newinitd "${FILESDIR}/timer_entropyd.initd.1" ${PN}
-}
-
-pkg_postinst() {
-	elog "To start ${PN} at boot do rc-update add ${PN} default"
-	elog "To start ${PN} now do /etc/init.d/${PN} start"
-	elog "To check the amount of entropy, cat /proc/sys/kernel/random/entropy_avail"
-}
diff --git a/sys-apps/toybox/Manifest b/sys-apps/toybox/Manifest
index 08b3cabaa80a..98077b438e9f 100644
--- a/sys-apps/toybox/Manifest
+++ b/sys-apps/toybox/Manifest
@@ -1,4 +1,6 @@
 DIST toybox-0.8.4.tar.gz 1133770 BLAKE2B adc695c2ddd592b9de7137db623621410afaa4cdf2dfde647f24f25d38de99ad38907b5e5aa2ded0d6b2eceafc71763a25e04abc33e8f057934fceed6df22e69 SHA512 507604f96ee89094ca7b4b218985659a8de41578d1a4f267c7282baf11306419e94bb4bfcb06835dff3e46f974a0bb49f89e4c427c69c590738a4a37b62969b8
+DIST toybox-0.8.5.tar.gz 2378469 BLAKE2B 9054c07fd8bd477a4995b14fcea091a1602b039216ec9acb4f60e39eb10bba88924c19084c7e28d4c0b7cd72b0e0ab46a892cd427909e073dfad3e2f7416d600 SHA512 deb3743a10278ba236e95a1f3995555c745c2909381d2692a42920615c002a5cc6f9cccffee84ec2fcf1188d8f8c0a11e2b7f6a7798f0b7f5d33a0c1c3149237
 EBUILD toybox-0.8.4.ebuild 1058 BLAKE2B 661aa389f23fd9378b257f02fa2005dc0153c762446e2024930a0a031bdfe06469e0332459813eaf20fcfbda07a182adbc610e0a4fba106bdb133da814f5584b SHA512 6da970c6be012eea604e420f244ca913a068db6b03b7be30e8c1a1858287abf2fded6ab341c325aa204b6b14a5d17cb4c23aee3073cca229adb309e712570f2b
+EBUILD toybox-0.8.5.ebuild 1058 BLAKE2B 661aa389f23fd9378b257f02fa2005dc0153c762446e2024930a0a031bdfe06469e0332459813eaf20fcfbda07a182adbc610e0a4fba106bdb133da814f5584b SHA512 6da970c6be012eea604e420f244ca913a068db6b03b7be30e8c1a1858287abf2fded6ab341c325aa204b6b14a5d17cb4c23aee3073cca229adb309e712570f2b
 EBUILD toybox-9999.ebuild 1058 BLAKE2B 661aa389f23fd9378b257f02fa2005dc0153c762446e2024930a0a031bdfe06469e0332459813eaf20fcfbda07a182adbc610e0a4fba106bdb133da814f5584b SHA512 6da970c6be012eea604e420f244ca913a068db6b03b7be30e8c1a1858287abf2fded6ab341c325aa204b6b14a5d17cb4c23aee3073cca229adb309e712570f2b
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/sys-apps/toybox/toybox-0.8.5.ebuild b/sys-apps/toybox/toybox-0.8.5.ebuild
new file mode 100644
index 000000000000..ca78edf8b366
--- /dev/null
+++ b/sys-apps/toybox/toybox-0.8.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multiprocessing savedconfig toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/landley/toybox.git"
+else
+	SRC_URI="https://landley.net/code/toybox/downloads/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Common linux commands in a multicall binary"
+HOMEPAGE="https://landley.net/code/toybox/"
+
+LICENSE="0BSD"
+SLOT="0"
+
+src_prepare() {
+	default
+	restore_config .config
+}
+
+src_configure() {
+	tc-export CC STRIP
+	export HOSTCC="$(tc-getBUILD_CC)"
+	# Respect CFLAGS
+	export OPTIMIZE="${CFLAGS}"
+
+	if [[ -f .config ]]; then
+		yes "" | emake -j1 oldconfig > /dev/null
+		return 0
+	else
+		einfo "Could not locate user configfile, so we will save a default one"
+		emake -j1 defconfig > /dev/null
+	fi
+}
+
+src_compile() {
+	unset CROSS_COMPILE
+	export CPUS=$(makeopts_jobs)
+	emake V=1
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	save_config .config
+	newbin generated/unstripped/toybox toybox
+}
diff --git a/sys-apps/tuned/Manifest b/sys-apps/tuned/Manifest
index b517cfc66ecf..f04cdaa6a74c 100644
--- a/sys-apps/tuned/Manifest
+++ b/sys-apps/tuned/Manifest
@@ -1,6 +1,4 @@
 AUX tuned.initd 421 BLAKE2B b60d6fbf4110ba7e0b5c36159dc9624460ccb8774f101a50b89e633bb177a8ef9d7c36fa425a27d8c5ec6c7b9b19965212cb5ee4b60e02abb3c3990beb26840a SHA512 0123e60def031887040df8690222cc553d93b3c5eb7413e19f722ef04ccf2aeb6468709f66866d432d4d0b0c0ed6875929f1292fde8ad18c4a6b589d1b40fab4
-DIST tuned-2.13.0.tar.gz 193816 BLAKE2B 1e51a9da855f54db9ac8ed6e764c091d513c1101771422a62c7c501dc3c8741430eb3503803b408709868d16d4791fbedb9dbc088b36fb693f065a1b6054fa15 SHA512 d81b0a80f911fe808ca324319da3e42c3c15196c0c37343d33b45c2b34f33e205e2913d77ffda8598379a91ef72ab73d88d7b83a4684b6a067e3f36d98a85927
 DIST tuned-2.15.0.tar.gz 207775 BLAKE2B 307b0598d9e99831526f2b26d5544df3832db7e17f28935c6f8d9293ec0d03729fb66906dca4739d48690e488f05383d448e7e714f6ae4824489564c295784c9 SHA512 67acdf10ecccd7910c4dcfd737610b4cb7651c7bf937bc0ed9c51869262d9f3a46f262d0b7636bc7a86a8abf579542a46f551e4f6c7561a061d8d58459be4589
-EBUILD tuned-2.13.0-r1.ebuild 1324 BLAKE2B 6235ecf7c383cb4cf69572509c48c23d8f13cc6cd07474cd134543642e205849cd4a8c5e8e60b60b1a9ce547673ceab272692d8995cf48049ce5987735f80aa4 SHA512 cf22b7446cedf1f5efe7886e43ad14bd284be62ad1b3250c6cadc1c34fdf390008458dab350dc741f3b9606d032d307f6cf6bf77f4cbfda6fa140d33438dcc62
 EBUILD tuned-2.15.0-r1.ebuild 1398 BLAKE2B 86d079a6b6661746b063f6229aada86f6c1b62a1d817e5e90fd5f1dba69ff3d49b797724c6662feae1234fb5c7edb4792a851ca7910e504b09ab8362640de04a SHA512 9ae8d5966bd251d936a9faee47d5146b5070b35cc31dcf2f8e210a94307aaf0a20540717b9b844c627595b5094fbfbd86a702d0ac05cb74acd3cd45ff6c37fd2
 MISC metadata.xml 388 BLAKE2B fba6c8b1e8afb1e474dca668ef0f1d9adc633f9c382ce7772235a8a38c1530dcb9329730d9b1c912a7b44a48ef43572f046751f51c3efcce3f4a6c7c2cdc012e SHA512 6f25c8d915777f95c6f134ba77006290b2d4c02ba70c7254ce7225062da042d8c9f7eb312f842a2988866804ff5069f5f3871e54f97d23bfac936da994d456ea
diff --git a/sys-apps/tuned/tuned-2.13.0-r1.ebuild b/sys-apps/tuned/tuned-2.13.0-r1.ebuild
deleted file mode 100644
index 7dc2f7cefc03..000000000000
--- a/sys-apps/tuned/tuned-2.13.0-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit python-single-r1 xdg-utils
-
-DESCRIPTION="Daemon for monitoring and adaptive tuning of system devices"
-HOMEPAGE="https://github.com/redhat-performance/tuned"
-SRC_URI="https://github.com/redhat-performance/tuned/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/configobj[${PYTHON_MULTI_USEDEP}]
-		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyudev[${PYTHON_MULTI_USEDEP}]
-		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-linux-procfs[${PYTHON_MULTI_USEDEP}]
-	')"
-
-RDEPEND="
-	${DEPEND}
-	sys-apps/dbus
-	sys-apps/ethtool
-	sys-power/powertop
-	dev-util/systemtap"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/^export DOCDIR/s/$/&\-\$(VERSION)/g" \
-		-e "/\$(DESTDIR)\/run\/tuned/d" \
-		-e "/\$(DESTDIR)\/var\/lib\/tuned/d" \
-		-e "/\$(DESTDIR)\/var\/log\/tuned/d" \
-		Makefile || die
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	python_fix_shebang "${D}"
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index e14263468099..5278a854d4ff 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,9 +1,10 @@
 AUX runuser-l.pamd 188 BLAKE2B 4fbd934c05386732b32281fdfac19153f01e0610868f3168026fbc4eb828ed1fe177677939958322fb074a95c8f64bdbaea42a4e9c039ac86dee0154ac96242e SHA512 86538adbd3d01c4b9e46fee00c38d298d2857fb1224461206425532404c212f03331308b74347c9af2e00583a3b50802085bdc6cb2bd393cf5e9d032e7290301
 AUX runuser.pamd 278 BLAKE2B 61afa98e02a4ee030176dad97b7aa7d7075b07584c0e9f2c254f90bf22f6bad7ad8d87cb6d7c95efb789dcbec01e266c3192e135a3a36d817ab47c6bc05e7a01 SHA512 a4c4d41078acdc7c7f1d1f1894d20d052d3d5a3c66d5680d7f76665e251c614fd76ca9678a27ea376147f49250c716a1b3b0c0afa9595bd74d26d2190d1680fd
+AUX util-linux-2.37-ppc-nortas.patch 1038 BLAKE2B 0e1ea63056a78476a86cb1fadc5a46e39d2d91af5a4de703857cd3720bc328c931f0ca10383930c414ab98aa7d85c16388da6d91c1192d68cca91365619423c1 SHA512 d8253a3c81cf703533a577e0efed7f1508ee5e979a3ec319e42eedd1e9b8883e0defcdca37852088557d2a027eac6e9008ad95355b7f925b98b165327a017da4
 DIST util-linux-2.36.2.tar.xz 5348032 BLAKE2B 17e49515f8d0430f3ed26b80bf1d6e811d847141020d0dae1340dc92887549b7b711f3db6e3913120871fc912435def73586a7aef09d8d9cc6ff7ca331b2770f SHA512 6ab141f44ca4cb6b600081f10eae17e15d23abd122a37eb3ac6c845513a6a4396dc9dcff30b3032de80116ddde50e27dfbc86f92708c1051f84f0c919194664b
-DIST util-linux-2.37-rc2-manpages.tar.xz 160480 BLAKE2B 9d9ad7a74fe8bdd523fa5075c1031c43596c16e7db6bc04e3c8cf0447200ec9c24db9b973a1e47b3aada4ae48f3b82d16105fdc8f98373c1d6cc6aa82bcac454 SHA512 2dd6050dec6732231087cf83c6db6593ed47cc986be9e6b28d57cb3fa03eb31992fd0cb92bd6f0ab971dc33e633c3b27bf7f9d53dee20f011d5461a9af68e23c
-DIST util-linux-2.37-rc2.tar.xz 5437912 BLAKE2B 8fb6183537bc3a6d2831d2f91c7222518dd844e080b86e1f927f8418f7c075e3ae816d2bac2d8d493bf297f30f26a0deaaa0d37e1437f7caf625f92370606970 SHA512 9a7f301604c2ae914b8c33f17a22563ec0128e45d7687bf11142d190bb1f51adeff7f392efc27b87ac088c615097ccc270a886a5c912e363f4748b3ed6f5a6ef
+DIST util-linux-2.37-manpages.tar.xz 160156 BLAKE2B 39572332cfe4cac2313941ae922a01f5f4fe34cceb2ca3c806e87ec55187053dfce044790ad497d04adafc2abc513ae1429a1686e71b3b4e0e7907d17c9b6548 SHA512 2f3f1da3eae10b90daa672690ec90de303d87e9b0390f795daf80927a7c42f6aac9d3516b63051a6237a5609b5fda1dec92a1b8adc172115f3478b7edfa04918
+DIST util-linux-2.37.tar.xz 5519268 BLAKE2B 37d4f260d636539c60b7196545c7c542c7e08a24cf3395be0c14054b5f05765c9f8234ded1c8fed60855e76bf0cfedc557d45e99b37d1e6b4a0244897fe06860 SHA512 84cf1df46165f286caa1a1204b335dc1fc826a8e1d52a817c28eb80ef19734eccd6efdfb078e87ade9e4381a9102e59d4df83e9bb100e4c73aff2aa4bfb85615
 EBUILD util-linux-2.36.2.ebuild 8942 BLAKE2B e26af16681c038a8d2818bfef7565b106711639e0fee55868a056496180648c6ae390e66595af22c1ac4c444052355ccd1a46ef359624b56ee1f8b3205ac2584 SHA512 4f9165ea6a2397b0b9df2971a8547d03005a3e1333673245b4d9397f2b78632cbab23bc12ccd4392ad6b90f1971fca764240730fd315eb22bfcb495937e5dc44
-EBUILD util-linux-2.37_rc2.ebuild 9754 BLAKE2B 3a0bd9c913eb52b123ab4e4cae17d5003948758a08615448f8450c0833844b0d2aa867f6c040850fa1f31dc91b6ba39f6ba87c47df1eab2f882380cb7be28ff3 SHA512 445c8b441aa14763ca3296c73ae6ad6896df54a4e6ffe6feeb754fb22574dc18ec3f7af1df66ec61612f38b501dcf7f7411e6a0a75a7afba8c1170152dc8498f
+EBUILD util-linux-2.37.ebuild 9843 BLAKE2B c5b8674337940621bd8a181e3d3837ef89df02ccc7eaab608ebbf26ea25888fd14fe8476b1d41667ee7fee7783dcae30f57f6ff80cad22199d471064adf19ced SHA512 8aa40f748041f53694425c8c84762b6c4e9c8ec4a1598a7eca5cee4ee4bed30b2ae33eda0f518a7c68db0dfd9bb20aaf02c6fb47b8641cf3f1be03393a38eeb4
 EBUILD util-linux-9999.ebuild 9754 BLAKE2B 3a0bd9c913eb52b123ab4e4cae17d5003948758a08615448f8450c0833844b0d2aa867f6c040850fa1f31dc91b6ba39f6ba87c47df1eab2f882380cb7be28ff3 SHA512 445c8b441aa14763ca3296c73ae6ad6896df54a4e6ffe6feeb754fb22574dc18ec3f7af1df66ec61612f38b501dcf7f7411e6a0a75a7afba8c1170152dc8498f
 MISC metadata.xml 1364 BLAKE2B 0221b836433dfffc122d794272c554b6114862efb7d474e68507fb399e56cf32bc86f0dba0d519782634eb45638d2e15dd25c8147d7209f5a3de536ba7ecf38b SHA512 094e0b577f2322b73ace41db762ea88736650a3f3010fb8a26f649a51efc83d09a66bbdaf7a24b24164264b2dbbf7839be49b21e0a125c95ca39f1c4cd6201e4
diff --git a/sys-apps/util-linux/files/util-linux-2.37-ppc-nortas.patch b/sys-apps/util-linux/files/util-linux-2.37-ppc-nortas.patch
new file mode 100644
index 000000000000..b3ac47163233
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.37-ppc-nortas.patch
@@ -0,0 +1,36 @@
+From 45cd3aa4ded6df54dde85e6939b48bb273c8b6c3 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Wed, 2 Jun 2021 13:59:26 -0700
+Subject: [PATCH] lscpu: fix build on powerpc
+
+fails with error: label at end of compound statement
+and fix typo as bonus.
+
+Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
+---
+ sys-utils/lscpu-cputype.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sys-utils/lscpu-cputype.c b/sys-utils/lscpu-cputype.c
+index cf7af361c..d5ca8e1f1 100644
+--- a/sys-utils/lscpu-cputype.c
++++ b/sys-utils/lscpu-cputype.c
+@@ -724,7 +724,7 @@ int lscpu_read_archext(struct lscpu_cxt *cxt)
+ 	}
+ 
+ #if defined(HAVE_LIBRTAS)
+-	/* Get PowerPC speficic info */
++	/* Get PowerPC specific info */
+ 	if (!cxt->noalive) {
+ 		int rc, len, ntypes;
+ 
+@@ -745,8 +745,8 @@ int lscpu_read_archext(struct lscpu_cxt *cxt)
+ 		ct->physsockets = strbe16toh(buf, 4);
+ 		ct->physchips = strbe16toh(buf, 6);
+ 		ct->physcoresperchip = strbe16toh(buf, 8);
+-nortas:
+ 	}
++nortas:
+ #endif
+ 	return 0;
+ }
diff --git a/sys-apps/util-linux/util-linux-2.37_rc2.ebuild b/sys-apps/util-linux/util-linux-2.37.ebuild
index 66a36a6cd0cb..2b3ff76f988c 100644
--- a/sys-apps/util-linux/util-linux-2.37_rc2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.37.ebuild
@@ -88,6 +88,8 @@ RESTRICT="!test? ( test )"
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
+	# https://github.com/karelzak/util-linux/pull/1329
+	"${FILESDIR}/${P}-ppc-nortas.patch"
 )
 
 rm_man() {
diff --git a/sys-apps/xdg-dbus-proxy/Manifest b/sys-apps/xdg-dbus-proxy/Manifest
index c685a31f8846..776866716e8a 100644
--- a/sys-apps/xdg-dbus-proxy/Manifest
+++ b/sys-apps/xdg-dbus-proxy/Manifest
@@ -1,3 +1,3 @@
 DIST xdg-dbus-proxy-0.1.2.tar.xz 119264 BLAKE2B 9f9fb561dd434e146636dd2e78275065c3f249b0486b1cb09ac0df2a2a9bd534f84192bb6f0f4b0627d47b9d490e3f5c10a6a4dca67d36a2465e4a971b28c64e SHA512 c76460e365778efeb1ef7cb9e479491afd1dc270680d108e7ece82b27be30bb4f958d4d218ac7d4497dcc749da25437f62119003866dcdeafcb6cea843dcbe1e
-EBUILD xdg-dbus-proxy-0.1.2.ebuild 557 BLAKE2B 1c1d0372bd221e2f0a19408685ed59097c3123c0dabc581c25b53d97cf42558596affa4752a5d3d0f29bf03b0227ccb762b2800bf423dd10ee3b8aba58b50ffa SHA512 8104cd566a1da457eb8a693e2ac212ef0bab0684fa32cadbde4c308b849a225e91afa3df4476b8641c3458562271033d3c7546f0f21b9e433ee3e0bff8fb4d6c
+EBUILD xdg-dbus-proxy-0.1.2.ebuild 564 BLAKE2B f578466abc46e0fbdef86fdd61e4907e5e016abe5590b64bc3fab4c7370cbc21fd239798623f7b78b3bae532a7e8d442efe598f21d72d614772a9e85036352af SHA512 7b66c6c6017692509eced2a69acd5de5f4f3ae8db35901400f337e2301f65c89d9fdca7b7f063017c244db3b14affe7eb2b993e74ea5a94f6c389f515a557b01
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild b/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
index 61cd561b7241..1ce59e3fadf0 100644
--- a/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
+++ b/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest
index 9bb1da6e7749..2aa2c97d4a9d 100644
--- a/sys-apps/xdg-desktop-portal/Manifest
+++ b/sys-apps/xdg-desktop-portal/Manifest
@@ -1,6 +1,3 @@
-AUX xdg-desktop-portal-1.8.0-fix-doc-portal.patch 4954 BLAKE2B 3ba7ad250eaabc707d5a139196d7ad428dc6356f7a35da6e8636214d8600f47b700eecbf5bca2194fd6b3e44d2fc60e38e0c664e6cd777a3400d608503445126 SHA512 350b0ae907c7927a08632f370f080296dcdfc054df5e9ca9e74fed3ec0b6e2d21af3f07d7ae072e372b5774ec578830f7187eb14e5baf3a5f516ff2faf0d97b1
-DIST xdg-desktop-portal-1.8.0.tar.xz 470692 BLAKE2B f21da5ad11dc2b1611983fdac87335b3c7e9c13222bbe3b90b276d75726a6f16d950a9ba62606aa31d52f57b8d076393ec0d48014b1623ab03dee23c524ed0ef SHA512 6d9760b41447af711d5937279b0031bcc88947e11204351accfcd9e6e19e498e9021675753185f92f7bd40336decc1895968796b1b71508c7caf5f6fc32a51a4
 DIST xdg-desktop-portal-1.8.1.tar.xz 473052 BLAKE2B a7d0aa2aa1e8220ced3e4abff8a8284c521b983ce807cd3e0d7b5d22f98f6428b6de9a193ae3aced9c13473617f453d13d0af83c677e3d077906b6cf8a138d45 SHA512 447d287d6627a1086d97dc5ebda20dfb1d0ca8643cbe54a7af5f6205a122a7be9d1643fded592f922c015561b7e2f4c6b6df555db3e0d3c02aad5bbe944077b6
-EBUILD xdg-desktop-portal-1.8.0-r1.ebuild 1060 BLAKE2B 81e3fc6eed93b4eedd09c2e126059e5d060ed113b4648389025c49e11b433ca9ff11d143ccf3b933e7113d3db06f5e9781c07aeaf7f6db199dab8ec71fe34f63 SHA512 37f53a187e24dd1cde5a2c8762b68ca8af3599ce4972b27caf99a4cd3cf5c7bdb0d1d133115ad29a97e632353e08c89bdb67ff328f032ced1f2477c282e634fe
-EBUILD xdg-desktop-portal-1.8.1.ebuild 983 BLAKE2B 1027688c72ec9652d55f8d89cea31b92ee13fd29709c8ec4016c842ac28b01e111efb6a87b23468101a9968f87368caf344eef1d66716b5a274e5d8e1ced26b5 SHA512 341501925233635295bbf77c4b7943db330e865d424fed3527bdd3b0ce7bb2c4f26f1d444aa9d4067395e8de61f950fd1011964368295a95178cf5235d604f0a
+EBUILD xdg-desktop-portal-1.8.1.ebuild 980 BLAKE2B bfe98db67b3a3982eed1f0dde0f5e48cd974d8e5bd68b72ca6217c4afcf6977e15aed3d3449d540473f314358ce7adbead6fcd797885f5833767ace43d0253a1 SHA512 450f6aedb3935ae5874167f7a2db1b003c9295ac92ccb59bbd0ace7a2de8d90f976cdbac0e3d886d43af667f407f5a6f4c437a3a843363491f67710fdea45c4a
 MISC metadata.xml 360 BLAKE2B 1e3fae0173fab20df0be6a2bd8432477d2c0ab2b9c4272e72a9d8a9eee3255c56311364ea079d288f87032fbc2ec8cad69f32a6bc41b152d19e307ee84493b49 SHA512 4e7232bd03fad6442491ce16c155b0d447050dfc383bb2c16b51297c8c2dcc2793b6d9ce6703451e9516d5a3017fb9e20e85ed7208c94c0faa4489bcbd897e22
diff --git a/sys-apps/xdg-desktop-portal/files/xdg-desktop-portal-1.8.0-fix-doc-portal.patch b/sys-apps/xdg-desktop-portal/files/xdg-desktop-portal-1.8.0-fix-doc-portal.patch
deleted file mode 100644
index 46b3aaf0fb40..000000000000
--- a/sys-apps/xdg-desktop-portal/files/xdg-desktop-portal-1.8.0-fix-doc-portal.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 57096483afb069e69b9addcc39fe92b72051f1d2 Mon Sep 17 00:00:00 2001
-From: James Henstridge <james@jamesh.id.au>
-Date: Tue, 24 Nov 2020 15:48:19 +0800
-Subject: [PATCH] xdp-utils: check if alternate doc portal path matches in
- path_for_fd()
-
-The document portal uses different inode number when exposing a
-particular document in different parts of the file system.  As sandboxed
-apps only have a subtree of the document portal file system mounted, the
-"same file" checks in xdp_app_info_get_path_for_fd() would fail for
-document portal paths.
-
-To fix this, we check to see whether the corresponding "by-app/$app_id"
-path matches the stat information of the file descriptor.
-
-Fixes #545
----
- document-portal/document-portal.c |  2 ++
- src/documents.c                   |  2 ++
- src/xdp-utils.c                   | 47 +++++++++++++++++++++++++++++--
- src/xdp-utils.h                   |  3 ++
- 5 files changed, 85 insertions(+), 2 deletions(-)
-
-diff --git a/document-portal/document-portal.c b/document-portal/document-portal.c
-index a4c044a..a4aacc4 100644
---- a/document-portal/document-portal.c
-+++ b/document-portal/document-portal.c
-@@ -1448,6 +1448,8 @@ on_name_acquired (GDBusConnection *connection,
- 
-   fuse_dev = stbuf.st_dev;
- 
-+  xdp_set_documents_mountpoint (xdp_fuse_get_mountpoint ());
-+
-   while ((invocation = g_queue_pop_head (&get_mount_point_invocations)) != NULL)
-     {
-       xdp_dbus_documents_complete_get_mount_point (dbus_api, invocation, xdp_fuse_get_mountpoint ());
-diff --git a/src/documents.c b/src/documents.c
-index 99de9e4..9ddc4ac 100644
---- a/src/documents.c
-+++ b/src/documents.c
-@@ -31,6 +31,7 @@
- #include <gio/gunixfdlist.h>
- 
- #include "xdp-dbus.h"
-+#include "xdp-utils.h"
- #include "document-enums.h"
- 
- static XdpDocuments *documents = NULL;
-@@ -46,6 +47,7 @@ init_document_proxy (GDBusConnection *connection)
-   xdp_documents_call_get_mount_point_sync (documents,
-                                            &documents_mountpoint,
-                                            NULL, NULL);
-+  xdp_set_documents_mountpoint (documents_mountpoint);
- }
- 
- char *
-diff --git a/src/xdp-utils.c b/src/xdp-utils.c
-index fa6ca6f..ef68f0f 100644
---- a/src/xdp-utils.c
-+++ b/src/xdp-utils.c
-@@ -884,6 +884,35 @@ verify_proc_self_fd (XdpAppInfo *app_info,
-   return xdp_app_info_remap_path (app_info, path_buffer);
- }
- 
-+static char *documents_mountpoint = NULL;
-+
-+void
-+xdp_set_documents_mountpoint (const char *path)
-+{
-+  g_clear_pointer (&documents_mountpoint, g_free);
-+  documents_mountpoint = g_strdup (path);
-+}
-+
-+/* alternate_document_path converts a file path  */
-+char *
-+xdp_get_alternate_document_path (const char *path, const char *app_id)
-+{
-+  int len;
-+
-+  /* If we don't know where the document portal is mounted, then there
-+   * is no alternate path */
-+  if (documents_mountpoint == NULL)
-+    return NULL;
-+
-+  /* If the path is not within the document portal, then there is no
-+   * alternative path */
-+  len = strlen (documents_mountpoint);
-+  if (!g_str_has_prefix (path, documents_mountpoint) || path[len] != '/')
-+    return NULL;
-+
-+  return g_strconcat (documents_mountpoint, "/by-app/", app_id, &path[len], NULL);
-+}
-+
- char *
- xdp_app_info_get_path_for_fd (XdpAppInfo *app_info,
-                               int fd,
-@@ -981,8 +1010,22 @@ xdp_app_info_get_path_for_fd (XdpAppInfo *app_info,
-       st_buf->st_dev != real_st_buf.st_dev ||
-       st_buf->st_ino != real_st_buf.st_ino)
-     {
--      /* Different files on the inside and the outside, reject the request */
--      return NULL;
-+      /* If the path is provided by the document portal, the inode
-+         number will not match, due to only a subtree being mounted in
-+         the sandbox.  So we check to see if the equivalent path
-+         within that subtree matches our file descriptor.
-+
-+         If the alternate path doesn't match either, then we treat it
-+         as a failure.
-+      */
-+      g_autofree char *alt_path = NULL;
-+      alt_path = xdp_get_alternate_document_path (path, xdp_app_info_get_id (app_info));
-+
-+      if (alt_path == NULL ||
-+          stat (alt_path, &real_st_buf) < 0 ||
-+          st_buf->st_dev != real_st_buf.st_dev ||
-+          st_buf->st_ino != real_st_buf.st_ino)
-+        return NULL;
-     }
- 
-   if (writable_out)
-diff --git a/src/xdp-utils.h b/src/xdp-utils.h
-index 7105bce..fea28b8 100644
---- a/src/xdp-utils.h
-+++ b/src/xdp-utils.h
-@@ -88,6 +88,9 @@ char **     xdp_app_info_rewrite_commandline (XdpAppInfo *app_info,
- 
- G_DEFINE_AUTOPTR_CLEANUP_FUNC(XdpAppInfo, xdp_app_info_unref)
- 
-+void  xdp_set_documents_mountpoint    (const char *path);
-+char *xdp_get_alternate_document_path (const char *path, const char *app_id);
-+
- XdpAppInfo *xdp_invocation_lookup_app_info_sync (GDBusMethodInvocation *invocation,
-                                                  GCancellable          *cancellable,
-                                                  GError               **error);
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0-r1.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0-r1.ebuild
deleted file mode 100644
index eee5858119f1..000000000000
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="Desktop integration portal"
-HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal"
-SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
-IUSE="geolocation screencast"
-
-BDEPEND="
-	dev-util/gdbus-codegen
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	media-libs/fontconfig
-	sys-fs/fuse:0
-	geolocation? ( >=app-misc/geoclue-2.5.3:2.0 )
-	screencast? ( >=media-video/pipewire-0.3:= )
-"
-RDEPEND="${DEPEND}
-	sys-apps/dbus
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-doc-portal.patch" )
-
-src_configure() {
-	local myeconfargs=(
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-		$(use_enable geolocation geoclue)
-		$(use_enable screencast pipewire)
-		--disable-docbook-docs # flatpak not packaged
-		--disable-libportal # not packaged
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.1.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.1.ebuild
index 4131ed399282..f144437d0ed6 100644
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.1.ebuild
+++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="geolocation screencast"
 
 BDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
commit	d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree	4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /sys-apps
parent	e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)