gentoo resync : 24.02.2018

6 files changed, 60 insertions, 147 deletions

diff --git a/dev-python/glance_store/Manifest b/dev-python/glance_store/Manifest
index f6518be1a706..627eabb8b17c 100644
--- a/dev-python/glance_store/Manifest
+++ b/dev-python/glance_store/Manifest
@@ -1,9 +1,5 @@
-DIST glance_store-0.13.1.tar.gz 127250 BLAKE2B 8150a99a3c0e87cf995906adeaffb8e0570de38e5385c95baea7320df45e06f4eda630261b356ac0916420d33035afa5def6321bb46cd392226af4c33450f471 SHA512 1625849ed35d8fec6d730790485451fd740240a6fd076ad084cd0444b5b8bfadeab82164854a9bee194f6f3cabff7c30815d5fdcd800a7d982ed8c3224e6aaec
-DIST glance_store-0.18.0.tar.gz 126949 BLAKE2B fab8e33e5f967e795e2b120621cdfe25187a8c0de705eeda8b8c9cf466c66ffd74b6b425775949dc45ba06fb0f76e5c91c71727a261c554a20fb40eb44f232cb SHA512 f23505b0081d0bb9948a4a2550868ea9864c00604358264c826551caccb4e35cbdcfcaa1e0ed3d470fbe72250196e246b596cbb57db0e99cc49fba3e0c609e01
-DIST glance_store-0.20.0.tar.gz 129769 BLAKE2B ff9855199c6c8d371666765b15680c7a8c33c74fe045b095b55251151d5623be047ddba478732a994190251328b53b0702d885bcd841b65004da4ca41f689a31 SHA512 456a316763b2364747d24472aa42cf7602d3432043a52164a141ea0827afd2c92e6770a4c04ca7bb3c96cb9103080801cb1095a1869e5851c0ee83c4e7aea018
 DIST glance_store-0.22.0.tar.gz 130377 BLAKE2B 7dc46dde1dbccddbbabf0e0d1d4033429e4ffa3d6dec6fe379b6f7aabcaa5eeed639aa2c76e5b85ccf3444f4e76ec894251bdb8ae573b094e657fe61acb7887b SHA512 3de073fd4926513674b87afb15a2d4485c4a98f76c7d36cd0957a9cd848399bfb1fc6b3b40550522b712e9bbddf8efec5c3fc629a944fe447543d35eb7184168
-EBUILD glance_store-0.13.1.ebuild 1620 BLAKE2B 9350d51e5b7c8eb0b4ec93ba1986ae96662c76d621d05136f0a3ca7a7a0fa29f43f61dac4a1af611558599baed7948b3e0190df4c896f83e0cc8aa1619133325 SHA512 67b81b9f84c47f9ec95cb457e049aa386b798b67af37fb0b7fb7747c7a423c010d11393f8911cbfe782c1cb28a20dfbc2ce35c5d9a19601232ed4ea884b902ac
-EBUILD glance_store-0.18.0.ebuild 1517 BLAKE2B 1a736d3823f760529ceb9a1be2fec44c772c02d393a0f00453f1ac7c0dc8fddd9f35c2f989dd2debc40bca4635a583add25668e96257ba6238f35821776487a9 SHA512 8f25f3a53f6315c9fa53994531b7635659f3cbfbb11b0cffbf370baab4ded52ce2512988e41d7f9a66df2d6aa20d75214b90230befa9be288b269b90bb685030
-EBUILD glance_store-0.20.0.ebuild 1455 BLAKE2B 44bf7753afa9ec328dc2f45e9150010a408bd61121e8570c1cf9e59e5116b1c9cfc50c81f6b02c1ae7ae0204c2fc74f36b95dd4377ade33d772ebf19472682eb SHA512 388e50051c7402a682d46f56b39e9952c2a0b85acb7ed4cb8e174c07b3cec57666fe2577e14e21a5899d7560be88863cb3087b8883871581aa59cf8904bbb919
+DIST glance_store-0.23.0.tar.gz 140917 BLAKE2B 764510b2d24b633a9120d4c39e66100a75de23c0bd7ef633bff4d381369c67d6a21b4f16019432ac02c6ed1b995c5c6373014dd9a5bd4df4981721146ced4145 SHA512 ee3d1187ac47427981af294604bd4742a12b60bdf406039a86c5eb33645e1407bc077ae079ea07b9c031922d9350b0e2eb7eaba70f51854c288faf90f9cd7b41
 EBUILD glance_store-0.22.0.ebuild 1631 BLAKE2B 1c3c27e87efeb8314db12b798992fc40ea09a452ab1c58cb2631fbcac065ceb12938ba31791299f2aeb2e936046d8427db3fabc946faccf6a6edb2c77adb4cc6 SHA512 09fdad30dd0da08e1e685bf85a3dd6f5c95379d36743d6bc30cf67bdd8ee82e42a7ebf00bbcaf791942fb2a7376279c9c0a2713395e744f650d5a601fa1f0ed3
