more badness from CVE-2013-6858 removed

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

3 files changed, 19 insertions, 77 deletions

diff --git a/www-apps/horizon/ChangeLog b/www-apps/horizon/ChangeLog
index c68e7ee5f3a7..dd1e70f4c597 100644
--- a/www-apps/horizon/ChangeLog
+++ b/www-apps/horizon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/horizon
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horizon/ChangeLog,v 1.17 2013/12/13 17:13:20 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/horizon/ChangeLog,v 1.18 2013/12/13 17:14:33 prometheanfire Exp $
+
+  13 Dec 2013; Matthew Thode <prometheanfire@gentoo.org>
+  -horizon-2013.2-r1.ebuild:
+  more badness from CVE-2013-6858 removed
 
 *horizon-2013.2-r2 (13 Dec 2013)
 *horizon-2013.1.4-r1 (13 Dec 2013)
diff --git a/www-apps/horizon/Manifest b/www-apps/horizon/Manifest
index d37867e986ce..2ae724b5c4af 100644
--- a/www-apps/horizon/Manifest
+++ b/www-apps/horizon/Manifest
@@ -7,26 +7,25 @@ DIST horizon-2013.1.4.tar.gz 1789471 SHA256 fb24b6d8b38d199a8ab0174335df63c7612e
 DIST horizon-2013.2.tar.gz 2580489 SHA256 f19d274966218ba678ce3ecdcc131f787a4614f1bd6cf6b7d24a88bcf79863f6 SHA512 2680b7b6a86b064eddbd52a281d8d1d419a0051d88160c24178095c414549e9b1f9ac11d4ad81d59b638eac928b2a1afe7f37fa266415807b53ec462964b6a1a WHIRLPOOL 502bb0387d01ca7145f9697cfa7ba657d4961024e86f16cd9f2b069df9a4d90addb44eb6947353c21f14a680b30f8a03a468ffbaa44a2a77a86752f2d8de236d
 EBUILD horizon-2013.1.4-r1.ebuild 1547 SHA256 11df634aad004e66b6f084a1d87f5e7b6e6e29392970156536ba2cfc839ebfae SHA512 9fa73fdef05d3d68f32381ddc9df007644ec1e6fa4fa29244022a1dfdba3baa9c8b14d7c6065f3c5574064e493e71b9f25616884fb15d531ea8f28c35acbdd9e WHIRLPOOL dc0e328926504e0d640ba89f292039163f6f13466b2923aad1e43fbe6609813eab74f190a8582b9f9d405dcf50cc2e8a55cb5d5594a70dca9088413db15d5b86
 EBUILD horizon-2013.1.9999.ebuild 1499 SHA256 07e3946b50ec0b6e9d702baa587227774c904c4b575ace0ebb1c66fa062856b6 SHA512 630b6c008b97f527345fcd5fac91513813916be81427dfe08f0b54c14aa73a76f1a52ea16782c928acfbf1471f239878bea50339185fb55dd2062ff4505c0145 WHIRLPOOL 85d7bae9b4bb177cbb671692463aea1e29e503f00e726abf5ed868ab533f01f6e3e9cb0153ed4fd29d183ab54d196a09ad8161978fd49b6d7a357d2140662506
-EBUILD horizon-2013.2-r1.ebuild 2500 SHA256 43707b472133ccd549a15419f1fa45340d393333b6fa531a101599dea3baf62b SHA512 c4de215a06af0ccced95a08172fbbd3ccf7311fe1fa88b126c4ecc6ae5e32c8d2c251427cd11ff2bd8d445325febe42e7b9ec8cad5861d26999cf00073c75d67 WHIRLPOOL 03c03e6e1ee3163a61eefab844766efa06df723d525dcf5a8080ff5c1cae003328aca9c4c15ee56d49b397d784f7ba6810438c47442580654bd223507d562ae6
 EBUILD horizon-2013.2-r2.ebuild 2561 SHA256 7874edb401e3d9a30f3135f8169ad4f51598952d16313eded062f5797a66879f SHA512 04b07c551fea61c07889c4093dcf50d052059a6240816c5348b4d91c7a7219089420fe56eeebf84026e4aaed8848e58da6a8a0ee476d35400dffec86db1e1199 WHIRLPOOL d7e53bd82d57620c3c0d382a0b312a760a1dbb448f296e61c92c5d090bff54e0dd58c74d4304380a6052c75bb7dc11c7a2b729309afe584dda77560fd6b5c7fb
 EBUILD horizon-2013.2.9999.ebuild 2521 SHA256 9cf61186c33ff8e75e3828c66e7650119cb16ae8185356cdac5542e99bdadf56 SHA512 90a89aee5620318df17dfa5a01e5cc7fa24c48f5920a3049426c01bd5e647745fa03056b07f44743563d0ca79e7e42f170e9122467c31ed5539cfbcaf72c7f90 WHIRLPOOL b2a884b03932ca0ed8ebfd49a5c5de102cf37ef2a7d7dc86c337ad96f7a1feb9ea9b59a4b0275d824e81f9c2780ea0618c225e3cc2b98345f15b78cd4dff67d8
 EBUILD horizon-9999.ebuild 1821 SHA256 3fadff63ffdc90d06b0cae7d7fb978a6216f69877c95902476c5a63e541a986b SHA512 c885f318493458a07954178e7719358dffb20449dbd170f37212fc3c60553c9146c85d523846fb8f8475867d91b5ce0743e6635fcf29980f1facab0dd71bfe5b WHIRLPOOL 3c0f946b69708d507b15a8f79cfa7080cf6ba06bb51aa8f1d81224acf0cc819ad8df2e50eeb6db805ce5442b8df1b8794d00ba8e6d7d9ea59e2314cde45e308a
