gentoo resync : 14.12.2020

98 files changed, 1605 insertions, 1948 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index a444b8a92ab8..3d01c8bf019a 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/ack/Manifest b/sys-apps/ack/Manifest
index 450152409eb7..09a216ffb58c 100644
--- a/sys-apps/ack/Manifest
+++ b/sys-apps/ack/Manifest
@@ -7,5 +7,5 @@ DIST ack-v3.4.0.tar.gz 251106 BLAKE2B 192d1e851ef5bd3547e21fe49cf276180eb278af78
 EBUILD ack-3.0.0.ebuild 810 BLAKE2B 2617de5e26ff8f9ecf601ee5a4f5c2104ec9acfc2e42fcc1fe56742dbe64c729bfbd58f780374bdd1bc6563bac29e05284e99e73ec5f5310cef0fa10cef239b6 SHA512 574ee3043cc235a1914d2002ac9a3184890f2ae6f23037823a699bca22b04b44d15c2617d4bd910e4e00123106d2c5a47d36e8289d75b1583e758f4b6cefd51e
 EBUILD ack-3.2.0.ebuild 812 BLAKE2B 916da318cdcc7aeb9b98f65f156365f103e59248c1087615c293da0a73d4fc1ad3f535e2f6f5a422406a26a522cebcb12f97d9e05c3d80aecf64e2e445020898 SHA512 b4272f60a2ffd169b490b07f2ac28db6c069ed5543451202d1b49b34f2deea2dc05098a0a304bc4a8b5cfde86419f2ab486a8a9b5dd88951d8994d2c4946a2eb
 EBUILD ack-3.3.1.ebuild 812 BLAKE2B aef52558bf7791b754afdfdce9fb497c26b44a3aeebe8a1b2bc587bcbce6d5477340194c33d551f7aedb4b2f5fe9fd71fce8aa6e382fffa686dffc0ea2a7fc87 SHA512 93c5e79e1800400bd40405993f5a8e05e43a446c308b26f3e6c9f670df36c354e2cf6f0396b5ad9fe636a1f6031d8a5e4a655b8b32e2e5abc1af4158983972f2
-EBUILD ack-3.4.0.ebuild 812 BLAKE2B aef52558bf7791b754afdfdce9fb497c26b44a3aeebe8a1b2bc587bcbce6d5477340194c33d551f7aedb4b2f5fe9fd71fce8aa6e382fffa686dffc0ea2a7fc87 SHA512 93c5e79e1800400bd40405993f5a8e05e43a446c308b26f3e6c9f670df36c354e2cf6f0396b5ad9fe636a1f6031d8a5e4a655b8b32e2e5abc1af4158983972f2
+EBUILD ack-3.4.0.ebuild 830 BLAKE2B 94b37db82ec9fa94a449de96b221ad55568593ca1bada350f6ee68e8a951112cc1cda561833853023f245e9be5ce31440f72b974a70543e9bcf20c9f43bc9191 SHA512 69dbb82b289c3e3a40633f8def16f7c49075b4a8df896a865858ff32c60f846deb9fea9c003ae6f4d6f068abfa8d77ed72827a6f5c87fa65864d1029acb8f92f
 MISC metadata.xml 1749 BLAKE2B c8803cd3161065885162a0a3c21a426e36914ff7796b3f99eb57f1e1db40be7cb789df331dde048e112f6ab691a30607100a521091ece034d2edabffc22751ee SHA512 91bee1d028fac56e397138f7db10742721a509c3ba1f7de21aebe5d9c334b2bc56736cbedf47df90f3dec5bc6193feacccceb45ad247e54fefdae5a06df65dac
diff --git a/sys-apps/ack/ack-3.4.0.ebuild b/sys-apps/ack/ack-3.4.0.ebuild
index 0df2c490211b..ee0ad246b94f 100644
--- a/sys-apps/ack/ack-3.4.0.ebuild
+++ b/sys-apps/ack/ack-3.4.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 ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index 9b7893431933..24eb84e5ed10 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,5 +1,7 @@
 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 2231 BLAKE2B e8ae0a0c14c50d533d960931ad070c2b77c8eee6262dfd97139abfdc378983532b5108ec724745b6d932e1807bd2ac95b599af7f189e927c3eebc11f6906bd77 SHA512 c1b24fd63aa32e3719301c8412c2abd11bcb7bad5da72b93b663d517498bcdd5fa0e2e70864a0735cf0f40c395da003f44bd29ad70d474458d7431f509d87df0
-EBUILD apparmor-utils-3.0.0-r1.ebuild 2270 BLAKE2B 754fcc4a9c6678754464d9a6db5d6ff506ca3cdabdfd02aec93aff745b6a8b1288c5237bc42eaee73fb526a1af471438bfd27fc3eca68359bd075f9875627779 SHA512 7dc19b60215e83caf6a833c88e11802ea86837c74e4a8390acd9309a64d77a4efc3f9b24d381cef342b6f9f8c8cee33cca17d7fb4b41c90acfb30099106a1316
+EBUILD apparmor-utils-3.0.0-r1.ebuild 2274 BLAKE2B 56d9b8698963d7caad85b61873dcd98dcfdc7ea6588db4b2e25e111146bef66815c84f03e36e9d25eeddc1932014a02f57608df44b988c3536844af074d475ba SHA512 77990a25ff751a4fdb3684fe29ee0f375c71e9d64cce5dbe0aa1f896eb0a40284ff4042b38f0841536f23123d23a149fcc84f452482d03e210fc5f538413f8c5
+EBUILD apparmor-utils-3.0.1.ebuild 2271 BLAKE2B 41d727928c0c8caa3c7c25007d4687b3d693e5551993487e79646b793748399648a544a55729312d41efe5e60adfd42194aad2a6257864e869137a95cf5966fc SHA512 8c6b4f9e1694d655562ca1af08d5bd20ce3a17cc1169fee45f3f0975bff9daa67d4a8541a6172ca07eae62ccc905e74a47db25f764a5317c9038a53d8ffa91d3
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
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
index 5dceaae3b4d8..a1a9c51e194d 100644
--- a/sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 inherit eapi7-ver perl-module python-r1 toolchain-funcs
 
 MY_PV="$(ver_cut 1-2)"
diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild
new file mode 100644
index 000000000000..7204e752028c
--- /dev/null
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_6,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}/${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 7f51aaa55470..6a9e4386bb96 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -8,6 +8,8 @@ AUX apparmor_load.sh 84 BLAKE2B 05195286287d5cdf56a7f67e18073f75625cbfb1c9283a22
 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 1731 BLAKE2B d8eca640ff0b2fac83cd53698b890414bb69b7374a9d08af15483d0b230ae07ece7cbf5604128c213a48b991fb2adf73338a20aa759f05417c46b0b5083f59bb SHA512 c20683297aec758e047db0f82195f8942edda5c21707a5389763ec7eb73fb60405ddb3e94f1402784377a431d26b4022b81c932f795d63c0bb8f2d54db5bfc36
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-apps/apparmor/apparmor-3.0.1.ebuild b/sys-apps/apparmor/apparmor-3.0.1.ebuild
new file mode 100644
index 000000000000..c857b1c46fa1
--- /dev/null
+++ b/sys-apps/apparmor/apparmor-3.0.1.ebuild
@@ -0,0 +1,83 @@
+# 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}-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 \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		CPP="$(tc-getCPP) -" \
+		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 \
+		CPP="$(tc-getCPP) -" \
+		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/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest
index 7f4ef4b6e48d..19222d7ac2d2 100644
--- a/sys-apps/baselayout-prefix/Manifest
+++ b/sys-apps/baselayout-prefix/Manifest
@@ -9,5 +9,5 @@ DIST baselayout-prefix-c88ceddbfc6a965dc0153aef21e012e774d9e30c.patch 2499 BLAKE
 DIST baselayout-prefix-c9338e89cdb603c1e08998bba28fbc977a62fc51.patch 9370 BLAKE2B 0e665e08db0ddec93604103d65d6e5a9249afdd55b22106b95e232128b724acd680bc875401cba15bc9aefcc19eddc4cf55b056a83e00a5a3862352470321d04 SHA512 d91c9537f445a8fd4308d5392fc42149e8d08c9ee3282e382995cd32ee531d77d73a94437c9b436b67e8c44aa598147ef63cc79a72ec2e9a83b078c5776ede51
 EBUILD baselayout-prefix-2.2-r5.ebuild 2905 BLAKE2B 72297193cf7cce6e7f755ca08696dbcbb858525c8a0be94b6107a38337fd33351c2b1f72fa3349b0c33e45ec4ca802d6c3fec21e8a3861216cf78b377a4a81c1 SHA512 83d948d13b868d01ccbd4d0b571d81ffcd4ffac67bc15e632b7335b2987b4c2451d55de9e6264265b364b517c8bafbb55acca970935db95bb4f2f0e3a9138113
 EBUILD baselayout-prefix-2.6-r1.ebuild 11019 BLAKE2B 00f1992732b28fdb376daf5a631910085749e824d90387101c7f0ce9996cfa7ce7c3bafd85fc55ec58e50b1ab55225ef553b93c96482242034274e65fa22e085 SHA512 22e7f6d8d778687c68dc6ac01ec638d52000367278fc2187e4e1442f907e4c79d3c38694acae342bf5b49331dbf8df3198ab86dd4e7c0aa0291a21817a0c3c76
-EBUILD baselayout-prefix-2.6-r2.ebuild 11113 BLAKE2B 938a4de3828ca552db4152fac92477c087d03a279ba94c614839a256e7262467d96f7622cd30c6c5c43dd761f32673c729f6482d7716b8cb243629d4cce7a008 SHA512 bcd40d5c1b7c49828723dee8d1115b2fb0bbbc8f9b0da534981ced208b025636d27ef7162a84f735887bd231037753888120141643ab988af3e70b04f489de77
+EBUILD baselayout-prefix-2.6-r2.ebuild 11120 BLAKE2B 2ea53dfdb33d2cea1a27f03429ced328e408f9ef2aaeecfdb2a2c5f86c27946e5ca127bc629ce206166452c153be63154d3bf109bc97d75af5283b7f3d590364 SHA512 81c1cc11b6b59d261a604d067cbd72bed446c530ba3619d8419f75bf7645fa83c84f3ab183ceb20484f3606ea2dd433d39564938aa8b5a512543eb6c2971e6a7
 MISC metadata.xml 317 BLAKE2B 023b00acfd1afc0255ae1356c8a9627a2d3d81e762b8a7bbd155c2e5e626c4a7663ced36ac04590a127e3a845122a17e07f7c0614dec091919e958883e71ced2 SHA512 3893a08cbe1db5c7888ba808a3cf04c20c8ba5988078791a707978f91e56bf2049244e30096617bf5906e3ff4257538407a02645ceb1a49a61ffef57980bcb27
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
index 3609b72802bb..32353c78d609 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${MY_PN}.git/snapshot/${MY_P}.tar.bz2"
-	KEYWORDS="~arm ~arm64 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~arm ~arm64 ~ppc64 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index 7afbba7ab144..d6adc34f11a9 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -3,6 +3,6 @@ DIST checkpolicy-3.0.tar.gz 69037 BLAKE2B 30b8a5e19e02472d1cf256636c70f957390985
 DIST checkpolicy-3.1.tar.gz 69072 BLAKE2B 31cb5ef52533b0a62f954e770278fc5766a961d87fb86260b04abe562bcd90d0025b33931c6ad54096c64ab54150c7562c112eac80eb2f60dbcdda57f4cacfe2 SHA512 2276a5a0919286049d2ceba386ef5f6de523745b588bb81cb4fed5eced5fd0b8070249b7a3ae5a85e2abb9369a86318f727d4073aad14ab75c43750a46069168
 EBUILD checkpolicy-2.9.ebuild 1167 BLAKE2B abc8401583d733530e3673cfa96c3059a8c3041578754fe745fb7850bbf92b852cac3458cbd0bbd550589e9830087d36c8e408d094be02a74d6ff396646deee9 SHA512 739189cf5e8d475e2eb3db2a3c323b32e03d4fff9b7684da149fe1d8470666d2359ca91470578ec0aec8b2f6d0c8e865c16016a0187b8eb2fbd0b8a62a2bce66
 EBUILD checkpolicy-3.0.ebuild 1167 BLAKE2B 033bc5b87495376881fa6d0cd2cd0152059478db0fbc262b13dc182955fc02e1a1c14e70b6cf9b756f458ca6631007d910805a744cbb98d739c0309f8a10f455 SHA512 d169a4348be5b8a48f87b244c40b2673857cb7695ef293cfdba084ef9f0db95110ae10857cd1e0cae48d338576fa05c30bdeec5762e7df5f12a4471e52f8b12b
-EBUILD checkpolicy-3.1.ebuild 1207 BLAKE2B 4ab6d0a6ed8f2080f89536b87676af9c8fcc4227047b7e35f96c163f76ade44fbd53b399ccde482c05181da82f64c419cb74416d3be57cdfce0dfe3968b71858 SHA512 e37923a568790a7155be174ee451616e78b8b2ce994ee6e96525fb6a7e4a2bdc5465f352f2be94f753c5b079088a5f689f347a3520321e73a6682e9592743a27
+EBUILD checkpolicy-3.1.ebuild 1205 BLAKE2B ae6dcf8e32b169d8f2b4389106d3131284f2af359056c42c03fafd1dc443df4bda0277b16af1fe59bf490ffb3ba604292e357eae90fa4bdcc2e1dfd9129c4020 SHA512 ee2d92c22559eea88f13b68f97b026992c7d4f16d8487c126d3b62ef10fcfb6917652bbdd03558306c4b978a4179c8981c090d7af4140ad0c441b6a9dcd10fc8
 EBUILD checkpolicy-9999.ebuild 1207 BLAKE2B 4ab6d0a6ed8f2080f89536b87676af9c8fcc4227047b7e35f96c163f76ade44fbd53b399ccde482c05181da82f64c419cb74416d3be57cdfce0dfe3968b71858 SHA512 e37923a568790a7155be174ee451616e78b8b2ce994ee6e96525fb6a7e4a2bdc5465f352f2be94f753c5b079088a5f689f347a3520321e73a6682e9592743a27
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sys-apps/checkpolicy/checkpolicy-3.1.ebuild b/sys-apps/checkpolicy/checkpolicy-3.1.ebuild
index fe88e2f1c073..070a1f1418cc 100644
--- a/sys-apps/checkpolicy/checkpolicy-3.1.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-3.1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index f5ec8b2aded1..e9d7c8c2fabe 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -1,20 +1,19 @@
-DIST c-dvar-9e1a5b4363aaece7169df2b2852944a1434b2df5.tar.gz 24719 BLAKE2B 3688d10d8295bf608d091cbc808dd2a22a535a94d40fcad46735a4f9e6e58ac06f969cd4ae7e65a04dd5719d00b424d902d904553e3e83bd0b93eebf6aed0cc0 SHA512 07e5d8b0b110ae4eab34024cfef05474b6a59a931ce61632bba3d96ed6bf042edf5b21238e2045cde92f1ab91ed45b1d78e2f8fe79f527f0ab6d018dc205608e
+DIST c-dvar-70f0f21e86a34577e674e202d5d09ef167102f02.tar.gz 24719 BLAKE2B 817c03739f56a3b741120896f98089bd6a379395b2f8e99697a79a3a2bdc855358a73b079434428c416373821e0e134acf6e30ef9bb9a384d25438c633e02433 SHA512 6a237100e66eef2413bf498d97a8fe1ca1b568df1f99276603f0b1627437a7f5741c38068cbafc49664f2a0438785a0ef7fb1de0fdb6768741585f1606d094e2
 DIST c-dvar-ebcef28b0da11ec20250f2fa710130967ddd8fa9.tar.gz 24584 BLAKE2B 6b9d488b14861084aa48a874d0db97d90ef554df4877650f66631474b12cd9c7d595726e074de4ddc549d7e053984aaa02f0cc0543811842fac468b2e3c3b8a4 SHA512 592ac99b75101e24babb0ab08ede530bf4cd3a31780d7da1e4d4ace04878811ab2db324c91dd962d6d9e433cd05658cc467a272d9ff3d17e2f594bfe08998b3e
-DIST c-ini-43f379396a320940d0661c15780f618f84d29348.tar.gz 14081 BLAKE2B 4d2b63eb5c068505cfddaa1511b95b1a3c646b7325e9efd55b4b5be85312081c148671e40157c757c45ab0128f0a486102267dddf1c3adbc8f91bb7da363a67a SHA512 bdc9412f2e43446f4dcc36f3447047c68f2bbd3c5b278671e3fb5b3d4a09d9724f362bc5d2fae44d5f899d0fe9978c559e3da57ec2eb36ee2d847bbf6af44014
+DIST c-ini-867f06a12a702c6869924575503877caa0adde75.tar.gz 13950 BLAKE2B 2cec6d49f7e698ee7f9514f8726c7c01dc72d2c186832122efcabeea37e082d0922be742c83f69c1ef93a820575c05dc2bb10790b41c2491e8c3719afbe5a37a SHA512 a3e82a24dc8119d90d573d87f5d92f24029490cae1564f66030f6781c95fa50c2c720378a8fbd07511007f1f53debbf62ca9ea86fdd905c42f325f28f35bd876
 DIST c-ini-f8336c98a74038a1104283fde284c5b82d6aef92.tar.gz 13957 BLAKE2B 7e0bb2d8b5cd8cdf2aefa48b9e8980327690bbc255937b12b54133014aac9473ddab517a126a0f24a2258cffc263043d643ccacb99c41bb666e4d0c18e62899e SHA512 5abba94f47f5155464e28b4f99ff147f1cd029db9b020c579508eec0f3e9d6be09462a56ed8b9320a4d8ccc0d03a8f959cdb9098fcd828c917f37e2deda90e1c
 DIST c-list-ac7c831398219acd8d63038e866035a6f86f9e21.tar.gz 9218 BLAKE2B 5821032f60a27c696b0e34e2d26250c48df19ad0d8883eb50b5a0ee6acafeb3f570b23db7b0c823ecdd47de6eb0d2d02d5aedf467283e8293e848189af8d59ae SHA512 95a3e03b0b3aefcdaaf350de0b41cdbba081716ff01bf6e2442aaf0340f0411f32f6a06d204614b59af26df921a161b4bee5f83b5145ec2cae485c9954a6709c
-DIST c-list-b1cd4dbf967d73b24dfe6cc56aaf3fdd668692e3.tar.gz 9362 BLAKE2B 04a1bca5166ad8b868ebac679e4a1c1f244bfc04ea617030a7cd9ea3765793d21cc2b1ab6c102a1e0fec65860b4d029f398ab6f9815f8fbec82608da59eb7794 SHA512 e1a852fa8e57f1fbe81f2fdc186079d6e4be9d729bb23d3d1f8450fd867dd2c04db3229fc96a80379c7199568c14df472e92a83d0925e2b2692eccc49a35b84d
 DIST c-rbtree-7624b79b26d020a796fe7c624a4f2d3340f3d66b.tar.gz 25835 BLAKE2B 080f8cc5168b40fcc87a3b21f8b8130385f6ccaafe1c229dca4b9a2e8b6294e7100784f9d2e12c336172e5eaa93645f41379e96bf85c622f0c46f27ad9dbaa65 SHA512 e231a040aedbd12309c4b57cd78fbbe931460fd0748f4a7d0f88ebbe5a0f088bdc6f473be94a5e9d9a28c0a8bf31d81a7a9669132b7eddb44a51a9a2e598cbb0
-DIST c-rbtree-fa97402c3faa18c2ddd8325eb66e2bd58a224477.tar.gz 26050 BLAKE2B 2e295550f455185eb97d1f3212d626bc7df94999fc065e814fdaa8c8d3cd14eb288f840e9cee04842cf1dc4b541a88a043d1f70eee36b77fa82f15430335372f SHA512 1fcafde26da46511dd7141280d14d96d7dd08fb7f62f71c2703c8fdb32783f9e6eac883a4adbdfb0b85139d26f89ce99291a28e789a4ec8c31e4a4560c584418
-DIST c-shquote-1d171fe52c23944c3c0be1f2603595f2488a9ff8.tar.gz 10758 BLAKE2B 1f78587e667b74cdb0dcaf82f54fc891840b75b4fff478bf315b5a45b421875ea43b07504330c35cc31c68956899d5c8e1768dcaf863ef6ece23ac56734b8479 SHA512 a0788dcbd7cdab95577564b499cca3ca1039d2b22bb05f277e84ff3868f1f80796ef26236b5aa082057169d8a9f69781f06792f9a3ae8e869d5d721931f3c882
+DIST c-rbtree-a3b1f80548d1c736208c55e9251c49ada649dd62.tar.gz 25948 BLAKE2B 82e3692fd747191fc160ae5add4e037696f9209f7ef3003bcb72def18c96a7368b5e6408d38de6c0609ef27fa6762d9323a85e0ab5d1a50d8b10cca99b2930d1 SHA512 9ab0c6062e5cfb771c4f31a9c8d82f744762d2f9acf24849bcc6f04de57e85fc0f8487ef8c8484e2e0f0baec83a3011b1425ddd183c2836f90906636f1db8d94
 DIST c-shquote-80d4252f31c74785f0ec8c4578a26f1c16d5941e.tar.gz 10639 BLAKE2B 9a0f64e0af692a0872b5f40236543e551b7eb49134fc31ca6bfcf56b36e5eba1c2445093a089bf4eaa1aa89671270b35a7cf20767377b167c1cc2cec8f72a23a SHA512 1a79cf2c7c5d3f0d901a3947e371717314b1a4015eb0182b3b670c65abf9c054f30870ec73c628d7b2519b506035be45c23267594e76bc3b7d2e6b53a38cb068
-DIST c-stdaux-d6ecce8afbb7703e1469cc5e7a59a8bd32e2d4a4.tar.gz 13142 BLAKE2B 771c79666d4758e37204aec1149186af8b1b29979ae604b335d3b5e0f78ee934c5fa97e81aa7e4cd19f8eb88f463c2f4a507b93309ae263fae827ee5138c7ac6 SHA512 c486bdddf76522e8242da46b8057a5ee9c9f5f152962a46bb50e0e2e35be5060b8b93d0b2a0d0bcd800abdf8de6e835e68d17d83dc47c6c99e7e0b2f4d91db23
+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-ffa3dcc365331e31eb0c0f73ccd258e7a29a162a.tar.gz 13000 BLAKE2B 23f5a264aa4a8c70e8562c62d4c4a3a865e5132febc9709576d4e565a72c171131c0d6292bb9d39a40cf5f3caa2dd6226a5c2e2bb763dd05c0e32e14f8a85725 SHA512 ac51a94b49db7b77c40fc3c1da74ee4a2a5fc8200f51e45d298cff2540fc7de0a348a028709562b8361f99c1978c37fac2de46941c2bd0ce31dabf80d405c042
-DIST c-utf8-1f7e2ff1164bd2161cb480532b2b34cb2074bde1.tar.gz 9462 BLAKE2B 3e1429da756f82123c3aec84c2abdf02af3e131e9004a59434bf6743173082fa4a0c6d43def625da03bf0de1b3c5cfd6f00719dcfb5baced783b3d9dbbc407e6 SHA512 4221c3d366d3cb8bd61a612fcadafbc48ae817cd4770c2710a39b5bdb916a31b8ba17ca55ccac5e54ed88ee9bbcc4a9bbb3ce5b836ccfc570db28d35816cee27
 DIST c-utf8-9017bab6cef301229e2295bdcb19476466065788.tar.gz 9332 BLAKE2B 34c97e01305b45ae0370b15d9c9e6257497fa9954889252f0344e5d2418d054bed07060b92fd22434581d9d9b8875a4771dd60db161447e7e402e75ff073daee SHA512 11b4eb7342f844bf65205e87de18ef96b685f50884d39dc0a00db2d1f99489d463b3c4a4f196e08c9a7dd39be7e0b372a27c3a666658f6e4a5e03951fb1b4596
-DIST dbus-broker-23.tar.gz 209924 BLAKE2B 44f966c04c34c4dec9916224038418203b55013f07f95331b6143aaf3e4d0a5add8e76a288627f9c6458326fabf4e9db9c235190d281c4ed01a7a325c90bcece SHA512 42bcb085e153f81d59ac8f1dccd707aa1da98d01f5299eeb2fac2f12bad3fd7aa3268a489f4e1dc827c0e3f7000f11989394047ffee3c3c4da9f50bc6d12dfac
+DIST c-utf8-af5bf7f330078d285e5f58584abd6de01c4cfd7d.tar.gz 9331 BLAKE2B 32b6da3f92e25d3971abea08f336856f44e9180e73d776058c473a8140ad519b7b614177445f4e143e56276795d04127ec8c8c01561935683227fb2c391a51cd SHA512 84ee285d90d1a899a75e1fc63931d10ff1b652bb06b19b0916afd0a3af5c359628e2ec2951ca987a8a6e6cdfbe73a286bd5a664c24e9998ada6c29f3c34752ce
 DIST dbus-broker-24.tar.gz 210347 BLAKE2B 037ccb389bf1df6dfcc600e363c604d498bff9b5e37ff10f5040acca4917fcd96c03552d769fcf87e50927bac17b8d1fe70f3ec8835c744166518791cc725d81 SHA512 81819f496dd34a43b16e1b3bcc982bb9b8574aec061fef7831b259c2649b05ed8c866795f815de9eb7aff940404811f8b235832121dfabb0672de9b76acb09d8
-EBUILD dbus-broker-23.ebuild 1823 BLAKE2B ae6df0b2f8b24395d2a48db5fda5d67d46a978581e9bf65fefb885c2bd4a8db1b3197cf82d089163943cbff9ca4b8c9442ef43055ae1c0223a917d525390b294 SHA512 240acf605d165c9ba33e031f62ace69bb63b1a2c0ecacfbdf9a0e90ab6cceb35e7f368f29aaccba4ff2221322e954f5742f3baa647eff821875f976d4e3458a3
+DIST dbus-broker-25.tar.gz 210739 BLAKE2B 6abf0a38fba3af41d95c4c1deea4c5d5b974bc1d0918d4b5ff317c08dd8e097212d966b76a76dad9674129f9babd00bd9c44d09b1d36fd25acb11298a10b0819 SHA512 bdeb0b002153234729a34f4163549f7589cb6ab03776cf6ab8956a5560fb7a6e089b4654913afd68d6c267036cd8b684e698075c06ee30aed7fb778394121a80
 EBUILD dbus-broker-24.ebuild 1830 BLAKE2B 0968973c86c3797e601f0eb7eec0f2a6b115de7523b41e1dc8c8f537f285195f04b004c8f6c9786065e5c5dce2d75904a1e90f9651458e8021c11d9cac94c09d SHA512 70d78ca26ff280f89c4370746809f0ee997d7aed053a4c0c121f8078614a523d602cb5d540517d694e8eda72fa2c743d38ba676e40c219784701f75c292f5190
+EBUILD dbus-broker-25.ebuild 1830 BLAKE2B 93e9b6dede776f524de17f52f2639b21d09e6653865ac8efd6d479508b1b3cd28e7b6b2258f357e805e3dfbed2375e7827d087fcdfa168bbda3420798fc5c286 SHA512 d78fe7188392c06107e54b70e6234b02853ef275e44099a03ac06653abf03f80282af1b24eefca2fb101969ccc46ab860c66601635c9a0c35ed1219c711dc0c0
 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-23.ebuild b/sys-apps/dbus-broker/dbus-broker-25.ebuild
index 509831015999..7cea8124d8da 100644
--- a/sys-apps/dbus-broker/dbus-broker-23.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-25.ebuild
@@ -9,16 +9,16 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
 else
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~ppc64"
 	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz"
 	declare -Ag SUBPROJECTS=(
-		[c-dvar]=9e1a5b4363aaece7169df2b2852944a1434b2df5
-		[c-ini]=43f379396a320940d0661c15780f618f84d29348
-		[c-list]=b1cd4dbf967d73b24dfe6cc56aaf3fdd668692e3
-		[c-rbtree]=fa97402c3faa18c2ddd8325eb66e2bd58a224477
-		[c-shquote]=1d171fe52c23944c3c0be1f2603595f2488a9ff8
-		[c-stdaux]=d6ecce8afbb7703e1469cc5e7a59a8bd32e2d4a4
-		[c-utf8]=1f7e2ff1164bd2161cb480532b2b34cb2074bde1
+		[c-dvar]=70f0f21e86a34577e674e202d5d09ef167102f02
+		[c-ini]=867f06a12a702c6869924575503877caa0adde75
+		[c-list]=ac7c831398219acd8d63038e866035a6f86f9e21
+		[c-rbtree]=a3b1f80548d1c736208c55e9251c49ada649dd62
+		[c-shquote]=95e4713a0de475688a5727a5d776dccbc69d3d28
+		[c-stdaux]=346623b40eb8137cae7568a69ee42253ff098ff7
+		[c-utf8]=af5bf7f330078d285e5f58584abd6de01c4cfd7d
 	)
 	for sp in "${!SUBPROJECTS[@]}"; do
 		commit=${SUBPROJECTS[${sp}]}
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 0954bdc6cc28..748a371da362 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -4,6 +4,6 @@ AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2
 AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e97339cba680f7a6f4628b71ca5660f9bc2c0efde75b9a083c08b121d186fd7900b3dea0443a7c0760 SHA512 6bc5bf619369448a221e4eb7c5af421b7610d9488f0409cf1847539b94bc2554238a8e53a60432d7ef60f9b812a3efb0b2ae2ca2544b6ed77b845ec0f5ba1a21
 DIST dbus-1.12.18.tar.gz 2094453 BLAKE2B eba48940c80a7483b858199156b297d97896232283988940d3cdb915eaa30bcdd13bc01f8410dcdb34193040a8bc8ce2dd45f1310aed791071e5dc5a6b38eb27 SHA512 817674e86a5d4cbfa705a79ca5197176311e47505c5da02334c2811f63b55014b582a12bce53bc73a08a3ad5061f210ba0d1e5f3bbf7697c81ca70c22a76fc13
 DIST dbus-1.12.20.tar.gz 2095511 BLAKE2B b467526e7e0281db7b8c7c178469fe006dab29ccb1ea197c02495bd297e8de766230b68ed86c4a7e05dbe09ca30ce941a15e0bf8030fe0df66c04febf0534b3b SHA512 0964683bc6859374cc94e42e1ec0cdb542cca67971c205fcba4352500b6c0891665b0718e7d85eb060c81cb82e3346c313892bc02384da300ddd306c7eef0056
-EBUILD dbus-1.12.18.ebuild 7240 BLAKE2B a011b8160b8f1b726494d7abce057e76dbcb4372f7e4ff32796a262af5054f7b8144bbb2edb6adb299e0127e6ec87dfb096384d7a5105f43533ed2c05405e923 SHA512 9f8a2e40db604792b55729d2f571281c5090bd65cf364381fae096fa19f88d0b444eb12cbc213aa0430d6c273d9e5b8de5aea14d0c78bad7b7cd4dde1c3253e7
-EBUILD dbus-1.12.20.ebuild 7240 BLAKE2B a011b8160b8f1b726494d7abce057e76dbcb4372f7e4ff32796a262af5054f7b8144bbb2edb6adb299e0127e6ec87dfb096384d7a5105f43533ed2c05405e923 SHA512 9f8a2e40db604792b55729d2f571281c5090bd65cf364381fae096fa19f88d0b444eb12cbc213aa0430d6c273d9e5b8de5aea14d0c78bad7b7cd4dde1c3253e7
+EBUILD dbus-1.12.18.ebuild 7247 BLAKE2B 3d1407ba0b3243fd7e2aa895e2658804acdfa5afd1628914ba63f609fd4275a5b86bbd7a120a290a2b65a5333e78f815be32b9337b95b651f9dd4ad90b0a8d47 SHA512 62dc04dd8a7327bee1411fdf9b63be1debb142d32651c169b8a8ee0a6d21913af9179df2903360fc6d56c4d31a1931c83299c161bafbc522d513d7492329df07
+EBUILD dbus-1.12.20.ebuild 7251 BLAKE2B 666b21bfa2a9c5cd217448193f7fb71bf5b65aa8c712c5d1427ac2951e0edf92e5766d49ba0cb0164a1bf85047f40d314c0d460ebc77f60954bd4abb49e8c396 SHA512 1cc873fb4437c2066ec954280a1f67980a646fcd16237a7eefd767f57e99fb30c1ef24050d6b02209d1b7e057f563a9f30a64b70f624b3127fcfeb355b8d2fca
 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738
diff --git a/sys-apps/dbus/dbus-1.12.18.ebuild b/sys-apps/dbus/dbus-1.12.18.ebuild
index dae892d4e87c..cb206f892a96 100644
--- a/sys-apps/dbus/dbus-1.12.18.ebuild
+++ b/sys-apps/dbus/dbus-1.12.18.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 
 LICENSE="|| ( AFL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc elogind kernel_linux selinux static-libs systemd test user-session X"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/dbus/dbus-1.12.20.ebuild b/sys-apps/dbus/dbus-1.12.20.ebuild
index dae892d4e87c..d6d11cb45bd1 100644
--- a/sys-apps/dbus/dbus-1.12.20.ebuild
+++ b/sys-apps/dbus/dbus-1.12.20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd virtualx multilib-minimal
 
 DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
@@ -12,7 +12,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 
 LICENSE="|| ( AFL-2.1 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc elogind kernel_linux selinux static-libs systemd test user-session X"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index a4f6d2c1615f..53d7b8e1c5fd 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,5 +1,5 @@
 DIST firejail-0.9.64.tar.xz 419464 BLAKE2B 9425910bd78739dc628a05247877f3e96065f9eab6be1fa87a70932ff04a53817e03cd67a81b35b0e5a69b5598fc5be9d6191f9c5c2bf511bc76c1edaf0eb22d SHA512 89bab9aee944ebde6221a96f0f028380f607cd49046cad5348d5974efcc92c50a172edf5e50c56606091d2060d1d8f0c50a41f05f63327672a3c3cb48eb93699
-EBUILD firejail-0.9.64-r1.ebuild 2482 BLAKE2B 3703d9d5ce29d3731c78d676a16ec3f2783be1e9a279d5097b91cde0bddfa947534f6daeb0de1248c1fad260a3b2d490866b9a62ae9ff7959f79fb82ab2f367c SHA512 99fcad32da86fbf263813f41a756027577875fd5a5836ec8211c4232aa1047d2408493410c05513aa4bbd15997fb5490d2be4f3132b5985d17042ff216ba0d54
+EBUILD firejail-0.9.64-r1.ebuild 2489 BLAKE2B 0192407f9bff829e28a8f258b809820ceed898494131e55e2e4016e6975363831c11308ad7fc9fd3a2679902b41034b863e06fe3f66f14bf713b796e2d605033 SHA512 d00daf9eb58c2c0f83ac16dc895b0659575607144c685b95ffb06c3213f46edb34ef01a94bb7b165b2ce337352662dd085126df784e66a901841a8c79d358a92
 EBUILD firejail-0.9.64.ebuild 2280 BLAKE2B 2c8f17dab51ab876796b249dec5ac848cc22606d9d5ffa806a6fdf2f1a041a2b9c33b5e41fbce69315574a5304c077f45e0b33b2fe73186806f3198a8d200a9b SHA512 30c053e6779f15d97e9a7dbb2377429e0a4b3bcc25491f647d1b66076f50f76b7cc79cebc09da8fbaa8b5454867d00153c7eceb6eaa828666ef702d2dd7104f7
 EBUILD firejail-9999.ebuild 2283 BLAKE2B a7b65c61e0954035bcbadc74fdb2e81882114f2b163b4a3c45a73017224684fb4a8ae8bbf6cd2deb3d6676a6edfe2c7797178fe992a86f4372ed56bc51b06ecc SHA512 c97f99ede18629d656520e45c4767bd76c5e4432352002e000eb78675ea28f2d8733eebd8e61f0032597f574270acbf83c176d0b982bc8ad5451ff46bb1598e2
 MISC metadata.xml 1832 BLAKE2B aec785bbd3674d6ec089390d65c064b6ce1f56c9ae459f39808a393dd478b9225821dbaad8892f22f367d5c163f40b664b29afcd130aa6463a87fe6c46ef592f SHA512 c1f8ee756c4bd7e79cfa81b4c5ac92a3377ab58a5d8df6f5535d9906d3fcb55d9f34664f2206c950b3b8ba560e3ed7e4d18b7f5637463ac8cb1934a90b2b68d4
diff --git a/sys-apps/firejail/firejail-0.9.64-r1.ebuild b/sys-apps/firejail/firejail-0.9.64-r1.ebuild
index 32dabff199ad..0cb2f6813469 100644
--- a/sys-apps/firejail/firejail-0.9.64-r1.ebuild
+++ b/sys-apps/firejail/firejail-0.9.64-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6..9} )
 inherit toolchain-funcs python-single-r1 linux-info
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	SRC_URI="https://github.com/netblue30/${PN}/releases/download/${PV}/${P}.tar.xz"
 else
 	inherit git-r3
