gentoo resync : 15.01.2020

4 files changed, 23 insertions, 30 deletions

diff --git a/dev-python/jaraco-itertools/Manifest b/dev-python/jaraco-itertools/Manifest
index 1fc022396194..3b854275e3ab 100644
--- a/dev-python/jaraco-itertools/Manifest
+++ b/dev-python/jaraco-itertools/Manifest
@@ -1,7 +1,7 @@
 DIST jaraco.itertools-2.3.tar.gz 12857 BLAKE2B 714b123965af3ff593205aab373f3097709729377cd867ca2a7ccbb7795b1818f47b0b316d4c927c9aec4eb66fe1da63b44c1d60db310dd97b5444b01f7db04d SHA512 070a442531fd079fefcb61bbbdb0cc98bc88cbc5f23f6cb40ee1fafbc9a259c69e0a373e949ab54d22836f54b0de41e1b09d10692f92d18030825ca09345be48
-DIST jaraco.itertools-3.0.0.tar.gz 13461 BLAKE2B b6b5146ea2fd9aabe72da85be84224d1c06b71278661183ea52e6ca7c9032c4ca33310d61eb93ceeb14edc4f5923dffc5af25cc8f3345c7453921d85f20ca22e SHA512 91ffcfd2e734fe6647115b54a0eec45b58176681208a48705600a7293484fabdb5190f6981a985f35048bbc2fcb66250fa8a0d862ef41422102cdec1acdbfa41
 DIST jaraco.itertools-4.4.2.tar.gz 19431 BLAKE2B d3493380f9522d436d4d8dbcdf484e7fd4fa223e96fabde0d7f3803c395e56d0bd28f49b9a6bfec0b680fdff7f5d145c85530036157f7976ffa82fc4851e3105 SHA512 74db7a3c7595c7deaf2a0c9ba68e9b02d02ccbc6c65142de34a5339aac679c2d71f05b27e27632d265de4f78997e11d7dc43178bd0d64f3010e1568a5085812c