-MISC ChangeLog 3368 SHA256 222509a1da71038e002ef197b9445625c5c06e73c590c6dc0c8ae94a29eedbea SHA512 0b2e5261b7706a6305d1d98e3937e3f12b41bc15081850d996d2235c7043890e3343ea43de80d84f3af6b4cb193a21322bab8c20deb6e3b6c76e403aaf04e9ca WHIRLPOOL 703d6e0c12cb5f9cd57575aa3df88cbf5be9cfdc262ea065e1e07b25448cc41e50b7bfd80411c58ab119b0a9e2065bd2fa32fdbf6a0de5fbf28d30309418e59d
+MISC ChangeLog 3497 SHA256 1deee5a4531141544843a156ce4f5b55712bad3842480bc42d5477949266d662 SHA512 903f6113c0c72314dabd2543e33bfff74489c97e0ab5da17107cfe05d033fae6fb20d1142c848a09b981923d74b61c5f85504a4b6cf09359dd237298a3b22058 WHIRLPOOL d1a4524127d4b7717e227cae3d5da80ee7ad266229cf5b8575cd899a2f0dd1f6f1645f63bf607719441489a501b7978d1abe0ac008544a3a474894096754210e
 MISC metadata.xml 502 SHA256 8a64a12fb6d42791ddde4f06dbeb1e32359e41fafb25b69b16d773eabf18ad57 SHA512 35da4f1a5a38b64361e5003731e9a0bfc81498c3e43b9b9e5b152d6fad2d8157a3632b737a9987bcec726d1057c52b05ee73e4fc280d9353f4649fe20c0b5915 WHIRLPOOL 028f50558b926a576c36fa0da5dfce8cae2a948f0adb4cd71df2f17e806565caaa0698dc262a484012e8c5d9d8cc6d0f4ef77983ea6d79b6b8b3e03ec80b7ea1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSq0A5AAoJECRx6z5ArFrDP9AQAICa6bb6+1aGQxs/fp/iSMYG