diff --git a/sys-apps/fwts/Manifest b/sys-apps/fwts/Manifest
index 58e05e009c91..53c1621087a4 100644
--- a/sys-apps/fwts/Manifest
+++ b/sys-apps/fwts/Manifest
@@ -1,3 +1,5 @@
 DIST fwts_20.05.00.orig.tar.gz 3817917 BLAKE2B 10365979a1b6bf2768930e144baa3982d462f05b77b1ca81116f7b44b80487924f37e097e46602c49696e987d9061a1917e3613e016bdb126146d880699c38f8 SHA512 4f68f6fc8351024e877e6fa6c9b856c7c3720348c1936f33fc8b455f5e85df83c9dc39a5c2dc16e106c851d4ac622f0a1d23b70f2b7726689f92077dbca5d82f
+DIST fwts_20.11.00.orig.tar.gz 3845548 BLAKE2B 3d08bf3dd339543fc67984f5da081a4ac4a0e1b413431bb0836ec2a99130f76cd717ff61128b09e9e7c24cb275b52cd2503c34daa273c8328cee7eb2453706ea SHA512 650fa21ceb4528a6d7fa40ae44c3258e01208186328fce8ca889df2809f82abf9b966c76c99791b3f40b17e5c2efda5b15dd2def4aaf494004778337f5074b55
 EBUILD fwts-20.05.00.ebuild 1127 BLAKE2B c966a749987a9f5a23d7bb2ae3b7f506a5ace2bdab79851615d601cafd0aae20d2a845d89b064944a0c12076d6cce058604195ad266918dde1e8295eed241ede SHA512 4ce7fd15f1bd44644998be1b7d0913a6a8176bf3d76738077e1d793294b8d865aea579e386deba766b3d8080d5f2b08bf58722c6b0e950e8b990c62abf7951fb
+EBUILD fwts-20.11.00.ebuild 1160 BLAKE2B 3babb19a62e51f008dffbeec21350e6549a3857bc370e26252dcf6b9fe835723f17fd0e8cddd46b33c5ac37cfce584cc03aef2d7ab32615496a861e1d8f9152c SHA512 fb2e7c94ca9b19f36e329b7ffb9b6a4955b7eb8581cffec849e10797851e598ababfaf4dc05b3adb8ae01413cc97b66cdcc42b175a960c7595e5c4c1ad5851ba
 MISC metadata.xml 241 BLAKE2B f00f58ea265e1a7321a74a2e8a86824f7a1930a6e99162af446a1c1f831139711d626045b21215856a29e6ba4575bc38c7ab965ffb547757dbf4305235245039 SHA512 9a4d0499ef0c9cb67816755a3313bbba0b42f01b35d5d7da31dfe3e14a94fead3b8c202b95ffd4a9c5edbda7b046045b19095924b57a08cd97aacbda5bbd4550
diff --git a/sys-apps/fwts/fwts-20.11.00.ebuild b/sys-apps/fwts/fwts-20.11.00.ebuild
new file mode 100644
index 000000000000..0d5da91d7a1c
--- /dev/null
+++ b/sys-apps/fwts/fwts-20.11.00.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Firmware Test Suite"
+HOMEPAGE="https://wiki.ubuntu.com/Kernel/Reference/fwts"
+SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	>=dev-libs/json-c-0.10-r1
+	dev-libs/libbsd
+	dev-libs/libpcre
+	sys-apps/dmidecode
+	sys-apps/dtc
+	sys-apps/pciutils
+	sys-power/iasl
+	sys-power/pmtools
+	"
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+S=${WORKDIR}
+
+src_prepare() {
+	default
+	sed -i -e 's/-Wall -Werror/-Wall/' configure.ac {,src/,src/lib/src/}Makefile.am || die
+	sed -i -e 's:/usr/bin/lspci:'$(type -p lspci)':' src/lib/include/fwts_binpaths.h || die
+
+	# Fix json-c includes
+	sed -e 's/^#include <json\//#include <json-c\//g' -i \
+		configure.ac || die
+	sed -e 's/^#include <json.h>/#include <json-c\/json.h>/' \
+		-i src/lib/include/fwts_json.h \
+		src/utilities/kernelscan.c || die
+	sed -e 's/-ljson/-ljson-c/'\
+		-i src/Makefile.am\
+		src/lib/src/Makefile.am\
+		src/utilities/Makefile.am || die
+
+	eautoreconf
+}
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 4bc5042858ee..44d4200a4594 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,14 +1,10 @@
 AUX fwupd-1.3.9-logind_plugin.patch 281 BLAKE2B 237c6d6f8a43408186c6707f1c373b2600bae6ad6ef750c579b7d51023615fc7f0569011aa88e73cb72030c4112f1d26e924676bc6fd1cb9e9c9a7fef76f8800 SHA512 148a5af93d2c3554239c5529d63e5f85ed70192856ca375ce0126c183babda7d7de5cf345e875f7cd88c6cce52f409f05f1689625ea6dde14bf330c9e11d98b9
 AUX fwupd-1.4.4-help2man_var.patch 2642 BLAKE2B c0a8f9f5a79c84a1521fc85feb9cd8afbb58a44b9af69726c86d4c1720a202d1721d74a83e35bb431b2c4e6e56281249353975954a69145a80f8e8b9b0152eea SHA512 f9b72f1ca470ac2e33428e03d3287420877d20597a83bf8db21510e3ab4980a26f1832091a087888f38891be4e912cf29e1568fc67d2e604622c28303cb5701e
 AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb
-DIST fwupd-1.3.10.tar.gz 2255394 BLAKE2B 39f517b7648236f39df6f41b5950fcba45a1184f269e533facd752f8e132bb979b32a1420ce4bfcad5bb5d5546ea3f28b357603f7754267550fc02c2125642c5 SHA512 a30ef2933fc01136a9296e99a0b1b9220f952a058aa28339ff944633a8966678b374f479b3a93a1e63bd97491679d3ce304cb621f6e63b86238a8746768daac2
-DIST fwupd-1.3.11.tar.gz 2255359 BLAKE2B 0f91c32602459d31e53c63647762307cfe2313c553e16836cc646eb04e3ac54ebd53d2e8615afb7f43b8cd79b7e6315ed688ae04b57de851be62ed6065579ebf SHA512 e300a84a1c2d7e44e2a1d5d86300487783fc3990b20b540065f9899705569bee8996eae951f32b6fac559e76955ff9b661aa9b181e4dc0211a33a514613ffddd
 DIST fwupd-1.4.6.tar.gz 2368201 BLAKE2B 86f4e8a3264b69eb72a357f59db082e81534dc28822934df328b1bf94aacb7ed1a219f8e5a03a9a37a0d07c248410822a3d12c4fd6b5df3a14157795e092a095 SHA512 c456704f40e7c5a5225255dbe3e4b794819d3fa982683a31b15a81f5467f007eef00cd80dac1844eca00ebab9ae12061139ae31c1fd7e2a6e012779d2a4b59f9
-DIST fwupd-1.5.1.tar.gz 2398842 BLAKE2B dce2da9807bc28c502281a75b98b21bab8fc34778ca1ed5e43b944cec2043ced7d3b997402d904eaceeb62d139182b883dfac0f4b6228750b18f8d0c66539d4f SHA512 57fa13d0c24cf9c8ec5341dca5392e054194861885233284a5a26d7c351ccdaab5a9ac9853681258882d42d21732302324719a709ff7e713885a9977430683ce
 DIST fwupd-1.5.2.tar.gz 2416756 BLAKE2B 8b5849c3b1a0758489cdc369dfa85658a3904bb9483484aded4a4f0d3ed39f0fa819171273dabf18c62a0249f09b1058269cdb57eb3c75590242f1ba6b1a0a85 SHA512 1ea7104c95f884ba52194d3136058f685ac1ad6d705930c4bc584aa4b1902164393d8702a14ec4a6af84e8b06d778a4896e63cbe9d3266f20da31d3795fc7ca7
-EBUILD fwupd-1.3.10.ebuild 4148 BLAKE2B d05855a501dd88e13c9845b1755e940cf231a0f706d5535ee3c836e9cff42555378d8b4614eba0c1ddfd18e94294eda890f7335a6601df6aaaa0518b5fbac455 SHA512 7aca24dc171a5bac2daf1e68b8003f02534bf6c425b9f56c19cabb0a7b21c93d89a7160bf9e094822d5a8aab30f6ad8be9831cd7a1055c6ed11612d36e3d3be8
-EBUILD fwupd-1.3.11.ebuild 4150 BLAKE2B 8fd9c91985f344d898cdd16a95807c5d67d83125ca7fc2035d23ed7e1559803ca5dfa84b5f678c84e7b7c480e93e860ce3f2fa9b84d19dcb0400b80455dec0d9 SHA512 a830693d00099e0ee12aa2d9e6b0be6239958c32684c517c0ca8d118ec9faccd88c6264b86f0d704c5d0e1f9595b34b75973169ab15c4abed62242ec4481b5df
+DIST fwupd-1.5.3.tar.gz 2429886 BLAKE2B 576823f6d235ed9ce2854cd0f44b9a7dd1eace46180ce978f906becaaefabb32e93f86cc672abafc99387427d33e3ab17052e98adfba4b6cbed85c5502a7ec1b SHA512 0c98dd7ca55afeaa4c895a837fc8d6eafcc51d215cc02be659916c7a39ddaa6bc3752adddba8cd2a9c77a4eca707b6c71522645f2847330c1c2ef44910451bf3
 EBUILD fwupd-1.4.6.ebuild 4058 BLAKE2B b5741ff3e24a276de100341b9a0bb37bcc71ac958ac19c2437b3c5471212247c75d71aad74c136ad4f103daf8397be495cc01ee858d3ea25886675e3ec637a37 SHA512 c25d3f5b6f8c74937761ba587959bc39a053ad74059750ee63d13ccc098f92c8fe91b1b8cb37d0ee86220f65f05235fd403de8a3cc670035e89a97ddceb90ff1
-EBUILD fwupd-1.5.1-r1.ebuild 3970 BLAKE2B 8e4a68c32d0adf5f38f183999d3810a4426c7711b414e8f1d531beac605fc0a3a6165a6275ebb34bfe80fd6455e619bbb35a8456c07ae2037d0967efdade1fc3 SHA512 a8dfb85985376080361b405ac579f623f4dc62ac4e112b035cec445b8c8927c80a198e8d3ba3b50e77498973e2c1cf2608bf8994430ffbbd062d48d9fc5ea7b1
-EBUILD fwupd-1.5.2.ebuild 3970 BLAKE2B 8e4a68c32d0adf5f38f183999d3810a4426c7711b414e8f1d531beac605fc0a3a6165a6275ebb34bfe80fd6455e619bbb35a8456c07ae2037d0967efdade1fc3 SHA512 a8dfb85985376080361b405ac579f623f4dc62ac4e112b035cec445b8c8927c80a198e8d3ba3b50e77498973e2c1cf2608bf8994430ffbbd062d48d9fc5ea7b1
-MISC metadata.xml 1181 BLAKE2B 467c8aa0e5816a75af46609baafd0472db7d28918e91032fb56cbf97eeaef3b196698d965f3e407d843d5f2fc90efbbdfcd4bf4263cab0919c09ec0e6e48b2a9 SHA512 77fbab8ce23a4e2e3568c4b08a7299d8aeea6a3333b12be6073bfc7a17020cd4122f04f8d592b891daf06176bbdcca345c0bae322a8d6db1da096f72ec2a93e6
+EBUILD fwupd-1.5.2-r1.ebuild 4003 BLAKE2B 8bb0bb266dfdfb1f8ffa287a74516b02a03e62d1b8126ad54fb149eb1e8094ef187e00ba0f88401dc88fb8b22c3079481bcd036b77c50631bf2807b9e768ecec SHA512 411f505b510b5db1412fb53b96dab4d8bbeb0c58a66bc1910d288a7dda67288bd05945ad86f6a28975ee1739a0e2c204706eeb152776fb2bc4f567bd71276474
+EBUILD fwupd-1.5.3.ebuild 4010 BLAKE2B fedc0742777efe79ec0fb6194eff732848ff7317ce31136abaf2eb056f52821da080bed2c154751211126b6e97e95cff6b29c44ad6ea898fcf7910e6536d7a31 SHA512 f84205d02a7702cb49b9e7f5268d3fec37642ee7ff5203a17c5c31a31b536cd952e511c28aef19150c9c323ce24ee1abf93a3bb29ca25935617db5f53c558cb3
+MISC metadata.xml 1038 BLAKE2B e4c7d1ce48108981032cc875ed3512e16eb5ea81197380c42cbf828c67259ec42fa0623b12a4aca12015c2c72033e8edcfeab3a15f9970ad45886cb8b860e1a6 SHA512 0bc97498a83deb2d8ae85df1f7ed8d2191a4b9d0814f388fd32c5cd4efbdc86c5359eb9e8ba2e62561d73dd2af5537c5f6ec61862a2fd24606ac5a96c7fa30d2
diff --git a/sys-apps/fwupd/fwupd-1.3.10.ebuild b/sys-apps/fwupd/fwupd-1.3.10.ebuild
deleted file mode 100644
index a75d878756bd..000000000000
--- a/sys-apps/fwupd/fwupd-1.3.10.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="agent amt dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( elogind minimal systemd )
-	dell? ( uefi )
-	minimal? ( !introspection )
-"
-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]
-	)
-"
-CDEPEND="${PYTHON_DEPS}
-	>=app-arch/gcab-1.0
-	app-arch/libarchive:=
-	dev-db/sqlite
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/json-glib
-	dev-libs/libgpg-error
-	dev-libs/libgudev:=
-	>=dev-libs/libgusb-0.2.9[introspection?]
-	>=dev-libs/libxmlb-0.1.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?]
-	virtual/libelf:0=
-	virtual/udev
-	dell? (
-		sys-libs/efivar
-		>=sys-libs/libsmbios-2.4.0
-	)
-	elogind? ( sys-auth/elogind )
-	gpg? (
-		app-crypt/gpgme
-		dev-libs/libgpg-error
-	)
-	!minimal? (
-		>=sys-auth/polkit-0.103
-	)
-	nvme? ( sys-libs/efivar )
-	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
-	redfish? ( sys-libs/efivar )
-	systemd? ( >=sys-apps/systemd-211 )
-	tpm? ( app-crypt/tpm2-tss )
-	uefi? (
-		app-crypt/tpm2-tss
-		media-libs/fontconfig
-		media-libs/freetype
-		sys-boot/gnu-efi
-		sys-boot/efibootmgr
-		>=sys-libs/efivar-33
-		x11-libs/cairo
-	)
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
-	!<sci-chemistry/chemical-mime-data-0.1.94-r4
-	${CDEPEND}
-	sys-apps/dbus
-"
-
-DEPEND="
-	${CDEPEND}
-	x11-libs/pango[introspection]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
-	"${FILESDIR}/${PN}-1.4.4-help2man_var.patch" #728484
-)
-
-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
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dbuild="$(usex minimal standalone all)"
-		$(meson_use agent)
-		$(meson_use amt plugin_amt)
-		$(meson_use dell plugin_dell)
-		$(meson_use elogind)
-		$(meson_use gpg)
-		$(meson_use gtk-doc gtkdoc)
-		$(meson_use introspection)
-		$(meson_use man)
-		$(meson_use nvme plugin_nvme)
-		$(meson_use pkcs7)
-		$(meson_use redfish plugin_redfish)
-		$(meson_use synaptics plugin_synaptics)
-		$(meson_use systemd)
-		$(meson_use test tests)
-		$(meson_use thunderbolt plugin_thunderbolt)
-		$(meson_use tpm plugin_tpm)
-		$(meson_use uefi plugin_uefi)
-		# Requires libflashrom which our sys-apps/flashrom
-		# package does not provide
-		-Dplugin_flashrom="false"
-		# Dependencies are not available (yet?)
-		-Dplugin_modem_manager="false"
-		-Dconsolekit="false"
-	)
-	export CACHE_DIRECTORY="${T}"
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use minimal ; then
-		sed "s@%SEAT_MANAGER%@elogind@" \
-			"${FILESDIR}"/${PN}-r1 \
-			> "${T}"/${PN} || die
-		doinitd "${T}"/${PN}
-
-		if ! use systemd ; then
-			# Don't timeout when fwupd is running (#673140)
-			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
-				-i "${ED}"/etc/${PN}/daemon.conf || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "In case you are using openrc as init system"
-	elog "and you're upgrading from <fwupd-1.1.0, you"
-	elog "need to start the fwupd daemon via the openrc"
-	elog "init script that comes with this package."
-}
diff --git a/sys-apps/fwupd/fwupd-1.3.11.ebuild b/sys-apps/fwupd/fwupd-1.3.11.ebuild
deleted file mode 100644
index 378dc3009785..000000000000
--- a/sys-apps/fwupd/fwupd-1.3.11.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="agent amt dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( elogind minimal systemd )
-	dell? ( uefi )
-	minimal? ( !introspection )
-"
-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]
-	)
-"
-CDEPEND="${PYTHON_DEPS}
-	>=app-arch/gcab-1.0
-	app-arch/libarchive:=
-	dev-db/sqlite
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/json-glib
-	dev-libs/libgpg-error
-	dev-libs/libgudev:=
-	>=dev-libs/libgusb-0.2.9[introspection?]
-	>=dev-libs/libxmlb-0.1.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?]
-	virtual/libelf:0=
-	virtual/udev
-	dell? (
-		sys-libs/efivar
-		>=sys-libs/libsmbios-2.4.0
-	)
-	elogind? ( sys-auth/elogind )
-	gpg? (
-		app-crypt/gpgme
-		dev-libs/libgpg-error
-	)
-	!minimal? (
-		>=sys-auth/polkit-0.103
-	)
-	nvme? ( sys-libs/efivar )
-	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
-	redfish? ( sys-libs/efivar )
-	systemd? ( >=sys-apps/systemd-211 )
-	tpm? ( app-crypt/tpm2-tss )
-	uefi? (
-		app-crypt/tpm2-tss
-		media-libs/fontconfig
-		media-libs/freetype
-		sys-boot/gnu-efi
-		sys-boot/efibootmgr
-		>=sys-libs/efivar-33
-		x11-libs/cairo
-	)
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
-	!<sci-chemistry/chemical-mime-data-0.1.94-r4
-	${CDEPEND}
-	sys-apps/dbus
-"
-
-DEPEND="
-	${CDEPEND}
-	x11-libs/pango[introspection]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
-	"${FILESDIR}/${PN}-1.4.4-help2man_var.patch" #728484
-)
-
-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
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dbuild="$(usex minimal standalone all)"
-		$(meson_use agent)
-		$(meson_use amt plugin_amt)
-		$(meson_use dell plugin_dell)
-		$(meson_use elogind)
-		$(meson_use gpg)
-		$(meson_use gtk-doc gtkdoc)
-		$(meson_use introspection)
-		$(meson_use man)
-		$(meson_use nvme plugin_nvme)
-		$(meson_use pkcs7)
-		$(meson_use redfish plugin_redfish)
-		$(meson_use synaptics plugin_synaptics)
-		$(meson_use systemd)
-		$(meson_use test tests)
-		$(meson_use thunderbolt plugin_thunderbolt)
-		$(meson_use tpm plugin_tpm)
-		$(meson_use uefi plugin_uefi)
-		# Requires libflashrom which our sys-apps/flashrom
-		# package does not provide
-		-Dplugin_flashrom="false"
-		# Dependencies are not available (yet?)
-		-Dplugin_modem_manager="false"
-		-Dconsolekit="false"
-	)
-	export CACHE_DIRECTORY="${T}"
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use minimal ; then
-		sed "s@%SEAT_MANAGER%@elogind@" \
-			"${FILESDIR}"/${PN}-r1 \
-			> "${T}"/${PN} || die
-		doinitd "${T}"/${PN}
-
-		if ! use systemd ; then
-			# Don't timeout when fwupd is running (#673140)
-			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
-				-i "${ED}"/etc/${PN}/daemon.conf || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "In case you are using openrc as init system"
-	elog "and you're upgrading from <fwupd-1.1.0, you"
-	elog "need to start the fwupd daemon via the openrc"
-	elog "init script that comes with this package."
-}
diff --git a/sys-apps/fwupd/fwupd-1.5.2.ebuild b/sys-apps/fwupd/fwupd-1.5.2-r1.ebuild
index 9ab001c44f90..4f976f3aff6b 100644
--- a/sys-apps/fwupd/fwupd-1.5.2.ebuild
+++ b/sys-apps/fwupd/fwupd-1.5.2-r1.ebuild
@@ -52,6 +52,7 @@ CDEPEND="${PYTHON_DEPS}
 		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
 	dell? (
@@ -69,6 +70,7 @@ CDEPEND="${PYTHON_DEPS}
 		media-libs/freetype
 		sys-boot/gnu-efi
 		sys-boot/efibootmgr
+		sys-libs/efivar
 		x11-libs/cairo
 	)
 "
