gentoo resync : 28.04.2021

10 files changed, 12 insertions, 373 deletions

diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index cc5736d33a11..c6e1711f18ab 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,21 +1,10 @@
-DIST pkgcheck-0.7.7.tar.gz 236359 BLAKE2B 46628e6fe1ab711773209785f3160ad5521f7173a676363a44102bd26b443eafe4f88829d9a6c9cf10538ebfa7ca8b28cb8c27f9719f98217ff626d1b5a9a0b3 SHA512 ac88a3aa689983bfac0efa85240e3a02c822a075095ff9940fac0cdc188428126e7612807e57a7582f21fcf1d668dba29d4785d062d757f6444fa024d0437751
-DIST pkgcheck-0.7.9.tar.gz 275854 BLAKE2B 4a98d801fc4e628f6b116fa6d05a5e31bf259f7774fc724c5ca497ea29c5e475a4679fdc4d5c2256de307af740c7bdb95a1d10e30adba94e8336a1e8a3657838 SHA512 1af7d90dcc1c13882f946f470746f7d03638762ed12d97094977c05eb11208f00a19d3a8789ce074efcc91e15258ac784027018016487213ae17e91ed6916630
-DIST pkgcheck-0.8.1.tar.gz 455289 BLAKE2B 5e0999c4348e4707e917b511718d378bd7cbb337aaae1fdb437b5bca5f4f795a65bebdf58f11e72b2b737e019a02a9b970636130b0712751ce9bf9ae9d023018 SHA512 16af41bede87b065cae59e5232707d272ad7c66ad1bac4bf4c3e4b727671be4a30d1e7d5408c29c5b288bfae8fac98829ae96b040c706deda95e670df095d022
 DIST pkgcheck-0.8.2.tar.gz 455039 BLAKE2B 282c75578cd4aa7aca3f54e9625360cde4d7146cc08a6b2bcf2f594b21b6224a18e0623055e8aa866e89583b9fd6ec12749aa4bba791f06a851b1b43fe60d440 SHA512 3377060dae6e2c49d5ae6f2dbb883da4ddeab35ecd04133635f3a91f5bfb63177497b8843445914132539efc461ce0ea89bd5d07d3cba49e0854b91d7e2f74ce
-DIST pkgcheck-0.9.0.tar.gz 585528 BLAKE2B f9fa2d11b9510d84b5d9381ff033de14ca5ec74cf84d50f3f8847c1585c38bd02f534b09cc017e04d6f322ebd95c8396d95eca299ed1327cd25fab9e42973be3 SHA512 a6778785c23eacd80df555c77c8a77ef66b16e2a601fbd9405f85ce8520079a6f1366aeede3a1758abc8db606bc4608cb4a7e1ad421a8416bdb35b3ff3af9d6f
-DIST pkgcheck-0.9.1.tar.gz 591753 BLAKE2B e4c8840c022b77dde34ad461367eb1947f269c8a0ff12e9dee2c8e373d1926f58f9d104571bc5de233975eda73509bf39eec533de03f78cf82fa41bbd10bcc74 SHA512 9adcf2fd5b9652e834f96f8a7652c97d28c4ec5a8b8704cd4c7c4ef8463237fc15f4c46e36993d0e72de5aab068b108368378d5481cf4d5df974e4a78adf6072
-DIST pkgcheck-0.9.2.tar.gz 593674 BLAKE2B e5d02e914e90db28540ca350d91d38ece9cea1f8413ec90b877bb41896cc7b710e451658c7c6cea3f4cc2f834230a986d18429c8ac3f23d4b317b28e3af8d74f SHA512 2bbced17dcc1718576aa4ce2401fc856cfb6256fe437295c25716852645841c6a28d1c1276f3a5943ce27943ab36bd3ca3ef9bf1ace20138368371a793a80b6d
 DIST pkgcheck-0.9.3.tar.gz 460029 BLAKE2B 3ef3aa6c338c5b379e4845302aaaacc5c71679309f45985e1dfa71fb1e62760c4f94ca43d34ca4ad75ecd1f738d9bcb0140568b4e4826ee6a14586c21d0c1a03 SHA512 5613f65437e6cc1c55330eef8bc354ad2f6e325a03c8353186d17a8e9dd21333a3900f91a36c1af0767ccda56f30d425ddb848e4eccf9d20ccba3f5de5098fb3
 DIST pkgcheck-0.9.5.tar.gz 459226 BLAKE2B 23f42ffb49bb89b33d01749fede01a8399c99a8e400bd451d1577c4240b929913b13738ba5bc55f3251058e26bebb619bedfb2ec1a50733a1bd8a7c62c7602df SHA512 2a404657e9b6d48d7f99d743aaee6bd4d5aee9cb48c28f89fea46cc7c680e6d3c0351660632abcf879c5ca3569b47cb22c7d6a53ba17d60fe6b545b3c96b90e7
