removing icehose

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

6 files changed, 21 insertions, 515 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/Manifest b/app-admin/glance/Manifest
index f64518072ee6..208f9385fae0 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -2,36 +2,30 @@
 Hash: SHA256
 
 AUX glance-2013.2-sphinx_mapping.patch 582 SHA256 043c3f7ef413cf3675920880af57943b909ec9f3376f6e86a1ae1d5948d9ad98 SHA512 d012ce5eaed00c3ba7b6219813cee503f68cdb14b8e50eedc731afc63767e1867749d6e4824611e0d024b2fdebfe5a2b3ad53b0ad7b18a39defcc17094da4a0f WHIRLPOOL 659bf94e7740be3ea0d2f130b332e694ebdcca8b90acfb479b8502eec4b867eda999ec2c6cdecc1f3dcbe3e3ddf72798c76bdf16ab4ab561ce61975a451c4585
-AUX glance-gbug-474064-grizzly.patch 2377 SHA256 df92ba14455d4379f0c2297f1f087d7f3f08118e6129e45b0e5bf5fd26c7aba1 SHA512 a284b6002c3b4ae39678eb0c492b3adb6311b115761ef43f38427dc08670c0ebfb4011a3879291ee6acdf9480ca135b4cff77f41b7af9fe7a837effafba2c6f0 WHIRLPOOL 8adfcc80adf72b501a7123c29454c446b86c05917cc8a910f799db5c223fc0efb02240f36b842c05c08e8347ae6d6273ddfa088a03f0f65eee0cbfc40176c9c2
 AUX glance.confd 25 SHA256 5a53dcf1eece81a06a2dd0856b15f8abe20eb1072361b110f752e396e86a7843 SHA512 13e671d4544e58d7397c1a87eb1048ed4bb9561587fcd63783e377b2d25e810222ca3944e0c8cf13c524e64f94c435b456a0d6f7cacfb148e275377699a11ca9 WHIRLPOOL 862a310fbdd7b68f132c45797210011b607d9b5c8937d60c9f5933a4d625bc985ad0277fea26804681b7e0a674dc9da15fbef40502c4052d6742ef0a94e88f3d
 AUX glance.initd 651 SHA256 1b2fc0e11d572bfcc121cb995ea7b3cce63ee705a05d2fb34a9f99d655546553 SHA512 c0ed1cac2038dda8882d5ce013b948debf1e5e411a062d8c9cbfdb1e1683c94bfd78a3f3468de63e0cc28930c59c0ff323a3116ce6a74ccf5d8ad1d547805bad WHIRLPOOL b0b25f4e983bf9f46cb9dd5872d14b24dc90e3c383dc458c79d065e0855bbf838afc4a13f0c92db640cd64311e22985d0b92e1ca4d428ce8b1f08ff23b89cecf
-DIST glance-2014.1.2.tar.gz 2117649 SHA256 497ebaf2736cc1f243eba7b17104d7cde08517c7cf70c021fb59768cb710a3bb SHA512 180ebdf6f4bcde4ae4b342c31ea2854eda1c45ae237245162772cb8cf8d300ba860748ff6fdaa87c0d1da60538f077441baab9f084924e578e0da0359758d80e WHIRLPOOL dac7e02a747260d3027de7bd927209303bf24862511c594116ab4861cae30b08fc5a39d2b77ee5ca61249dd465761de56184b5b0da9bea989395d52ec7aa5c84
-DIST glance-2014.1.3.tar.gz 2124337 SHA256 302a135e96c0a8d040957cabbee58a8fb71e8b3e30054641d825e4003070901c SHA512 8d23f7dbadf4368c4c15389b3d3198b9f6ad74d8831dbc50795e4d306ed2b5c3d9a6d9e324ce1555fa66c5063c0855ac96b99302ebc47c0dab67d88d3a109058 WHIRLPOOL 43771d78c3b58e321fb36c004945a22611ebfcd81c10f390112b10c6198bb9c6d99c0b7a82ddd3c463f286fe7860a76afdf7e3a69c0020508d693ccf04eac11f
 DIST glance-2014.2.1.tar.gz 780312 SHA256 8059435c485be487d7b1e73da2f758e9871abf74cddde9b592939f05eb77cb45 SHA512 53797d09672188092d667efed6a914d9ec5a2c014687c2ec61473ec27fb9426391213622e0166c37a969128290c4cb039f07398d5f9906504794f984cc94cf91 WHIRLPOOL 41d05b55d2ac2c9310f0d3583e782c40c5dfecd256bb51219947016f3e71874eb2321c98c3a1fe2fd807b0f312aca0dbaeff8196df4e7ad20ddde662b41be5c9
 DIST glance-2014.2.tar.gz 780616 SHA256 49838163c3ccbe068c1868fe38b0567aa7267fbe3245b010e196de8624a07082 SHA512 782cc6d6e759f98dc5399566264769f5806a50dfa469ac35bbd95f27a33df31837252d4e07b080e442eb53c572d8d8f29332ae6dcbdcc8f7e3e836a06a83841f WHIRLPOOL f1731885c045665ce54dd3b2e39fe994a1e80db8f6b74cdb556899f94632681ae9037471864442a724d7cbb6f4deae100856ce482f112a485ec26fca81b22597