diff --git a/sys-apps/fwupd/fwupd-1.5.1-r1.ebuild b/sys-apps/fwupd/fwupd-1.5.3.ebuild
index 9ab001c44f90..f9dd4bc46643 100644
--- a/sys-apps/fwupd/fwupd-1.5.1-r1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.5.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="agent amt dell gtk-doc elogind flashrom minimal introspection +man nvme policykit synaptics systemd test thunderbolt tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( elogind minimal systemd )
@@ -52,6 +52,7 @@ CDEPEND="${PYTHON_DEPS}
 		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
 	dell? (
@@ -69,6 +70,7 @@ CDEPEND="${PYTHON_DEPS}
 		media-libs/freetype
 		sys-boot/gnu-efi
 		sys-boot/efibootmgr
+		sys-libs/efivar
 		x11-libs/cairo
 	)
 "
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index 757decb28e49..c4fce7423fee 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -10,10 +10,8 @@
     <flag name="amt">Build and install Intel AMT plugin</flag>
     <flag name="dell">Enable Dell-specific support.</flag>
     <flag name="flashrom">Enable flashrom plugin via <pkg>sys-apps/flashrom</pkg></flag>
-    <flag name="gpg">Enable GPG support.</flag>
     <flag name="man">Build and install man pages</flag>
     <flag name="nvme">Build and install NVMe plugin</flag>
-    <flag name="pkcs7">Enable PKCS7 verification support via <pkg>net-libs/gnutls</pkg></flag>
     <flag name="redfish">Install redfish plugin</flag>
     <flag name="synaptics">Install synaptics plugin</flag>
     <flag name="thunderbolt">Install Thunderbolt plugin</flag>
diff --git a/sys-apps/gentoo-systemd-integration/Manifest b/sys-apps/gentoo-systemd-integration/Manifest
index 55780e9f7998..77a5df3b3c8d 100644
--- a/sys-apps/gentoo-systemd-integration/Manifest
+++ b/sys-apps/gentoo-systemd-integration/Manifest
@@ -1,6 +1,6 @@
 DIST gentoo-systemd-integration-7.tar.gz 64243 BLAKE2B 389c6627af6eca9b4a0854d35751a8cb45cdb2795c7b621e96e9d5bcc13a80fe1cb109c0cb2bfd9d33f7642fd08198a0afbd5b4e5956ea6ba8dc89cf4635d9c0 SHA512 cd47caa01d73da57998b6b37d89cbeb53fa722c7f4a31bb03d03762350490cde1db3ce06090df6b6ff25c1cafb40f6c2186efbd52156ebc6d078b4a59d6fef52
 DIST gentoo-systemd-integration-8.tar.bz2 53734 BLAKE2B 711f1f6603fa40e81fe32809a32f61486ab068b1f636502ac36d58e4c204b5f0d46f51a6624f134a457f246b520614213cf45cc5397de769b315e01e32720bcf SHA512 373892ca9ae8845673f9ddad74e0be0b71af944e109adf0d2ce8e54a9c24ffff5e90cfa92e74b7abc1e7d7b1598404258b90b549697bde28a1025a2d974e991f
 EBUILD gentoo-systemd-integration-7.ebuild 794 BLAKE2B 7f33bc671174599f5a855a93522f7888f2a818a2a45f47742ed61f05f05708b976ee566625df20cfd422dd6f9f9ba4ebd21fcefd51e9bbb2059d48b542e795cc SHA512 fdef060281bf6c98ac0236a6e111bf8f36746fe80c335b4b2fec453502f903effd7ff261593a60a836beb1e333812102061165c9e1f86a340c9bf3db3729bf1c
-EBUILD gentoo-systemd-integration-8.ebuild 739 BLAKE2B 4f0e0dd931f86016bc196dc9fd53f841612b00f1960e94cdf4c19890d861980fa8fb3cf696abef6c2b9abab5faec062a6fd4b65ad4ad4b6fbed73a48becd3d74 SHA512 5abaf6ca527472ef12c7d2719c78511344cc314156f6afe6d997edd5bd75f5566df6a24e97b3253e58e0ae8c378d9eddde72cdfe4c5824f91cfc543496eb5809
+EBUILD gentoo-systemd-integration-8.ebuild 746 BLAKE2B 0c058aba4b832e547a1d46d41e3a2fe9868b0b6aa5e937776ac6a0906cc437d79e5e616fa740e2f6e8ec3d723a7258b4e5e298611afee111788b5faeca9b3e25 SHA512 d019036ef93682e70b66008893244fb268532ea7d03ec45c077278fdb5c9f548ebf59a578d798f6b8464c4880d88091d8d4d3a03f182546dd3ef5c767befaec4
 EBUILD gentoo-systemd-integration-9999.ebuild 729 BLAKE2B 24adcb67d253b61a09eee0df7ee78cbcafc01c3e60f5d114351204f456cdd4c138f5c27c311e72ef80e976458424266c2b9d979aa1c8022887e7b01936975841 SHA512 bd37d55941397bf4aefda23375d58892a480d4348548a543d5a0d5139acfba677082e4c14eb839a9e9b77952fb86dd32623e0b9f255a36cc32ad9327d32ce345
 MISC metadata.xml 355 BLAKE2B e2e7d95fe4d4f671d0b8a24bee9db8c458232ceed374b7ed902f724ca5971cebb81acc19fe62a6d53bf98cff4c7b999d3dbcf674426e46accda3d591d6009545 SHA512 b590b927b555441da6f665dbf637ffaa27651f074a62d1738959c5913f45ee648146f9054e07ade42d5f28f93cb350b43c94299a50506d01d446de22ebacdbc0
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild
index 406fc9773b03..46a294eef2ec 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc x86"
 fi
 
 inherit systemd
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index bd7917299861..a4b87963b894 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,7 +1,7 @@
 DIST grep-3.4.tar.xz 1555820 BLAKE2B 4e1924d6d5eb66faca93b405cce9784d726a476f26a384c3b44375cb09f817008aeedaa701a30b6c1f21c030902d603a80ec80105b2d5d76eadf09b910d573a7 SHA512 0f1506bd19971fbdcb47a111277ca63e8ad045456f096980852fd0a61c860f29f4b369bbaaa5cbce4b0a81718e3e3274d9a078b491f2109baa9a02ce600ee206
 DIST grep-3.5.tar.xz 1586396 BLAKE2B 62c98acb29b9998e60b64cacbe82df4f03a8d8a427a060d00283506155e6acadc4d77e8b8c2fa110227715c314ac7cde38a38eff0b92eb0ec793c59ba2562ea5 SHA512 8367aa930ecf7fa5c07153666bf7991097648bd7bf4ca672e6b14e0bb806c89991ec55d2880812877761cbde1d33562f22803835d74bfcd293c2246e274306c4
 DIST grep-3.6.tar.xz 1589412 BLAKE2B 86be3af6718ea3bf29982e1618c0ea9afc135f07e452a7ac8b618b863c0754a979482d4d418e558e703e03a4afcef7818a84ebcbe119aa63cd2892ad09e1a772 SHA512 8934544a19ded61344d83ff2cab501e86f17f8ae338892e0c36c2d2d8e63c76817840a0071ef5e3fcbca9115eba8a1aae0e4c46b024e75cd9a2e3bd05f933d90
-EBUILD grep-3.4.ebuild 1515 BLAKE2B 1ac764198529abfe48e0f4fec6973404c29ba07ed8255bbb898109ced405c2445754065c0d8959d26e831988f12341c468883550a29f45e05e91cf7e1ff9fa6b SHA512 cace0e11249a7e1d35997379f41321fcb3fbff314cfa32e81276782c133bf5fd6bfd0459fd589d7531a467ec7a8779edbe0ef17354f23d7b2596d1ccc13130fb
+EBUILD grep-3.4.ebuild 1514 BLAKE2B 6dee2bb77c82ebfd5d14bfc095811e8eba798e7ed6abf65e0a186494558a0008323535264c592486ecb78cc9c350c489f69fd56fffaf8bc8ed87e70f8e01ffaf SHA512 534e2ace6d59b2289dac04ebcbba97193c17fa8522ca395051b8a82d9ce0aa71ddd2ebb73ef5c45b016ec28f3d53e432859ef5fe48a512d602d0f2a8923b4e27
 EBUILD grep-3.5.ebuild 1516 BLAKE2B 29af64e0d4b5d7dda792e8b58dc78e20b2988f200a6c087791201cbc74f54a5b790a48ea39771cee9757355fc13015119f7f376938189ab3a5ca7c41fa701e5c SHA512 97074c1b4179c64c1584a065c65434fa48b7f4f23638bb17490abc2a501f01d2dee723d75a934d3e1fc60cd28078aea62867b349d0c2e90dd77b4c67dd725d94
 EBUILD grep-3.6.ebuild 1494 BLAKE2B a6bad3481f3cec277b4ce66d073de9ef750117d6becc72a8ec8c9dfb9323d16b5a98547c749103aa8afeb24d548ee5c1ff086aaed8186affcf823d51f01a16da SHA512 332901e74127528a3b761f7b600bd635b00cad534ded7bfd6e2ea2512307157b5a5aa9539663e0621c11543a1eebd1cb1cb8009239d169ccd31bdee421957480
 MISC metadata.xml 327 BLAKE2B 4b377e001da15ee2ba05c41866d06eb3e9833f46b6985c38adb405842fb434bdfb49d944557787f4ed68d8e7194036d298b662973c480043ac841ff628a57f53 SHA512 394c0bd736594ec5ef916f1bd0b4b1d8b5547132bb375fe04f67da49fd0cdaec184206e8255f054b8cb5656dc5426e92a51781758cc1b6373200f31bd3152d6f
diff --git a/sys-apps/grep/grep-3.4.ebuild b/sys-apps/grep/grep-3.4.ebuild
index 1ceaf434310f..29703df8e85c 100644
--- a/sys-apps/grep/grep-3.4.ebuild
+++ b/sys-apps/grep/grep-3.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls pcre static"
 
 LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index 2b406fa8fdc8..fde06c46c4d6 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -1,8 +1,10 @@
 DIST hwids-20200204.tar.gz 3495191 BLAKE2B 23075b6728d9b0e020be45729d0df4cef95cac5e912e646b612266337d1add59c87a1031e6672c5b6eb23e13c26e6299b62a5886aa25017242a86fd474c1e9ae SHA512 1d2a9baaa7ab64575a3d9b98ae4df9060cb8593ae752365296dd53b18bc5996170bbfe1c5b4b1ffc24b28e3dbaa7c321c4fa333bbf91449a6ca7b187cbe23741
 DIST hwids-20200306.tar.gz 3512152 BLAKE2B 6a6ee48598e72f97a90bff8f45aacb699218570ede5b60ed119ebae78de6cd4b92e02f96cf57c83710da699be9a7dcdfdef8d404539e04b664298874b35e54ce SHA512 eff1d2783925ca459b387fbaa5cf68a98aa4209ab8509ad92a902b4d02cc7f4a47e5506c2beed4c792d24a8ab636ad77b376a92b59ae4f605d1b5258350ff250
 DIST hwids-20200813.1.tar.gz 3680906 BLAKE2B 652cf4b05ead42a750c6f41ad78650ea8b0125f90563dec37bfa8388d021ceab12e94fd2f949b3f7b3b7c09a356d279b91e62164af2cf066cfee07ab583f8b83 SHA512 5ba15067969fa19d3218f523c1a0186568841466de4d18c563b5f09202ab7185c4df02b962f70eb6d3e99915caad8a743fc6c6349f49b666db742f9ced8053fc
+DIST hwids-20201207.tar.gz 3749352 BLAKE2B a968e6daf5686c4f73d9d900fbe80a5b3844c006102ed8801f88e378dc43c1bb66aaeced42bc2703a9c8ad624a1a7167bba485b1bf0c0d0e6043920e015c9177 SHA512 ec638edd1bbf00bd66e9baa50e3b9c9a5004a96a359e6bea306f1509c69bb3c7ede3569174007ab8bde11d49300da452b06be96136cde6bd2d84a76cff9251c2
 EBUILD hwids-20200204.ebuild 1669 BLAKE2B 8e070debcc0dcd428d49726af36a640642e699e7811706694cbfcd6f03d07251e7dcef29759eb5b9da36ff8c72a33fb50fdf365c81304b179e155b2307e73707 SHA512 d32cc90225945dc8a6f4b9dace7e99fcec8369116f1e9e04a447c6dc83ba7ada6054c5bcad706ea554b2836f1eb4d91c237a0a31123f4bed52eefdc614188dfe
 EBUILD hwids-20200306.ebuild 1678 BLAKE2B 15d252b1a9090d3b744a463c42a4d5e46c27df4c57807ae03acc5b524d4fb5f00a3e7acc01900a00eb17618d4685b606ed89abbc678c80c371fb7ff36e0b15b3 SHA512 d953589f15789952126486fb5f5eac733e33bc8c8c88e888887f7c92717efbdf8b716dc100bb7467226f8a0d762566a05ccac0ed2cf5d35e477c5d3fdaa4990e
-EBUILD hwids-20200813.1.ebuild 1678 BLAKE2B 15d252b1a9090d3b744a463c42a4d5e46c27df4c57807ae03acc5b524d4fb5f00a3e7acc01900a00eb17618d4685b606ed89abbc678c80c371fb7ff36e0b15b3 SHA512 d953589f15789952126486fb5f5eac733e33bc8c8c88e888887f7c92717efbdf8b716dc100bb7467226f8a0d762566a05ccac0ed2cf5d35e477c5d3fdaa4990e
+EBUILD hwids-20200813.1.ebuild 1669 BLAKE2B 8e070debcc0dcd428d49726af36a640642e699e7811706694cbfcd6f03d07251e7dcef29759eb5b9da36ff8c72a33fb50fdf365c81304b179e155b2307e73707 SHA512 d32cc90225945dc8a6f4b9dace7e99fcec8369116f1e9e04a447c6dc83ba7ada6054c5bcad706ea554b2836f1eb4d91c237a0a31123f4bed52eefdc614188dfe
+EBUILD hwids-20201207.ebuild 1679 BLAKE2B 6f3c0dc51d9598239348f1abfaf3f2c691b5c060dd21ab31fb79ccf4d9c240791a7ea061ae31aae201b15456459981ce1e06d15838b5dc136526c940dfc5c4d2 SHA512 f3a949dbda15206076e48d996bcbf6d9b1568a4338511dfbc05e87d6102eb5b08dffedf23cc24f06d2f9f17bc7247802e6229f01e23c5098b49b3768c0eb9c58
 EBUILD hwids-99999999.ebuild 1679 BLAKE2B 6f3c0dc51d9598239348f1abfaf3f2c691b5c060dd21ab31fb79ccf4d9c240791a7ea061ae31aae201b15456459981ce1e06d15838b5dc136526c940dfc5c4d2 SHA512 f3a949dbda15206076e48d996bcbf6d9b1568a4338511dfbc05e87d6102eb5b08dffedf23cc24f06d2f9f17bc7247802e6229f01e23c5098b49b3768c0eb9c58
 MISC metadata.xml 647 BLAKE2B 88b205060dbd1c22edb25b740b5b84d0b36e8746a8bfd5793ab385afa2afd34e54626c2b09e59dc2cf91d838ae44dea878be26cd9cab83a98054a3d0b4bfbd52 SHA512 b05dbd41c2a839d2ac8baaf8ee2352ee999d48deb123c54e048da44cccb06f64729620983848a6b16ada8af50e6fb68adf15323ff362f230b7213f485b1ec27c
diff --git a/sys-apps/hwids/hwids-20200813.1.ebuild b/sys-apps/hwids/hwids-20200813.1.ebuild
index c964e6ebfa16..13c9146d0919 100644
--- a/sys-apps/hwids/hwids-20200813.1.ebuild
+++ b/sys-apps/hwids/hwids-20200813.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 99999999 ]]; then
 	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"
