From 5662003f15584a3fbd8e507ebcaa4782429e5b97 Mon Sep 17 00:00:00 2001 From: Matt Thode Date: Mon, 13 Apr 2015 01:53:21 +0000 Subject: [PATCH] bup Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x33ED3FD25AFC78BA --- app-admin/glance/ChangeLog | 9 ++++++- ...4.2.2-r2.ebuild => glance-2014.2.3.ebuild} | 27 ++++++++++++------- app-admin/glance/glance-2014.2.9999.ebuild | 4 +-- 3 files changed, 28 insertions(+), 12 deletions(-) rename app-admin/glance/{glance-2014.2.2-r2.ebuild => glance-2014.2.3.ebuild} (86%) diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog index 6e7dc370a9e0..3ad4570393d4 100644 --- a/app-admin/glance/ChangeLog +++ b/app-admin/glance/ChangeLog @@ -1,6 +1,13 @@ # 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.62 2015/03/23 06:41:02 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.63 2015/04/13 01:53:21 prometheanfire Exp $ + +*glance-2014.2.3 (13 Apr 2015) + + 13 Apr 2015; Matthew Thode + +glance-2014.2.3.ebuild, -glance-2014.2.2-r2.ebuild, + glance-2014.2.9999.ebuild: + bup 23 Mar 2015; Ian Delaney glance-2014.2.2-r2.ebuild: reset border to dep pysendfile ahead of upstream who will in time do it, diff --git a/app-admin/glance/glance-2014.2.2-r2.ebuild b/app-admin/glance/glance-2014.2.3.ebuild similarity index 86% rename from app-admin/glance/glance-2014.2.2-r2.ebuild rename to app-admin/glance/glance-2014.2.3.ebuild index 946b918c4674..406c2bd3d502 100644 --- a/app-admin/glance/glance-2014.2.2-r2.ebuild +++ b/app-admin/glance/glance-2014.2.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2014.2.2-r2.ebuild,v 1.2 2015/03/23 06:41:02 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2014.2.3.ebuild,v 1.1 2015/04/13 01:53:21 prometheanfire Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) @@ -18,33 +18,41 @@ KEYWORDS="~amd64 ~x86" IUSE="doc mysql postgres +sqlite +swift test" REQUIRED_USE="|| ( mysql postgres sqlite )" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/pbr-0.8.0[${PYTHON_USEDEP}] =dev-python/hacking-0.8.0[${PYTHON_USEDEP}] =dev-python/Babel-1.3[${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/requests-1.2.1[${PYTHON_USEDEP}] - !~dev-python/requests-2.4.0[${PYTHON_USEDEP}] + >=dev-python/requests-2.1.0[${PYTHON_USEDEP}] + =dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] - >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] + =dev-python/testtools-0.9.34[${PYTHON_USEDEP}] + !~dev-python/testtools-1.4.0[${PYTHON_USEDEP}] + =dev-python/psutil-1.1.1[${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}] + =dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] + =dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}] <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}] diff --git a/app-admin/glance/glance-2014.2.9999.ebuild b/app-admin/glance/glance-2014.2.9999.ebuild index 7d3690995f2e..721562935a27 100644 --- a/app-admin/glance/glance-2014.2.9999.ebuild +++ b/app-admin/glance/glance-2014.2.9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2014.2.9999.ebuild,v 1.7 2015/03/11 19:57:00 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2014.2.9999.ebuild,v 1.8 2015/04/13 01:53:21 prometheanfire Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 ) @@ -42,7 +42,7 @@ DEPEND="dev-python/setuptools[${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}] -- 2.26.2