commit:     9f807ca5f60f77c42f0843840406e2f061dfe053
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 23:47:44 2019 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 00:06:47 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f807ca5

sys-cluster/cinder: remove pike/queens

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 sys-cluster/cinder/Manifest                  |   5 -
 sys-cluster/cinder/cinder-11.1.1.ebuild      | 209 --------------------------
 sys-cluster/cinder/cinder-11.2.0.ebuild      | 209 --------------------------
 sys-cluster/cinder/cinder-12.0.5.ebuild      | 217 ---------------------------
 sys-cluster/cinder/cinder-2017.2.9999.ebuild | 210 --------------------------
 sys-cluster/cinder/cinder-2018.1.9999.ebuild | 217 ---------------------------
 6 files changed, 1067 deletions(-)

diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 2a8309921ad..f71c070f0d6 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,8 +1,3 @@
-DIST cinder-11.1.1.tar.gz 5808526 BLAKE2B 
1b773e45673c35faff1a327d73608949e088f3635adb6dd6c7e779e708dd8f2270b85086378d48042b86e60ad7ca94754d56c1d0193f1d715112a03cf3163c77
 SHA512 
10ecf0068c57077a24bb0445a0901e07e7ad211cd7fac67ed016b770b477e9ba0e9954de70f165aae69e079f6b2e9416d8292ec701db4c97b987c7dac8f69a43
-DIST cinder-11.2.0.tar.gz 5832600 BLAKE2B 
3d06bef947ffd8b38bb178de79f592b678793bb53ccec23d2b46132d78180d58aa11ea760c9ad5d3923d32452c700aeb6e097d84261e86bdce79d34bff1c2402
 SHA512 
4ef77c0d0423286d1ce2aa1174b65b17999819f719f061811c24f277e41b8463bf4971982c4d9f5e085aac75fcd964353ae26bcf7b395023a0aa37e964000014
-DIST cinder-12.0.5.tar.gz 5358388 BLAKE2B 
7ee078eb4cc4c4b16053453f1f3e5bd37c29766f80bedd1b3fe6e9d44387c8215d0fed1f79d92576254bf51b567227193a7175db7d06ef35d7f3fff5d82dd4da
 SHA512 
80788d2b10a4a0bf83e61db8e58f54dd8bbcd9fa06cd4025d37809f310bc7ed148ea9c180f4e6f02cf06f8b388384cbb9cb8a8f29a327acfe8188503550a7097
 DIST cinder-13.0.3.tar.gz 5464871 BLAKE2B 
3d2beebe7503d673ebc8a3f6b07da2a6799d276578823cb1abb518894f88cf97ec051337016b177ddc45614d70b9a5350a49c144011b0d1e41beaf901b4a73da
 SHA512 
2e358f7f0220aa6b6b88dedc8c942abcf5c54c53a690d18d84bee6d63b4f28b75c463f1d37a5e24925431e441f26066dbb0b4d33750429efbe7663d0e69de3a4
 DIST cinder.conf.sample-13.0.3 185527 BLAKE2B 
c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2
 SHA512 
1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
 DIST cinder.conf.sample-2018.2.9999 185527 BLAKE2B 
c53c017c5cacf2fb604840e14adf3b1db36bf8dd2c79d29f1c6b35da843640f97efcfd97d6f68a40a2f928ce864a3e221d7138d7cac977c0d544817e2826ebb2
 SHA512 
1dc850bebd66d90e2950795337a78ea8aea69ead0aeb3e5b7f97c7b12f33a3afc483f3bde2942a34539fbc048fa5b589b3c7d2df53314180f64094569bb81b15
-DIST pike-cinder.conf.sample 185310 BLAKE2B 
6f6a626537098107d63cd33ef6f8cc63dd5064711fcab3b6a7ebd0bb4170d3cc18e1cc414491859c63ca02d39602f496068823975f1cd5de731402696ade0868
 SHA512 
12c44b7a31888fbf4c70e037a2f5d0b778018e10bd0fc1cb97391bbe2fc6f97bbe4bec0d1504513ee0235ce50decda6883fe64a7d8fd5e329d8ad73e6bb74654
-DIST queens-cinder.conf.sample 179467 BLAKE2B 
00c229a6d9882740460c633db69bf3f5ff3d77a2a8e78f38528f1b5e6e03c2371141ba219c24b8dc82e51c20a5e784af142c1a0192791ff356e5841a9991d713
 SHA512 
346f9ad4ddcfed26dd3b9b34e65c2edaf08a7d649d4af5bd3a5ebf1047c78d6cdc4e4712666e022f56acd3b2a0b323850b40cc4d0008f2c140507342a00b2908

