summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode <prometheanfire@gentoo.org>2013-09-14 09:35:34 +0000
committerMatthew Thode <prometheanfire@gentoo.org>2013-09-14 09:35:34 +0000
commita9bad49e28da8be03d1e34c8c609d4b013557210 (patch)
tree6e7433af65e74d7cc5238047c42b611b7a58cff5 /app-admin/glance
parentfixes ovs-1.11.0 build failure (diff)
downloadgentoo-2-a9bad49e28da8be03d1e34c8c609d4b013557210.tar.gz
gentoo-2-a9bad49e28da8be03d1e34c8c609d4b013557210.tar.bz2
gentoo-2-a9bad49e28da8be03d1e34c8c609d4b013557210.zip
re-fixing bug 474064, somehow I stopped patching it...
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
Diffstat (limited to 'app-admin/glance')
-rw-r--r--app-admin/glance/ChangeLog9
-rw-r--r--app-admin/glance/glance-2013.1.3-r2.ebuild (renamed from app-admin/glance/glance-2013.1.3-r1.ebuild)3
-rw-r--r--app-admin/glance/glance-2013.1.9999.ebuild6
3 files changed, 15 insertions, 3 deletions
diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog
index 8b1ee0202c1d..a07a29c183ef 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.17 2013/09/12 06:27:28 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.18 2013/09/14 09:35:34 prometheanfire Exp $
+
+*glance-2013.1.3-r2 (14 Sep 2013)
+
+ 14 Sep 2013; Matthew Thode <prometheanfire@gentoo.org>
+ +glance-2013.1.3-r2.ebuild, -glance-2013.1.3-r1.ebuild,
+ glance-2013.1.9999.ebuild:
+ re-fixing bug 474064, somehow I stopped patching it...
12 Sep 2013; Matthew Thode <prometheanfire@gentoo.org> files/glance.initd:
fixing init script for bug 482522
diff --git a/app-admin/glance/glance-2013.1.3-r1.ebuild b/app-admin/glance/glance-2013.1.3-r2.ebuild
index de8b571f112d..c7e2c50fb3da 100644
--- a/app-admin/glance/glance-2013.1.3-r1.ebuild
+++ b/app-admin/glance/glance-2013.1.3-r2.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.3-r1.ebuild,v 1.1 2013/09/12 04:47:49 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.1.3-r2.ebuild,v 1.1 2013/09/14 09:35:34 prometheanfire Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
@@ -54,6 +54,7 @@ RDEPEND="${DEPEND}
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )"
PATCHES=(
+ "${FILESDIR}/glance-gbug-474064-grizzly.patch"
)
# "${FILESDIR}/glance-gbug-474064-grizzly.patch"
diff --git a/app-admin/glance/glance-2013.1.9999.ebuild b/app-admin/glance/glance-2013.1.9999.ebuild
index 1e8c322bb838..1f0b159c0e9a 100644
--- a/app-admin/glance/glance-2013.1.9999.ebuild
+++ b/app-admin/glance/glance-2013.1.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-2013.1.9999.ebuild,v 1.3 2013/09/12 04:47:49 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.1.9999.ebuild,v 1.4 2013/09/14 09:35:34 prometheanfire Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
@@ -54,6 +54,10 @@ RDEPEND="${DEPEND}
<dev-python/sqlalchemy-0.7.10[postgres,${PYTHON_USEDEP}] )
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )"
+PATCHES=(
+ "${FILESDIR}/glance-gbug-474064-grizzly.patch"
+)
+
python_install() {
distutils-r1_python_install
newconfd "${FILESDIR}/glance.confd" glance