updating glance to 2013.1.3

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

4 files changed, 26 insertions, 103 deletions

diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog
index 7c79afbe6b48..cdb61f9bf384 100644
--- a/app-admin/glance/ChangeLog
+++ b/app-admin/glance/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/glance
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.13 2013/08/02 18:17:27 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.14 2013/08/11 01:00:33 prometheanfire Exp $
+
+*glance-2013.1.3 (11 Aug 2013)
+
+  11 Aug 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +glance-2013.1.3.ebuild, -glance-2013.1.2-r2.ebuild,
+  -glance-2013.1.2-r3.ebuild:
+  updating glance to 2013.1.3
 
 *glance-2013.1.2-r2 (02 Aug 2013)
 *glance-2013.1.9999 (02 Aug 2013)
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index 7f60cfb401bf..d74a0792e3e5 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -6,28 +6,27 @@ AUX glance-gbug-474064-grizzly.patch 2377 SHA256 df92ba14455d4379f0c2297f1f087d7
 AUX glance.confd 25 SHA256 5a53dcf1eece81a06a2dd0856b15f8abe20eb1072361b110f752e396e86a7843 SHA512 13e671d4544e58d7397c1a87eb1048ed4bb9561587fcd63783e377b2d25e810222ca3944e0c8cf13c524e64f94c435b456a0d6f7cacfb148e275377699a11ca9 WHIRLPOOL 862a310fbdd7b68f132c45797210011b607d9b5c8937d60c9f5933a4d625bc985ad0277fea26804681b7e0a674dc9da15fbef40502c4052d6742ef0a94e88f3d
 AUX glance.initd 1276 SHA256 030c10e8688916024eef7222d9f801f2fad2204c160ebc5898e3f764bc96c353 SHA512 4514ce8df0b96e1dbd51df4c55d79cf55122957199488dcfcdf8699de3f919b58e81609cc129203d62c2fd706865463ad480ac3cb50bd151471594171532cdb0 WHIRLPOOL f82ba96f3429c937e9404e0f4ceb643b05c32d127757eeabd5f0d0790eef91a62a11978a237cc0fa1abfd2246b811a9d61e03247ffb6320ae145d7ab9a2515b8
 DIST glance-2012.2.4.tar.gz 643408 SHA256 d50fa522e890258eff32aad1947684abdf0cf0c67a8a487f60a7179a84edd3f2 SHA512 fc91d799fa5fd2c66aef228d622c852623e70fa83e5babdeb10e041f77571e5a08c90c6fca16943dc98ca1cd50a09314fc5bd282e5530e7e1e44a623eee28198 WHIRLPOOL 34fdfab54444845ed4a3c0e849066f01ef88cf4317d952a0fedf562f331a41c87572d80234296651a722770929472de9263f7ded37deaaf6d65f35723e41031c
-DIST glance-2013.1.2.tar.gz 719039 SHA256 55d12a314f6fa5d291c0a0f9be4ad9d2b53086a9e47fad82d83bcf08105a65a0 SHA512 124d8d133bdbdab5b1bf43d7faa3249b14d91fed2edcc0621619865ad0fe22021d98d37786d8866a97e6b4613968b82985f7778be37f0e7f71e5e56299a1f680 WHIRLPOOL d57b5b213a25155436a941a2c44144dce31be7d23a168765fb59f8956148460d0e8c7b3052362f03f0acc9ee520b73d5a3e0ac9dec9a410318942501a6beccb6
+DIST glance-2013.1.3.tar.gz 721788 SHA256 642782416d790dfcb6d5bb85626dd5d48784ba8f3a53e7863ec13312e86cb209 SHA512 260bd30555bbc4f9d170c4d542bd159039558f563da55f896095323cd0369f0a10f5b8d5ff52b9c1ad3b6fcc867a54a8ef276f35ef9e65cbc0083733de3e5643 WHIRLPOOL ad2d62004bc95033dc0031df426a508942466a432cd18de2e3ba9e89723357b880c69052badae32fde224b9004606cb667e98a1c63e74b182bfb1b308c2fff54
 EBUILD glance-2012.2.4-r3.ebuild 2690 SHA256 7ff1fbab494058436d41f56392ea32a9a701f77f61919247c2e08275d58e291f SHA512 6180bb2adbb5305f77caecead3771d32fc201e81635e694caac4162f835cae1125c2dda7829d2268af54e7bf64cb57f447e82e33c07bb46cb054801301324905 WHIRLPOOL 080efcb922f5ee8b58c80aa1ada75ff9ef085828c0b8c9a1280c52f6f6d5cf3d6167bb14bd198edabef9beee971885dd06d1cc9588e52921278b90d36e9863bd
