bumping for CVE-2015-3289

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x33ED3FD25AFC78BA

4 files changed, 259 insertions, 8 deletions

diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog
index 97afddab77a3..0c1dafec1c7e 100644
--- a/app-admin/glance/ChangeLog
+++ b/app-admin/glance/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/glance
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.72 2015/07/18 11:52:59 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.73 2015/07/29 03:27:30 prometheanfire Exp $
+
+*glance-2015.1.0-r1 (29 Jul 2015)
+
+  29 Jul 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +files/CVE-2015-3289_2015.1.0.patch, +glance-2015.1.0-r1.ebuild:
+  bumping for CVE-2015-3289
 
   18 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> glance-2015.1.0.ebuild:
   amd64 stable wrt bug #554284
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index db3bbea95c65..e1332d67b900 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX 2014.2.2-CVE-2015-1881.patch 4298 SHA256 f0f2d7c1f3014781158f3f238226f1dc25cce61e23e689078a5378c6f726ee59 SHA512 6def2047c1e44b601338cdb9f84dc43e21d26a821214ee0b5f99bc820d21d6ebf235d34fac2a0e3628f3fd2bea7b12b5cd5c66065d290ecb10eb6e57d6269a8e WHIRLPOOL 2e874def7b33cd9254922df5e4501dec4d3d889f43b9b6cc93898767273661cc7d271b387df8203cbe495681e1f7a943ccd5752fb9964364d05fc166f4d5cd5b
+AUX CVE-2015-3289_2015.1.0.patch 2085 SHA256 fa07fb892700c6fbd69358a5a7e58237645bd6f0bf36ad64bcaacdea3e338337 SHA512 a39c0ab605c6b4b7443994eb803064f7dc1d722c6e5f7d8ff8185c747c6651b4feb6a1689892e2ab884fab43229220526aa136186689cb6475f3338607abbdd2 WHIRLPOOL 40939353b84736d9621e4b53a7fd0c5bbff8f93e55768037973e277c794f655dd0186d08c54cf5ddf98a625200e67be164338354586b3ffaef3ecdf8d7f6f7a6
 AUX glance-2013.2-sphinx_mapping.patch 582 SHA256 043c3f7ef413cf3675920880af57943b909ec9f3376f6e86a1ae1d5948d9ad98 SHA512 d012ce5eaed00c3ba7b6219813cee503f68cdb14b8e50eedc731afc63767e1867749d6e4824611e0d024b2fdebfe5a2b3ad53b0ad7b18a39defcc17094da4a0f WHIRLPOOL 659bf94e7740be3ea0d2f130b332e694ebdcca8b90acfb479b8502eec4b867eda999ec2c6cdecc1f3dcbe3e3ddf72798c76bdf16ab4ab561ce61975a451c4585
 AUX glance.confd 25 SHA256 5a53dcf1eece81a06a2dd0856b15f8abe20eb1072361b110f752e396e86a7843 SHA512 13e671d4544e58d7397c1a87eb1048ed4bb9561587fcd63783e377b2d25e810222ca3944e0c8cf13c524e64f94c435b456a0d6f7cacfb148e275377699a11ca9 WHIRLPOOL 862a310fbdd7b68f132c45797210011b607d9b5c8937d60c9f5933a4d625bc985ad0277fea26804681b7e0a674dc9da15fbef40502c4052d6742ef0a94e88f3d
 AUX glance.initd 651 SHA256 1b2fc0e11d572bfcc121cb995ea7b3cce63ee705a05d2fb34a9f99d655546553 SHA512 c0ed1cac2038dda8882d5ce013b948debf1e5e411a062d8c9cbfdb1e1683c94bfd78a3f3468de63e0cc28930c59c0ff323a3116ce6a74ccf5d8ad1d547805bad WHIRLPOOL b0b25f4e983bf9f46cb9dd5872d14b24dc90e3c383dc458c79d065e0855bbf838afc4a13f0c92db640cd64311e22985d0b92e1ca4d428ce8b1f08ff23b89cecf
