gentoo resync : 04.08.2018

4 files changed, 8 insertions, 150 deletions

diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index 01e4339782b3..aa1a64be951f 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -1,15 +1,11 @@
 DIST pbr-0.8.2.tar.gz 77790 BLAKE2B 4b2efa9a06f0e47eac8d2b591d2c10223418c5813a8de83696348d7ec7ddd20f077492e43028994f1a2d1e28856d3d6159e4105174a760211584b026a616da24 SHA512 76d7d4c97660d5a6bbe9a33498a93b32528073024520e570739c511c0138ba1af7e35139bf77ca2a94063e5979baccd6252619449d6aed546fd1331be81ab52a
 DIST pbr-1.10.0.tar.gz 111425 BLAKE2B 2cef589ada2892dd8357ad3248c4b544d58c699d24b6e299284f49a7f838dcfc846daabc4e40de388848ad415a12c19813e13aab1d3f3bf147e064269e4dd725 SHA512 f7f6ce2f70324e2d287f58c3d12e0be2e33ef9ed32311ad2c56410eb67cda20732adff2058ba2fc244249a17a4c95b0d589ba913db4777e63ff1023ae888c864
 DIST pbr-3.1.1.tar.gz 102665 BLAKE2B 301515d50f8550f5553a29faacb1daef589b41b8116320abd4552bb67886498d89eced1f95e1efdd6ac0511a5587eb479dc9d2963a74e92300463c3c53201e7d SHA512 c01fb83678f8fc3acddc153dd341a17ed9d602b6770f0ff244b1c5b54c37d4ddcbd0c3d726f7d7020865819e02797c1c79a0c15e9ee2ae5c1510fce7112b2a3a
-DIST pbr-4.0.2.tar.gz 107720 BLAKE2B 346e74414cb77da61be08eee39148991aff7eaea7bab54407ce9dc48f422c576fd2125c11acb31cdf54cecb059281cf540c4ccfa005056c5c3b276ea2161c873 SHA512 d678c933a1d1b0319358b0d067291d29467582e6abb26e21386b9d98092f561e3b76965e0b18e12e88abab790b737606ae2a37cc11cb0a4a34ff6c1ad99cfdb1
-DIST pbr-4.0.3.tar.gz 108684 BLAKE2B e3a9a695b04333a9523c8e749628773cd12f38e87cd6cc670b8ba40b800871004a5cd9d038913e5f483291d180afbeb524535c6c68833ee48adde6ff276783f4 SHA512 9e5c915bd661e3356ad1b92b3d01df3a592a6120c9dc58d3e4bfbc3040f2d69f896244ea8f6c9cffad3e774747d330cd03e928cfc160e5df980c134fe2dee801
-DIST pbr-4.0.4.tar.gz 109077 BLAKE2B efe901b074cd6747fe123b6a325cb45e010d774834a875e86647b6a9c3afbaff9e435087e757ae4276c0b18558faeea57c8dec6b2039ab7b0f70424f64d94f57 SHA512 fc849a27c3b5deb89545dd05eb102a14f2c42a0d617f474df46b3292c14ab7e0a4343cd6e1a38eef77815cca49374d58698cb0c2fdd2aa5f2f47e890939adbb3
 DIST pbr-4.1.1.tar.gz 108683 BLAKE2B 5c0157ff14590113e7baae0bdca1ff46108a7a10d6eae8bd0a2d06bee62b4aa65eed25c900ae1b67324ac6b416641081c63a274c9694db1877b5d9073c1c04d9 SHA512 ed739901b3a2d1eafa1d4d408a39f1e5d967776571efe0913877145aaccee3114558e107a4e5704403288324c63a08cfbca07a3409bd1baafcbc33105abdf3e4
