gentoo resync : 15.01.2020

4 files changed, 65 insertions, 33 deletions

diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 9e95b9aa60af..1caaefc92e77 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,4 +1,6 @@
-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
+DIST pkgcheck-0.7.3.tar.gz 221266 BLAKE2B f4633a3c115913d8973b82f8ab6a4550334f5091fcf02d4557932e903e984fe659e75fc581a6ab10775630045c8d912bb34b098ffe75c563e338453d90e30b2e SHA512 2f2ec7ab8a43840e9e1ed419564835384419c87aa71f45f233714ddea0f66c837769e47502b3f12cd3cae4107c81e14b483f36c070da59964c0a9274965e0fa1
+DIST pkgcheck-0.7.4.tar.gz 222384 BLAKE2B 4461a4b01755a6e1095c4a80c001381807e7b153ecc1b7770b0b58e2f4aebc2db35cbe4f37354424ecb8c7d139cc2258568df28c00f0a0c082dec8831161c885 SHA512 11ba1ea9e40d56fb24c136296b8ff06643d3519e330421fd0ec336ff5d9fb079f9e04269cb1521a60e6d68fa5cd7c03e0c595a042d7f9ec77944a30e399abe74
+EBUILD pkgcheck-0.7.3.ebuild 1318 BLAKE2B 2c937d6a7b13c51a1a260e36042caa38db07e1267dc820fdd2be880f78a09b4e814ab8872fe930a1d95afd8983450a8ab6b6d7cafcd46ab8d8beb4d62d635ca5 SHA512 dbd792542bfa92a7b28cef7633fc9618e95c84ed940a6a5701f145e05e1752478f9c763c68f4914bfd6cc2309fcdb42e1b3c6eb124ed09d6429de5a07446e1ba
+EBUILD pkgcheck-0.7.4.ebuild 1318 BLAKE2B 9373935373bbb8d12d78e6ee7a3e179e0c2adb1987e1fb22f379352d62486806010ff0d9136a37eb051d29487968eddcaae7b1e0045eea8c30e088cdf463dd18 SHA512 6b5ab1b5492d99685e041a6f78960bf5f0fd23dea682ceb94bf080409dbba5aa3c7cdfc18796ca1a30ea8e7ddfde9fabc92394610a7cef7276e1690adaefd5b6
+EBUILD pkgcheck-9999.ebuild 1318 BLAKE2B 2c937d6a7b13c51a1a260e36042caa38db07e1267dc820fdd2be880f78a09b4e814ab8872fe930a1d95afd8983450a8ab6b6d7cafcd46ab8d8beb4d62d635ca5 SHA512 dbd792542bfa92a7b28cef7633fc9618e95c84ed940a6a5701f145e05e1752478f9c763c68f4914bfd6cc2309fcdb42e1b3c6eb124ed09d6429de5a07446e1ba
 MISC metadata.xml 550 BLAKE2B 546180cdc48f3c64c63ab80711aaeb9f0e84380ebafd76aba32b5744652b9de7d242bc886cde704dab3720c9251b1845deb0fae7f8825477efb5d5562df41afb SHA512 9ecdd3db309e3f7f97452303cd058ebd34423feb050250c8bbc917598e68d55b9e99e2f6a6ac02aadde0e2218c89513dcf13983765852d360c1656c4b945025c
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.1.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.3.ebuild
index c4df9003bc22..4626c74a350b 100644
--- a/dev-util/pkgcheck/pkgcheck-0.7.1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.7.3.ebuild
@@ -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.4[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.8[${PYTHON_USEDEP}]"
+		>=dev-python/snakeoil-0.8.5[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.9[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
@@ -40,39 +40,15 @@ RDEPEND+="
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${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_docs
-}
-
 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
 }
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.4.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.4.ebuild
new file mode 100644
index 000000000000..bbcc3dd247b0
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.7.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7,8} )
+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="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.5[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.9[${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}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index b81e8708d7c0..4626c74a350b 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -28,8 +28,8 @@ if [[ ${PV} == *9999 ]]; then
 		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.8.4[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.8[${PYTHON_USEDEP}]"
+		>=dev-python/snakeoil-0.8.5[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.9[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]