@@ -9,16 +10,24 @@ DIST glance-2014.2.3.tar.gz 783651 SHA256 e0c4eda2ec6a38a11129b45f6776dc32a763b1
 DIST glance-2015.1.0.tar.gz 1100719 SHA256 0d8be9f28b1686de3d0d1037498eaaf717d39ad9fa85d2a07016131fff470009 SHA512 04f99eaf1043291eb5622c069d2a15d344d7d508740d7b738fce36e1373ec0df26172077b3bdf9f23cd8234d74a34995e3d66ac120430ff17017fe788eb3e9d6 WHIRLPOOL 862b2d89801f3a750434d50fafd75b8f22d031532910b7f63d6b8ca00546a19fa5a07dea1c286e4f5fea9b11614a4c25750a4b2ca5c429a03984a2972f681b40
 EBUILD glance-2014.2.3.ebuild 6039 SHA256 f24748da45ad30a8ae2476580de57211a6cfd3b3ec61131747db520d985eacec SHA512 a3a0331cd798bebdd268084700569823d1c15e7128a5ba3f512b642fe8f95c6abc553aaaf65a4dfe3b160109b09dd8c0ce1673a3992691600a2f2706530befa0 WHIRLPOOL b598821a118da0159ec0c5b8644e71d609902b1725011c9024412d7f20e5257639992f6641dd3440f645777749c53bc1bd8076abd791140d1cbc3e30750e3973
 EBUILD glance-2014.2.9999.ebuild 6050 SHA256 4d635412e9e750e9746d976b2ae7f678b4ec364a9485a54d461faefc3255b297 SHA512 cfa163e1ab038507021c72d73a3a9a6fae11a54cf1d52799b3696fd437848b83a934f1760efb2a1143484fa53c295818648b5a664a471bd546eb5be2ffda3577 WHIRLPOOL 6149a9f2070d9ad8d82f7044ee1e5b7c5456a707ff279cb1cb50da39aed4eb6c3a3b2a6fb56797bdf03baf28ef335fb15352c76f6194c369101e45a005976217
+EBUILD glance-2015.1.0-r1.ebuild 6660 SHA256 3dc868b7ca4cba8970c89ce43f2873a4aced97c16f0f4c1cb315e1c1e3a84123 SHA512 5708c8f7979ce400e3d5ad24a0d6826a3c62e1121e8587fb68e709c78042ff9367a9cb39483590b2e8db4a76949c3844fcd81992e1de80b5b764246281ffdb6c WHIRLPOOL 0e356f6d47ab0070057fb8643c41c7842f645a5474e907058f55529721c963378bfd0cc3d3fb3f8c0fa8ecd71b95f58af97d1e73f395c30e103d3c4931c85916
 EBUILD glance-2015.1.0.ebuild 6605 SHA256 1e38c968710da05f5abba509e8187a9b118cbb49c8f2c94b23ada3a743436467 SHA512 f2f25a4aef8599d1f20e5e4cf489ed84d56877fba34a9b765c31e5605da9858ef311eda63d770171196e398b3ff790e435ef400c0eed119a2ea29304fc3547c8 WHIRLPOOL d556c673e917c965bdf1d7fe9a3a9f174175bd3a45d4eccb44cd45b75efba63c38fb0f32d9c14fe83a16ba75eaa519a9d2763508131cf1ba6c3c1699d946b0ca
 EBUILD glance-2015.1.9999.ebuild 6623 SHA256 6a1a2199bd94ed97dab93cbe4043bad04e2cb6d5f9e4b7175641b8bbddb053c3 SHA512 28311194982c85dd14f2ebc4a90c53dd1fc2840c061439e7bded0eba1ccad66c449a1838d52adc481714be282f3b6b66954b3131e263e4a4c97c976a4223a420 WHIRLPOOL df1d27ec0579fc20773f3bdd223fb3efbf4a78af5f1395db983775c0fed668670fa8276ba98fbcac9ac530f98d11898683e0eebda315e03427a4196d92cba6b9
