diff options
author | Matthew Thode <prometheanfire@gentoo.org> | 2014-11-18 22:17:25 +0000 |
---|---|---|
committer | Matthew Thode <prometheanfire@gentoo.org> | 2014-11-18 22:17:25 +0000 |
commit | 63e749f6c3d4597b1ccec69abed452d5a76606d5 (patch) | |
tree | cff42c3ccf3494952925e6c49210fa2c8ad4a280 /app-admin/glance | |
parent | bup (diff) | |
download | gentoo-2-63e749f6c3d4597b1ccec69abed452d5a76606d5.tar.gz gentoo-2-63e749f6c3d4597b1ccec69abed452d5a76606d5.tar.bz2 gentoo-2-63e749f6c3d4597b1ccec69abed452d5a76606d5.zip |
more fixing of juno
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
Diffstat (limited to 'app-admin/glance')
-rw-r--r-- | app-admin/glance/ChangeLog | 8 | ||||
-rw-r--r-- | app-admin/glance/glance-2014.2.9999.ebuild | 4 | ||||
-rw-r--r-- | app-admin/glance/glance-2014.2.ebuild | 157 |
3 files changed, 166 insertions, 3 deletions
diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog index 98ba6f5f5076..56ae675e584c 100644 --- a/app-admin/glance/ChangeLog +++ b/app-admin/glance/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-admin/glance # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.50 2014/11/18 22:14:03 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.51 2014/11/18 22:17:25 prometheanfire Exp $ + +*glance-2014.2 (18 Nov 2014) + + 18 Nov 2014; Matthew Thode <prometheanfire@gentoo.org> +glance-2014.2.ebuild, + glance-2014.1.2.ebuild, glance-2014.2.9999.ebuild: + more fixing of juno *glance-2014.2.9999 (18 Nov 2014) diff --git a/app-admin/glance/glance-2014.2.9999.ebuild b/app-admin/glance/glance-2014.2.9999.ebuild index a0c3d9a116a4..5938d153ad57 100644 --- a/app-admin/glance/glance-2014.2.9999.ebuild +++ b/app-admin/glance/glance-2014.2.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2014.2.9999.ebuild,v 1.1 2014/11/18 22:14:03 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2014.2.9999.ebuild,v 1.2 2014/11/18 22:17:25 prometheanfire Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) @@ -11,7 +11,7 @@ DESCRIPTION="Provides services for discovering, registering, and retrieving virtual machine images with Openstack" HOMEPAGE="https://launchpad.net/glance" EGIT_REPO_URI="https://github.com/openstack/glance.git" -EGIT_BRANCH="stable/icehouse" +EGIT_BRANCH="stable/juno" LICENSE="Apache-2.0" SLOT="0" diff --git a/app-admin/glance/glance-2014.2.ebuild b/app-admin/glance/glance-2014.2.ebuild new file mode 100644 index 000000000000..bcdb90c04023 --- /dev/null +++ b/app-admin/glance/glance-2014.2.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2014.2.ebuild,v 1.1 2014/11/18 22:17:25 prometheanfire Exp $ + +EAPI=5 +PYTHON_COMPAT=( python2_7 ) + +inherit distutils-r1 user + +DESCRIPTION="Provides services for discovering, registering, and retrieving +virtual machine images with Openstack" +HOMEPAGE="https://launchpad.net/glance" +SRC_URI="http://launchpad.net/${PN}/juno/${PV}/+download/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc mysql postgres +sqlite +swift test" +REQUIRED_USE="|| ( mysql postgres sqlite )" + +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/pbr-0.8.0[${PYTHON_USEDEP}] + <dev-python/pbr-1.0[${PYTHON_USEDEP}] + test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}] + <dev-python/hacking-0.9[${PYTHON_USEDEP}] + >=dev-python/Babel-1.3[${PYTHON_USEDEP}] + >=dev-python/coverage-3.6[${PYTHON_USEDEP}] + >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}] + >=dev-python/mock-1.0[${PYTHON_USEDEP}] + >=dev-python/mox-0.5.3[${PYTHON_USEDEP}] + >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] + !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] + <dev-python/sphinx-1.3[${PYTHON_USEDEP}] + >=dev-python/requests-1.2.1[${PYTHON_USEDEP}] + !~dev-python/requests-2.4.0[${PYTHON_USEDEP}] + >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] + >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] + >=dev-python/psutil-1.1.1[${PYTHON_USEDEP}] + <dev-python/psutil-2.0.0[${PYTHON_USEDEP}] + dev-python/mysql-python[${PYTHON_USEDEP}] + dev-python/psycopg[${PYTHON_USEDEP}] + ~dev-python/pysendfile-2.0.0[${PYTHON_USEDEP}] + dev-python/qpid-python[${PYTHON_USEDEP}] + >=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}] + >=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}] )" + +#note to self, wsgiref is a python builtin, no need to package it +#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}] + +RDEPEND=">=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] + sqlite? ( + >=dev-python/sqlalchemy-0.8.4[sqlite,${PYTHON_USEDEP}] + <=dev-python/sqlalchemy-0.8.99[sqlite,${PYTHON_USEDEP}] + >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}] + <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}] + ) + mysql? ( + dev-python/mysql-python + >=dev-python/sqlalchemy-0.8.0[${PYTHON_USEDEP}] + <=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}] + >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}] + <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] + ) + postgres? ( + dev-python/psycopg:2 + >=dev-python/sqlalchemy-0.8.0[${PYTHON_USEDEP}] + <=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}] + >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}] + <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}] + ) + >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}] + >=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}] + >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] + >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] + !~dev-python/routes-2.0[${PYTHON_USEDEP}] + >=dev-python/webob-1.2.3[${PYTHON_USEDEP}] + >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] + >=dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}] + !~dev-python/sqlalchemy-migrate-0.9.2[${PYTHON_USEDEP}] + >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}] + >=dev-python/kombu-2.5.0[${PYTHON_USEDEP}] + >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}] + >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}] + dev-python/ordereddict[${PYTHON_USEDEP}] + >=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}] + >=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}] + >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}] + >=dev-python/keystonemiddleware-1.0.0[${PYTHON_USEDEP}] + >=dev-python/WSME-0.6[${PYTHON_USEDEP}] + dev-python/posix_ipc[${PYTHON_USEDEP}] + swift? ( + >=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}] + ) + >=dev-python/oslo-vmware-0.6.0[${PYTHON_USEDEP}] + dev-python/paste[${PYTHON_USEDEP}] + >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}] + <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}] + >=dev-python/python-cinderclient-1.1.0[${PYTHON_USEDEP}] + >=dev-python/python-keystoneclient-0.10.0[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-0.11[${PYTHON_USEDEP}] + >=dev-python/six-1.7.0[${PYTHON_USEDEP}] + >=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}] + >=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}] + >=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}] + >=dev-python/retrying-1.2.2[${PYTHON_USEDEP}] + !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}] + >=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}] + >=dev-python/glance_store-0.1.1[${PYTHON_USEDEP}]" + +PATCHES=( "${FILESDIR}/${PN}-2013.2-sphinx_mapping.patch" ) + +pkg_setup() { + enewgroup glance + enewuser glance -1 -1 /var/lib/glance glance +} + +python_compile_all() { + use doc && "${PYTHON}" setup.py build_sphinx +} + +python_test() { + # https://bugs.launchpad.net/glance/+bug/1251105 + # https://bugs.launchpad.net/glance/+bug/1242501 + nosetests glance/ || die "tests failed under python2.7" +} + +python_install() { + distutils-r1_python_install + + for svc in api registry scrubber; do + newinitd "${FILESDIR}/glance.initd" glance-${svc} + done + + diropts -m 0750 -o glance -g glance + dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber + keepdir /etc/glance + keepdir /var/log/glance + keepdir /var/lib/glance/images + keepdir /var/lib/glance/scrubber + + insinto /etc/glance + insopts -m 0640 -o glance -g glance + doins "etc/glance-api-paste.ini" + doins "etc/glance-api.conf" + doins "etc/glance-cache.conf" + doins "etc/glance-registry-paste.ini" + doins "etc/glance-registry.conf" + doins "etc/glance-scrubber.conf" + doins "etc/logging.cnf.sample" + doins "etc/policy.json" + doins "etc/schema-image.json" +} + +python_install_all() { + use doc && local HTML_DOCS=( doc/build/html/. ) + distutils-r1_python_install_all +} |