-EBUILD jaraco-itertools-2.3-r1.ebuild 1404 BLAKE2B 2ae18f3755cbaf76527ee2e1f9575b83f5d86ac0b5507b644e02e7693fc75c547dc0f72a1ac30977889c034b28339f146f38b6c8ca6ed1416d3ea732f15e722a SHA512 3fadd65f64b0424182911ed7fd430ed3de4996b1b3252c59b2dc46fd12914e82bc0a6799cf08ef7eebe191d87e68ddc5bfefafc77a7cfc7c1b1547cd47ef403a
-EBUILD jaraco-itertools-3.0.0-r1.ebuild 1471 BLAKE2B eb320ffd38b66e384de129eff07a8d419b8ea420108c1fb72c7f6dc2801b38824f0e6d967ca919bbb1ea732662c2855cdfb63761c89286642f0184aa9b02bb98 SHA512 8e048cda2d51ad0def3ff59eca42deb5444a3d400f6d0b4e728d2664a9a739b4bb4c642c4df593af46dbaff17a43a4069f227db1e7db9555814a0cc697a12096
-EBUILD jaraco-itertools-4.4.2.ebuild 1658 BLAKE2B 80e94d4679df1b6611366c9d6a8bdf55e40574489616c430fb25e93572b12062c9dacb1719ee7ccaebd718af681de44893916bace2e90f3d718e84114c811a28 SHA512 29f9fa3b1a4c193389e04c505ba3c2fc81529eef15548a1b87a6cefaa2aa8d9c9780618a924251549e37c6c2752198a35899d82d4c9d5106f9d99e2e16013652
+DIST jaraco.itertools-5.0.0.tar.gz 19517 BLAKE2B b38bbb75daa53ce9390a51099b3ebad16696924c26c6674a7c5b9ae5e219db6560d1bae24b4c491d6e424b7fecea66dac2eab673d0cfa91fbdb3a4246b852944 SHA512 38ae2cbdd436b277e3d3c252fadeb5239e2d32b2291686b2a3dbaca69328392eb1db4318b2144954b17302e5b15b94ad89f1ea8a1b2e354deec7d4516bd7ec85
+EBUILD jaraco-itertools-2.3-r1.ebuild 1400 BLAKE2B 42d68930b42184ff5c3ee7521c91db62acce6881469a2fc6095beb8129b59b427d649d01730e82f4c3d8c35d88462742626b0d32a6a8fe8630f22bc9ce6216af SHA512 fac80eb3ab79ea825660d2de8cb5d5361f84ed7d811a178bb37b7799e7b0bf289888692f9ffd11af39b2aae9792f4eb6278b7b669bf974b4f5d1410324477225
+EBUILD jaraco-itertools-4.4.2.ebuild 1656 BLAKE2B 4c21458f3b12ebbabcf65aa3b2ae1c1120c6f7181fdd09d08157f1be773cc2baa76e9fc53aad929f488bb3170380163d2d0d3d46e7c9096522bb44b106b0d070 SHA512 e86386d409c8cf6fc56a9663e2dff7a85d599b061cf2b43a6c3a5f3e358ac6e50137555e907b55d4dd5ea4fe4ddc95cbb876d0f3945cb42fdea9e42e3bac4b93
+EBUILD jaraco-itertools-5.0.0.ebuild 1492 BLAKE2B eaaf8c862caad50afb8a17bbc07f4d68a4f5ce4dba74ce54ee30d556dbcc3843c656e5482db292f3a98192b537d1d63539fd98a77051dd92ee6e51ab51ef4a0f SHA512 4335628e851694feabca7429268f49e3614c6b9ac690d55582123f91039b9eddb2313f4499b1f39e2c32a541ddffd3650fe6fbb8d8ef9b5c6c0e79ae321fbe1b
 MISC metadata.xml 550 BLAKE2B 9a0db00bf8d20a8942cc362092d64aad0a91d47e54fc5a7c3a6d444defb32a1045f0993d3ad2c61f6edbf059c633388ff4109e71af3454824631e79388bcc5ed SHA512 f60f044460ba89008629bbde7c052af0159ad7044124606a7cddbba403c9a20bae9b91839ab76e48e1b0481f2a6cabdbc4ca0e00e636955e2149f5ebddfd964c
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-2.3-r1.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-2.3-r1.ebuild
index 199ea810629d..a5217730a581 100644
--- a/dev-python/jaraco-itertools/jaraco-itertools-2.3-r1.ebuild
+++ b/dev-python/jaraco-itertools/jaraco-itertools-2.3-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # Tests fail with PyPy and PyPy 3
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-4.4.2.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-4.4.2.ebuild
index 805e75d860aa..2b82805b2df1 100644
--- a/dev-python/jaraco-itertools/jaraco-itertools-4.4.2.ebuild
+++ b/dev-python/jaraco-itertools/jaraco-itertools-4.4.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # Tests fail with PyPy and PyPy 3
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-3.0.0-r1.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild
index 5b1ed0d5e538..427399b7651b 100644
--- a/dev-python/jaraco-itertools/jaraco-itertools-3.0.0-r1.ebuild
+++ b/dev-python/jaraco-itertools/jaraco-itertools-5.0.0.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-# Tests fail with PyPy and PyPy 3
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+# Tests fail with PyPy 3
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -15,46 +15,39 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
+# TODO: remove six
+# https://github.com/jaraco/jaraco.itertools/pull/6
 RDEPEND="
-	<dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
+	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/inflect[${PYTHON_USEDEP}]
 	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
 "
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
 	test? (
 		${RDEPEND}
 		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
 	)
 "
+distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
+	'>=dev-python/rst-linker-1.9'
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
 python_test() {
 	# Override pytest options to skip flake8
 	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
 		|| die "tests failed with ${EPYTHON}"
 }
 
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
 }