fixing up testtools deps

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

4 files changed, 9 insertions, 133 deletions

diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog
index 65b61912d5db..b9f84c856151 100644
--- a/app-admin/glance/ChangeLog
+++ b/app-admin/glance/ChangeLog
@@ -1,6 +1,10 @@
 # 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.26 2013/11/18 03:02:59 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.27 2013/12/19 02:08:50 prometheanfire Exp $
+
+  19 Dec 2013; Matthew Thode <prometheanfire@gentoo.org>
+  -glance-2013.2-r1.ebuild, glance-2013.2-r2.ebuild, glance-2013.2.9999.ebuild:
+  fixing up testtools deps
 
   18 Nov 2013; Matthew Thode <prometheanfire@gentoo.org> +files/glance-3.initd,
   glance-2013.2-r2.ebuild, glance-2013.2.9999.ebuild:
diff --git a/app-admin/glance/glance-2013.2-r1.ebuild b/app-admin/glance/glance-2013.2-r1.ebuild
deleted file mode 100644
index c136132add9d..000000000000
--- a/app-admin/glance/glance-2013.2-r1.ebuild
+++ /dev/null
@@ -1,128 +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.2-r1.ebuild,v 1.1 2013/11/13 12:30:45 idella4 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}/havana/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc mysql postgres +sqlite +swift test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-0.3.12[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
-			dev-python/nose-exclude[${PYTHON_USEDEP}]
-			>=dev-python/openstack-nose-plugin-0.7[${PYTHON_USEDEP}]
-			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-			>=dev-python/nosehtmloutput-0.0.3[${PYTHON_USEDEP}]
-			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-			>=dev-python/testtools-0.9.24-r1[${PYTHON_USEDEP}]
-			>=dev-python/psutil-0.6.1[${PYTHON_USEDEP}]
-			dev-python/mysql-python[${PYTHON_USEDEP}]
-			dev-python/psycopg[${PYTHON_USEDEP}]
-			>=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
-			=dev-python/pep8-1.4.5[${PYTHON_USEDEP}]
-			=dev-python/pyflakes-0.7.2[${PYTHON_USEDEP}]
-			=dev-python/flake8-2.0[${PYTHON_USEDEP}]
-			>=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.7[${PYTHON_USEDEP}]
-			>=dev-python/Babel-0.9.6[${PYTHON_USEDEP}]
-		)
-		doc? ( dev-python/oslo-sphinx )"
-#=dev-python/pysendfile-2.0.0 & dev-python/qpid-python need making and adding to portage under test?
-#note to self, wsgiref is a python builtin, no need to package it
-#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
-
-RDEPEND=">=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
-		sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
-				  <dev-python/sqlalchemy-0.7.99[sqlite,${PYTHON_USEDEP}] )
-		mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
-				 <dev-python/sqlalchemy-0.7.99[mysql,${PYTHON_USEDEP}] )
-		postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
-					<dev-python/sqlalchemy-0.7.99[postgres,${PYTHON_USEDEP}] )
-		>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
-		>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-		>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
-		<dev-python/webob-1.3[${PYTHON_USEDEP}]
-		virtual/python-argparse[${PYTHON_USEDEP}]
-		>=dev-python/boto-2.4.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-migrate-0.7.2[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
-		>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
-		swift? (
-			>=dev-python/python-swiftclient-1.5[${PYTHON_USEDEP}]
-			<dev-python/python-swiftclient-2[${PYTHON_USEDEP}]
-		)
-		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-		dev-python/paste[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-1.3.0[${PYTHON_USEDEP}]
-		!~dev-python/jsonschema-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/python-cinderclient-1.0.4[${PYTHON_USEDEP}]
-		>=dev-python/python-keystoneclient-0.3.0[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${P}-sphinx_mapping.patch )
-
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py build_sphinx
-}
-
-python_test() {
-	nosetests glance/ -I test_notifier.py || die "tests failed under python2.7"
-}
-
-python_install() {
-	distutils-r1_python_install
-	newconfd "${FILESDIR}/glance.confd" glance
-	newinitd "${FILESDIR}/glance-2.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"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/app-admin/glance/glance-2013.2-r2.ebuild b/app-admin/glance/glance-2013.2-r2.ebuild
index db0fc8426d4b..77d91da25b8c 100644
--- a/app-admin/glance/glance-2013.2-r2.ebuild
+++ b/app-admin/glance/glance-2013.2-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.2-r2.ebuild,v 1.2 2013/11/18 03:02:59 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.2-r2.ebuild,v 1.3 2013/12/19 02:08:50 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -30,7 +30,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 			>=dev-python/nosehtmloutput-0.0.3[${PYTHON_USEDEP}]
 			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
 			>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-			<=dev-python/testtools-0.9.24-r1[${PYTHON_USEDEP}]
+			>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}]
 			>=dev-python/psutil-0.6.1[${PYTHON_USEDEP}]
 			dev-python/mysql-python[${PYTHON_USEDEP}]
 			dev-python/psycopg[${PYTHON_USEDEP}]
diff --git a/app-admin/glance/glance-2013.2.9999.ebuild b/app-admin/glance/glance-2013.2.9999.ebuild
index 009140a2975d..f719ec97d0dc 100644
--- a/app-admin/glance/glance-2013.2.9999.ebuild
+++ b/app-admin/glance/glance-2013.2.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.2.9999.ebuild,v 1.3 2013/11/18 03:02:59 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2013.2.9999.ebuild,v 1.4 2013/12/19 02:08:50 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -31,7 +31,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 			>=dev-python/nosehtmloutput-0.0.3[${PYTHON_USEDEP}]
 			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
 			>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-			<=dev-python/testtools-0.9.24-r1[${PYTHON_USEDEP}]
+			>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}]
 			>=dev-python/psutil-0.6.1[${PYTHON_USEDEP}]
 			dev-python/mysql-python[${PYTHON_USEDEP}]
 			dev-python/psycopg[${PYTHON_USEDEP}]