gentoo resync : 28.04.2019

5 files changed, 242 insertions, 25 deletions

diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 6314fab566f7..a0a1280bcd6b 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,11 +1,13 @@
 AUX cinder.initd 494 BLAKE2B f919de45b8e39b65d355f627fcd71a4c23a7bb550157d25811c1d1f3a84b9f1c1e7c596361ec5d2aab650f1ebf3f0f053e313f2e15be64995d1309a6eafc8a69 SHA512 be3c2e6798b08527487cfd2b1cd66a03d891526a45f52c97a536b15a08d46a4162e3b036dcae86911c7dba25c5d7f02e73a089d4dd720526bf38ecd0f44c59b0
 AUX cinder.sudoersd 86 BLAKE2B 1ea49d3cf3bc134ea0a2d5512c6e258f117187267bfa408fea0d2449a091068e5404812a0e693f226d895ec23766ed73aca36128d6f7b968ae44dc38b8ad948a SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1
-DIST cinder-13.0.3.tar.gz 5464871 BLAKE2B 3d2beebe7503d673ebc8a3f6b07da2a6799d276578823cb1abb518894f88cf97ec051337016b177ddc45614d70b9a5350a49c144011b0d1e41beaf901b4a73da SHA512 2e358f7f0220aa6b6b88dedc8c942abcf5c54c53a690d18d84bee6d63b4f28b75c463f1d37a5e24925431e441f26066dbb0b4d33750429efbe7663d0e69de3a4
 DIST cinder-13.0.4.tar.gz 5466572 BLAKE2B de5511f74faa9a096fa1183a78e65b0950fa95cc9e746ac750ecfd6ce840bda7f4f9899b2af4bcacb4cef6e8f5bb94bf706263df5055ed973ecc43ea1834ef68 SHA512 a492580718cb2cdd47bf1dc74d95ef9b3a6afdf50351e20e840c6a9805aed434e520be30c4126ba26216011b16e16007bc6e8816bb8aa7aea1e20d7cc2d622dd
-DIST cinder.conf.sample-13.0.3 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
+DIST cinder-14.0.0.tar.gz 5498509 BLAKE2B adbd31dc953b467690a82be29e75467ec60a65064e402c1659948cb413154e9e9efd088ecc3b7accbe9b378e3a7f8bd5325d133e2d37b38d9ce091189857e293 SHA512 28940052eea307bcdce8ed9f7df09cb58b7250e561e128b3dd65123f8baffdacfadb6f6243a82d898fb8dc4ce11cf0fb0ad9905d5445cf61e2f603a580915562
 DIST cinder.conf.sample-13.0.4 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