diff --git a/sys-cluster/cinder/cinder-11.1.1.ebuild 
b/sys-cluster/cinder/cinder-11.1.1.ebuild
deleted file mode 100644
index b0f15626d2d..00000000000
--- a/sys-cluster/cinder/cinder-11.1.1.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-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";
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/pike/cinder.conf.sample
 -> pike-cinder.conf.sample
-https://tarballs.openstack.org/${PN}/${P}.tar.gz";
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-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/Babel-2.3.4[${PYTHON_USEDEP}]
-       !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-       >=dev-python/decorator-3.4.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/eventlet-0.21.0[${PYTHON_USEDEP}]
-       >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-       >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-       >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-       virtual/python-ipaddress[${PYTHON_USEDEP}]
-       >=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
-       >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-       >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-       !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-       >=dev-python/oauth2client-1.5.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-concurrency-3.8.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-privsep-1.17.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-       >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-       >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-       >=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
-       dev-python/paste[${PYTHON_USEDEP}]
-       >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-       >=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-       >=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-       >=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-       !~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
-       !~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
-       >=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-       >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-       >=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}]
-       !~dev-python/python-novaclient-7.0.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/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.7.0[${PYTHON_USEDEP}]
-       >=dev-python/rtslib-fb-2.1.43[${PYTHON_USEDEP}]
-       !~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}]
-       !~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}]
-       >=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-       >=dev-python/six-1.9.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-2.1.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-       >=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}]
-       >=dev-python/os-brick-1.15.2[${PYTHON_USEDEP}]
-       >=dev-python/os-win-2.0.0[${PYTHON_USEDEP}]
-       >=dev-python/tooz-1.47.0[${PYTHON_USEDEP}]
-       >=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
-       >=dev-python/castellan-0.7.0[${PYTHON_USEDEP}]
-       >=dev-python/cryptography-1.6[${PYTHON_USEDEP}]
-       !~dev-python/cryptography-2.0[${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
-       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/policy.json"
-       doins "etc/cinder/resource_filters.json"
-       newins "${DISTDIR}/pike-cinder.conf.sample" "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
-}
-
-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
-}

diff --git a/sys-cluster/cinder/cinder-11.2.0.ebuild 
b/sys-cluster/cinder/cinder-11.2.0.ebuild
deleted file mode 100644
index a95e329fad9..00000000000
--- a/sys-cluster/cinder/cinder-11.2.0.ebuild
+++ /dev/null
@@ -1,209 +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_{4,5} )
-
-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";
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/pike/cinder.conf.sample
 -> pike-cinder.conf.sample
-https://tarballs.openstack.org/${PN}/${P}.tar.gz";
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-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/Babel-2.3.4[${PYTHON_USEDEP}]
-       !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-       >=dev-python/decorator-3.4.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/eventlet-0.21.0[${PYTHON_USEDEP}]
-       >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-       >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-       >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-       virtual/python-ipaddress[${PYTHON_USEDEP}]
-       >=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
-       >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-       >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-       !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-       >=dev-python/oauth2client-1.5.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-concurrency-3.8.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-privsep-1.17.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-       >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-       >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-       >=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
-       dev-python/paste[${PYTHON_USEDEP}]
-       >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-       >=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-       >=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-       >=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-       !~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
-       !~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
-       >=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-       >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-       >=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}]
-       !~dev-python/python-novaclient-7.0.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/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.7.0[${PYTHON_USEDEP}]
-       >=dev-python/rtslib-fb-2.1.43[${PYTHON_USEDEP}]
-       !~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}]
-       !~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}]
-       >=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-       >=dev-python/six-1.9.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-2.1.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-       >=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}]
-       >=dev-python/os-brick-1.15.2[${PYTHON_USEDEP}]
-       >=dev-python/os-win-2.0.0[${PYTHON_USEDEP}]
-       >=dev-python/tooz-1.47.0[${PYTHON_USEDEP}]
-       >=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
-       >=dev-python/castellan-0.7.0[${PYTHON_USEDEP}]
-       >=dev-python/cryptography-1.6[${PYTHON_USEDEP}]
-       !~dev-python/cryptography-2.0[${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
-       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/policy.json"
-       doins "etc/cinder/resource_filters.json"
-       newins "${DISTDIR}/pike-cinder.conf.sample" "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
-}
-
-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
-}

diff --git a/sys-cluster/cinder/cinder-12.0.5.ebuild 
b/sys-cluster/cinder/cinder-12.0.5.ebuild
deleted file mode 100644
index 696f299b97f..00000000000
--- a/sys-cluster/cinder/cinder-12.0.5.ebuild
+++ /dev/null
@@ -1,217 +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_{4,5,6} )
-
-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/queens/cinder.conf.sample
 -> queens-cinder.conf.sample"
