removing the old badness fixes bug 512296 CVE-2014-2573

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

5 files changed, 20 insertions, 398 deletions

diff --git a/sys-cluster/nova/ChangeLog b/sys-cluster/nova/ChangeLog
index 2fde51567564..34298843f9ca 100644
--- a/sys-cluster/nova/ChangeLog
+++ b/sys-cluster/nova/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/nova
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.65 2014/06/09 04:56:40 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.66 2014/06/15 04:31:28 prometheanfire Exp $
+
+  15 Jun 2014; Matthew Thode <prometheanfire@gentoo.org>
+  -files/CVE-2014-0167-2013.2.3.patch, -nova-2013.2.3-r1.ebuild,
+  -nova-2013.2.9999.ebuild:
+  removing the old badness fixes bug 512296 CVE-2014-2573
 
   09 Jun 2014; Matthew Thode <prometheanfire@gentoo.org>
   +files/2014.1-CVE-2014-2573-1.patch, +files/2014.1-CVE-2014-2573-2.patch,
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index b5cc96299d03..5a36292006c1 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -3,35 +3,31 @@ Hash: SHA256
 
 AUX 2014.1-CVE-2014-2573-1.patch 4668 SHA256 7e6c29d435595182b080228208c0d0a574fcf05d9935efec355e55c50ea84010 SHA512 86c7b98fd07cf36e201d9ed0e19df856a83093f80a8b3dd9d17b87d357913c9271c8d8afdd3d608a5576173b2e3e5f1f0893ec0fd3dfdb095d506187ae2284af WHIRLPOOL 007dccb766f223c3cbf2fd31c7ca2c3809c9d2549147178c1f3a67e8617e2fcaf942842c39b980038030d954163cee0e89b96b1e65e82d32d5cd22ce2bdbb5ec
 AUX 2014.1-CVE-2014-2573-2.patch 8266 SHA256 9591831ffe6aac669d946ca7e414af4e468aadc948165c3d766a82db910d9766 SHA512 7eac6631468d46d6ff36d3701fe1eab66620b916ca6be3a16cab63f2e63325c3d1920979a6a3dbc95e9f6e88a5c026752bb30b5c6ec6d5282d33ed0b6e634b0c WHIRLPOOL e1e9cec4022d42337f7da11b475ade10a19883fbba2c997e4644c7e2e0c839c80a5e6684b04053a18ef738e574330f3bd48421700c11c6badb52cacf1b2a80eb