-EBUILD glance-2014.1.2.ebuild 4919 SHA256 f31b2d20bea14911985f43b5a5f0fe928f4bba8e876a44b59d116a100c116935 SHA512 11133e1522cdfd56fcd9f7af35a1270d6f31d07c9a2fc7b698c99ca71aabe551cd675e4247ae3a35d6c1a82f275be02f66d7caea04572338036192b031a5361a WHIRLPOOL 5fdab930a85042eb02b7311db3d01d199990aa5fe8762b9dfbea4390dd29d2f712e78a04aa212bc4afd16888071f8f97e98dee22bdb7f062c84e5b66bd0d8936
-EBUILD glance-2014.1.3.ebuild 4976 SHA256 c78810ffe73aaea1f81aba8b1c640d98596a48c464a500dffc3bb28dc5ae54ee SHA512 f43f930ac52dc99119c4ac84996c80d8d614877ee82734539d779c08c250d0a5091a164e0c893b97f50ba14916ce86fa36a98777c2c705051fd544bc767f329f WHIRLPOOL e57009fee8526c1e2f492dc81de666a261ad35882201d4945e60387e9cf6a582bcfe024acb7b07119a2f46b3cae96f599fa9394a054b5ff942901e6d94652c16
-EBUILD glance-2014.1.9999.ebuild 4986 SHA256 8173f54ab9ddaecf68be50998400700f45e4805f9e6e901395184bc2e63e475b SHA512 3b54a1bc0a46f0af680d64f41ce2bdcf743875ad1645c3b2d61c2f94a9bf111e47d578f1f7d7fb87f3f8e834ae708b9731d36b5bbbab310a044658f8b4ff1529 WHIRLPOOL 4b36bcd9b0bd8752af25209fe13628c8e3fb91133777c5b3064f4e5116a9fa69350a01d9a7bf2d4559abc0daacf12a5c7086dad2e4fb856a39b101d0134fe07d
 EBUILD glance-2014.2.1.ebuild 5889 SHA256 dd72103c508fd217c0df6285d56afa2efb2fc883cb2870a57d9040c090327961 SHA512 c148cf013a748f23d2a33659b7fcca1b634b1aa4a9e8f304209ef5d1a510032fc73c16170f371a3b0148e16fb3648c2f86d2705ba87e514e33c1f4730ad7ca4a WHIRLPOOL e6ae955c6517a89f4b784163e0e96512f623226c12f4b834974a3943ae9276c55f7829abe83c66e903c754acceaf00d500450fcc3ee5bec0f8b0f08c4a5f1d68
 EBUILD glance-2014.2.9999.ebuild 5899 SHA256 ad477d40b1be82df8abe638c68292a4ea17c7fdcef28fea6a6f78ecd603e174a SHA512 a5f14e2869eafc48a471d6404a81e57994b016b08e1de9e5eb3a5717cbdcd61da0ddd18b9a6d2c9d2847bbbffa2e73ef242a9420f0b2a1589d6ad480ab7fb5d8 WHIRLPOOL 5f2d86bb43054374959bc7a905e9489295e26d7476f574cbd3544b759cc493d78d606d19ff21be6a2462adee4877268af95fa8bb3ccecc81471b1ae6fa18c5da
 EBUILD glance-2014.2.ebuild 5834 SHA256 5472da1285996318da79f6421ed03ba5a4b7f742129f55d310973d3abe2053ed SHA512 47ae05e8bde201a026b9030436784489b9ac65293a72d15b5350f7edf6f824f9e13ae362988e3672d4ea90726f69005d631f91108c5aee544e1e32a14ffa0d95 WHIRLPOOL 6dc0acd6016447d81dd72302a8e41ebe139efae17210331138da6637a5d7ee903541218995e485d7809b7f08e3715ab40f2216118f1626af0577a018809a0656
 EBUILD glance-9999.ebuild 4843 SHA256 cb262eac190bee1adb59ccc125809a3633adbd3448f5a15ee567b3c9a9e0b829 SHA512 e4aa1b6862ded7694eda77bf440ad71e6e6d413a7a7786f1dcd90f0084b8fdcf200486fe50cb49cb78936f0e2242e52b8122c84daa82c142836858e52d8137e7 WHIRLPOOL be80f071732df48b517f40015296c6a921afa665fece31c1efb3a12bb7bf89df20b9d113c10fa470c5ddf25da09d2e97377042ff295cdd7db2bb05e5fc04691f
