gentoo resync : 14.05.2020

3 files changed, 2 insertions, 46 deletions

diff --git a/dev-python/blessings/Manifest b/dev-python/blessings/Manifest
index 24aba1b259a0..88b7c7ffa46b 100644
--- a/dev-python/blessings/Manifest
+++ b/dev-python/blessings/Manifest
@@ -1,4 +1,3 @@
 DIST blessings-1.7.tar.gz 22844 BLAKE2B 3694d3e421416bf876265fd0877240b2e0d61e8c58dfa63a6e74dd2f5efd2307cc4a0eef0e825adc0c0f37f6e78e15640362f9477c0dc5c89846416e16f180a9 SHA512 9b1e3eded3fa588c48898d88ba466836be8f25264ce908a2289504e8f13b01315ae1686ee34c0e3a44cdd2bf73da8c1b65e0aaf49ffc0e5b29c412a497c3d76e
-EBUILD blessings-1.7-r1.ebuild 1099 BLAKE2B c266a8c1e0a3bb14b3b480e09ccf615e2fa20c42c4d8ed2427c960e4554bf3839d3b7bdb61b6f4b8f2019d570f3a4b2cf637c86c3e11e3f300a1120b5fe94e1c SHA512 59a7d9285ebf26b882f056142cfdd89c420d9b83bb0c9e8fe809999ff0a2c10fda117c54ef834f9dbf0506120627139c004cad9da526bdcdf9e190e9739bca34
-EBUILD blessings-1.7.ebuild 1136 BLAKE2B 5c7ff036993f6a898c3ff1316dd5bea3098fdcec427d158a380d2a3a1046f7cdc4bbafd3945f3c02dc8ee8cc39d5632910b443ad9574331f483d961471b0821b SHA512 0f48edc965c6a7f331031004599d25174cce680759f57b4bcab84bdf0bd463a7106d6b09e6914c71b55337bdffcf145ea1820fd9c42e8c9d0b20891bb9baea3a
+EBUILD blessings-1.7-r1.ebuild 1097 BLAKE2B 02ed46c2f5f98fe340d2249adfff4a1604c4e28fbbbeae4e44d81781a658d4ad564589ecfd97b93e44646e0e26dfac3b99158957500aeece6099840ac2b59d13 SHA512 41902da4ee7f57499cb328cb0a54895c8d3cc60019d8cd3aa6372f19bb6876323dfc1012c61d3f36148ecc5ffdf39d06fa8f9fc13d99ac718393c7f48b2cd284
 MISC metadata.xml 450 BLAKE2B d5969d6f857cb2ef4927505a351baaa6116bc3b85c1e54a1afd031cc903909ababfa7fd76c01fc9ee4a4bb6ff33552ab984f902932bd8772f11ec931f8fa99dc SHA512 8851fc3ed67dbdbe0efb8fd1712101644793086e6d84fe52fd54d741d81f4c30bb666e1aa82bfc111e2f264e3a238c6059d8be6844a05819b285cc913ade0231
diff --git a/dev-python/blessings/blessings-1.7-r1.ebuild b/dev-python/blessings/blessings-1.7-r1.ebuild
index 4d4244fee145..d9b166b70bc5 100644
--- a/dev-python/blessings/blessings-1.7-r1.ebuild
+++ b/dev-python/blessings/blessings-1.7-r1.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 )"
 
diff --git a/dev-python/blessings/blessings-1.7.ebuild b/dev-python/blessings/blessings-1.7.ebuild
deleted file mode 100644
index 4530868483cb..000000000000
--- a/dev-python/blessings/blessings-1.7.ebuild
+++ /dev/null
@@ -1,43 +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} )
-
-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/"
-# 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="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	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 -v -w \"${BUILD_DIR}\"" /dev/null \
-		|| die "tests failed with ${EPYTHON}"
-}