gentoo resync : 25.11.2020

4 files changed, 35 insertions, 47 deletions

diff --git a/dev-python/python-senlinclient/Manifest b/dev-python/python-senlinclient/Manifest
index 133210b601f3..586483bfd0e3 100644
--- a/dev-python/python-senlinclient/Manifest
+++ b/dev-python/python-senlinclient/Manifest
@@ -1,3 +1,3 @@
-DIST python-senlinclient-1.2.0.tar.gz 107117 BLAKE2B cb1f70c59414b6bc54d58a3370ad5917851e36a19b65248125efd53bc24d29d3edb4fbc7734ba6d9d64c1ccea78307c7363de96c93c03fb801c66c83c1edf40e SHA512 1216e9511715a2cc5a703020a08ebb01bc24111150230f7ae8441ab750865c4cc07535f2b9d15ee8f7c93cc4f2ebd24473fb38b3946476063eff05c103d8ef6b
-EBUILD python-senlinclient-1.2.0.ebuild 1471 BLAKE2B 5321666dc192230e0e27b4263a17be42454bd13c3d9f2b41a17e7c304db40cf5b9fc201e8ac278916f0682b7375dc086181b59557db265e69af5867660fe7eae SHA512 fafdc54bd3ccb86f86990c2b70d2269b014c117ad1f018a1e5420f0559b4e2d90f81001fed90073b4c59dcdf815c05d7b99d69c46c766d47028c370e1e50d644
-MISC metadata.xml 512 BLAKE2B 09cfbde6587c01d6c77d489a5cdc1996609335daaea933444646d865ad3f1f0581448903eea1deb2ecc3a444e58b7fd8fa78e0c2ade82e8c4ef5c795273ceffb SHA512 186acb6a47aa41e5a0b2d49b4e95e8db69ba581fe85bfb5401c2be10e6b90c72f8d5b15d7fc6fcb448cd08ee43309f48fbf61c5f0a96bca32fed8c88b65beeb0
+DIST python-senlinclient-2.1.1.tar.gz 88012 BLAKE2B 0aab4a5eefbd87334323d3785a34fb99cba0ced69cd018d66048cd9664026756c9c11a9287eebccc9cb449d90a3a83322617c04c5e69697b244dc0b6305f73d1 SHA512 7b3813a589c21d87729837a6a208d87dff6c6a8c5f887d9684edd8931d0894b86d95b32f3f8ea65286cdb24c1ae863365712288cb97d86b7aba7dd6c73e059c7
+EBUILD python-senlinclient-2.1.1.ebuild 1178 BLAKE2B e50e95ea87a70f78d2cf02361c687d7defe38005e2dd2b5430479c6eb30e88da3fb484724fc7b90fe480b1e409e53387f88a1ae844faf96d83d0ec3bba2c71d3 SHA512 6257580495596018c2ce34ba51d2eab53cf6cd16ca8d4afa30671699bddebce431b44ad0242f63927f78dbb14ecc8a1470ccf4bb775f073cdc519bbaa4d50757
+MISC metadata.xml 536 BLAKE2B b87a916d45d5a0b0ac1ac9bb65772102e9aea0b1eb073e1f1b46a0731327794e751d9d787e09da374b1ca3b45c177238324e24f0a479df2d534f2ffc3d0995e5 SHA512 0144e5a534c14c1070f055058a7870b0b08c907da391676a5843c6ea30a83298dab18a4a5cfd1fb262b506099cfc5f43f9cecb72ce16378eeb6e981150dbb680
diff --git a/dev-python/python-senlinclient/metadata.xml b/dev-python/python-senlinclient/metadata.xml
index 17025f778bed..2fd3bf60633d 100644
--- a/dev-python/python-senlinclient/metadata.xml
+++ b/dev-python/python-senlinclient/metadata.xml
@@ -9,6 +9,7 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">python-senlinclient</remote-id>
 		<remote-id type="github">openstack/python-senlinclient</remote-id>
diff --git a/dev-python/python-senlinclient/python-senlinclient-1.2.0.ebuild b/dev-python/python-senlinclient/python-senlinclient-1.2.0.ebuild
deleted file mode 100644
index f1b2e3660f8c..000000000000
--- a/dev-python/python-senlinclient/python-senlinclient-1.2.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Senlin API"
-HOMEPAGE="https://github.com/openstack/python-senlinclient"
-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"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-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/openstacksdk-0.9.10[${PYTHON_USEDEP}]
-	!~dev-python/openstacksdk-0.9.11[${PYTHON_USEDEP}]
-	!~dev-python/openstacksdk-0.9.12[${PYTHON_USEDEP}]
-	>=dev-python/osc-lib-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/python-heatclient-1.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.10.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() {
-	# built in...
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/python-senlinclient/python-senlinclient-2.1.1.ebuild b/dev-python/python-senlinclient/python-senlinclient-2.1.1.ebuild
new file mode 100644
index 000000000000..6c6e07edc485
--- /dev/null
+++ b/dev-python/python-senlinclient/python-senlinclient-2.1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 python3_7 python3_8 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Senlin API"
+HOMEPAGE="https://github.com/openstack/python-senlinclient"
+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"
+
+DEPEND=">=dev-python/pbr-2.1.1[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/pbr-2.1.1[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.2[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/openstacksdk-0.24.0[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.11.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/python-heatclient-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.13.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]"