-EBUILD glance-2013.1.2-r2.ebuild 2735 SHA256 5c7175b846c7abb02fe543c90e3f4f6fb1b426e91f9b4b88baade13d8b77918a SHA512 aad35b480ba0c07e8de4cbb5c6124af88d68944db91f086f044320a3fb56612dfbd1e267a9aa9105ae45a73edde0a7617cb860db57b39f4152c19c0ff0f4c8cc WHIRLPOOL 38a118cd7c09c321923da87a54e996f4f20ca0c8ed38360e638eaeea87b5a307c87837960dc9b9693d8edd875884ad4eefb998215d6eedf19e34dd5565379a7f
-EBUILD glance-2013.1.2-r3.ebuild 2861 SHA256 ef0446a84b2ccad2b1d404ec9b55dbf25fe754b20ce13f0e1505937b77f089cb SHA512 09036dc264047239d922bf3f3a2bf24d069c3ddd07b681e3367aa8326bae5c343c36d26df9bd35e16254eae4539246dd451c87e868477af8af2e1ea48f26a1a8 WHIRLPOOL 91ad565e35f2958a16a7110d1d5baa56f46c010fd2aad56c4e8599bb40fa2dfc9b6ac67e32c16a8db90e550db51c51d5ba502ea97dce9c4c0a6048f3d5e6f033
+EBUILD glance-2013.1.3.ebuild 2859 SHA256 8b662a9d485c81edbe36085abdd74d9e660721651b29ac41e62de6eb234a3490 SHA512 3125e2af167b7641b4800143034e38faeecf8e6fe118cf09199be55f5bb3662ca95794db95306ed35a41858c5cf40eeee66c783e2c5e2275fbac2312d88ca408 WHIRLPOOL 2a462c3fac4bb173ad1c7598ff921f257a79876ab78dc049287afa8d6373e15b031438373ee6cb1b876245088a3618a387a03a1f9f601bee0b038a0b7e440394
 EBUILD glance-2013.1.9999.ebuild 2820 SHA256 1f29ef0c0c457c0c745fb5d0be21f3e7858b4e7110cf6ec390a5352400eb37a8 SHA512 b2af34dd26644a88dd36136c7c2c4e69c452cd3fccbb84b128234405d2740879b02d2c77daaed9228f3c1099a3b300fe491de5652e61e89ad92783fc27b487f3 WHIRLPOOL d0fe84c8f0fe6dbaf095275cae5a03b18f0b0aa0afd90a739add25e577f43fc2bbd0f4de31bb194819579910dd75eb9aea625da43e793e0cb53b9bc9678e120e
 EBUILD glance-9999.ebuild 2794 SHA256 b3fa1ad7557e4664cc7f64342c6e1c05960b7716e197b78b91faa9714d6e8c6f SHA512 a3ae8f3129ce3d8ec61b7c0caf9530929a9e828b6123a2309520c4911b282e85e3730ef82cd6d94ec37d9fc2e65da7204b479c1dc054c58d46b275a847397a01 WHIRLPOOL e6aacaff9e45229517c5b221cdd4ea92a5d15023919d97657f2ca51e375b21767de71c4ddb1c93a24e6740256bece4e2525cca2ee95a1debe77b2f4650aef1d5