-       EGIT_REPO_URI="https://github.com/openstack/cinder.git";
-       EGIT_BRANCH="stable/queens"
-else
-       
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/queens/cinder.conf.sample
 -> queens-cinder.conf.sample
-       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/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')]
-       >=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/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.3.0[${PYTHON_USEDEP}]
-       >=dev-python/keystonemiddleware-4.17.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.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-concurrency-3.25.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-5.29.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-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-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.0.0[${PYTHON_USEDEP}]
-       !~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
-       !~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
-       >=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-       >=dev-python/python-keystoneclient-3.8.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/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/rtslib-fb-2.1.43[${PYTHON_USEDEP}]
-       !~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}]
-       !~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}]
-       !~dev-python/rtslib-fb-2.1.64[${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}]
-               !~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-1.9[${PYTHON_USEDEP}]
-       !~dev-python/cryptography-2.0[${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
-       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}/queens-cinder.conf.sample" "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
-}
-
-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
-}

diff --git a/sys-cluster/cinder/cinder-2017.2.9999.ebuild 
b/sys-cluster/cinder/cinder-2017.2.9999.ebuild
deleted file mode 100644
index 21735a00e68..00000000000
--- a/sys-cluster/cinder/cinder-2017.2.9999.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 eutils git-r3 linux-info user
-
-DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of 
nova-volumes"
-HOMEPAGE="https://launchpad.net/cinder";
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/pike/cinder.conf.sample
 -> pike-cinder.conf.sample"
-EGIT_REPO_URI="https://github.com/openstack/cinder.git";
-EGIT_BRANCH="stable/pike"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-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/Babel-2.3.4[${PYTHON_USEDEP}]
-       !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-       >=dev-python/decorator-3.4.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/eventlet-0.21.0[${PYTHON_USEDEP}]
-       >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-       >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-       >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-       virtual/python-ipaddress[${PYTHON_USEDEP}]
-       >=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
-       >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-       >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-       !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-       >=dev-python/oauth2client-1.5.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-concurrency-3.8.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
-       !~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-privsep-1.17.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-       >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-       >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-       >=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
-       dev-python/paste[${PYTHON_USEDEP}]
-       >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-       >=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-       >=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-       >=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-       !~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
-       !~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
-       >=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-       >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-       >=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}]
-       !~dev-python/python-novaclient-7.0.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/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.7.0[${PYTHON_USEDEP}]
-       >=dev-python/rtslib-fb-2.1.43[${PYTHON_USEDEP}]
-       !~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}]
-       !~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}]
-       >=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-       >=dev-python/six-1.9.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-2.1.0[${PYTHON_USEDEP}]
-       !~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-       >=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}]
-       >=dev-python/os-brick-1.15.2[${PYTHON_USEDEP}]
-       >=dev-python/os-win-2.0.0[${PYTHON_USEDEP}]
-       >=dev-python/tooz-1.47.0[${PYTHON_USEDEP}]
-       >=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
-       >=dev-python/castellan-0.7.0[${PYTHON_USEDEP}]
-       >=dev-python/cryptography-1.6[${PYTHON_USEDEP}]
-       !~dev-python/cryptography-2.0[${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
-       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/policy.json"
-       doins "etc/cinder/resource_filters.json"
-       newins "${DISTDIR}/pike-cinder.conf.sample" "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
-}
-
-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
-}

diff --git a/sys-cluster/cinder/cinder-2018.1.9999.ebuild 
b/sys-cluster/cinder/cinder-2018.1.9999.ebuild
deleted file mode 100644
index b4978e98b3f..00000000000
--- a/sys-cluster/cinder/cinder-2018.1.9999.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-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/queens/cinder.conf.sample
 -> queens-cinder.conf.sample"
-       EGIT_REPO_URI="https://github.com/openstack/cinder.git";
-       EGIT_BRANCH="stable/queens"
-else
-       
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/queens/cinder.conf.sample
 -> queens-cinder.conf.sample
-       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/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')]
-       >=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/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.3.0[${PYTHON_USEDEP}]
-       >=dev-python/keystonemiddleware-4.17.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.1.0[${PYTHON_USEDEP}]
-       >=dev-python/oslo-concurrency-3.25.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-5.29.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-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-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.0.0[${PYTHON_USEDEP}]
-       !~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
-       !~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
-       >=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-       >=dev-python/python-keystoneclient-3.8.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/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/rtslib-fb-2.1.43[${PYTHON_USEDEP}]
-       !~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}]
-       !~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}]
-       !~dev-python/rtslib-fb-2.1.64[${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}]
-               !~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-1.9[${PYTHON_USEDEP}]
-       !~dev-python/cryptography-2.0[${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
-       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}/queens-cinder.conf.sample" "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
-}
-
-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
-}

Reply via email to