gentoo resync : 06.08.2019

4 files changed, 92 insertions, 29 deletions

diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 685ef582535c..668c820ce682 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,4 +1,6 @@
-DIST pkgcheck-0.5.4.tar.gz 95354 BLAKE2B ce39854d494db7a7d3412690b8a789f3d78d2a7d0519f11397ec8b02bd03118f171eeba8fe37207e9c18bdf28e7e321ec06d8bb84f9302c07b5238c0851df1e3 SHA512 3c196ce170bb01f0a9f15caa8557e30cad8e088ab9bc733ac754e9c5f6d9078a70a4d14649ee5342848cc170f3c34d7575b35872c5d1a5693fb7aad207727b1b
-EBUILD pkgcheck-0.5.4.ebuild 1329 BLAKE2B 06d0c18872ff72005cf1f613d3dbace72cab4378e1ea60747e18fa665e4314671c235d8a999beed28cd8957097fcc3cb5099e023042f1fcc8ff87f90a5410d3c SHA512 91fbef02f96fb1c3110f9b58d3ba47dcefe9fa0b0b1b434ffdb5b6f44a7336431816392b0fa38a47393e41ab22fe8d141bf184e45fe9e32dd8c36140e2c31223
-EBUILD pkgcheck-9999.ebuild 1277 BLAKE2B a51bd3b1a5edf2635fa804a1bc8ae49488d3e5a9dc22e40741e879d44f27409474872a89d5501f39e73eb1379372f1646255a03aa6ac9b3817dddc9c3f1beb1d SHA512 beae01defca87158c5a00cad2e4f22a7e537c1fb96412e023ff6e581bdbe555ef5b67f6dd6f9a582b7aa57a98d98b8d0daa3b5d03acfe0373466626f41a3dfd1
+DIST pkgcheck-0.6.2.tar.gz 169107 BLAKE2B cd7570924b6b115aae467275bc4e1b26a7c20454860d614c23f96c45f5856d6cc8874aa4ba6d250591eae2f5ef0da8102124a924dfdeba5ca75a17fc1005eaaf SHA512 8684fd40694f4348150bd10e4ad4cfb99cf4978595ccd77e117b50abb54060ef1f9d2a9889279ce139b95c39b6b755ccb8c9604a84ea62892e519552e27ca5af
+DIST pkgcheck-0.6.3.tar.gz 171317 BLAKE2B 76e74cb7b7ce093aec6eff210b4984b195adfa615bdfa9937d47725246a8f0f4074a5d7fe0537e9b556df08906cb738f109eb0bcd980966b1baba4f754888285 SHA512 888bcbe66603de97f92f0bd9a35de6b177724b752e70f55a04cb1ae17c32a476986b9d5165cbf92819c1945bf481529943ef6fe3cfd72739749149760c9809c3
+EBUILD pkgcheck-0.6.2.ebuild 1344 BLAKE2B a84d785972b55a4dfe414c9afbfcb66a436dfa3f1f05b5ac5937e3296dadd315587de3becf3c789bb1cfe2321583272923cdadf0e71490457256ca44d8627699 SHA512 17df39ba1a46e6efeab2fcc6b8188591b837e29c18a128d9b7489fcf19ba12512fbc080f93004b2f9922f520fbf51fbff24961fc35b9bd708f317ada8296e53f
+EBUILD pkgcheck-0.6.3.ebuild 1344 BLAKE2B 6aae272faa382357c84dc6318f7c0965c1619d4e128ba34b7e85a3cc3a1a78c754f55f9e4df614e3800ec9fafc169e0a2e62d61c0c87d442804ad1f90ec0c6a2 SHA512 d3a92545b88cd224088a13b3255824ea3200af1561df632ad15113f032bcaeb67848cd1ec038af5145524ec88041e79b590733be74f4110d26315c130ed5603a
+EBUILD pkgcheck-9999.ebuild 1344 BLAKE2B 6aae272faa382357c84dc6318f7c0965c1619d4e128ba34b7e85a3cc3a1a78c754f55f9e4df614e3800ec9fafc169e0a2e62d61c0c87d442804ad1f90ec0c6a2 SHA512 d3a92545b88cd224088a13b3255824ea3200af1561df632ad15113f032bcaeb67848cd1ec038af5145524ec88041e79b590733be74f4110d26315c130ed5603a
 MISC metadata.xml 337 BLAKE2B 515d4c48bd17aa665f445ee52a54bef10f3ea5c35ca4ca51e7d4389fe99d86685b9bafbab38f390a4b6fbb0df5d504a1468888d3fec5383e686ff19345658f86 SHA512 e2f31f9cc7fe4296758b15b222f7f14ff04a78d28850bc48f67af0fba4a561f6da63191ebaba73fc6623d12296ad6137ec84b74a5eb9b6b76c929d7029468a71
diff --git a/dev-util/pkgcheck/pkgcheck-0.5.4.ebuild b/dev-util/pkgcheck/pkgcheck-0.6.2.ebuild
index aeeac7fcdedf..f244fafd53a3 100644
--- a/dev-util/pkgcheck/pkgcheck-0.5.4.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.6.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
@@ -17,30 +17,32 @@ fi
 DESCRIPTION="pkgcore-based QA utility"
 HOMEPAGE="https://github.com/pkgcore/pkgcheck"
 
-LICENSE="|| ( BSD GPL-2 )"
+LICENSE="BSD"
 SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 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.7.2[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.9.5[${PYTHON_USEDEP}]"
+		>=dev-python/snakeoil-0.8.1[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.1[${PYTHON_USEDEP}]"
 fi
-RDEPEND+=" dev-python/lxml[${PYTHON_USEDEP}]"
+RDEPEND+="
+	dev-python/chardet[${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
-}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
 
 python_compile_all() {
-	esetup.py build_man
+	use doc && esetup.py build_man
 }
 
 python_test() {
@@ -49,10 +51,8 @@ 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
 }
-
-pkg_postinst() {
-	python_foreach_impl pplugincache pkgcheck.plugins
-}
diff --git a/dev-util/pkgcheck/pkgcheck-0.6.3.ebuild b/dev-util/pkgcheck/pkgcheck-0.6.3.ebuild
new file mode 100644
index 000000000000..1a07b1b270b2
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.6.3.ebuild
@@ -0,0 +1,58 @@
+# 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 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.1[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.2[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+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-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 75dc351a4f38..1a07b1b270b2 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -17,9 +17,10 @@ fi
 DESCRIPTION="pkgcore-based QA utility"
 HOMEPAGE="https://github.com/pkgcore/pkgcheck"
 
-LICENSE="|| ( BSD GPL-2 )"
+LICENSE="BSD"
 SLOT="0"
-IUSE="doc"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND="
@@ -27,16 +28,18 @@ if [[ ${PV} == *9999 ]]; then
 		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
 else
 	RDEPEND="
-		>=dev-python/snakeoil-0.8.0[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.10.0[${PYTHON_USEDEP}]"
+		>=dev-python/snakeoil-0.8.1[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.10.2[${PYTHON_USEDEP}]"
 fi
 RDEPEND+="
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
 
 python_compile_all() {
 	use doc && esetup.py build_man