gentoo resync : 26.11.2017

3 files changed, 29 insertions, 85 deletions

diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
index 979d0810d581..3cea7897e0aa 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -1,11 +1,7 @@
 DIST oslo-i18n-3.12.0.tar.gz 40514 SHA256 6add28cbbe8254838f7f131de0cf0f3761786d57e5fe5716a488260b725f58d3 SHA512 a19cfec1acb1461d6373ffe5c13c275ce50c4e817e613c3cccd56b90955d99088162089753fba3b3185ee44598013e965c030d011e56140f95958dc9bfec4b61 WHIRLPOOL 64aefcf366b18db65f54b9277c6946ef013e02f49ebae6c8066227324ed807e644a14c17fccd6b5359d6e7fbf49f4e29e2c6fdfeacc8eeac98c79b5816e6ba74
 DIST oslo-i18n-3.17.0.tar.gz 42858 SHA256 168b8c06f03599ac8172eb87112b5054e46bf421db03c367c059e3110d98ad31 SHA512 22d4fb92f94b0d69f719764219fe1234a42feec8d3eb72c9098cd8451a9e26778c209eb3a5ebb1b0f6e793304b8fc48d38578b598f24bc31a43e9468eb44fac4 WHIRLPOOL efd91876ea705c60f71d2f8abe7bc0b06d322b7ef420b6e87e9224afd3d659c57dcc273ba116533d1c2f6720edd3a0a1363daf1df7a27a4c9b543147dc3b10fe
