9999 version of stable/grizlly for glance

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

4 files changed, 197 insertions, 9 deletions

diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog
index f479fd82d045..7c79afbe6b48 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.12 2013/07/02 15:33:35 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.13 2013/08/02 18:17:27 prometheanfire Exp $
+
+*glance-2013.1.2-r2 (02 Aug 2013)
+*glance-2013.1.9999 (02 Aug 2013)
+
+  02 Aug 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +glance-2013.1.2-r2.ebuild, +glance-2013.1.9999.ebuild, glance-9999.ebuild:
+  9999 version of stable/grizlly for glance
 
 *glance-2012.2.4-r3 (02 Jul 2013)
 *glance-2013.1.2-r3 (02 Jul 2013)
diff --git a/app-admin/glance/glance-2013.1.2-r2.ebuild b/app-admin/glance/glance-2013.1.2-r2.ebuild
new file mode 100644
index 000000000000..93791f1507ea
--- /dev/null
+++ b/app-admin/glance/glance-2013.1.2-r2.ebuild
@@ -0,0 +1,83 @@
+# 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.9999.ebuild b/app-admin/glance/glance-2013.1.9999.ebuild
new file mode 100644
index 000000000000..aa09e6f42623
--- /dev/null
+++ b/app-admin/glance/glance-2013.1.9999.ebuild
@@ -0,0 +1,83 @@
+# 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.9999.ebuild,v 1.1 2013/08/02 18:17:27 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit git-2 distutils-r1
+
+DESCRIPTION="Provides services for discovering, registering, and retrieving
+virtual machine images with Openstack"
+HOMEPAGE="https://launchpad.net/glance"
+EGIT_REPO_URI="https://github.com/openstack/glance.git"
+EGIT_BRANCH="stable/grizzly"
+
+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 )"
+
+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/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
+
+	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-9999.ebuild b/app-admin/glance/glance-9999.ebuild
index 744c0a67d8ab..9fb9e157bf58 100644
--- a/app-admin/glance/glance-9999.ebuild
+++ b/app-admin/glance/glance-9999.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-9999.ebuild,v 1.3 2013/04/11 07:25:24 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-9999.ebuild,v 1.4 2013/08/02 18:17:27 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -11,6 +11,7 @@ DESCRIPTION="Provides services for discovering, registering, and retrieving
 virtual machine images with Openstack"
 HOMEPAGE="https://launchpad.net/glance"
 EGIT_REPO_URI="https://github.com/openstack/glance.git"
+EGIT_BRANCH="master"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -26,7 +27,8 @@ RDEPEND="${DEPEND}
 	>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
 	dev-python/httplib2[${PYTHON_USEDEP}]
 	dev-python/iso8601[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${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}]
@@ -45,11 +47,11 @@ RDEPEND="${DEPEND}
 		<dev-python/python-swiftclient-2[${PYTHON_USEDEP}]
 	)
 	sqlite? ( >=dev-python/sqlalchemy-0.7[sqlite]
-	          <=dev-python/sqlalchemy-0.7.9[sqlite] )
+	          <=dev-python/sqlalchemy-0.8[sqlite] )
 	mysql? ( >=dev-python/sqlalchemy-0.7[mysql]
-	         <=dev-python/sqlalchemy-0.7.9[mysql] )
+	         <=dev-python/sqlalchemy-0.8[mysql] )
 	postgres? ( >=dev-python/sqlalchemy-0.7[postgres]
-	            <=dev-python/sqlalchemy-0.7.9[postgres] )
+	            <=dev-python/sqlalchemy-0.8[postgres] )
 	ldap? ( dev-python/python-ldap )"
 
 python_install() {
@@ -62,7 +64,20 @@ python_install() {
 	done
 
 	diropts -m 0750
-	dodir /var/run/glance /var/log/nova /var/lock/nova
-	#removed because it conflicts with glanceclient, which we install in rdepend
-	rm ${D}"/usr/bin/glance" ${D}"/usr/bin/glance-python2.7"
+	dodir /var/run/glance /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
+
+	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"
 }