removing the old and jankey

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

5 files changed, 20 insertions, 455 deletions

diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog
index a16c5191352c..60ef2c13a30f 100644
--- a/app-admin/glance/ChangeLog
+++ b/app-admin/glance/ChangeLog
@@ -1,6 +1,11 @@
 # 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.79 2015/07/29 23:26:39 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.80 2015/08/05 02:37:16 prometheanfire Exp $
+
+  05 Aug 2015; Matthew Thode <prometheanfire@gentoo.org>
+  -files/2014.2.2-CVE-2015-1881.patch, -glance-2014.2.3.ebuild,
+  -glance-2014.2.9999.ebuild:
+  removing the old and jankey
 
   29 Jul 2015; Matthew Thode <prometheanfire@gentoo.org>
   glance-2015.1.9999.ebuild:
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index e99cad078e09..2cdfcfc44baa 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1,34 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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
-DIST glance-2014.2.3.tar.gz 783651 SHA256 e0c4eda2ec6a38a11129b45f6776dc32a763b1e234f0834d36d108690ce85be4 SHA512 c7e0365fec7553a12b3f326f3f7fe69323bc9c20653aa6a972226ffee48cd54f4850cb3ee591b78f6932c6f2808cc260b7bc336cdb2f0a80852a05bf56dd717a WHIRLPOOL 96d1e7e5fc5061b0b87bfeb5371788d79c860d69ae638d61a616f74e930492b4c6dfe2206d427462cffb4c537f6ba99ac8d4bd81907cebc400084918e8500efa
 DIST glance-2015.1.0.tar.gz 1100719 SHA256 0d8be9f28b1686de3d0d1037498eaaf717d39ad9fa85d2a07016131fff470009 SHA512 04f99eaf1043291eb5622c069d2a15d344d7d508740d7b738fce36e1373ec0df26172077b3bdf9f23cd8234d74a34995e3d66ac120430ff17017fe788eb3e9d6 WHIRLPOOL 862b2d89801f3a750434d50fafd75b8f22d031532910b7f63d6b8ca00546a19fa5a07dea1c286e4f5fea9b11614a4c25750a4b2ca5c429a03984a2972f681b40
 DIST glance-2015.1.1.tar.gz 1102359 SHA256 5c5714264c4ad9c3d178b983899b54f69f138505ddd77e13141dc5f3d1598ebe SHA512 d9233b78174ec0f84b317abf7d26153a7e3ead25b4ebc31acbe5d0806b6877da5875de52ee0742dcbdd5fd3d23cb0240208f6fd57fa59cc403ad228ac85f2a0f WHIRLPOOL 69a4cd27b4ac57a47523ceb4b899bbbb3569e7af2bb8f3e64373d98b7c72450bd587c6da96d33903dcbf44e02f89ea563d116d9d2dc90d4a0f472eca89963a87
-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 6651 SHA256 4cf14769e4c7f50b4efdeda3d4d19ff796777ad86550bf9034c1618aa079c330 SHA512 fe19df1dd7a8c4a22a3a587d2ac3834bead3138d629c180aadaef91d7369c5b7e8e02be84e504e65226faf159b9e4a8c6880b14adefae6cfc564a225ea40eb83 WHIRLPOOL aaa117aa260ed1007a126e4fbe347d52c23b3c624cad73e27831b37c8c5451226266542a346dab087ac383ec57b96eeb852343206795310cb70b25b34226802f
 EBUILD glance-2015.1.1.ebuild 6745 SHA256 261b6bab7c8e5422a4bd8879e6c965fed92f95389aa021d4cdc8c24a6a177984 SHA512 1f1c8c57641afbd5a1c61f0bb59cadf6f7401e02ab088c59cb46295fac55ba1592f687fb7ac3fb7857b30bd191be66a254b4b536009a27bac323cf4e8a34217c WHIRLPOOL 0c937f43320b7b1cf98f452265ec510ad1a6bcb2d9d99ba110c69c1d36f0d8e8decdc9602768af6f47b0e5193e18aec764a3f906f07d08e87af3946f9a996472
 EBUILD glance-2015.1.9999.ebuild 6755 SHA256 d0ea75e3221a6296023a54affc878ffc433bb47edf29d1a9099950cb28267208 SHA512 13bbcda4ab250d81815e320eb9f47b3225a62c77c0f74f969d5b6f75961c9545def6e45774c838f1f9581b479eb99551aa65cc663fe1c62b6ea16c21d92ac650 WHIRLPOOL 2c053d006648d9ff7511e9be00ed75182e23cb99653920d3c08e100c5acc50a2805fe96b2d522f7c731db4cae4411546c05090a1ae858a4de1fe2d294b79edc4