-EBUILD pkgcheck-0.7.7-r1.ebuild 1439 BLAKE2B c9f277bf416adb2b9e8371b539cfce4d04cd42080c71f292e218769c81030ca59e792f8eb198370aabd95fadd9c8470d399fb00eedb37453c87ad5e7c47bdd22 SHA512 eb03cd5371488c808186f057c20127935ae2570aaee927ea4d012fc4c0634970f5fd0d33757f611f14958de7e4a9e192a65d5ba997ff6389c8e9f2145de8ecb8
-EBUILD pkgcheck-0.7.9-r1.ebuild 1446 BLAKE2B 3a4b8bc7d6d0d515e220343eef74345ba39853f65ed39e898a68b8bf900c49610c7f5f78c1f49de08eff9254f0cdd54f57672a8177469e23bf0cc82e0effbef4 SHA512 a077e0f9e8879d89691c608e6cf0b619fc56ccb3ba92052280a55c5a5b1005d397ae72aa7638df040dbb2c15498e0df4f33f0d7e1dc3540b4e87fbdc583523e7
-EBUILD pkgcheck-0.7.9-r2.ebuild 1447 BLAKE2B ddbd3beddb0ecfd71c9120eab6d338d398b82f7dc3813698a115c74a126fb0464f6c077a7ea1b4aa35787517538c23531d58233da0d61ded74db7e2bb4b57e5e SHA512 eb46f428631af94a1095bb3f9df59ff7ec9cc6b57621f38b745e1755ae50f5b830f4c4ddc45f86b0a76afd6ef36cfef159a1f92723be3432195b08d3b1c507c1
-EBUILD pkgcheck-0.8.1-r2.ebuild 1386 BLAKE2B 8038faade06c55eed6be95c34e5a7ad01d5d0e4e1bb36db023327435456ce608fb975f785890b055a587b888ef7c23d1eec626dcc69211f11b49315e737cfeb4 SHA512 9ea5244aa12ba08a5ab1e80842c6f991d1ffa1eb121ebba947a02ae6679052e58680e5cfbf0c579cc9476ada71d2bb5d8bf58565d0490b549379229548af290f
+DIST pkgcheck-0.9.7.tar.gz 453478 BLAKE2B 486bae68af1757fbdb4b109b34cea836cb6dee258d4e53b4c3818c1aa6194da86e7ee339335ac6f2a1c2fb89a547f46658fadd88706fa807a9fdce2bb82a5c65 SHA512 e8fc02997d558af1e8e89a13130076b4db59e9c2a8ea383d0dca9a57375dae1fb315619593178d67c89d30e7b16810905694c838ea4ec608eaee195fa4797569
 EBUILD pkgcheck-0.8.2-r2.ebuild 1417 BLAKE2B 0b635b4a66c79928fd2ae21de749e456686dcd77d66e7fb413c39c0b645c3252c4eab7d77f1725b038fdcdd84d25998dcb79b9ee1a0c80b6063510d49d9f15a5 SHA512 3ef8917647484400d8a46e2942e598769e01918f381117877815535ed0dc6e683640ef49dc4cec2f5182d80c2ef06184ce823f9beb6ecc9203490a907db813e1
