gentoo resync : 21.12.2017

3 files changed, 2 insertions, 76 deletions

diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
index 849841970563..6f093fc33e80 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -1,7 +1,5 @@
 DIST oslo-i18n-3.12.0.tar.gz 40514 BLAKE2B b7b0cdca21fb44d8be43dc06758e90aa1ae07feaad234e93807770a1ccdd9d9406e4d2523c23ff975b7965929e4d234c2f82839307bf4865f0e4b54cb6372e32 SHA512 a19cfec1acb1461d6373ffe5c13c275ce50c4e817e613c3cccd56b90955d99088162089753fba3b3185ee44598013e965c030d011e56140f95958dc9bfec4b61
-DIST oslo-i18n-3.17.0.tar.gz 42858 BLAKE2B 60d6497db3bd9b315a7fcb756245e0f5318d5430712d6948994be196aecf128965b5fd9eb41a45570fc83160efbf5828f1fb160c166bccf3fc210347af805421 SHA512 22d4fb92f94b0d69f719764219fe1234a42feec8d3eb72c9098cd8451a9e26778c209eb3a5ebb1b0f6e793304b8fc48d38578b598f24bc31a43e9468eb44fac4
 DIST oslo-i18n-3.17.1.tar.gz 42660 BLAKE2B 645a8341cf2bedf18932fbfa092b608da4169993a2a62aef36b869e975dfd662b7d52008aedf046b09ac10e4641e810902904b16e450a728b0f075fdee654977 SHA512 86d244eba7a887d4b8c3327487c9dd67c8e4baa52afdc05f94a229d6c1c951b8a25fc628f490320501773bb808afb8fb3b450a8d26e11b9a36a3c22baaa64544
 EBUILD oslo-i18n-3.12.0.ebuild 1599 BLAKE2B 8fa74fb402d4fbfb8bae967a3ea490ecac146a1d0e965f4acddd8d4bf5d8b9e2ec97a379ecbb0931a10f3d00c620bba94a04daf2813ce3b78088a197e6c62fa0 SHA512 7cc2860dc5119333860b5e80c5159b0f070f886cc868c5f734633db8e627654cee9296b773aab54eea5d6f90d81c9799bd3f900cb135ea94a0ded3968eed5818
-EBUILD oslo-i18n-3.17.0.ebuild 1944 BLAKE2B fa0303dcaa2de11fe3eed5a926d5f4221de2bc209a57bbceebcc6d722d13d2f1e63e123dcdcd59a0be65356726424f7c32902eb69a4f7d8573368cede6401e6f SHA512 f6be59c97901119f6c9e53adc16249b3b151ee9778be33b2555f350521187039a6baf3633460e1eae848e8db3f41478bb29f3e6ec8d2e71f2e9ed58b8ce3edf2
-EBUILD oslo-i18n-3.17.1.ebuild 1946 BLAKE2B ad30e5449aae6ee80664f81a8c2420f85278b49b3595f17ddcde35672532bd18abed6a3cb5988955debf82bb465b45ef7420038875ab0d09f94fbf43ccc11856 SHA512 da880f9604438031cab239c37570352474455966550a364a9f897d7856d538c125660f64f581d7b1b85324dfa1a417bbac73e9dd7db9ede7043341a43757e28a
+EBUILD oslo-i18n-3.17.1.ebuild 1944 BLAKE2B f50bccee49fa6c4182b8012918efa1c905e22716ccb9e7385043da9c10ecd2fd53c5c09e2530f1088a96283e8053b91ce74e457338da3412b0d8dacf371a3ac4 SHA512 f1a189771d993733f56b44985664bafe4f0db4a53d60c7c51b143f53aa8ff5b6f375e624a3860145945575975b465cfcd3adf412ad1635baba6e30464f54f0cc
 MISC metadata.xml 472 BLAKE2B 98f7913442dadb92834bbc027d458b5abaeeac785c881d6a4c51cef401126795a70254373901b626908b2b513867e6b6f9c2254417473c48229bedadc572bf8c SHA512 cd798ff83761c7409f07974012b11443e52cff35588e610d0d047438834198e9a3e35c69a6f6e1f724e8b7a118dd4cc4eb8df38e6017caa22bc061d697c0e97f
diff --git a/dev-python/oslo-i18n/oslo-i18n-3.17.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-3.17.0.ebuild
deleted file mode 100644
index 2e776044c947..000000000000
--- a/dev-python/oslo-i18n/oslo-i18n-3.17.0.ebuild
+++ /dev/null
@@ -1,72 +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,5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo i18n library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc 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/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${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}]
-	)
-	doc? (
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-i18n/oslo-i18n-3.17.1.ebuild b/dev-python/oslo-i18n/oslo-i18n-3.17.1.ebuild
index 185846ef6f53..92662ca89321 100644
--- a/dev-python/oslo-i18n/oslo-i18n-3.17.1.ebuild
+++ b/dev-python/oslo-i18n/oslo-i18n-3.17.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]