-MISC ChangeLog 14995 SHA256 1c8ce44d3509dc99e74397ccb53b9980affb23c1258cf21955784491619fecfe SHA512 91647d5741fbfbbc6157638636da5141f4c4bea8a4c90b628cd0fb9e37f981c5592d5003685ffc9c4e391403664bb9879f3e0dcce0b94a950d6722899dde62d5 WHIRLPOOL 98e8c05f9dd720cdb4b3a1458e26edf92577d7ad5628bfc1dd7c039ec649da007bbdc924fa8c7d3d1cd138620ea2439120e2065b742d43d2e9b937101ac596fc
+MISC ChangeLog 15177 SHA256 bafe483a76a229fc0871d1fe42837b5ec1cb2640500be46515bc0fdc2008fea7 SHA512 5435ed84455f1f0adbc16eb3d10042992163c9b5847f60d4c04aa92933708965a01b573b2ce3ed1058e7d333e247db1eec8f30f675a0d1005b21fc5d4103977a WHIRLPOOL 7fc94722861301a399626010b664431558dd52e472a39431d2d47f78999b7611fde66fc119181c53c3be486888d3798db7a6fcf098052eae30386c455ae8ad22
 MISC metadata.xml 684 SHA256 1ef788456271f080736aea2b5b997f6bbe69e5682dc1e95c923ce77c5235eb78 SHA512 325e17a5fb4840a87e93fb4947cebeec1788b483a4ef64f615efbef07e17b79ca5dcc8637420dd3e7bf89ea858eea25e47d48bdaf07e0aa77df5b40aeeff7c06 WHIRLPOOL 821b3e8cf042676c408a0d8918b609a34fdc4270f960c14e831475669bfa7c2fc9acc1ef1839ad28749979ebeabb7bf1e0a8b1fa39a139c3fb4a5fbf4ff63bcf
 -----BEGIN PGP SIGNATURE-----
 
-iQIcBAEBCAAGBQJVuWF9AAoJEGSje+quGaToS9UQAIqm61IbAn2EAwsKS3aBeYEX
-ihHVskrtMtxLH1DA9iSeKABGflxpVpZ3w1ZQTqt3U9Wf/x4GRGTcpN8omTZGkzhh
-Bmakh4/m0rNHcjck6qbk9/kOoXlS/Vfeq935SErfAo4bC7OA5GeXDHhgJw2nvzdj
-PSznjPWqX75YNS4SdYEmKGtr6hlVC0CL1zS/Ham/y2ul1EeWu7/zB5eq/zGos2o0
-+9yrbXSP0PzVRTzviCrXt5wkze7NRfrSrIeYKntLRE2kUq0wIFUDf9SUSwIeiDbF
-3yL7nn2jPlO0YUpfEMDsNaItFAv4cu+zoOIfGYIw/kmr29JvsKSsesTdNTmQ1rYo
-FtSPHzGBUqfqZtInArxX0UNtLFHh4Nn8+6CDR4NmkrYiekaRj7aS+ekGsPlz/wYU
-uPo9bDxWLiNoeXkYJ9XmLtghm5/4W/HCAqR8+ktmYOfvkkwxRT723BAwgmjx6Iay
-2luQi3G2SkZmsJKC7ZI5qRR0GUM/lSRWDE/tyqJ/LvYUlcdIA8a5LgWCpwBbWjnH
-oAcUZWoaIk7FN5AOZogxRAuld/Q5Q9Ok3VqFMggRAxKgWdRR6WziIkVzqUnZhFX5
-HAQFU0rgvg4mkF9PopfARMDBUj4F7OLbsS8GMeTeiqpNjeokvFXikIjbYQDfMcrA
-bhyJteDNYGCtDicOUPFv
-=Jw+P
+iQIcBAEBCAAGBQJVwXcyAAoJEGSje+quGaToVDUP/iZcpO5et+SIZjtLjpzd5Dpm
+Iwl1/5d648nSlG+IjfFeRMKBupuP2KlqIUhsTNRFyUiIl6HZyPwj/EZgLx/1gtwr
+eGeaTdLVozFgndax7vgwwTw16Q0NcBs+B32YVEhyo7UVpTDcxXlR/zakT2X+Te2J
+QbmTrgzRTDPYKHtE4/ENhHe2V991C3e7X9aDEm6MoHrAvzAq2aPju8OI0E9uc/GI
+UBNs/8rgvxUkmSMANaDjtj3nOAoD6Z2gA+qxWGhdVoyFUlN3M8FSV5QF/WUcI6cG
+QWXFC3uJ6Q9d/mjAzcpObnZFem7nO+XnHWsgyMviktW2DSztv5w52NYwGHaWBE/H
+/hluW1xLb2a8tvU+KD6OpSKBMDxQN/u+22/YMlnx3LqzqRf7F/Uj1owSzx0BV3lb
+RYTd/3dcTdVW9ZTNqkk9w3Np//0hPJeR9sOcD2Zw7xL7Sbo44lNKwn2Wy1NYqEj0
+zBVuumEcNvJr/YScAjaSb9UAwYHf5JEntTSnXiog9OZ4m55HGqbDdFBBLm5xCogc
+y0EvDNX0revunbtIFsUcZ8OSPw1EXDIdEb65Q4roIVe3AsfQCP4Nzw+9TlaNnkPP
+12RtBgVx7VhPbGqpTUvYLVbljIT5fcVbOkqTqr/1IktDzu3vdqTYiS6APf8yVr7F
+phDO6TyJj/UJTQJp98Wr
+=uGW2
 -----END PGP SIGNATURE-----
