gentoo resync : 31.08.2021

15 files changed, 48 insertions, 155 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index ef3545f1c6d6..06b8793867ce 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/elt-patches/Manifest b/app-portage/elt-patches/Manifest
index ad0c80894274..9730b3c0e7a5 100644
--- a/app-portage/elt-patches/Manifest
+++ b/app-portage/elt-patches/Manifest
@@ -1,3 +1,5 @@
 DIST elt-patches-20201205.tar.xz 39240 BLAKE2B aa2e2377f0d0cba14f38c59664174d066eff04c9d2a71346c998c4324987fbce25cfd91b79e8e40bde0d81bf7d3c43126bffd0a6b0b219aaad11f4f9f22abde4 SHA512 67e199f060e2c93e01b7a7809f52c0a18d82e86f1b1eb34b965c2acd24e5538a874b820028e363d3002cf58b43c2fe3376ae28d2bef0ca81feabb90c83ae47c2
+DIST elt-patches-20210827.tar.xz 39264 BLAKE2B 271565e4ab906374ca30f69f5ebc8c14cbda5c176b7d54de4315adf83c12111cab4d04254f5bbbc13cf6bc701ba8a940def98e3a983d199ca6aedfe82a280682 SHA512 bf7d50df82e6335879ba4e130817bce67c4e63c55e2ac7249fa35b60f6b73290f857562433477907283b41b137bf12ee254b5bea20f8eebf173c6584d74f5e49
 EBUILD elt-patches-20201205.ebuild 775 BLAKE2B f091c227cb3c273c609f81904b1afa1425c323a5610055ced48a891ff97f60ec0d467d391af427a8b8c49d01d6b842a1094fdddcb966f0ab82d6c67e897df0e8 SHA512 19a1369fe2320337b224d37a5e744e3baf21387fe84b0a8e63a04027adc8a005ef17670db3ec0f44729c3063858e0112d9325a8b70ad41a8664fa2e17ad45682
+EBUILD elt-patches-20210827.ebuild 783 BLAKE2B 4e39a506e7711c5910e00641492a04c7610a588dd3583d227d1d33cde7dfbb43ee7a8f5929ccdeebd43c516b31d00f7555e6371f2417ee778fdbf42c7daa2832 SHA512 982edefc09dba186ba548695394310fd1468840f1dced0a385d6687305239a4f7d4cf794d4ab5af0fc8fafbd3f176c8cbae792ee5bdddd6afcb4c9faf2973fae
 MISC metadata.xml 223 BLAKE2B ce9aaf73ccbc1745f44acf92e5a32b134fc36a7f40c1c83a4f8296bafe3902d851ca1d1b67829d82573b8e9df4bd2643122a98846ed7824bbf67fd88b0c822e0 SHA512 291302ff827472b8aaaa094bf6ed7b728166f21c9603b98beed59db2071a75193d7c5e462c4d435eea7e1047a1f31076bdf6deb08a1c8ab794ddd965c9be92bb
diff --git a/app-portage/elt-patches/elt-patches-20210827.ebuild b/app-portage/elt-patches/elt-patches-20210827.ebuild
new file mode 100644
index 000000000000..bc94d8304da6
--- /dev/null
+++ b/app-portage/elt-patches/elt-patches-20210827.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Collection of patches for libtool.eclass"
+HOMEPAGE="https://gitweb.gentoo.org/proj/elt-patches.git/"
+SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+
+RDEPEND="sys-apps/gentoo-functions"
+BDEPEND="app-arch/xz-utils"
+
+src_compile() {
+	emake rootprefix="${EPREFIX}" libdirname="$(get_libdir)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" rootprefix="${EPREFIX}" install
+}
diff --git a/app-portage/iwdevtools/Manifest b/app-portage/iwdevtools/Manifest
index b4123b6483c1..43549d1d7468 100644
--- a/app-portage/iwdevtools/Manifest
+++ b/app-portage/iwdevtools/Manifest
@@ -1,8 +1,6 @@
-DIST iwdevtools-0.1.1.tar.gz 16139 BLAKE2B effceb407319d2f8acf44db5642a55c426c73628bef9c2004dd76118dc042cbc1178975e06b14d6950cef417790693af9a98dc77e4873f0175a408ca14f71384 SHA512 b0d3a1145c3ecfc71e7f8b0d8d8e321840869037841e1faa547ad4a385751b4fb13de31b3ed497eeacbdf227a81c4f28ff6fd229b008105489ada7c1a15b88e4
-DIST iwdevtools-0.2.0.tar.gz 23498 BLAKE2B 50c946bb69ae720b27836aebb825d6b1e9545e80dda6d0c939c4be7be30f0f4017c309b2794805fc030e074cc2629bbc328545024d5f89860d05693731ab0b55 SHA512 c31d8646477f1cb8ab784441e2f16155248fc337d2138ce6780810dc7e81cdd6792d610db26e8f7759f89f50732c784bf4938c4a861420412f0056fd9b391a08
 DIST iwdevtools-0.3.1.tar.gz 25597 BLAKE2B 1129ff57f95c27156023752a85b9cb25f66c75d2548a2d7be284b5de9b2b1dee7ed56fa806d175c7751f29a05529f659de7524f967484deacf9138e83899dd9a SHA512 4504d8fb1ff18497fc747482ab1c707b6c581f6b4ac74a494459e4e5e45867e2ee8e39e60b020225509a6c5654e40b31f17d9de0300a2ef76e9d5df248c01847