-MISC ChangeLog 14118 SHA256 126a9f90fa8c5767cb721536adaf46b6d627abd29d6927f898d6dff3d6e923c3 SHA512 1c638614eb227eedbb672bac48d0765715e611415116a6ebbb3df439a4ef812274e6f0bf0ad3310cf8fd485b5917943e0308b589264d4601b809756b49da0f04 WHIRLPOOL 7c914a10a2aed06d3b3ce44232f857e769febaca59c659dd8da3a71e4103e7c8099ff509e5a643832156b791c0ac5e16d6b2ae573c28d17717ab79dea4ca6f55
+MISC ChangeLog 14313 SHA256 047ea10da3a893b626a9358464b724eb4c7b1a62718d679c13f141e332f7827c SHA512 077d3ac643cb876012465c079e2657e9c7a6709bbb617753429293baf6e7fae19846565bfa72ae77a15d6d8a807b52cbc1d1c0ec2d91f5acc3a7fb7bdce09e37 WHIRLPOOL 10ca8c7d1a190b4f10259f372aa8adcc7f284ffe61ef3ae97a1136a7f0c0129faef0316ecc6bc32e08d613b6307f52f85c444fc545f66ccbac6dfe50a0b17010
 MISC metadata.xml 684 SHA256 1ef788456271f080736aea2b5b997f6bbe69e5682dc1e95c923ce77c5235eb78 SHA512 325e17a5fb4840a87e93fb4947cebeec1788b483a4ef64f615efbef07e17b79ca5dcc8637420dd3e7bf89ea858eea25e47d48bdaf07e0aa77df5b40aeeff7c06 WHIRLPOOL 821b3e8cf042676c408a0d8918b609a34fdc4270f960c14e831475669bfa7c2fc9acc1ef1839ad28749979ebeabb7bf1e0a8b1fa39a139c3fb4a5fbf4ff63bcf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
 
-iJwEAQEIAAYFAlWqPZIACgkQG9wOWsQutdYdQgP+Jq0TIp6Pnzd4g7miiDeRuT1P
-LgGt015vvROs1AqXa/H6hLK/6YfEerVrR38q7o6qSyHCkjBkl+oG4UIy+1ecc2rr
-ze0FZKTXlYGt3FGCb5gYYb8Uqu9tP1dwMDyt1g9Wj0GbzPsSPjWnYYRLuRtFR66r
-80Gwb6CPMqINCib8u7M=
-=ytu2
+iQIcBAEBCAAGBQJVuEhuAAoJEGSje+quGaToDcQQAI4JmejoPWFNsrXG++WmV4MM
+HEOLcChFeP9mV3ma9P+vOcrs5/wq1MwsUMl/7zgvMdQ2NQo8hNZD3JMA9Lk1uuvF
+VQrWMZ3vJ9d1pfm3ObzJ8v92XLEVY4xyvXhO/yw7zLcvjySPei3Sh0aRgjNwVMw1
+jQMn/KM17UBxsXBY6gasOPmU6b28UXjSIZreopb61CFlQzFfPOmXMRydIf4eeLLG
+wiLrwhRMRi6HxlfSwvxjocbP0zSUPRQFmvUd96zKX8i4g3gBOgTQzfYvCiQuQNeh
+RPOQpFFGXm+B/DlSqqkMzTSlpKkXvzDTNW6FIwb/YFwUTEg7vsZztEUNgYSMjLj4
+UMOSIX09bEHjURGoKb8XAKgrQKtgSam4W955TvJMVLUMRRd2W8c0x0kKsxOxILpu
+VlvDLidcHA/MgDBLXWRPO6dw9PdLiywlEIW+CZxGW+QC3Cg2ldfbCVUGpw/Xjeap
+5RcsMO73FBFc4owxC7LrtGicM1qux1LcCEXxqqdRDW1K6H1/vSsN4YWKoIS0Uq7W
+B2X5p7EGu9ojGus35nsbnzm5b1nzIrdmyg2PEaszqik2fYMAkeRqovXm8FP6jk4U
+RdEAhbBhzho/hJ8MdQu5VtTPhe0ZngtsKi68fL50nNSgfPW8XTDqJAcck455gPil
+Umrg62v24YZyWEbRhPfq
+=Vr3l
 -----END PGP SIGNATURE-----