-AUX CVE-2014-0167-2013.2.3.patch 5832 SHA256 b6ec01d6ea62424b0340c7004cef69b0bfeb22b667169776d9ded53435b01a99 SHA512 aa913a9eb482bd2f5d401ac76749543b51772fdd3ce9fec35026cabbedbf2846122df70383221e6dfa5e829f1d2f173ebc1aaf760c8adfc0b1ceac8e98a3f5f7 WHIRLPOOL 8f53c518ce1bfa91afc4bc2f715469a8b5573fb23298d1e9ae4b8f9f0d8086ece227bee6132da976ca2a04379e6fc5706e2db6f54f3edf97a404b5fb6d849e98
 AUX nova-confd 101 SHA256 d9013141618d1e8b8ba85297155747d9c8fc362238de7bba3108b9a2539c8c73 SHA512 4c7ec1d123f2cdaf394d1f4824df861bbe309b0b329db44080160d81746cd0fc9d4cc1b35da0f66ab075f1d4e835ababfb7bccaf4a2e931e60f2c0ac572a552e WHIRLPOOL 6a237357a3905d29a96b32c37f6d189e4f5cefc0986bb091e24a79295191332143741c604c2a9fd44484c75b3be89742a5570862cf0cd4ba225425f7f32b5348
 AUX nova-initd 1496 SHA256 5b5f928335ac345103492555c3bc57407f547915b099762d0087aef172e5edf8 SHA512 cca06baba484d505f3a96643d836204a08e9dde50197531cdab2d95188b992a95a375a386b9c54fcc8e0a4f6167babba975db7510db1087f044afa39effe4eec WHIRLPOOL 4c667a5cc469826063a65879c1beddc98371edf295a273c9b8f679627cabfe2260d8b3bbdf9550d3894fc1525d63b9f98d6e939406f90ac5f2f745daa59311c2
 AUX nova-sudoers 78 SHA256 9e88c2843fb74cc46802c0b103067ad12915ec50335d05e546a5dba76acb4a76 SHA512 22c0606c6335b2d1a03bd18a319a54f16f76f091b2e8416dbba05ce7c15890beff7f32f0322eb5ba3f2a5c750436cacbe0cee189b390b878e3f0c0df219ef984 WHIRLPOOL bc42ae1d12e9f900b263fd5c3d0f59062f46fbec1ff97c0bceb234082bea5943eb64795b4f5e102b8e2749c6868163e5924467088cad42df09345e3406e5f83c
 AUX nova.initd 627 SHA256 74417e422e6c503ae338bb981934b54a5da57e783bdfed778de6ce9fec3617b8 SHA512 163d5d94f6ce7c67413b9e90161590651329c96e1c8df480d1c983294f43bd596ef75ebe818cd1a8f1557babfd6bbd02a7deaf597d936acfe882dc3c9c5a1f42 WHIRLPOOL b51a0316513d06083f2cfa572427926c14663ab984bcd26a9521bf88699bfefd745e7ff91e9330bae86bd769d809837e010caa948cd133fbd010e820b7ab8448
 AUX nova.sudoersd 78 SHA256 9e88c2843fb74cc46802c0b103067ad12915ec50335d05e546a5dba76acb4a76 SHA512 22c0606c6335b2d1a03bd18a319a54f16f76f091b2e8416dbba05ce7c15890beff7f32f0322eb5ba3f2a5c750436cacbe0cee189b390b878e3f0c0df219ef984 WHIRLPOOL bc42ae1d12e9f900b263fd5c3d0f59062f46fbec1ff97c0bceb234082bea5943eb64795b4f5e102b8e2749c6868163e5924467088cad42df09345e3406e5f83c
-DIST nova-2013.2.3.tar.gz 6888463 SHA256 02902cb65b5adb0419c69cdb03ea2a0cfdfe8f7df342be44f3760d66cdecb61e SHA512 fd525e6f3f13e9405d4e53faaf44e88a3a4afe8491d9241edb6b66b61b9d8ec279dd0aead70ee5e6d166caf6879927fc01e57230d1129a7b2e2a794e32054570 WHIRLPOOL d4551136683595fd5ab831d692ab90a1aea177df4266341399726923ce285b6b7852705c89a516c146f88903d9a7fc4b3879419f158a68581144453f0fa36e8b
 DIST nova-2014.1.tar.gz 7951303 SHA256 c8fc0e03a826b2b659c77e24737b267588f2c71e3bea9527c71e55a2c76a54d9 SHA512 0893d1ebbf91798cc737e8df97dd2d44fffe4a6163c99f5e63d0f3f6a9ba1c3d1c9ef38e217b74e8da62dd8d5cd91f3be32da2ec062c642d192e32fd96cdf650 WHIRLPOOL c5fcc88912e5eb21aaa9908759324dd37c3670e37edca8562ba1301431fdf8cc40699152fe3ee3a48a495922f4b11846a804ee990d13d3d037726aa520cc0af0
