gentoo resync : 25.08.2020

4 files changed, 3 insertions, 127 deletions

diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index b9e107e25171..cbbb27bd20bd 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1,7 +1,3 @@
-DIST jaraco.text-1.10.1.tar.gz 8790 BLAKE2B 268c13a9a84c4b29ac9141d8a43c716d8248b87c2b71f6bb8a34c2cf1568acdd012e84b1be0469f70ee8e102f723e218b6d551a9bd0cab5192a28d712ed39f03 SHA512 5c09b90f586d5ddf7419013f7e36814598337c257e6bd1c1eec993d7df021440798ec9300a6d45c960c5458c4197b458d1863f478b60a9a003241e98a644f28e
-DIST jaraco.text-3.1.tar.gz 13220 BLAKE2B f52ca11b8b20a42d2c36102d4d48cf27952314bf5304521fde020c6e52e92bf6f534b2c6c4d8cc0b73aec8bd118030e455d8a5eeb19fb4e927105fa7e4477817 SHA512 9edd50e3b67d40a1a5dfe8796dd55f80aac52cef9ba2f1ad565cf597c1ff8824d2c61900cedd104210b60dcc6dced8c01321af67e2e1a755be89e1c15945da1e
 DIST jaraco.text-3.2.0.tar.gz 14279 BLAKE2B aa8c8903bac61db3d1017408e1aa525f66060422c27b754af343a64e586b64c6623b66881bea62b9b2e89821a40c933d54c9a8cddc7bda08ac108ad08a9524dc SHA512 4107ef1078b44714b6ee5fb6ebd2bb7c35415debc6eaedd8bc18a70a2936cc7c7757acd7b3fac9587201ef52a25d9b29e49f2385a0a08afffb1d0c3de6ecc377
-EBUILD jaraco-text-1.10.1-r1.ebuild 1398 BLAKE2B a8ddc0d90f447a17d0660aa46cf19e57895edcd96678f0d1d664055cf84996a584c7c6bb189cce39aaecc02bb4fdf7000f853a46b119a0976e97aae700f053e5 SHA512 5feda10ad31693621278217fe811596f2b2a6c40c8bd6980cfed04a45fb79cb5ff6dd51fa12bce8e6cef285c176ee4716a114b98335d105bdcb0fb351d574b4a
-EBUILD jaraco-text-3.1.ebuild 1639 BLAKE2B 7ea163dcc304213bf92afde4b9c91eb9bdec7b6fabe41befa86115f82a78d3bf7df299e9e52fc3a0a95d82bfcf066e85d86bbe7da8c8c779456ac62294f8c59b SHA512 b347c1514a3f691d69458d5f97479a132a0f47bded24ab3144df6cec45a3446c41e695637e4d6a378c31928877fd4f3aa325f98c40c9dcca4dfc0d8d6e494b73
-EBUILD jaraco-text-3.2.0.ebuild 1496 BLAKE2B 3942a6de4f71f7b2b1c782c0b290a26afb4bb597d06004d04aa549c72d7363aebc223b05513a06a0d7851d708dcde26db5579d5fe7286db17e085d9ed2a28070 SHA512 8738b16d54585d59bd70f9353709d3c703e0b255c2cce9393c0831096bea8480ab69f26794c5168fb17be61103fdb91e4aca3b7b1333ceb2ba03652dbfa47e1f
+EBUILD jaraco-text-3.2.0.ebuild 1483 BLAKE2B ee1a49037beaa9d71d1a000cbed914ba9974991c61485a82789e83212cbd6d689b17d8fb79b00326fb2f0e91e71579e96dae64286c56d9bea6d122c83fb70f39 SHA512 41a91dac99a61b19c01ac2bb075822099ad87e937c971073655a8561982421e508f057c5201560f02c64dfd0cc897f615deaa4d333fe3762a11666876a13c552
 MISC metadata.xml 631 BLAKE2B aaa62e5e0d4cc048c1a279b16890d035cd0a60cc41e9b4c99b37876a21286248b5a00d193a2036d0c6d447ff57e635245583f571834daa5a2e994653570122b8 SHA512 84c01b2578aabd0fd5be4347ade555ca4f4ddd96e7009f7dd1b9d021465bc55f66431c72ed05a7e5633a81f3b401f8f77568bacc872198e145b5421aed05491e
diff --git a/dev-python/jaraco-text/jaraco-text-1.10.1-r1.ebuild b/dev-python/jaraco-text/jaraco-text-1.10.1-r1.ebuild
deleted file mode 100644
index 5609a83b3be8..000000000000
--- a/dev-python/jaraco-text/jaraco-text-1.10.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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"
-RESTRICT="!test? ( test )"
-
-PDEPEND="dev-python/jaraco-collections[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/jaraco-functools[${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? (
-		${PDEPEND}
-		${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}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/jaraco-text/jaraco-text-3.1.ebuild b/dev-python/jaraco-text/jaraco-text-3.1.ebuild
deleted file mode 100644
index 728ffc4387a0..000000000000
--- a/dev-python/jaraco-text/jaraco-text-3.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' -2 pypy3 python3_6)
-"
-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
-}
diff --git a/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild b/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
index 9a3c00ccc7dd..1084d2d49d18 100644
--- a/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -22,7 +22,7 @@ RDEPEND="
 	dev-python/jaraco-functools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python{2_7,3_{5,6}})
+	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_6)
 "
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]