-MISC ChangeLog 3182 SHA256 0691c77055b6694c4b0b50bfb2996e0b8aad9fd67a001077b239da0f1673315a SHA512 a5a9046746204fc34517882512f0f52582408cf184753a072ab806f7eb4e5cca16bd5184a5a8b4ccdf6dbe995a405d85147ba204d3a838f63406e2c12c424627 WHIRLPOOL 415c290ceaf74625bacb7b40867fa10a9aece2407ad68bc600aaefb71ea14d11728d16f06a6eefcd55e691d6b93a2caa590d1c6dcce35012b8261a9be19f531d
+MISC ChangeLog 3387 SHA256 2431c30a4324e6c9115c4c7d226e5ea7770364042e137e3dbe4e5215d9e61bb0 SHA512 43669ae7383a22e7b2dce86d664aa3e750dc5ae89280778e252d4a9d9f3ab1fab8f046ec356b47d768830e32140e7de66d929a850625fe19626aded39a3f090f WHIRLPOOL 08a5958767f6a1d649bd0647847deeb7403c33ed8de441af1508305d00b9723b5bf3c34f4e90749646179437f29027001184462288d6ef6202fd8abafaed0de2
 MISC metadata.xml 551 SHA256 de9d9d349c334c740b04384a4f1288e7f2f8491751c38b5846fa5fdc801dd3c0 SHA512 0141af1612f84846713c8ffe8d0c4e653a77772d4e050deb5b9a47882aed9f803c7a0ebe7709f64279b04a19658f10da4aef962a70ecc7aebc2e7dce2ede4c68 WHIRLPOOL 4858e7841f26f04b1e35838cfb475cf34506fdb26e1a03f75c219d599dddac73fbc3429c80b5ac7c752fe2782445e2d492f58fc0b87da44ddc6d03b4710c8f13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJR+/frAAoJECRx6z5ArFrDwecP/RCSunw2AuXFhIyyY9jAIwF0
-5IuMAQE/6GEtCSgBV3XV7rASEThAhdfzW8vDyCk4XpVeCvMwD6WrepUfN5zIT86O
-KD/16ZN5rTxLxEgGCKYBbGH0QE9gUqk9ACGQ+KfcQji5TZ+P31/apSjr05aqTOgh
-tTjxggwFiyNJw2teY3BLS5qImLydmxF73Epo7mxTMXC23uHYUxQgKDJp194K5zx+
-eIPy0Ly/4Ry/6Xap2VqSy5YpKz+wOJJt+pqaS84AMQ8b5kUFf2q9FRqqX24T+3lR
-BbhMDADy/F92xece2rzfJYIvEuI3tIbL0FjqYR/bXq3ay8AwOTrb8hRRgbpjK6OT
-L60OejLFFC9dp3yKSx8fidRTWbD9NQB/3zy7N3jLeCl6VYY2geqXjuKCkpOd6gek
-y3PM2uZy8TyvvsrAhNGye5L9D4UbkIczdbOKvA8VkmN75U1EWABAlZw9HqA7S6z4
-oZs/rrOtEIo87e9NXxFCe3MWDnilduRqeQFy47+vKR6TBnt3GyLAj68/NpPiZcRg
-LfMSy9wpzpTqLMI7zmihkbB9U9UVJOpJXfKV1rHp7nv4RYLLVyQ9/EaJX1uaniTc
-v99PxmE+sG6W5oPJONpWtdbXOnXrDbiuxg3MNUZBur4FWEzjMlhnjgZZ0DmKyedJ
-tWjBHsZqzLJn9zGOymxu
-=kT+t
+iQIcBAEBCAAGBQJSBuJtAAoJECRx6z5ArFrD9BYP/ij9D6KERWoq8zYSQ6h4OVYx
+hVNAt6VXXAu48nPfAH17UUH1AjEMX1PsgBBtOho1h/qygbWP3+3EOqkmjJP7w7JP
+G9EGkADKZ1JXJDPdLXYLY6voMKCS9Zx703WzV6l/kXjrz6Z1ZSL/8LMkmGOZe1vs
+u2FznvurM7n85vuxpbtBizZeFn5qkPRijA+m7MHKtKGBF/n0hpQUUZ8VGc+7soFT
+277HPWCDhVV8lj6HYWeJypUVnHqIJ3N9zthvcb4Yk1P9Z5FQ4NObjONeQZnSSDzV
+01Oq+a0AHJV2FHTpBq6Zv93rQFFFHcvNapWjXCy4zLsd4ANYZdmL3bidjqSN0bUB
+OlXolbujjf2aXgRiMUOAYOIEsBoc12gbFRzQBGGfjxw0Z/iJXGlO2k0YW0GdrNBP
+vpO6j8GRa1UAUriji04FKc/cCHPO1wdWmca1+34jNy/gbE3hK9fASUVyiHguoIkB
+jgihNEnF98hXTUGk138EIyWbwVG+YwJZMEKW8KkTyGHgB6s2GG1m9FkAZSTDBT5H
+SVSqoXScU2ky+sJJd5O/0QOSdYWyGThvIQO3Nmgic6LYtuZGLfxBb2TNeEQbiZNo
+6T+yGWN6FToOpqED5/LNHMJ7wet16VD01HU8pla9yqwO0JlsCBYo/NR6pcKaUSm8
+MEdRJl/A9tQ1LKbXwzRs
+=XxMg
 -----END PGP SIGNATURE-----