-MISC metadata.xml 692 BLAKE2B 7a1852e914b4711754f3eebc0bfa5f2750af5893e0ccaffac7074fe519b79b3a32ed40a82d64a663f76d6dfd5448b89a3278d176650d1cdb5e08069f1b9f0993 SHA512 97172f66abbafd05483b8b7d51ae5a1384c5beed369eba1fe8828b83186b06c90f88f5ebe0c9bb69164f76a3214bb7af67e95b9b16fe774fdfa60948891f13ac
+EBUILD glance_store-0.23.0.ebuild 1866 BLAKE2B f9062268e8b95651086a1c07f580883c05764bc0f653f3516cb038d7159af3f2c9fd819956e873772d71c222fbd74137d4b877dba8d764fb818c82354075c59b SHA512 a8b483c4e0ff9fbe5e24154b0dc2e3a5556b655f9e736742f60789d69ea59dd3d0996f100d4e1f43a5f4ed0f10004c04bc5b5bf5b03d4fea66a5ce90a863a4f6
+MISC metadata.xml 807 BLAKE2B c5195ef9669d04dc0f81f47b07e802984114b15bf4dedaf99b7214187befb556765a4b14c7d55c9bbbf1dcc2acb4f22e7c5a12a65912cb9f2bbcb73d1cafa4a5 SHA512 3479866f525828fbd21f7d0953088720d0045bf2e00d8dd4cb5bba25f7d5ba939c4bc9bac89d1f9bbf5c3a815f0d5199045f6ad0585c6712843dc1f26135705d
diff --git a/dev-python/glance_store/glance_store-0.13.1.ebuild b/dev-python/glance_store/glance_store-0.13.1.ebuild
deleted file mode 100644
index 8f8478e527c8..000000000000
--- a/dev-python/glance_store/glance_store-0.13.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A library for glance"
-HOMEPAGE="https://github.com/openstack/glance_store"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+cinder"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/oslo-config-3.7.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.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${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/requests-2.8.1[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.9.1[${PYTHON_USEDEP}]
-	cinder? ( >=dev-python/python-cinderclient-1.2.1[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
-	sed -i '/ordereddict/d' requirements.txt
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/glance_store/glance_store-0.18.0.ebuild b/dev-python/glance_store/glance_store-0.18.0.ebuild
deleted file mode 100644
index 201407baf74b..000000000000
--- a/dev-python/glance_store/glance_store-0.18.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A library for glance"
-HOMEPAGE="https://github.com/openstack/glance_store"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+cinder"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/oslo-config-3.14.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.16.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${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}]
-	cinder? ( >=dev-python/python-cinderclient-1.2.1[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
-	sed -i '/ordereddict/d' requirements.txt
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/glance_store/glance_store-0.20.0.ebuild b/dev-python/glance_store/glance_store-0.20.0.ebuild
deleted file mode 100644
index e0841900f036..000000000000
--- a/dev-python/glance_store/glance_store-0.20.0.ebuild
+++ /dev/null
@@ -1,43 +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 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="A library for glance"
-HOMEPAGE="https://github.com/openstack/glance_store"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+cinder"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.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/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.0[${PYTHON_USEDEP}]
-	cinder? ( >=dev-python/python-cinderclient-1.2.1[${PYTHON_USEDEP}] )
-"
diff --git a/dev-python/glance_store/glance_store-0.23.0.ebuild b/dev-python/glance_store/glance_store-0.23.0.ebuild
new file mode 100644
index 000000000000..87104d200212
--- /dev/null
+++ b/dev-python/glance_store/glance_store-0.23.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for glance"
+HOMEPAGE="https://github.com/openstack/glance_store"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="cinder swift vmware"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${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/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	virtual/python-enum34[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	cinder? (
+		>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
+	)
+	swift? (
+		>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
+	)
+	vmware? ( >=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}] )
+"
diff --git a/dev-python/glance_store/metadata.xml b/dev-python/glance_store/metadata.xml
index c097a6135423..7907f3a2f3fc 100644
--- a/dev-python/glance_store/metadata.xml
+++ b/dev-python/glance_store/metadata.xml
@@ -18,6 +18,8 @@
 		<remote-id type="github">openstack/glance_store</remote-id>
 	</upstream>
 	<use>
-		<flag name="cinder">adds cinder backend support</flag>
+		<flag name="cinder">enable cinder backend supprt</flag>
+		<flag name="swift">enable swift backend supprt</flag>
+		<flag name="vmware">enable vmware backend supprt</flag>
 	</use>
 </pkgmetadata>