gentoo resync : 15.12.2019

4 files changed, 30 insertions, 88 deletions

diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 0d674141bea5..f4426f676299 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,8 +1,6 @@
-DIST pkgcore-0.10.6.tar.gz 645141 BLAKE2B 16723dfae157c809e53f8607bd72ee178ac23280c1eea2f73af4864521aa4c5d7026972e85ab0ca92d3d714819ee24e86a3154ed2ed7f5d619ac7863b58c3436 SHA512 c5221cc7a72f5c3ae76ad1ce59a6b46f8b066991df9766f59b08d8514b6bb5336d8bef217c343d97ff764eb7b3614197f7613d5dfac52360603298dc06f6d7ea
 DIST pkgcore-0.10.7.tar.gz 645474 BLAKE2B 3c311967cd2b4e29a45fbf4f2af9207c20f2401780fc3991c726917d103d6e59e951172280c212c7dd46db33defbfd6aad1a55da4d02484b8963ab8049b86c6a SHA512 91910c9b7ec02396e1e0ff2a23a18757749fea635e3e294131d736eeee8d67bd58e9b5f1de7440e50d926291dd3ed36dc7381a29f7ac9b58c27cf4f3fc49ee45
-DIST pkgcore-0.9.7.tar.gz 592202 BLAKE2B fa16380e89ad2fb2a05d8f08387c3cfa2203b4e6faad3fc4758d572eb08d6c64f781eef8c2d56151f1facec3a202325d4c4a271a1a3ced88df7371f2af75dbf3 SHA512 cb996fd35a8e4e73acfacf1942d498932ec092a282397bd41df72eea26b6d08c15e01b96ece8ebb6876e84281d85d4f8ef81e1f2ef107adff1b984ee592d6a6f
-EBUILD pkgcore-0.10.6.ebuild 1422 BLAKE2B 94c02312eca2b999086c8a7e2ed8cf043999e7d85b663f809f93769545205ee29bfca48f21065612ab9f2b37d3aace43654cbd7ffd742a9cc6493a0b247e0801 SHA512 d107b6261344fee23f37f4fc2ca1ab7c552b0d587edc64e679a564d9b1f8c3e9beecd6ac0a9d71e488dfdc0c3d34f362a215c6d03d0df4e442ae2c70ca06fcbb
+DIST pkgcore-0.10.8.tar.gz 643637 BLAKE2B 191f0c0bfcc0eb6b684001ba4c06393f6010ad2171b0be695c1aceeae3973717c7bc59bb5848d85797508fdbac5645cac228df7d6b9bc9aebcc98ca69243e533 SHA512 607b921b05c833a0c199abbfc4a4afe282935dc6e67904f9cc0588bdd4b2e872c1cffa5ebf0e6aad04912b362c67dc2b29794c3be5410dd019797b447a0ed3d5
 EBUILD pkgcore-0.10.7.ebuild 1422 BLAKE2B 94c02312eca2b999086c8a7e2ed8cf043999e7d85b663f809f93769545205ee29bfca48f21065612ab9f2b37d3aace43654cbd7ffd742a9cc6493a0b247e0801 SHA512 d107b6261344fee23f37f4fc2ca1ab7c552b0d587edc64e679a564d9b1f8c3e9beecd6ac0a9d71e488dfdc0c3d34f362a215c6d03d0df4e442ae2c70ca06fcbb
-EBUILD pkgcore-0.9.7.ebuild 1490 BLAKE2B 867dacbb663e06ddfc7595da418bf5b71a5481972317496a9c93ca00ebee64233abec8790304c1b10097ba6b2444fc01f1713803b09940608cd1b4535ccfeac5 SHA512 362e413b8ea9d0bcefdfeeb66272ce9e922a2461ac158977634c33a9b9fb672b6ac6741223feb43c82ba393dc8b8274a7825781c4f3a8790b6f1da7dd75731e7
-EBUILD pkgcore-9999.ebuild 1422 BLAKE2B 94c02312eca2b999086c8a7e2ed8cf043999e7d85b663f809f93769545205ee29bfca48f21065612ab9f2b37d3aace43654cbd7ffd742a9cc6493a0b247e0801 SHA512 d107b6261344fee23f37f4fc2ca1ab7c552b0d587edc64e679a564d9b1f8c3e9beecd6ac0a9d71e488dfdc0c3d34f362a215c6d03d0df4e442ae2c70ca06fcbb
+EBUILD pkgcore-0.10.8.ebuild 1765 BLAKE2B 9267ff91ad85183fcf1995ac992274fa973e5af3e4d1ab0a5ca23cabb75d46961077efc681e04608e906a6d4347f21d1bd8033c7735875cb4d95dd92ae79bf04 SHA512 fc19ae2dcd82b8bce61deec015d30ee1f1e568c0904da57563cde371d507b68271093e118205ccd2e3264b0038325013074cc24a1aa3b38d113d214eb2df5313
+EBUILD pkgcore-9999.ebuild 1072 BLAKE2B f814ecdc97009cdeb305f0cbeb8e4e2103bc4be665c8af78831fc765a3c2c36a8ac48ae2c0e26b4d3779df1191fde759e6f02f79dc7f180fca150eb530c6f5a6 SHA512 60586c9c8c6cd46eb47ba294fcc501dbdcbab67cf70c6debdf0420eaccfff6d59c6cbbd53c9246f54163b02c94d910523b5763de32f5a3d46d415cc6e326064c
 MISC metadata.xml 409 BLAKE2B 42709aa3a13109a21d1cfa0db9ef758216a2e902d68a10f0db14b4019464a702ef0c91079d0856f9389a2221886bbd3d5d5480ca99efc708543d198d00b7ed3e SHA512 ec04202f105a62a697511c7a89dad118b3618fdce4044c25648492e1557a95b9e29c01a08fca21e106273485471af98c52a6db6b2a40605a67a632938faebd29
diff --git a/sys-apps/pkgcore/pkgcore-0.10.6.ebuild b/sys-apps/pkgcore/pkgcore-0.10.8.ebuild
index 670df92a2cf7..7351db9305d0 100644
--- a/sys-apps/pkgcore/pkgcore-0.10.6.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.10.8.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
 
@@ -26,19 +26,33 @@ RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND+=" >=dev-python/snakeoil-0.8.3[${PYTHON_USEDEP}]"
+	RDEPEND+=" >=dev-python/snakeoil-0.8.4[${PYTHON_USEDEP}]"
 fi
 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() {
-	local esetup_args=( $(usex doc "--enable-html-docs" "") )
-	# only build man pages for live ebuilds if doc USE flag is enabled
-	[[ ${PV} == *9999 ]] && esetup_args+=( $(usex doc "--enable-man-pages" "") )
-	esetup.py build "${esetup_args[@]}"
+	use doc && esetup.py build_docs
 }
 
 python_test() {
@@ -46,6 +60,7 @@ python_test() {
 }
 
 python_install_all() {
+	local DOCS=( AUTHORS NEWS.rst )
 	esetup.py install_docs \
 		--docdir="${ED%/}/usr/share/doc/${PF}" \
 		--mandir="${ED%/}/usr/share/man"
diff --git a/sys-apps/pkgcore/pkgcore-0.9.7.ebuild b/sys-apps/pkgcore/pkgcore-0.9.7.ebuild
deleted file mode 100644
index d48195c029f8..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.9.7.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0"
-IUSE="doc test"
-
-if [[ ${PV} == *9999 ]] ; then
-	SPHINX="dev-python/sphinx[${PYTHON_USEDEP}]"
-else
-	SPHINX="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-fi
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND="=dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND=">=dev-python/snakeoil-0.7.3[${PYTHON_USEDEP}]"
-fi
-DEPEND="${RDEPEND}
-	${SPHINX}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )
-"
-
-pkg_setup() {
-	# disable snakeoil 2to3 caching...
-	unset PY2TO3_CACHEDIR
-}
-
-python_compile_all() {
-	esetup.py build_man $(usex doc "build_docs" "")
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install install_man \
-		$(usex doc "install_docs --path="${ED%/}"/usr/share/doc/${PF}/html" "")
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	python_foreach_impl pplugincache
-}
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index 670df92a2cf7..09021519bb70 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-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,35 +19,26 @@ HOMEPAGE="https://github.com/pkgcore/pkgcore"
 
 LICENSE="BSD MIT"
 SLOT="0"
-IUSE="doc test"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND+=" >=dev-python/snakeoil-0.8.3[${PYTHON_USEDEP}]"
+	RDEPEND+=" >=dev-python/snakeoil-0.8.4[${PYTHON_USEDEP}]"
 fi
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
 "
 
-python_compile_all() {
-	local esetup_args=( $(usex doc "--enable-html-docs" "") )
-	# only build man pages for live ebuilds if doc USE flag is enabled
-	[[ ${PV} == *9999 ]] && esetup_args+=( $(usex doc "--enable-man-pages" "") )
-	esetup.py build "${esetup_args[@]}"
-}
-
 python_test() {
 	esetup.py test
 }
 
 python_install_all() {
-	esetup.py install_docs \
-		--docdir="${ED%/}/usr/share/doc/${PF}" \
-		--mandir="${ED%/}/usr/share/man"
+	local DOCS=( AUTHORS NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
 	distutils-r1_python_install_all
 }