-EBUILD nova-2013.2.3-r1.ebuild 4544 SHA256 9c53e240ac79e2c77280b82d8146d8b371e6337ca627a6c4be38013718aa5bc8 SHA512 8ddbf49a5b71dae694be8b20e498adc64d85b415470dbb1218c835bb6cb41214b693e56bc4179dd4e68788dc45edb9f17b0372265c0251215386c651d775eaa5 WHIRLPOOL 63d8d1048410b08ef2e184357ba60a5cdf5be6a3be48c86b40940328a65741aad5686f5860d33b26088922c74bf3a0513962675aabc09ad8d0f041816353e13b
-EBUILD nova-2013.2.9999.ebuild 4518 SHA256 2967d09f391e940b6b7a698e84d769aa953c33138df8189fe901aabb8b1b151c SHA512 c92ce4b2f77d119a98d4634228a600bb93c902cb34dd2895377c70957f0f451128fc1079e451235ef6439358476377a0cb863a012e1a265995b57f174e866e66 WHIRLPOOL 0da414d998486d523f84f74b461e5f31dd5123b2dfe3fe5f3337e40b6dcdc78daade0d9af29d097e6ba38f671110e5f52f4bdd0635e4449f209cddf73c27b388
 EBUILD nova-2014.1-r2.ebuild 4922 SHA256 b78cdb1ad3b1f552cf790ef0a3432098fbd181484d4320bb2bb422af9cea7575 SHA512 a9999002f16777c14d3c7c7cdc0d18276547537ba894b7f1b4b2e9de08f25e08166b6ef9c044798b1be334a4d19dbdf08536f016fb10527f738904b1ede696a7 WHIRLPOOL 27243120224dcd2c9ab230409db46dac334cf7d2bc4f90c757cf14a73509b363c0c2d9776f8d54dc1fce6c8ce9b890935b2b53191d05a2ff380e050d97ba253a
 EBUILD nova-2014.1.9999.ebuild 4834 SHA256 933e3316d7ee8b1ba7383e79c22a5cb0c21a2706f872afd8ef43edfdbe7ef1d6 SHA512 513c5a2b7d27899195d96c591f1395ff9b1ae1ecb98c55a148d4a096d705a14c0bdb93d5d8ee2963b30e711e9f3abc510bac20ef324fb79c7f1b27c3d1818652 WHIRLPOOL 884c4336348713698dd7da564ff3c05c3915c1bd5b057887614e6e274bf2b39f62a51218ba045b1ee836f742f4c4d0b10493a7cc2f9302271557d65dcb895a3e
 EBUILD nova-9999.ebuild 5225 SHA256 8336956c0a15fd17e15f748c6445c3b144f2a9047dd8257ba3dda7a7b7f1ad01 SHA512 6d961e646096eb4df5814d31b06352f999291becefa5e8fdd88afd14e6ede54e583ba224e474e1122e90b114da4136782cd8336afb467c61fc5400a7dd3a05e8 WHIRLPOOL c4bad3d35be8adb4af48562507ef213185e6d722541226e7d8bedd02578265c035874b371f432db4d1db222fc2776cc74374a508ca562a30dae622a86e0bab10
