gentoo resync : 15.01.2020

5 files changed, 49 insertions, 39 deletions

diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index 4e74c43d06af..f74f2c548eb3 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1,7 +1,7 @@
 DIST inflect-0.2.5.tar.gz 109756 BLAKE2B ecb64b0fea04602f112dfba11ade6828eae7a7f3f44d4c4fb15c2300ac18025ea4c51f9c36aae5e7e92bd09e24d08091ce096b888a520fd2d4c40374356333d5 SHA512 68371158ac90d9662c19657cbf697f44ee9ceac090286d53e29ee04252efbb7d0bfbd99ae6847e6eec1991ef4ef670eff60693d1f0a301885bab2a09c7ce4616
-DIST inflect-2.1.0.tar.gz 98767 BLAKE2B 2cddbeb7d4ca5e150435e42b75e0eff2e2b20a8cf38c89fe6e8958bc52d69aa070f7ba5c6c73bfdd2dab585ceb32006542f31abbeccc2375760742c70e0c6c50 SHA512 c5230ad6f224a6e9667ce3c135bf43d09939bf457f68fb3d52a4278b110df10c9ddddd05e68d94f04a6902319ad71440440bad019c081d0d781a2dbde9ab98bc
 DIST inflect-3.0.2.tar.gz 71546 BLAKE2B 951eb818ba1645a9e426468811ad449378aa5a7341575ac2aff5e9d1e06237fe8e96fa64cd678665cd6c05e1dc5e477a65b261b9d8bd170be4fb923d5fb90e9c SHA512 5858548e947f742b91630fc584f568a2221057ada7cd4a55f39de1b52a82c97884d6a78c2f32e5995e354fd1c4eae4d5b3d30491ef57dd5187fd6baca93d2779
-EBUILD inflect-0.2.5.ebuild 579 BLAKE2B 9ada69722ba9ebcc419160e0f6cb3e17f85553ebf4b9431a3bdb546f9f681bca11eb017ad59723a8c53df1c668154159639138b51e01793ada61e3c9b6b28d7b SHA512 4077d30330a5b8f05bebf0844069bf0d8e7ec9916f3ee0a66eda4be0313cc394e356cf6e1aac70694260afccc63e4fb4d2506135b69c12a6f1f1218b05111b47
-EBUILD inflect-2.1.0.ebuild 679 BLAKE2B 1b517e4b9a9385fc56c13d2fc43529e4bd5d63a9ec9dfba685adcf7d2616789bc47975ae0dec47c912b71dfd29af316044f24d73b0984bc6d8d9e2a42342a3e9 SHA512 ad612210eb83d25d575dbc1fd78e1ca6d2d072cfe2fad11404eb328432bbd53f12b7ca4ed24fa410cfc0331809e279f5e911230a5b7461d01c7e30b22c888d0d
-EBUILD inflect-3.0.2.ebuild 1227 BLAKE2B f6ae9c321e66848c7ea5501a3df36025ffc6f100bc9007ed466430663277449c59b3b5a896c1a8b0c7ebf9ec70511cf40ce486c20c0d48e5c3f7eed9748f5468 SHA512 3a4d006b4c3385f4d7046f90bf70b7da02e4d98166a20cd69062d5f3546e8ba443d3ec573a0dc4ea4909083ca93de1f1afa8a96b5a51f129ca387292dd432563
+DIST inflect-4.0.0.tar.gz 71091 BLAKE2B 597db3d84cce1660ea92b84af5d07d77f537b2d738caedbe132ed9cb074a3c80c2f9e1cab321f0e231b2a29803f3b25206f27b78672c4917873007f3a56f1a8a SHA512 7d9ef9389b9301e596165fcb1774467ddeb421636094a0f0cebbcaa11558b4529ccb90644e1097f91cff3316911c98f4bb1df92180193a5313ca7da91a282e5c
+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 1119 BLAKE2B eaf9e27cb9e4243fe003bf514795e3a3a2d9ddd5bebb75ec6aca39370896bac86d006746af2bb0c8f006529088b0ef26134902cda648843203e4eb71761fc11c SHA512 93a848083e049760add722cfdd81a97ca22dc8eb11ea367d4562f38fdcca71738c8421e47276ba216bbd8d076d00d4748f318ea90bd2a8fe15528adbce11d3e4
 MISC metadata.xml 371 BLAKE2B 0c72b1b5bfd404e494c2a6e2f48cf56634981d6ac86026dcd43f9c81804099b0a4693d4971f50db501e1f9421b5952ee6ab65805fbb17213cd0af75f4cc5aa1b SHA512 266d5f9dd95fc339a8653f0f8342996d194565a23e8e024523e1e8880f900301ca796a2abe5f550c51281be0df59d1704e44bb1bfed000d5a880f1a915b8af07
diff --git a/dev-python/inflect/inflect-0.2.5.ebuild b/dev-python/inflect/inflect-0.2.5.ebuild
index 92e9feb41e35..707c55335c8a 100644
--- a/dev-python/inflect/inflect-0.2.5.ebuild
+++ b/dev-python/inflect/inflect-0.2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-python/inflect/inflect-2.1.0.ebuild b/dev-python/inflect/inflect-2.1.0.ebuild
deleted file mode 100644
index 470adefdb043..000000000000
--- a/dev-python/inflect/inflect-2.1.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,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 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests -v 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 9058ef631cda..fb4d41585408 100644
--- a/dev-python/inflect/inflect-3.0.2.ebuild
+++ b/dev-python/inflect/inflect-3.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy{,3} python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
 
 inherit distutils-r1
 
diff --git a/dev-python/inflect/inflect-4.0.0.ebuild b/dev-python/inflect/inflect-4.0.0.ebuild
new file mode 100644
index 000000000000..d7180e8c2c94
--- /dev/null
+++ b/dev-python/inflect/inflect-4.0.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 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 ~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}"
+}