gentoo resync : 24.02.2018

4 files changed, 23 insertions, 195 deletions

diff --git a/dev-python/python-glanceclient/Manifest b/dev-python/python-glanceclient/Manifest
index 0316144bd9e4..7ed04f506ed3 100644
--- a/dev-python/python-glanceclient/Manifest
+++ b/dev-python/python-glanceclient/Manifest
@@ -1,9 +1,5 @@
-DIST python-glanceclient-2.0.1.tar.gz 159091 BLAKE2B ff66907c5f60c0733e29620d8b2cc71f11ac4b194ce7a74568162d6be98647836be356fc1e72473e00e67e02b99aec039ad5f5f8d0f45aafec2fb41e085bad2d SHA512 48253d70c50ad5b671e0d662612217f76e79b2e15ec1714d578c85ffae3d6b18e019f90946d11cc90e41b981c6bb24c7f47094c046892fdee33034689631af53
-DIST python-glanceclient-2.5.0.tar.gz 157864 BLAKE2B c2a0a005a697305ff92a5299c7b251ce0a3c17c437445deca51d71672dc1ee4ac312822a367414c0deb280dd827a5169fcf5bb7e5a3ebb5d00828b20ff52777c SHA512 1a702666c9430577e4d6018c95df59600bdb644b224708aaedcef3308d6209f9bc60d5f228126554b27e723414703ef7fe20d0c69058882748eb1e59d63afaa2
-DIST python-glanceclient-2.6.0.tar.gz 161852 BLAKE2B 4acff92d774cdc1085e5889d466602319f7112925a0aa2e17174f72370d593a2a051b73a2ac97eeba5bdad9bc01fcfbc38b1726745c2254f1a1cb8f0eebc5dab SHA512 c566a261a42cc38db0adea507bbca4790ffa850a81bbf98ff01aa8629bb2d80fe9717a2e17b048367974809c7f7d348881397a53bfeafbc7438b73f9b4bc97e0
 DIST python-glanceclient-2.8.0.tar.gz 177172 BLAKE2B 0772b7e2b788b63bb590c8354dbad2c4e0bbd731f790f36916aeb154a44474f979961195d307e45149bccd2a58e1df72c48aa0593d6972c606b393f1202ee440 SHA512 257eaf1d548a3a6277b9c80e8b23b9ae4231586307c43a064754c227f3e3c872451ec0469aca931638ea0f7c9920892878c677b144dc72bad215c38d375a63d3
-EBUILD python-glanceclient-2.0.1.ebuild 2937 BLAKE2B 507b755e8090c3b48b825c26f38bbb07674e6ab40b41b9297464262b77d7f8c945bb9a33bad1bcfdc33d289a26c63260e90636182071ce5cb4c65a834c1ab429 SHA512 4d66740c6cbef3d4f915faca0a9fec14ff90d4587c371e29f2a1c2223935407948c1858fd71d341b97b506160a058c14ea178e6b533f7eeeceb2ccfbd3a940cf
-EBUILD python-glanceclient-2.5.0.ebuild 2674 BLAKE2B 7651dc72a047785af941641d41f01d159fbb3e5b3c74f3b90f382c2678e897e516e5361b5d350338198b49f25d03083d31826bdc49122ce824475dfd904239dc SHA512 05fa60be6a3996fb6c0c6a259046bcbf74afd268f937b14f6df64eba68805382189b4928e5f684ee6900326d1b2d3655a48c9096bd1140a3759b68be6cf3081b
-EBUILD python-glanceclient-2.6.0.ebuild 2432 BLAKE2B 4a9d8c99204ca998b933d7c5bdd9600d9ad663fce3af10d10128a1564f1edf6539414dc62d129a9a166cf239df3d77ca68b0919f3d00b5cabad0d8781e51f9bd SHA512 a22a2cc006f8d71c7383ef922c91ae72346394a02dd697f50124911572922f8beda5cdd0fb210f9b150d154eec398329fdb5454d2b7f59b1265b5c66e185163d
+DIST python-glanceclient-2.9.1.tar.gz 175836 BLAKE2B f559bff0b4ae1d1782bb06f9bb8b0188d9e78b83afb52a07245f8d9694bfe88e52718d3279f8b2b7d32acdd3cc86d507154bc9bcf716206696144345f4766249 SHA512 0dae48a5673ed779c0a4136896f5e74dcde489a5dfee55295f65d4b74dbe4680b1669570d0fe5011ca5282d0b6057ebc9261e5a06cff0b09fe41fa88529c3947
 EBUILD python-glanceclient-2.8.0.ebuild 2612 BLAKE2B 844e6ab91a070f9d20fd4418be7b63776eedc900c568ccf89f7c78f52f03fe6675e06249dc0eba5f56fcd70402d133192f77da1bc65ed1f71603852565b8f3b1 SHA512 ff395ab1c060e51278a7e5b6cb283827776a7a7d3e008d1fc0932412f05df0373f6d3f0bceec56e0d1e55d93d5256e59e6da6a15171b6f45bfc394a8a6f7abd0