-EBUILD pkgcheck-0.9.0-r2.ebuild 1471 BLAKE2B e11a1f5b4435064308cab3acd07ea5301b7b0d463786c0037ec217c5378221b8c6d53ff34faea6365c08c8fa38bc6ac5c3b212ea6b156dfe4da0f43864dc8ea7 SHA512 32b50f2db0deb57931288e6fad53f899441ea2034722ae94c8485971657a47e2cda11920c119322ce0ad976107d7b2b5169a80bfb9b7d705b559f081fe68671d
-EBUILD pkgcheck-0.9.1-r2.ebuild 1545 BLAKE2B 5a421d8b7ed67ac8712a7b64dec324785c582696ea188c556fcea09089d1fd239909dd73d9ec6c934eb611509ecca058e915e536b4dab3e0552406bc145597f4 SHA512 41bb42a7cfa5eb458a601abd53a9b357b9377c472d9db5fd712ec7beca9fe21ebbef4898503d2cc2f14b34e716530aaa1e4911dc244bebfb1d905a2afdd1d995
-EBUILD pkgcheck-0.9.2-r2.ebuild 1658 BLAKE2B 960f4b31676fdc2965ef452e6e5c4a62a8f859e46b9386b9930aa84010feaf0417b5a7f9cd70ebb2c17207893a9eb184602ee40b43f7d1dfc99e1435a001e061 SHA512 0a3e2a175fb0483a29a5eb839d7864d9022b7b246aa8f5d6cc1f3a545cb5a42e18f99792cdc4156ee37f4c6736e778c78061919b181727f3bb7de01ad20a8145
-EBUILD pkgcheck-0.9.3-r1.ebuild 1552 BLAKE2B bba0c6003224d4620fba6a8dbc2d0954a45cf0558f7d9e1aeb0abb8a851f20d00373be9b556db4ecdf44964f8adee15a7b354e069d67228f009ec5a6163a0d37 SHA512 ee0d8ff0e909054a06ccdc89cec5819ba7b8a7cd694da79a32b70f2e8b2cd2709d44ea4ff34efa6aef4b8d9c38106dff0c2df7c0d32c2d7b487361b249fbe334
+EBUILD pkgcheck-0.9.3-r1.ebuild 1544 BLAKE2B f8d9c073beafcbedea2058b26420130fe065a25d57524de80caa310b03570a3ad52e6109666a4e008fc87868a708c9510164304880f5e086d14a8b6a9e06ebcf SHA512 a49b1d8d5eabd1139ef081bf374fb36fb0b6e724eac57644cf72c976271878941340774d7e8aea77ece8d185315d38f8cbe359fbc4187be67296ee09b9ab4ee4
 EBUILD pkgcheck-0.9.5.ebuild 1507 BLAKE2B ed58c351d977d491d464d896a8519d88ed1799d7bfada82c2588249ff4245b5efcb65a2df38fb3a620f5573d0fc542ee7347338c8bd58fcba22118e1f0106f0b SHA512 dff66a95a5c5ec85d886f58674b6b9bc945f2664c666105b2e8e4989a2cddcd324578ca1abcbfbd56bfd98eabc99abd222662882163a5b51d3813e8b899f1279
