commit: c54ea4d3f2212827d313ee616c83bb8fe6b42603
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 28 16:07:44 2019 +0000
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Feb 28 16:22:12 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c54ea4d3
sys-cluster/cinder: 12.0.5 stable amd64 and x86 with cleanup
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
sys-cluster/cinder/Manifest | 1 -
sys-cluster/cinder/cinder-12.0.4.ebuild | 217 --------------------------------
sys-cluster/cinder/cinder-12.0.5.ebuild | 2 +-
3 files changed, 1 insertion(+), 219 deletions(-)
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 9fd98108033..7094563b082 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,5 +1,4 @@
DIST cinder-11.1.1.tar.gz 5808526 BLAKE2B
1b773e45673c35faff1a327d73608949e088f3635adb6dd6c7e779e708dd8f2270b85086378d48042b86e60ad7ca94754d56c1d0193f1d715112a03cf3163c77
SHA512
10ecf0068c57077a24bb0445a0901e07e7ad211cd7fac67ed016b770b477e9ba0e9954de70f165aae69e079f6b2e9416d8292ec701db4c97b987c7dac8f69a43
-DIST cinder-12.0.4.tar.gz 5349921 BLAKE2B
168beb53879656956a97a4e787aba200b119e80e3b787fa94534c7ca8a68fb641df47069e19759ef022103a3f306402711ec315bc61d6387b427c6f5672919fc
SHA512
0a139c25458020a869ab9395f42cd31b83cbfb65640a41ef0039aef48a92fd641a0084c5fd8fbdc35b6c8b6e9250e1d0a845816b92a882358acf4e2793be536c
DIST cinder-12.0.5.tar.gz 5358388 BLAKE2B
7ee078eb4cc4c4b16053453f1f3e5bd37c29766f80bedd1b3fe6e9d44387c8215d0fed1f79d92576254bf51b567227193a7175db7d06ef35d7f3fff5d82dd4da
SHA512
80788d2b10a4a0bf83e61db8e58f54dd8bbcd9fa06cd4025d37809f310bc7ed148ea9c180f4e6f02cf06f8b388384cbb9cb8a8f29a327acfe8188503550a7097
DIST cinder-13.0.2.tar.gz 5463591 BLAKE2B
d146e43bdd97bd15aeaf7c582c8cbe37080a7a1e8b5090c2727fb2dfbfc953121c0bb4c2adfce5f09d3e43e02093335dcce655dcc64abfa98d58b08327257950
SHA512
04ea9c0dafcc98858b587bf94e5afa20cfbfdd1aebd615ac62cfc7821a8dc6106b695071d68dc369bff014e877fc188216f3b05a9a08ea94a1b99712eca25c92
DIST cinder-13.0.3.tar.gz 5464871 BLAKE2B
3d2beebe7503d673ebc8a3f6b07da2a6799d276578823cb1abb518894f88cf97ec051337016b177ddc45614d70b9a5350a49c144011b0d1e41beaf901b4a73da
SHA512
2e358f7f0220aa6b6b88dedc8c942abcf5c54c53a690d18d84bee6d63b4f28b75c463f1d37a5e24925431e441f26066dbb0b4d33750429efbe7663d0e69de3a4
diff --git a/sys-cluster/cinder/cinder-12.0.4.ebuild
b/sys-cluster/cinder/cinder-12.0.4.ebuild
deleted file mode 100644
index bdab1c26a9d..00000000000
--- a/sys-cluster/cinder/cinder-12.0.4.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2018 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-12.0.5.ebuild
b/sys-cluster/cinder/cinder-12.0.5.ebuild
index 7d5ccdd03cd..696f299b97f 100644
--- a/sys-cluster/cinder/cinder-12.0.5.ebuild
+++ b/sys-cluster/cinder/cinder-12.0.5.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then
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"
+ KEYWORDS="amd64 ~arm64 x86"
fi
LICENSE="Apache-2.0"