+EBUILD python-glanceclient-2.9.1.ebuild 2443 BLAKE2B 26009207655cf894d8ac47d856429f9cedc8b85d68a1e2c5315f44c2e5705ebafa0d6a5ea7ed08d96aff2131d28c3d34fa276faa937bae06734907c97e92dbb7 SHA512 c6ae1faaf0c23f8885e71598bd83cdf50c13ff22a9f213f092d29f098c9b9013804d78341b63dfc1bf32270cf112d8beee7d6cbb592a7139a6217109fd550bc7
 MISC metadata.xml 632 BLAKE2B 69885578505253d6ec3d0245779a89ebe5c75ab8a8e9fecbf95c29d4aa17ba6864e69c1806a01cde0e92080a86ccbae146bdb2c003f50fd3dfd32b6d2186536f SHA512 d807a9aadecb131f92d6a476a8bc0b0293d46c6ac761a2d1ddb596ac219c6c8ac349402e3f56d150e78ad81c5d2838a33b3d35222a18f9a416f969f6d6208d8f
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.0.1.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.0.1.ebuild
deleted file mode 100644
index 4e5987cf4a3c..000000000000
--- a/dev-python/python-glanceclient/python-glanceclient-2.0.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python{3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Glance API"
-HOMEPAGE="https://github.com/openstack/python-glanceclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-REQUIRED_USE="test? ( doc )"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
-		dev-python/ordereddict[$(python_gen_usedep 'python2_7')]
-		>=dev-python/os-client-config-1.13.1[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-0.1.1[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
-		<dev-python/fixtures-2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/tempest-lib-0.14.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.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="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.3.0[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.3.1[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.3.2[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.3.3[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-1.6.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-1.8.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
-	<dev-python/python-keystoneclient-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/warlock-1.0.1[${PYTHON_USEDEP}]
-	<dev-python/warlock-2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:_&:' -i doc/source/conf.py || die
-	sed -i '/^argparse/d' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	testr init
-	testr run || die "testsuite failed under python2.7"
-	flake8 tests && einfo "run flake8 over tests folder passed" || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.5.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.5.0.ebuild
deleted file mode 100644
index 858a033096d9..000000000000
--- a/dev-python/python-glanceclient/python-glanceclient-2.5.0.ebuild
+++ /dev/null
@@ -1,81 +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
-
-DESCRIPTION="A client for the OpenStack Glance API"
-HOMEPAGE="https://github.com/openstack/python-glanceclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-REQUIRED_USE="test? ( doc )"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/ordereddict[$(python_gen_usedep 'python2_7')]
-		>=dev-python/os-client-config-1.13.1[${PYTHON_USEDEP}]
-		!~dev-python/os-client-config-1.19.0[${PYTHON_USEDEP}]
-		!~dev-python/os-client-config-1.19.1[${PYTHON_USEDEP}]
-		!~dev-python/os-client-config-1.20.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-sphinx-3.4.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.0.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.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="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/warlock-1.0.1[${PYTHON_USEDEP}]
-	!~dev-python/warlock-1.3.0[${PYTHON_USEDEP}]
-	<dev-python/warlock-2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -e 's:intersphinx_mapping:_&:' -i doc/source/conf.py || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	testr init
-	testr run || die "testsuite failed under python2.7"
-	flake8 tests && einfo "run flake8 over tests folder passed" || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-glanceclient/python-glanceclient-2.6.0.ebuild b/dev-python/python-glanceclient/python-glanceclient-2.9.1.ebuild
index 0c9a39ad8287..32391f43045c 100644
--- a/dev-python/python-glanceclient/python-glanceclient-2.6.0.ebuild
+++ b/dev-python/python-glanceclient/python-glanceclient-2.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,47 +12,47 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 REQUIRED_USE="test? ( doc )"
 
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	${CDEPEND}
 	test? (
 		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
 		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		dev-python/ordereddict[$(python_gen_usedep 'python2_7')]
-		>=dev-python/os-client-config-1.22.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/ordereddict-1.1[$(python_gen_usedep 'python2_7')]
+		>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
 		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.1.0[${PYTHON_USEDEP}]
 	)
 	doc? (
-		>=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/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
 	)
 "
 RDEPEND="
 	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
 	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
 	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/warlock-1.0.1[${PYTHON_USEDEP}]
-	!~dev-python/warlock-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/warlock-1.2.0[${PYTHON_USEDEP}]
 	<dev-python/warlock-2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
 	>=dev-python/wrapt-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
 "
 
 python_prepare_all() {