gentoo resync : 28.04.2021

3 files changed, 2 insertions, 45 deletions

diff --git a/dev-python/nose2/Manifest b/dev-python/nose2/Manifest
index 73dd0e7cf888..2b0c2ab9ca38 100644
--- a/dev-python/nose2/Manifest
+++ b/dev-python/nose2/Manifest
@@ -1,5 +1,3 @@
 DIST nose2-0.10.0.tar.gz 156614 BLAKE2B 8e785cd36a781952b4401842288edf7b2551c69a894cee0d56b56c3e74de36b89bf09f849dc7264733d0c906660a5d01f2b74252507ae322073640d8ca0abfaa SHA512 e9522fddb45ab303819a38f6e4de16a2676b824e7027e8137d5e44917c21de91aec8661b28946e0bb1c7c72de907ba5eaa0e8bf76b2b76ae1edfcfe68fdb01dd
-DIST nose2-0.9.2.tar.gz 153381 BLAKE2B 9339a31b664561bd86817a969a64a3d80dacdda3ed25bc0a0b6531812e56c7e2bfaadcad3712d8af1a7ce585e27ff6de54428667e44e7c6b0003db5d52703971 SHA512 9af69f0cc9db2e8ef37d2c4ea4fd2d661a38df73fc984d261a1c7c39fba07e44afdf494f0939362b84a03e80c3d93ee75c9352ef333616bf8ce6e6f019b811fe
-EBUILD nose2-0.10.0.ebuild 876 BLAKE2B fb955035498a0b13f1d14f48f0a0bc62ba6f7bd9f032e365c622ace5d1810fc7c7e8df3a57fac2d2a26dc15413614efea64c4a2c4047a737fcf28df73a569b2e SHA512 c362121cd29f9003f6f4dfde5dbb7ff9917161971f2af945c5b1e61a223684da938bf76dd0fc86fce4d15a7aebe924d52c23038b61c632712bb5e996428353a2
-EBUILD nose2-0.9.2.ebuild 874 BLAKE2B 6a61a1b5c27bae61d13ed89b866a894da05b1fc789ed20f2f4546de6edd5aeb79f0be9348eddd99ceda51e147f06de2cc965316555e6ed9a5f26a1c1e32c925e SHA512 f87a3cc96b067df9cc0d63b187a791dc48b6976cdee2d3189e44df9a5c5bfdd80c5502b59e6b2b331ec66a065921c5f41ce669dabfb5a0cf9ad7cb191b80007d
+EBUILD nose2-0.10.0.ebuild 874 BLAKE2B 6a61a1b5c27bae61d13ed89b866a894da05b1fc789ed20f2f4546de6edd5aeb79f0be9348eddd99ceda51e147f06de2cc965316555e6ed9a5f26a1c1e32c925e SHA512 f87a3cc96b067df9cc0d63b187a791dc48b6976cdee2d3189e44df9a5c5bfdd80c5502b59e6b2b331ec66a065921c5f41ce669dabfb5a0cf9ad7cb191b80007d
 MISC metadata.xml 312 BLAKE2B 22f9d7365fc58ec0909ed0d3bd159ea17a7c89c33d982573264be761d1a08ffc8f9aebe95927f81417eff4e72e71b91ab6eca9773471778cacb779e667627f1e SHA512 310e65bf0154dc12b14ec9ec6124f31f1b658c0d2f3beb7f3d01643c0b28ac6efae9536dd8d1e55f8900404b812e71eddbb235e9eaa91e7d8d5945a9420f03c4
diff --git a/dev-python/nose2/nose2-0.10.0.ebuild b/dev-python/nose2/nose2-0.10.0.ebuild
index 1f4c68ec3af2..78d73e088364 100644
--- a/dev-python/nose2/nose2-0.10.0.ebuild
+++ b/dev-python/nose2/nose2-0.10.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/nose-devs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 # Failures need investigating
 RESTRICT="test"
diff --git a/dev-python/nose2/nose2-0.9.2.ebuild b/dev-python/nose2/nose2-0.9.2.ebuild
deleted file mode 100644
index 78d73e088364..000000000000
--- a/dev-python/nose2/nose2-0.9.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit distutils-r1
-
-DESCRIPTION="Next generation unittest with plugins"
-HOMEPAGE="https://github.com/nose-devs/nose2"
-SRC_URI="https://github.com/nose-devs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-# Failures need investigating
-RESTRICT="test"
-
-BDEPEND="
-	doc? ( >=dev-python/sphinx-1.0.5 )
-"
-DEPEND="
-	>=dev-python/coverage-4.4.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.1[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	"${PYTHON}" -m nose2.__main__ || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}