+DIST cinder.conf.sample-14.0.0 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 DIST cinder.conf.sample-2018.2.9999 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
-EBUILD cinder-13.0.3.ebuild 7809 BLAKE2B eac04abb8fede52a183b7908b4be44e7d5cb38b536c63c68eb50b4d41ad71607b94768b49dd159ff3f32599268c8f92dabee65427a0b1736150860924384f469 SHA512 83a0e6742a08a8e65a084f0f07025c35d8615ea0041e4e1edbc1b76df59c88e57e00e0b6c6eee33da53b0a2568588fa799ec831616b2993d3c69f6cd7c6ff0f4
-EBUILD cinder-13.0.4.ebuild 7811 BLAKE2B f903b27a6a07b69413fadabd0e94a368b4553438fe89404b9fdceefe4f77a80924bbabc84460393c6437583c34e6fb9d108d222e1e84a387c8864f7fe731390a SHA512 8ace1323dad4c04e7ef36042104552c870f560ab376b4b192a28923dafad60915ea9f0631fe239ec47a8ffa65b1d15daf66f4ad7a19b44497e234a7b953b27b4
-EBUILD cinder-2018.2.9999.ebuild 7814 BLAKE2B 6755862a53601c6f2afce2f3d07583e59b737cb8d3ff788099b4f9bccb8cc6a7084306fb999c55be18cf7281b62cae16625b4125b166dc68281d845e57fa0b3a SHA512 35ff4a9673ff4ba9af192853ee30997b86cf28866951a520d34149c02f8196365754bcaf8337834b4254581abd9e3067e09439840a1d97d8333bf2aa290c4270
+DIST cinder.conf.sample-2019.1.9999 185527 BLAKE2B c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2 SHA512 1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
+EBUILD cinder-13.0.4.ebuild 7807 BLAKE2B 4f8fcb254a66c4cdafbdc760d6640136b97e48c857aa868f08a379695d7529fa2f8fb05c20e6aeed33ec56b9ee66ec040bdd382ab1517231329d7084f94c758d SHA512 8b4f16da33f2c868dcee627275aed329cc9676f8509e5be763226b9453bff26ecf5dfbd85b3bc06198210e44ff8a07b56eb48b931b18517f2f7cd78ca89c3d54
+EBUILD cinder-14.0.0.ebuild 7818 BLAKE2B da3671b1b1b1153ad9bac111d63e2d408989107817e8efae04bbf9e77b8c1886e413786c2ca2185c0d78b935ab55afbc086443eec4265e6dbea305df85d214d9 SHA512 eb9c70b521aebc02f3d699b480f2a83e913143a67c5521c6b8a7c75e3ff1b59fc0bd499810da89ea048b939bda3b143ee9e1f40a7943a0a21d59cf331ac2825d
+EBUILD cinder-2018.2.9999.ebuild 7809 BLAKE2B 25e88e7eeeab5230ed34fde72301ca280da38b3c2a37e28fc2474d7e8252bfd0bfea6025a10ede5166f4335cd869e7baa8f2a95bf2138c8cc8c5b7a18b888924 SHA512 e662bb768f38ea5f972118a0bdafd963a89f04b96ee784475ec7002f4fd2f7b1434e13d5517d1250d481eba995d2b44f0ac4a1717b8b5885d3c57433f7187413
+EBUILD cinder-2019.1.9999.ebuild 7818 BLAKE2B da3671b1b1b1153ad9bac111d63e2d408989107817e8efae04bbf9e77b8c1886e413786c2ca2185c0d78b935ab55afbc086443eec4265e6dbea305df85d214d9 SHA512 eb9c70b521aebc02f3d699b480f2a83e913143a67c5521c6b8a7c75e3ff1b59fc0bd499810da89ea048b939bda3b143ee9e1f40a7943a0a21d59cf331ac2825d
 MISC metadata.xml 1244 BLAKE2B bac3f4931079ae89c48d66ed2fe689978fcf609638ade7b26d8f07ffbd6562d7c4a16b42dec4390654747c6d2dfcb92b73d27c90356f1928199469d42432ef69 SHA512 fda201e6974bb0af9c24c1384a3bb2dd0a0c630439d7f1955de336f53804070a68426919fd4dc6f864d502c7e9e99a80d1920c740b6dc179f7b46c7f7fb7aef9
diff --git a/sys-cluster/cinder/cinder-13.0.4.ebuild b/sys-cluster/cinder/cinder-13.0.4.ebuild
index f3ef098f76ee..b599d7a7b07b 100644
--- a/sys-cluster/cinder/cinder-13.0.4.ebuild
+++ b/sys-cluster/cinder/cinder-13.0.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1 eutils linux-info user
 
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then
 else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-${PV}
 	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/sys-cluster/cinder/cinder-13.0.3.ebuild b/sys-cluster/cinder/cinder-14.0.0.ebuild
index a8e41663d73e..f5e2d68d7552 100644
--- a/sys-cluster/cinder/cinder-13.0.3.ebuild
+++ b/sys-cluster/cinder/cinder-14.0.0.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_{4,5,6} )
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1 eutils linux-info user
 
@@ -13,11 +13,11 @@ if [[ ${PV} == *9999 ]];then
 	inherit git-r3
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-${PV}"
 	EGIT_REPO_URI="https://github.com/openstack/cinder.git"
-	EGIT_BRANCH="stable/rocky"
+	EGIT_BRANCH="stable/stein"
 else
 	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-${PV}
 	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 LICENSE="Apache-2.0"
@@ -33,8 +33,6 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 
 RDEPEND="
 	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
 	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
 	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
 	dev-python/enum34[$(python_gen_usedep 'python2_7')]