+DIST pbr-4.2.0.tar.gz 107958 BLAKE2B 716283ceb7b1a8da41e77441c7526bf8cbdb5be7c710013630d3bbddf7de0ce37f3abd063f6103f3ec27fc5c09796f6452d8117df3b533b3c7377bf6dce7d37f SHA512 d46d93333b4d0d3fd5c14e0a474ca7beceddf794a5dbcf66f810993b8d33b48602518072effcd429566f4eede2a38c4aec289df262c2c0e7ab4b82474e14f14d
 EBUILD pbr-0.8.2-r1.ebuild 2101 BLAKE2B 4e85eb993ab7e6dc05687c531145441b1627fa61846546bd3c66cc5690bcb1f55b7b49ad0f5dc4cbf86c4e949deb7e66c11e9117a90c7933334477c6eeae6f73 SHA512 bc6d083dadd1d46e7d6f311d43e89e4fef40e7c1a02f826359166c42aa4c075c1336081bea03986519dbc9912785b1f2732326d1bbaa0ddc391c9649356a8b7c
 EBUILD pbr-1.10.0-r1.ebuild 2602 BLAKE2B fcd63f45eba4952178bea076c77e5d6880c27f310a8e2043867bc1f278f5d450f9a75832f90dc482c709d4bad4eadf3c1f150092e546e624a03290fea7390664 SHA512 d516a6d42efebe51e2846721e8292fb402d9ee5a88cea385a281f8f7d828da30c59df9582fac1174c2100f8943b318a52d208d6ee10d294a9a3e915e95c1a589
 EBUILD pbr-3.1.1.ebuild 2828 BLAKE2B 7fc677aa10ce15627e6e6f6857f0d5b1fc336fe139e42b3ff1aa62d2d898eeb6a92a8e7c22e06e5f597025a4ad16e60dfdec60758b6b5f36569bdd67a39566c1 SHA512 58894ca83de7006ee6486d75ee1673c970ccb207d50c84332b215086468e3288b10a38245a92c8a6330f2a26fddd001b70a9d89b8144009459180474774c1cc1
-EBUILD pbr-4.0.2.ebuild 2599 BLAKE2B e5e7af33e19e31b94160c89fd484174b3cd01964c9dbabfe327e96e6417ecb60f5c51bfe99b9ed1b2eefbba890de820f3fe0698a844d0186cfcc4628b667a3f0 SHA512 8a87bbd53b49ae13c0ae4b2ebab38bf8f55d768128eddd3063e9acb2075ebd5c95a3b2abf9d956ab55875561d99573cbe9732c700a2db679f6ead1a387060787
-EBUILD pbr-4.0.3.ebuild 2599 BLAKE2B e5e7af33e19e31b94160c89fd484174b3cd01964c9dbabfe327e96e6417ecb60f5c51bfe99b9ed1b2eefbba890de820f3fe0698a844d0186cfcc4628b667a3f0 SHA512 8a87bbd53b49ae13c0ae4b2ebab38bf8f55d768128eddd3063e9acb2075ebd5c95a3b2abf9d956ab55875561d99573cbe9732c700a2db679f6ead1a387060787
-EBUILD pbr-4.0.4.ebuild 2599 BLAKE2B e5e7af33e19e31b94160c89fd484174b3cd01964c9dbabfe327e96e6417ecb60f5c51bfe99b9ed1b2eefbba890de820f3fe0698a844d0186cfcc4628b667a3f0 SHA512 8a87bbd53b49ae13c0ae4b2ebab38bf8f55d768128eddd3063e9acb2075ebd5c95a3b2abf9d956ab55875561d99573cbe9732c700a2db679f6ead1a387060787
 EBUILD pbr-4.1.1.ebuild 2601 BLAKE2B a2945d95e1ba37c28d86fdd0bff32f0a880c801eeddb2f3f70f6b21fbac7c0bb869021ccb389888c146f5920b7350af1d0c53d34784f9dd0e0934eb937ff1f55 SHA512 c71925bd2db17d18a625ea6510f589c8bf7df9f10031659f7a6c4a63432826639ba6a93c99be229b5f62933051fc00532d53bb0660f89e0d0c804b8bc7af44dc
