removing 2014.2 as well

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

3 files changed, 18 insertions, 193 deletions

diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog
index 87087aa41cfc..f4a883810dbf 100644
--- a/app-admin/glance/ChangeLog
+++ b/app-admin/glance/ChangeLog
@@ -1,6 +1,9 @@
 # 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.55 2015/01/13 03:15:47 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.56 2015/01/13 03:19:23 prometheanfire Exp $
+
+  13 Jan 2015; Matthew Thode <prometheanfire@gentoo.org> -glance-2014.2.ebuild:
+  removing 2014.2 as well
 
   13 Jan 2015; Matthew Thode <prometheanfire@gentoo.org>
   -files/glance-gbug-474064-grizzly.patch, -glance-2014.1.2.ebuild,
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 208f9385fae0..118ac732075a 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -5,27 +5,25 @@ AUX glance-2013.2-sphinx_mapping.patch 582 SHA256 043c3f7ef413cf3675920880af5794
 AUX glance.confd 25 SHA256 5a53dcf1eece81a06a2dd0856b15f8abe20eb1072361b110f752e396e86a7843 SHA512 13e671d4544e58d7397c1a87eb1048ed4bb9561587fcd63783e377b2d25e810222ca3944e0c8cf13c524e64f94c435b456a0d6f7cacfb148e275377699a11ca9 WHIRLPOOL 862a310fbdd7b68f132c45797210011b607d9b5c8937d60c9f5933a4d625bc985ad0277fea26804681b7e0a674dc9da15fbef40502c4052d6742ef0a94e88f3d
 AUX glance.initd 651 SHA256 1b2fc0e11d572bfcc121cb995ea7b3cce63ee705a05d2fb34a9f99d655546553 SHA512 c0ed1cac2038dda8882d5ce013b948debf1e5e411a062d8c9cbfdb1e1683c94bfd78a3f3468de63e0cc28930c59c0ff323a3116ce6a74ccf5d8ad1d547805bad WHIRLPOOL b0b25f4e983bf9f46cb9dd5872d14b24dc90e3c383dc458c79d065e0855bbf838afc4a13f0c92db640cd64311e22985d0b92e1ca4d428ce8b1f08ff23b89cecf
 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.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 11080 SHA256 1fdb72c8503e44b788528da7cab01bfbcbd62078423f5a19bc8a2d08caa52504 SHA512 a51d8d7e0a1c0fcd257c88f8ff554d00fb255278c89b46ffd88a9701f25f6cb930ca945d22e12bf3f62d2f0ea6ff356af8cc7621b46927580b27693ad36c42a6 WHIRLPOOL 8fe6c4a1de3c2ba4dc11ed05cc68c27b0b319557589dad944dbfd2e4e5aa6e7ebe6b50e3c32f626af127fb906b6d32fcd8bc84a1a84bc9f0928ac52712296c73
+MISC ChangeLog 11187 SHA256 9a59d0516a81e6dcd66ff9573a68f421f8ba3053ace2f8102e0e4e3feaebf222 SHA512 24528f87d9615ea8174fdf6fd5829069292949968ceb2bb816ff761fd97f644370edeb10c94be05f4b61ed49235973a76fcbf6d5186c5872fa01f93b1d993c3b WHIRLPOOL 958977900938d169ec5ae325c6865fccba47d098f7199d438287c8d145b7ed537fe40beacc26880981d8757ffea3e3adf3bbcf7aaafac46cfdc3fbd94ee2b71c
 MISC metadata.xml 607 SHA256 b74d960c096528dbb7c9be6b0da777e10abe32928459f045e7c58b0156e22d95 SHA512 e38e4dd740fe55d73d6d97fd9ffa3aec5466fbb5f8e6484b125560313245ae697a0dcf612fb065125c6737a8254b6218c0703f7de79437bb2799c6c67f386e45 WHIRLPOOL 445bf712fd733fa90c395cc24fd02155bed15b092713d502b54331da9237f397877c2328adbf4049ee64ae163713ce031ebe5048c8826ed1a011d4ebcdbb681d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-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
+iQIcBAEBCAAGBQJUtI7EAAoJEGSje+quGaToGewP/3HRVIAsus8uLhPgLtBhCVWS
+rkP/qFXNxlgP1B8eVj+U5t1JD4/pA31NlcniiHNHukKEq9cqs71UXXlR666/kcf8
+G3GbElttOLzJejx0ac8DCZINFVFH6PV57v4slHD+0I+2aeamzbnGtW2gwZuhikff
+C4xVEWOf2HnZ/kkZsqFREp3NdY9RnlxZ9GDb3a0uKF9/8ur6KQTV5LBkyGpnmqDT
+hCkn0uu7uReMtMPr2D4m9IIp7OgdVvMZqbCMoUJy+aZ4QZz7M97aStoU9oybzwwf
+bFmYrcix0AFKuBAFZnyd0xPq4QPatK84qE1ra5LvHVuw4lkqR5GJ/ZSUSqPJIkoi
+tZ7xAqh7L4cDZ4NDeS2jtLMdj+1Uod4waTd7uoSazjciXffEsjWiKFWibqvICZ0t
+yLrdPzO/QtzSNJFK2dpcWCcL+dMBRIpsWs9FuZLmn5kqlTKvqx8ctpkEYsWQVLdn
+EBhZTnv9B8ykhx1UmY/cWr4Xx70UPlREgpYmpCp6Ric83C4HyDi9rMW7iHVpP52n
++rXPDpGtBCijvR1TXUBMhHEYtELo5/lRI8Ftwq+ANRsdU8Tggu61eV/T3qqUEJdj
+grKmGev8oBMz6iKEPrWikdxOOn1bildrDMdzo/eyLmw2zH0Hs8kI39Iz/4vkx1Ba
+ahHzGNMH+aW0MAf5lfao
+=Sh0k
 -----END PGP SIGNATURE-----
diff --git a/app-admin/glance/glance-2014.2.ebuild b/app-admin/glance/glance-2014.2.ebuild
deleted file mode 100644
index 7f0a77fbc3b5..000000000000
--- a/app-admin/glance/glance-2014.2.ebuild
+++ /dev/null
@@ -1,176 +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.2.ebuild,v 1.3 2014/11/21 00:05:34 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}/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? ( >=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.0[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
-				>=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
-				!~dev-python/requests-2.4.0[${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/psutil-2.0.0[${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-2.2.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.8.4[sqlite,${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.8.99[sqlite,${PYTHON_USEDEP}]
-			)
-			(
-				>=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.8.4[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
-			)
-			(
-				>=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.8.4[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
-			)
-			(
-				>=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/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/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
-	!~dev-python/sqlalchemy-migrate-0.9.2[${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/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-i18n-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-1.4.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
-}