gentoo resync : 10.11.2019

3 files changed, 51 insertions, 32 deletions

diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index 0c056f2a3c23..ef99d0bab5ca 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-1.0.1.tar.gz 110413 BLAKE2B 4c7a5801fde8e0825c7a18612d7d4b6e92534c742ca9021e31c77ffb346e4e5b83f2ca1336d4a4116b721c14d1d6d7387838eff5a52b198c6490a1d00fa8d1a0 SHA512 000cd0e16d16b67cd36914c11d2230268e49be524f184f247d5cea29cc6b69d7b7259b9a67174efd570a2fb9eb6c392a7a6e223d48fd04d824a625fb7fc7f2a7
 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 552 BLAKE2B cc0fff049deeb0bee5c71e0fdc2df51d51f7679bedd7330678cd0b5614de848e3837de9a3e7715385c7f60017b29f762bc97290f86ae9820b2cace6429a4ad36 SHA512 0865be3db57cf0dd6af0028abba516bdc5cd2517ec69cf424945d9757c346f7d1e6bd9fa1ff6a9c90cd5bfd3e9c90adb4f12170cd390c44cebe0774c46efda20
-EBUILD inflect-1.0.1.ebuild 655 BLAKE2B d0c390edae482912fc9769187bafef0ce22279de2611821473bede85966e0dc637179595f6edbe267eaaf784d5cdfdf5e42c8e03da9900f21a355a74d866ddfe SHA512 f4712c81dd99ced656ac80c725a943508b6f6ce251d1d03db9303f6df1c4de3cf1e3a843a768fd349973334e4e1c417b3945eed50a5c960d162dafdd8b4e5038
 EBUILD inflect-2.1.0.ebuild 652 BLAKE2B 68279cced816dba3cba21170e05ce451cdf30e89954cb58c86a4610c57efb2515802fc08836a3374491c88ef035107a19b07fb5e72f0eab25fa8165080236c9c SHA512 803eae36303117e82095c6a7989fca1b72350a2e1bd8a7bf2f644af96938f7ea69efafd0d9d17bed4c8fba7ed3935cfa67c88ace0c69ef8eb38a2ce841e71078
+EBUILD inflect-3.0.2.ebuild 1222 BLAKE2B 28a694a6b0c6a75a189d84205d7ccb4b269a7cf0ff0ba40126d14006fb5a93913d7111d880818694b1014ba7867b2dbe3d7f8ef3287a2172d4afdd0de1ee46b9 SHA512 cef26dacb4625206006080e6d7b9e7c2fc533f4fc67b0816825c9f425bbea5ba042ec41d8d2e87158c79133d3aeda4dc8671e04ad552cd4a76c3ce5d7802a27c
 MISC metadata.xml 371 BLAKE2B 0c72b1b5bfd404e494c2a6e2f48cf56634981d6ac86026dcd43f9c81804099b0a4693d4971f50db501e1f9421b5952ee6ab65805fbb17213cd0af75f4cc5aa1b SHA512 266d5f9dd95fc339a8653f0f8342996d194565a23e8e024523e1e8880f900301ca796a2abe5f550c51281be0df59d1704e44bb1bfed000d5a880f1a915b8af07
diff --git a/dev-python/inflect/inflect-1.0.1.ebuild b/dev-python/inflect/inflect-1.0.1.ebuild
deleted file mode 100644
index 17f586434458..000000000000
--- a/dev-python/inflect/inflect-1.0.1.ebuild
+++ /dev/null
@@ -1,30 +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="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="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
new file mode 100644
index 000000000000..94231ddd4ce6
--- /dev/null
+++ b/dev-python/inflect/inflect-3.0.2.ebuild
@@ -0,0 +1,49 @@
+# 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="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}"
+}