gentoo resync : 30.06.2019

3 files changed, 9 insertions, 71 deletions

diff --git a/dev-python/python-saharaclient/Manifest b/dev-python/python-saharaclient/Manifest
index d048e80151ca..799a309c3e6e 100644
--- a/dev-python/python-saharaclient/Manifest
+++ b/dev-python/python-saharaclient/Manifest
@@ -1,7 +1,5 @@
-DIST python-saharaclient-1.1.0.tar.gz 81664 BLAKE2B 8bfc8ed2bcc4cc13e6894d7776f7cb99c8a72632e132801df689832ef847c56b7cedf39abb112223a2919ea3ef52fc99e31290f7acb555f76505e11f195c48db SHA512 0799549d68bc65792cdf0129f3590667a1a87697182ad24c5c41e9c01abf5e133a16a60fe0331f313da44017aaf0503bbc131e8a62536a692032af36ae9f1386
-DIST python-saharaclient-1.5.0.tar.gz 94824 BLAKE2B cacc3f2e8a1df5f7e50f5b5c004745333ea4b287c0a86792247212fb873ec55329719f16472c3c7fef196f2ce8fd05c760e8db33b84e0ea949f7e89997c0f960 SHA512 8b845ad0eefa05b564659dea9e619a3946e0d62a981b46a4fecfc2d4aab785b8eeb2e18266d5467efd8e0ca31c441af7da41a816ea42405a8cd137adeae2793b
 DIST python-saharaclient-2.2.0.tar.gz 111804 BLAKE2B 5a52b7d51c3cc283b7785e7e3495ded4fc3b0b92ff8a8c01c61e6f04a6a54458f50e5505270018586ba08a9e55af809139f4fa892f9e9b86e072d12eee40e47e SHA512 88e630ab1b28404329572adadc3c923b592c47e6a2ccecbd40f79a0f3d6d65eb1476d62c6c5dc0f2d2e6687dbb5e1cdab4011c5c6355f29033b801b8c25f206c
-EBUILD python-saharaclient-1.1.0.ebuild 1829 BLAKE2B dafeebc667e00766acb1a8f12fe18f0762659d95f5550ccdb07c744dd53b68b982af1b1bd151c3693f882254267cc5932d4f7f30806afbcc3247758c0ad3beba SHA512 1bcca092d5ac2fce9240a578c4e0e8efce2a09fd35ad05e92b3f3d80c6ac0e1055c7c399045ec3590339dff1191d2a8f4cecaf169e69c7c1f30b2d02b0b605f4
-EBUILD python-saharaclient-1.5.0.ebuild 1987 BLAKE2B d85be213f8fdc1e2ea654fa5e211266f9d6c2b1e68ad7ea876fe8431e0b134b64c3ef7039d98bb398f97480aa59c3b6550cf31bbceec195a505a3ff418234e26 SHA512 f65fee64c47762e6531d74c07cf00c79502e1fc40aaa34c5eb7bef2d482e20ccbdb1ee646f6f0a907ae7bcbe6c0a69c6bfb743aee4bed89f7f76ffdd55ba58c4
+DIST python-saharaclient-2.2.1.tar.gz 111417 BLAKE2B b4545a161a630caabca9318eb0ead796b417d686cdf2c134f7e8022e3e62e7b01e5db7cff1950826d49798d6e6ea41334138bcf918dfb23a2eaf6527c0788fde SHA512 f5ebbe76d00a9bab4239bc19df2bde30b133b261bf8abb63db12cde9539c5bc92fb1a24b6c9ed6e8a509a44ae2abe98f5e8b74655517a1e2c2126938cc5c517f
 EBUILD python-saharaclient-2.2.0.ebuild 1738 BLAKE2B 554ba20d1cd4c03bd61d54664d548fa0a16738f5c1c45020d7ffccae6aaa61bdc9f7e1347c9fd1fbd8e21942ebba3af991efe4c6f945e8cd8f18fcb5e02a0e30 SHA512 443bc055b43dd26fbcd95843b875bd001af6ac8404b4fa444a139b8dcfc01a3f6f95b27355c1b90420106e55ebdeb41aed2085a94cdce74698992e5d7ef9c0cc
+EBUILD python-saharaclient-2.2.1.ebuild 1740 BLAKE2B 2219c123ff2263340c36c37b3db16292627c0e810acab6652ff28b57291b603c952ed97e52369b434800db251454a60e000de8189e36c827f3fb9e5eb3128b03 SHA512 02a31f26bd75027f6df4d67bd55fe49fabad560f898ba3d14e6e349e89ea686104ac171cfd182e60b1ece19c8ea72a00f9cb3308c5bf7c8220c234c8ddde990c
 MISC metadata.xml 643 BLAKE2B 2a3c45ea4f9fa3c045cb88796e093436e66719daf71739c7679882f11123f2ac405926c8405046aed4efb55328d7235619192b9b7f978f7571c673e306953834 SHA512 4ab105b6287560e19a7b6ba8e999da16bdb520ff8f1a812e0e17ebff9c1edd2f7ec1475978ee478c556d31af8c201555669c92ff388de45a206b45005ec95d2c
diff --git a/dev-python/python-saharaclient/python-saharaclient-1.1.0.ebuild b/dev-python/python-saharaclient/python-saharaclient-1.1.0.ebuild
deleted file mode 100644
index a17244d2959e..000000000000
--- a/dev-python/python-saharaclient/python-saharaclient-1.1.0.ebuild
+++ /dev/null
@@ -1,55 +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="This is a client for the OpenStack Sahara API, aka HADOOP"
-HOMEPAGE="https://github.com/openstack/python-saharaclient"
-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"
-
-CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/os-testr-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-1.8.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
-		<dev-python/sphinx-1.4[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/python-openstackclient-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${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_test() {
-	testr init
-	testr run --parallel || die "testsuite failed under python2.7"
-}
diff --git a/dev-python/python-saharaclient/python-saharaclient-1.5.0.ebuild b/dev-python/python-saharaclient/python-saharaclient-2.2.1.ebuild
index cffa8d92287d..981baeb7c401 100644
--- a/dev-python/python-saharaclient/python-saharaclient-1.5.0.ebuild
+++ b/dev-python/python-saharaclient/python-saharaclient-2.2.1.ebuild
@@ -1,8 +1,8 @@
 # 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} )
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ 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="test"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
@@ -23,21 +23,16 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
 		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
 		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
 		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/os-testr-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
 	)"
 RDEPEND="
 	${CDEPEND}
 	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
 	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.11.0[${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}]