gentoo resync : 14.05.2020

5 files changed, 4 insertions, 74 deletions

diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index 126ccc3a5c9a..03066684bf85 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1,9 +1,5 @@
-DIST inflect-0.2.5.tar.gz 109756 BLAKE2B ecb64b0fea04602f112dfba11ade6828eae7a7f3f44d4c4fb15c2300ac18025ea4c51f9c36aae5e7e92bd09e24d08091ce096b888a520fd2d4c40374356333d5 SHA512 68371158ac90d9662c19657cbf697f44ee9ceac090286d53e29ee04252efbb7d0bfbd99ae6847e6eec1991ef4ef670eff60693d1f0a301885bab2a09c7ce4616
 DIST inflect-3.0.2.tar.gz 71546 BLAKE2B 951eb818ba1645a9e426468811ad449378aa5a7341575ac2aff5e9d1e06237fe8e96fa64cd678665cd6c05e1dc5e477a65b261b9d8bd170be4fb923d5fb90e9c SHA512 5858548e947f742b91630fc584f568a2221057ada7cd4a55f39de1b52a82c97884d6a78c2f32e5995e354fd1c4eae4d5b3d30491ef57dd5187fd6baca93d2779
-DIST inflect-4.0.0.tar.gz 71091 BLAKE2B 597db3d84cce1660ea92b84af5d07d77f537b2d738caedbe132ed9cb074a3c80c2f9e1cab321f0e231b2a29803f3b25206f27b78672c4917873007f3a56f1a8a SHA512 7d9ef9389b9301e596165fcb1774467ddeb421636094a0f0cebbcaa11558b4529ccb90644e1097f91cff3316911c98f4bb1df92180193a5313ca7da91a282e5c
 DIST inflect-4.1.0.tar.gz 72200 BLAKE2B c15f6b0d5d93050283dfc4d691e9fdbc26bb2f71573d6b397834e87af62f3afb8f5cdb0448c531de37e84729c0c6ae0cf4ea7a7b081a9dd784f7c06b962d7def SHA512 9a2ba4777f01475390976f3ac28f046d39d1f86cfdafd161cc7c8d33526aca35d44e6598ccf2a0b68d3511a64b67ed0991b51c78bda8f279cd706fd29a3fa514
-EBUILD inflect-0.2.5.ebuild 575 BLAKE2B 3b08519374ff99105001452bb98e23afee63434803d8f789913ab3a9099911c5d10ddf0981ccd926d084ccf686a6fc11db14544855c0ba13c55a624d4c196d6b SHA512 c45ec21562859554af7aca682f34e6f09b2a5b2fd8fdd22bb1dbfa2266f9ee8dacbb182b368f0395fe584d7d2cce2868a0f9a76b6e765ec8618692a077add8cc
-EBUILD inflect-3.0.2.ebuild 1222 BLAKE2B 075da95d632a0e250a9bc9654851417ea25237e8debd4d92e8e271aa456696a637e43f41920ac32d0e569d873b2ec9570272e260401e53cdd2ae32a3cd016426 SHA512 cc7f57360900e5079734dd1cda1ba4e97e2ab8fe0f3997253d81f4aad7ccb30098c22ade0826ae8b4c3f14a28396a43cb523acf906ca726b116afdc6afad1e33
-EBUILD inflect-4.0.0.ebuild 1137 BLAKE2B 8aa2cb050f5cd5092a92ba8fc8a12509e9b8484967556957dbe1f56508f3b0d45f30b0a36f728f94d754a6633c032aabbe34d4df7866fd565daa2049fb399aa8 SHA512 97f03bc2b401ccae8b24402da88f13ec662d53feb4ef0f67b30523e0986950e1362991f70b3a7ecc4c17cc4399c5969297f831c55502827defc73d0a787fe0e4
-EBUILD inflect-4.1.0.ebuild 1134 BLAKE2B 46089317d809f4d9979425569c71f12a2a363fdb14dfabbac04781b992824b862362cddaabd2d159f6f878b4bd677493dbca384b7a1bcffc52b3f8849c794660 SHA512 db6e0562c0670da8e6a60dc572872fe9b3f9645d7e6e8093331c044bad272edc640906db52478d308635b8dddf9547fa31b6aada77ba8e595c1550d882bb1cd3
+EBUILD inflect-3.0.2.ebuild 1221 BLAKE2B a509765bbaef5fce7e7c44c34e57cb38eaf972ddb57730521fb4db2a9fc3d33083407f32b2de06aad2a04197d7340b3e49dc8bfeaa3fea1230b9e87955646541 SHA512 852be80446b9b71a422c732a41baa0c07eb2af65d209512dd39971b4d24caf3dbf221e66a80391e00c8d04dedd2f02e7812535e30060c06c27d523d60a680a00
+EBUILD inflect-4.1.0.ebuild 1130 BLAKE2B b9f4e2d2f16b1389d89bd81a217b8f1e46fa80495ae9d4f7a172fb9d328ed52e4dbe4f933270541d8e270a221d6c983fd2bd1387df95efab28e69ebbac5a97be SHA512 4cba87ef3b9ec737da81f57e7df1e4905780ed62665cb388cdab4ef2a11fa06061bc2d3d46cef5f09f3e06a2c8ab887295fb4cf81d1cee3c81d7b7b370f99b84
 MISC metadata.xml 496 BLAKE2B f1e420733f50138d3e750b0eea09ee773aee906b7e18351c18adf161f6cdbb257d24784f503b455f1529a45899d968fe15d274d296c04b42f609f89eae0354d7 SHA512 e2a538fe19ae2849100603f5e695e4d100819ccb7e0bfe26d99268eaffd5b650f275b33efa6a4cda4caa17d941be917cecf17ca0939794820defbd01dd728fa5
diff --git a/dev-python/inflect/inflect-0.2.5.ebuild b/dev-python/inflect/inflect-0.2.5.ebuild
deleted file mode 100644
index 707c55335c8a..000000000000
--- a/dev-python/inflect/inflect-0.2.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_6} )
-
-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="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests tests || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/inflect/inflect-3.0.2.ebuild b/dev-python/inflect/inflect-3.0.2.ebuild
index fb4d41585408..e87f18512a29 100644
--- a/dev-python/inflect/inflect-3.0.2.ebuild
+++ b/dev-python/inflect/inflect-3.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/inflect/inflect-4.0.0.ebuild b/dev-python/inflect/inflect-4.0.0.ebuild
deleted file mode 100644
index 259a01510e67..000000000000
--- a/dev-python/inflect/inflect-4.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
-
-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 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
-"
-# six can be removed in the next release
-# https://github.com/jazzband/inflect/commit/407dfa7e170a562012f37e9bd65c3b50cd3da0cb
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
-	'>=dev-python/rst-linker-1.9' dev-python/alabaster
-
-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 13d597c2df93..226bf1c28ce6 100644
--- a/dev-python/inflect/inflect-4.1.0.ebuild
+++ b/dev-python/inflect/inflect-4.1.0.ebuild
@@ -15,7 +15,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 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"