gentoo resync : 15.01.2020

5 files changed, 10 insertions, 92 deletions

diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index f4426f676299..42b8e479206a 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,6 +1,4 @@
-DIST pkgcore-0.10.7.tar.gz 645474 BLAKE2B 3c311967cd2b4e29a45fbf4f2af9207c20f2401780fc3991c726917d103d6e59e951172280c212c7dd46db33defbfd6aad1a55da4d02484b8963ab8049b86c6a SHA512 91910c9b7ec02396e1e0ff2a23a18757749fea635e3e294131d736eeee8d67bd58e9b5f1de7440e50d926291dd3ed36dc7381a29f7ac9b58c27cf4f3fc49ee45
-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.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
+DIST pkgcore-0.10.9.tar.gz 647634 BLAKE2B e05b091d9ea797fe4207eb750edabf98faa3574b9ee93799554ed525cab5513b5cf45d9f2757c1ba27a3e7add4c55cd51ee57a650d988916e2bc6d03bb78f91d SHA512 efa9e43f2a67e934b7dded190f93f09b860b770097e3715b7f03af3213fc680f5b9d5d9d14c5671d0ef2df9cf0144a009f7fd20e2f28d5c2dcdc685c65bf7232
+EBUILD pkgcore-0.10.9.ebuild 1072 BLAKE2B dbdc62e4f8549554caabf213cc4100c4733d8157f0d668ac449e9ef14de4894cde48917940c8da7c8d892d4c3a309999f4a73ef09372bc13a15b9f04175199e1 SHA512 e7c1c1af43e24aa946564869ae4f20e2824b401fa6072670ad44369734a83418d71cba9094a24fd02c064fce02b19d412b49a68c009ba3a1aef2706047e545fa
+EBUILD pkgcore-9999.ebuild 1072 BLAKE2B dbdc62e4f8549554caabf213cc4100c4733d8157f0d668ac449e9ef14de4894cde48917940c8da7c8d892d4c3a309999f4a73ef09372bc13a15b9f04175199e1 SHA512 e7c1c1af43e24aa946564869ae4f20e2824b401fa6072670ad44369734a83418d71cba9094a24fd02c064fce02b19d412b49a68c009ba3a1aef2706047e545fa
+MISC metadata.xml 336 BLAKE2B 1dde157c2023dcc7578651078f6e9ef30ac5eb28bd5edb690a29b329307c3435b4f1cd51288c1661f58362f57c5de7267e497c548c32fd5defbca85f0ec6d7cc SHA512 a48569920d2907935e8cdfb28b2e2d5fa2bd791eef4fa2ec59c0a22caf322c05cc2c68574ce928890e0de873d69e9e62adb2efe82704556ac6ebef82ef6fc876
diff --git a/sys-apps/pkgcore/metadata.xml b/sys-apps/pkgcore/metadata.xml
index eed40afb00f9..98b0e74b0c93 100644
--- a/sys-apps/pkgcore/metadata.xml
+++ b/sys-apps/pkgcore/metadata.xml
@@ -5,9 +5,6 @@
     <email>radhermit@gentoo.org</email>
     <name>Tim Harder</name>
   </maintainer>
-  <use>
-    <flag name="doc">Build and install API docs.</flag>
-  </use>
   <upstream>
     <remote-id type="github">pkgcore/pkgcore</remote-id>
   </upstream>
diff --git a/sys-apps/pkgcore/pkgcore-0.10.8.ebuild b/sys-apps/pkgcore/pkgcore-0.10.8.ebuild
deleted file mode 100644
index 7351db9305d0..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.10.8.ebuild
+++ /dev/null
@@ -1,68 +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,8} )
-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 MIT"
-SLOT="0"
-IUSE="doc 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.4[${PYTHON_USEDEP}]"
-fi
-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"
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.10.7.ebuild b/sys-apps/pkgcore/pkgcore-0.10.9.ebuild
index 670df92a2cf7..a4a26e422fe7 100644
--- a/sys-apps/pkgcore/pkgcore-0.10.7.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.10.9.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.5[${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
 }
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index 09021519bb70..a4a26e422fe7 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -26,7 +26,7 @@ RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND+=" >=dev-python/snakeoil-0.8.4[${PYTHON_USEDEP}]"
+	RDEPEND+=" >=dev-python/snakeoil-0.8.5[${PYTHON_USEDEP}]"
 fi
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]