-PGNrFPJq6O6hCRtdIhHbejCiLTKi33/R01S/4wKS6KleII8S3GLhy5vug5NnpoRE
-VUsWKYKE94afPfNGPxZYBmnJOaoeWwm26A3CR+VRSRE/W3fy5Z3qDb8Nc9bOeAYv
-KlJpMl3mBRSLjtSOZ8gHkfbx/T0P8aKr7JORfcZ7B9SVx5HpbXJHlrFxyLznBRMl
-npl8SUQNU2WRoSQNy1IsrQlhDFFzziCtYc6ZPni1VMlmU5Qv3ZBaQBVCL5y3Rdyy
-3dRvyxcUWO0i9v4euAxdS5nsrRrqW2Jt/kBs0VK3/Meb6xheXBJNFlSvtkuih4Vm
-jQ4xKBfR9hzMD2oXj1FxU/gVB+lwdLibvq3Vr3zhJUMLgBnnRkPWiUfKBA7cdfKz
-3yG3AvSz2SmEfVeQEbpkny3ffwabkrKrEECaySS1rdFqFq6wpGb+M+Dud4s0k9af
-0qw3r2mGWfBmnBZeKDWsd3oWacEEis7OkxRTx7GteWrdV7ElvhUct7rE+GXHbt8h
-iZw73k/1suDxi8d0vb91PDYaGh84qxD3oxyH+JmqrSXwwCBdogK57XXKmiBHpAtI
-YIYBiDHbCtiaoY8ioWciRzbTvQ1s6QDR2joObvtFUgaI1ExB3ROm4uYhp7I4Urri
-OTahM1c3GJPIygemj6CZ
-=/rn9
+iQIcBAEBCAAGBQJSq0CCAAoJECRx6z5ArFrDjNMP/3oCazkQAnTmYxOsercqIvj/
+eoOyblOowJ3PSducPuBZhPXco3l9REjTXdZsEArqMQ5WQTwK6kP//jEKAMpa1YpY
+clo5Lg8MCa9VQmBEFTH8FZb0jib8MBzMJoPWpjupioe7OHVdR4xAVZhK9XTdutic
+EajBeVSjmCg/q4Yku0bFO42u9F2jczeQ2p6sZHRZ72JSwJHAPZMb/KjIZvuh+Khn
+qed29P1V/znnmfk6LPduOMau7FzUMMBT7v0dq3V8dvFrjJ1dgF6LgXdenJn9J5Bd
+C6WvbZvAaqG204OjgzYu+EbsfYXq3v9CgSA5dKpz8o+SyjXMYMro4eRcBEaybOeC
+p71Ax3WBFVm/jkdTUihGZq6eLKebHalJCSX+XBtwyMxrRcCA73yW7dYnWM2aHmeI
+D6G3vNVUKHaztCauPMT1+yMzgaQi1VrOnyGORM1wgDOLvq/0uXDeORWRFtrUu5EM
+8kop5ezvpL0doXIsNgUbOQckIh147diCCkd7LWJNIN8vP/hVLkSGvJ1OzqvCEoWP
+tGsgogfP3oyPRRfxaO59gFBbBdVN+wvSW/BOlIPzclWIv2gZejsJnF/faJZXF/ex
+j/Dge6cyJgok0+oQxesiQGXQzhz/rRFwvX9QqpScf+jB3FfrWOaqXYaPYdEXDXqa
+fPbMxeYXzJzk+cemHhFj
+=Mabg
 -----END PGP SIGNATURE-----
diff --git a/www-apps/horizon/horizon-2013.2-r1.ebuild b/www-apps/horizon/horizon-2013.2-r1.ebuild
deleted file mode 100644
index f67477adb94f..000000000000
--- a/www-apps/horizon/horizon-2013.2-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/horizon/horizon-2013.2-r1.ebuild,v 1.1 2013/11/27 04:37:26 idella4 Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Django-based project aimed at providing a complete OpenStack Dashboard."
-HOMEPAGE="https://launchpad.net/horizon"
-SRC_URI="http://launchpad.net/${PN}/havana/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? ( >=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.8[${PYTHON_USEDEP}]
-			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			>=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
-			dev-python/django-nose[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
-			dev-python/nose-exclude[${PYTHON_USEDEP}]
-			dev-python/nosexcover[${PYTHON_USEDEP}]
-			>=dev-python/openstack-nose-plugin-0.7[${PYTHON_USEDEP}]
-			>=dev-python/nosehtmloutput-0.0.3[${PYTHON_USEDEP}]
-			dev-python/selenium[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			=dev-python/docutils-0.9.1-r1[${PYTHON_USEDEP}]
-			dev-python/oslo-sphinx[${PYTHON_USEDEP}]
-			)"
-RDEPEND=">=dev-python/django-1.4[${PYTHON_USEDEP}]
-		<dev-python/django-1.6[${PYTHON_USEDEP}]
-		>=dev-python/django-compressor-1.3[${PYTHON_USEDEP}]
-		>=dev-python/django-openstack-auth-1.1.1[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
-		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
-		>=dev-python/lesscpy-0.9j[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
-		dev-python/netaddr[${PYTHON_USEDEP}]
-		>=dev-python/python-cinderclient-1.0.5[${PYTHON_USEDEP}]
-		>=dev-python/python-glanceclient-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/python-heatclient-0.2.3[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.3.2[${PYTHON_USEDEP}]
-		>=dev-python/python-novaclient-2.15.0[${PYTHON_USEDEP}]
-		>=dev-python/python-neutronclient-2.3.0[${PYTHON_USEDEP}]
-		<dev-python/python-neutronclient-3[${PYTHON_USEDEP}]
-		>=dev-python/python-swiftclient-1.5[${PYTHON_USEDEP}]
-		>=dev-python/python-ceilometerclient-1.0.5[${PYTHON_USEDEP}]
-		<dev-python/python-troveclient-1[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2010h[${PYTHON_USEDEP}]
-		>=dev-python/lockfile-0.8[${PYTHON_USEDEP}]"
-
-src_test() {
-	./run_tests.sh -N --coverage
-}