+EBUILD pbr-4.2.0-r1.ebuild 2752 BLAKE2B 00b6503f19bdab76fa00451bcb0253eca38b407f8d75cd6b1bc8a3f1ffea6086c7aad0abd999dbb0514f77b2a244f6039c07a70290c03a0f6b162ae401fff197 SHA512 27cf34e621f474af7f668b88ad0d70ab39714826248186a34c54a68452435fa08f2afdb2904374dbd464aab8ee00bd0a6ebd9cdd51317f33e91d21917ec787d7
 MISC metadata.xml 686 BLAKE2B e7638d779ac7aa46c074cf4060bbca595c8e555e972da8b418762bb40237ef0f6d89125f3c0e8f5201a362b2425247ed5a7ecd9d26afe9981f9e51dd005c28fc SHA512 b4bff66d2f42e08f93d723e43bd1b6b32d8bd01a45136a741992af07c11da7fe0db847e46316e5bd237f47cb844fb481e09bff0c6df3d071197686d7dfaa7bc9
diff --git a/dev-python/pbr/pbr-4.0.3.ebuild b/dev-python/pbr/pbr-4.0.3.ebuild
deleted file mode 100644
index 229da21adf65..000000000000
--- a/dev-python/pbr/pbr-4.0.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
-HOMEPAGE="https://github.com/openstack-dev/pbr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
-# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-PDEPEND=""
-
-# This normally actually belongs here.
-python_prepare_all() {
-	# This test passes when run within the source and doesn't represent a failure, but rather
-	# a gentoo sandbox constraint
-	# Rm tests that rely upon the package being already installed and fail
-	sed -e s':test_console_script_develop:_&:' \
-		-e s':test_console_script_install:_&:' \
-		-e s':test_sdist_extra_files:_&:' \
-		-e s':test_command_hooks:_&:' \
-		-e s':test_sdist_git_extra_files:_&:' \
-		-i pbr/tests/test_core.py || die
-	sed -e s':test_command_hooks:_&:' \
-		-e s':test_global_setup_hooks:_&:' \
-		-i pbr/tests/test_hooks.py || die
-	rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
-	einfo "rogue tests disabled"
-	sed -i '/^hacking/d' test-requirements.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/pbr/pbr-4.0.4.ebuild b/dev-python/pbr/pbr-4.0.4.ebuild
deleted file mode 100644
index 229da21adf65..000000000000
--- a/dev-python/pbr/pbr-4.0.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
-HOMEPAGE="https://github.com/openstack-dev/pbr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
-# docutils is needed for sphinx exceptions... https://bugs.gentoo.org/show_bug.cgi?id=603848
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-PDEPEND=""
-
-# This normally actually belongs here.
-python_prepare_all() {
-	# This test passes when run within the source and doesn't represent a failure, but rather
-	# a gentoo sandbox constraint
-	# Rm tests that rely upon the package being already installed and fail
-	sed -e s':test_console_script_develop:_&:' \
-		-e s':test_console_script_install:_&:' \
-		-e s':test_sdist_extra_files:_&:' \
-		-e s':test_command_hooks:_&:' \
-		-e s':test_sdist_git_extra_files:_&:' \
-		-i pbr/tests/test_core.py || die
-	sed -e s':test_command_hooks:_&:' \
-		-e s':test_global_setup_hooks:_&:' \
-		-i pbr/tests/test_hooks.py || die
-	rm pbr/tests/test_wsgi.py || die "couldn't remove wsgi network tests"
-	einfo "rogue tests disabled"
-	sed -i '/^hacking/d' test-requirements.txt || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/pbr/pbr-4.0.2.ebuild b/dev-python/pbr/pbr-4.2.0-r1.ebuild
index 229da21adf65..b000008290fc 100644
--- a/dev-python/pbr/pbr-4.0.2.ebuild
+++ b/dev-python/pbr/pbr-4.2.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -14,7 +14,8 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~s390 ~x86 ~amd64-linux ~x86-linux"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
@@ -34,6 +35,7 @@ DEPEND="
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 		>=dev-python/virtualenv-14.0.6[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.1.0[$(python_gen_usedep python{2_7,3_4,3_5,3_6})]
 		dev-python/wheel[${PYTHON_USEDEP}]
 		dev-vcs/git
 	)"
@@ -65,6 +67,6 @@ python_test() {
 
 	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
 
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
+	stestr init || die "stestr init failed under ${EPYTHON}"
+	stestr run || die "stestr run failed under ${EPYTHON}"
 }