gentoo resync : 12.01.2019

3 files changed, 11 insertions, 63 deletions

diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 0d353b8d1bde..61923b5a3c37 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,6 +1,4 @@
-DIST pkgcheck-0.5.3.tar.gz 80896 BLAKE2B f396d14c95f8b9eb652fdc3073be942bc271f67116c081818ae8d769ca492f201a1da206d9ea4d0011e01790ce54a1d0c0e174de966938adea46ad526652f766 SHA512 39804112b70bb90b655754b78d87a23906b749622083534dda1cb7b7e381c61f95c41c02fbfc6f8dea075bd3665cfda93f565c5d896779d5746ac71b74878df9
 DIST pkgcheck-0.5.4.tar.gz 95354 BLAKE2B ce39854d494db7a7d3412690b8a789f3d78d2a7d0519f11397ec8b02bd03118f171eeba8fe37207e9c18bdf28e7e321ec06d8bb84f9302c07b5238c0851df1e3 SHA512 3c196ce170bb01f0a9f15caa8557e30cad8e088ab9bc733ac754e9c5f6d9078a70a4d14649ee5342848cc170f3c34d7575b35872c5d1a5693fb7aad207727b1b
-EBUILD pkgcheck-0.5.3.ebuild 1208 BLAKE2B a9a4d89c04ec512be71d2adff1638f6d2daec7b929da8d2fc719fead0337b4e4a58e7b1a80544ec025af96edd8c05396fe4984db5c33ecc79b48f8763cf0e8cb SHA512 5f88cbd4c3162a3e6cb02e8710464c10384268564428b4dc713f9b9d122909e8cce9ed086648c5238a1b1c6092d78abbf248e72b764818b1bea687f3886706d5
 EBUILD pkgcheck-0.5.4.ebuild 1336 BLAKE2B 7d5beefb887dd1dba9f1ad4cebbd0bfac8a0e6c7633301223a843b4e54c498e43919324c8d10815a4d41a7e08039e19e5305f9b6807bd1ce4d1cca5cfb04d11b SHA512 44b8e3877881af9a34685de4ee1f40e56bb2802581260cc56e3c5add635ee20db2e0b9efca4e6c4f112c78ab20082c03dbfadde80f5d2fb023c230d9f96d9188
-EBUILD pkgcheck-9999.ebuild 1247 BLAKE2B 8da15077358e5e18dc8caf985d2e9930a7324512c82f52053cb4926789562d0624d7b393bd16fcb9d32e758b5f4b3573c98e070f2a2b3d5b369f84da00e5335b SHA512 8209da6dbc589c4e4be06678388cb9050fe00046381eb7d606a00249e17c6e549cd8347677216bce762c8092e769404dc04cc98937463b18b805e70befff5788
+EBUILD pkgcheck-9999.ebuild 1308 BLAKE2B a9c60ed56de7e719a3accb8919d854a300b3fd04a058e7d76fe51fce5a41e10dc751fe896ee33713620b0e787c7e9f1bc56b1fb2657156e3ffc25f9c2353c5ff SHA512 11235d5c364fcd3f7edaaefa3a46826a80f1ce18e1357fc5e8fc6f293cc562cc3783b1e3ca335caa5356a8752720490dbd6bdee5fa24bf71e0766cae9e37ec6e
 MISC metadata.xml 337 BLAKE2B 515d4c48bd17aa665f445ee52a54bef10f3ea5c35ca4ca51e7d4389fe99d86685b9bafbab38f390a4b6fbb0df5d504a1468888d3fec5383e686ff19345658f86 SHA512 e2f31f9cc7fe4296758b15b222f7f14ff04a78d28850bc48f67af0fba4a561f6da63191ebaba73fc6623d12296ad6137ec84b74a5eb9b6b76c929d7029468a71
diff --git a/dev-util/pkgcheck/pkgcheck-0.5.3.ebuild b/dev-util/pkgcheck/pkgcheck-0.5.3.ebuild
deleted file mode 100644
index 7f6377c90e14..000000000000
--- a/dev-util/pkgcheck/pkgcheck-0.5.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-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="https://github.com/pkgcore/${PN}/releases/download/v${PV}/${P}.tar.gz"
-fi
-
-DESCRIPTION="pkgcore-based QA utility"
-HOMEPAGE="https://github.com/pkgcore/pkgcheck"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-
-RDEPEND="
-	>=sys-apps/pkgcore-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/snakeoil-0.7.0[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-[[ ${PV} == *9999 ]] && DEPEND+=" dev-python/sphinx[${PYTHON_USEDEP}]"
-
-pkg_setup() {
-	# disable snakeoil 2to3 caching...
-	unset PY2TO3_CACHEDIR
-}
-
-python_compile_all() {
-	esetup.py build_man
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS NEWS.rst )
-	distutils-r1_python_install install_man
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	python_foreach_impl pplugincache pkgcheck.plugins
-}
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 2b1a33742b3b..898fbc5e514f 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
@@ -19,11 +19,12 @@ HOMEPAGE="https://github.com/pkgcore/pkgcheck"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
+IUSE="doc"
 
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND="
-		=dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		=sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND="
 		>=dev-python/snakeoil-0.8.0[${PYTHON_USEDEP}]
@@ -31,11 +32,11 @@ else
 fi
 RDEPEND+=" dev-python/lxml[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	dev-python/setuptools[${PYTHON_USEDEP}]"
-[[ ${PV} == *9999 ]] && DEPEND+=" dev-python/sphinx[${PYTHON_USEDEP}]"
 
 python_compile_all() {
-	esetup.py build_man
+	use doc && esetup.py build_man
 }
 
 python_test() {
@@ -44,7 +45,9 @@ python_test() {
 
 python_install_all() {
 	local DOCS=( AUTHORS NEWS.rst )
-	distutils-r1_python_install install_man
+	esetup.py install_docs \
+		--docdir="${ED%/}/usr/share/doc/${PF}" \
+		--mandir="${ED%/}/usr/share/man"
 	distutils-r1_python_install_all
 }