+	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"
diff --git a/sys-apps/hwids/hwids-20201207.ebuild b/sys-apps/hwids/hwids-20201207.ebuild
new file mode 100644
index 000000000000..fdc4a456ddd5
--- /dev/null
+++ b/sys-apps/hwids/hwids-20201207.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2012-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit udev
+
+DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
+HOMEPAGE="https://github.com/gentoo/hwids"
+if [[ ${PV} == 99999999 ]]; then
+	PYTHON_COMPAT=( python3_{6..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 03e85cb94cc4..6d808659e2be 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -1,14 +1,6 @@
 AUX hwloc-1.8.1-gl.patch 542 BLAKE2B d0264d6ef139add1b76befd8f8b440dd6c4b994bea6187c4339eaf47b3fccfebc9598230914db17e21997f8d70c6a94dbfceaa01234a3090d68df35c4cf6f931 SHA512 1f281f338cef379963b374d7e656f90be98dfd0b0768fe12dc8e6d366b1c386c2ed50ed405d5dcd0b00c2bb57b12849a3b918712e38214fca45e2a3b1c584f33
-DIST hwloc-1.11.10.tar.bz2 4102431 BLAKE2B 4caec6f1c1a5f0b571854127cc6fd808e778b3b2bcf7ded7edfe99100ac4ccc05c893f3df0a56119234510aa5256e5da84cfa15dddb7d15e49eca2936baa7f41 SHA512 9e2cf5cc43f8c21cfd0bf09a58fda09ba832908eca5a211d164eb106f090609b6351bc934e572200530284fbfc5c460db29a49ec7974dbd298d757ed8aaf32b3
 DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f SHA512 dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138
-DIST hwloc-1.11.2.tar.bz2 4019136 BLAKE2B 29a959c48b3be347b5816333c3f9948ddafc6c4882d7c646c956ae08d72827dd4cef22da7842a034e3131e0044f9528573c6dfceb373869c326890f23651d967 SHA512 aa54b6389c303470a00dbbb3ae5f688244d0f1e0d84e661b739933ff9d86928869f2f3be04fe621cdf06c206defcd4ea1c9e8b72696f7cada9bb3243c3feba68
-DIST hwloc-2.0.4.tar.bz2 6057001 BLAKE2B 0d73c2ec544263bb36404d8112412b6b308935b9b8b4ba37cac05d8bdc525763fa862c63d387545cb0e02e1bd8f1c931e034381dede83b7119f30928f4e54bf4 SHA512 c7bb69f0e536188921138d003f3854a12f942a4f625e665d5ce6d32c1c4a884e0a91f9125de33dd292f522032b759e6240df3f3e53534033567ea0d829feefce
-DIST hwloc-2.1.0.tar.bz2 6272755 BLAKE2B 3ab13bd5cd00c4c19a1c4b1de21fb799038bd0afaa86520696478eada8d0ac11a4f4de11b96b0d92495b431f4b49ccb4185b176ad5abb9372ba6c5c9794ef21c SHA512 3fda7c4152c3f1b701c3da0fcbbe7e1dffb502042cb86e9a44ce6df8e227c005333e61d5459407f88efbd56816db0ab90b19f75d047e0c77b3b7f5c6405ea501
 DIST hwloc-2.3.0.tar.bz2 6414781 BLAKE2B 60bc80ae73d0ae9ff9a438474efe682dfff28149b843645c928d4c5531f25c7763311816d5c86028efa9e07aa86935dbb6cff56ec429ee607ce4e5b5b88d4bbe SHA512 ecb0950cd08eab7d97f7cbef9db0dc31cb5b4debedaae6f48814625ee5da0153fdc1f863fa84c5d59b76634e877a348fa556f3c8c29fc43bc6ae7211c313906c
-EBUILD hwloc-1.11.10.ebuild 2170 BLAKE2B 60cdea9ee071aa1610a48085e9b6dcb2f38a8cd473095df9d6db3d804f8d84a82e5d576d90687c09a224274999e652bff2e153b513c948bd83f4be11ad6512df SHA512 bf49f0c3c7d95de2ff4d707655e87f13b64848e19f5db9f46eaa0f015c13dd9272c357fad4bffb220eed964f439fd655b43a21e2ca731a49dd9ce7ed4b6988a4
-EBUILD hwloc-1.11.13.ebuild 2143 BLAKE2B ae73d12b60c54e7160e789cb72e3cf939135dad7f22b17443e6093b58c6bc8dfe2f27df7bdcca4cbe70e58ff965c8d0860fea2a81461eaf485e1bff08e0a2240 SHA512 41bd54a082baf04b224abffaf420af5760da2d1eeea68968bc21715c70537ab67e9d1de937435e57e4d7f9bfd817a596377e888d0985949988d90e659e3479dc
-EBUILD hwloc-1.11.2-r1.ebuild 2115 BLAKE2B d79a58930fc0bc95065af6d3f2344ae2678f61e87d962668400a00f7118697e13e49d58c8a48215518af17dd477c282ea9551ad5d31d6f17e329e7006cb050d6 SHA512 775dc6c380f2bd41ef012abd1fb7efbe486f6e7489d08cdda3e79da3d640248950349120d699b19651d60eeb61dd05ca4a0a9a3e8c76535746a6390064eedc2b
-EBUILD hwloc-2.0.4.ebuild 2022 BLAKE2B 81e1daf91440f2cff13e3301915b0a2069396b98ff5ba33a06ea418d07ae606e0b6de85632e356a81b142978143d22e1fe11fb9d33343cf6da99d551d116d286 SHA512 bcbb4c5e522983c39ede9b6ee5723d359118a599a2b2c22351d80d59fbe67987a592a82d04513ac5e78e37847187dbc20bd903ddd94204c60bf0de8a9b733f77
-EBUILD hwloc-2.1.0.ebuild 2399 BLAKE2B 962fac7338357c0a66e239f0ceb05f7906cdc2dddd459f48191cd998c2d79f2666a5f1356443fb4d13922e5448c7ebb70f2b498e98a80a30fb931ccda946d9dc SHA512 62575ccd7482649ac50f78b6bddfe19016d8f7387d8f3de603f374e7cdef29d7babc2066be26c5386c5f2f7b91fddae22ebaca17aca9c7758991dafd49192bb1
+EBUILD hwloc-1.11.13.ebuild 2164 BLAKE2B fec193bcca00e0faa20fd1657fcade820d344e22cf15135c97be96451608399b08baf5b0f3c83f11a10afca2c8482ea75686e773fcd3de16de525f472dbd1f14 SHA512 e93fa48c8c3bcb39dce5d0a900e5b340c9f571110a76a220dd6d3a59f7256ad3d81cd8fc2815ac3e1907cd3a64f12412c3f3ac95c190882ead46a6003b43eb97
 EBUILD hwloc-2.3.0.ebuild 2924 BLAKE2B e3606ad4868f9efe244c7766c4a91ed373a51eebd37ceb97f4570796c38e9b5586341d9c3237030c77a1a7ac9ce31828084065bb58ff7e2c9368aa87f738a919 SHA512 78152bd3110ab168dcb067c875e8161001cdfc47825baa224fa6f3ba9dd5147d424bdc8e11dc14c3d9780577adaaff01573f2a171696330f645d626dc7becfea
 MISC metadata.xml 1758 BLAKE2B ba3810fe4f1739add73deff3e6557d5a4c8efae8ab855c587f506c3079b97a1eae245ab7c3fab984540b5bd2e8be4e72fa2e3a33fa1dbb8be296dd2ed5ec1d30 SHA512 bff4e0dbac83c2c1a1e01ad284936f56f79580f3c1dde11bbe75276dd6dda13490cbfad6183b7ad6a4962a4875488a291f090e8e05816973836fce5c257dae8a
diff --git a/sys-apps/hwloc/hwloc-1.11.10.ebuild b/sys-apps/hwloc/hwloc-1.11.10.ebuild
deleted file mode 100644
index c3630b9ccaa1..000000000000
--- a/sys-apps/hwloc/hwloc-1.11.10.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools cuda flag-o-matic toolchain-funcs versionator multilib-minimal
-
-MY_PV=v$(get_version_component_range 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/5"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
-
-# opencl support dropped with x11-drivers/ati-drivers being removed (#582406).
-# Anyone with hardware is welcome to step up and help test to get it re-added.
-
-# dev-util/nvidia-cuda-toolkit is always multilib
-
-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] )
-	pci? (
-		>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
-		>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
-	)
-	plugins? ( dev-libs/libltdl:0[${MULTILIB_USEDEP}] )
-	numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )
-	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	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"${EPREFIX}"/opt/cuda/include
-		append-cppflags -I"${EPREFIX}"/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"${EPREFIX}"/opt/cuda/$(get_libdir)
-	fi
-
-	ECONF_SOURCE=${S} econf \
-		$(use_enable static-libs static) \
-		$(use_enable cairo) \
-		$(multilib_native_use_enable cuda) \
-		$(use_enable debug) \
-		$(multilib_native_use_enable gl) \
-		$(use_enable pci) \
-		$(use_enable plugins) \
-		$(use_enable numa libnuma) \
-		$(use_enable xml libxml2) \
-		$(use_with X x)
-}
diff --git a/sys-apps/hwloc/hwloc-1.11.13.ebuild b/sys-apps/hwloc/hwloc-1.11.13.ebuild
index ad6e57460544..8417f7fabee4 100644
--- a/sys-apps/hwloc/hwloc-1.11.13.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.13.ebuild
@@ -57,6 +57,7 @@ multilib_src_configure() {
 	fi
 
 	ECONF_SOURCE=${S} econf \
+		--disable-opencl \
 		$(use_enable static-libs static) \
 		$(use_enable cairo) \
 		$(multilib_native_use_enable cuda) \
diff --git a/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild b/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
deleted file mode 100644
index a447cda89521..000000000000
--- a/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic cuda autotools-multilib multilib toolchain-funcs versionator
-
-MY_PV=v$(get_version_component_range 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/5"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
-
-# opencl support dropped with x11-drivers/ati-drivers being removed (#582406).
-# Anyone with hardware is welcome to step up and help test to get it re-added.
-
-# dev-util/nvidia-cuda-toolkit is always multilib
-
-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] )
-	pci? (
-		>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
-		>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
-	)
-	plugins? ( dev-libs/libltdl:0[${MULTILIB_USEDEP}] )
-	numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )
-	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README VERSION )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.1-gl.patch"
-)
-AUTOTOOLS_AUTORECONF=1
-
-src_prepare() {
-	if use cuda ; then
-		append-cflags -I/opt/cuda/include
-		append-cppflags -I/opt/cuda/include
-	fi
-	autotools-utils_src_prepare
-}
-
-multilib_src_configure() {
-	export HWLOC_PKG_CONFIG=$(tc-getPKG_CONFIG) #393467
-	use cuda && local LDFLAGS="${LDFLAGS} -L/opt/cuda/$(get_libdir)"
-	local myeconfargs=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable cairo)
-		$(use_enable cuda)
-		$(use_enable debug)
-		$(multilib_native_use_enable gl)
-		$(use_enable pci)
-		$(use_enable plugins)
-		$(use_enable numa libnuma)
-		$(use_enable xml libxml2)
-		$(use_with X x)
-	)
-	autotools-utils_src_configure
-}
diff --git a/sys-apps/hwloc/hwloc-2.0.4.ebuild b/sys-apps/hwloc/hwloc-2.0.4.ebuild
deleted file mode 100644
index c412bfedcf48..000000000000
--- a/sys-apps/hwloc/hwloc-2.0.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=6
-
-inherit autotools cuda flag-o-matic eapi7-ver multilib-minimal toolchain-funcs
-
-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 cuda debug gl +pci plugins svg static-libs 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] )
-	pci? (
-		>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
-		>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
-	)
-	plugins? ( dev-libs/libltdl:0[${MULTILIB_USEDEP}] )
-	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	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"${EPREFIX}"/opt/cuda/include
-		append-cppflags -I"${EPREFIX}"/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"${EPREFIX}"/opt/cuda/$(get_libdir)
-	fi
-
-	ECONF_SOURCE=${S} econf \
-		--disable-opencl \
-		$(use_enable static-libs static) \
-		$(use_enable cairo) \
-		$(multilib_native_use_enable cuda) \
-		$(use_enable debug) \
-		$(multilib_native_use_enable gl) \
-		$(use_enable pci) \
-		$(use_enable plugins) \
-		$(use_enable xml libxml2) \
-		$(use_with X x)
-}
diff --git a/sys-apps/hwloc/hwloc-2.1.0.ebuild b/sys-apps/hwloc/hwloc-2.1.0.ebuild
deleted file mode 100644
index d996e67548ae..000000000000
--- a/sys-apps/hwloc/hwloc-2.1.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools 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 libudev netloc nvml +pci plugins static-libs svg 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] )
-	libudev?	( virtual/libudev )
-	netloc?		( !sys-apps/netloc )
-	pci?		(
-				>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
-				>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
-			)
-	plugins?	( dev-libs/libltdl:0[${MULTILIB_USEDEP}] )
-	xml?		( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	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${EPREFIX}/opt/cuda/include"
-		append-cppflags "-I${EPREFIX}/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${EPREFIX}/opt/cuda/$(get_libdir)"
-	fi
-
-	local myconf=(
-		--disable-opencl
-		--enable-shared
-		$(multilib_native_use_enable cuda)
-		$(multilib_native_use_enable gl)
-		$(use_enable cairo)
-		$(use_enable cpuid)
-		$(use_enable debug)
-		$(use_enable libudev)
-		$(use_enable netloc)
-		$(use_enable nvml)
-		$(use_enable pci)
-		$(use_enable plugins)
-		$(use_enable static-libs static)
-		$(use_enable xml libxml2)
-		$(use_with X x)
-	)
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install_all() {
-	default
-	systemd_dounit "${ED}/usr/share/hwloc/hwloc-dump-hwdata.service"
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sys-apps/inxi/Manifest b/sys-apps/inxi/Manifest
index 6511454a50b1..4e9029b10473 100644
--- a/sys-apps/inxi/Manifest
+++ b/sys-apps/inxi/Manifest
@@ -7,5 +7,5 @@ EBUILD inxi-3.0.33.1.ebuild 812 BLAKE2B 45822e1ef6a20bf7680aa2b271ce51b7188bf36f
 EBUILD inxi-3.0.34.1.ebuild 940 BLAKE2B a0df1d5c79accdfa98e336565fcd56b617fdac1f3620db6eb37656641eec27994152b9c69c857b2ffd0400d11e8ad564f3605ba6c80cb8aea2f82870b0f5c11e SHA512 9db372af1f597c3ecd81d2a2c17094931ea0c634b0adaf88973ce8cee5bf272ae870219a83252eb0e8c325f562ba60900d512e94043ee7b3f71c1e79487df597
 EBUILD inxi-3.0.36.1.ebuild 940 BLAKE2B a0df1d5c79accdfa98e336565fcd56b617fdac1f3620db6eb37656641eec27994152b9c69c857b2ffd0400d11e8ad564f3605ba6c80cb8aea2f82870b0f5c11e SHA512 9db372af1f597c3ecd81d2a2c17094931ea0c634b0adaf88973ce8cee5bf272ae870219a83252eb0e8c325f562ba60900d512e94043ee7b3f71c1e79487df597
 EBUILD inxi-3.0.38.1.ebuild 940 BLAKE2B f2f06922cb8611498da30d4db171dd501ae8683eba8ab713a74c02f6f7436fa9932a38562474d3f546649bc04e81392658bd8c7ad9fe945f0c246b5aedf51454 SHA512 866ea34a2b6434afb6eed6fac2ae246c7b10d9d2d3dfac5fbcec911c57fd44ed2d5eeedc440a1a59dc488127aad0e2c89a104a7c56e0317743d3d79eb666d631
-EBUILD inxi-3.1.06.1.ebuild 812 BLAKE2B 0c38afc8334a4156fd717220bb647dba7912f4830d06b18338b665de33428225dacfbc86544d392cf9ffa100dc2e3353f9566bb807df56ad9c80cf2ff32f7cb2 SHA512 b51a09d8257c6916e34c89e0be713d5f33413da7b451b588c9796cb9e3e3578d9421c803e0293a2e27b4eae013e4bd96d79fdb8f9bfbac0e782e818a7e134ee1
+EBUILD inxi-3.1.06.1.ebuild 808 BLAKE2B c6b90979be89e0504d54d3e328ad2aedd02646bbee4453b22faf4cae26e890bcdc4f91ce1cff729feda30918e230fdc9ea8ca7b6ba078837cc30d8913b4c272c SHA512 5f4b797f3a186cde897adb0e09293e1f4a01356924e0d6a767b3358db938a575f83b39b74c78dbdc9b6a11b0a9ba3782844ccffbe597a67e8941983745215ec2
 MISC metadata.xml 612 BLAKE2B e09803ea44365da79b2cec697d9800d5fcabf1e55f9ae8818fe8dad0657ac9c6e0dae7d1943d93c2a1609f84d71b8d27479a1ba72455ea5a15c3d48bb575b875 SHA512 a6b52b63caef73e7028a9d03f1bda2cc6ab24d492f41f2fe6ccc9f254dfa8e0f611ff7d08ec4f111b44dd96d6dcc8f647bda4777d53603f788c7f599ecc5dc05
diff --git a/sys-apps/inxi/inxi-3.1.06.1.ebuild b/sys-apps/inxi/inxi-3.1.06.1.ebuild
index 9f446bf4dc90..a1906c34d77e 100644
--- a/sys-apps/inxi/inxi-3.1.06.1.ebuild
+++ b/sys-apps/inxi/inxi-3.1.06.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/smxi/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm ppc ppc64 x86"
 IUSE="bluetooth hddtemp opengl"
 
 DEPEND=""
diff --git a/sys-apps/likwid/Manifest b/sys-apps/likwid/Manifest
index 9268a4bcabea..a89e8d933ac0 100644
--- a/sys-apps/likwid/Manifest
+++ b/sys-apps/likwid/Manifest
@@ -1,6 +1,4 @@
 AUX likwid-4.3.1-fix-gnustack.patch 1014 BLAKE2B 68ac831c96f826156238bbb4178c4923cb869a2757928af12f788a01067fb129326fec0c7a98b073f504f0aa8234d42dcd9fe7cdb0185b8107a6db3962cfbc08 SHA512 ab12e2ebebfca5c87b1ad2c89c5073aaa6987e8d440cfdfffc107233fc5b66c6562f25fdbd6720df3c1477becaaa3c3ac470fa4f99ac15bb78ea09fa06460a4b
-DIST likwid-4.3.3.tar.gz 1579433 BLAKE2B 9ec468bba009dec860b24c9c55c3d6023ffda3ab0985d835796686ba52d1d3372b2bfce926cf229388978de34e1ab0b41d8d27c88623c51c3e8ff1e9d674906b SHA512 ae4d68e238bc40e4a4ab5df628561c9bb7a0ef8727d5779dba2c32fff0be1dd333532bee7e4c197e5fe286de81d35b863ef09f4bc8b9f9145360e6e461f3d94e
 DIST likwid-4.3.4.tar.gz 1584829 BLAKE2B dcd1c3a0c5e549dc3d22bb98120339521e270da55460f5af9f2fe04849af0fe1ac4d9b881883a4efc3695ceb087d1afad5bcc55b55543199d2c33b0f5012cc68 SHA512 f1ee930a98d160728078a81a2cdc798ec62ac484545ced937131e6a6443e5ac23b8e597d31c7b1b9f67c1169e1c662c366cf1098158cb467d9f7ff12946b08a2
-EBUILD likwid-4.3.3.ebuild 5524 BLAKE2B f1f755a47c7ecd2f8f549dcb264f22fa11641038c50b8e0aaea538145c724e92b8b0d86066441240aba2c961a5aa897963457797a480dbbbfacdcf9847d01a05 SHA512 fbd78dcadcf4e66b3e4b37b7fa4345d7c52ebdc10fcb340f2dad878889b836ba6b19090b3d17c96ff9dcdc6e3f72092de8141a6ffb7bb8be217dec45de0bb950
-EBUILD likwid-4.3.4.ebuild 5524 BLAKE2B f1f755a47c7ecd2f8f549dcb264f22fa11641038c50b8e0aaea538145c724e92b8b0d86066441240aba2c961a5aa897963457797a480dbbbfacdcf9847d01a05 SHA512 fbd78dcadcf4e66b3e4b37b7fa4345d7c52ebdc10fcb340f2dad878889b836ba6b19090b3d17c96ff9dcdc6e3f72092de8141a6ffb7bb8be217dec45de0bb950
+EBUILD likwid-4.3.4.ebuild 5514 BLAKE2B c7bdc0310f21b8985128bc6006f57a3bfa3746783a8bbdd6187a7569ad4ea74580a67ee6a250e0aa73960adf01066d0428a75b21479011c23a79bec54eaa4d8c SHA512 b9a511141568693eb960a4837914e8357dc814280b58e062286ba6472aedadca86e9f6cbaab89320a456df99a2edf1c61ee3978411d2d38f78690aba93160914
 MISC metadata.xml 333 BLAKE2B bb0321ece26d2e67d8c0cce9895247e8dcb84d72ca1b0186f066e639805e4006d9a8288403042c6fd96fd02489b554eb208843eafe436140f6e352121e5b1806 SHA512 bc44f5e8d86426c7fc32dc2d75c42d85a456c69cacccc1f44dbb8c561defb1748dd665fcc916d3a6577766a3d7bbd0944fa73f7df04b2d17b3fd3353929fa2e2
diff --git a/sys-apps/likwid/likwid-4.3.3.ebuild b/sys-apps/likwid/likwid-4.3.3.ebuild
deleted file mode 100644
index 02a836a19c6d..000000000000
--- a/sys-apps/likwid/likwid-4.3.3.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-FORTRAN_NEEDED=fortran
-#PYTHON_COMPAT=( python3_{6,7} )
-
-# 4.3.4 will need python-single-r1
-inherit fcaps fortran-2 linux-info toolchain-funcs
-
-DESCRIPTION="A performance-oriented tool suite for x86 multicore environments"
-HOMEPAGE="https://github.com/rrze-likwid/likwid"
-SRC_URI="https://ftp.fau.de/pub/likwid/${P}.tar.gz"
-
-# If this ebuild is changed to use the bundled Lua-5.3, then MIT should be
-# added to the LICENSE field.
-LICENSE="GPL-3+ BSD"
-
-SLOT="0"
-KEYWORDS="~amd64" # upstream partial support exists for x86 arm arm64
-IUSE="fortran" # ${PYTHON_REQUIRED_USE}
-
-# lua:
-# likwid's primary functionality is driven by a set of lua scripts installed in
-# /usr/bin/
-# likwid bundles lua-5.3.2, AND supports using a system copy of lua-5.2 or
-# lua-5.3, which we use. This ebuild uses the system copy of Lua instead.
-#
-# hwloc:
-# likwid bundles a MODIFIED copy of hwloc-2.0.0a1 with specific configuration
-# for CPU probing & access
-#
-# Perl:
-# likwid uses Perl to convert from an internal text format to ASM listings
-# likwid also uses perl for some installed helper scripts
-# The build system bundles some Perl modules, that are not removed at this time:
-# Parse-RecDescent
-# Template
-#
-# Python:
-# Python3 is used for one helper script, filter/json, added after 4.3.3
-CDEPEND="dev-lang/perl
-	dev-lang/lua:5.3"
-
-# filter/json uses Python3
-RDEPEND="${CDEPEND}"
-	#${PYTHON_DEPS}"
-
-# Part of the build process depends on Data::Dumper
-#	perl-core/Data-Dumper"
-DEPEND="${CDEPEND}"
-
-CONFIG_CHECK="~X86_MSR"
-
-FILECAPS=(
-	-M 755 cap_sys_rawio+ep usr/sbin/likwid-accessD
-	--
-	-M 755 cap_sys_rawio+ep usr/sbin/likwid-setFreq
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.3.1-fix-gnustack.patch"
-	# Old patches are obsolete:
-	#"${FILESDIR}/${PN}-4.3.1-Makefile.patch"
-	#"${FILESDIR}/${PN}-4.3.1-config.mk.patch"
-)
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	#python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Ensure we build with a non executable stack
-	sed \
-		-e '/^SHARED_CFLAGS/s/$/ -Wa,--noexecstack/' \
-		-i make/include_{GCC*,CLANG}.mk \
-		|| die "Failed to set nonexecstack"
-
-	# Make the install targets respect Q= for being quiet or not
-	# MUCH easier for debugging
-	sed -r \
-		-e '/^install/,/^[a-z]/{/^\t@/{ s/@/$(Q)/; }}' \
-		-i \
-		Makefile || die "Failed to sed Makefile"
-
-	sed -i \
-		-e '/^\.NOTPARALLEL:/d' \
-		Makefile \
-		bench/Makefile \
-		ext/hwloc/Makefile || die "Failed to re-enable parallel"
-
-	default
-}
-
-export_emake_opts() {
-	# Warning: this build system uses PREFIX in a way that differs from
-	# autoconf! It's more like:
-	# PREFIX=$(DESTDIR)$(INSTALLED_PREFIX)
-	# it's not 100% like that, because parts of the Makefiles are inconsistent.
-	# this is the same solution used in the upstream RPM specs
-	# these variables are uppercase so they match what's put into Make.
-	local INSTALLED_PREFIX=/usr
-	local INSTALLED_LIBPREFIX=/usr/$(get_libdir) # upstream is '$(INSTALLED_PREFIX)/lib'
-	local INSTALLED_MANPREFIX=/usr/share/man # upstream has it as used but undefined variable.
-	# TODO: support LUA_SINGLE_TARGET here later for Lua 5.2
-	local LUASLOT='5.3'
-	# If the build is too loud, pass 'Q=@'
-	src_compile_opts=(
-		"Q="
-		"INSTALLED_PREFIX=${INSTALLED_PREFIX}"
-		"INSTALLED_LIBPREFIX=${INSTALLED_LIBPREFIX}"
-		"INSTALLED_MANPREFIX=${INSTALLED_MANPREFIX}"
-		"PREFIX=${INSTALLED_PREFIX}"
-		"LIBPREFIX=${INSTALLED_LIBPREFIX}"
-		"MANPREFIX=${INSTALLED_MANPREFIX}"
-		"CC=$(tc-getCC)"
-		"ANSI_CFLAGS=${CFLAGS}"
-		"INSTRUMENT_BENCH=true"
-		"LUA_INCLUDE_DIR=/usr/include/lua${LUASLOT}"
-		"LUA_LIB_DIR=/usr/$(get_libdir)"
-		"LUA_LIB_NAME=lua${LUASLOT}"
-		"LUA_BIN=/usr/bin"
-		"FORTRAN_INTERFACE=$(usex fortran likwid.mod false)"
-		"FC=$(usex fortran "${FC}" false)"
-		"FCFLAGS=-J ./ -fsyntax-only" # needed for building correctly
-	)
-	src_install_opts=(
-		"PREFIX=${D}${INSTALLED_PREFIX}"
-		"LIBPREFIX=${D}${INSTALLED_LIBPREFIX}"
-		"MANPREFIX=${D}${INSTALLED_MANPREFIX}"
-	)
-}
-
-src_compile() {
-	export_emake_opts
-	emake \
-		"${src_compile_opts[@]}"
-}
-
-src_install() {
-	export_emake_opts
-	emake \
-		"${src_compile_opts[@]}" \
-		"${src_install_opts[@]}" \
-		DESTDIR="${D}" \
-		install
-
-	use fortran && doheader likwid.mod
-
-	# Fix Python filter added shortly after 4.3.3
-	#python_fix_shebang "${D}"/usr/share/likwid/filter/
-
-	# Do NOT use 'doman'! The upstream 'make install' target does a sed as it's
-	# generating the final manpage to the real install dir; and the copies in
-	# ${S} are unmodified.
-	dodoc README.md CHANGELOG doc/logo.png
-	dodoc doc/*.txt
-	dodoc doc/*.md
-	dodoc -r doc/applications doc/archs
-	# Fix upstream partial doc install
-	rm -rf "${D}"/usr/share/likwid/docs || die
-	ln -sf "/usr/share/doc/${PF}" "${D}"/usr/share/likwid/docs || die
-}
-
-pkg_preinst() {
-	# This is now a symlink, but used to be a plain directory
-	OLDDOCDIR=/usr/share/likwid/docs
-	if [[ ! -L "${OLDDOCDIR}" && -d "${OLDDOCDIR}" ]]; then
-		einfo "Cleaning up old docdir at ${OLDDOCDIR}"
-		rm -rf "${OLDDOCDIR}" || die
-	fi
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-	einfo "If you get 'Cannot gather values from MSR_PLATFORM_INFO', then 'modprobe msr'!"
-	einfo
-	ewarn "To enable users to access performance counters it is necessary to"
-	ewarn "change the access permissions to /dev/cpu/msr[0]* devices."
-	ewarn "It can be accomplished by adding the following line to file"
-	ewarn "/etc/udev/rules.d/99-myrules.rules: KERNEL==\"msr[0-9]*\" MODE=\"0666\""
-	ewarn "Alternatively, assign the MSR files to a unique group and use mode 0660"
-}
diff --git a/sys-apps/likwid/likwid-4.3.4.ebuild b/sys-apps/likwid/likwid-4.3.4.ebuild
index 02a836a19c6d..914ca442fe63 100644
--- a/sys-apps/likwid/likwid-4.3.4.ebuild
+++ b/sys-apps/likwid/likwid-4.3.4.ebuild
@@ -1,31 +1,32 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 FORTRAN_NEEDED=fortran
+LUA_COMPAT=( lua5-{2..3} )
 #PYTHON_COMPAT=( python3_{6,7} )
 
 # 4.3.4 will need python-single-r1
-inherit fcaps fortran-2 linux-info toolchain-funcs
+inherit fcaps fortran-2 linux-info lua-single toolchain-funcs
 
 DESCRIPTION="A performance-oriented tool suite for x86 multicore environments"
 HOMEPAGE="https://github.com/rrze-likwid/likwid"
 SRC_URI="https://ftp.fau.de/pub/likwid/${P}.tar.gz"
 
-# If this ebuild is changed to use the bundled Lua-5.3, then MIT should be
-# added to the LICENSE field.
 LICENSE="GPL-3+ BSD"
 
 SLOT="0"
 KEYWORDS="~amd64" # upstream partial support exists for x86 arm arm64
-IUSE="fortran" # ${PYTHON_REQUIRED_USE}
+IUSE="fortran"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}" # ${PYTHON_REQUIRED_USE}
 
 # lua:
 # likwid's primary functionality is driven by a set of lua scripts installed in
 # /usr/bin/
 # likwid bundles lua-5.3.2, AND supports using a system copy of lua-5.2 or
-# lua-5.3, which we use. This ebuild uses the system copy of Lua instead.
+# lua-5.3.
 #
 # hwloc:
 # likwid bundles a MODIFIED copy of hwloc-2.0.0a1 with specific configuration
@@ -41,7 +42,7 @@ IUSE="fortran" # ${PYTHON_REQUIRED_USE}
 # Python:
 # Python3 is used for one helper script, filter/json, added after 4.3.3
 CDEPEND="dev-lang/perl
-	dev-lang/lua:5.3"
+	${LUA_DEPS}"
 
 # filter/json uses Python3
 RDEPEND="${CDEPEND}"
@@ -68,6 +69,7 @@ PATCHES=(
 
 pkg_setup() {
 	fortran-2_pkg_setup
+	lua-single_pkg_setup
 	#python-single-r1_pkg_setup
 }
 
@@ -104,8 +106,8 @@ export_emake_opts() {
 	local INSTALLED_PREFIX=/usr
 	local INSTALLED_LIBPREFIX=/usr/$(get_libdir) # upstream is '$(INSTALLED_PREFIX)/lib'
 	local INSTALLED_MANPREFIX=/usr/share/man # upstream has it as used but undefined variable.
-	# TODO: support LUA_SINGLE_TARGET here later for Lua 5.2
-	local LUASLOT='5.3'
+	# WARNING: setting LUA_LIB_NAME=${ELUA} does *not* work with LuaJIT, keep this on mind
+	# should likwid upstream ever begin to support it.
 	# If the build is too loud, pass 'Q=@'
 	src_compile_opts=(
 		"Q="
@@ -118,9 +120,9 @@ export_emake_opts() {
 		"CC=$(tc-getCC)"
 		"ANSI_CFLAGS=${CFLAGS}"
 		"INSTRUMENT_BENCH=true"
-		"LUA_INCLUDE_DIR=/usr/include/lua${LUASLOT}"
-		"LUA_LIB_DIR=/usr/$(get_libdir)"
-		"LUA_LIB_NAME=lua${LUASLOT}"
+		"LUA_INCLUDE_DIR=$(lua_get_include_dir)"
+		"LUA_LIB_DIR=$(dirname "$(lua_get_shared_lib)")"
+		"LUA_LIB_NAME=${ELUA}"
 		"LUA_BIN=/usr/bin"
 		"FORTRAN_INTERFACE=$(usex fortran likwid.mod false)"
 		"FC=$(usex fortran "${FC}" false)"
diff --git a/sys-apps/mcstrans/Manifest b/sys-apps/mcstrans/Manifest
index 434831b493d3..244ede6423fc 100644
--- a/sys-apps/mcstrans/Manifest
+++ b/sys-apps/mcstrans/Manifest
@@ -4,6 +4,6 @@ DIST mcstrans-3.0.tar.gz 44570 BLAKE2B 82358f6564e42ebfa50647892b35e4788ff9b8636
 DIST mcstrans-3.1.tar.gz 44598 BLAKE2B 1755c2f56e3d40fa2ea95c349988fe5dd7b52a9f26bef0f42e42bda8f7b94993b9a47d2e333337f746cbabd9dd571118b0a8e1ffb7c22c604db58fc809bcc033 SHA512 21e9b7a8c9d98cbee61f2eb1c440a51d19ac111a5955c24d365a8784e1aa34fb47a22a108e550c8a4cde4f25ec5afc466126a68e9faedfc796bef83eada93b60
 EBUILD mcstrans-2.9.ebuild 1112 BLAKE2B 28e4b4e11895e7ddc472808e950074ecf831e96fccfb72528b6d946498b96163a0472409cbe1bb6232a84890f95595fede1866a7bf87b5357dc664b1c887f99e SHA512 50d08031a4443b91d3819ab7e49e1e8fbc2dd28bf5fa612d65e080572e732c1832ae2ff173f46b6183d7758b2ae5efe8eebd883c6a8d128170e9ebbfce5f41b0
 EBUILD mcstrans-3.0.ebuild 1112 BLAKE2B 098b5e20768fd54d2a3baaa4dedc56a58cfc36b764c0c8825206c8d10f4b885044d8c4d45abf9339218eaa8fde566a73d03c3f54c245d10aaa667ca25abc740a SHA512 b1a3d390c8f5ef1be73040ad7c4c18f38739d46d1cafd721bb56de422bbca404c686b4172300ee5ac72224c58b0e8c338a0a05b6c7be71fbffcf5ae43f50c774
-EBUILD mcstrans-3.1.ebuild 1078 BLAKE2B 1862d557c4f0cf0269328357aa068ebfae379e920e31eeffbd1341191ba0bb08e780da0367f9123d82b6260b7c92a8541b03e02a7e8962ebdf788f56573b7ed7 SHA512 575049fa3e79bb24ca551182a110832463025a56a29f69b1239fbe02e20eb36a0a467d24ccce9daa2465273391c8d5eb68b538bb9cfd3a28e6966ae8a8d59654
+EBUILD mcstrans-3.1.ebuild 1076 BLAKE2B 95420d079ff83b4a3e4aa7655932d1ded963f53e01e4cefad6b49613f882458c3ac9ec4a9f0771f314e32d341cad58e5684aa56b669e191b0a353c217c2a3a2c SHA512 4c41ad6cb454f39743f3d822298743abb5cba0846a030e2666e7beae9fb245ec8acc60b32762c1ce66131f188cb0dfbe69f1fc933dabcc62d8ae9d2dc5884e78
 EBUILD mcstrans-9999.ebuild 1078 BLAKE2B 1862d557c4f0cf0269328357aa068ebfae379e920e31eeffbd1341191ba0bb08e780da0367f9123d82b6260b7c92a8541b03e02a7e8962ebdf788f56573b7ed7 SHA512 575049fa3e79bb24ca551182a110832463025a56a29f69b1239fbe02e20eb36a0a467d24ccce9daa2465273391c8d5eb68b538bb9cfd3a28e6966ae8a8d59654
 MISC metadata.xml 334 BLAKE2B a76cd05e8b752345f7624b375455c1f25ca0417c60a16cc0f2a37d2a876ce237faa80b4c997d34de967e61f05c299a4b1fbe848799d93a5f16dcfebcfed5ebdf SHA512 3bee1c898adaf223c205ba41afe4adfc620ccdff69ea77abfd02b3e33d21a307b889945f2d674b1c88fb4f853c6ace7cca67143f7339315abc3d167f752a1cd5
diff --git a/sys-apps/mcstrans/mcstrans-3.1.ebuild b/sys-apps/mcstrans/mcstrans-3.1.ebuild
index c848c15f507c..5510582a2b53 100644
--- a/sys-apps/mcstrans/mcstrans-3.1.ebuild
+++ b/sys-apps/mcstrans/mcstrans-3.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 636250fa3b71..fb40a42b9332 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -3,7 +3,7 @@ AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
 DIST openrc-0.41.2.tar.gz 245302 BLAKE2B ab80dc4f3a7c2c464fe64cdfa7fd31363d5a9d25e90d0239325be05561e5802f22c47013fde82650f5ce08cf99f16f5f479d8617c254647b8c40cec9609d0b6b SHA512 ebfa691cae4704bb3023ea0508a712a45b8c20809828729dfa5292e96f3fd1b309813d80d7c286d0c09680bf5378aba40cfd994f27951f43a3ffb1fd0d69a58b
 DIST openrc-0.42.1.tar.gz 242848 BLAKE2B 381f52552c13afbbcf45456fe71078bacf9182adfd67c97394093986977f5e8262d8a3c64219501745575a5210f525afe9fccee72f7625485a9f575108baa369 SHA512 579b9bfbb151b945a364a2c12b037d2e15991820ca99a07ac18e9bdc50074e67fbf0dcf9865aa4deabe2bf82092e4623be51c9e0b4014384951e0a92ac1e7646
-EBUILD openrc-0.41.2.ebuild 5250 BLAKE2B 99e9d190d921a13d249e0da95ba800b5d813b1d3caa4bdfc95d86df3141ad41adfffde2cddb3b66d3969699bc0b48a979def988317419781ff13fc1bae0de457 SHA512 70080e095841aa340d56b4ae916c8fd3c1c6eaffa58820e2a96867a12c17800f04fb0f7afd00d7faf53ea2aff562294b6b394d2af3f7559f2917449891fa8a04
-EBUILD openrc-0.42.1.ebuild 5403 BLAKE2B fda5f7dcaa69e13b63f6017fa32c24f33839486357dd758d896968f95a93d3470cb078c4a7b36eb3a6db760c6fbe513db5e40940076fc7c84e577c16ac68aa76 SHA512 32eb7bc513dadb6295ca6ca973213e0d1c57f50e1628637748564f71bcd1f139366b86ea4fd55a37a12885a18480d21f2b1ca03bdbeb376a935836e2f55d1226
-EBUILD openrc-9999.ebuild 5024 BLAKE2B e436f5a2d30359e32cd92b237d7ffb2ea821d26830ce6fe137f3c71f90ea245d9e300a9227984c7d93e2acb0f81a6674cc19960768fbb1a65dbdaadbe0300e43 SHA512 36442c0b1a737903ebb6251587d4ad200b4424e52031df41037eaf52b7e121a9ab216d0d202301cd74a2dc1fe9379432a82ab9e407403e60f4e781698b926604
+EBUILD openrc-0.41.2.ebuild 5251 BLAKE2B caddba8654402dff27269c1460233758824effa7185f323d6b65da9811432246093c16b72b00bfc37e923ba7ef6b92ba96ba99d6446a6ad54305db239617dd77 SHA512 a3688714d603639ef95748a1b5688a7cd2158387260ddd63f0e92c945b0ae75df844a03bb3a2cebc05b5ccf0615ecd6da7082cc9945721dbaadb52c95c417780
+EBUILD openrc-0.42.1.ebuild 5404 BLAKE2B c8e1bb298988e4249d3b3bc8143b3dc0cc08514278ca50663f2d87d1c0f4501921545413736b91978495e09f5456ccae6253780f15fdfc0398cefb0313e960b1 SHA512 6e7c07b0575c098339c71234d061d605b50cf5255407addc4c0414b8b80229b0f1ee909a3f396a32e8a6cf3070e263e9a50f2755c3fcbf35ab4926f6c37725a2
+EBUILD openrc-9999.ebuild 5025 BLAKE2B 9f19179f99c2ce4885917e4d5bffc82caa10deda853ee84160ec7617a91062fe169220b4a8e3cf51a7a5e6ba3cbb118804c36dd1ad17312e0d241ba0f2b7d386 SHA512 5517b720f81200a6d086e05a016d5192e982960980a3f2c03923a41d132ea3771de380c35f9a167bc6c4824b14847bfc21208e415c25cee41b537bb2533ab94d
 MISC metadata.xml 706 BLAKE2B 1d6a4937d577fff7db7fd64617328ca49faccaa61749adabc411a215960ee06c1af32499be697921012eee34f5c680295e46f545099f06393965a17c0d0d034d SHA512 d5d669cdcf8707689c855cab678031c6e9b1e33e4b931c7d80bbe2ad442aedabef718018466f0cb15bd8a329292a0de844935f9332611f3fb334b57d14aa39c1
diff --git a/sys-apps/openrc/openrc-0.41.2.ebuild b/sys-apps/openrc/openrc-0.41.2.ebuild
index 63a8bbbd49d5..afd7df37c6b7 100644
--- a/sys-apps/openrc/openrc-0.41.2.ebuild
+++ b/sys-apps/openrc/openrc-0.41.2.ebuild
@@ -176,7 +176,7 @@ pkg_postinst() {
 		ewarn "You have emerged OpenRc without network support. This"
 		ewarn "means you need to SET UP a network manager such as"
 		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
-		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
 		ewarn "Or, you have the option of emerging openrc with the newnet"
 		ewarn "use flag and configuring /etc/conf.d/network and"
 		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
diff --git a/sys-apps/openrc/openrc-0.42.1.ebuild b/sys-apps/openrc/openrc-0.42.1.ebuild
index 663c940fad47..a10ce3384c69 100644
--- a/sys-apps/openrc/openrc-0.42.1.ebuild
+++ b/sys-apps/openrc/openrc-0.42.1.ebuild
@@ -180,7 +180,7 @@ pkg_postinst() {
 		ewarn "You have emerged OpenRc without network support. This"
 		ewarn "means you need to SET UP a network manager such as"
 		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
-		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
 		ewarn "Or, you have the option of emerging openrc with the newnet"
 		ewarn "use flag and configuring /etc/conf.d/network and"
 		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index d07f1b872887..c159c6cdce2d 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -170,7 +170,7 @@ pkg_postinst() {
 		ewarn "You have emerged OpenRc without network support. This"
 		ewarn "means you need to SET UP a network manager such as"
 		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
-		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
 		ewarn "Or, you have the option of emerging openrc with the newnet"
 		ewarn "use flag and configuring /etc/conf.d/network and"
 		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 68969d228374..e93cb47ee431 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,5 +1,7 @@
 AUX pkgcore-0.10.13-metadata-xsd.patch 750 BLAKE2B 93a75ca69597422da66b42aed94e0ad67b1b80802103b90b4306c8967ea5d1723860b9851085186e078c50e3c222cbe8a78bc0fa071ed7c0cf85b4218920f4dc SHA512 d2f2f16167b9d2c32b80783b4d21d04e47328209b3ccff24c057044286ae8896fb3205ec103edbe1f6fd5e20c4ed7871bf3c27b1fc134e8299c76b7ff86ba33b
 DIST pkgcore-0.10.13.tar.gz 647320 BLAKE2B ef80320a0a8d35ed68b1d77d52a3cfb2ffbadae2fe9f11efe3f42c68f55388074b5c4b2857f265f1add4cfe479cba9716d45afaf141d113b0874d409955269c7 SHA512 acc5ee2cc6fd0f897129f311e0484e28a1c8f374c5a2e56a29d228fee74b7be0cb6059171b743e0db35544b5b5779d35efcda21e46e65285653ba4155205281f
+DIST pkgcore-0.10.14.tar.gz 627149 BLAKE2B 05012f21998ae97212364f63ca6d423806e20d0f2fd5785b9a52ec3c535c12675cd2a8f300ed1b3fbfe627d33ab9b138bf28a3a2792c405dbe068045d73243af SHA512 f4e4959d55d412b81306a4e7205163814b95b2f454dd7bb233c9a16d5a5975c0d2e20882e73859266ebf1bd6233e4d88e97291632b2f6cf2c2ae58cb5a680a3b
 EBUILD pkgcore-0.10.13-r1.ebuild 1146 BLAKE2B 1b94b7836087ace2e4b5a3b366a97fc42bfda6de298d8db11a54c6b495c4c9f22b41d56e1c8d15a51cb3dca0fba0428ae23f93c3248b624f371e7c1d90fac034 SHA512 b9347581bf17afbaa09a57cea1a9a161d837fe64d430754d3579c6ec1844e5cda273253f52feca4a80e3fb5607e91c8d01b2646a3ec3903811bbd47d8f3520ea
-EBUILD pkgcore-9999.ebuild 1083 BLAKE2B d0c3f82381d3034f8b522f44c5c83d0437ea855a00c0ba8ab6f3f9ef066277b81b7664f07c2a4761d4293f7e6b14be9906945fa371ab40c8a4d6d3debeb53b47 SHA512 7262ab79c9418428103b97b8065069d2db1e8813a7f59a3a0d9a55c353931f85eb12814636305246936f3032bb6923a683c3f1d6608848e04f63b188d3a61885
+EBUILD pkgcore-0.10.14.ebuild 1094 BLAKE2B f16e7f51549abf65254e678869785ad96459ebcbd6fe6742afdc40ef654b09f4cd0284d583eb0f7e9580faf88d1dc66ea6b7b5c50deb66374ab11a0e461126b8 SHA512 55aaa20ac47c118e57247847dcbfc59a3553d2f0c477081a1543f2c88e3c14f3179e8a919bf2b12e3c46aec094ad39a169e475da933dbe05578eafb6ff29ee2c
+EBUILD pkgcore-9999.ebuild 1094 BLAKE2B a69c2f28b93b31865fe4cccecbd38c37fb500c0b75f4f864cd5da5e7ea6daddc334c98b336694339b5001484c0eeb1cf2c403cd73a37eafa63eae7b5a3f1535b SHA512 74bb7df8582464aab7c6f71a9731ec5b3dddcfe3359c629e4b409439e7204c338fc3895065e52cf8add22e5965c655a18e14675e26f8ec44eed4d306ef4b74bb
 MISC metadata.xml 337 BLAKE2B 8980bf734cb1f95d4089aed57ac9ac0538b12aff969f37fe298581b5af005a805027962c343fcd88f7b828fc4e837f9bd47478fad7fb9bfd7a8e3bc3bc7a432c SHA512 1c1e68deab3ccdb8a2c80d0d13a9c3ed481f84bcaeae4a9e593c9f0080e9ed0762051d195ea9206ddeca4e60687a39210483aba3f51004031afd1b6bd2e7e5b5
diff --git a/sys-apps/pkgcore/pkgcore-0.10.14.ebuild b/sys-apps/pkgcore/pkgcore-0.10.14.ebuild
new file mode 100644
index 000000000000..2561e25371d1
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.10.14.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="a framework for package management"
+HOMEPAGE="https://github.com/pkgcore/pkgcore"
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND+=" >=dev-python/snakeoil-0.8.9[${PYTHON_USEDEP}]"
+fi
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index 92b8f06a6e33..9ade7b1bcd9e 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=6
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
@@ -26,7 +26,7 @@ RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND+=" >=dev-python/snakeoil-0.8.7[${PYTHON_USEDEP}]"
+	RDEPEND+=" >=dev-python/snakeoil-0.8.9[${PYTHON_USEDEP}]"
 fi
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 53d72d7a1b64..7542658c878c 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -7,6 +7,6 @@ DIST policycoreutils-extra-1.36.tar.bz2 8830 BLAKE2B 6d98e41ea379d3e95221a6e53d8
 DIST policycoreutils-extra-1.37.tar.bz2 8809 BLAKE2B a7f6122c2e27f54b018174e962bd7f4c14af04e09bbb5300bde6967ea7f2dc5cd03b5787919a4e7f5288bcbc6747922962b5bd3b588ab1e3a035fbff4910d8f5 SHA512 0a85cd7cf279256b5e1927f9dfdd89626a1c8b77b0aeb62b496e7e8d1dccbaa315e39f9308fb2df7270f0bc1c10787b19990e7365cad74b47b61e30394c8b23f
 EBUILD policycoreutils-2.9.ebuild 4875 BLAKE2B 2b97a2f7563e4e3474898b77ea0bac1c301ce1f6cddb3841e863e9f9fca6ed566221b012c53099e7b035c0d705a8f1fe67cbee88201c30aff7bc6f126aaa6899 SHA512 d967b6d20255f0983cbebead02302e14b4a7f8dfab70a079d82d38a3d8255b673ba56583a211d3cc60c2674d8d6a9c275d34a9572b1f6595e14fd0de19ad75a5
 EBUILD policycoreutils-3.0.ebuild 4753 BLAKE2B 3238ceb29eec9166041462b3dd6ea8d91c54d130733033fa5d4a7f1e53a903645f25399d359e31ef1b4e713e5fa68b5ddf07f83cf57a4de7a32d122958891d7d SHA512 60a11fe6afae58bcaecc640671bd3adc55bcb100b463c0931e91d387236320692b8b878a685e413f9728308f5de903aec44a6548db6283740854461e5d700a67
-EBUILD policycoreutils-3.1.ebuild 4855 BLAKE2B 55a1687ae733cda69f5c3589fef3abf3fa00cf80102036cbc976fcf06635ed9caf83232ffa53a89014b1e95fcac946c1a4bc32bcb1e8a99f1df38284a91e553c SHA512 69c740d15913531bf59c3785c09e34878d19de5990892967711f02ae90c07b079ce0b0cdd7ed18a3155ecc798a5f7b7a07eb72c82851bb61c454ccc0f244185e
-EBUILD policycoreutils-9999.ebuild 4855 BLAKE2B 55a1687ae733cda69f5c3589fef3abf3fa00cf80102036cbc976fcf06635ed9caf83232ffa53a89014b1e95fcac946c1a4bc32bcb1e8a99f1df38284a91e553c SHA512 69c740d15913531bf59c3785c09e34878d19de5990892967711f02ae90c07b079ce0b0cdd7ed18a3155ecc798a5f7b7a07eb72c82851bb61c454ccc0f244185e
+EBUILD policycoreutils-3.1-r1.ebuild 4857 BLAKE2B bd3811ab4897547498d1677b5c0071ed6a9f1f2cdae234e4ef697151bad616ff828319d067621601f310ede0f787bcccb831c7220888bfa32fba13bd7221f00d SHA512 1584f7f965ad31095697843ee3a289681cb8175c3c74a582ace11a61431d8972b44677587c5974c1b3caa951dbd952420cb121e9ac45f6ce4807c49b4929cf45
+EBUILD policycoreutils-9999.ebuild 4859 BLAKE2B ca6828493673752d5a0f733839ebbc270f0f5e35a383039802fa4b987de3807cabadf182c97f1056ced86967cd7bcd14ba765dde5d8ade37bdd81dca72eae955 SHA512 71cab653be4b00dd20b48795a7b8148bf2880746b2b0f306f9cbaf79a479b662d091c7ee6db319432600e0742878f37f2fa231e7e2d96aca78d4f9d5600b01e8
 MISC metadata.xml 1117 BLAKE2B 0ec558cea900ec5f25cef43a76a5c0436562ca9d43cfa23d9251ac4e8eb22f0154ca577f061f50762559be9b567faf5dd7ed994c59308ba140f2fe2b8a5d1ad0 SHA512 1f8703b31ced13b4e15311ecc9d4e03c085eb580e61394e8781744a9c33794e0f10144617415e69b703f5716ca5fd15ad6db14fe93a95c9b5d46c429542beac5
diff --git a/sys-apps/policycoreutils/policycoreutils-3.1.ebuild b/sys-apps/policycoreutils/policycoreutils-3.1-r1.ebuild
index 742b9fca0890..9ce99c44a21c 100644
--- a/sys-apps/policycoreutils/policycoreutils-3.1.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-3.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 PYTHON_REQ_USE="xml"
 
 inherit multilib python-r1 toolchain-funcs bash-completion-r1
@@ -31,7 +31,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz
 		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm64 ~mips x86"
 	S1="${WORKDIR}/${MY_P}"
 	S2="${WORKDIR}/policycoreutils-extra"
 	S="${S1}"
diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
index 742b9fca0890..8f15a3bee236 100644
--- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 PYTHON_REQ_USE="xml"
 
 inherit multilib python-r1 toolchain-funcs bash-completion-r1
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index da2eea57f58f..2d67d412e968 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,11 +3,17 @@ AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906
 DIST portage-2.3.89-bug-718578.patch 1325 BLAKE2B 7a3bc520274617736eac2e3d078e90d151bdb5d8615f6217a499c0f5d4c80813f2c753e7902cf34482df0725ad0b43a38707764c8be14aae9f7ca34f0bd8721f SHA512 6f1c5d7b42beb8078c45cccbad2bd65374b69af92521d9be3beb6784477ca5bcdd75d8e762b239e44e3121e6fe5e3a040c92c9b61521e4a9b1d6bafee10d4c88
 DIST portage-2.3.99.tar.bz2 1051210 BLAKE2B dd3f990dbc87e655a767ce01e1ee3f0b1d5226fa818949408e54b81a2f96e50a4215a79af42b00dc795792858c4f86453b238b14baef4f0793c937b5617534b8 SHA512 176842318a4134ce54c5aa6485fef296f5a14edd2a72421c2011973a0f1a6af39bc5398f1e9eb3b8666d5fc307589c5b91ab93c219bdedb2d307357d8ddefbf5
 DIST portage-3.0.10.tar.bz2 1048234 BLAKE2B 9011c7a3a7ea6c5c78190c5344370d26700e4bf95e56fdf7036c3c4e1ef2e8bf691f5ee21142aaa4e15d5798404e5abadfdb2b5fea288451666840f0adb0ef77 SHA512 d5823fa263876350f5128e03c92350a90f665a5539e0eeea1cfb9320a1c83cfdffe91315bfa54dbc1ba6ffb42fdcbda3b0b728f79aaf3ef254ebb7fd09563188
+DIST portage-3.0.11-bug-754903-pdepend.patch 5379 BLAKE2B 34d2bca2af7d0a7286fa8ca7e3486341112c0a2d52f79d76a89cf5b68d85be4bc66434b8c3916987824ffdb799ed97db4a50f7b10744d55e229c6ca923e8d3ba SHA512 ecb01de1dfd1a331231a6d7a4e77bce36f7f663354cacd1640eefacdd14873b64ebf30c30105df87b4857fc7d1b8612d61f5f44d6d617bc109fad7583d3940b2
+DIST portage-3.0.11-bug-757741-AttributeError.patch 1077 BLAKE2B 6411f23746781ec5ebb5eb59679a0e1ea5bca650ca6f06d2c3cf0d8fb78fbaf47b915b33839e2f8aedcffb9b961787ceec92c614284482d65a72ce80f3ac148f SHA512 b0c0135f0db9ddc723ec996a922a36510b009e08d67ff7b1eafd208a11e3c2914c11e18fe26d56ae3f1ca986f1057a230bec9c25555c7e4c9ca5308bc34b0c2a
+DIST portage-3.0.11.tar.bz2 1048734 BLAKE2B d52e6d90750da0a2474e7b0071955111382aaf14d0c464bd66e673fc953ee90c2a426bd2e05b3642339483184a390ba416b2024849779d0fd95172d383ad4851 SHA512 048f7df9f2748565b8cc258667d1ea8fe0cd5e2dbea58d70ce9670885ba00949c16f9c5e7d2c3b2f795fd8f1d977792a9cb083613376128d33bdf9c1e1e4a8e9
+DIST portage-3.0.12.tar.bz2 1049335 BLAKE2B 9f7b17ebfe068559ffbc2bc0799f72901abab8b8b5bb608c8f6afe1f8f7fdaae1026c2a04d9b2256b367711196e32b58c6927ea6fc57146148ed71b295acdcb8 SHA512 6f93f35c06ac765f926f5281e2fac99d52140e8c5d95ee4224796c1ea23ed5f45ed5382acbbfc7aebf9f68a9c585fc1b41b615ef765be2d16577909032de1350
 DIST portage-3.0.4.tar.bz2 1042654 BLAKE2B 6f869b2eb24f9e590bf8e01172050105a1bd9ea88657db5893133b4620231a0ddcda871d6fcc10623f7f2ef809116310c76355263819be6c3734b0ca184d5fc0 SHA512 7a0c39cd4ed65aebd84ff8bbadba29760b3aa392a0d606c5b29a1112fd0845c42f74eebb0728a069b2b097a6eb7eec2d18af615fd9edcc38f1018ae6ff686812
 DIST portage-3.0.8.tar.bz2 1046968 BLAKE2B 662147c37a9e7b81030fadb4d6438b734ee57a9eb9bfcee80991d137a017aa3541565961282ebf8736db71aeb05532ffa139ff3a34a84bc9064cf74427acb666 SHA512 5f97870a11ecca30ffe8f463f87cd16a1edb52b44832c6eaba15cadcfde2b4f7edf963749e45c8043b45b38e53ee210dc913aa2d2432a2bd3928cc27c8765a85
 DIST portage-3.0.9.tar.bz2 1047839 BLAKE2B 44cf96ac69c1b6d2f95aea8b6e87af5665bfa797ef97d3ae09d4faeefa5b36671f542a5bb8b141b0d914afef96d536a63da4539d27336471621363008d2f73bd SHA512 01ad255a12381fb3b52a8d6c1b04cb377c52b8856973aa296a1086f2d89dd6458244486a0d477e95d4247c3edf7e8e3bb20523263979401443b212085737e618
 EBUILD portage-2.3.99-r2.ebuild 8482 BLAKE2B 9880361867a65a42c22b277e46fdf973d32b57679519dcce4728fe3297a6b55990a0cc319e161f3056f33c72979101e9b54168e01ef6a1a2bfdc6a92df042821 SHA512 c04cf3569d920a4e55da0eac94cbf93b5780d9b2eb3afa45c918fbae88c11a0f130aba4370b1897628a0f03fd24dcf573aad03164c4e9a786ec754f96cd0939d
 EBUILD portage-3.0.10-r1.ebuild 8627 BLAKE2B 305994b05147a9e3fd5c8fc8f4281c23f356371dd8bd016f7976e0411da6f55d7b37cd6bff0f3d2e6c05cf7ae3f6d6e58c1f1ee6d7256d4933992b713b3a3118 SHA512 92679a639c18d00b38f9dae80e07641e5c78801111ac1a9b8f0e99f226ecd4fa1453417a9da4c6468412ad783683edbf84c63fcef4cc63dfc3da6f3d2ad21b26
+EBUILD portage-3.0.11-r2.ebuild 8785 BLAKE2B 735df2fdb2481176693a377fe9aeda86e3122ac6c60aff3ccace8cfe7ba42cb2c66130a5bb8d7914e8e885a636a89d81d13a9f1eee3641257ab6ce0fda200308 SHA512 569f0a6f6d4d8dd2f61611c88857da2ac4fd613cb1bb487687f7e5567a9add4b2bb77b2b0df717c34c4c591d451a573fe2f93268dfb1293a194f14d4c5f91dc3
+EBUILD portage-3.0.12.ebuild 8386 BLAKE2B 31a02b0077c892cfa61726a716b5cca2349d731fe6e9480476512ad62e457c4b051ab1c0ec236f02728e6955f6f1c45d45c71b8302dd2e35b00cc662dbf2b9cb SHA512 b48ccbf8f975a22b7c61859ca239584c67cd0bc6bc718b2191ee66daabebb600e10f7e0bd5328b0fb3aba5077095fa823d824bb82f5b7dd944f6e319a005241d
 EBUILD portage-3.0.4-r1.ebuild 8527 BLAKE2B 631108e364ee22d284e334c5c641f4e807375ac75804a7c3099837d94a74f4c41cbbaf6ca365624516f858ee68c07b8551a3c1c9f1950f6352d0186db4bd28c6 SHA512 8ff2a857a31c283408b9d8a6f5d1a984c6299ccd1b7f8eaaff2e3b5f3b1dcc62f32bee8dbc1496a4a75e836f4772f91a295a23facb005d035c337032ed63d6a1
 EBUILD portage-3.0.8.ebuild 8379 BLAKE2B d2c21e67e7e182c79c0435033dcafdef239a28d4108a953a74839bd6cd8fc83076bdd324f35cc2d64028c13f6a9b4bbb6a725b3f797be035e1a0710f07a9e980 SHA512 b000f7461b73ea27b71e228df180f7cca078890d93a89f8c835986e49eba31d9faa1b6ade34db6aa9e35a4fb9cfed05eb104611e9952dbbd6f99cff41f75b850
 EBUILD portage-3.0.9.ebuild 8378 BLAKE2B 6d286cf9502773ffe070393836d1bb524e1e7ab5ae23106f1bebd4b1e407ff674387681bc9134e03439f8ef0b6d95fe5fff4855d4df07227eb60e19d522eba62 SHA512 0274d6dabbc5d1cc25bee61483a53d6e5088a432984a8961f3631f010aada1e55082d766f180eeb5acf251c3d5f834957e24120c62bd19e2ceee328ab40818f2
diff --git a/sys-apps/portage/portage-3.0.11-r2.ebuild b/sys-apps/portage/portage-3.0.11-r2.ebuild
new file mode 100644
index 000000000000..91955bb7a5cc
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.11-r2.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+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="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="
+	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_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
+	https://github.com/gentoo/portage/commit/07a604537e746814613dc171a5c09072ef0266af.patch -> portage-3.0.11-bug-754903-pdepend.patch
+	https://github.com/gentoo/portage/commit/ff270ae58eca457a1e2bbf9507d8438123082ca0.patch -> portage-3.0.11-bug-757741-AttributeError.patch"
+
+PATCHES=(
+	"${DISTDIR}/portage-3.0.11-bug-754903-pdepend.patch"
+	"${DISTDIR}/portage-3.0.11-bug-757741-AttributeError.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
+
+	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions; then
+		printf "[build_ext]\nportage-ext-modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f ! -name etc-update -print0)
+
+		einfo "Adjusting make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use apidoc && targets+=( apidoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use apidoc && targets+=(
+		install_apidoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	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 \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
+}
diff --git a/sys-apps/portage/portage-3.0.12.ebuild b/sys-apps/portage/portage-3.0.12.ebuild
new file mode 100644
index 000000000000..28cd3d04cca0
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.12.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+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="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="
+	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_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	check_extra_config
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions; then
+		printf "[build_ext]\nportage-ext-modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f ! -name etc-update -print0)
+
+		einfo "Adjusting make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use apidoc && targets+=( apidoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use apidoc && targets+=(
+		install_apidoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	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 \
+		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
+}
diff --git a/sys-apps/restorecond/Manifest b/sys-apps/restorecond/Manifest
index 5e8dffdf74e6..92c00887f84e 100644
--- a/sys-apps/restorecond/Manifest
+++ b/sys-apps/restorecond/Manifest
@@ -4,6 +4,6 @@ DIST restorecond-3.0.tar.gz 18797 BLAKE2B 354477ea9f57cc27c14a2648b99b32c45ac6d4
 DIST restorecond-3.1.tar.gz 18939 BLAKE2B 3a3fcde057dad3ed05692d679ba27e0b24f191d92ed5114fa38cb5f846c4cc00d85bb09b5d4e560ed2b914444e0c2d1c407f6c03900610624d5626d05f2991bc SHA512 cdcf299f48b89a7c641ded9507b9b966bf648497394f8e988a9cb1ceb3224c86369706027f3416a4f9750836f7a8f4580a4b3df76673e03f897b383d7ed0e2c8
 EBUILD restorecond-2.9.ebuild 1145 BLAKE2B af99619a522615ebd01935b687f24c45d512510522bd725eb66b430c6b7d46086cc33634db109dc9f08f165f82e8bf059d34cdd4414ab9873298a52020d9730a SHA512 d6de5a092b1241d43e2b4663441e93568fa463444d41b032245e157c7994d072e318ac217a8e252549994bb72acdbdfb36453d51966707c18dd628fa5b7d4126
 EBUILD restorecond-3.0.ebuild 1145 BLAKE2B 2c533c3af22c23562873d976e5961ae897bce49080283002120454042ffa4cff29303cfc34b92e1b016f0ddca500f8901c668b10f8a6a9729b27e4d523c3444e SHA512 9a55df70a4e7482a456a298b56f9d4560b62863a09da9ecbd9f8cdcc3d967ac59d0ccc09b82cdf2af2e64d26dfbeac4162d4ed5d6cb6bee66819ec6ab863c532
-EBUILD restorecond-3.1.ebuild 1225 BLAKE2B 3b9cef9ce1ffada0499058dbc7999707bb49ba253b9fb7c50a4b88cc5fb03f5a8469539480eb2650aec0d8958e4020684bdfc1fc4bf3926ad525d73a8a0d3e82 SHA512 fea6248c0b7f99efafb7cb9b33f38d2566792277a04e41c1336f21a906e0c58092dad436508c8d266403545b4e38bb6db4a65be1fde26e67050e4dfebc1dfd04
+EBUILD restorecond-3.1.ebuild 1223 BLAKE2B ec5249e704e332e23cb35504417f7d16828e9b54885f0896d09306a2ffc91ab11fa3e93bef34c11d4f3cd33373d1f5caa1fade40da9002dc992dd6a1de2aedea SHA512 5eb40f7d4fd35de6508874babbac075b2e0c3afc15b963f5696135c866a5782b57fa6096e12f128814e501f7d29cd567db2d35eaa8a70e1d2a6d9da468fef99c
 EBUILD restorecond-9999.ebuild 1225 BLAKE2B 3b9cef9ce1ffada0499058dbc7999707bb49ba253b9fb7c50a4b88cc5fb03f5a8469539480eb2650aec0d8958e4020684bdfc1fc4bf3926ad525d73a8a0d3e82 SHA512 fea6248c0b7f99efafb7cb9b33f38d2566792277a04e41c1336f21a906e0c58092dad436508c8d266403545b4e38bb6db4a65be1fde26e67050e4dfebc1dfd04
 MISC metadata.xml 334 BLAKE2B a76cd05e8b752345f7624b375455c1f25ca0417c60a16cc0f2a37d2a876ce237faa80b4c997d34de967e61f05c299a4b1fbe848799d93a5f16dcfebcfed5ebdf SHA512 3bee1c898adaf223c205ba41afe4adfc620ccdff69ea77abfd02b3e33d21a307b889945f2d674b1c88fb4f853c6ace7cca67143f7339315abc3d167f752a1cd5
diff --git a/sys-apps/restorecond/restorecond-3.1.ebuild b/sys-apps/restorecond/restorecond-3.1.ebuild
index 001d8cd6d3f8..90da950241da 100644
--- a/sys-apps/restorecond/restorecond-3.1.ebuild
+++ b/sys-apps/restorecond/restorecond-3.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 97cdeb9d6325..589cb64650f3 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -1,28 +1,6 @@
-AUX rng-tools-5-fix-noctty.patch 2069 BLAKE2B 6de4e60b1855b74bfaa528e4dfa3fa2377f34af0976d05d06f71c2912268c0b8f6355d6d99d21f5ad248521b9873ca7548f64076c684276af5e431f2542f5221 SHA512 7555185f529ade3cdcd277624820717ede9dff8c004a15786ed8b73c74b9300d71da2d8a51deda63b18f1af07ddbd18fe4a5693a147e189886370f359243251e
-AUX rng-tools-5-fix-textrels-on-PIC-x86.patch 2677 BLAKE2B af3911de5a8d7c91bc8a3065d817497b9f46341a05851bfe8d45de481dc8daaba618e1cc176dd397cd63430b51b582fd880f803d69bba61e00deae91e56e3c87 SHA512 8c7c6bced6e0982069ba6ef99c169609ff452a55c32543c25f198a59f81d4e976caf400867cb52bbe2996363f22943ff73c678427da43ad3a019bbe29bd29ce1
-AUX rng-tools-5-man-fill-watermark.patch 765 BLAKE2B 1e99d4961ba0e132fac5fbc7d5794ff638497662c0f9b16810d42428eb7fbdaa5dfe657ac961115587db2acf0672e67387077a317fe2afdc7eabdd4d1eb83e92 SHA512 8bc7a9903f9f77da2d55321605a2421bef27d8cedd3ea67e5547f4e59b85b3139b3cf269efe4c3abd767d87666e3e28b03e4fbf6984122febf45ea14af3332a0
-AUX rng-tools-5-man-rng-device.patch 398 BLAKE2B 6781f201e9c87143aa56dbb35702e95441cdfc304233be40d9f28c929c18f955d710b32128eede20bee71bab789bc72318cd71af294c2e6bc6d721882c3d030c SHA512 cd4c0cbcc32f6ace0f05c0dca82461c2a676a986c000850a422c3b509d79f22ddb98732749e63a1d9ec6d90db1745b7a163a590ada61f0ebcdde07b160647d3f
-AUX rngd-confd-4.1 562 BLAKE2B 8fe0147a1f9e67541c709f793ed1f34ed173204739973abbb1df629fb79ebf47d78c7d2e0f1aa9a867aff1f77133271325e2dbb2bfe5440921f5c16c2f0e8e5b SHA512 45e0e9cbe0180162f659bf05c15ee99fb8c1b80274cd8744384ba7f791b1c9a46a63e81eea665b4f492c13b7d5cc1fdb6e524a49a25af77f3791f527b31f688b
-AUX rngd-confd-6 2038 BLAKE2B 0f239923693d167a6a53609822d15a92e0c0e98d9c090c17ea3a73ad4a187528cd9a5d4bf071ec544592ef3ce801c2c364ccba193c22940411629b14a486cd69 SHA512 fe58599105fbcf8e1bf5f584aeefa54681dfa9fa2cd73cd682acd348f170ca825b692a1a8d153b438096c580a4b0cdab56a03b32b5f9ae8e73f06c3535c1ea46
 AUX rngd-confd-6.7 2245 BLAKE2B 7643525d9a57479ba1b725ea6f976421c3df990c56d9f694b6fd2d3283c51ccf42e1be403a2208be70bc09dbd946c0cb803bfb303ae3999e97b3c3baa1162aaf SHA512 f16c5bc417e7bae86311397b3bf51927cc2cfbb0b4ee14a835fff5b62f4d12ab194329942e21cae4eec56953e4271b1fc655dcfa0be4ccbff1df1f1defdc70d8
-AUX rngd-initd-6-r1 1577 BLAKE2B be6d70877e840c8d95a029057e03f533219e7b45d87d493af80f9a88df72b3eb272e9565e238a05665ed50c2b417815aed96be82c739ba1ab8de26ee463d0a1d SHA512 5e133f0572920b48a56734bc86edece5f655c6dde11b669307e3c49591e2678fcf9135017aafbc3b37f2af8d6c9c5cf8e52217ee50ff68abc2a7bf2330576f37
 AUX rngd-initd-6.7-r1 1683 BLAKE2B 34bea128a94f2fc8479ebd8e8a398a01bb96dcbe8dd74876f8b8725f701862908448deca3768437d1cd98b138c9203106c199942910f63e7c95598d3e1b27818 SHA512 c1e3d94509d5cd3301836961598e221ef0db2e7310386f0467a4f3068eada8ad4010b063202b8a8c3d163d39799aea7d6a4dcb4d8ca569fe7b51f5c870100b6d
-AUX rngd-initd-r1-4.1 494 BLAKE2B 1f11526717fcc9b88125e89474e1f06fc11621435811f4997e9e6197f634794df681ef698ab08d3f7c610dfb47c156231a157cfda05c804a6293a27dc276322f SHA512 8bf9a0bd25bcc9c1cc4eacdf875077208ba0899c626a55e57f055cc93b62e23a427e0622859c5b4a31c3aebe550b180777528b43942a3efb2e2c0b4243c3c9c6
-AUX rngd-shutdown.patch 1030 BLAKE2B bdfc3e3c9c7fcdf5b6aef15ab883852c02bcdcb06850a5a11b172141c577fa1b2ede4305c0b048a00b4d6c3c9780f4c7973c1c7b4aec2ba3abe60bc87edeba4c SHA512 aa7c61a600d9036d93c2efd658784e640fea64d0ec4d8c3efa70dddec37fc181eb5929a2ad47526983f885e2157eb67d57685d049371fb510652e345a2c0fc72
 AUX rngd.service 133 BLAKE2B 1c3059e7ee924b42bc6567f5142973d550282248b3e49053b96782039ebd63096a0a8960d3e5a43cfac1d505c57e71015ad706099f06ac2809adf52c0b108d7c SHA512 51e9ea84b624cda8d3689d6a9a8d60da4a556aa9d2a1a04e698d9a1490717aa47172e152c93711f8d04be8a5b68b1dfd568a762bd8ee7219afb7cdfff15657d2
-AUX test-for-argp.patch 1245 BLAKE2B eb60f4d921f395d713e0ab9f132e47ce8783a096600f050c45212bae6929dc9546ff5f7b5ddf92d66570d82041b1e31ca3d690abd1e17d1c0fc688629a462e06 SHA512 0fe4b37eb3d2e93ff9ce17aed8cfcaa29c7f04289ba692d10fd0f8ef6d9b1e5f64a5734a508aea548f13fd00217972a68bcbeaf6977e763087ad20c19d456ed6
-DIST rng-tools-5.tar.gz 122182 BLAKE2B de7085d530e38de21a1c33792d67a72e0131b221082d690cdb299367b80b0a123c2976174aa3f895a4a2ab1216aacfaa8e09de485c85154dc4a5b8f960d05245 SHA512 58047c37cad4f5f1210b696e4dba122878f78e57d05d9cb822f79234240ecce31efd2d39061fea1eb5b2e81d48d8c3bf6b92d06451f1ce5d5db7117704e89c50
 DIST rng-tools-6.10.tar.gz 56806 BLAKE2B 6cce0579a47f638cd90b51ba5216712fe39bf92dd59b288691a5e9783d520212cfb62e875a7e8f85de7a932568fdf0287cbea6f4869c9616a4c9325a111b0243 SHA512 b72d8918f709989ebc70cb9ea9c8b3dabf53041b24bc3f3a6de1bea318861dfd6c1a6110bd750041dc4819406db4a2b28f5137af5f5d5f2beb666f607913b389
-DIST rng-tools-6.6.tar.gz 51468 BLAKE2B 47231c60d78a48ade07855dfe8a807d6c10b8e27dc662ff7d98cf232b50e6c32f24197291a813d6ed6d15325a33fe9683d82943109a80cac1d9e348fc30cb849 SHA512 00bbe7f817d8f228f357a79ca270c27c62c0e588a99cd76917ecb7e88dfb627028c66497a59c9918205f3551aaf631963c8fd6504cb4198ddf57f714204c21c4
-DIST rng-tools-6.7.tar.gz 52792 BLAKE2B 3789aa4c6e2f024dcaef6b9b51521e206d65500a94ab456db61dc45c69ac5e4849a1e74abbe0f7640827ffb4bb20675c1f639a5be852d21d0d1a3c6b2e96bb5e SHA512 2f09edacb5448087041257326faf570c303b42f90bb695a1999b2c7543f20a28b15cdf705a2eca55cae8e9cf9fb5205c056fc26cfaf6af958bcda2cde1952b4d
-DIST rng-tools-6.8.tar.gz 53769 BLAKE2B 2a10a5639c5b1f4506b2c2cfb0185d16b5b604bd8aae72ca616b121f2e7624ff1ba00eb32daa3626b00d89f106356924bde511e263ab8978ff764757b44588ea SHA512 8fa47c2f0f8ebe6ac13025fa2c74505528b503c4e126c5d02b939797d6d4a8c9fc2b345353e48e497e32c1620a0821431e70752a9eb8ecb71960f16713696b62
-DIST rng-tools-6.9.tar.gz 54426 BLAKE2B b798f8d052b5f13a2847edbe5fc4c7f189433cecac97537193afab09cd35a89d8ddde16708f45f474997ea926bf47b2c6950f03ae7d7d93e559f22ed9fbbabc3 SHA512 08d0b19c309331fd2a2cfb5523a980d5ab1a2e727d06e2b3ecc8851aa94b6fffe9021714f33b5bd1eeb8e6a1d28ab865845520d8e4c96ab3f63019718c08ae7b
-EBUILD rng-tools-5-r2.ebuild 1146 BLAKE2B 0fb06c8208399d1f4fee01b53ab112af78c6b4214b2c9caebd5f22c94d3de062cbc869ea207bc47bee48a11a4892ce94543972274042e5ce1f2b1cb153b33ef1 SHA512 7eb055a3cee18b56c845eb05f0a66666a8d108fc059fb0c4e2139251f9fa5f3625f25bf133cf13bcc07cb666b07d29d1b83809825c8fa664df3ea90b571c3fb5
-EBUILD rng-tools-6.10-r1.ebuild 1865 BLAKE2B 92f720914b63025ed130e34842969f157ec3bbaca426cab4d2c10d7a014deed5ab506e4b18bff6069340b709b1c2a62b3ae71a513cc594085fad8c6c30c585e9 SHA512 ba191cce816313ff9d3165ec51b93154164427b405cfab269c7c3d386a0c1335f606e14050670aea8c67c8ccc75b98f93096781505699273340d07fc5d8d75ed
-EBUILD rng-tools-6.10.ebuild 1799 BLAKE2B 493516f958d5245cd0bd47edbdf00062cc0e0041160bc10c94e0bde46f91e6056d0afb3f7630e886ff86b3133e3a11a5893a80eb0d88fa1d0c8986af6955f7ff SHA512 541717d5a08d03bccb57dd8bfcd4e83e9117b567494df36f1f51ebbc0736762d981884b12cf0e700618fcd9cad911b9473e85ec2b8826b9199ab854ae691d7cc
-EBUILD rng-tools-6.6-r1.ebuild 1409 BLAKE2B 20dfe5ef85122bd102a654c3ef95ae651c18116721d0b42478269cc6e3941c449081325149337a215dc6e250296d298d21ac4eaa8052b53b2055451b777c803f SHA512 91710d9bc23534b1e4930a24ab609816838938ab54e4627748c6eab5c36a615ba6baa681fc46dff9bd15c0b75e6cf181f1383528e14bbd811106d23d55153492
-EBUILD rng-tools-6.7-r1.ebuild 2143 BLAKE2B 0a0da05d43c4763da8c42c1d5ed39287878fd1c24dafe7d37f4002bb6bd08293ba0fa80189210a19a83ab5c5c6914a0e0205d497f1f88d59f2cea997ceb00eb4 SHA512 14e9cd49419ba51d6df5be4134f6bae33aae463a6e19faa6220023f1ba80c9d971c442ae52ca248d85828eb395fa60e5ae41fb95d85e4364b15e99709d36a286
-EBUILD rng-tools-6.7-r2.ebuild 2173 BLAKE2B 01fb210ba3b0ed8b5f40ceb061b7e31c4f14de6ffef6af18d4c25519646776bdc66cab8c376b91cd057588a64e5b1377a0fca52d033174bbc6f77f59edac7e49 SHA512 cf9e07fc1ee37c37cd5de5b08e62aab692f83593ceeca0131edafa621a4acf61f9661851c230c5a7ded13796b99266fedeca97827c4e35ba26c301602e8d4a1d
-EBUILD rng-tools-6.8.ebuild 1835 BLAKE2B 7d78bef80be7e07da0792566bd96ca306984557f7eecb6940ae75b3ca75cbfb0590a3ed0f89f7b24a29abf65a836939577b75e4840f14896ce49ecd20ab1d785 SHA512 0efb9570fad17b1fec65c455bce367ef50062ac4bb5f764ba7f61734d5ff865386ee89f3871fad751226569cc424b6d38de4b236aa03de4a483bb0a793f04162
-EBUILD rng-tools-6.9.ebuild 1829 BLAKE2B f463ef43eb9adfd54676a7d11c6ff6e29d2f6bdec6af78a6643f15c09ebb2492e3b901247ad872bbce3837ec0ba7e9de6ef39e2531a34face48ad9954c614b1f SHA512 9560ebf4224fe0b22c4fdc0237fe23bd91beece3b6e45bd5837103b12b06dac2e011d605d99d5b845b5b14b6b1eba9ff7eb24eee9bc1c96d9e2db6eade6a928e
+EBUILD rng-tools-6.10-r1.ebuild 1859 BLAKE2B dbed15bdab91852dc931b593aa9c5a625aa77b7721827d9edbbf5005beaad20d88aa086b6deebbc3dbccd59179c36a0c24e8758fb50d6527ed3a405759d9f9a8 SHA512 5125b29f1a842e590e94e3808617378a0a05908a584c52f1ad52ae60880c163c6cdda72b2b78269a47f912482163d5807b9b282b50418bcb45c8b763f67a0399
 MISC metadata.xml 713 BLAKE2B c05a29fb9b1c47eff6e8fbdf72bcd911bff431d72e1fb432e40f5ef760d82c26ec29322ccef9d06816b5d137708922b8c44df7ed0c1c60a07eba3b319fa0e1f5 SHA512 65b2454b2161f61cf187bb14b66f8cac59de3b023ed007e7780338533b8bc5c6aa0cff00d99d958f33b566b3fd9d2a597d698275c3a7914541233a9f9336cd64
diff --git a/sys-apps/rng-tools/files/rng-tools-5-fix-noctty.patch b/sys-apps/rng-tools/files/rng-tools-5-fix-noctty.patch
deleted file mode 100644
index 568ebe04589d..000000000000
--- a/sys-apps/rng-tools/files/rng-tools-5-fix-noctty.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Gokturk Yuksek <gokturk@binghamton.edu>
-Subject: [PATCH] Fix rngd to open the entropy source with 'O_NOCTTY' flag
-
-When start-stop-daemon starts a rngd instance configured to use a tty
-device as its entropy source, the application crashes due to not being
-able to read from the entropy device. This is caused by
-start-stop-daemon calling setsid() before executing rngd, which
-disassociates the controlling terminal. When rngd attempts to open a
-hardware entropy source that's a tty device, per POSIX rules, the
-device becomes the controlling terminal for the process. Then rngd
-calls daemon(), which internally calls setsid(), and consequently
-disassociates the controlling terminal for the child. Meanwhile the
-parent rngd process exits. This results in tty device hanging up. By
-looking at the strace logs attached to the bug, it can be observed
-that although the parent rngd process is able to read() from the
-entropy source successfully, further attempts to read() by the child
-rngd process return 0. This complies with the POSIX, which states that
-read() calls on a hung up terminal shall return 0.
-
-Note that when rngd is started without start-stop-daemon, this problem
-does not happen because at the time of opening the entropy source rngd
-already has a controlling terminal.
-
-Prevent the entropy source from becoming the controlling terminal by
-passing 'O_NOCTTY' flag to open() when opening an entropy source. This
-flag prevents a tty device from becoming the controlling terminal for
-a process without a controlling terminal at the time of open().
-
-Thanks to John Bowler <jbowler@acm.org> for debugging the problem and
-pinpointing the issue as well as confirming the fix.
-
-Gentoo-Bug-URL: https://bugs.gentoo.org/556456
-Reported-By: John Bowler <jbowler@acm.org>
-
---- a/rngd_entsource.c
-+++ b/rngd_entsource.c
-@@ -175,7 +175,7 @@
-  */
- int init_entropy_source(struct rng *ent_src)
- {
--	ent_src->rng_fd = open(ent_src->rng_name, O_RDONLY);
-+	ent_src->rng_fd = open(ent_src->rng_name, O_RDONLY | O_NOCTTY);
- 	if (ent_src->rng_fd == -1) {
- 		return 1;
- 	}
diff --git a/sys-apps/rng-tools/files/rng-tools-5-fix-textrels-on-PIC-x86.patch b/sys-apps/rng-tools/files/rng-tools-5-fix-textrels-on-PIC-x86.patch
deleted file mode 100644
index 5fa5f0b4ecf7..000000000000
--- a/sys-apps/rng-tools/files/rng-tools-5-fix-textrels-on-PIC-x86.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From: Francisco Blas Izquierdo Riera (klondike) <klondike@gentoo.org>
-Subject: [PATCH] Fix assemby textrels on rdrand_asm.S on PIC x86
-
-This patch updates the fixes in the assembly in rdrand_asm.S in
-sys-apps/rng-tools-5 so it won't generate textrels on PIC systems.
-The main fixes are in the use of leal in SETPTR for such systems, the rest is
-the usual PIC support stuff.
-
-This should fix Gentoo bug #469962 and help fix #518210
-
-This patch is released under the GPLv2 or a higher version license as is the
-original file as long as the author and the tester are credited.
-
-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=469962
-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=518210
-Upstream-status: Not sent yet
-Signed-off-by: Francisco Blas Izquierdo Riera (klondike) <klondike@gentoo.org>
-Reported-by: cilly <cilly@cilly.mine.nu>
-Reported-by: Manuel Rüger <mrueg@gentoo.org>
-Tested-by: Anthony Basile <blueness@gentoo.org>
-
---- rng-tools/rdrand_asm.S
-+++ rng-tools/rdrand_asm.S
-@@ -2,6 +2,7 @@
-  * Copyright (c) 2011-2014, Intel Corporation
-  * Authors: Fenghua Yu <fenghua.yu@intel.com>,
-  *          H. Peter Anvin <hpa@linux.intel.com>
-+ * PIC code by: Francisco Blas Izquierdo Riera (klondike) <klondike@gentoo.org>
-  *
-  * This program is free software; you can redistribute it and/or modify it
-  * under the terms and conditions of the GNU General Public License,
-@@ -174,7 +175,19 @@
- 	jmp	4b
- ENDPROC(x86_rdseed_or_rdrand_bytes)
- 
-+#if defined(__PIC__)
-+#define INIT_PIC() \
-+	pushl	%ebx ; \
-+	call    __x86.get_pc_thunk.bx ; \
-+	addl    $_GLOBAL_OFFSET_TABLE_, %ebx
-+#define END_PIC() \
-+	popl	%ebx
-+#define SETPTR(var,ptr) leal (var)@GOTOFF(%ebx),ptr
-+#else
-+#define INIT_PIC()
-+#define END_PIC()
- #define SETPTR(var,ptr)	movl $(var),ptr
-+#endif
- #define PTR0	%eax
- #define PTR1	%edx
- #define PTR2	%ecx
-@@ -190,6 +203,7 @@
- 	movl	8(%ebp), %eax
- 	movl	12(%ebp), %edx
- 	push	%esi
-+	INIT_PIC()
- #endif
- 	movl	$512, CTR3	/* Number of rounds */
- 	
-@@ -280,6 +294,7 @@
- 	movdqa	%xmm7, (7*16)(PTR1)
- 
- #ifdef __i386__
-+	END_PIC()
- 	pop	%esi
- 	pop	%ebp
- #endif
-@@ -294,6 +309,7 @@
- 	push	%ebp
- 	mov	%esp, %ebp
- 	movl	8(%ebp), %eax
-+	INIT_PIC()
- #endif
- 
- 	SETPTR(aes_round_keys, PTR1)
-@@ -323,6 +339,7 @@
- 	call	1f
- 
- #ifdef __i386__
-+	END_PIC()
- 	pop	%ebp
- #endif
- 	ret
-@@ -343,6 +360,16 @@
- 
- ENDPROC(x86_aes_expand_key)
- 
-+#if defined(__i386__) && defined(__PIC__)
-+	.section	.text.__x86.get_pc_thunk.bx,"axG",@progbits,__x86.get_pc_thunk.bx,comdat
-+	.globl	__x86.get_pc_thunk.bx
-+	.hidden	__x86.get_pc_thunk.bx
-+	.type	__x86.get_pc_thunk.bx, @function
-+__x86.get_pc_thunk.bx:
-+	movl	(%esp), %ebx
-+	ret
-+#endif
-+
- 	.bss
- 	.balign 64
- aes_round_keys:
diff --git a/sys-apps/rng-tools/files/rng-tools-5-man-fill-watermark.patch b/sys-apps/rng-tools/files/rng-tools-5-man-fill-watermark.patch
deleted file mode 100644
index ea249a5ebdfb..000000000000
--- a/sys-apps/rng-tools/files/rng-tools-5-man-fill-watermark.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/555094
-
-patch by Gokturk Yuksek <gokturk@binghamton.edu>
-
---- a/rngd.8.in
-+++ b/rngd.8.in
-@@ -66,7 +66,9 @@
- .TP
- \fB\-W\fI n\fR, \fB\-\-fill\-watermark=\fInnn\fR
- Once we start doing it, feed entropy to \fIrandom-device\fR until at least
--\fIfill-watermark\fR bits of entropy are available in its entropy pool (default: 2048).
-+\fIfill-watermark\fR bits of entropy are available in its entropy pool.
-+By default, this value is set to 75% of the entropy pool size or 2048 bits
-+if the entropy pool size couldn't be determined.
- Setting this too high will cause \fIrngd\fR to dominate the contents of the
- entropy pool.  Low values will hurt system performance during entropy 
- starves.  Do not set \fIfill-watermark\fR above the size of the
diff --git a/sys-apps/rng-tools/files/rng-tools-5-man-rng-device.patch b/sys-apps/rng-tools/files/rng-tools-5-man-rng-device.patch
deleted file mode 100644
index 82a0cf295765..000000000000
--- a/sys-apps/rng-tools/files/rng-tools-5-man-rng-device.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-https://bugs.gentoo.org/555106
-
-patch by Gokturk Yuksek <gokturk@binghamton.edu>
-
---- a/rngd.8.in
-+++ b/rngd.8.in
-@@ -59,7 +59,7 @@
- .TP
- \fB\-r\fI file\fR, \fB\-\-rng-device=\fIfile\fR
- Kernel device used for random number input
--(default: /dev/hwrandom)
-+(default: /dev/hwrng)
- .TP
- \fB\-s\fI nnn\fR, \fB\-\-random-step=\fInnn\fR
- Number of bytes written to random-device at a time (default: 64)
diff --git a/sys-apps/rng-tools/files/rngd-confd-4.1 b/sys-apps/rng-tools/files/rngd-confd-4.1
deleted file mode 100644
index 77e5db583458..000000000000
--- a/sys-apps/rng-tools/files/rngd-confd-4.1
+++ /dev/null
@@ -1,22 +0,0 @@
-# /etc/conf.d/rngd
-
-# Please see "/usr/sbin/rngd --help" and "man rngd" for more information
-
-# If a single device is preferred, then specify it here, otherwise we will
-# search for suitable devices.
-#DEVICE=
-
-# Random step (Number of bytes written to random-device at a time):
-STEP=64
-
-# Should TPM be avoided?
-# NO_TPM=0
-
-# Should RDRAND be avoided? Please note that unless this is commented
-# out, RDRAND _will_ be disabled, as any value will cause it to be
-# disabled.
-# NO_DRNG=1
-
-# Fill watermark
-# 0 <= n <= `sysctl kernel.random.poolsize`
-WATERMARK=2048
diff --git a/sys-apps/rng-tools/files/rngd-confd-6 b/sys-apps/rng-tools/files/rngd-confd-6
deleted file mode 100644
index a30e8c4fdadc..000000000000
--- a/sys-apps/rng-tools/files/rngd-confd-6
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# /etc/conf.d/rngd
-# Please see "/usr/sbin/rngd --help" and "man rngd" for more information
-
-# Space-delimited list of entropy sources to enable
-# Note that some of the entropy sources may require certain USE flags
-# to be enabled or require hardware support to function properly
-# Entropy sources not specified here (or in the exclude list below)
-# will be enabled/disabled based on rngd default behavior
-#
-# Choose from the list:
-#         hwrng:  Hardware RNG Device
-#         tpm:    TPM RNG Device (Deprecated)
-#         rdrand: Intel RDRAND Instruction RNG
-#         darn:   Power9 DARN Instruction RNG
-#         nist:   NIST Network Entropy Beacon
-#                 (UNSAFE for cryptographic operations)
-#         jitter: JITTER Entropy generator
-#
-#INCLUDE_ENTROPY_SOURCES="hwrng tpm rdrand darn nist jitter"
-
-
-# Space-delimited list of entropy sources to disable
-# This is useful for disabling certain entropy sources even
-# when they are supported on the system
-#
-#EXCLUDE_ENTROPY_SOURCES="nist tpm"
-
-
-# Entropy source specific options:
-#
-#
-# hwrng device used for random number input:
-#
-#HWRNG_DEVICE="/dev/hwrng"
-#
-#
-# rdrand options:
-#         use_aes:(BOOLEAN)
-#
-#RDRAND_OPTIONS="use_aes:1"
-#
-#
-# darn options:
-#         use_aes:(BOOLEAN)
-#
-#DARN_OPTIONS="use_aes:1"
-#
-#
-# jitter options:
-#         thread_count:(INTEGER)
-#         buffer_size:(INTEGER)
-#         refill_thresh:(INTEGER)
-#         retry_count:(INTEGER)
-#         retry_delay:(INTEGER)
-#         use_aes:(BOOLEAN)
-#
-#JITTER_OPTIONS="thread_count:4 buffer_size:16535 refill_thresh:16535"
-#JITTER_OPTIONS="${JITTER_OPTIONS} retry_count:1 retry_delay:-1 use_aes:1"
-
-
-# Kernel device used for random number output
-#
-#RANDOM_DEVICE="/dev/random"
-
-
-# Random step (Number of bytes written to random-device at a time):
-#
-#STEP=64
-
-
-# Fill watermark
-# 0 <= n <= `sysctl kernel.random.poolsize`
-#
-#WATERMARK=2048
-
-
-# Any extra arguments for rngd
-#
-#EXTRA_ARGS=""
diff --git a/sys-apps/rng-tools/files/rngd-initd-6-r1 b/sys-apps/rng-tools/files/rngd-initd-6-r1
deleted file mode 100644
index 5d89dd7a1868..000000000000
--- a/sys-apps/rng-tools/files/rngd-initd-6-r1
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-	after urandom
-	provide entropy
-}
-
-command="/usr/sbin/rngd"
-description="Check and feed random data from hardware device to kernel entropy pool."
-pidfile="/var/run/${RC_SVCNAME}.pid"
-command_args=""
-command_args_background="--pid-file ${pidfile} --background"
-start_stop_daemon_args="--wait 1000"
-retry="SIGKILL/5000"
-
-
-# Parse rngd confd file for extra command line arguments
-start_pre() {
-    for entsrc in ${INCLUDE_ENTROPY_SOURCES}; do
-	command_args="${command_args} -n ${entsrc}"
-    done
-
-    for entsrc in ${EXCLUDE_ENTROPY_SOURCES}; do
-	command_args="${command_args} -x ${entsrc}"
-    done
-
-    if [ "x${HWRNG_DEVICE}" != "x" ]; then
-	command_args="${command_args} --rng-device=${HWRNG_DEVICE}"
-    fi
-
-    for entsrc_opt in ${RDRAND_OPTIONS}; do
-	command_args="${command_args} -O rdrand:${entsrc_opt}"
-    done
-
-    for entsrc_opt in ${DARN_OPTIONS}; do
-	command_args="${command_args} -O darn:${entsrc_opt}"
-    done
-
-    for entsrc_opt in ${JITTER_OPTIONS}; do
-	command_args="${command_args} -O jitter:${entsrc_opt}"
-    done
-
-    if [ "x${RANDOM_DEVICE}" != "x" ]; then
-	command_args="${command_args} --random-device=${RANDOM_DEVICE}"
-    fi
-
-    if [ "x${STEP}" != "x" ]; then
-	command_args="${command_args} --random-step=${STEP}"
-    fi
-
-    if [ "x${WATERMARK}" != "x" ]; then
-	command_args="${command_args} --fill-watermark=${WATERMARK}"
-    fi
-
-    command_args="${command_args} ${EXTRA_ARGS}"
-    return 0
-}
diff --git a/sys-apps/rng-tools/files/rngd-initd-r1-4.1 b/sys-apps/rng-tools/files/rngd-initd-r1-4.1
deleted file mode 100644
index b7777ebab71c..000000000000
--- a/sys-apps/rng-tools/files/rngd-initd-r1-4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need localmount
-	after urandom
-	provide entropy
-}
-
-command=/usr/sbin/rngd
-pidfile="/var/run/${SVCNAME}.pid"
-command_args="--pid-file ${pidfile} --background --random-step ${STEP:-64} ${NO_TPM:+--no-tpm=1} \
-	${NO_DRNG:+--no-drng=1} --fill-watermark ${WATERMARK} ${DEVICE:+--rng-device ${DEVICE}}"
-start_stop_daemon_args="--wait 1000"
-retry="SIGKILL/5000"
diff --git a/sys-apps/rng-tools/files/rngd-shutdown.patch b/sys-apps/rng-tools/files/rngd-shutdown.patch
deleted file mode 100644
index ba2fffdd86f6..000000000000
--- a/sys-apps/rng-tools/files/rngd-shutdown.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://bugzilla.redhat.com/show_bug.cgi?id=1690364
-
-diff --git a/rngd_jitter.c b/rngd_jitter.c
-index 23d96b3..43a13e0 100644
---- a/rngd_jitter.c
-+++ b/rngd_jitter.c
-@@ -473,26 +473,22 @@ void close_jitter_entropy_source(struct rng *ent_src)
- 	for (i=0; i < num_threads; i++)
- 		tdata[i].active = 0;
- 
--	flags = fcntl(pipefds[1], F_GETFL, 0);
--	flags |= O_NONBLOCK;
--	fcntl(pipefds[1], F_SETFL, &flags);
-+	close(pipefds[1]);
- 
- 	/* And wait for completion of each thread */
- 	for (i=0; i < num_threads; i++) {
- 		message(LOG_DAEMON|LOG_DEBUG, "Checking on done for thread %d\n", i);
- 		while (!tdata[i].done)
-+			pthread_kill(threads[i], SIGINT);
- 			if(tdata[i].done) {
- 				message(LOG_DAEMON|LOG_INFO, "Closing thread %d\n", tdata[i].core_id);
- 				pthread_join(threads[i], NULL);
- 				jent_entropy_collector_free(tdata[i].ec);
--			} else {
--				read(pipefds[0], tmpbuf, 1024);
-+			} else 
- 				sched_yield();
--			}
- 	}
- 
--	close(pipefds[2]);
--	close(pipefds[1]);
-+	close(pipefds[0]);
- 	free(tdata);
- 	free(threads);
- 	return;
diff --git a/sys-apps/rng-tools/files/test-for-argp.patch b/sys-apps/rng-tools/files/test-for-argp.patch
deleted file mode 100644
index 4ed2aa40b6df..000000000000
--- a/sys-apps/rng-tools/files/test-for-argp.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-On glibc systems, argp is provided by libc.  However, on
-uclibc and other systems which lack argp in their C library,
-argp might be provided by a stand alone library, libargp.
-This patch adds tests to the build system to find who provides
-argp.
-
-X-Gentoo-Bug: 292191
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=292191
-Reported-by: Ed Wildgoose <gentoo@wildgooses.com>
-Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -47,6 +47,28 @@
- dnl Checks for optional library functions
- dnl -------------------------------------
- 
-+dnl First check if we have argp available from libc
-+AC_LINK_IFELSE(
-+	[AC_LANG_PROGRAM(
-+		[#include <argp.h>],
-+		[int argc=1; char *argv[]={"test"}; argp_parse(0,argc,argv,0,0,0); return 0;]
-+		)],
-+	[libc_has_argp="true"],
-+	[libc_has_argp="false"]
-+)
-+
-+dnl If libc doesn't provide argp, then test for libargp
-+if test "$libc_has_argp" = "false" ; then
-+	AC_MSG_WARN("libc does not have argp")
-+	AC_CHECK_LIB([argp], [argp_parse], [have_argp="true"], [have_argp="false"])
-+
-+	if test "$have_argp" = "false"; then
-+		AC_MSG_ERROR("no libargp found")
-+	else
-+		LIBS+=" -largp"
-+	fi
-+fi
-+
- dnl -----------------
- dnl Configure options
- dnl -----------------
diff --git a/sys-apps/rng-tools/rng-tools-5-r2.ebuild b/sys-apps/rng-tools/rng-tools-5-r2.ebuild
deleted file mode 100644
index 40645077af97..000000000000
--- a/sys-apps/rng-tools/rng-tools-5-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools systemd toolchain-funcs
-
-DESCRIPTION="Daemon to use hardware random number generators"
-HOMEPAGE="http://gkernel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc x86"
-IUSE="selinux"
-
-DEPEND="dev-libs/libgcrypt:0
-	dev-libs/libgpg-error
-	elibc_musl? ( sys-libs/argp-standalone )"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-rngd )"
-
-src_prepare() {
-	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
-	epatch "${FILESDIR}"/test-for-argp.patch
-	epatch "${FILESDIR}"/${P}-fix-textrels-on-PIC-x86.patch #469962
-	epatch "${FILESDIR}"/${P}-man-fill-watermark.patch #555094
-	epatch "${FILESDIR}"/${P}-man-rng-device.patch #555106
-	epatch "${FILESDIR}"/${P}-fix-noctty.patch #556456
-	eautoreconf
-
-	sed -i '/^AR /d' Makefile.in || die
-	tc-export AR
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/rngd-initd-r1-4.1 rngd
-	newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
-	systemd_dounit "${FILESDIR}"/rngd.service
-}
diff --git a/sys-apps/rng-tools/rng-tools-6.10-r1.ebuild b/sys-apps/rng-tools/rng-tools-6.10-r1.ebuild
index d5f8c40bc124..76de150c11ce 100644
--- a/sys-apps/rng-tools/rng-tools-6.10-r1.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
 IUSE="jitterentropy libressl nistbeacon pkcs11 selinux"
 
 DEPEND="
diff --git a/sys-apps/rng-tools/rng-tools-6.10.ebuild b/sys-apps/rng-tools/rng-tools-6.10.ebuild
deleted file mode 100644
index 52e0489c3fc3..000000000000
--- a/sys-apps/rng-tools/rng-tools-6.10.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Daemon to use hardware random number generators"
-HOMEPAGE="https://github.com/nhorman/rng-tools"
-SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
-IUSE="jitterentropy nistbeacon pkcs11 selinux"
-
-DEPEND="
-	dev-libs/openssl:0=
-	sys-fs/sysfsutils
-	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 )
-"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-rngd )"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
-
-	default
-
-	mv README.md README || die
-
-	eautoreconf
-
-	sed -i '/^AR /d' Makefile.in || die
-	tc-export AR
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable jitterentropy)
-		$(use_with nistbeacon)
-		$(use_with pkcs11)
-		--without-rtlsdr # no librtlsdr in the tree
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/rngd-initd-6.7-r1 rngd
-	newconfd "${FILESDIR}"/rngd-confd-6.7 rngd
-	systemd_dounit "${FILESDIR}"/rngd.service
-
-	if use pkcs11; then
-		local DISABLE_AUTOFORMATTING=1
-		local DOC_CONTENTS="
-The PKCS11 entropy source may require extra packages (e.g. 'dev-libs/opensc')
-to support various smartcard readers. Make sure 'PKCS11_OPTIONS' in:
-	'${EROOT}/etc/conf.d/rngd'
-reflects the correct PKCS11 engine path to be used by rngd.
-"
-		readme.gentoo_create_doc
-	fi
-
-}
-
-pkg_postinst() {
-	use pkcs11 && readme.gentoo_print_elog
-}
diff --git a/sys-apps/rng-tools/rng-tools-6.6-r1.ebuild b/sys-apps/rng-tools/rng-tools-6.6-r1.ebuild
deleted file mode 100644
index 7ad1a1edc80a..000000000000
--- a/sys-apps/rng-tools/rng-tools-6.6-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd toolchain-funcs
-
-DESCRIPTION="Daemon to use hardware random number generators"
-HOMEPAGE="https://github.com/nhorman/rng-tools"
-SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~x86"
-IUSE="jitterentropy nistbeacon selinux"
-
-DEPEND="dev-libs/libgcrypt:0
-	dev-libs/libgpg-error
-	sys-fs/sysfsutils
-	jitterentropy? (
-		app-crypt/jitterentropy:=
-	)
-	nistbeacon? (
-		net-misc/curl[ssl]
-		dev-libs/libxml2:2=
-		dev-libs/openssl:0=
-	)
-	elibc_musl? ( sys-libs/argp-standalone )
-"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-rngd )"
-DEPEND="${DEPEND}
-	nistbeacon? (
-		virtual/pkgconfig
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/test-for-argp.patch
-	"${FILESDIR}"/${PN}-5-fix-textrels-on-PIC-x86.patch #469962
-)
-
-src_prepare() {
-	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
-	default
-
-	mv README.md README || die
-
-	eautoreconf
-
-	sed -i '/^AR /d' Makefile.in || die
-	tc-export AR
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with nistbeacon)
-		$(use_enable jitterentropy)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/rngd-initd-6-r1 rngd
-	newconfd "${FILESDIR}"/rngd-confd-6 rngd
-	systemd_dounit "${FILESDIR}"/rngd.service
-}
diff --git a/sys-apps/rng-tools/rng-tools-6.7-r1.ebuild b/sys-apps/rng-tools/rng-tools-6.7-r1.ebuild
deleted file mode 100644
index 35ca738e350c..000000000000
--- a/sys-apps/rng-tools/rng-tools-6.7-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Daemon to use hardware random number generators"
-HOMEPAGE="https://github.com/nhorman/rng-tools"
-SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
-IUSE="jitterentropy nistbeacon pkcs11 selinux"
-
-DEPEND="dev-libs/libgcrypt:0
-	dev-libs/libgpg-error
-	sys-fs/sysfsutils
-	jitterentropy? (
-		app-crypt/jitterentropy:=
-	)
-	nistbeacon? (
-		net-misc/curl[ssl]
-		dev-libs/libxml2:2=
-		dev-libs/openssl:0=
-	)
-	pkcs11? (
-		dev-libs/libp11:=
-	)
-	elibc_musl? ( sys-libs/argp-standalone )
-"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-rngd )"
-DEPEND="${DEPEND}
-	nistbeacon? (
-		virtual/pkgconfig
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/test-for-argp.patch
-	"${FILESDIR}"/${PN}-5-fix-textrels-on-PIC-x86.patch #469962
-)
-
-src_prepare() {
-	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
-
-	# rngd_pkcs11.c needs to be linked against -lcrypto #684228
-	# See: https://github.com/nhorman/rng-tools/pull/61
-	if use pkcs11; then
-		sed -e '/rngd_pkcs11.c$/ a rngd_LDADD\t+= -lcrypto' \
-			-i Makefile.am || die
-	fi
-
-	default
-
-	mv README.md README || die
-
-	eautoreconf
-
-	sed -i '/^AR /d' Makefile.in || die
-	tc-export AR
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable jitterentropy)
-		$(use_with nistbeacon)
-		$(use_with pkcs11)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/rngd-initd-6.7-r1 rngd
-	newconfd "${FILESDIR}"/rngd-confd-6.7 rngd
-	systemd_dounit "${FILESDIR}"/rngd.service
-
-	if use pkcs11; then
-		local DISABLE_AUTOFORMATTING=1
-		local DOC_CONTENTS="
-The PKCS11 entropy source may require extra packages (e.g. 'dev-libs/opensc')
-to support various smartcard readers. Make sure 'PKCS11_OPTIONS' in:
-	'${EROOT%/}/etc/conf.d/rngd'
-reflects the correct PKCS11 engine path to be used by rngd.
-"
-		readme.gentoo_create_doc
-	fi
-
-}
-
-pkg_postinst() {
-	use pkcs11 && readme.gentoo_print_elog
-}
diff --git a/sys-apps/rng-tools/rng-tools-6.7-r2.ebuild b/sys-apps/rng-tools/rng-tools-6.7-r2.ebuild
deleted file mode 100644
index adeb2bb4fccc..000000000000
--- a/sys-apps/rng-tools/rng-tools-6.7-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Daemon to use hardware random number generators"
-HOMEPAGE="https://github.com/nhorman/rng-tools"
-SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
-IUSE="jitterentropy nistbeacon pkcs11 selinux"
-
-DEPEND="dev-libs/libgcrypt:0
-	dev-libs/libgpg-error
-	sys-fs/sysfsutils
-	jitterentropy? (
-		app-crypt/jitterentropy:=
-	)
-	nistbeacon? (
-		net-misc/curl[ssl]
-		dev-libs/libxml2:2=
-		dev-libs/openssl:0=
-	)
-	pkcs11? (
-		dev-libs/libp11:=
-	)
-	elibc_musl? ( sys-libs/argp-standalone )
-"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-rngd )"
-DEPEND="${DEPEND}
-	nistbeacon? (
-		virtual/pkgconfig
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/test-for-argp.patch
-	"${FILESDIR}"/${PN}-5-fix-textrels-on-PIC-x86.patch #469962
-	"${FILESDIR}"/rngd-shutdown.patch
-)
-
-src_prepare() {
-	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
-
-	# rngd_pkcs11.c needs to be linked against -lcrypto #684228
-	# See: https://github.com/nhorman/rng-tools/pull/61
-	if use pkcs11; then
-		sed -e '/rngd_pkcs11.c$/ a rngd_LDADD\t+= -lcrypto' \
-			-i Makefile.am || die
-	fi
-
-	default
-
-	mv README.md README || die
-
-	eautoreconf
-
-	sed -i '/^AR /d' Makefile.in || die
-	tc-export AR
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable jitterentropy)
-		$(use_with nistbeacon)
-		$(use_with pkcs11)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/rngd-initd-6.7-r1 rngd
-	newconfd "${FILESDIR}"/rngd-confd-6.7 rngd
-	systemd_dounit "${FILESDIR}"/rngd.service
-
-	if use pkcs11; then
-		local DISABLE_AUTOFORMATTING=1
-		local DOC_CONTENTS="
-The PKCS11 entropy source may require extra packages (e.g. 'dev-libs/opensc')
-to support various smartcard readers. Make sure 'PKCS11_OPTIONS' in:
-	'${EROOT%/}/etc/conf.d/rngd'
-reflects the correct PKCS11 engine path to be used by rngd.
-"
-		readme.gentoo_create_doc
-	fi
-
-}
-
-pkg_postinst() {
-	use pkcs11 && readme.gentoo_print_elog
-}
diff --git a/sys-apps/rng-tools/rng-tools-6.8.ebuild b/sys-apps/rng-tools/rng-tools-6.8.ebuild
deleted file mode 100644
index 85c8eb05db86..000000000000
--- a/sys-apps/rng-tools/rng-tools-6.8.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Daemon to use hardware random number generators"
-HOMEPAGE="https://github.com/nhorman/rng-tools"
-SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
-IUSE="jitterentropy nistbeacon pkcs11 selinux"
-
-DEPEND="dev-libs/libgcrypt:0
-	dev-libs/libgpg-error
-	sys-fs/sysfsutils
-	jitterentropy? (
-		app-crypt/jitterentropy:=
-	)
-	nistbeacon? (
-		net-misc/curl[ssl]
-		dev-libs/libxml2:2=
-		dev-libs/openssl:0=
-	)
-	pkcs11? (
-		dev-libs/libp11:=
-		dev-libs/openssl:0=
-	)
-	elibc_musl? ( sys-libs/argp-standalone )
-"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-rngd )"
-DEPEND="${DEPEND}
-	nistbeacon? (
-		virtual/pkgconfig
-	)
-"
-
-src_prepare() {
-	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
-
-	default
-
-	mv README.md README || die
-
-	eautoreconf
-
-	sed -i '/^AR /d' Makefile.in || die
-	tc-export AR
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable jitterentropy)
-		$(use_with nistbeacon)
-		$(use_with pkcs11)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/rngd-initd-6.7-r1 rngd
-	newconfd "${FILESDIR}"/rngd-confd-6.7 rngd
-	systemd_dounit "${FILESDIR}"/rngd.service
-
-	if use pkcs11; then
-		local DISABLE_AUTOFORMATTING=1
-		local DOC_CONTENTS="
-The PKCS11 entropy source may require extra packages (e.g. 'dev-libs/opensc')
-to support various smartcard readers. Make sure 'PKCS11_OPTIONS' in:
-	'${EROOT%/}/etc/conf.d/rngd'
-reflects the correct PKCS11 engine path to be used by rngd.
-"
-		readme.gentoo_create_doc
-	fi
-
-}
-
-pkg_postinst() {
-	use pkcs11 && readme.gentoo_print_elog
-}
diff --git a/sys-apps/rng-tools/rng-tools-6.9.ebuild b/sys-apps/rng-tools/rng-tools-6.9.ebuild
deleted file mode 100644
index 45d0870a2f1b..000000000000
--- a/sys-apps/rng-tools/rng-tools-6.9.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
-
-inherit autotools systemd readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Daemon to use hardware random number generators"
-HOMEPAGE="https://github.com/nhorman/rng-tools"
-SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
-IUSE="jitterentropy nistbeacon pkcs11 selinux"
-
-DEPEND="dev-libs/libgcrypt:0
-	dev-libs/libgpg-error
-	sys-fs/sysfsutils
-	jitterentropy? (
-		app-crypt/jitterentropy:=
-	)
-	nistbeacon? (
-		net-misc/curl[ssl]
-		dev-libs/libxml2:2=
-		dev-libs/openssl:0=
-	)
-	pkcs11? (
-		dev-libs/libp11:=
-		dev-libs/openssl:0=
-	)
-	elibc_musl? ( sys-libs/argp-standalone )
-"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-rngd )"
-DEPEND="${DEPEND}
-	nistbeacon? (
-		virtual/pkgconfig
-	)
-"
-
-src_prepare() {
-	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
-
-	default
-
-	mv README.md README || die
-
-	eautoreconf
-
-	sed -i '/^AR /d' Makefile.in || die
-	tc-export AR
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable jitterentropy)
-		$(use_with nistbeacon)
-		$(use_with pkcs11)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	newinitd "${FILESDIR}"/rngd-initd-6.7-r1 rngd
-	newconfd "${FILESDIR}"/rngd-confd-6.7 rngd
-	systemd_dounit "${FILESDIR}"/rngd.service
-
-	if use pkcs11; then
-		local DISABLE_AUTOFORMATTING=1
-		local DOC_CONTENTS="
-The PKCS11 entropy source may require extra packages (e.g. 'dev-libs/opensc')
-to support various smartcard readers. Make sure 'PKCS11_OPTIONS' in:
-	'${EROOT%/}/etc/conf.d/rngd'
-reflects the correct PKCS11 engine path to be used by rngd.
-"
-		readme.gentoo_create_doc
-	fi
-
-}
-
-pkg_postinst() {
-	use pkcs11 && readme.gentoo_print_elog
-}
diff --git a/sys-apps/secilc/Manifest b/sys-apps/secilc/Manifest
index 084ae7ae46bf..d4546a41383e 100644
--- a/sys-apps/secilc/Manifest
+++ b/sys-apps/secilc/Manifest
@@ -3,6 +3,6 @@ DIST secilc-3.0.tar.gz 176060 BLAKE2B dcceaa72f3e34777f0d4a6a05de073e4f2dc53b757
 DIST secilc-3.1.tar.gz 176631 BLAKE2B e79818580d2a788d672574ebd77349f0c59b678d2be628479f517412ca876fa225ba0dd63ef3200ed15ff693cd5f4cb4ff537d81666fef3a008ba4b3a7577e0c SHA512 79e3e4910178af49ea164d620aa997adb21dd18581c054a4023dd9116ec9dd203bd12989ef308aa1d253b47fcd251ee2b99c26e143d1db3de22a7f374ff38e0b
 EBUILD secilc-2.9.ebuild 902 BLAKE2B d21e16c113f24dcde2db43a79ea5c6618f55e5ee24e8bfba4006b44b092760ad9b3240d72b8847e1dbe2a3cad581a9a0d08540c9bac70528ac7cfad14f6b7578 SHA512 77304add0be53344872bbd68e91da6e1d5747b58d1b5af4ce47a42377f82e02bcc3df46477dbb169a1bd053a2f0a5548a30dc46bb74fbd6e636caec970eb6363
 EBUILD secilc-3.0.ebuild 902 BLAKE2B edd6c9642e5cb1457c58fed5e391ee9163c31b223217f8b775411d7f7459ba10278ee726612f24a6baad884642970baa441c39bc4b47075543822717a1bc1cee SHA512 b5ab249d7279d50bf97e26004f6f0bf5e57df6ccd24b5261fc99ff20b2fcb9d4df8cc241aeb11d759a346b05c50fe39c03233fc109c6a2367ba244b77957322e
