gentoo resync : 23.09.2020

3 files changed, 2 insertions, 56 deletions

diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index 319b975ff7fd..c281e27f0aea 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1,5 +1,3 @@
-DIST inflect-3.0.2.tar.gz 71546 BLAKE2B 951eb818ba1645a9e426468811ad449378aa5a7341575ac2aff5e9d1e06237fe8e96fa64cd678665cd6c05e1dc5e477a65b261b9d8bd170be4fb923d5fb90e9c SHA512 5858548e947f742b91630fc584f568a2221057ada7cd4a55f39de1b52a82c97884d6a78c2f32e5995e354fd1c4eae4d5b3d30491ef57dd5187fd6baca93d2779
 DIST inflect-4.1.0.tar.gz 72200 BLAKE2B c15f6b0d5d93050283dfc4d691e9fdbc26bb2f71573d6b397834e87af62f3afb8f5cdb0448c531de37e84729c0c6ae0cf4ea7a7b081a9dd784f7c06b962d7def SHA512 9a2ba4777f01475390976f3ac28f046d39d1f86cfdafd161cc7c8d33526aca35d44e6598ccf2a0b68d3511a64b67ed0991b51c78bda8f279cd706fd29a3fa514
-EBUILD inflect-3.0.2.ebuild 1221 BLAKE2B a509765bbaef5fce7e7c44c34e57cb38eaf972ddb57730521fb4db2a9fc3d33083407f32b2de06aad2a04197d7340b3e49dc8bfeaa3fea1230b9e87955646541 SHA512 852be80446b9b71a422c732a41baa0c07eb2af65d209512dd39971b4d24caf3dbf221e66a80391e00c8d04dedd2f02e7812535e30060c06c27d523d60a680a00
-EBUILD inflect-4.1.0.ebuild 1138 BLAKE2B 23c36449d9b214270b19cb07e88d478e7661ca10b4e66ebc43ddbd3d58f0783e4205f103c4651ce82722aa026f768884101dd4420422c3b7003c9cef30e3b27d SHA512 49b4a5679fec1b85eb89389ab30efd04da3f414d258f1c329581cea46707848ec2f785a9f22f9af86963ebe0dd6603176f04c31f9f8a5cf00b8f3a26c31dd1c6
+EBUILD inflect-4.1.0.ebuild 1005 BLAKE2B 47027952c17e73fdbf15eeb872c29b9f0080e3da59d65e8738d04c9a3ed81c118013cbfb4d8dfee9560103f0866bec2eaf476c722d136a123b6c90dec9a0158c SHA512 ac507e143bb5dcd85148042d5d18e53799f034f7eaf0e671af17373c922928209577b1d8ed83136cad7a62e23f67fdd4da8eb1fbb49d9bd95f017932f56428d7
 MISC metadata.xml 496 BLAKE2B f1e420733f50138d3e750b0eea09ee773aee906b7e18351c18adf161f6cdbb257d24784f503b455f1529a45899d968fe15d274d296c04b42f609f89eae0354d7 SHA512 e2a538fe19ae2849100603f5e695e4d100819ccb7e0bfe26d99268eaffd5b650f275b33efa6a4cda4caa17d941be917cecf17ca0939794820defbd01dd728fa5
diff --git a/dev-python/inflect/inflect-3.0.2.ebuild b/dev-python/inflect/inflect-3.0.2.ebuild
deleted file mode 100644
index e87f18512a29..000000000000
--- a/dev-python/inflect/inflect-3.0.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Correctly inflect words and numbers"
-HOMEPAGE="https://github.com/jazzband/inflect"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-# nose is still required by some test features
-# https://github.com/jazzband/inflect/issues/90
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/alabaster[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-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
-	pytest -vv tests --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/inflect/inflect-4.1.0.ebuild b/dev-python/inflect/inflect-4.1.0.ebuild
index 360011e84cb0..5ed8ab2d118e 100644
--- a/dev-python/inflect/inflect-4.1.0.ebuild
+++ b/dev-python/inflect/inflect-4.1.0.ebuild
@@ -4,8 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
-# [options.entry_points] is present in setup.cfg but it is empty
-DISTUTILS_USE_SETUPTOOLS=manual
 
 inherit distutils-r1
 
@@ -15,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -23,7 +21,6 @@ RDEPEND="
 	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
 "
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
 	dev-python/toml[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )