gentoo resync : 29.01.2021

5 files changed, 75 insertions, 19 deletions

diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index a82d4456ec19..e974d260478f 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,6 +1,7 @@
 DIST pkgcheck-0.7.7.tar.gz 236359 BLAKE2B 46628e6fe1ab711773209785f3160ad5521f7173a676363a44102bd26b443eafe4f88829d9a6c9cf10538ebfa7ca8b28cb8c27f9719f98217ff626d1b5a9a0b3 SHA512 ac88a3aa689983bfac0efa85240e3a02c822a075095ff9940fac0cdc188428126e7612807e57a7582f21fcf1d668dba29d4785d062d757f6444fa024d0437751
 DIST pkgcheck-0.7.9.tar.gz 275854 BLAKE2B 4a98d801fc4e628f6b116fa6d05a5e31bf259f7774fc724c5ca497ea29c5e475a4679fdc4d5c2256de307af740c7bdb95a1d10e30adba94e8336a1e8a3657838 SHA512 1af7d90dcc1c13882f946f470746f7d03638762ed12d97094977c05eb11208f00a19d3a8789ce074efcc91e15258ac784027018016487213ae17e91ed6916630
-EBUILD pkgcheck-0.7.7.ebuild 1414 BLAKE2B 01638e4375ff92e362b168ffae6c79b3f736232701e0b391458eea12060d8445190781f7d81bf0db6506f7d4cc7ee2f64276184d01cab4eeda2c26ccb0c8a981 SHA512 fd0c558a38cac10ed4c8a9ebd63df097d48d41bac5f52a7aa94d9e48685cc1c0f9d76922f1cc2bc386824ca182131c6957c4aac4d98882e32700e101412e1908
-EBUILD pkgcheck-0.7.9.ebuild 1422 BLAKE2B b003499b4686b50a1129e81450e3f92394922841284796729ed6e3e7e1d8bc8ad396334844f797496eb13a6f61e2e0bb3f1b35929fc9e1d4fa2a11735708abe2 SHA512 3cf15a66e2c9bfa159b1a51001eb0c0ebecd99ad0e47d7731d5345cf2ddac734f1a0ab88a20eedadb2ae955c6dfa7bcbe017dce0872076c938284b9fca917a25
-EBUILD pkgcheck-9999.ebuild 1468 BLAKE2B e86c456ffd7e7ad84e3d50f2a01236e32c0d561899a3bf92dc68dbb602aa33f75aaba166ea31ce9b5466102523940dee727104294f2d7e1c2e9b883b28397e1f SHA512 dabe7b1a9a7e77fa920c25585a9c387abb3fe05a637c1360eccbdfe589b879e18b1e84fb5ff29be4f83b77a624fb772e019ed252a531052194eca55a93ac1e7c
+EBUILD pkgcheck-0.7.7-r1.ebuild 1439 BLAKE2B 119d16039b070ce4c7ce4d52fac350e51a3e1cb13f96bf50a0dd59786bc097ff508a5ef08b637f599a050d21b8d4bb82f1fd17735d3a722d140d074d73886a48 SHA512 80580afd199abc27974b9e46e433d521a2e49a92fbdf482afa88992a94693e49ae02c592e91dfcbe6a270591b88089bbee667fad38209d2f73151ace488bd30d
+EBUILD pkgcheck-0.7.9-r1.ebuild 1446 BLAKE2B b7d1fcc843cb5af9b6413e17eeaa7c40167ec21ee2cddc54ba5806f11722562c0342ec7c3d20fa94764eab618c85ef4aee9d5f6eb956338a603be2176df80fd0 SHA512 9146d5ab33160c5619ee17719b1c45688b5e62459fcc6abca8f2a069c2b5c576393b707fa975c1eb081b8dafb1a3a6a488a37b0c4a9a282ce681a38785d601aa
+EBUILD pkgcheck-0.7.9-r2.ebuild 1447 BLAKE2B ddbd3beddb0ecfd71c9120eab6d338d398b82f7dc3813698a115c74a126fb0464f6c077a7ea1b4aa35787517538c23531d58233da0d61ded74db7e2bb4b57e5e SHA512 eb46f428631af94a1095bb3f9df59ff7ec9cc6b57621f38b745e1755ae50f5b830f4c4ddc45f86b0a76afd6ef36cfef159a1f92723be3432195b08d3b1c507c1
+EBUILD pkgcheck-9999.ebuild 1376 BLAKE2B 9f9f2cd48f1d064df36e52edc07ad5190a58247b8a06731bae12dfa1070a650a5d292443d54cc3dbfe5e5d9a8af58615c64ec45838e7af08d8cad4b942134707 SHA512 5c9accc1bbd4a46b075ef3bc3ff9f6128f1bc2495e34463c09ac3176a1b0d841d8fd79c97488b34aac366d6d0618120d2d7cf1f41866a604e0e68bb12cce4b58
 MISC metadata.xml 328 BLAKE2B b84dba717460e84f7ee3163fd8d6a5f13eb3b15dd1bb749f6ece81f062e3530988dacefadb24c1395eb36593a7ab6d868b06c8c4ee8f620a17c85faf04283b24 SHA512 5696505214a737ad495b23bfac2a51fbbc5b1e815eb6fcbabb3c6674325f05e3f6f418de05257c08935e389e47879e8a2d1b3723ec86aeb5ad97c6110fd2ec75
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.7-r1.ebuild
index 3c1b4083146f..9a1ac968b480 100644
--- a/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.7.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,7 +29,8 @@ if [[ ${PV} == *9999 ]]; then
 else
 	RDEPEND="
 		>=dev-python/snakeoil-0.8.8[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.13[${PYTHON_USEDEP}]"
+		>=sys-apps/pkgcore-0.10.13[${PYTHON_USEDEP}]
+		<sys-apps/pkgcore-0.11"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.9-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.9-r1.ebuild
new file mode 100644
index 000000000000..dc30511adbd7
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.7.9-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 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 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.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.9-r2.ebuild
index 72a9c7ce56f1..2d0a341c2bf1 100644
--- a/dev-util/pkgcheck/pkgcheck-0.7.9.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.7.9-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # 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 optfeature
 
@@ -29,7 +29,8 @@ if [[ ${PV} == *9999 ]]; then
 else
 	RDEPEND="
 		>=dev-python/snakeoil-0.8.9[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.14[${PYTHON_USEDEP}]"
+		>=sys-apps/pkgcore-0.10.14[${PYTHON_USEDEP}]
+		<sys-apps/pkgcore-0.11"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index ae82d9f6d150..1fba97972fb5 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1 optfeature
@@ -19,8 +19,6 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck"
 
 LICENSE="BSD MIT"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND="
@@ -28,8 +26,8 @@ if [[ ${PV} == *9999 ]]; then
 		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.8.9[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.14[${PYTHON_USEDEP}]"
+		>=dev-python/snakeoil-0.9.0[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.11.0[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
@@ -37,14 +35,11 @@ RDEPEND+="
 	dev-python/pathspec[${PYTHON_USEDEP}]
 	dev-python/tree-sitter[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
 
-python_test() {
-	esetup.py test
-}
+distutils_enable_tests setup.py
 
 python_install_all() {
 	local DOCS=( NEWS.rst )