diff --git a/app-admin/glance/files/CVE-2015-3289_2015.1.0.patch b/app-admin/glance/files/CVE-2015-3289_2015.1.0.patch
new file mode 100644
index 000000000000..5b697741e408
--- /dev/null
+++ b/app-admin/glance/files/CVE-2015-3289_2015.1.0.patch
@@ -0,0 +1,50 @@
+From 88f92eb11d556bf43e2800a05973ad2da0db0195 Mon Sep 17 00:00:00 2001
+From: Flavio Percoco <flaper87@gmail.com>
+Date: Fri, 8 May 2015 11:44:14 +0200
+Subject: [PATCH] Save image data after setting the data
+
+The image's locations are missing when image's are imported using tasks
+because the ImportToStore task is not saving the image metadata after
+the import. This patch fixes that.
+
+Change-Id: I43dec450d5fc4bee2131d78dbe3c2b2373c3f739
+Closes-bug: #1453068
+(cherry picked from commit 4efb56aae9288952bdb0d368a7c307e8524b80d8)
+---
+ glance/async/flows/base_import.py            | 4 ++++
+ glance/tests/unit/async/flows/test_import.py | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/glance/async/flows/base_import.py b/glance/async/flows/base_import.py
+index 487247c..7656bde 100644
+--- a/glance/async/flows/base_import.py
++++ b/glance/async/flows/base_import.py
+@@ -283,6 +283,10 @@ class _ImportToStore(task.Task):
+ 
+         image_import.set_image_data(image, file_path or self.uri, None)
+ 
++        # NOTE(flaper87): We need to save the image again after the locations
++        # have been set in the image.
++        self.image_repo.save(image)
++
+ 
+ class _SaveImage(task.Task):
+ 
+diff --git a/glance/tests/unit/async/flows/test_import.py b/glance/tests/unit/async/flows/test_import.py
+index 0f355bc..7acd599 100644
+--- a/glance/tests/unit/async/flows/test_import.py
++++ b/glance/tests/unit/async/flows/test_import.py
+@@ -112,6 +112,10 @@ class TestImportTask(test_utils.BaseTestCase):
+                                           "%s.tasks_import" % image_path)
+             self.assertFalse(os.path.exists(tmp_image_path))
+             self.assertTrue(os.path.exists(image_path))
++            self.assertEqual(1, len(list(self.image.locations)))
++            self.assertEqual("file://%s/%s" % (self.test_dir,
++                                               self.image.image_id),
++                             self.image.locations[0]['url'])
+ 
+     def test_import_flow_missing_work_dir(self):
+         self.config(engine_mode='serial', group='taskflow_executor')
+-- 
+2.3.6
+
diff --git a/app-admin/glance/glance-2015.1.0-r1.ebuild b/app-admin/glance/glance-2015.1.0-r1.ebuild
new file mode 100644
index 000000000000..6f73e339fcaa
--- /dev/null
+++ b/app-admin/glance/glance-2015.1.0-r1.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2015.1.0-r1.ebuild,v 1.1 2015/07/29 03:27:30 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 user
+
+DESCRIPTION="Provides services for discovering, registering, and retrieving
+virtual machine images"
+HOMEPAGE="https://launchpad.net/glance"
+SRC_URI="http://launchpad.net/${PN}/kilo/${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? (
+			${RDEPEND}
+			>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
+			<dev-python/hacking-0.11[${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/sphinx-1.1.2[${PYTHON_USEDEP}]
+			!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+			<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+			>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+			!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+			>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+			!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+			>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
+			<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+			<dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
+			dev-python/mysql-python[${PYTHON_USEDEP}]
+			dev-python/psycopg[${PYTHON_USEDEP}]
+			~dev-python/pysendfile-2.0.1[${PYTHON_USEDEP}]
+			dev-python/qpid-python[${PYTHON_USEDEP}]
+			>=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
+			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+			<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
+			>=dev-python/elasticsearch-py-1.3.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.9.7[sqlite,${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		dev-python/mysql-python
+		>=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.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.17.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/sqlalchemy-migrate-0.9.5[${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.9.3[${PYTHON_USEDEP}]
+	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/taskflow-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/keystonemiddleware-1.6.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/python-swiftclient-2.5.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/oslo-vmware-0.11.1[${PYTHON_USEDEP}]
+	<dev-python/oslo-vmware-0.12.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-keystoneclient-1.1.0[${PYTHON_USEDEP}]
+	<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.11[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-0.3.1[${PYTHON_USEDEP}]
+	<dev-python/oslo-policy-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-serialization-1.5.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.3.0[${PYTHON_USEDEP}]
+	<dev-python/glance_store-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/CVE-2015-3289_2015.1.0.patch"
+)
+
+pkg_setup() {
+	enewgroup glance
+	enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+	sed -i '/xattr/d' test-requirements.txt || die
+	sed -i '/pysendfile/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+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
+	testr init
+	testr run --parallel || die "failed testsuite 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/*.ini
+	doins etc/*.conf
+	doins etc/*.sample
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}