gentoo resync : 15.12.2019

3 files changed, 4 insertions, 49 deletions

diff --git a/dev-python/nose2/Manifest b/dev-python/nose2/Manifest
index b3512679a67a..4a8fde67fc21 100644
--- a/dev-python/nose2/Manifest
+++ b/dev-python/nose2/Manifest
@@ -1,5 +1,3 @@
-DIST nose2-0.6.5.tar.gz 134808 BLAKE2B 5f094d537ff7c48b7bfaf139b4c96a93875013ca5663d1e5b3feec543e7efd55335488321bcdd5752529cb36685dd28c91bd29665aed9e5f58fef837e5e2944b SHA512 fc84aa19d486ff1441dd43666182212e4a05b3be054f3c8967e36e624c08ee6eb10b01bba45b5f5dbbd38cfd057d53877e0bc0d9aba59b842688a5d4ec944b40
 DIST nose2-0.9.1.tar.gz 152411 BLAKE2B 39f2d992e5cab4b9e5cd4401ea9285884eeeac7d2e126b5aad5582186efa0f325139480a446950019e91a376b5992fea106064e5170c9ea7961f128b895a335c SHA512 48cfe3956a3cb696e344ea03e5e0ac8d52831b8272b7cad2bdee34681d1e4e7968fe9da9b71cc9db40b6edf289509c2af766e73611f3a6f23ebd5062f4d52c9e
-EBUILD nose2-0.6.5.ebuild 942 BLAKE2B bf5a88b98c0807c34a5aba0e4a7905f0905d2f081e955f824993fcde0935864a75107ce6cc0dca061f9c9903cafda1eae0ce642040d78a8832b0701361d1d256 SHA512 9c0ccf948ea72af4eda1b9c3c5728132f0d8e06bf9543146f5c0560dc2da25083e74b6af3d7ad21bdeb64f190603ea991bcc857f1012ae36130b3371a66dcb31
-EBUILD nose2-0.9.1-r1.ebuild 889 BLAKE2B 35466710489358f723731a5df4cd070ab61d1de1b3feb2bd2b0ca9392ed2d1969513ea3c17f1eb859e20ece6ea06ee05f0702e345012d63055ac4d65a889058e SHA512 be0d8dbb295d56ef22e3d4223b7447d8418a3e9669da08b9d60f2205aa3a9b9b3067bfae0ccc12004e86b86c52bc947454a08a93802c7b638f507562ef7b3f2a
+EBUILD nose2-0.9.1-r1.ebuild 871 BLAKE2B db66e36b866f96b2f0e76333f2b729f4ab4acd029b7c3162a9ddbc47474c2df5cfef78bd4fc1cfe529841fdc025544d5fe3baefe6ce56e5523f3d5d77e13459f SHA512 049545838bfc3372dce9cc0d494bbaa6fcc70d583d386c58726d2aee81ef7cda70ad09a404085d9cbc032c689f3d84a14071b7695f5a363f468116990746b345
 MISC metadata.xml 245 BLAKE2B 3add0b4d7a53d7fe522e4b78a567cf1a8b1fe89d9abfd8fd5ccbc70104ccf52b15c4081cea951454752df03f43de328c975f280a42f8b248e83fc37a89716fdb SHA512 1ecded9f7a627a77dd609108d3bb95d70fea72e3fcc70436a6f0e54abe609bf9553644a8aaf2333e1aa0b14095768dc8f5d35b510173ccb194f4f8ac4243e33e
diff --git a/dev-python/nose2/nose2-0.6.5.ebuild b/dev-python/nose2/nose2-0.6.5.ebuild
deleted file mode 100644
index 4e7c882e5f4c..000000000000
--- a/dev-python/nose2/nose2-0.6.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="nose2 is the next generation of nicer testing for Python"
-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"
-
-CDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.1[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${CDEPEND}
-	doc? ( >=dev-python/sphinx-1.0.5[${PYTHON_USEDEP}] )
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/cov-core-1.12[${PYTHON_USEDEP}]
-"
-
-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
-}
diff --git a/dev-python/nose2/nose2-0.9.1-r1.ebuild b/dev-python/nose2/nose2-0.9.1-r1.ebuild
index 22dd4594b981..2c81a2d5f80f 100644
--- a/dev-python/nose2/nose2-0.9.1-r1.ebuild
+++ b/dev-python/nose2/nose2-0.9.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Next generation unittest with plugins"
@@ -12,12 +12,12 @@ 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"
 
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.0.5[${PYTHON_USEDEP}] )
+	doc? ( >=dev-python/sphinx-1.0.5 )
 "
 DEPEND="
 	>=dev-python/coverage-4.4.1[${PYTHON_USEDEP}]