bup

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x33ED3FD25AFC78BA

diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog
index 6e7dc370a9e05a5d7b040f32ed4160210301f160..3ad4570393d49301dfa003a96733e16f2147f828 100644 (file)
--- 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 <prometheanfire@gentoo.org>
+  +glance-2014.2.3.ebuild, -glance-2014.2.2-r2.ebuild,
+  glance-2014.2.9999.ebuild:
+  bup
 
   23 Mar 2015; Ian Delaney <idella4@gentoo.org> 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 946b918c4674f175752e39d1ede8d8ec8d1e7592..406c2bd3d502a2a43e490252dc02624ccc38c7e0 100644 (file)
--- 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/pbr-1.0[${PYTHON_USEDEP}]
                test? (
                        ${RDEPEND}
                        >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
                        <dev-python/hacking-0.9[${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/coverage-3.7.2[${PYTHON_USEDEP}]
                        >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+                 <dev-python/fixtures-1.0.1[${PYTHON_USEDEP}]
                        >=dev-python/mock-1.0[${PYTHON_USEDEP}]
+                 <dev-python/mock-1.0.2[${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/sphinx-1.3[${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/requests-2.4.0[${PYTHON_USEDEP}]
                        >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-                       >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
+                 <dev-python/testrepository-0.0.21[${PYTHON_USEDEP}]
+                 >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
+                 !~dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+                 <dev-python/testtools-1.5.1[${PYTHON_USEDEP}]
                        >=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
                        <dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
-                       dev-python/mysql-python[${PYTHON_USEDEP}]
-                       dev-python/psycopg[${PYTHON_USEDEP}]
+                       <dev-python/mysql-python-1.2.4[${PYTHON_USEDEP}]
+                       <dev-python/psycopg-2.7[${PYTHON_USEDEP}]
                        >=dev-python/pysendfile-2.0.0[${PYTHON_USEDEP}]
-                       dev-python/qpid-python[${PYTHON_USEDEP}]
+                       <dev-python/qpid-python-0.26.2[${PYTHON_USEDEP}]
                        >=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
                        >=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
+                 <dev-python/oslo-sphinx-2.5.1[${PYTHON_USEDEP}]
                )"
 
 #note to self, wsgiref is a python builtin, no need to package it
@@ -52,6 +60,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 
 RDEPEND="
        >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+       <dev-python/greenlet-0.4.3[${PYTHON_USEDEP}]
        sqlite? (
                >=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 7d3690995f2ecd74d870adcc9adf20cbade3877d..721562935a27204694ee1e6fe877167af3a24165 100644 (file)
--- 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/psutil-2.0.0[${PYTHON_USEDEP}]
                        dev-python/mysql-python[${PYTHON_USEDEP}]
                        dev-python/psycopg[${PYTHON_USEDEP}]
-                       ~dev-python/pysendfile-2.0.0[${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}]