gentoo resync : 15.01.2020

5 files changed, 3 insertions, 252 deletions

diff --git a/dev-python/keystonemiddleware/Manifest b/dev-python/keystonemiddleware/Manifest
index 925d608ea245..04f1927a6625 100644
--- a/dev-python/keystonemiddleware/Manifest
+++ b/dev-python/keystonemiddleware/Manifest
@@ -1,9 +1,3 @@
-DIST keystonemiddleware-4.17.0.tar.gz 204603 BLAKE2B 37c3de6b5151b8e6d6e53ae70836f2d8a068472822cf8fdb71f38bea58099281a4e2648b11605d5952e65baf1722ca539e06a337d6854136e84bfdeea149e309 SHA512 ead2eb829a2189efddb6cf0052d86d32eaca0ae7474cf0444640c0c976df66bc1cf61971891639b798ffb6745fb510fe6499e42e94cc60f2c2084ad7f06c7ab7
-DIST keystonemiddleware-4.21.0.tar.gz 207164 BLAKE2B da9e55170c4af189661b518c596caa216d44df4caf139992ddd3cb9de0f14799cb08fb02e9bb6472df1a68aff7971687109002e6308009afbd2532e32eebebb4 SHA512 2746c2524559d6de18433d3718c7caf887fc92499466c04c65bef38467e9d16f80b1907c663b47c148dc18c2aae6192a79b4d5b2387f575a69cc837971eddf76
-DIST keystonemiddleware-6.0.0.tar.gz 208974 BLAKE2B f8a92ed31ef5d8385ae28bbc909d4c3c3d157c9b879d3beb0b3b87665381ac138c0f0a114e0c095b663f51cf4c1973f8cbb06eff3ca21feb998809bcb73d83cd SHA512 e2fe230da87de7f4ee768ba93dcbaf5382e44972a84914d6c0fbe0f13eda14ff74642594cfbbed1d6ec359eae4158bf9b798b48d362becdd6bad84ec3015db3b
 DIST keystonemiddleware-7.0.1.tar.gz 177439 BLAKE2B 645cade35a1b310b9a897b17fc96a7f1f33ca26efd3dbe482c8d76cca9a9639364cda6d2798c0b2956f5b905c166a67fe3f334cd0ae276e7b0124956f9a9cfd6 SHA512 2c3890a395fe03c19e121a1d315180bf2bf5004351a5dcabb1f455bf22514c682347a3c387da361075a81c3e931f6ac802aed1a95fa3763b90a2ac77adbec306