-EBUILD pkgcheck-9999.ebuild 1501 BLAKE2B d0c8b037a86e3f817a6b7ea3ab01198b3a4e3bf2df869ced7835f53c5e7955e3ca7793d584401581865740c3f9ef2849d15a2dbd5f53ec1006c0d1352b97f225 SHA512 62c31e8f132d4d4dd1af78072bc03179a853f5fbb22ecdd1c6fba2b1774465c6465807b9988577020e63871955acfe0dc17601d4d595d7c5824db1f47464eca9
+EBUILD pkgcheck-0.9.7.ebuild 1500 BLAKE2B 7d8837016e1515c2fe7921da0367ae9f4e2507beb2c8c45b268c3da795fd95f733e90146ca1e4ce1a67fd3ec5fb642884237c48f7cd89b681c6b8aff22d6d294 SHA512 b21ca0419ea415d32a51cea2ad0baadc5b76952f3de35667a7b624efaeb0cba2b7af2361fc4785b438b1cac20776b27d2cf2ab198e14930eced0cfe22a4676f2
+EBUILD pkgcheck-9999.ebuild 1507 BLAKE2B 195770c065ba7471492ea94d35e9cabf658921cfca255543354f96f4112bd12958d2d445f99e60c5ab71beec94e2dbd98c13f6837d67bede0ad46547a29d1b92 SHA512 ec29615b0f6c41dddc72c6ced8c3edc6e68efb093122ff4896b685189b7676a12d997fac0645ad993ebd79ca14cf285eb063275e1cc0f3297b90acf0a5f6dad2
 MISC metadata.xml 328 BLAKE2B b84dba717460e84f7ee3163fd8d6a5f13eb3b15dd1bb749f6ece81f062e3530988dacefadb24c1395eb36593a7ab6d868b06c8c4ee8f620a17c85faf04283b24 SHA512 5696505214a737ad495b23bfac2a51fbbc5b1e815eb6fcbabb3c6674325f05e3f6f418de05257c08935e389e47879e8a2d1b3723ec86aeb5ad97c6110fd2ec75
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.7-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.7-r1.ebuild
deleted file mode 100644
index 5e13518a2141..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.7.7-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.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="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.8.8[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.13[${PYTHON_USEDEP}]
-		<sys-apps/pkgcore-0.11"
-fi
-RDEPEND+="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Network check support" dev-python/requests
-	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.9-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.9-r1.ebuild
deleted file mode 100644
index 7c92c2376683..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.7.9-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.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="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.8.9[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.14[${PYTHON_USEDEP}]
-		<sys-apps/pkgcore-0.11"
-fi
-RDEPEND+="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Network check support" dev-python/requests
-	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.9-r2.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.9-r2.ebuild
deleted file mode 100644
index 2d0a341c2bf1..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.7.9-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.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="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.8.9[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.14[${PYTHON_USEDEP}]
-		<sys-apps/pkgcore-0.11"
-fi
-RDEPEND+="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Network check support" dev-python/requests
-	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.8.1-r2.ebuild b/dev-util/pkgcheck/pkgcheck-0.8.1-r2.ebuild
deleted file mode 100644
index 4c51a0245288..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.8.1-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.9.0[${PYTHON_USEDEP}]
-		<sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.11.1[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	<dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Network check support" dev-python/requests
-	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.0-r2.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.0-r2.ebuild
deleted file mode 100644
index 2a6517ae020b..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.9.0-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.9.0[${PYTHON_USEDEP}]
-		<sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.11.1[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	<dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests setup.py
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Network check support" dev-python/requests
-	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.2-r2.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.2-r2.ebuild
deleted file mode 100644
index 653ef4155710..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.9.2-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1 optfeature
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility for ebuild repos"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND="
-		>=dev-python/snakeoil-0.9.3[${PYTHON_USEDEP}]
-		<sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.11.4[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pathspec[${PYTHON_USEDEP}]
-	>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests setup.py
-
-src_prepare() {
-	# remove stray files from source dist
-	find -name '*.so' -delete || die
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	local -x PYTHONDONTWRITEBYTECODE=
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	local DOCS=( NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Network check support" dev-python/requests
-	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.3-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.3-r1.ebuild
index 3b4b3965e984..446c03b9f7a2 100644
--- a/dev-util/pkgcheck/pkgcheck-0.9.3-r1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.9.3-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.1-r2.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.7.ebuild
index 90f85d834a8d..bee686dc4d51 100644
--- a/dev-util/pkgcheck/pkgcheck-0.9.1-r2.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.9.7.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+	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,16 +26,15 @@ if [[ ${PV} == *9999 ]]; then
 		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.9.3[${PYTHON_USEDEP}]
-		<sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.11.4[${PYTHON_USEDEP}]"
+		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/pathspec[${PYTHON_USEDEP}]
-	<dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
+	>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 18f0ea5c49f8..f801b3b477e3 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+	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,8 +26,8 @@ if [[ ${PV} == *9999 ]]; then
 		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.9.3[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.11.4[${PYTHON_USEDEP}]"
+		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.11.6[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]