gentoo Easter resync : 12.04.2020

3 files changed, 46 insertions, 4 deletions

diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index 3cf19af5cdd0..dbb348605b57 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,5 +1,7 @@
 DIST humanize-0.5.1.tar.gz 20507 BLAKE2B 55d7b598b32658b1d4c4741b37b5c33bdc9d63a5a779455e2fb93e1e4c3a0d8fd58e8522ef82734e1ba2b161fd881829373ba3569baffd9ea3271ad7ed3e7568 SHA512 dd7ad7f3c564cc6abcb6b128e50dbea7f19f7f418bfd936aae2472961c53ec71202133c5c2b5b930ef41ef807b51d6ba1210565627ed32c0b41acc0abd32a2d5
-DIST humanize-1.0.0.tar.gz 34411 BLAKE2B dc1d2f3c5db2ddbecccf7c1f9894a7fa7ddbb98a530e971ecc1de2b666a1b3a21e2770f25cefa37029d1d439d03e68bbb5a3496cc2fbd074b8bb427a09f52cf1 SHA512 2e012b7be88d0297301f25ecba7ba8083f5fc6384715a657c815373c6f2742f1429e62363e6e16f1bfc85c41b8ab8d4a361112045414e9aef038c12783df2592
+DIST humanize-2.1.0.tar.gz 38484 BLAKE2B 482ef77b004be1c122bec036dc38d93deda7f714d0384804b9374d7031109e74ec1fbe3bb0fa8e7b28f8c98ccad9a11757a64c765d0ec05e7f031f4cb7d6ee96 SHA512 1efd1c34febf6140a02f15b73a90f453630b255414e056c75fd77c83e9aaa30f802a845b7e1c4e90baf0da26fa6d258e0d0fd84f0d4660b55730baccfde62b2d
+DIST humanize-2.2.0.tar.gz 42776 BLAKE2B 9df295b7b34bfb12ca132837e16f0ac2affe1e51ef7bfa533501200fd738967bcabc1b27c37a5fcd7301b6f22a7385a36ec4b30314a099202692d59222a1b271 SHA512 d36a92c7552193eb0fa0aa827041811a77239c067d8070895ed5fbfd05b6f9b4124ac53658d316bf9068256be1b9d7ee61b206209ebc17b6eb24cd70b8ae2461
 EBUILD humanize-0.5.1.ebuild 877 BLAKE2B 53fe455e34cd55b205a800b213325e0d49fc5a34def7492befa0c85494ce456f1fb9cbbb9266933d3c53e88f5cfe46df1b5782b6ff64d1f0f926e34dee79ff6d SHA512 c654f8f6343dc8f481adbe71aadc5daeb01f7375d3fe995f59b71989620cb4fea377f4f1c918bff6461b794f6216bdf224bb43d023c6ea46dc306e1c21d525bd
-EBUILD humanize-1.0.0.ebuild 833 BLAKE2B dd99619762c947dd512b59fc4c730820d719c1dfc24464219592cc4d6d33b5d24db8453c474dfd7f418e19dc69c6128b054100158de38ecfb5e7a5efe59c191e SHA512 71a6abd61cd200097bd3af715544055ee6a8be5f62c2d8dd72e48a0483cb8cbbdcddaf5f94e61c28ddf27ed1756e447287fb2fee46e89b2ff20b68873aeb3ad9
+EBUILD humanize-2.1.0.ebuild 893 BLAKE2B a0353beecd55a641a35a578cfdb0d793733db71e55331cfca3bce3bd670b688845ed49f663348f605c817605cd9df25361db4da509166aa0d3a2ee9f3cb402e6 SHA512 e7810411998ee048f6be2007843c5edce290323f0e3b81f1ecb12335bc14b1ac1a015b170782c9c5924e3e73987827c74f78febe0f08fbef642bad3975e5062c
+EBUILD humanize-2.2.0.ebuild 893 BLAKE2B a0353beecd55a641a35a578cfdb0d793733db71e55331cfca3bce3bd670b688845ed49f663348f605c817605cd9df25361db4da509166aa0d3a2ee9f3cb402e6 SHA512 e7810411998ee048f6be2007843c5edce290323f0e3b81f1ecb12335bc14b1ac1a015b170782c9c5924e3e73987827c74f78febe0f08fbef642bad3975e5062c
 MISC metadata.xml 436 BLAKE2B 79f8554b22e171509667145d3270ea7068ff215fc9d999f2cf654cf42948ba49f850efcdb19cb2a3fb41347612a4d3f178c529410b42238555b20b652b40900f SHA512 871a75a8295b80f9884f191f2264329be5a2975429e35b1ded2e085771284cfa76e230d2e7784a05524ec51cb809fde24e34d6caea45904f5fed3b388fe855a2
diff --git a/dev-python/humanize/humanize-1.0.0.ebuild b/dev-python/humanize/humanize-2.1.0.ebuild
index be43d73ef82d..4785489816a4 100644
--- a/dev-python/humanize/humanize-1.0.0.ebuild
+++ b/dev-python/humanize/humanize-2.1.0.ebuild
@@ -22,11 +22,15 @@ RESTRICT="!test? ( test )"
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
 "
 
 python_test() {
 	# The package uses pkg_resources to determine its version
 	distutils_install_for_testing
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+	pytest -vv || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/humanize/humanize-2.2.0.ebuild b/dev-python/humanize/humanize-2.2.0.ebuild
new file mode 100644
index 000000000000..4785489816a4
--- /dev/null
+++ b/dev-python/humanize/humanize-2.2.0.ebuild
@@ -0,0 +1,36 @@
+# 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} )
+# The package uses pkg_resources to determine its version
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Common humanization utilities"
+HOMEPAGE="https://github.com/jmoiron/humanize/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	# The package uses pkg_resources to determine its version
+	distutils_install_for_testing
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}