-EBUILD keystonemiddleware-4.17.0.ebuild 2877 BLAKE2B cf9ebd052664dc1f6ebf2e3cd0855e6031572b88fe391e5d8a1d28ba38b3d1fced91e6fe5eec04a28b72583bea82b8e086457b4a2873336617cf9bb22fe85d65 SHA512 ea01f3d407a4e4c51deb523a8d591e437b16fcf123bad4a687e22c6515c1a4e2d914f95ae5b42e995820ac6f14c17b85953710d8881fa4de6b2c8fac87061bdb
-EBUILD keystonemiddleware-4.21.0.ebuild 2684 BLAKE2B 463dbea97c6c8aff0179a8e52773c8e2baf264e82987faffae017a42f601628557c57b882f506c4ef409f95baa50aed0d6cd57865862f6080d4ea35d62ab8607 SHA512 185cb82e78e21f4fe9c0d9e4100bee213829aa825500d8d019586fe0ae202a9c4fa3d4a3b2a9ab55bb2bf2b70c7e390c446494da4b5576fab181e275c9c03dd7
-EBUILD keystonemiddleware-6.0.0.ebuild 2469 BLAKE2B 5c1b995172c915e4e14cc5ddc14327ded4f38c2e53eb2a1127530ce89c893e839f7d8eedba3062124a314e4b9a409fb6c08d3d1ecc81436e69827a1c190c772e SHA512 9bf90d2ec6a3100c4f54ced09c76f14ca6f7b5f85e1191e3112f9db41e2311dd5708773b8d2a5a25cb518b26aa026d254ad5ebf830b2e2f115b41520e4be2ea0
-EBUILD keystonemiddleware-7.0.1.ebuild 1478 BLAKE2B 69661e85171d4fd938cc0a0eca3741b37deec294ff0e2125ca06d0a3aaf5fe2769b4b9b8636b91c494d02fd47e2d9b2987b0801ce4e0a45875e353a03feb0378 SHA512 f9384ca0f280f09c0706761b1dbe66f6bd9f82ff074fccb05477ee8fb76c80b9616b0bae289f3d9892ad36907e77252b08f2c034372a6e45c1294609905ea684
+EBUILD keystonemiddleware-7.0.1.ebuild 1466 BLAKE2B 3be59200a860cb8097c5bbff3774b3e80b08fe85d9e4b3e04838dc3d1f7d27031d6f8dd11fb63fd5c2df04c1272df28dcc81ec1dc80836b82f32298fee393d39 SHA512 7771e244dac935eafc985eff418dee5b4bf6babecb6d19f1880e29132d1bc5679c3b56b517d5a3be53392a47f1590af2cf361e70310a60d2abf5bf16504a15c1
 MISC metadata.xml 624 BLAKE2B 9431121807a163b4dac75bfe53e40ee4b86412db23d46c8fa6318ec6e0d2af338eb6423076879bbb863e7a2aa173d484d2f1a3c98211021e5357e07f9cae481b SHA512 5ca1f6ea10053be2f9f74c797cd1143f6b3ab267d0decb66f3609973c20637b55769bcb305ab70693d99d3ab09da6aa6ac7d2acc66431a4a52f6dc9aef79aa6c
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-4.17.0.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-4.17.0.ebuild
deleted file mode 100644
index 86ec621b4549..000000000000
--- a/dev-python/keystonemiddleware/keystonemiddleware-4.17.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A middleware for the OpenStack Keystone API"
-HOMEPAGE="https://github.com/openstack/keystonemiddleware"
-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"
-RESTRICT="!test? ( test )"
-
-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/cryptography-1.6[${PYTHON_USEDEP}]
-		>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.11.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		!~dev-python/reno-2.3.1[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/keystoneauth-2.21.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-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/positional-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
-	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	testr init
-	testr run || die "testsuite failed under python2.7"
-	flake8 ${PN/python-/}/tests || die "run over tests folder by flake8 drew error"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-4.21.0.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-4.21.0.ebuild
deleted file mode 100644
index b48ce9b71dbf..000000000000
--- a/dev-python/keystonemiddleware/keystonemiddleware-4.21.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="A middleware for the OpenStack Keystone API"
-HOMEPAGE="https://github.com/openstack/keystonemiddleware"
-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"
-RESTRICT="!test? ( test )"
-
-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/cryptography-1.9[${PYTHON_USEDEP}]
-		!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
-		>=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/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/os-testr-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/webtest-2.0.27[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
-	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	testr init
-	testr run || die "testsuite failed under python2.7"
-	flake8 ${PN/python-/}/tests || die "run over tests folder by flake8 drew error"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-6.0.0.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-6.0.0.ebuild
deleted file mode 100644
index 3659332520a0..000000000000
--- a/dev-python/keystonemiddleware/keystonemiddleware-6.0.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A middleware for the OpenStack Keystone API"
-HOMEPAGE="https://github.com/openstack/keystonemiddleware"
-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="test"
-RESTRICT="!test? ( test )"
-
-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/cryptography-2.1[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/os-testr-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/webtest-2.0.27[${PYTHON_USEDEP}]
-		>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
-	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]"
-
-PATCHES=(
-)
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	testr init
-	testr run || die "testsuite failed under python2.7"
-	flake8 ${PN/python-/}/tests || die "run over tests folder by flake8 drew error"
-}
diff --git a/dev-python/keystonemiddleware/keystonemiddleware-7.0.1.ebuild b/dev-python/keystonemiddleware/keystonemiddleware-7.0.1.ebuild
index 719f91a0eb89..aec07f809a6a 100644
--- a/dev-python/keystonemiddleware/keystonemiddleware-7.0.1.ebuild
+++ b/dev-python/keystonemiddleware/keystonemiddleware-7.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1