gentoo resync : 31.12.2017 (final resync this year)

5 files changed, 4 insertions, 135 deletions

diff --git a/dev-python/oslo-service/Manifest b/dev-python/oslo-service/Manifest
index d4c52db82168..aa5dc15cb720 100644
--- a/dev-python/oslo-service/Manifest
+++ b/dev-python/oslo-service/Manifest
@@ -1,9 +1,5 @@
-DIST oslo.service-1.19.0.tar.gz 74937 BLAKE2B 0459f16c7eaf75c3df5a58eda40fb5b9cb3831662038c5ee19e6049fad940474a65e9003641f6ba4755b918d1d7f6333fd60670c672b30339b6b7339ab5275ee SHA512 d9f8c5d07d418ab2d0234299071e4ff129ec4af4bf8f2973f7899c1a7636fc67f1ce16e770ada7c7fe8a19f28a156536e1c159546a0dd708f26404dffceb5c70
 DIST oslo.service-1.19.1.tar.gz 76246 BLAKE2B fb5355d058459da0be54f1d208201f130a20a1a59c90fc15ecb4e748c8cdd5174410a521ad05bd125b3f4ada673d1ba2ad7c7a2565a2d0821e2ec55a50e7e61c SHA512 3298ba9e0dddfe477c324b3eb55d4d20ab5da6231488658b78290d1e9e9eafab758885d350471d1c87c24d01551a4643c1f748323a8455d743f0dbe74d4c5d68
-DIST oslo.service-1.25.0.tar.gz 76400 BLAKE2B 09dda44cbe2633efe149b552b9d2c484f1f63f085d2772e1caac9adc38246b5ccb5fd04c3d94b717b1c70f620898ca686ae72fb306b5236232902578ed2ae456 SHA512 829c9be54813900c4bce0072e408a4c996548ca123524c76b4a3b99d7bc940d22f7d4a0a1d6e02ce88b252fa34bdedf26129bdfd4894c4b5b14c8ec71b85629c
 DIST oslo.service-1.25.1.tar.gz 76864 BLAKE2B fe4c8ac0f52ad7dcdd5240716030cd807d7755bf6f39d949331d18c1d0ce30563609f15db0db10824712b0a22cbd5ee9d6985fa5c9a51e734b000382d0ca7501 SHA512 2632ff6ce079916e44d6250487e202a7e1590cb0ba094868bd9d8e01cea9f89f22a5336edeb74aff2fa0f6aa017aefd454159511134670cceff5112b9957ce81
-EBUILD oslo-service-1.19.0.ebuild 2062 BLAKE2B c08d9b2a29cc5596e4254eca16e8c9ee9da9a6e9ef9a785ef400632a5e198462494d74d0f1217d625f5285752198014dbb175ab14cb04ba89301defe7f70c26e SHA512 7b50b5098986b4bb794c201fe10182ec2f2078a9ab328f193684f526b71c28fc94186b4dfd28645d31ce4fedc24e81510bf3fa5c5a1ef5a846d546a15d5cd41a
-EBUILD oslo-service-1.19.1.ebuild 2064 BLAKE2B 87c27ff38449f2f1f6dca056162db9de081b93423bba9702c7aaed572233df87ed4249a219a2d1a0c251fa2230f85545f6c918b445d2d53774b73017d1751fc0 SHA512 32a3713312f0332458d112ca5504a1982c22534ac973a0ce773f5f7eb9ed3ba21cf3c9617f1f0a9aa66117b4f444bf7862312e87e22dd522876970b4f30c513a
-EBUILD oslo-service-1.25.0.ebuild 2207 BLAKE2B 413d64c460fcb44bd70704262cd237fc852201f417d203dff5b6e283918e939fb270cd7268e00391d79192bccd868ea4ef261cb8f54fb6f2fb6c3b715133d420 SHA512 30109f79017401d8b966283c1a99b3b55b287e4275f057f069fb6c7b66b785c2d5a5b314fc0a8712776e30be11bc3c37ba2782efec80e29131da8fe9b3f3aa43
-EBUILD oslo-service-1.25.1.ebuild 2209 BLAKE2B bb9c522991599ea1a3b333b565b8d4b8c788abffc97193094d9706581328e64d6306eda3f40983d3e79674b1845b638ad8b28f2609ffaa28b3d73dbf9ff29920 SHA512 b884733ccb9a5e9ccd993ae639677c1300d62304bed0f9638d68896734f8dfae4e5859a3d49f60a67f0b1434aa68fd639a3c7e6cdcebc200600dac25fbad4486
+EBUILD oslo-service-1.19.1.ebuild 2062 BLAKE2B c08d9b2a29cc5596e4254eca16e8c9ee9da9a6e9ef9a785ef400632a5e198462494d74d0f1217d625f5285752198014dbb175ab14cb04ba89301defe7f70c26e SHA512 7b50b5098986b4bb794c201fe10182ec2f2078a9ab328f193684f526b71c28fc94186b4dfd28645d31ce4fedc24e81510bf3fa5c5a1ef5a846d546a15d5cd41a
+EBUILD oslo-service-1.25.1.ebuild 2207 BLAKE2B f0b267507fa5a90770ec57cc24debd421ae9ea7949f0e590b42869717f5c5553d169507f2cbe056bf32af7a7696fc299dab858ad1493d528540e81b03a73f5ac SHA512 84d67ce2b71608204676112d4c8618210edc6d309e0edd9ac49ed583321c782118ba226a22a81fbe3dc8881302d269762fe9f64fadc0992d3fc412dec334fe26
 MISC metadata.xml 329 BLAKE2B 2ef43d1bf3df7be8c2e2b08bf7cca10d1bc23235111bc74bf0b23ef6f9c5ac3ad05a1243b518c0d8b703e4815ec7fc92ad01c907baa77d9c4dbb622a1288aaf2 SHA512 c02f0b4e37e3dabe1dbc10ca6b5e08627d8e7df5fee71573cda34338249508586bf068c56711521aa20bf80a1fdcf94a1e89df5d17cb5eb21a07b996a071d1ae
diff --git a/dev-python/oslo-service/oslo-service-1.19.0.ebuild b/dev-python/oslo-service/oslo-service-1.19.0.ebuild
deleted file mode 100644
index 68dd17fdfc1a..000000000000
--- a/dev-python/oslo-service/oslo-service-1.19.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for running OpenStack services"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.service"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
-S="${WORKDIR}/oslo.service-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
-		dev-python/doc8[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	!~dev-python/routes-2.3[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-service/oslo-service-1.19.1.ebuild b/dev-python/oslo-service/oslo-service-1.19.1.ebuild
index 0660928ac7c8..68dd17fdfc1a 100644
--- a/dev-python/oslo-service/oslo-service-1.19.1.ebuild
+++ b/dev-python/oslo-service/oslo-service-1.19.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.service-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-service/oslo-service-1.25.0.ebuild b/dev-python/oslo-service/oslo-service-1.25.0.ebuild
deleted file mode 100644
index 4443ed6a468e..000000000000
--- a/dev-python/oslo-service/oslo-service-1.25.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for running OpenStack services"
-HOMEPAGE="https://pypi.python.org/pypi/oslo.service"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
-S="${WORKDIR}/oslo.service-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
-		dev-python/doc8[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-service/oslo-service-1.25.1.ebuild b/dev-python/oslo-service/oslo-service-1.25.1.ebuild
index 729b8faae141..af307573d4db 100644
--- a/dev-python/oslo-service/oslo-service-1.25.1.ebuild
+++ b/dev-python/oslo-service/oslo-service-1.25.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.service-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]