gentoo resync : 15.12.2019

4 files changed, 31 insertions, 82 deletions

diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 4fe46e41d475..9e95b9aa60af 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,6 +1,4 @@
-DIST pkgcheck-0.6.9.tar.gz 196583 BLAKE2B 01d5382c1b64e565eee34efb1723e9324cfa3dffcf9783e1f707fb384caa55c0b926df0638e318e8de03d28f29a1db37d37a6475d15928c8391bb7930239fc0d SHA512 0c7d1564ce01039ee25dd9eeab76105e3c82e0c3fbf7023709ec7d4d430d28c447e821bec992c5aca460bbd53fba070081462a5c95525d50b60d18ce9a5bed7a
-DIST pkgcheck-0.7.0.tar.gz 196523 BLAKE2B 2ac7c61ffa4ff4b7319dc699ddfabcd5006710ff0089893d2c427fc4d1607107a7374fb3fe4d5da16c8a4725d8e350e29433b6c201ce1594169af3d8a04c8c40 SHA512 b7e4f2d044a9afc55810f30be3307b7b3dcc5f5dcfdc3d2702593866f2d6e5c6906175e484185961e9bad4f8f02a729b74bac4cb8e7697f99951b397f8fe8a2e
-EBUILD pkgcheck-0.6.9.ebuild 1452 BLAKE2B 081eeedc8c03355ac7f28fe25c4d9a3904b33be2da9b1c3381b1247ecef3dd6e127d1ca9db859a6ab47179bf0c6097015ee9d2cb0323d6954e64988a2e5198ac SHA512 64d581b240f051959cdf2275489babb620a22f37d516a37f44cbf9f51b00d4418c7b65817f80abb2b1353d95c069828bda75e55d2561909a9db6bd2400f882b2
-EBUILD pkgcheck-0.7.0.ebuild 1452 BLAKE2B 081eeedc8c03355ac7f28fe25c4d9a3904b33be2da9b1c3381b1247ecef3dd6e127d1ca9db859a6ab47179bf0c6097015ee9d2cb0323d6954e64988a2e5198ac SHA512 64d581b240f051959cdf2275489babb620a22f37d516a37f44cbf9f51b00d4418c7b65817f80abb2b1353d95c069828bda75e55d2561909a9db6bd2400f882b2
-EBUILD pkgcheck-9999.ebuild 1491 BLAKE2B 7f364f184c8f1c164958715f3c369bc3b8bee8c601e33b34d228e795cb5e81c608b2fe3d95596c85ca762d408bebff29bd4a5516e1422512bdf17164c3d285cd SHA512 c01a599b65be43641da7d244a04db2dcf8d3aa657101a52f67ce6d72fe7e564987fa0665acaa340d55febf17fd03d5d969a89e26d030005c4ad89bc59cc384af
+DIST pkgcheck-0.7.1.tar.gz 212835 BLAKE2B 07fce0ed898a276ff939aec9018e02816b0abefe2a2c491ba7be8fb9616fd2351d827ae7f9248ed708a6dc1c387e3b7f30fd78ddbf8aa14b247bdec9e4925bf5 SHA512 0aaab2319d8a9c8dacf1027fd45239b11e530f213c940fcd1cda775f3e214064249c5598d586fb7bf3c0da53460de6e4d19e73ad26ec9be2bfdec645a82f78d1
+EBUILD pkgcheck-0.7.1.ebuild 2011 BLAKE2B 6cb277ffa2e9165564a42d70dfad5bb45860baf717bbb3a8d04e5cf059a6e30c03fe21a0cfa8d47cd55cfd9370f3eab924c7ad0a361c7c8afccfb4bf5a97c85f SHA512 7dcff058c8a2085b3346cbc3f8f4282f9c0a2455d3145f9598de5ce31efe2585df480c5f55258260c869f42b064734aaf5096bf19998eb1976270dcff7d5a4e6
+EBUILD pkgcheck-9999.ebuild 1318 BLAKE2B 2b77f6a4b990de4f637ace4ac82eb09674b32f8f50d820b2adb54b9be14eaeaba29dbd086ba4404c293ac92aadbe23f91e0a08a2276b48bdb5390330ccb525c4 SHA512 57b9c24328559fdee739a0143e02dd49d692a6b180cbabb891b970145985b395ce7ceb8a188b98ab2e9e39604a4811f18477f597f1841a7504e73f7ae6d7c677
 MISC metadata.xml 550 BLAKE2B 546180cdc48f3c64c63ab80711aaeb9f0e84380ebafd76aba32b5744652b9de7d242bc886cde704dab3720c9251b1845deb0fae7f8825477efb5d5562df41afb SHA512 9ecdd3db309e3f7f97452303cd058ebd34423feb050250c8bbc917598e68d55b9e99e2f6a6ac02aadde0e2218c89513dcf13983765852d360c1656c4b945025c
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.0.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.0.ebuild
deleted file mode 100644
index 5c6e0fb886b6..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.7.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="doc network perl 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.3[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.7[${PYTHON_USEDEP}]"
-fi
-RDEPEND+="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	network? ( dev-python/requests[${PYTHON_USEDEP}] )
-	perl? ( dev-perl/Gentoo-PerlMod-Version )
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_compile_all() {
-	use doc && esetup.py build_man
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS NEWS.rst )
-	esetup.py install_docs \
-		--docdir="${ED%/}/usr/share/doc/${PF}" \
-		--mandir="${ED%/}/usr/share/man"
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.6.9.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.1.ebuild
index 5c6e0fb886b6..c4df9003bc22 100644
--- a/dev-util/pkgcheck/pkgcheck-0.6.9.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.7.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
@@ -28,23 +28,41 @@ if [[ ${PV} == *9999 ]]; then
 		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.8.3[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.7[${PYTHON_USEDEP}]"
+		>=dev-python/snakeoil-0.8.4[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.8[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
 	network? ( dev-python/requests[${PYTHON_USEDEP}] )
 	perl? ( dev-perl/Gentoo-PerlMod-Version )
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	doc? ( $(python_gen_any_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/snakeoil[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	') )
+	!doc? (
+		$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
+	)
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
 
+python_check_deps() {
+	has_version "dev-python/setuptools[${PYTHON_USEDEP}]" || return 1
+	has_version "dev-python/snakeoil[${PYTHON_USEDEP}]" || return 1
+	if use doc; then
+		has_version "dev-python/docutils[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+	fi
+}
+
 python_compile_all() {
-	use doc && esetup.py build_man
+	use doc && esetup.py build_docs
 }
 
 python_test() {
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 46531c291504..b81e8708d7c0 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="doc network perl test"
+IUSE="network perl test"
 RESTRICT="!test? ( test )"
 
 if [[ ${PV} == *9999 ]]; then
@@ -28,8 +28,8 @@ if [[ ${PV} == *9999 ]]; then
 		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.8.3[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.7[${PYTHON_USEDEP}]"
+		>=dev-python/snakeoil-0.8.4[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.8[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
@@ -40,22 +40,15 @@ RDEPEND+="
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
 
-python_compile_all() {
-	use doc && esetup.py build_man
-}
-
 python_test() {
 	esetup.py test
 }
 
 python_install_all() {
 	local DOCS=( AUTHORS NEWS.rst )
-	esetup.py install_docs \
-		--docdir="${ED%/}/usr/share/doc/${PF}" \
-		--mandir="${ED%/}/usr/share/man"
+	[[ ${PV} == *9999 ]] || doman man/*
 	distutils-r1_python_install_all
 }