-EBUILD iwdevtools-0.1.1.ebuild 955 BLAKE2B 62661252672c6a17599ff49885cc27fefb0025444786888941c0900d45e11674884ce940109934b9c0abba2dc5ecd62387c89c148772f28476c9e20717b9cd70 SHA512 ba5cd8d8c7d37529a32d8382986e03d45f295914c9e2545ca7f8358e10ceca276909c41d0a5351085f9316bf389127dd835ba6501e188a9de693fe22983dc93c
-EBUILD iwdevtools-0.2.0.ebuild 1139 BLAKE2B 12e5456739590061da4ea8cb55c27390810aa9bf4925fe4a6bcace09f7bb82c7d927fba651a0c0cecde0609bc2b7a918f7783098012011e88c1ab9eb21f08b58 SHA512 444672e125e95ca90a370a28b8d73273a4cf901ebe96cbd52a1905cfdb39010711417989e1c12dcbc1beb48d422d734617d09efe14a793e3b201062c979f1525
-EBUILD iwdevtools-0.3.1.ebuild 1139 BLAKE2B 12e5456739590061da4ea8cb55c27390810aa9bf4925fe4a6bcace09f7bb82c7d927fba651a0c0cecde0609bc2b7a918f7783098012011e88c1ab9eb21f08b58 SHA512 444672e125e95ca90a370a28b8d73273a4cf901ebe96cbd52a1905cfdb39010711417989e1c12dcbc1beb48d422d734617d09efe14a793e3b201062c979f1525
-EBUILD iwdevtools-9999.ebuild 1098 BLAKE2B bfc12186e24ba828d38fc480d1e2e922dabbc45fe193801a42b6873be1247d2bc35ec4e6b68c9bdfda5b5d6336a947bb85a050613710732a14b101add42a8460 SHA512 af89291b91cd2f676f5bea188d99535496857ff45e1522fa00cef34c5f88dfbda92be2c268c1b9fa3663c3980900d7c5bbf180e5429846f6ed8e818c28c399d3
+DIST iwdevtools-0.4.0.tar.gz 31939 BLAKE2B bdab037a2b27bf0c67bb453427ad7f8d7485db3f45f3c465e3b2790e8e259b1328b75eff7d86012df06a44f4101e8bc0e83c9e7a8886adc25d589ecca1a25892 SHA512 a8be15568f24d2f54178f9a92cbc4107f7fdb06da8b2a769ad19ca5b55e90896c4b2253569d7d39158765081d9f9267ff568a066edef8401ec52c29451655ee1
+EBUILD iwdevtools-0.3.1.ebuild 1136 BLAKE2B 727d34ad41b5e4bb8f023d35bf77b10b0e55af9f8a299ec821389254dd418ea017cb62570645d95d261f4f231e36328aaa1c420538d79d4d6d697b0c6c745056 SHA512 1eb3165c4b07604565f7a8f5ce14cfea9fe48e2f67685b6408818b35659c1244412ec91d9e16c7cfa5684e7ec00338ffe035372e99e0a860e2f53571193ea896
+EBUILD iwdevtools-0.4.0.ebuild 1206 BLAKE2B b8cdbf8d592d7c40cf224f95f6536a4467bdf5528a33de7bba94e1e2a685eabe9c55920fb2cdd4df00c479b0b50db058c82384abf8db87bac04a4d50532f8615 SHA512 33f66f90f0417e4915b04e3a90f65a4ab4e432c38ca8446ffc10c0d07e7648ddbc703dd711040e66a835060aad3edf83b8175c6b63fcc8dd19d7b3bd0628f2ea
+EBUILD iwdevtools-9999.ebuild 1235 BLAKE2B 683d2aa51fd8cf22b8497a41edef87e4184b0113ebe2070d9ee82896004e5866ed394477c8269e4929d5ecd0ea3dcfe9028f5a67afd31c049c26928dcbdbf4da SHA512 666f7af6fbe06d4b5b9f400bc393a595ec91e1b4b1da0a3a0bf691bfcdf4449117b25e7c066e1fd20aaa1e9b20f6f4bcde8dc712b6e5a1cc594ec0eca788ac1b
 MISC metadata.xml 353 BLAKE2B f4868e3da19d4f84861e6b6c4dc90bc7e75804eb6d5db4b52992ec3ab9b33e5c4fb44811c8cec56ea5049de90c3ed499795d3b2b402557cf9bd0cb63a4718dcd SHA512 e63ba6b3d19b2ffa64561c986be1fe5094abc27db85c9cc8c71cd2879c1450c44d37370bdce662f0b4295c5d63b8a9dab3088bd645552039ccb76f93b7a0e2d2