-EBUILD secilc-3.1.ebuild 904 BLAKE2B 4393b427e8c7bfa3aeffeed3b22c43d561b1f7e82a3b444562151bb79e70ab66e40b2555b090b2704ad83c574eb95d1f44cca193add74ce00a464ff72c377a8f SHA512 fc08f700371c287d7b9dee5cc2af798981358c9c0f97b045d1dbd039d1088833a7d8670c4ae9aa4d411732eb4b2d42f5b0f0b7282d4d5bee34cac39d5a075068
+EBUILD secilc-3.1.ebuild 902 BLAKE2B 3a2c205279d1d2870fb89bad1506fda1864b044fa6788f02ebba8f9b4c9b1155541dfa26fd18e3cd2823cad09597553be2510ff9058f4de2640d800a225ca19e SHA512 b418e483ca94112e6ae467b60a93231b20d45ff065d9d6bb6d20df41c4baf163f140114a0c7e3745423bc2283023df4d5e37815abb95c6d68cd1f4c57c9dc377
 EBUILD secilc-9999.ebuild 904 BLAKE2B 4393b427e8c7bfa3aeffeed3b22c43d561b1f7e82a3b444562151bb79e70ab66e40b2555b090b2704ad83c574eb95d1f44cca193add74ce00a464ff72c377a8f SHA512 fc08f700371c287d7b9dee5cc2af798981358c9c0f97b045d1dbd039d1088833a7d8670c4ae9aa4d411732eb4b2d42f5b0f0b7282d4d5bee34cac39d5a075068
 MISC metadata.xml 517 BLAKE2B 69224c0360ff5acd98dcd493463266090ad17693588e91a434e412460352594673563388b52eba5313c7a9aa3b745d916f089805fe88ba8270cef1528f1fe13c SHA512 457ff97de6f9c6992a025588a5af5692abfc38a7df8537de2006ac841989a9b7e566b796b16d304252ad03cf66f205dd3a4fb0218281fd551c430c58b9039310
