gentoo Easter resync : 12.04.2020

4 files changed, 23 insertions, 44 deletions

diff --git a/dev-python/blessings/Manifest b/dev-python/blessings/Manifest
index d7c1a3a4a864..24aba1b259a0 100644
--- a/dev-python/blessings/Manifest
+++ b/dev-python/blessings/Manifest
@@ -1,7 +1,4 @@
-DIST blessings-1.6.1.tar.gz 20122 BLAKE2B b2158f3fd538ef8641438bce7800efc9417e9febec6509d0e11389277b02ee03e661fe70198176a6a3578c216aeb4a6957da28d090cb1dc2849efff135cdf400 SHA512 7a4b051e448cddde7e8ce24106ce0d5d893eb442b19fff04f9ddf28381dfa1b4bdd4be79b87782162b2ead13597a346f533edb944130f2e5bc39aa936ca48db2
-DIST blessings-1.6.tar.gz 19974 BLAKE2B 5b454c7199c637f9b8d4de69a92b8137e65b925898064f31dabb56bf4fd7af8b3374b7311bcd0369b668868bc2335ce945306c242c1bf58d6d7d50c09150c017 SHA512 5d0fc365416bf2b36b6de72f6b8c01bf0ab8df4a0148f492c80056a9ebd5d569e9c01966481e0d70a25add16da2bc3e73be933226369abca533ce019f97479f2
 DIST blessings-1.7.tar.gz 22844 BLAKE2B 3694d3e421416bf876265fd0877240b2e0d61e8c58dfa63a6e74dd2f5efd2307cc4a0eef0e825adc0c0f37f6e78e15640362f9477c0dc5c89846416e16f180a9 SHA512 9b1e3eded3fa588c48898d88ba466836be8f25264ce908a2289504e8f13b01315ae1686ee34c0e3a44cdd2bf73da8c1b65e0aaf49ffc0e5b29c412a497c3d76e
-EBUILD blessings-1.6-r1.ebuild 808 BLAKE2B a69ac2ca3628b7e9e798affeef653aaada37d7aa9fa5011c47881a695ace78c43600f300979545b5f6f5657ae6a02019479a194445d8c6686226010a424276aa SHA512 6b972cfc2a20a6363846ce02bf187591919720c3f16fb83dbe9a1e895967ae6f14e2d4e0e0ab53c2a2754918a005e4c0b6092039883617d6fe19a5052c6fc8bf
-EBUILD blessings-1.6.1.ebuild 810 BLAKE2B 80cfcde28c77612096ec719d67c84e28c8ede730cb1bb83dead0364e42bbf5cbb9c75b8941b2d7d123a710d10d1be0e232984948f2fac1f48028af41ae08c8f8 SHA512 7d0f3ea9c89f69da88b732499a3a227f8c052c1bbb1280ec0ebe7aea203174de86464b102b81c0c435f31b1fd25fac7a53a1f46232fc55336ebd2d99e44b6467
-EBUILD blessings-1.7.ebuild 1138 BLAKE2B e8a86f4e2b08e538947069b70a5831b5240102ddb9ead7b23fb5c4a2fe0a7d135dc3149f790fa8861092fe06c8f93a534cedb18e3f845014da6f731e419d4113 SHA512 70e8b930632584221571906f4de47177b33134c3ce3ffe93ffe48babf40cba84d0317317f38720032c6fc4daace819390b092be778235b4be195dcaf02e0a49e
+EBUILD blessings-1.7-r1.ebuild 1099 BLAKE2B c266a8c1e0a3bb14b3b480e09ccf615e2fa20c42c4d8ed2427c960e4554bf3839d3b7bdb61b6f4b8f2019d570f3a4b2cf637c86c3e11e3f300a1120b5fe94e1c SHA512 59a7d9285ebf26b882f056142cfdd89c420d9b83bb0c9e8fe809999ff0a2c10fda117c54ef834f9dbf0506120627139c004cad9da526bdcdf9e190e9739bca34
+EBUILD blessings-1.7.ebuild 1136 BLAKE2B 5c7ff036993f6a898c3ff1316dd5bea3098fdcec427d158a380d2a3a1046f7cdc4bbafd3945f3c02dc8ee8cc39d5632910b443ad9574331f483d961471b0821b SHA512 0f48edc965c6a7f331031004599d25174cce680759f57b4bcab84bdf0bd463a7106d6b09e6914c71b55337bdffcf145ea1820fd9c42e8c9d0b20891bb9baea3a
 MISC metadata.xml 450 BLAKE2B d5969d6f857cb2ef4927505a351baaa6116bc3b85c1e54a1afd031cc903909ababfa7fd76c01fc9ee4a4bb6ff33552ab984f902932bd8772f11ec931f8fa99dc SHA512 8851fc3ed67dbdbe0efb8fd1712101644793086e6d84fe52fd54d741d81f4c30bb666e1aa82bfc111e2f264e3a238c6059d8be6844a05819b285cc913ade0231
diff --git a/dev-python/blessings/blessings-1.6-r1.ebuild b/dev-python/blessings/blessings-1.6-r1.ebuild
deleted file mode 100644
index d72f67714017..000000000000
--- a/dev-python/blessings/blessings-1.6-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A thin, practical wrapper around terminal coloring, styling, and positioning"
-HOMEPAGE="https://github.com/erikrose/blessings https://pypi.org/project/blessings/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	# The tests need an interactive terminal
-	# https://github.com/erikrose/blessings/issues/117
-	script -eqc "nosetests -w \"${BUILD_DIR}\"" /dev/null \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/blessings/blessings-1.6.1.ebuild b/dev-python/blessings/blessings-1.7-r1.ebuild
index 8b602edf13c1..4d4244fee145 100644
--- a/dev-python/blessings/blessings-1.6.1.ebuild
+++ b/dev-python/blessings/blessings-1.7-r1.ebuild
@@ -1,30 +1,42 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 
 inherit distutils-r1
 
 DESCRIPTION="A thin, practical wrapper around terminal coloring, styling, and positioning"
 HOMEPAGE="https://github.com/erikrose/blessings https://pypi.org/project/blessings/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+# https://github.com/erikrose/blessings/pull/136
+SRC_URI="https://github.com/erikrose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
+IUSE="doc test"
 RESTRICT="!test? ( test )"
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
 "
 
+python_compile_all() {
+	if use doc; then
+		sphinx-build docs/ docs/_build/html || die
+		HTML_DOCS=( docs/_build/html/. )
+	fi
+}
+
 python_test() {
 	# The tests need an interactive terminal
 	# https://github.com/erikrose/blessings/issues/117
-	script -eqc "nosetests -w \"${BUILD_DIR}\"" /dev/null \
+	script -eqc "nosetests -v -w \"${BUILD_DIR}\"" /dev/null \
 		|| die "tests failed with ${EPYTHON}"
 }
diff --git a/dev-python/blessings/blessings-1.7.ebuild b/dev-python/blessings/blessings-1.7.ebuild
index f2f31335e0c2..4530868483cb 100644
--- a/dev-python/blessings/blessings-1.7.ebuild
+++ b/dev-python/blessings/blessings-1.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/erikrose/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"