summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode <prometheanfire@gentoo.org>2020-04-23 11:21:12 -0500
committerMatthew Thode <prometheanfire@gentoo.org>2020-04-23 11:21:27 -0500
commite6909a80057d5fda729c7def7a018d098cecbbdd (patch)
tree185a79248e1afe7c668b0a9340c0c2b67de2ccd6 /sys-cluster
parentsci-libs/cartopy: Add support for Python3.7 (diff)
downloadgentoo-e6909a80057d5fda729c7def7a018d098cecbbdd.tar.gz
gentoo-e6909a80057d5fda729c7def7a018d098cecbbdd.tar.bz2
gentoo-e6909a80057d5fda729c7def7a018d098cecbbdd.zip
sys-cluster/cinder: just remove oauth2client
Closes: https://bugs.gentoo.org/718982 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --force Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/cinder/Manifest2
-rw-r--r--sys-cluster/cinder/cinder-15.0.1.ebuild213
-rw-r--r--sys-cluster/cinder/cinder-15.1.0-r1.ebuild (renamed from sys-cluster/cinder/cinder-15.1.0.ebuild)4
3 files changed, 2 insertions, 217 deletions
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 10c760cfb7fb..5d499e2aa6be 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,5 +1,3 @@
-DIST cinder-15.0.1.tar.gz 5516811 BLAKE2B 081b3a6175303c783ff23122d409814812fdab2a7955174cd90b57ea62c055c1e39936d8e8a38e21fc2820e7069e0afc91fa46a490f539f518f33302067b4acd SHA512 7a63f25bcd6beedc60bb4a6b976d8b1f862b445a6d858e2fbbf53f4ff425d8bee094af354883a46c6226349d7557d45a649cd745e79a445e32b759b24294116f
DIST cinder-15.1.0.tar.gz 5504663 BLAKE2B 19097821729c99f0a13f0c30c9fa2c8647fe4c6ae01790b59b264fad282f1051e5e3f3275720114b1575afcbef517baab89a34ce75b7ef54d6515c204907f28a SHA512 1c6c88854994d440c3818d26533ea075adfcfc4b8642b2796d1ac90a5feec5e3c8d64d06f433840afcf2d9d4f5a50ba256808b74495e0e735a3f0a19bdc838e3
-DIST cinder.conf.sample-15.0.1 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a
DIST cinder.conf.sample-15.1.0 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a
DIST cinder.conf.sample-2019.2.9999 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a
diff --git a/sys-cluster/cinder/cinder-15.0.1.ebuild b/sys-cluster/cinder/cinder-15.0.1.ebuild
deleted file mode 100644
index 8c8f4a9cfe8c..000000000000
--- a/sys-cluster/cinder/cinder-15.0.1.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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/train/cinder.conf.sample -> cinder.conf.sample-${PV}"
- EGIT_REPO_URI="https://github.com/openstack/cinder.git"
- EGIT_BRANCH="stable/train"
-else
- SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/train/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"
-RESTRICT="!test? ( test )"
-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/eventlet-0.22.0[${PYTHON_USEDEP}]
- !~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
- !~dev-python/eventlet-0.25.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/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
-}
diff --git a/sys-cluster/cinder/cinder-15.1.0.ebuild b/sys-cluster/cinder/cinder-15.1.0-r1.ebuild
index dd0bb4f9d5bc..7e28298f02b3 100644
--- a/sys-cluster/cinder/cinder-15.1.0.ebuild
+++ b/sys-cluster/cinder/cinder-15.1.0-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then
else
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/train/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"
@@ -32,6 +32,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
${CDEPEND}
app-admin/sudo"
+# >=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}] # do not include, upstream depricated
RDEPEND="
${CDEPEND}
>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
@@ -47,7 +48,6 @@ RDEPEND="
>=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}]