diff --git a/sys-apps/secilc/secilc-3.1.ebuild b/sys-apps/secilc/secilc-3.1.ebuild
index db36c3ca9f49..84a3781d99e3 100644
--- a/sys-apps/secilc/secilc-3.1.ebuild
+++ b/sys-apps/secilc/secilc-3.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index 9904de74f117..5448cb0be073 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -3,7 +3,7 @@ DIST selinux-python-3.0.tar.gz 2100098 BLAKE2B 6949911020139378e9bdcc2b7c01c067d
 DIST selinux-python-3.1.tar.gz 2100549 BLAKE2B c5d207bad60c379259e3bfc8f029f76d4572818cdd41a263498ed4434a70eaf7ff51af7772cfb27de0e9e4af03bcf9906ab0f6a59e88de10e81cbe0e8c5928b8 SHA512 5dd98f77ae8ea8bac6a89ec7def76e12496b9a9f8c9612c4cc1dac7a8e8c60380a00c857426bfefbcb4273706addd2594e9b467f69408ef284f082a09d45bd49
 EBUILD selinux-python-2.9.ebuild 2552 BLAKE2B c3a46c9b484dd134426ee1cfecdcd0caedefa0d02cb1071789ca62c7a2ad860c12f770bd8130ed25f660b70e352ca2c65b062ee6bf9ac2b185e651ccfd44e861 SHA512 2d896bb07f08d2def9eceebfaf0aad8fa27e3041ca44e04c3e936502d9323b48a0d8c89c5611ea9885c90d90a9c0823f3c8786bec5520857b20ad4f18461fe61
 EBUILD selinux-python-3.0.ebuild 2558 BLAKE2B c390f92149cd44b5443867439f64d0e71b75c9614e7d3115008b57b04d0307dfc36fa4c4a43ca725a9b5a723c12091c9496257dc0f4c31908a52c922a943c348 SHA512 5c4533c9bf0545c13881c7b2f4281c4e3e14498f4e5def1285843b0464d232e6f6bdaaf49cbd9b3ffd3b72e07f03659d56405e2431b5f195dd27f592c42aff61