@@ -46,8 +44,8 @@ RDEPEND="
 	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
 	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
 	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.21.0[${PYTHON_USEDEP}]
 	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
 	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
 	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
@@ -56,17 +54,18 @@ RDEPEND="
 	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
 	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-6.4.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.44.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
 	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
 	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
 	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.34.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
 	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
@@ -77,18 +76,18 @@ RDEPEND="
 	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.15.0[${PYTHON_USEDEP}]
 	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
 	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
 	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.20.0[${PYTHON_USEDEP}]
 	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
 	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
 	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-3.2.0[${PYTHON_USEDEP}]
 	>=dev-python/rtslib-fb-2.1.65[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 	sqlite? (
 		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
@@ -203,6 +202,8 @@ python_install_all() {
 	insinto /etc/sudoers.d/
 	insopts -m 0440 -o root -g root
 	newins "${FILESDIR}/cinder.sudoersd" cinder
+	# stupid python
+	rm -r "${ED}"/usr/etc
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/cinder/cinder-2018.2.9999.ebuild b/sys-cluster/cinder/cinder-2018.2.9999.ebuild
index 08199f011f46..dedea484546e 100644
--- a/sys-cluster/cinder/cinder-2018.2.9999.ebuild
+++ b/sys-cluster/cinder/cinder-2018.2.9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit distutils-r1 eutils linux-info user
 
diff --git a/sys-cluster/cinder/cinder-2019.1.9999.ebuild b/sys-cluster/cinder/cinder-2019.1.9999.ebuild
new file mode 100644
index 000000000000..f5e2d68d7552
--- /dev/null
+++ b/sys-cluster/cinder/cinder-2019.1.9999.ebuild
@@ -0,0 +1,214 @@
+# 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 eutils linux-info user
+
+DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
+HOMEPAGE="https://launchpad.net/cinder"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-${PV}"
+	EGIT_REPO_URI="https://github.com/openstack/cinder.git"
+	EGIT_BRANCH="stable/stein"
+else
+	SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/rocky/cinder.conf.sample -> cinder.conf.sample-${PV}
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
+REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
+	dev-python/enum34[$(python_gen_usedep 'python2_7')]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.21.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
+	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-6.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.44.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.34.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.15.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/rtslib-fb-2.1.65[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	~dev-python/suds-0.6[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
+	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
+	iscsi? (
+		tgt? ( sys-block/tgt )
+		sys-block/open-iscsi
+	)
+	lvm? ( sys-fs/lvm2 )
+	memcached? ( net-misc/memcached )
+	app-emulation/qemu
+	sys-fs/sysfsutils"
+# qemu is needed for image conversion
+
+#PATCHES=(
+#)
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES=""
+	if use tcp; then
+		CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
+	fi
+	if use rdma; then
+		CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
+	fi
+	if use infiniband; then
+		CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
+	fi
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
+		done
+	fi
+}
+
+pkg_setup() {
+	enewgroup cinder
+	enewuser cinder -1 -1 /var/lib/cinder cinder
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	# only used for docs
+	sed -i '/^sphinx-feature-classification/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
+	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	keepdir /etc/cinder
+	dodir /etc/cinder/rootwrap.d
+
+	for svc in api scheduler volume; do
+		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
+	done
+
+	insinto /etc/cinder
+	insopts -m0640 -o cinder -g cinder
+	doins "etc/cinder/api-httpd.conf"
+	doins "etc/cinder/logging_sample.conf"
+	doins "etc/cinder/rootwrap.conf"
+	doins "etc/cinder/api-paste.ini"
+	doins "etc/cinder/resource_filters.json"
+	newins "${DISTDIR}/cinder.conf.sample-${PV}" "cinder.conf.sample"
+	insinto /etc/cinder/rootwrap.d
+	doins "etc/cinder/rootwrap.d/volume.filters"
+
+	dodir /var/log/cinder
+	fowners cinder:cinder /var/log/cinder
+
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/cinder.sudoersd" cinder
+	# stupid python
+	rm -r "${ED}"/usr/etc
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "Cinder needs tgtd to be installed and running to work with iscsi"
+		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
+	fi
+}