diff --git a/app-admin/glance/files/2014.2.2-CVE-2015-1881.patch b/app-admin/glance/files/2014.2.2-CVE-2015-1881.patch
deleted file mode 100644
index f7c40b3c863b..000000000000
--- a/app-admin/glance/files/2014.2.2-CVE-2015-1881.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 25a722e614eacc47e4658f0bca6343fa52f7d03f Mon Sep 17 00:00:00 2001
-From: abhishekkekane <abhishek.kekane@nttdata.com>
-Date: Thu, 12 Feb 2015 04:09:14 -0800
-Subject: [PATCH] Image data remains in backend for deleted image
-
-Trying to delete image created using task api (import-from) image gets
-deleted from the database, but image data remains in the backend. Import
-task does not update the location of the image and it remains None even
-image becomes active. Location entry is not added in the database in
-image_locations table.
-
-Added location information to the image before saving the image in
-the database.
-
-SecurityImpact
-
-Conflicts:
-	glance/common/scripts/image_import/main.py
-
-Change-Id: Ie389de6538a9b98dc51c7d781b81b3ab10b83842
-Closes-Bug: #1420696
-(cherry picked from commit 78b5b0a9575cd5e9c4543ec0e8fd6072af1f0ebb)
----
- glance/common/scripts/image_import/main.py         | 30 +++++++++++-----------
- .../unit/common/scripts/image_import/test_main.py  |  3 ++-
- 2 files changed, 17 insertions(+), 16 deletions(-)
-
-diff --git a/glance/common/scripts/image_import/main.py b/glance/common/scripts/image_import/main.py
-index 24dd52b..72c992e 100644
---- a/glance/common/scripts/image_import/main.py
-+++ b/glance/common/scripts/image_import/main.py
-@@ -84,29 +84,29 @@ def import_image(image_repo, image_factory, task_input, task_id, uri):
-     # NOTE: set image status to saving just before setting data
-     original_image.status = 'saving'
-     image_repo.save(original_image)
--    set_image_data(original_image, uri, None)
--
--    # NOTE: Check if the Image is not deleted after setting the data
--    # before setting it's status to active. We need to set the status
--    # explicitly here using the Image object returned from image_repo .The
--    # Image object returned from create_image method does not have appropriate
--    # factories wrapped around it.
-     image_id = original_image.image_id
-+
-+    # NOTE: Retrieving image from the database because the Image object
-+    # returned from create_image method does not have appropriate factories
-+    # wrapped around it.
-     new_image = image_repo.get(image_id)
--    if new_image.status in ['saving']:
--        new_image.status = 'active'
--        new_image.size = original_image.size
--        new_image.virtual_size = original_image.virtual_size
--        new_image.checksum = original_image.checksum
-+    set_image_data(new_image, uri, None)
-+
-+    # NOTE: Check if the Image is not deleted after setting the data
-+    # before saving the active image. Here if image status is
-+    # saving, then new_image is saved as it contains updated location,
-+    # size, virtual_size and checksum information and the status of
-+    # new_image is already set to active in set_image_data() call.
-+    image = image_repo.get(image_id)
-+    if image.status == 'saving':
-+        image_repo.save(new_image)
-+        return image_id
-     else:
-         msg = _LE("The Image %(image_id)s object being created by this task "
-                   "%(task_id)s, is no longer in valid status for further "
-                   "processing." % {"image_id": new_image.image_id,
-                                    "task_id": task_id})
-         raise exception.Conflict(msg)
--    image_repo.save(new_image)
--
--    return image_id
- 
- 
- def create_image(image_repo, image_factory, image_properties, task_id):
-diff --git a/glance/tests/unit/common/scripts/image_import/test_main.py b/glance/tests/unit/common/scripts/image_import/test_main.py
-index 27f502b..a81a66c 100644
---- a/glance/tests/unit/common/scripts/image_import/test_main.py
-+++ b/glance/tests/unit/common/scripts/image_import/test_main.py
-@@ -56,7 +56,8 @@ class TestImageImport(test_utils.BaseTestCase):
-                     image_id,
-                     image_import_script.import_image(image_repo, image_factory,
-                                                      task_input, None, uri))
--                self.assertEqual('active', image.status)
-+                # Check image is in saving state before image_repo.save called
-+                self.assertEqual('saving', image.status)
-                 self.assertTrue(image_repo.save.called)
-                 mock_set_img_data.assert_called_once_with(image, uri, None)
-                 self.assertTrue(image_repo.get.called)
--- 
-2.0.5
-
diff --git a/app-admin/glance/glance-2014.2.3.ebuild b/app-admin/glance/glance-2014.2.3.ebuild
deleted file mode 100644
index cfed4605b2de..000000000000
--- a/app-admin/glance/glance-2014.2.3.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# 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-2014.2.3.ebuild,v 1.4 2015/05/22 06:08:33 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}/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? (
-			${RDEPEND}
-			>=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/coverage-3.7.2[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		  <dev-python/fixtures-1.0.1[${PYTHON_USEDEP}]
-			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		  <dev-python/mock-1.0.2[${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-2.1.0[${PYTHON_USEDEP}]
-			!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		  <dev-python/testrepository-0.0.21[${PYTHON_USEDEP}]
-		  >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-		  !~dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		  <dev-python/testtools-1.5.1[${PYTHON_USEDEP}]
-			>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
-			<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
-			<dev-python/mysql-python-1.2.4[${PYTHON_USEDEP}]
-			<dev-python/psycopg-2.7[${PYTHON_USEDEP}]
-			>=dev-python/pysendfile-2.0.0[${PYTHON_USEDEP}]
-			<dev-python/qpid-python-0.26.2[${PYTHON_USEDEP}]
-			>=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
-			>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		  <dev-python/oslo-sphinx-2.5.1[${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}]
-	<dev-python/greenlet-0.4.3[${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.15.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.16.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.32.1[${PYTHON_USEDEP}]
-	<dev-python/boto-2.35.0[${PYTHON_USEDEP}]
-	~dev-python/sqlalchemy-migrate-0.9.1[${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/oslo-vmware-0.9.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-db-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-messaging-1.6.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
-}
diff --git a/app-admin/glance/glance-2014.2.9999.ebuild b/app-admin/glance/glance-2014.2.9999.ebuild
deleted file mode 100644
index 6c68bba0385a..000000000000
--- a/app-admin/glance/glance-2014.2.9999.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# 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-2014.2.9999.ebuild,v 1.10 2015/05/22 06:08:33 prometheanfire Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 git-2 user
-
-DESCRIPTION="Provides services for discovering, registering, and retrieving
-virtual machine images"
-HOMEPAGE="https://launchpad.net/glance"
-EGIT_REPO_URI="https://github.com/openstack/glance.git"
-EGIT_BRANCH="stable/juno"
-
-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.8.0[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? (
-			${RDEPEND}
-			>=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/coverage-3.7.2[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		  <dev-python/fixtures-1.0.1[${PYTHON_USEDEP}]
-			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		  <dev-python/mock-1.0.2[${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-2.1.0[${PYTHON_USEDEP}]
-			!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		  <dev-python/testrepository-0.0.21[${PYTHON_USEDEP}]
-		  >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-		  !~dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
-		  <dev-python/testtools-1.5.1[${PYTHON_USEDEP}]
-			>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
-			<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
-			<dev-python/mysql-python-1.2.4[${PYTHON_USEDEP}]
-			<dev-python/psycopg-2.7[${PYTHON_USEDEP}]
-			>=dev-python/pysendfile-2.0.0[${PYTHON_USEDEP}]
-			<dev-python/qpid-python-0.26.2[${PYTHON_USEDEP}]
-			>=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
-			>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-		  <dev-python/oslo-sphinx-2.5.1[${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}]
-	<dev-python/greenlet-0.4.3[${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.15.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.16.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.32.1[${PYTHON_USEDEP}]
-	<dev-python/boto-2.35.0[${PYTHON_USEDEP}]
-	~dev-python/sqlalchemy-migrate-0.9.1[${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/oslo-vmware-0.9.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-db-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oslo-messaging-1.6.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
-}