-EBUILD selinux-python-3.1-r1.ebuild 2594 BLAKE2B 253043520f734e82b27141c2e2d1088dbccb3ca016f35607ace5808f365498060400500172e7c5bd217168464f5fd14c09328ab3b19df47ad29ef74692aaa4eb SHA512 8814d31ee68f9bb1ca40b354b4f955982eff55f13a4f8022d433083cc9316e2fa3f32d799c8157e2a5573f6f083c3ef5c6794be8f812bafb6b5c803439bb4ce9
+EBUILD selinux-python-3.1-r1.ebuild 2592 BLAKE2B 4e8887963e09d6138443885f7a52075206118bf5711e2ca1b4fbd3ce4251e3c7c7a2982d8ea263e45d9308211e6f614680870dad023465dd89d5c909a08a32f2 SHA512 da4d84af8e26af692c07b4009fdc7549c2fc13236dc7574d8967864976a83094ea877dde63591ad88a48c7be3391720ebfc8895476202fa39b7f29b73f5adea3
 EBUILD selinux-python-3.1.ebuild 2542 BLAKE2B 617dde2527956f09f532fc118ef84962fc384a78c647aeec98f2f6e2f40da23f562aae4afd2c6c90ab66a19e1ea10d1af03cf7c8265b59519898d86f276b95b2 SHA512 f2e98e15ed3c1b91498d829b7938473bf73b780cff4bd6d2a559b8b12b4e63de88cc19e8208ad94a7260c0ea316ca16299ff6bedb618651ae0fff2bc0c4a6461
 EBUILD selinux-python-9999.ebuild 2594 BLAKE2B 253043520f734e82b27141c2e2d1088dbccb3ca016f35607ace5808f365498060400500172e7c5bd217168464f5fd14c09328ab3b19df47ad29ef74692aaa4eb SHA512 8814d31ee68f9bb1ca40b354b4f955982eff55f13a4f8022d433083cc9316e2fa3f32d799c8157e2a5573f6f083c3ef5c6794be8f812bafb6b5c803439bb4ce9
 MISC metadata.xml 557 BLAKE2B 40a5075b9313be98cc5566696ebdf42dfa77814d2c5907832c06b8f846cb902023949bca3aa1b37a03a756649c6025f5f91357c0f6c73292b864396ea1c118cd SHA512 248d0177b4794bd342b35ce901f91a67227f1d8b256f6a56f06b3d424e94dbfb48b8500623bdccc2e0650402276cc1e50d1a7f475e2b04505ec0d4b4f2b590fe
diff --git a/sys-apps/selinux-python/selinux-python-3.1-r1.ebuild b/sys-apps/selinux-python/selinux-python-3.1-r1.ebuild
index e3fe4738a86b..c92909383ffe 100644
--- a/sys-apps/selinux-python/selinux-python-3.1-r1.ebuild
+++ b/sys-apps/selinux-python/selinux-python-3.1-r1.ebuild
@@ -26,7 +26,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${MY_P}/${PN#selinux-}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/semodule-utils/Manifest b/sys-apps/semodule-utils/Manifest
index 0fd63ec0ea35..2d85657cd4aa 100644
--- a/sys-apps/semodule-utils/Manifest
+++ b/sys-apps/semodule-utils/Manifest
@@ -3,6 +3,6 @@ DIST semodule-utils-3.0.tar.gz 14263 BLAKE2B 119f40b34184e2cb0719e6a34ffb026f23c
 DIST semodule-utils-3.1.tar.gz 14257 BLAKE2B c8c9a1ce7c9c4f53b1f4c728d16b149fdc284f4cff8b4fce0cb59b77d37d6d7e9bf2102c7177c4eaf94677af6147e42d8d0bd55c0bf3a358968d0162d5a6c65a SHA512 b92794bbfbce5834ee7f62fddb40b5506e9291e8fa7c5d669b2e281089b8f8dc40c4522ea287ac5deffdaee751442ba8e691e2ac45fdd378b60d5d6b2527d157
 EBUILD semodule-utils-2.9.ebuild 977 BLAKE2B deb8b71bd36deb5b50e05578d31ede94a40c5e8c81070af3b55c83f82e17e5cd320a09ab6816a1aae945a431d3827773150c14bbe2b32743e59f544ec6dfb678 SHA512 4d817a11754753080b233110e1f24fa832427fb366ba39462959e197f724064b335e848aa47b1fcbce235627b7691b61c527e5b7e7e8410d81c0e2c84f811701
 EBUILD semodule-utils-3.0.ebuild 977 BLAKE2B d36ef3f0bdd532b05eb8c204ff1cd8c11174b85bd0469aec8f420e9874f35b6b7bdeb482c2021f6e15bd7ad826c6483c991e7d0ac6eace075eab8f57be0281c0 SHA512 35159c6ba4ead2c0909f86cc45f8995928565dd1e36b6bc513cf73d273188c6e93689724104991c9a46c6cfebea6bee33c5776057b8ad08016297c72906f4601
-EBUILD semodule-utils-3.1.ebuild 939 BLAKE2B bf2a3ee661d25124602ddefce76746570ebc974e6b8d7b28c78e0ba2b5144de528c7db7ad15afdcf6704ed86916535a6476aeca13d03aba498c3343b9df1e941 SHA512 20ae6289b23580918bac2b032357db24b847c771d290ada9391d66e5fc648fb57bd604b19d890edb7b6867cf840d3cb6ae34b7698d8dddf97b953c5a93df154e
+EBUILD semodule-utils-3.1.ebuild 937 BLAKE2B 2a17b566209258d0f47adf56d8c38f7c920f6ceb053e07bfaf7dd51139e39a42cc60a4e1986ccb19b50c4bc89b1c97b3a133c02a38431127dfd17200e361e535 SHA512 e36fad3f19c5f81791e57a02ff677a42d02e8037b4cad66d24d7bf37fa50863954c8fe58c18d1416212d24537febed8b91bdfa6fa3ce9c79efb5c80675b3d476
 EBUILD semodule-utils-9999.ebuild 939 BLAKE2B bf2a3ee661d25124602ddefce76746570ebc974e6b8d7b28c78e0ba2b5144de528c7db7ad15afdcf6704ed86916535a6476aeca13d03aba498c3343b9df1e941 SHA512 20ae6289b23580918bac2b032357db24b847c771d290ada9391d66e5fc648fb57bd604b19d890edb7b6867cf840d3cb6ae34b7698d8dddf97b953c5a93df154e
 MISC metadata.xml 400 BLAKE2B 688a9292eb5fc938ae1aef1e62cb46f7cfb119f8d8e784e03c7d3f0d13d48b5120037195d1aac27080b6768a28fa51c209a6928ad0b84aa3802bda55d66f94be SHA512 737d2e097f9b98132e1a75d42c95aaf8ec51be2c4da9898f33b7b07ef519bb846bfc36836c33fc3ddfc716fac06c610475149b5923a684a249f4edf6cc13a147
diff --git a/sys-apps/semodule-utils/semodule-utils-3.1.ebuild b/sys-apps/semodule-utils/semodule-utils-3.1.ebuild
index db1d166cceb3..21cea74be5de 100644
--- a/sys-apps/semodule-utils/semodule-utils-3.1.ebuild
+++ b/sys-apps/semodule-utils/semodule-utils-3.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]] ; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/smcipmitool/Manifest b/sys-apps/smcipmitool/Manifest
index f030d7eb0296..5e57809fa438 100644
--- a/sys-apps/smcipmitool/Manifest
+++ b/sys-apps/smcipmitool/Manifest
@@ -1,5 +1,5 @@
 AUX fake-java.bash 301 BLAKE2B e164317201544295dfaa10724c0319a4dc980d25256706172cb8547706725c05244c827489929faf19c0375630db0597427b1e42c758521a4b4d352d1e742d33 SHA512 bb5b4a57a0492df04f9428bbeedb6917fe5cf7273f0c73a300adb13e4d8b6e5cd907729cabfad548bafaa71a98e4ee1d996914fa4dafe0cd6e5a5310b1625e6d
 AUX launcher-pre.bash 149 BLAKE2B 7af8c0fb3d29784008e0c94aefad7d4f586e42f49a3dc9542c82755e1bf9af91cca452f8050b1c8c96f7bac887cb7da1c782efeae9d9eba24350a3a09c958025 SHA512 1d3ae073b2268ef070b4480a7d117091c6bbdc029a33e9f97c8cb5f008aa4b2d951371c17023ee91199b7daee4cd1fcd42f72cd8c3abb50c9932d29e65bb01a7
