updating glance to 2013.1.3

(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)

3 files changed, 10 insertions, 86 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/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