diff --git a/app-portage/iwdevtools/iwdevtools-0.1.1.ebuild b/app-portage/iwdevtools/iwdevtools-0.1.1.ebuild
deleted file mode 100644
index 8886d7139126..000000000000
--- a/app-portage/iwdevtools/iwdevtools-0.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="Small tools to aid with Gentoo development, primarily intended for QA"
-HOMEPAGE="https://github.com/ionenwks/iwdevtools"
-SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	app-portage/portage-utils
-	sys-apps/diffutils
-	sys-apps/file
-	sys-apps/portage
-	sys-apps/util-linux"
-
-src_configure() {
-	meson_src_configure -Ddocdir=${PF}
-}
-
-pkg_postinst() {
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "To (optionally) integrate with portage, inspect the .bashrc files installed"
-		elog "at ${EROOT}/usr/share/${PN}. If not already using a bashrc, you can use"
-		elog "the example bashrc directly by creating a symlink:"
-		elog
-		elog "    ln -s ../../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
-		elog
-	fi
-}
diff --git a/app-portage/iwdevtools/iwdevtools-0.3.1.ebuild b/app-portage/iwdevtools/iwdevtools-0.3.1.ebuild
index 7637b8439253..a4a8c6a5377a 100644
--- a/app-portage/iwdevtools/iwdevtools-0.3.1.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-0.3.1.ebuild
@@ -33,7 +33,7 @@ pkg_postinst() {
 		elog "at ${EROOT}/usr/share/${PN}. If not already using a bashrc, you can use"
 		elog "the example bashrc directly by creating a symlink:"
 		elog
-		elog "    ln -s ../../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
+		elog "    ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
 		elog
 		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for info on tools."
 	fi
diff --git a/app-portage/iwdevtools/iwdevtools-0.2.0.ebuild b/app-portage/iwdevtools/iwdevtools-0.4.0.ebuild
index 7637b8439253..1152e307b338 100644
--- a/app-portage/iwdevtools/iwdevtools-0.2.0.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-0.4.0.ebuild
@@ -12,6 +12,8 @@ SRC_URI="https://github.com/ionenwks/iwdevtools/archive/refs/tags/v${PV}.tar.gz
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-misc/pax-utils
@@ -20,6 +22,7 @@ RDEPEND="
 	sys-apps/file
 	sys-apps/portage
 	sys-apps/util-linux"
+BDEPEND="test? ( ${RDEPEND} )"
 
 src_configure() {
 	meson_src_configure -Ddocdir=${PF}
@@ -33,7 +36,7 @@ pkg_postinst() {
 		elog "at ${EROOT}/usr/share/${PN}. If not already using a bashrc, you can use"
 		elog "the example bashrc directly by creating a symlink:"
 		elog
-		elog "    ln -s ../../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
+		elog "    ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
 		elog
 		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for info on tools."
 	fi
diff --git a/app-portage/iwdevtools/iwdevtools-9999.ebuild b/app-portage/iwdevtools/iwdevtools-9999.ebuild
index e1cb0aed9c1c..0af26d4a3147 100644
--- a/app-portage/iwdevtools/iwdevtools-9999.ebuild
+++ b/app-portage/iwdevtools/iwdevtools-9999.ebuild
@@ -12,6 +12,8 @@ EGIT_REPO_URI="https://github.com/ionenwks/iwdevtools.git"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-misc/pax-utils
@@ -20,9 +22,15 @@ RDEPEND="
 	sys-apps/file
 	sys-apps/portage
 	sys-apps/util-linux"
+BDEPEND="test? ( ${RDEPEND} )"
 
 src_configure() {
-	meson_src_configure -Ddocdir=${PF}
+	local emesonargs=(
+		-Ddocdir=${PF}
+		-Deprefix="${EPREFIX}"
+		$(meson_use test)
+	)
+	meson_src_configure
 }
 
 pkg_postinst() {
@@ -33,7 +41,7 @@ pkg_postinst() {
 		elog "at ${EROOT}/usr/share/${PN}. If not already using a bashrc, you can use"
 		elog "the example bashrc directly by creating a symlink:"
 		elog
-		elog "    ln -s ../../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
+		elog "    ln -s ../../usr/share/${PN}/bashrc ${EROOT}/etc/portage/bashrc"
 		elog
 		elog "See ${EROOT}/usr/share/doc/${PF}/README.rst* for info on tools."
 	fi
diff --git a/app-portage/nattka/Manifest b/app-portage/nattka/Manifest
index b3b24165e557..bf3d91182d69 100644
--- a/app-portage/nattka/Manifest
+++ b/app-portage/nattka/Manifest
@@ -1,10 +1,4 @@
-DIST nattka-0.2.13.tar.gz 93917 BLAKE2B 48e5245234d0ef0fd47353bac0d971d6187f59d94c0fb58f4cce160ee28f847a8fb32f8399af3148daaac299b32b590899de716dee1ee9cf107b1efe2451189f SHA512 0d3428cb3b5dee3fcdc29b9d22b5c05d626d26060fcd5518f789493fc68e51762edf9162a9b5b19c6c08fb9cb9c0e350faa41d96c53bd924b50475176140ccdb
-DIST nattka-0.2.14.tar.gz 93925 BLAKE2B 2fa31e8b4ea8aa74d2af52e5a410288715495997c328c5415a65200a077a385eacb3050e593c778194f2e519fd28d2273679d822e0be55b815e19ff38882dfe3 SHA512 28e24576606813d56c8e37cdd203960a67394893b819d846595a03fd222f6ed2fd319bc5d650f229bf7a8979d3823f28de82a87e3bb76fdaf49e9e02dbf62ac5
-DIST nattka-0.2.18.tar.gz 94668 BLAKE2B 02e656eb079b76d0eea87093e9c58b57d29b53954d9301da42eef301373c742a06f80432831cfe27b6765f83420bf37d726933e8424ed842cd80b8fae6242c04 SHA512 fb4abbedbf50dab754721585ea6c50a0e220deb83e005a4e34215f9a66536ff131aa0bb4f2e25854c853f4aab4cdce7137e909d79f609f3e4b2a9964be5bfc57
 DIST nattka-0.2.19.tar.gz 93800 BLAKE2B 65efff2454cdb24f3b71dc5713adbf3bda3976ed958622f7adec14e3708a53531aac6801e838fd21346ce02974fa79bcb82c3f4d2a6555095fa8d81db9ad2992 SHA512 7508a78fa774a9229caa573426839ec84210e9a2d38b7ca9cd47d857b9922b946e9e31fadf946f001565ce6dc65103bca8af58935d7eb2fcf32da423345ce61a
-EBUILD nattka-0.2.13.ebuild 875 BLAKE2B 24bfcc07d615796c60c42dd28359891c30b1d2a6f05e263260062bcf359abb93df2053a953c3aca10712d520736b2c541a2c58040e5f253c399024510a6aaa53 SHA512 3182ea2999de12771ed47e91d9a84a39fb0f949ac9a14fa22ce2c7a699f97eb9bdd90a32c4ed1f9772a6d2f67f0dbe1a92e114c4e4c0f9180f6cc4a31b043149
-EBUILD nattka-0.2.14.ebuild 883 BLAKE2B aaa7d1f3ca53f47b3beb2f031373e9b752dfa2b8f79cf4fe01ba9e5f39a29590ab881303073b656b7c7cba3139c2005c9350573fef91e09650c365e72ab51a98 SHA512 285526769a6fb52ef61dce8304c78da9eadad72d780cdc27fbe5db1a2cad3a1bf5f192d509efd8e5811b6ec6913519dee6a000884230540b3cb28bcd8da053c6
-EBUILD nattka-0.2.18.ebuild 883 BLAKE2B aaa7d1f3ca53f47b3beb2f031373e9b752dfa2b8f79cf4fe01ba9e5f39a29590ab881303073b656b7c7cba3139c2005c9350573fef91e09650c365e72ab51a98 SHA512 285526769a6fb52ef61dce8304c78da9eadad72d780cdc27fbe5db1a2cad3a1bf5f192d509efd8e5811b6ec6913519dee6a000884230540b3cb28bcd8da053c6
-EBUILD nattka-0.2.19.ebuild 883 BLAKE2B aaa7d1f3ca53f47b3beb2f031373e9b752dfa2b8f79cf4fe01ba9e5f39a29590ab881303073b656b7c7cba3139c2005c9350573fef91e09650c365e72ab51a98 SHA512 285526769a6fb52ef61dce8304c78da9eadad72d780cdc27fbe5db1a2cad3a1bf5f192d509efd8e5811b6ec6913519dee6a000884230540b3cb28bcd8da053c6
+EBUILD nattka-0.2.19.ebuild 875 BLAKE2B 24bfcc07d615796c60c42dd28359891c30b1d2a6f05e263260062bcf359abb93df2053a953c3aca10712d520736b2c541a2c58040e5f253c399024510a6aaa53 SHA512 3182ea2999de12771ed47e91d9a84a39fb0f949ac9a14fa22ce2c7a699f97eb9bdd90a32c4ed1f9772a6d2f67f0dbe1a92e114c4e4c0f9180f6cc4a31b043149
 EBUILD nattka-9999.ebuild 818 BLAKE2B 2532291ee841df3052269b4cce9dd5ff17777ef2f2364e1e55c17be1462095e9002648d43f4e7e155e8ba4ff086fd05dd02f81fe336876ea18cf57cf1c6e7f43 SHA512 a8449aa98fbd5b0501e4fd1f91bb7df96f717efbf32acbecc349beba84ceaadceeef9ca9ac300e289de1df33f7d1a0507c038d2ee72b7dfc62533c95c0f9b9f4
 MISC metadata.xml 384 BLAKE2B 190cdbb5b8976f88c21c364eedd2548b16d7a0bdd72c546058271b9b70fe98fe52d29e26f16cf6039aee0be0a89d058ca80da3dbfbe7c8cfa9906c7797cf2393 SHA512 6f50634a08f13a36a3b8070e4cf41dcc8517e4677f973709003996321e38a61dd049a5415eaf3c12dfe21f03c347f3729e02c4740c012e2c4e9133230e9fc971
diff --git a/app-portage/nattka/nattka-0.2.13.ebuild b/app-portage/nattka/nattka-0.2.13.ebuild
deleted file mode 100644
index 5e140d0ba09c..000000000000
--- a/app-portage/nattka/nattka-0.2.13.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A New Arch Tester Toolkit -- open-source stable-bot replacement"
-HOMEPAGE="https://github.com/mgorny/nattka/"
-SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="depgraph-order"
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-util/pkgcheck[${PYTHON_USEDEP}]
-	dev-vcs/git
-	sys-apps/pkgcore[${PYTHON_USEDEP}]
-	depgraph-order? (
-		dev-python/networkx[${PYTHON_USEDEP}]
-	)"
-BDEPEND="
-	test? (
-		dev-python/vcrpy[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
diff --git a/app-portage/nattka/nattka-0.2.14.ebuild b/app-portage/nattka/nattka-0.2.14.ebuild
deleted file mode 100644
index 75261fa77b65..000000000000
--- a/app-portage/nattka/nattka-0.2.14.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A New Arch Tester Toolkit -- open-source stable-bot replacement"
-HOMEPAGE="https://github.com/mgorny/nattka/"
-SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="depgraph-order"
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-util/pkgcheck[${PYTHON_USEDEP}]
-	dev-vcs/git
-	sys-apps/pkgcore[${PYTHON_USEDEP}]
-	depgraph-order? (
-		dev-python/networkx[${PYTHON_USEDEP}]
-	)"
-BDEPEND="
-	test? (
-		dev-python/vcrpy[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
diff --git a/app-portage/nattka/nattka-0.2.18.ebuild b/app-portage/nattka/nattka-0.2.18.ebuild
deleted file mode 100644
index 75261fa77b65..000000000000
--- a/app-portage/nattka/nattka-0.2.18.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="A New Arch Tester Toolkit -- open-source stable-bot replacement"
-HOMEPAGE="https://github.com/mgorny/nattka/"
-SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="depgraph-order"
-
-RDEPEND="
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-util/pkgcheck[${PYTHON_USEDEP}]
-	dev-vcs/git
-	sys-apps/pkgcore[${PYTHON_USEDEP}]
-	depgraph-order? (
-		dev-python/networkx[${PYTHON_USEDEP}]
-	)"
-BDEPEND="
-	test? (
-		dev-python/vcrpy[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
diff --git a/app-portage/nattka/nattka-0.2.19.ebuild b/app-portage/nattka/nattka-0.2.19.ebuild
index 75261fa77b65..5e140d0ba09c 100644
--- a/app-portage/nattka/nattka-0.2.19.ebuild
+++ b/app-portage/nattka/nattka-0.2.19.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="depgraph-order"
 
 RDEPEND="
diff --git a/app-portage/pkg-testing-tools/Manifest b/app-portage/pkg-testing-tools/Manifest
index 68637f90b157..62f13f4f523b 100644
--- a/app-portage/pkg-testing-tools/Manifest
+++ b/app-portage/pkg-testing-tools/Manifest
@@ -1,3 +1,3 @@
 DIST pkg-testing-tools-0.1.0.tar.gz 6131 BLAKE2B 6d8dddb81e57159df9f2e1897718433d29f330286afb868a1111db4e0bb7a53823df57a5d7084a24fd5807787f169fff137f5c6c0bdcddeec2c59090d9b90775 SHA512 05165d3790b4d38c939226d1149c0c44cd62fe222a199bce8f1e108d12475710f8482f82e2e2e45223ba24fd1b50451dea8b3761c8f474a59e660b9a67bf8ab4
-EBUILD pkg-testing-tools-0.1.0.ebuild 465 BLAKE2B d362da60f16f83e11506faf4d84926a67e54ffb69be5357bc63217c1c3198342a9b7dae2e2f341d6747d694dcacbfa91b432ea80d83167308349afc9b1a2494e SHA512 1ef64be6b39128ff352d7492667c56bbf8d4fb0190c0584069dc609a98652476311a1c5d8c807b68f3c62bd6e517e935df5db12a198ecd42be72fbc8c0c3eeba
+EBUILD pkg-testing-tools-0.1.0.ebuild 463 BLAKE2B b551b3e2ddd64f7c8b7e356ef9cc97c9a10975b55d0b1c509c399d61bfa20383b46a8e0506521c748c1211ec16327965cd0245105029338f27c2976f8777e7f4 SHA512 584665ad4c7230ede8653f16e5c6a81f9202034f67fbad1ce76cb6f1f93150130a6b4592800bd3bc51c8eaee55e85455730ed8a84a12209043c4941e76454bae
 MISC metadata.xml 345 BLAKE2B d80bdd7996aa73b0085e2f5656b8d302ee936da562e45775785c1543719b8298823a50d437da0a2d7e0037919f607146eeae310cb95b7984737b4891635ee7cf SHA512 ddbe8a257ac698a25d13e84833682b35f55252da02985caf9cc40c289bdaf6001382c9a018c39d824f37727fc7b0a8f9930e509554fb740b151b4120fcc6fee6
diff --git a/app-portage/pkg-testing-tools/pkg-testing-tools-0.1.0.ebuild b/app-portage/pkg-testing-tools/pkg-testing-tools-0.1.0.ebuild
index a6616c032088..3177469c8986 100644
--- a/app-portage/pkg-testing-tools/pkg-testing-tools-0.1.0.ebuild
+++ b/app-portage/pkg-testing-tools/pkg-testing-tools-0.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/slashbeast/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	sys-apps/portage[${PYTHON_USEDEP}]