-DIST SMCIPMITool_2.23.0_build.191216_bundleJRE_Linux_x64.tar.gz 78810880 BLAKE2B fa4d0c7ed8cd7fb8b03847b30d22b4c70d74402be50ef217b237a0ba786e264a0832533476db5523cf3ce9a88c2191cbc9ff32d54911dfca54ff8835268f0efd SHA512 7770a1ec468934e1ac89612e77092f83ce91822326279afedcc5da9b5cdd84193e8077b87441c79253e366bde6f1ef3756ff35ff7fce8bc1759bb889ab8b082b
-EBUILD smcipmitool-2.23.0.191216.ebuild 1839 BLAKE2B 132b8c51469f0a37bc4ca4aa5170510f2741e2aa9121f056493964ed28941bed8e8fc5d0b8341c7b1b5ce7cf605e3b90260e3dd17d0394fae7b5b7414230dee7 SHA512 31347e3b5f314f2034f13f9f7f77496fb5baeb228cbf05a46872d9401ee64cbaf55d0b86040ca36a6132a6986f51b7fc68af6361f88a7907fefaab4c226fa44e
+DIST SMCIPMITool_2.24.0_build.201007_bundleJRE_Linux_x64.tar.gz 81360010 BLAKE2B 9903172cdfbe962b8147489bb96be57550b61dc4e4dff3728e980d105c6fbfbde1448c0264153e3bb38be1fcac7580e4fd96e2cd7de3a9ecdf797839fde7f133 SHA512 9ac85b79d3addbbedf938bd07d001ebd421f5261aad7d0ebe11b26d69c7d4ebc7c48a57a1a9c6538f51289962c8d18d09b6cf52946a686ca030012bb915bfb05
+EBUILD smcipmitool-2.24.0.201007-r1.ebuild 1825 BLAKE2B 790f51598495ef5e791da5ba9cbbbb677d8525d93e70061cf7ada04ce9f2a2a3528766350c81efcaa97f8b84cc688d095ba7dc74478ff423ec429aca4fa3638f SHA512 22a989fc5e2633503d05d26ac5ea2eea078924c77a39ef50896679a7151b9714c6c6a0e7583a1adeceb4d68950c1147123ce60fb52aaf1ea0544a9f9a0427a8d
 MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
diff --git a/sys-apps/smcipmitool/smcipmitool-2.23.0.191216.ebuild b/sys-apps/smcipmitool/smcipmitool-2.24.0.201007-r1.ebuild
index 279c66adc7f2..585fc347333b 100644
--- a/sys-apps/smcipmitool/smcipmitool-2.23.0.191216.ebuild
+++ b/sys-apps/smcipmitool/smcipmitool-2.24.0.201007-r1.ebuild
@@ -47,7 +47,7 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar *.jar
-	java-pkg_doso libjcurses.so *64.so
+	java-pkg_doso *64.so
 
 	local pre=$(prefixify_ro "${FILESDIR}"/launcher-pre.bash)
 	java-pkg_dolauncher smcipmitool-ikvm --jar iKVM.jar -pre "${pre}"
diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest
index e1fc89782dc6..89e71cd92348 100644
--- a/sys-apps/systemd-tmpfiles/Manifest
+++ b/sys-apps/systemd-tmpfiles/Manifest
@@ -3,5 +3,5 @@ AUX stmpfiles-setup.initd 396 BLAKE2B 54796d5db9fc350a98e467cf763afaa82bc27f5477
 AUX stmpfiles.confd 56 BLAKE2B c26aafd0e47b01354c7f20869cd71d36d7a8560e9013863eca6abb736d78c1eeb3eec00427c6bc8d37ab5b9bb88155d11b9e18809da9110ed40c77a34ebb1a82 SHA512 464cb238b87a8fbeb57e6534d0f2d861e8ade4219be9b7e2faf05c799f717cd2f23d176393bdd3c3b236058aa6f8bda837ad947fbe8f9489405760e9bfedbe40
 DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
 DIST systemd-tmpfiles-246-musl.tar.xz 25860 BLAKE2B 87fc4ca37abec9c1a0cee48bf78c575bd53e16a50d427eff338159dc6d5474ffd328af533ccf90a0e1e160a16baa7378070f418f2be0d7f77e00907a5d07d30e SHA512 4a93d9f0cb2df2dd0a2f91820615dd3a95d19583f45dc0589e37ceaedfc2040112310a6e3fc525e28e222e96a91498af2fe8541b5bf86a635c0f52dd1a84deb7
-EBUILD systemd-tmpfiles-246.ebuild 4491 BLAKE2B 17124a80e29a2211b42ea9d059bb8e45c6eadc7c1cd04d3bd25a263534f31cb6b7e942b294f55f68c558d5c56c7c9e531de11ee761cf89c77ab645660f35e273 SHA512 289624de6d5eaf333273969ad1fd82785fc17ac56a31b11e69857f264455acf00413250f0146de3337e34a24f2aea9ed88d4f862dbe19305742c3bc9459bba25
+EBUILD systemd-tmpfiles-246.ebuild 4564 BLAKE2B a1bea3e658ff600a43d1efe50653657138604ed1b67e14cb15fba995a3e6925d18f802b827297e29d92c5c663c64df7f5f6c751ea4971bd1b6288c3820e8b1a6 SHA512 0aa13da16c17fd3481d51b7fe427737ce00b06a6d3dfa264e42a1e25562676a39858fa799e4135510544035ca419849b4ff2f2231d1e07a9e926ba77c5397db2
 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
index 99967bb12780..dae5539fd8c7 100644
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
@@ -14,8 +14,8 @@ SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${P
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
-IUSE="test"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
+IUSE="selinux test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -23,6 +23,7 @@ DEPEND="
 	>=sys-apps/util-linux-2.30:0=
 	>=sys-kernel/linux-headers-${MINKV}
 	sys-libs/libcap:0=
+	selinux? ( sys-libs/libselinux:0= )
 "
 RDEPEND="${DEPEND}
 	!sys-apps/opentmpfiles
@@ -117,7 +118,6 @@ src_configure() {
 		resolve
 		rfkill
 		seccomp
-		selinux
 		smack
 		sysusers
 		timedated
@@ -147,6 +147,7 @@ src_configure() {
 		-Dstatic-libsystemd=true
 		-Dsysvinit-path=''
 		${systemd_disable_options[@]}
+		$(meson_use selinux)
 	)
 	meson_src_configure
 }
@@ -198,7 +199,7 @@ add_service() {
 
 	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
 	mkdir -p "${EROOT}/etc/runlevels/${runlevel}"
-	ln -snf "${EROOT}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
+	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
 }
 
 pkg_postinst() {
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 55d97a083965..5ceba5d2a947 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -7,8 +7,10 @@ AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f1
 DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
 DIST systemd-247-rc2.tar.gz 9865122 BLAKE2B ddc12d733fa81cedcea974d05980e3b6731c48229c6ba30dbdeab1a17f32ab7f17f140b6609a542482cf972dc447d797a400a4b7dc30961c1dfdb9d79f0973e2 SHA512 01fb347f3edb08efdf97b54339b381e4747377af08528f7267e6de6e85215025f81da13f822fcd9b449891b925aa163c6755dea86e6727b626ea27c19e5f391b
 DIST systemd-stable-246.6.tar.gz 9545237 BLAKE2B 5290736b30ca1a3188335a74d49b4f3e8b48007d9563efac1985ea6428a8b8fd6cad7ae87c35e13a32f851ebd27821829738274d35cfbff9340750bd3b086621 SHA512 1936b291d9831cf61f800fe718a4c2c2fe9b2a11fd817fe32bd48da2087a675dfc91013209a3478ea52e8ada593300ed906e248b8081dcf9141bf1cc17483ea9
+DIST systemd-stable-247.1.tar.gz 9889494 BLAKE2B d16535242d8e80e2f698cc5cb17f9e50c971ecf883b8d68433dd952175f50d511cad90fcf98da5f8f760b10c388842128f7f62aaef57e8175a9d6f70a7283fa5 SHA512 2a737afcee4409c2be073d8cb650c3465a25c101b3c3072ea6e6a0614d06e3ed7ae55c84f9ae60555915ad1480b3a13aa72fef4b9210139afe6b0d7a7629385a
 EBUILD systemd-246-r2.ebuild 15224 BLAKE2B 7b1108222a77b92640c21d46c09bca1d40247cc0711913341dae37740d8b38c70741be0471360d4ba602e4823628a9cbb0f26e8535b3c223bfbb29bc494dfef7 SHA512 cb7f79c8cf8bc638c1104f141345043a7a041d3729a514debc62a1e726467c387ed11bd6160fc02e9993a56dede7958aa1b664dec0a62c603254842708f1d59b
 EBUILD systemd-246.6.ebuild 15260 BLAKE2B c4f0800e64d042ca74626e88bb34072ea4b84931a27192362ba096a3aeea73350cd4d49fe0d614a66d774a8166d1929b7664a227ae750bd5ccd15bdb4da70aaf SHA512 eff22df11fb3ff8d5707b8d122b6caeafb29b04194f3e70439028c64f57f4a5eceee6ff2aeca9643cbcdb8a42daed18bd9ce3f771d6fd18e3729b045c4263a67
+EBUILD systemd-247.1.ebuild 15274 BLAKE2B 6d09faf768eae5b11307a3ad622cc2e357299f8333f9cba9cc307e9fbce58f15d57776c9939da979da26b9cb5ccfe87cf99550dc0fca6a8d3cd467afb8db387f SHA512 728dd45503e2f865a7ad97c2483b024dbb4c3c4d7c64cab0660705892a271736089360fabf739cd70996e85bdaea33fa10e5ee721dbbb2009a244e29090e1a05
 EBUILD systemd-247_rc2.ebuild 15267 BLAKE2B 687764f5cf5bdaf407b37441f9ddf3efa231f7630ef04483018342d34f56aef303a03031909fec3fc6db9a673a4ea6d09f2efe2e238edd571ad2df40d6414a25 SHA512 a09666aa382d6882fb64c15e0b9fa3bab7dad25ff5ef6b5a32855701a428cf277cee3d9ad21e2887332a57fdcc510a676b2cb6799f3c4c1aa652ab0169a9fcda
 EBUILD systemd-9999.ebuild 15267 BLAKE2B 687764f5cf5bdaf407b37441f9ddf3efa231f7630ef04483018342d34f56aef303a03031909fec3fc6db9a673a4ea6d09f2efe2e238edd571ad2df40d6414a25 SHA512 a09666aa382d6882fb64c15e0b9fa3bab7dad25ff5ef6b5a32855701a428cf277cee3d9ad21e2887332a57fdcc510a676b2cb6799f3c4c1aa652ab0169a9fcda
 MISC metadata.xml 2373 BLAKE2B fac7a9db4c217998f84bcbb5bc490eee748a35f9d991962d5aa21c6ec562d494af06b67fe35879ee2b245445d22ea7eadc4db6305215f393c4565b86665b3130 SHA512 e2d999684255f6c6509af7dca1b9e1411eac9a4cde6f30d9631c5b9d2bbe749a40f3d08c067d2cad5eb1cdd8ad823c3afb6844cc5e3c1d455fbd8cd20d87a696
diff --git a/sys-apps/systemd/systemd-247.1.ebuild b/sys-apps/systemd/systemd-247.1.ebuild
new file mode 100644
index 000000000000..5259542b5b43
--- /dev/null
+++ b/sys-apps/systemd/systemd-247.1.ebuild
@@ -0,0 +1,531 @@
+# Copyright 2011-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
+	MY_PV=${PV/_/-}
+	MY_P=${MY_PN}-${MY_PV}
+	S=${WORKDIR}/${MY_P}
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb +zstd"
+
+REQUIRED_USE="
+	homed? ( cryptsetup )
+	importd? ( curl gcrypt lzma )
+"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0="
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
+	curl? ( net-misc/curl:0= )
+	dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	homed? ( ${OPENSSL_DEP} )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
+		>=net-libs/gnutls-3.1.4:0=
+	)
+	idn? ( net-dns/libidn2:= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( app-crypt/p11-kit:0= )
+	pcre? ( dev-libs/libpcre2 )
+	pwquality? ( dev-libs/libpwquality:0= )
+	qrcode? ( media-gfx/qrencode:0= )
+	repart? ( ${OPENSSL_DEP} )
+	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
+"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-${MINKV}
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	acct-group/adm
+	acct-group/wheel
+	acct-group/kmem
+	acct-group/tty
+	acct-group/utmp
+	acct-group/audio
+	acct-group/cdrom
+	acct-group/dialout
+	acct-group/disk
+	acct-group/input
+	acct-group/kvm
+	acct-group/render
+	acct-group/tape
+	acct-group/video
+	acct-group/systemd-journal
+	acct-user/systemd-journal-remote
+	acct-user/systemd-coredump
+	acct-user/systemd-network
+	acct-user/systemd-resolve
+	acct-user/systemd-timesync
+	>=sys-apps/baselayout-2.2
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	sysv-utils? ( !sys-apps/sysvinit )
+	!sysv-utils? ( sys-apps/sysvinit )
+	resolvconf? ( !net-dns/openresolv )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-auth/nss-myhostname
+	!sys-fs/eudev
+	!sys-fs/udev
+"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	hwdb? ( >=sys-apps/hwids-20150417[udev] )
+	>=sys-fs/udev-init-scripts-34
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+BDEPEND="
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/meson-0.46
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	sys-devel/m4
+	virtual/pkgconfig
+	test? ( sys-apps/dbus )
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+python_check_deps() {
+	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if use test && has pid-sandbox ${FEATURES}; then
+			ewarn "Tests are known to fail with PID sandboxing enabled."
+			ewarn "See https://bugs.gentoo.org/674458."
+		fi
+
+		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	# Do NOT add patches here
+	local PATCHES=()
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	# Add local patches here
+	PATCHES+=(
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/gentoo-generator-path-r2.patch"
+			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
+			"${FILESDIR}/gentoo-journald-audit.patch"
+			"${FILESDIR}/gentoo-pam.patch"
+		)
+	fi
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+meson_use() {
+	usex "$1" true false
+}
+
+meson_multilib() {
+	if multilib_is_native_abi; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dsupport-url="https://gentoo.org/support/"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in PATH
+		-Dsplit-usr=$(usex split-usr true false)
+		-Dsplit-bin=true
+		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+		# no deps
+		-Dima=true
+		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
+		# Optional components/dependencies
+		-Dacl=$(meson_multilib_native_use acl)
+		-Dapparmor=$(meson_multilib_native_use apparmor)
+		-Daudit=$(meson_multilib_native_use audit)
+		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
+		-Dlibcurl=$(meson_multilib_native_use curl)
+		-Ddns-over-tls=$(meson_multilib_native_use dns-over-tls)
+		-Delfutils=$(meson_multilib_native_use elfutils)
+		-Dgcrypt=$(meson_use gcrypt)
+		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
+		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+		-Dhomed=$(meson_multilib_native_use homed)
+		-Dhwdb=$(meson_multilib_native_use hwdb)
+		-Dmicrohttpd=$(meson_multilib_native_use http)
+		-Didn=$(meson_multilib_native_use idn)
+		-Dimportd=$(meson_multilib_native_use importd)
+		-Dbzip2=$(meson_multilib_native_use importd)
+		-Dzlib=$(meson_multilib_native_use importd)
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dlz4=$(meson_use lz4)
+		-Dxz=$(meson_use lzma)
+		-Dzstd=$(meson_use zstd)
+		-Dlibiptc=$(meson_multilib_native_use nat)
+		-Dpam=$(meson_use pam)
+		-Dp11kit=$(meson_multilib_native_use pkcs11)
+		-Dpcre2=$(meson_multilib_native_use pcre)
+		-Dpolkit=$(meson_multilib_native_use policykit)
+		-Dpwquality=$(meson_multilib_native_use pwquality)
+		-Dqrencode=$(meson_multilib_native_use qrcode)
+		-Drepart=$(meson_multilib_native_use repart)
+		-Dseccomp=$(meson_multilib_native_use seccomp)
+		-Dselinux=$(meson_multilib_native_use selinux)
+		-Ddbus=$(meson_multilib_native_use test)
+		-Dxkbcommon=$(meson_multilib_native_use xkb)
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+		-Dcreate-log-dirs=false
+
+		# multilib options
+		-Dbacklight=$(meson_multilib)
+		-Dbinfmt=$(meson_multilib)
+		-Dcoredump=$(meson_multilib)
+		-Denvironment-d=$(meson_multilib)
+		-Dfirstboot=$(meson_multilib)
+		-Dhibernate=$(meson_multilib)
+		-Dhostnamed=$(meson_multilib)
+		-Dldconfig=$(meson_multilib)
+		-Dlocaled=$(meson_multilib)
+		-Dman=$(meson_multilib)
+		-Dnetworkd=$(meson_multilib)
+		-Dquotacheck=$(meson_multilib)
+		-Drandomseed=$(meson_multilib)
+		-Drfkill=$(meson_multilib)
+		-Dsysusers=$(meson_multilib)
+		-Dtimedated=$(meson_multilib)
+		-Dtimesyncd=$(meson_multilib)
+		-Dtmpfiles=$(meson_multilib)
+		-Dvconsole=$(meson_multilib)
+
+		# static-libs
+		-Dstatic-libsystemd=$(usex static-libs true false)
+		-Dstatic-libudev=$(usex static-libs true false)
+	)
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+	meson_src_test
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
+
+multilib_src_install_all() {
+	local rootprefix=$(usex split-usr '' /usr)
+
+	# meson doesn't know about docdir
+	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if ! use resolvconf; then
+		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
+	fi
+
+	rm "${ED}"/etc/init.d/README || die
+	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
+
+	if ! use sysv-utils; then
+		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+		rm "${ED}"/usr/share/man/man1/init.1 || die
+		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+	fi
+
+	if ! use resolvconf && ! use sysv-utils; then
+		rmdir "${ED}${rootprefix}"/sbin || die
+	fi
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+	keepdir /etc/kernel/install.d
+	keepdir /etc/systemd/{network,system,user}
+	keepdir /etc/udev/rules.d
+
+	if use hwdb; then
+		keepdir /etc/udev/hwdb.d
+	fi
+
+	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
+	keepdir /usr/lib/{binfmt.d,modules-load.d}
+	keepdir /usr/lib/systemd/user-generators
+	keepdir /var/lib/systemd
+	keepdir /var/log/journal
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	if use hwdb; then
+		rm -r "${ED}${rootprefix}"/lib/udev/hwdb.d || die
+	fi
+
+	if use split-usr; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+
+	gen_usr_ldscript -a systemd udev
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
+	local locale_conf="${EROOT}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+save_enabled_units() {
+	ENABLED_UNITS=()
+	type systemctl &>/dev/null || return
+	for x; do
+		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
+			ENABLED_UNITS+=( "${x}" )
+		fi
+	done
+}
+
+pkg_preinst() {
+	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
+
+	if ! use split-usr; then
+		local dir
+		for dir in bin sbin lib; do
+			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
+				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
+				eerror "One of them should be a symbolic link to the other one."
+				FAIL=1
+			fi
+		done
+		if [[ ${FAIL} ]]; then
+			eerror "Migration to system layout with merged directories must be performed before"
+			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+			die "System layout with split directories still used"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${EROOT}"
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	systemd_reenable systemd-networkd.service systemd-resolved.service
+
+	if [[ ${ENABLED_UNITS[@]} ]]; then
+		systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if type systemctl &>/dev/null; then
+			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
+		fi
+		elog "To enable a useful set of services, run the following:"
+		elog "  systemctl preset-all --preset-mode=enable-only"
+	fi
+
+	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
+		rm "${EROOT}/var/lib/systemd/timesync"
+	fi
+
+	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
+		ebegin "Reexecuting system manager"
+		systemctl daemon-reexec
+		eend $?
+	fi
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index 588f71c15736..f782ef8ace08 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -1,5 +1,6 @@
 DIST usbutils-012.tar.xz 98388 BLAKE2B a19d64edeb08bafe3e6a0d6be7cb5196cebb68623cfb5cd21941f109a3f3def774382bc6fe8b68398278e530417190030c8dd39ab982c088329c7acbb36cb672 SHA512 e26a60229e6eed5de670d6511dd1fa5ee3453cc5a848820531b46a1678b69378a2a45c29e24a218a8e7065c2c345356f03a2992f8298ddae6c8026d181f8de66
 DIST usbutils-013.tar.xz 98056 BLAKE2B d6e7925e180ba90f27ca12f13ed985f34e51b230ec08188c91bf39bb8e64baa319aa63d473318e1a4cb21b53808e8610f837ea0bb85657072f1c70107d037873 SHA512 eb1751e5b82f7a1bdffc667662cebee6fd42f466e59d4eb4c98f0d3723d740305377da1df1ba5831402fddbbd1697bbfa2abd22d9ed175e2dee55d6d007e9e54
 EBUILD usbutils-012.ebuild 1198 BLAKE2B f0952377a3e94cde2e205ad0d47c78459ec7a623230233fd6c8d49f3925e9a4c163892e798008879cb51a8b0df99957bd58e94f8ee5518715879011e419e1d27 SHA512 f55e68020504640468567e54cf41fe8c526135f73c16f6c8b6dcb214a550c8f76412035739ddd2f1d62d5bece2d8ef25cfa5ddecb20e3f3aedfb8a79cfe69dbb
-EBUILD usbutils-013.ebuild 1209 BLAKE2B e405cc0d7447a33f58b19258f20e5679e09dd46f9695a7cc0f41cc5e0ecaa0a045e0a305a5208f5642794b80c932bfbe1a12f59486a51f590a7e4c8577285659 SHA512 64fcf736021b6bd90c08049d49f1515c1c0954b9c7dac638b399da83fd7da287011db38fb8b206d600af6f54a87ea0a907e0371f13a3866651cad99b6e5c8b65
+EBUILD usbutils-013-r1.ebuild 1275 BLAKE2B 37618690c256110f104d12b2c34ca47328f5ae08d70562e50bd0263b352efcaa7ec6026f8e9035b58a8fb9474489dcc80ef47e8c23b32e1fe0a611de02de5aa4 SHA512 92c46b18268b2a6d16a270859622616f244e6162e53ef60348f4855a2ba2cf1e44c2aaa746c89ef839897c548c2031316e6bc9edab25eb7eb59589f6e06ef288
+EBUILD usbutils-013.ebuild 1201 BLAKE2B 1296cfb7978e73c49e26bd52b1ed86421f781400f34c8d9453a4351db1629dce85a41bccdd2e3ad2438253160498891aa65f375f6187633bd7ef0ed4eb34f955 SHA512 0f80d2a5b74e5093ab5ba43cd858e662f35d5bf0fe230a0d0bf596d890ef6fc9f457278afb27b7aea9c86c24b7b79c14242b8c7c1688790379c83af8a9c5a462
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/usbutils/usbutils-013-r1.ebuild b/sys-apps/usbutils/usbutils-013-r1.ebuild
new file mode 100644
index 000000000000..648f5b9094c4
--- /dev/null
+++ b/sys-apps/usbutils/usbutils-013-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="USB enumeration utilities"
+HOMEPAGE="https://www.kernel.org/pub/linux/utils/usb/usbutils/
+	https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usbutils.git/"
+SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="virtual/libusb:1=
+	virtual/libudev:="
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig"
+RDEPEND="${DEPEND}
+	sys-apps/hwids
+	python? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+	use python && python_fix_shebang lsusb.py.in
+}
+
+src_configure() {
+	local myeconfargs=(
+		--datarootdir="${EPREFIX}/usr/share"
+		--datadir="${EPREFIX}/usr/share/misc"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	newdoc usbhid-dump/NEWS NEWS.usbhid-dump
+	dobin usbreset # noinst_PROGRAMS, but installed by other distros
+
+	use python || rm -f "${ED}"/usr/bin/lsusb.py
+}
diff --git a/sys-apps/usbutils/usbutils-013.ebuild b/sys-apps/usbutils/usbutils-013.ebuild
index 60aebb858601..a463d8031a90 100644
--- a/sys-apps/usbutils/usbutils-013.ebuild
+++ b/sys-apps/usbutils/usbutils-013.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 1c9455846d4c..abade3054f24 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -10,7 +10,7 @@ DIST util-linux-2.36.1.tar.xz 5231880 BLAKE2B 52d867aa0b722a84828c37958d80b0bdcc
 DIST util-linux-2.36.tar.xz 5242420 BLAKE2B a03b626a376815f37a17b3808d1d421c7ec27a133edf857116603de38f7e13f527687691d0c8aa68f4f6868be6f3bcc64573d759308d74731107e02067449ce6 SHA512 cbb4975da8d99a1edd45514171d59ea7b019ce0f77a81e88b447a733f725e91c53540d9dc78bc626dc011dca129b8b150aaf9e64ccf62a4202ae816581acf4fd
 EBUILD util-linux-2.33.2.ebuild 8417 BLAKE2B 3b6971e04a78a962f7bbd5e6b663ce3408d57befe412d40c6b4b05777f40aea034e9f5f52872aea7537393210a2127fa952ed548061e89c15ef627987d2cfcec SHA512 7a1e0c679a1c69f2e64b54c6897a5e7c430bd8ce1fde91f9b02a00dfec115ec0c2deccbc760c1280fa092f8782c48610366828b4ebdbbaa10b2a6741a1a65a03
 EBUILD util-linux-2.34-r3.ebuild 8450 BLAKE2B 84795217360708525a23bad91268d45c997fb0ae87215a7a0c9027e2245fb98decc6f523faff98855b101e380f49663e6f7b34bb82d18d93641326e91567edf2 SHA512 3444d77384f176ff6c1b3c7f023c90b021723a4158456b504fc927b141a1ad438dfe59802d297fc136cf55d08f01be002d8f136b85df50fa762d083abacb4857
-EBUILD util-linux-2.35.2.ebuild 8893 BLAKE2B 7e815f2d65257a1165a5a4f9e60c3338754a5300e800bae1872786e7e4c8be549668565dcb861856f4cce63e20e5f103120d77f0cf7498723f271a95f7ce9d78 SHA512 d0a4c98fb3049508a6a5a8ed0fbe5e1dd73cab5a343cb7d6f4d9a959232618868647c149766b8cd5c73e8ffd7fa4b5a56fb2359e34bd578f51fae60b81cd4415
+EBUILD util-linux-2.35.2.ebuild 8892 BLAKE2B 25db98e56803e586ab9a8e8a8f7cfd31e13dd7c1bbb29b3c40746bbc50e222e1a58e63a932f0da6884c9b9e95a1371c06eadb005c4a0c5b6bc833d4367bc2926 SHA512 7e7a86e00590a23eb35c81e4313813f688a8917b1260f2a39eb1f0a6b60e689912bf2c032326e07abecaae40a9841136879b545bf2b4603059766dcebbf1ced9
 EBUILD util-linux-2.36.1-r1.ebuild 8904 BLAKE2B 3db44617352ed3acc74500ea6698e2baa41ce85d0260410cf5dfd9cec4f462254264a4481f89f1d21a8240a089928c2780395074a9413c4b4be6ffdfd4aa8d92 SHA512 f8f052242bf3262e30dac8053c373ad2ade653432d3e2a9ceb3801873ccbe6a134dff3dd368e4832389ed623bc61dd5808771682d9c62aa6a7dd0f8789243484
 EBUILD util-linux-2.36.ebuild 8829 BLAKE2B 65c336d5168454eefa2441d274921fe68df7fc273f593240ea063eaa34c4d1b97c8589849d8a0bc89dcdfee4984c08501847d068aff9e17f6f5d0296d98a6a73 SHA512 b7cc930e138a4763a57468ce2028e78ac4fee20b3748c5a946b5b8f89ba9410b9d2324fd95ccc81f3770ecbd9a127690497476d992f459f3f506462506e14108
 EBUILD util-linux-9999.ebuild 8764 BLAKE2B c9273cc668518f91dbff6ccb5edcbe4f9ba30f580240ec840f91ed66c68e69de682471390a0c9604d0f60926d6667d0265ebe8bc48aa8926cd6e1320b284ffec SHA512 950550197233fa9cafa404e04a69abcaaceeaaff8408cb1dd850efb7ae7a3ed57754210f2802dd81fe37f331ccb0ae58c0c141e192b0943ad99e050502a813eb
diff --git a/sys-apps/util-linux/util-linux-2.35.2.ebuild b/sys-apps/util-linux/util-linux-2.35.2.ebuild
index a8a3a209c72a..006fd2ec7b8a 100644
--- a/sys-apps/util-linux/util-linux-2.35.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.35.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi