gentoo resync : 03.03.2021

4 files changed, 5 insertions, 58 deletions

diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index 46e5a9a391e4..4179c6f465c3 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1,7 +1,5 @@
-DIST jaraco.text-3.2.0.tar.gz 14279 BLAKE2B aa8c8903bac61db3d1017408e1aa525f66060422c27b754af343a64e586b64c6623b66881bea62b9b2e89821a40c933d54c9a8cddc7bda08ac108ad08a9524dc SHA512 4107ef1078b44714b6ee5fb6ebd2bb7c35415debc6eaedd8bc18a70a2936cc7c7757acd7b3fac9587201ef52a25d9b29e49f2385a0a08afffb1d0c3de6ecc377
 DIST jaraco.text-3.4.0.tar.gz 15427 BLAKE2B 4f9584b9824c4d73ac9c75bc153048466d826fb37e8240ebec12181c837bca0d8f79a3e1dce25117f4c3e361a48a1566419d2555d430fcb792b5e40eede2713b SHA512 074b963c9ccf020409a28d7ef0053d5b221f9a3b16003ca9eac663f70b1a909b4523f9e5aba606f77108723157f237602f7c9f5079a782c8bfa9fdbbb553cf28
 DIST jaraco.text-3.5.0.tar.gz 15453 BLAKE2B 53a3553f09a6c33734684477fe1228b159269a6a7e38aa8381af54f17162d1658be1f91157fd092544141bd086fdded32bec2fa0103c4c6978301cae3e199a04 SHA512 da566f1a6d8343d05c51ca3f4635212094ddbc84fe9b460dd7630030a9b5bb28c97ccb0de5928da50230a182985c7e5bce8903d4019ce5afb89067ad938dd152
-EBUILD jaraco-text-3.2.0-r1.ebuild 1432 BLAKE2B 8e3f11196a7d25d47456a16f68bb5e38dded5e3943cfe2b923bfef97467cd42f5668e15e0cb7114c6e6b27ab772ef0f8ea3ae034a60e5a687a78ab1fe383d428 SHA512 a9b8a87e126935a7afebaade8ffdd1e2e98139921254fd9ab33bc367829139b6b2137e3ddb07628fdd5e6d65da17921ea2c7b457af94edf5c138af7f99b52dc7
-EBUILD jaraco-text-3.4.0.ebuild 1246 BLAKE2B 247f049504af918b9db50f812ae661abf65e09cac0b646111158d6ad8bb992b0e5e94328fcc262f774d8bfe203aa3580ea543eb0c67174622ebd30e503e33a45 SHA512 3e2e2a8e8be3d2fa80c2736fde975c1631f6822cd0f4df7fff0904f99684f862436d18cfcef6cb187daed056c7575ad1ee2bdb00423077950a361973b35bac0f
+EBUILD jaraco-text-3.4.0.ebuild 1241 BLAKE2B dc94c90299a92e956120a393d00dfc95fb2c289e5117e3eac59180cb7767341624f0567f8d682e2bd75f38ada051e7b955ce9fbb7305cae70bd15aba517ee521 SHA512 e2a7cf42291efca0bef7fc8260faa59e503330aa5eabd87768719353b216a85b3397f6b8d362ba23d214b47d1b0995932ff9898181e0fb6abad9304d96e478d6
 EBUILD jaraco-text-3.5.0.ebuild 778 BLAKE2B 78e2fccca36614cfc931a5fb6c7c6e4ce9a5bfc97fe294982883e4e8b641efe52d018928a20651d8527887da103f61ebff8933cd22cd801ec219022e096f1ea3 SHA512 41630f8370de81195dd39d28d44dbe58486745946505cade3b2bcbbd397e6dc3f0ba109d21e8ad08c1f2cb9c91ef0dc358c1e4a48f88555b1f035aa1bfd9516e
-MISC metadata.xml 631 BLAKE2B aaa62e5e0d4cc048c1a279b16890d035cd0a60cc41e9b4c99b37876a21286248b5a00d193a2036d0c6d447ff57e635245583f571834daa5a2e994653570122b8 SHA512 84c01b2578aabd0fd5be4347ade555ca4f4ddd96e7009f7dd1b9d021465bc55f66431c72ed05a7e5633a81f3b401f8f77568bacc872198e145b5421aed05491e
+MISC metadata.xml 655 BLAKE2B 6bd01547bc069cfdd2a6d8ef05d0f62b17e54b54ac3d45ce3c66d765a5db88c52750d3f80053efe8eca8c36163deb36268e5a1683e65813d42fe1f033306d4c5 SHA512 94ad62364c1159d64d69d8781ed42f642d3877c2e6776f0d863d6b89fd085199d03a65f251b9fd1c21628d3210160ef120250ad7956d1589b8e06207831d2937
diff --git a/dev-python/jaraco-text/jaraco-text-3.2.0-r1.ebuild b/dev-python/jaraco-text/jaraco-text-3.2.0-r1.ebuild
deleted file mode 100644
index eb261ec246ad..000000000000
--- a/dev-python/jaraco-text/jaraco-text-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-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 arm arm64 ~ia64 ppc ~ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_6)
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-
-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.4.0.ebuild b/dev-python/jaraco-text/jaraco-text-3.4.0.ebuild
index 88fc3ac83bd9..787d8a63c4aa 100644
--- a/dev-python/jaraco-text/jaraco-text-3.4.0.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 
 RDEPEND="
 	dev-python/jaraco-functools[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-text/metadata.xml b/dev-python/jaraco-text/metadata.xml
index e1433b293fac..4e38311d16fc 100644
--- a/dev-python/jaraco-text/metadata.xml
+++ b/dev-python/jaraco-text/metadata.xml
@@ -9,6 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">jaraco.text</remote-id>
 		<remote-id type="github">jaraco/jaraco.text</remote-id>