removing icehose

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)

5 files changed, 7 insertions, 495 deletions

diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog
index 94a24d119d3f..87087aa41cfc 100644
--- a/app-admin/glance/ChangeLog
+++ b/app-admin/glance/ChangeLog
@@ -1,6 +1,11 @@
 # 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.54 2014/12/09 01:20:13 prometheanfire Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.55 2015/01/13 03:15:47 prometheanfire Exp $
+
+  13 Jan 2015; Matthew Thode <prometheanfire@gentoo.org>
+  -files/glance-gbug-474064-grizzly.patch, -glance-2014.1.2.ebuild,
+  -glance-2014.1.3.ebuild, -glance-2014.1.9999.ebuild:
+  removing icehose
 
 *glance-2014.2.1 (09 Dec 2014)
 
diff --git a/app-admin/glance/files/glance-gbug-474064-grizzly.patch b/app-admin/glance/files/glance-gbug-474064-grizzly.patch
deleted file mode 100644
index b8f3d0a346c1..000000000000
--- a/app-admin/glance/files/glance-gbug-474064-grizzly.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 28d0350070c6120a83287f0846c59f50814bc37a Mon Sep 17 00:00:00 2001
-From: "Mark J. Washenberger" <mark.washenberger@markwash.net>
-Date: Wed, 26 Jun 2013 15:41:25 -0700
-Subject: [PATCH] Don't rely on prog.Name for paste app
-
-Relying on the name of the program breaks packagers who need to move
-glance executables around to other locations on the file system.
-
-Fixes bug 1194987
-
-Change-Id: I7721c5181b17b1f34adc279c055dfff5d17b57e5
----
- bin/glance-api.py       | 2 +-
- bin/glance-registry.py  | 3 ++-
- glance/common/config.py | 5 +----
- 3 files changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/bin/glance-api b/bin/glance-api
-index a82261e..5244b84 100755
---- a/bin/glance-api
-+++ b/bin/glance-api
-@@ -61,7 +61,7 @@ if __name__ == '__main__':
-         glance.store.verify_default_store()
- 
-         server = wsgi.Server()
--        server.start(config.load_paste_app(), default_port=9292)
-+        server.start(config.load_paste_app('glance-api'), default_port=9292)
-         server.wait()
-     except exception.WorkerCreationFailure as e:
-         fail(2, e)
-diff --git a/bin/glance-registry b/bin/glance-registry
-index 678bcd1..39bc3ee 100755
---- a/bin/glance-registry
-+++ b/bin/glance-registry
-@@ -51,7 +51,8 @@ if __name__ == '__main__':
-         log.setup('glance')
- 
-         server = wsgi.Server()
--        server.start(config.load_paste_app(), default_port=9191)
-+        server.start(config.load_paste_app('glance-registry'),
-+                     default_port=9191)
-         server.wait()
-     except RuntimeError as e:
-         sys.exit("ERROR: %s" % e)
-diff --git a/glance/common/config.py b/glance/common/config.py
-index 45cea5d..cd4feba 100644
---- a/glance/common/config.py
-+++ b/glance/common/config.py
-@@ -183,7 +183,7 @@ def _get_deployment_config_file():
-     return os.path.abspath(path)
- 
- 
--def load_paste_app(app_name=None):
-+def load_paste_app(app_name):
-     """
-     Builds and returns a WSGI app from a paste config file.
- 
-@@ -195,9 +195,6 @@ def load_paste_app(app_name=None):
-     :raises RuntimeError when config file cannot be located or application
-             cannot be loaded from config file
-     """
--    if app_name is None:
--        app_name = CONF.prog
--
-     # append the deployment flavor to the application name,
-     # in order to identify the appropriate paste pipeline
-     app_name += _get_deployment_flavor()
--- 
-1.8.1.5
-
diff --git a/app-admin/glance/glance-2014.1.2.ebuild b/app-admin/glance/glance-2014.1.2.ebuild
deleted file mode 100644
index db48778b1624..000000000000
--- a/app-admin/glance/glance-2014.1.2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# 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.1.2.ebuild,v 1.1 2014/08/21 20:40:15 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}/icehouse/${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.6.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[${PYTHON_USEDEP}]
-				>=dev-python/requests-1.1[${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/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[${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.0[sqlite,${PYTHON_USEDEP}]
-			!~dev-python/sqlalchemy-0.9.5[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.9.5[${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.9.5[${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-		)
-		>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
-		>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-		>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-		>=dev-python/boto-2.12.0[${PYTHON_USEDEP}]
-		!~dev-python/boto-2.13.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
-		>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.2.1[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-0.14[${PYTHON_USEDEP}]
-		swift? (
-			>=dev-python/python-swiftclient-1.6[${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.0.6[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-0.11[${PYTHON_USEDEP}]
-		>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-		>=dev-python/oslo-messaging-1.3.0[${PYTHON_USEDEP}]
-		dev-python/oslo-vmware[${PYTHON_USEDEP}] "
-
-PATCHES=( "${FILESDIR}/${PN}-2013.2-sphinx_mapping.patch" )
-PATCHES=( "${FILESDIR}/2014.1.2-CVE-2014-5356.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
-}
diff --git a/app-admin/glance/glance-2014.1.3.ebuild b/app-admin/glance/glance-2014.1.3.ebuild
deleted file mode 100644
index 77c5d695d119..000000000000
--- a/app-admin/glance/glance-2014.1.3.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# 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.1.3.ebuild,v 1.1 2014/10/11 22:25:23 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}/icehouse/${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.6.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.1.9999[${PYTHON_USEDEP}]
-				>=dev-python/requests-1.1[${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/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[${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.0[sqlite,${PYTHON_USEDEP}]
-			!~dev-python/sqlalchemy-0.9.5[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.9.5[${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.9.5[${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-		)
-		>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.13.0[${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.12.0[${PYTHON_USEDEP}]
-		!~dev-python/boto-2.13.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-migrate-0.9.2[${PYTHON_USEDEP}]
-		>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.2.1[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-0.14[${PYTHON_USEDEP}]
-		swift? (
-			>=dev-python/python-swiftclient-1.6[${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.0.6[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-0.11[${PYTHON_USEDEP}]
-		>=dev-python/six-1.6.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-messaging-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-vmware-0.2[${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
-}
diff --git a/app-admin/glance/glance-2014.1.9999.ebuild b/app-admin/glance/glance-2014.1.9999.ebuild
deleted file mode 100644
index 801970a61487..000000000000
--- a/app-admin/glance/glance-2014.1.9999.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# 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.1.9999.ebuild,v 1.5 2014/10/11 22:25:23 prometheanfire Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit git-2 distutils-r1 user
-
-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"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc mysql postgres +sqlite +swift test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.6.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.1.9999[${PYTHON_USEDEP}]
-				>=dev-python/requests-1.1[${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/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[${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.0[sqlite,${PYTHON_USEDEP}]
-			!~dev-python/sqlalchemy-0.9.5[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.9.5[${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.9.5[${PYTHON_USEDEP}]
-			<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-		)
-		>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.13.0[${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.12.0[${PYTHON_USEDEP}]
-		!~dev-python/boto-2.13.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-migrate-0.9.2[${PYTHON_USEDEP}]
-		>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.2.1[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-0.14[${PYTHON_USEDEP}]
-		swift? (
-			>=dev-python/python-swiftclient-1.6[${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.0.6[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-0.11[${PYTHON_USEDEP}]
-		>=dev-python/six-1.6.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-messaging-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-vmware-0.2[${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
-}