gentoo resync : 20.03.2022

3 files changed, 3 insertions, 72 deletions

diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 7d3de2c317a5..45890df00be6 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,6 +1,4 @@
-DIST pkgcheck-0.10.8.tar.gz 460288 BLAKE2B aab2abdd9eaee483d580180753fc719127b7c7d0024b834e9199101aa2d18684ec7804efc4ddf59f4a44c0cc6c2896f437d4a7a9fe4496813be4a3a8d33ce7ad SHA512 9a186e032b86e1b565d6198dc9a993a9a8ef065e43f431d6d6dd9bbd6c32fe91501612984c7e3b2092754450c992fc683270d62c29ec85beeb97674b07a9ba9a
 DIST pkgcheck-0.10.9.tar.gz 460614 BLAKE2B 5b581cf5acd6cf46d72bb3c928a93a20e3b2f552d447617eaf2b9ac50cd7956f9a43fa7b17932b27fa8dafc6d49e41cb8553e4a9059b0ef5fd769713deb6fb12 SHA512 cc800f89944353dec5a4293968a16c132e573b309b6074d4f950b993dab7ea8c51decf3921bd34d3b04520c932a932d27e6e969c8dcf86d20fd6917265d474b6
-EBUILD pkgcheck-0.10.8-r1.ebuild 1766 BLAKE2B 21b3d8d823309a4046215cfe7d57763cc71c4cf54247daa638400e040f4747c7a83b8fed019c309ee4305a485709d1e10dbc15774f0243c2d350d4a66ad7afb6 SHA512 c8329ede5451515e9c90078f51e6c8909f35d919a55d922f012e82de7d883937fb810bb909ef0afb277abbbe4f203ca9877383c6c68b45fceefcc6375c6e9ecd
-EBUILD pkgcheck-0.10.9.ebuild 1573 BLAKE2B f1f1ceadf0cc890dfd31ff3c06e0a5182fcf68650d7054ec8f13b5f84e82a807452daa3150da407904e06d9af8fe2910608f2b73a4d5ad0768e0c7beb9b84c8a SHA512 ab489bd05bed67046792b414efd79932a195a3df0f6194b9242330613874e595a3960d2ae0054e28eb07888b8288bdc819829e137bbb32919611db8684f66a37
+EBUILD pkgcheck-0.10.9-r1.ebuild 1671 BLAKE2B ac976be2b0a8294b69b39973322e4f612ac88886e05193a990ac093241e8a68258f2e235dd5f7bb6d07f3f6269f60fd3095b67c7856f4e9f8433f4a4bf87175b SHA512 236f3b6312b8161cd7152be7da55b0908744ac47f2cb2fe192279b6a83bdde4f003f9e5c69b40f0704c76c93e935b558cb885b04eea575035ee8052c8e6cae5c
 EBUILD pkgcheck-9999.ebuild 1573 BLAKE2B f1f1ceadf0cc890dfd31ff3c06e0a5182fcf68650d7054ec8f13b5f84e82a807452daa3150da407904e06d9af8fe2910608f2b73a4d5ad0768e0c7beb9b84c8a SHA512 ab489bd05bed67046792b414efd79932a195a3df0f6194b9242330613874e595a3960d2ae0054e28eb07888b8288bdc819829e137bbb32919611db8684f66a37
 MISC metadata.xml 329 BLAKE2B 30154e72c975701c69832cdb72ac9d2464ce5ac65ae107ed1a0d55269dd80664532b529a1ad5a907a948446244b9f41d13c2d19484b45d208f8757f5192bdd32 SHA512 e51404fef8bb71baba825a6700ba9c9ea3680e2892016daf38d3979d33c77c07ea88f95b00c6c821907fbbda129c35ecbcc00b0128111e18290b110cfac5e316
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.8-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.9-r1.ebuild
index 5cb54fa820f6..a186529aa8f9 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.8-r1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -48,10 +48,7 @@ BDEPEND="
 distutils_enable_tests setup.py
 
 src_prepare() {
-	# extend allowed system uid/gid range per Council 2021-11-14
-	sed -i -e 's:500:750:g' \
-		src/pkgcheck/checks/acct.py \
-		tests/checks/test_acct.py || die
+	sed -i -e '/tree-sitter/s:~=:>=:' requirements/*.txt || die
 	distutils-r1_src_prepare
 }
 
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.9.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.9.ebuild
deleted file mode 100644
index ceb25cde418e..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.10.9.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-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 ~riscv ~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 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.6[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.8[${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}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests setup.py
-
-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
-}