-DIST oslo-i18n-3.5.0.tar.gz 36093 SHA256 5fff5f6ceabed9d09b18d83e049864c29eff038efbbe67e03fe68c49cc189f10 SHA512 156b28fa1db65a57a8db2744d72cb5db2706ec773746e676895121c0d6459f4806d826b76428841ee7124c27eba281095fa50d64cbb68f82133c41560ea15950 WHIRLPOOL 8d599b0e989c650d305c0f2ad85596971e6b0e3c5a8f8daa00ba76b9fdc8cdf5486a346343123247efc8dbaf4d7825a62b5340a957c7e7881c2483ea051e90e1
-DIST oslo-i18n-3.9.0.tar.gz 35973 SHA256 0bcb8108cf38b9ad4feb1ee08d27e34dc358f80dc7a7fe9a5b942ebf3b07c0b5 SHA512 7c176b8ac3ef0b52b2a08a7779c59b01fd32e084b99562eb232f9894ba4c9ae0bd810721fcf6fedf8729e3fdbfebce8b6210698aa0ae9e003855c8f2d66f2b0a WHIRLPOOL 34781968918cf6e7114301f7122f9d8f516be9f2db89798e64ad4589eb78f9b4a11e0f30b034b697734cfa3508cd997f13e8afe4b4abbc970d1705b42b060842
-EBUILD oslo-i18n-3.12.0.ebuild 1599 SHA256 468b17fa09a8f8d9b1587c7fead7a2a5af71ca4baab40aa9b47039bedaf0c965 SHA512 7cc2860dc5119333860b5e80c5159b0f070f886cc868c5f734633db8e627654cee9296b773aab54eea5d6f90d81c9799bd3f900cb135ea94a0ded3968eed5818 WHIRLPOOL 2df2609406d6b9dec008c6182147e7c6382b85681ce0f06180ecec515403ee334f3c3a98ec4a11fba47fba7dd9042b1148cb75ea31fe13aebaacd9fdfa5fb239
-EBUILD oslo-i18n-3.17.0.ebuild 1944 SHA256 8a923b600af069ee29bde643392112634739ca277f8236f35438289a9ad93c82 SHA512 f6be59c97901119f6c9e53adc16249b3b151ee9778be33b2555f350521187039a6baf3633460e1eae848e8db3f41478bb29f3e6ec8d2e71f2e9ed58b8ce3edf2 WHIRLPOOL 4f3577177f5c82cdef7b4fc026e85a54048b896319715b92079f76b8dc2bc8a93227b79dfd9ed068cd74a56555f0deb323190da1d96b46c80532617c01e8aad9
-EBUILD oslo-i18n-3.5.0.ebuild 1525 SHA256 3174ca952b129457542e609114b9fbf4260c11b96a181404e775b89d471a73d9 SHA512 4786e2cec38727f051234d7ff6ea21b7d889ed29ac56df411b82382f54ee67097a5ffbd7db3890766d54f65332fe2676e4c889cb2a000eab31e310bf0ab51888 WHIRLPOOL d5435681dab0bff16d5ac53ce6640cd5113baa910a38f0f0a47c3621937998c0fbcffba4c0ab47ed0c47ffc40e34fb93e496354210fafe505a935216fa2dbe5f
-EBUILD oslo-i18n-3.9.0.ebuild 1536 SHA256 436e5cea6aa3990e8426769c4597b5c1d3a6b819b8f0ec01e09b12adce5fd8cc SHA512 6556de69537c3448854ff5c200eab75767d6356cc7c6bc0758ea610bf6644757c98927aa76f0356cfa408f342ff5915d009279c36ef9ac7a6a6d20fc9cf44e76 WHIRLPOOL c84467a9b96da0f1d14a9e306fb9be4625023a61f506c72b6afc3121f40fbb8aa032d3e9b02d3bd6386ef7bf3cda508cb4d8a533b0fce932fa6f4a5e27aa3382
-MISC ChangeLog 5947 SHA256 09cdcc02b711e6302d7f53e0f5ee8013332f5ae8a899f16cb074cf50e3f41b2a SHA512 c0de53706d663362eb04b6efdbd789a397d4801cca14491c03d0635712650a810e236cdd73288217a05ebbe4bdb9423b7471052206ed861db5cec4e24a97139b WHIRLPOOL a2144af3e1b41a18bfb9c744cadf5939380cb283888679838f816b3b4464f72f625c951da547671b2a98c17566d69f64f7f8d66a1b830db84f8be57beda4027d
-MISC ChangeLog-2015 1723 SHA256 66422a6ee309ab228639d48b5e530765c11bd72dd573b77eff68b831b822d4e1 SHA512 f0707127f3e27723df0b9d2d4efa0c7bf67b1c7e4c7e9de7ef2165e561af675fe240a94125c7876780c388a4eb32e7516cb46718fbd89efb1bfae6de0960baba WHIRLPOOL c5b15e9c22ccda2851eaccdc6c0aae3934b8ffa5ac277a5b7f1d711ca98fdc52e729de3ebf8997e89297c10fec720680da6a595038950a4f3d3f4f64d9405f3c
-MISC metadata.xml 472 SHA256 ad23959ddef7ae03cd52635cb99937fc1d0a5e7da772e3edf71311cf2981f60b SHA512 cd798ff83761c7409f07974012b11443e52cff35588e610d0d047438834198e9a3e35c69a6f6e1f724e8b7a118dd4cc4eb8df38e6017caa22bc061d697c0e97f WHIRLPOOL b33429d420487489fb5bf982c16ab5db3d81908b09283ef21e5db10bcfca188c6f39dd7a97691828f9501b59b33303623f7131b253958d0e2730216ccdc8743f
+DIST oslo-i18n-3.17.1.tar.gz 42660 SHA256 6fbab96f646281a3b996548811f1640a28ca6188efca87fdbdaf40de31f5c10f SHA512 86d244eba7a887d4b8c3327487c9dd67c8e4baa52afdc05f94a229d6c1c951b8a25fc628f490320501773bb808afb8fb3b450a8d26e11b9a36a3c22baaa64544 WHIRLPOOL 8611cbcf9fb08cf00238a4273b11dba27d9d8b162a95a19c6fc9275b2f99ead7454e3a027c82e4ada27aaa4f9cff7f6a367aa990e10915211de59b49497665d1
+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
+MISC metadata.xml 472 BLAKE2B 98f7913442dadb92834bbc027d458b5abaeeac785c881d6a4c51cef401126795a70254373901b626908b2b513867e6b6f9c2254417473c48229bedadc572bf8c SHA512 cd798ff83761c7409f07974012b11443e52cff35588e610d0d047438834198e9a3e35c69a6f6e1f724e8b7a118dd4cc4eb8df38e6017caa22bc061d697c0e97f
diff --git a/dev-python/oslo-i18n/oslo-i18n-3.9.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-3.17.1.ebuild
index 1e02c9edcd96..185846ef6f53 100644
--- a/dev-python/oslo-i18n/oslo-i18n-3.9.0.ebuild
+++ b/dev-python/oslo-i18n/oslo-i18n-3.17.1.ebuild
@@ -15,35 +15,45 @@ 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/oslotest-1.10.0[${PYTHON_USEDEP}]"
-CRDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CRDEPEND}
+	${CDEPEND}
 	test? (
-		${CDEPEND}
 		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-3.14.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? (
-		${CDEPEND}
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.16.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="
-	${CRDEPEND}
+	${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
 }
diff --git a/dev-python/oslo-i18n/oslo-i18n-3.5.0.ebuild b/dev-python/oslo-i18n/oslo-i18n-3.5.0.ebuild
deleted file mode 100644
index aa819d57a44f..000000000000
--- a/dev-python/oslo-i18n/oslo-i18n-3.5.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
-
-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/oslotest-1.10.0[${PYTHON_USEDEP}]"
-CRDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CRDEPEND}
-	test? (
-		${CDEPEND}
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-3.7.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		${CDEPEND}
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CRDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-"
-
-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
-}