-MISC ChangeLog 10880 SHA256 57c9881b9e7f6c6648157d8ada70055d7fb05506f5fb3cfec59d131c33f0c1e3 SHA512 2956ecf8029cacec77cf292df0ae88871f5b895a7fa5c40346392f93fa293f6318f10f29ca5c1c429038e5aadf6f2b76df303e72be70d0fb58991ca048ecce0d WHIRLPOOL ba46bcb6ecaf7753a66f6b7d1e7bce432c26633bfa34b7232c05924f4d6b19c9adf0430e5a2b41109e426d46eae4f72ca9362fac43293a914d01b37172b6200f
+MISC ChangeLog 11080 SHA256 1fdb72c8503e44b788528da7cab01bfbcbd62078423f5a19bc8a2d08caa52504 SHA512 a51d8d7e0a1c0fcd257c88f8ff554d00fb255278c89b46ffd88a9701f25f6cb930ca945d22e12bf3f62d2f0ea6ff356af8cc7621b46927580b27693ad36c42a6 WHIRLPOOL 8fe6c4a1de3c2ba4dc11ed05cc68c27b0b319557589dad944dbfd2e4e5aa6e7ebe6b50e3c32f626af127fb906b6d32fcd8bc84a1a84bc9f0928ac52712296c73
 MISC metadata.xml 607 SHA256 b74d960c096528dbb7c9be6b0da777e10abe32928459f045e7c58b0156e22d95 SHA512 e38e4dd740fe55d73d6d97fd9ffa3aec5466fbb5f8e6484b125560313245ae697a0dcf612fb065125c6737a8254b6218c0703f7de79437bb2799c6c67f386e45 WHIRLPOOL 445bf712fd733fa90c395cc24fd02155bed15b092713d502b54331da9237f397877c2328adbf4049ee64ae163713ce031ebe5048c8826ed1a011d4ebcdbb681d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUhk6XAAoJECRx6z5ArFrDsjIQANBpLvOzvRSGVL6K3RpSDTN7
-WXMDkdsBeDn2oOYwfTFLTMraU/6IYhevQEzcA7dbOWHNZgpoHQo2l2bFouY+B9nh
-+rLe19MOnfTJDM8H95G0EzEFk4DxAhSPJZ7dvg8K1Yf4HkqOFZlms0lzUrShFME8
-KwHLm2XpsQz5vmbeWi82Jm7j60sq3rpEF3nPhRq+2KyB31q/p2zXbkTOvf8FNR4P
-CivGexqU0sraXzuBeqCSoe4PTiUKZLAwabcAjjR5Kal6t2bQSCGLRfeAT48+Ayl5
-7eiAsKJxvH/pTqDRWzGe1XG8R8sCRtX+RzJGBZJgxR7KvvHaP13sZ7YqnQpIvilz
-pWLhB5/lED6PmdR847ryKr2czRsvMMnHJBv97fs+/2wH7cU/r854b6r8DE2OR9Jo
-Y4p2lbPaqRL855w/ap+Yvuz5+UCMvTe3M6JIPEVvX995git44vyzRuq6vUmay8cM
-nD3ytI8BrV2WXlCqXysKeCtiDLvFoNB7+ydqBDOvYdqbQ3vExhVcUuTJnCeQ/OJj
-OzU4dmKfaNQGr1p/frfruZH6iJJVIacg99bqX/OBoMXoOxff3KawgBS2f2ECYr5O
-9Y7Wu7q1wjX5+JtRr1diN6TJlyP0wsKwyear5fU7mt73nb1BSenOxEUseDoBi+9w
-n8jwPq0GFTdwPdqoNdHb
-=2rc+
+iQIcBAEBCAAGBQJUtI3rAAoJEGSje+quGaTorhEQAMwD4TQ9htj4YIBv64Itiyc+
+LVMtUFT90WHcCqkvEKEfKmTrv18CTBRLyVNnf8gHy+QpsJU8QwWHZyZ24jGv0M/b
+nhGJHl8f41mb0VvFNUW93NGQwPzLdIY5Hvv3dAtm7foFyETAFALGkKk2QItAUeZQ
+DibOZ8WyHnFipamE/OTiBt9dwwPp9d8JFhGrm2eNeUXEKTKmMZy0x2wakCKQHzSY
+BttCT9l0PdkqUr7YeFC5CmIKHw6EAB61asRien3+CwZjUlBw+Rn+mnCP3NncZrGV
+3Qn1lVmRA1JNtT3p6ayh3qSBFi+cjV0alsfpntBEC5y8y7jBPPX5mBdFyaToM68W
+eqSJrxfUfj2J2F3XhWmhkwz2lX9TfEhjnfEhBOWr7mAkGlIJyWo8m0oVEwXX9WB+
+GGu8LhKdi82ZSKKvdb82j0T4SEptZbCMNnmoezZNMBScuoYGA8cxRj0/RvxApm05
+YehdfJq44r+npL5lm1VzWVOkWAjbqVxyB/WAhjkn+5H/61z6wATobwvpTen+T+eP
+TSGJuqsLlPeg58IytliTEyLlhmDQkrakQ9sJjGq3aFjEb6jb478hMFgMPi86/1MM
+2ZwAiS3rTKRVzIioAeREq5iWWoyGcmxz3hAOHLIp3wAX4oZotIbYl/IGkXvVnod4
+0WyKtsKZb9pZNyplGRk/
+=/+4m
 -----END PGP SIGNATURE-----
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
-}