-MISC ChangeLog 14995 SHA256 d0546248127026a560b7572d55fe15b3b40a5c61c5ab239210a65ce82c9ca09a SHA512 c8099ab6450a7ee9109d8704fcc7db6f517491902f769e8305bff44d9d64a285d32b4f0d62936d5b85d0ccfd92a2201e431a9d90f49ca8c5ec4a29588d907ea1 WHIRLPOOL 024f39b61222947effd0b8278e6cae6c1de1369f45ccbe407fb2e0a0e9009c4949f5fad844f02b8cfcbbde2b5a8430e19888b38c3e9a1bec02bb19fa9c505455
+MISC ChangeLog 15204 SHA256 6e9730b320dbedaafcd7827f3d99e18821863094cc305f624abd657ffdf472c2 SHA512 5aac0dcba835380edd0bc3dbd1ce1537ab914b56702fa0581495c7bc2bb7f7e1873fc16df0b5aa3756455dee1c50f70790cc2fa5763b9e51895f7f72683b5b5c WHIRLPOOL 105e2db5b21c5a49685168a1468bbbe3bc11d2910eef596f8689ac200eca5dc0201589c131c8c15da581f3a58ebc3d3d6013f7812c802e5eb44e3e490a8028c4
 MISC metadata.xml 1452 SHA256 29bf3efaab7a4e45f5e442b26a7606edaed3f47e4ffec3e8990f95aea6bf2450 SHA512 537664b6ff29f4afe09eb4635c2cb06d87a6c3c3101e8ef89d1ab9b5b802c79024e94a0cce5a44ec2fd5b1cc37a251dd42156a015b6a294f219b90daff17c9c1 WHIRLPOOL c6e44f9a48fea6ae2a323e9e03d8805301fb0d94bb5634b1946909715f6c05d45c49180204d00221aae1e6dc6748347b4273fae838216b5d5d07932bc473a851
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTlT6fAAoJECRx6z5ArFrDFnQQAMNtsUE10ARxCV7/wfryTMAW
-6bSDlExFcBcydICKonPR0/Inp6TiuSpqxAny9WEfQoKhJMZ17dsx6vmmV2RqZW32
-UFSAkB5uPAx5lTZxCnl2Yjt521gfMeoHSzBqTJo3FWD+2k7uP6UVwHQNPYXR90OS
-83aOizyqMNsZ+3wekMheCw06f/8s0uE1D7KZvX1uNp/QWrASZDV1o0a7pMx9M8BB
-Gn1vm2yxmYv8Y1hqdTt+rp5GcJ9H3DCY2fyMV8jAS2ZxWg8nlAo5leJ9p0liqK5g
-2LR+anKdbU47nmaA25IoloqWxU4SWAeFC3xxfTGxuIsX45VjgbWTCoqVLx45OWrR
-/3Crk2a60KJ274LqRKEBz22JwVi7mDrL8Yo56rIIEHUYgTRO0d7FGfPMXI01gOwp
-xxflE4H/i9Yqy4VHRmiVqrV9nX4xVQEMWVXkFrR4wdUKttz0mkopGA7vMOgU1une
-RXPEGMtIpJff/NpCkPnjimqXdmm1XFN9JRLqUxkpvK/lx1DyMj39zIbLBugj5ouh
-atPzMLag9V7Yr2ZK30ah4O2eibK4+m3dtv3fB7IrfAcMfqgsdtHYFE7jvMPPvx29
-E39Hkrx9LAZZNTe7W+3wZch4hpLXVp3r0qt02mHnNtPBmTDrdxFPKAdaTGsMIUnn
-NRBd/RZZntT0KAaeQEwL
-=dElP
+iQIcBAEBCAAGBQJTnSGzAAoJECRx6z5ArFrDYN0P/0b3rShqBEMVLeYmxgN3bay9
+0Jd4BI8bM/OYP2sVZSjFGAIEdmiIlTv9YuBoq9P7rRc1WjsTokrCGT9MJOXXvewn
+BUmpzi5yZJ3yY09yhu3QdN7rHgyoDtsjXWmJEHIwzwL/alxnm6PCeoax9Yf95H/T
+39APzurZhbffRAtfFqxuWmVl7bMnUTE+TWm2TiFYoxFiHZFTYzAn51x6cvSwVlg2
+w4PgEgggNwr5l8ZTLDidlPEG02dpDUjEKeR6zloE5A/PBnIuF7OXqzuqv8wBXJUw
++Usq9i/mKZ3Q3tNlrxfBlLsqxcQ6ifSm0lZDqY6+5zgKrVnfuVzlJBFFPzVMK0QJ
+8AvuSSa3vgm5ldj9tqLN6HmJfOSoM06wCEh2CG0RY6i9ZA8e+r3rCQr/Tx7icN1M
+Kl6LeobmOyuv/AU2e+difGZFyF1lZbnEM9wvohFAKyE3JfIUpNtZI6lYJIuT8XMp
+EA0LEu0ufKShowUlaaYQthQCIhI5LilO1n5GgogqdNhGU01TfRDsbB1v+4YxmUVm
+ANz3IKfxVZAIlDNIpLeSE/bRROIlEXU2H3vTClXZOXWzCqT1asIt+lZV6DILcZH3
+3+hDGz+IVF2qr0eK1eFekySH4l0ZmRzPs/W5zLl1Jr/5I/zetQx0tN1rUTgMfpmx
+3mpc9ZOk5OHyh6yH1xEM
+=Vd+C
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/nova/files/CVE-2014-0167-2013.2.3.patch b/sys-cluster/nova/files/CVE-2014-0167-2013.2.3.patch
deleted file mode 100644
index a29c9bde6439..000000000000
--- a/sys-cluster/nova/files/CVE-2014-0167-2013.2.3.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From 5a1adb94e77f7be4885e4d86087140b94421c963 Mon Sep 17 00:00:00 2001
-From: Andrew Laski <andrew.laski@rackspace.com>
-Date: Thu, 3 Apr 2014 16:37:36 -0400
-Subject: [PATCH] Add RBAC policy for ec2 API security groups calls
-
-The revoke_security_group_ingress, revoke_security_group_ingress, and
-delete_security_group calls in the ec2 API were not restricted by policy
-checks.  This prevented a deployer from restricting their usage via
-roles or other checks.  Checks have been added for these calls.
-
-Change-Id: I4bf681bedd68ed2216b429d34db735823e0a6189
----
- nova/api/ec2/cloud.py            |   10 +++++++++
- nova/tests/api/ec2/test_cloud.py |   44 ++++++++++++++++++++++++++++++++++++++
- 2 files changed, 54 insertions(+)
-
-diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
-index 94ff160..36c2f12 100644
---- a/nova/api/ec2/cloud.py
-+++ b/nova/api/ec2/cloud.py
-@@ -30,6 +30,7 @@ from oslo.config import cfg
- from nova.api.ec2 import ec2utils
- from nova.api.ec2 import inst_state
- from nova.api.metadata import password
-+from nova.api.openstack import extensions
- from nova.api import validator
- from nova import availability_zones
- from nova import block_device
-@@ -85,6 +86,9 @@ LOG = logging.getLogger(__name__)
- 
- QUOTAS = quota.QUOTAS
- 
-+security_group_authorizer = extensions.extension_authorizer('compute',
-+                                                            'security_groups')
-+
- 
- def validate_ec2_id(val):
-     if not validator.validate_str()(val):
-@@ -631,6 +635,8 @@ class CloudController(object):
-         security_group = self.security_group_api.get(context, group_name,
-                                                      group_id)
- 
-+        security_group_authorizer(context, security_group)
-+
-         prevalues = kwargs.get('ip_permissions', [kwargs])
- 
-         rule_ids = []
-@@ -665,6 +671,8 @@ class CloudController(object):
-         security_group = self.security_group_api.get(context, group_name,
-                                                      group_id)
- 
-+        security_group_authorizer(context, security_group)
-+
-         prevalues = kwargs.get('ip_permissions', [kwargs])
-         postvalues = []
-         for values in prevalues:
-@@ -737,6 +745,8 @@ class CloudController(object):
-         security_group = self.security_group_api.get(context, group_name,
-                                                      group_id)
- 
-+        security_group_authorizer(context, security_group)
-+
-         self.security_group_api.destroy(context, security_group)
- 
-         return True
-diff --git a/nova/tests/api/ec2/test_cloud.py b/nova/tests/api/ec2/test_cloud.py
-index 269a738..b28d194 100644
---- a/nova/tests/api/ec2/test_cloud.py
-+++ b/nova/tests/api/ec2/test_cloud.py
-@@ -23,6 +23,7 @@ import copy
- import datetime
- import functools
- import iso8601
-+import mock
- import os
- import string
- import tempfile
-@@ -47,6 +48,7 @@ from nova.image import s3
- from nova.network import api as network_api
- from nova.network import neutronv2
- from nova.openstack.common import log as logging
-+from nova.openstack.common import policy as common_policy
- from nova.openstack.common import timeutils
- from nova import test
- from nova.tests.api.openstack.compute.contrib import (
-@@ -471,6 +473,34 @@ class CloudTestCase(test.TestCase):
-         delete = self.cloud.delete_security_group
-         self.assertRaises(exception.MissingParameter, delete, self.context)
- 
-+    def test_delete_security_group_policy_not_allowed(self):
-+        rules = common_policy.Rules(
-+                {'compute_extension:security_groups':
-+                    common_policy.parse_rule('project_id:%(project_id)s')})
-+        common_policy.set_rules(rules)
-+
-+        with mock.patch.object(self.cloud.security_group_api,
-+                'get') as get:
-+            get.return_value = {'project_id': 'invalid'}
-+
-+            self.assertRaises(exception.PolicyNotAuthorized,
-+                    self.cloud.delete_security_group, self.context,
-+                    'fake-name', 'fake-id')
-+
-+    def test_authorize_security_group_ingress_policy_not_allowed(self):
-+        rules = common_policy.Rules(
-+                {'compute_extension:security_groups':
-+                    common_policy.parse_rule('project_id:%(project_id)s')})
-+        common_policy.set_rules(rules)
-+
-+        with mock.patch.object(self.cloud.security_group_api,
-+                'get') as get:
-+            get.return_value = {'project_id': 'invalid'}
-+
-+            self.assertRaises(exception.PolicyNotAuthorized,
-+                    self.cloud.authorize_security_group_ingress, self.context,
-+                    'fake-name', 'fake-id')
-+
-     def test_authorize_security_group_ingress(self):
-         kwargs = {'project_id': self.context.project_id, 'name': 'test'}
-         sec = db.security_group_create(self.context, kwargs)
-@@ -575,6 +605,20 @@ class CloudTestCase(test.TestCase):
-         db.security_group_destroy(self.context, sec2['id'])
-         db.security_group_destroy(self.context, sec1['id'])
- 
-+    def test_revoke_security_group_ingress_policy_not_allowed(self):
-+        rules = common_policy.Rules(
-+                {'compute_extension:security_groups':
-+                    common_policy.parse_rule('project_id:%(project_id)s')})
-+        common_policy.set_rules(rules)
-+
-+        with mock.patch.object(self.cloud.security_group_api,
-+                'get') as get:
-+            get.return_value = {'project_id': 'invalid'}
-+
-+            self.assertRaises(exception.PolicyNotAuthorized,
-+                    self.cloud.revoke_security_group_ingress, self.context,
-+                    'fake-name', 'fake-id')
-+
-     def test_revoke_security_group_ingress(self):
-         kwargs = {'project_id': self.context.project_id, 'name': 'test'}
-         sec = db.security_group_create(self.context, kwargs)
--- 
-1.7.9.5
-
-
diff --git a/sys-cluster/nova/nova-2013.2.3-r1.ebuild b/sys-cluster/nova/nova-2013.2.3-r1.ebuild
deleted file mode 100644
index df210a182a5e..000000000000
--- a/sys-cluster/nova/nova-2013.2.3-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2013.2.3-r1.ebuild,v 1.1 2014/04/11 15:12:49 prometheanfire Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils multilib user
-
-DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system) written in Python."
-HOMEPAGE="https://launchpad.net/nova"
-SRC_URI="http://launchpad.net/${PN}/havana/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+compute +kvm +network +novncproxy sqlite mysql postgres xen"
-REQUIRED_USE="|| ( mysql postgres sqlite )
-			  || ( kvm xen )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		app-admin/sudo"
-
-RDEPEND="sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
-	          <dev-python/sqlalchemy-0.7.99[sqlite,${PYTHON_USEDEP}] )
-		mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
-	         <dev-python/sqlalchemy-0.7.99[mysql,${PYTHON_USEDEP}] )
-		postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
-	            <dev-python/sqlalchemy-0.7.99[postgres,${PYTHON_USEDEP}] )
-		>=dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
-		>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-		virtual/python-argparse[${PYTHON_USEDEP}]
-		>=dev-python/boto-2.4.0[${PYTHON_USEDEP}]
-		!~dev-python/boto-2.13.0[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
-		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-		>=dev-python/routes-1.12.3-r1[${PYTHON_USEDEP}]
-		>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-		<dev-python/webob-1.3[${PYTHON_USEDEP}]
-		>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-		>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-		dev-python/paste[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
-		dev-python/netaddr[${PYTHON_USEDEP}]
-		>=dev-python/suds-0.4[${PYTHON_USEDEP}]
-		>=dev-python/paramiko-1.8.0[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.8[${PYTHON_USEDEP}]
-		>=dev-python/python-cinderclient-1.0.5[${PYTHON_USEDEP}]
-		>=dev-python/python-neutronclient-2.3.0[${PYTHON_USEDEP}]
-		<=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.3.2[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-0.10[${PYTHON_USEDEP}]
-		>=dev-python/websockify-0.5.1[${PYTHON_USEDEP}]
-		<dev-python/websockify-0.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
-		dev-python/libvirt-python[${PYTHON_USEDEP}]
-		novncproxy? ( www-apps/novnc )
-		sys-apps/iproute2
-		net-misc/openvswitch
-		net-misc/rabbitmq-server
-		sys-fs/sysfsutils
-		sys-fs/multipath-tools
-		kvm? ( app-emulation/qemu )
-		xen? ( app-emulation/xen
-			   app-emulation/xen-tools )"
-
-PATCHES=(
-		"${FILESDIR}/CVE-2014-0167-2013.2.3.patch"
-)
-
-pkg_setup() {
-	enewgroup nova
-	enewuser nova -1 -1 /var/lib/nova nova
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	for svc in api cert compute conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
-		newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
-	done
-	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
-	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
-
-	diropts -m 0750 -o nova -g nova
-	dodir /var/log/nova /var/lib/nova/instances
-
-	insinto /etc/nova
-	insopts -m 0640 -o nova -g nova
-	newins "etc/nova/nova.conf.sample" "nova.conf"
-	doins "etc/nova/api-paste.ini"
-	doins "etc/nova/logging_sample.conf"
-	doins "etc/nova/policy.json"
-	doins "etc/nova/rootwrap.conf"
-	#rootwrap filters
-	insinto /etc/nova/rootwrap.d
-	doins "etc/nova/rootwrap.d/api-metadata.filters"
-	doins "etc/nova/rootwrap.d/compute.filters"
-	doins "etc/nova/rootwrap.d/network.filters"
-	#copy migration conf file (not coppied on install via setup.py script)
-	insinto /usr/$(get_libdir)/python2.7/site-packages/nova/db/sqlalchemy/migrate_repo/
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
-	#copy the CA cert dir (not coppied on install via setup.py script)
-	cp -R "${S}/nova/CA" "${D}/usr/$(get_libdir)/python2.7/site-packages/nova/" || die "installing CA files failed"
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0600 -o root -g root
-	doins "${FILESDIR}/nova-sudoers"
-}
diff --git a/sys-cluster/nova/nova-2013.2.9999.ebuild b/sys-cluster/nova/nova-2013.2.9999.ebuild
deleted file mode 100644
index 71685f993c32..000000000000
--- a/sys-cluster/nova/nova-2013.2.9999.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2013.2.9999.ebuild,v 1.13 2014/04/06 06:32:19 prometheanfire Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils git-2 multilib user
-
-DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system) written in Python."
-HOMEPAGE="https://launchpad.net/nova"
-EGIT_REPO_URI="https://github.com/openstack/nova.git"
-EGIT_BRANCH="stable/havana"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="+compute +kvm +network +novncproxy sqlite mysql postgres xen"
-REQUIRED_USE="|| ( mysql postgres sqlite )
-			  compute? ( || ( kvm xen ) )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		app-admin/sudo"
-
-RDEPEND="sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
-	          <dev-python/sqlalchemy-0.7.99[sqlite,${PYTHON_USEDEP}] )
-		mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
-	         <dev-python/sqlalchemy-0.7.99[mysql,${PYTHON_USEDEP}] )
-		postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
-	            <dev-python/sqlalchemy-0.7.99[postgres,${PYTHON_USEDEP}] )
-		>=dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
-		>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-		virtual/python-argparse[${PYTHON_USEDEP}]
-		>=dev-python/boto-2.4.0[${PYTHON_USEDEP}]
-		!~dev-python/boto-2.13.0[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
-		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-		>=dev-python/routes-1.12.3-r1[${PYTHON_USEDEP}]
-		>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-		<dev-python/webob-1.3[${PYTHON_USEDEP}]
-		>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-		>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-		dev-python/paste[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
-		dev-python/netaddr[${PYTHON_USEDEP}]
-		>=dev-python/suds-0.4[${PYTHON_USEDEP}]
-		>=dev-python/paramiko-1.8.0[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.8[${PYTHON_USEDEP}]
-		>=dev-python/python-cinderclient-1.0.5[${PYTHON_USEDEP}]
-		>=dev-python/python-neutronclient-2.3.0[${PYTHON_USEDEP}]
-		<=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.3.2[${PYTHON_USEDEP}]
-		>=dev-python/stevedore-0.10[${PYTHON_USEDEP}]
-		>=dev-python/websockify-0.5.1[${PYTHON_USEDEP}]
-		<dev-python/websockify-0.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
-		dev-python/libvirt-python[${PYTHON_USEDEP}]
-		novncproxy? ( www-apps/novnc )
-		sys-apps/iproute2
-		net-misc/openvswitch
-		net-misc/rabbitmq-server
-		sys-fs/sysfsutils
-		sys-fs/multipath-tools
-		kvm? ( app-emulation/qemu )
-		xen? ( app-emulation/xen
-			   app-emulation/xen-tools )"
-
-PATCHES=(
-)
-
-pkg_setup() {
-	enewgroup nova
-	enewuser nova -1 -1 /var/lib/nova nova
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	for svc in api cert compute conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
-		newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
-	done
-	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
-	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
-
-	diropts -m 0750 -o nova -g nova
-	dodir /var/log/nova /var/lib/nova/instances
-
-	insinto /etc/nova
-	insopts -m 0640 -o nova -g nova
-	newins "etc/nova/nova.conf.sample" "nova.conf"
-	doins "etc/nova/api-paste.ini"
-	doins "etc/nova/logging_sample.conf"
-	doins "etc/nova/policy.json"
-	doins "etc/nova/rootwrap.conf"
-	#rootwrap filters
-	insinto /etc/nova/rootwrap.d
-	doins "etc/nova/rootwrap.d/api-metadata.filters"
-	doins "etc/nova/rootwrap.d/compute.filters"
-	doins "etc/nova/rootwrap.d/network.filters"
-	#copy migration conf file (not coppied on install via setup.py script)
-	insinto /usr/$(get_libdir)/python2.7/site-packages/nova/db/sqlalchemy/migrate_repo/
-	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
-	#copy the CA cert dir (not coppied on install via setup.py script)
-	cp -R "${S}/nova/CA" "${D}/usr/$(get_libdir)/python2.7/site-packages/nova/" || die "installing CA files failed"
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0600 -o root -g root
-	doins "${FILESDIR}/nova-sudoers"
-}