gentoo Easter resync : 12.04.2020

4 files changed, 4 insertions, 83 deletions

diff --git a/dev-python/testresources/Manifest b/dev-python/testresources/Manifest
index eecc8320a72a..9922d6380e54 100644
--- a/dev-python/testresources/Manifest
+++ b/dev-python/testresources/Manifest
@@ -1,7 +1,3 @@
-DIST testresources-0.2.7.tar.gz 32050 BLAKE2B 9ff16d2e33d7b528598d2f5b903e57625018ecbfd9484dab0d8a7d922429cc8d35dada91d84c897c426e06e01b7bd0befe23814996f4aa7b0651148edaa6f246 SHA512 29518f7326272c56a5f2f3f1f7741959dde9265ba5ce7e0c7d7afabd91bd44a519d1cad82a11a41944ff12d65e541536476f87afcac9a7cbb4869743a38547b7
-DIST testresources-1.0.0.tar.gz 44501 BLAKE2B a10cbf562241ee2a756a5de6a9334ff664db7569d3459548d4a9042ab8dffd0d715c16616ffe08ec86ad4a0b4940e0c09b83b57f7bea86b35b6f728e55384fe3 SHA512 7c9f9cbcc62066ab4a75d68780d88925484eeee23e2e0ef0395b63ec2a92968a6969d1bd6f483945e32ff5566e686b426f2f37daf4f803d2ef779032ea97cc6b
 DIST testresources-2.0.1.tar.gz 41948 BLAKE2B 81f597099eb17090cfa759c2fc4e30be2de3f749760e6a0e88e4c5484c91fe6a00d1296ec6ba7dc5aea1bcd0f9239989fab8fbb4f211b6c5bf031ff1be4b803b SHA512 0b23432b019400fe378e957d14a91083eef7fe1130a494b567a5274d69e4e8e09ab75861e5453c3f217507e144cf179c908f84dd1a807992d4bee0b8d32cb0f4
-EBUILD testresources-0.2.7-r2.ebuild 968 BLAKE2B cbc2890fd712e251d3fb913f42107590b973706b9ae08392065a7dbfd42b622670afc6edd0e8d8a1b2ed164e0f3d3fe8c07d2a55fad4b660b9178cc390a76fe7 SHA512 1705f26524fa541769f32c1c1ad8473fa6c2de513ff36ec69a95df30f806bb3ad1d146a148b9dcd8c00b5e265da94a086a1d72c773978c7ba714c73d944dbc80
-EBUILD testresources-1.0.0.ebuild 973 BLAKE2B a893ec87b17bd25250ea227771d4a4242308665b857b084631b713e207abf9ba9353bb2d16397008a739241bfbfb569a02a5d6010903c11b98e029c5502af6ea SHA512 1ce7c14c841bcb11a8af276c68adb413acef2953d538e34470b1fb6b1993489da39adef032f38ba304082f55b300806c2e750dedf5b2137f391f0bdb1699c854
-EBUILD testresources-2.0.1.ebuild 969 BLAKE2B 43e3975d227a661e5155f384d5d5c2dbca74f20b73ca8d745eb5aebec1606981df5348af9c4d09a8e96d7e8d50888ef50ae3b422a124b7930866e98cf9035b29 SHA512 bba947045e5b092d98e195c4d9901a473398fa82140a49dcbcfee1c06ab65313b2fd81be771158188bb45c3e82c9d4d886b76b755a75f6997b41c00f53911d6b
+EBUILD testresources-2.0.1.ebuild 990 BLAKE2B 742a9a7587e207d4a8f28ad48cb7c23ac3e4e477862696b62091ce7b3dcfcf30340b6be6cee18be06117c54ba97db7b48d7a7102367ef63df96e1870c7eaaf00 SHA512 8ac43de085bf8177cac1a99df7f48c75b3d4cb3bd0a44b5eb641539db39c56d3ac18be689c9b6943b1cd162f38a2965ebdf9df325f1abd9fc16946dc02afbaef
 MISC metadata.xml 939 BLAKE2B db25bed8c4a747daf38631903c47491d4cd5ceeed168eb14c68ca0894c271d866616d9a2704beb446a1316a710c98b73a5e224afee7d1e6ceea092de834b958d SHA512 5962ed430ea8163666e9cf360a456e48b38bcba0b85466d01a54fe4d2aacfde98484d4c0740f5ec29393d6291ab14c4da897976201667d22c76ffa56aac402c5
diff --git a/dev-python/testresources/testresources-0.2.7-r2.ebuild b/dev-python/testresources/testresources-0.2.7-r2.ebuild
deleted file mode 100644
index b5ec2ed6b813..000000000000
--- a/dev-python/testresources/testresources-0.2.7-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A pyunit extension for managing expensive test resources"
-HOMEPAGE="https://launchpad.net/testresources"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-	)"
-RDEPEND=""
-
-python_prepare_all() {
-	sed \
-		-e 's:testBasicSortTests:_&:g' \
-		-i lib/testresources/tests/test_optimising_test_suite.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests --verbose || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/testresources/testresources-1.0.0.ebuild b/dev-python/testresources/testresources-1.0.0.ebuild
deleted file mode 100644
index 53e170eb75a7..000000000000
--- a/dev-python/testresources/testresources-1.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A pyunit extension for managing expensive test resources"
-HOMEPAGE="https://launchpad.net/testresources"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-		dev-python/fixtures[${PYTHON_USEDEP}]
-	)"
-RDEPEND=""
-
-python_prepare_all() {
-	sed \
-		-e 's:testBasicSortTests:_&:g' \
-		-i testresources/tests/test_optimising_test_suite.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests --verbose || die "Tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/testresources/testresources-2.0.1.ebuild b/dev-python/testresources/testresources-2.0.1.ebuild
index bc591c7b20ae..9b480a2aef84 100644
--- a/dev-python/testresources/testresources-2.0.1.ebuild
+++ b/dev-python/testresources/testresources-2.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -13,11 +13,12 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]