gentoo resync : 13.10.2019

3 files changed, 61 insertions, 50 deletions

diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index dab444f543a8..8903216e1c9d 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1,7 +1,7 @@
 DIST jaraco.text-1.10.1.tar.gz 8790 BLAKE2B 268c13a9a84c4b29ac9141d8a43c716d8248b87c2b71f6bb8a34c2cf1568acdd012e84b1be0469f70ee8e102f723e218b6d551a9bd0cab5192a28d712ed39f03 SHA512 5c09b90f586d5ddf7419013f7e36814598337c257e6bd1c1eec993d7df021440798ec9300a6d45c960c5458c4197b458d1863f478b60a9a003241e98a644f28e
-DIST jaraco.text-1.8.tar.gz 7364 BLAKE2B 60e3ce561ca5c6dca3093a51f8397e925279882ee5b1c02e5359b518f2344481f3d86a927fbd1c7fc903e3207c46cd052a6efbcfac693debce721884188ab87a SHA512 7f13eee9553d7531bf2f51af1b1c7fbb9d778cf082e6eb49948fc0943b7eb5a0268ec51b363ae9e96df854e0af5e38fbc4a679c746160e422759c044d4a33654
+DIST jaraco.text-3.0.1.tar.gz 11969 BLAKE2B 8eed750e81aa6a82baaa25483a2b60d2adb9f7a1769f92556a3a5c3fc53c3dc63a7910615317007dd0b934e73987da5de53d0e52a3cd44da955b717b48348dd4 SHA512 dcac7de44de4f1ae4dcfbe3e1857a4017b967bbbfc46df05cbf7d0f319a0f841440406b75a6e84b3283d8946ee1753c99f16438228dd2393fa023571c3911a10
 DIST jaraco.text-3.0.tar.gz 12082 BLAKE2B 474a3701460dc899015ef0331f2d4de996915e4b840dfcbb8963fd2eb98571bf7f398285dd4df0a0df36e5d1ba8ce04fa59d396dede5ac059c2b991f6a203a1d SHA512 449b917919f074e0b8a285083163fb5141fdee0db0e6d49c58c8e07ca6f284b5d53d01174e266bf8d21914870574672425abf9b094e815d0d9f0c94b1219de16
 EBUILD jaraco-text-1.10.1-r1.ebuild 1379 BLAKE2B f6721435bdb371f6f7061a4e575411a9a3812b0d4780fc5f87bd3866e295821e88d9df8891721e153a04415e678219942c92f3907dc8606736bae2ce03987985 SHA512 cce7096bd5dfe97bbc0c2fcb5ca04f2ed06016a8d4468b87286364e1ee7420663419caefbc9138d3dcc2a2f7bd9c11736192a4ee81d51618e4cac67c27b6fe53
-EBUILD jaraco-text-1.8.ebuild 1147 BLAKE2B a950e82e70ac58d8c1ba265f000948ba6e4c8b140c276274d3b4b079a8f81f1b1f5f54127b2f97f228b2c1e568d6b0e0f2a122ea54c3db4e147d02eb4ed456e1 SHA512 f10b20de7ca299ec7ae02444681e4529c7a448e3ec86875cd924d48ae16b9e3b5a0c53c924380589de21ac449f8e02ac290b944451e412f2b4a01f1938c8a1cb
+EBUILD jaraco-text-3.0.1.ebuild 1526 BLAKE2B b0ec3c68eceb40b5350e147b7b76b0fb3ce2fc625d951239c77839c9564320c1f6f0c5e1a4c66d32783a7c46907d8ab1602a59bd3d309993498777dc9c0ff073 SHA512 20577f82ae24da7621426e08a2015407cffdad9e55280ca3d4dabb2b42d2fc3c5fc51297eb52208e0876452c53d4ac1f17503a1e7bd3c05dabbccd9cbe88c295
 EBUILD jaraco-text-3.0.ebuild 1492 BLAKE2B 59108078857e6c8b893eca08cd23872ebe5862297514dcd7355ee16a01fa5987688c185f87cf0f3f97f44642ed805f0f926b5ffbc76218ca3ad176961d6e83b1 SHA512 9fb5f7bd11f48f24087d5a6ba9ec753f4d8b485775b2f5300bc11987bcbd84aad35bb6f458946813502839b765087f7bf6c7c3504abe072efebe39227380438f
 MISC metadata.xml 530 BLAKE2B 15328b15f81e40af54c52ceef75adc55cc83d04c2ca52c8bcfe85d5fce1e8b70efb38b4a15c8390d283e72a2496dc0b148da0b51b3213440a6ca8379d091c927 SHA512 00c56e02c156ed1b402475dc24dab7c1943bdf6e3067da3f02fe91af0789cf87041cd7191869ab9a785aef21d4e696fc9b134a48fa769ca1f0d0337d1cdc5969
diff --git a/dev-python/jaraco-text/jaraco-text-1.8.ebuild b/dev-python/jaraco-text/jaraco-text-1.8.ebuild
deleted file mode 100644
index 85eb497cca49..000000000000
--- a/dev-python/jaraco-text/jaraco-text-1.8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Text utilities used by other projects by developer jaraco"
-HOMEPAGE="https://github.com/jaraco/jaraco.text"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-PDEPEND="dev-python/jaraco-collections[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/jaraco-functools[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/rst-linker[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/jaraco-text/jaraco-text-3.0.1.ebuild b/dev-python/jaraco-text/jaraco-text-3.0.1.ebuild
new file mode 100644
index 000000000000..65391ac9c63b
--- /dev/null
+++ b/dev-python/jaraco-text/jaraco-text-3.0.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Text utilities used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.text"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/jaraco-functools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=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}]
+	)
+"
+
+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}"
+}
+
+# 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
+}