diff --git a/app-admin/glance/glance-2013.1.2-r2.ebuild b/app-admin/glance/glance-2013.1.2-r2.ebuild
deleted file mode 100644
index 93791f1507ea..000000000000
--- a/app-admin/glance/glance-2013.1.2-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.1.2-r2.ebuild,v 1.3 2013/08/02 18:17:27 prometheanfire Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides services for discovering, registering, and retrieving
-virtual machine images with Openstack"
-HOMEPAGE="https://launchpad.net/glance"
-SRC_URI="http://launchpad.net/${PN}/grizzly/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap mysql postgres +sqlite +swift"
-REQUIRED_USE="|| ( ldap mysql postgres sqlite )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/boto
-	dev-python/anyjson[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.9.12[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/iso8601[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-0.7[${PYTHON_USEDEP}]
-	<dev-python/jsonschema-1[${PYTHON_USEDEP}]
-	dev-python/kombu[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
-	dev-python/passlib[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	dev-python/pastedeploy[${PYTHON_USEDEP}]
-	dev-python/pycrypto
-	>=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
-	dev-python/python-glanceclient[${PYTHON_USEDEP}]
-	dev-python/routes[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.7
-	>=dev-python/webob-1.2[${PYTHON_USEDEP}]
-	virtual/python-argparse[${PYTHON_USEDEP}]
-	swift? (
-		>=dev-python/python-swiftclient-1.2[${PYTHON_USEDEP}]
-		<dev-python/python-swiftclient-2[${PYTHON_USEDEP}]
-	)
-	sqlite? ( >=dev-python/sqlalchemy-0.7[sqlite]
-	          <dev-python/sqlalchemy-0.8[sqlite] )
-	mysql? ( >=dev-python/sqlalchemy-0.7[mysql]
-	         <dev-python/sqlalchemy-0.8[mysql] )
-	postgres? ( >=dev-python/sqlalchemy-0.7[postgres]
-	            <dev-python/sqlalchemy-0.8[postgres] )
-	ldap? ( dev-python/python-ldap )"
-
-PATCHES=(
-		"${FILESDIR}/glance-gbug-474064-grizzly.patch"
-)
-
-python_install() {
-	distutils-r1_python_install
-	newconfd "${FILESDIR}/glance.confd" glance
-	newinitd "${FILESDIR}/glance.initd" glance
-
-	for function in api registry scrubber; do
-		dosym /etc/init.d/glance /etc/init.d/glance-${function}
-	done
-
-	diropts -m 0750
-	dodir /var/run/glance /var/log/nova /var/lock/nova
-	keepdir /etc/glance
-	insinto /etc/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"
-}
diff --git a/app-admin/glance/glance-2013.1.2-r3.ebuild b/app-admin/glance/glance-2013.1.3.ebuild
index 4fbe9399cbbe..29a3448a661f 100644
--- a/app-admin/glance/glance-2013.1.2-r3.ebuild
+++ b/app-admin/glance/glance-2013.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.1.2-r3.ebuild,v 1.1 2013/07/02 15:33:35 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.1.3.ebuild,v 1.1 2013/08/11 01:00:33 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -54,8 +54,8 @@ RDEPEND="${DEPEND}
 	ldap? ( dev-python/python-ldap )"
 
 PATCHES=(
-		"${FILESDIR}/glance-gbug-474064-grizzly.patch"
 )
+#		"${FILESDIR}/glance-gbug-474064-grizzly.patch"
 
 python_install() {
 	distutils-r1_python_install