fixing up testtools deps

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

5 files changed, 25 insertions, 150 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/Manifest b/app-admin/glance/Manifest
index 03a428fd4db4..aff6f99fc3c2 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -12,27 +12,26 @@ DIST glance-2013.1.4.tar.gz 724110 SHA256 dfb8070a12bbf5761db1c55d21db4772fe81ed
 DIST glance-2013.2.tar.gz 1614843 SHA256 135fb1b6fe8410894b9d070071e1b7d7ddd37fb7c7267e2644e91e2b5448d6e5 SHA512 38f9f38a79c18b8ea32c36052434c48b6558cbc0a92e3855d4e6f6961b160e22b78d7c89ff52f877ce93f312c6e3f87573e4545c44d1ce20dddb626f7a747017 WHIRLPOOL 6254cee35ac9b36c7a0894332d5222fbc31240360c90a75b22d944bd499a480533fd9248a95c245575dbc79354dd2cb835e194832ea035e9cbfbb7fb4132f7c2
 EBUILD glance-2013.1.4.ebuild 3146 SHA256 1ea12e958ef036f33d7479bf594251c189d922af33cf4ddb0441ad429193bd96 SHA512 b8fa8788dbd8274fa43fa0dfe88fc8f43f832a82913d4816174bf771639eeb907659faad3315981706bac41b7143b75c5c3ae50d5ad8794d4fd9c88c932ae99a WHIRLPOOL 6a7826ce32d9ba75111c58d130366602d706f406ad0cfd4fa17f42694d73c985cf0c19ffb3f26f78fad58cf88f101456bd6e4614c29f54609e620c313f19626d
 EBUILD glance-2013.1.9999.ebuild 3108 SHA256 d5c2be3191fe463325739e687b6c1bcd8a3a0368a74070e505e0af99d7426c47 SHA512 9184b27115d249582d04a8685f5d9388613456007ab672dc91fc466f17cacb44a2b7f12367ad32300b745ed1ae59e6649348e6eedc87b4f82bf7e14325665727 WHIRLPOOL e770e0e34c1cf1a18241027bf6dc65b20cf44ce082aec50aa46b1414e03fcb0edbdf4a5329db4b045afa1ee6d3dc67939113d84c97036bf2404baf18a0c5d567
-EBUILD glance-2013.2-r1.ebuild 4819 SHA256 f00d7c59e5c6820250e8c6fd6620185f5c1a6559cd3c03ba3596176fd4a0d233 SHA512 379ebe6b0b49a7cd55f14845c246ef74e39135c864337e296ca443217461636904e25cfbeb22cd20f16f68e4f23532a228f33520b69a3a6fc4244e9c6d081a02 WHIRLPOOL b4b7fd7453e463ecfe5e9b4e2b89668e61df6c0bdd675def166f5b2d38513a81aa5120976f91344749dc121331694e94a4b25a1537178a8d034e6c1c2a69c792
-EBUILD glance-2013.2-r2.ebuild 5189 SHA256 91111996da560d1463dc77caa6c4d553225262ac079995bfa0c6b254ff6d8174 SHA512 38967a6d4c4240121b7178c498dc7142dcee6e72fcb5dec2ed62a23d90ab44ef9425a30569cafe0d4d6c2fb711caa7a681a0d87eb942a1be7b0bfae81ab4fd36 WHIRLPOOL 862b1e44147a0550259638e0bd83692c07cd896582ec3691ebe2943eec886a75aabc7e85698d07fa4cc17c00e7778e2940876ef05d0e8f9e81b378136e2fcbcd
-EBUILD glance-2013.2.9999.ebuild 5209 SHA256 e9df2042025369eb834e58ff5b839b74a24ac343b5595d95f1f9de931c0b1ce7 SHA512 76a5f68f5bd07211d9ce0b433a3927b611cc4fd46b33a362d94ea87feee4e27b91bd3b09e13bff20d258ab6bb8d6a0d2673720466db4b7fc6d6fb943727d8fea WHIRLPOOL 9ed2b112e31ac0aa3f340af053aafcc773d0c05b050c0e7da5e3ee994156d782079466bba3be9318926017e8cd392740754d5c4487e41691242e5d58c59ea483
+EBUILD glance-2013.2-r2.ebuild 5186 SHA256 8793661acf115175388ac9b5f56fae205abcf50e9e0c58c0618ec0492e9cb679 SHA512 f060edbad68bb06425cf9b11a44e2d405d67c05d8763274e0097e634115366d0bf5deeb530b005bbf5cb80b663c31571f0b730e65b4e332b984ebb18c6544bc3 WHIRLPOOL ad3ff8cc14369dd8ace9661e2afbe3c131ee26eb00e845cc93a64b7a6a9450f0e48eaa406c598471622493d6cbc4ec91436c36da56f41226e0f06c6c6562c013
+EBUILD glance-2013.2.9999.ebuild 5206 SHA256 eeca8c2663530438f28050a698ad9d2d78eaa92b1163e1e02ede9254c65093ca SHA512 fb5498a47792ef6072e62bae106167b835e832556d1dc061f5896aa97037cbf58871fe8b683f46078150909790c1c643c6aac6a766e6e5d7b08a425af7668c4e WHIRLPOOL 458859c64a72276caad22b893345f2a15a8f91c72b3a1a5b1c1f3107766448f5ad31daa2edf01d04f20579d95397ce7a9510f35b15b74f8bc30383cebb512287
 EBUILD glance-2013.2.ebuild 3339 SHA256 b8f47bd6d8a6cbf7b60fcaac9eb71bbf1c46eb0e33113a1b40cefc405e20029d SHA512 2559cad07c9ad4a21a12873029d00a379a9ceacab3551f9ce92869eaef161ad54af17751f5345297f3dbbd156f41c5a8c712767496c5c56d9603a4ecd8c2461c WHIRLPOOL 79d22ae2f09b9c5c80f0d2da0852f5429c7f3c431dfbbb0c4e7d768abd77415339144d918a38e19db38258bd8282ea77322363c06fbcd41f4825dcd1ab472918
 EBUILD glance-9999.ebuild 3031 SHA256 70283c6d4784f1a524210e9fb994f5e2ab14a133581f509f833253a2fc07243f SHA512 a79d8ae559f26eba446c25ff48c58cc524bb399862dae936fed91c129facde0da906019458b586102ad5d13fe025eddf2d2a19b57a74e9395b5e6ecf33f05637 WHIRLPOOL a8ed52c906b9d840b312b39f458780aed6f42b1b0dd6a67fe5e27b04a5926bb5565ceed7ba425eceae5c43aceb3335272714d58ad64f5121e35db5d132db476b
-MISC ChangeLog 5923 SHA256 6981aea9e782d441ece2f59856df29d6d22b5ed6b1a424d2caa210ef63710874 SHA512 6209e6a66620b8cb42aa35198f56bbb70ab634e66afb4ab1a295da726eb53e280fb75cb779cb9c8a42ab47a61c6a25f6421ffc5c9ab508bb0f319002478d8fb4 WHIRLPOOL 123e40864cda360a6b82b537883db10b9f9bd7c913ea017661c8ef163af31da8029283ac8a74a8c38c2855ad468a9437cbfd396f465ba02f20d89471d342f151
+MISC ChangeLog 6088 SHA256 0072f79039c792921033a0e308b1391d054fadef565213f99286df286e55c12d SHA512 19e9ec6ad0948eaeda76088c707c25e87c2d3f047ef6171a148f8d71a6bbeae042c1aeb7587f9c89ef81e3b4bf9220a847c80ef5008af9aaf91f5f988a39b5c1 WHIRLPOOL 741fb5a961a0fa64d6d3e82486e589522a8b6c1d79eb66caea1cc08b25e749a56736ed8a2f795a60d3ce57eab5d375bc1f11fa5d80c6c2437098949f0aa195a4
 MISC metadata.xml 551 SHA256 de9d9d349c334c740b04384a4f1288e7f2f8491751c38b5846fa5fdc801dd3c0 SHA512 0141af1612f84846713c8ffe8d0c4e653a77772d4e050deb5b9a47882aed9f803c7a0ebe7709f64279b04a19658f10da4aef962a70ecc7aebc2e7dce2ede4c68 WHIRLPOOL 4858e7841f26f04b1e35838cfb475cf34506fdb26e1a03f75c219d599dddac73fbc3429c80b5ac7c752fe2782445e2d492f58fc0b87da44ddc6d03b4710c8f13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSiYP3AAoJECRx6z5ArFrDVYwQANgV9TjDjbQQZ7llm3oDseTO
-XQQui2URdoLmC8EapSG/2qqwlSxOL55HBTVkhoqTZ220kB9GG1mdL9TwT8REl5dT
-iAiV+MEUehWojq8JB8qmXK44ffSF3i7QeVkw2SsFUNiLHsDpPdYgkZKrvHp7FPHc
-QE07c2H0t8d1rZtfhBItHEvK/dw/Ed0AZ11RbCXdzsIUeBXYKtIfoGp/euPVGD14
-72qnLllyfQ8Wg6x7iBn8uE2W6BphLWHg9fKOHNdBHI55dvREpEnP0oVbmy3UeVWi
-aPL7ec9WjuiZpcBavOIhzdePlHag2Ai52mHrhblpkSdNPU6qBIJlOkyrjU8+iQod
-XEt0yReFIgYDnpxRM/N7mZB2bI+MP1GRfNKbNNydzzYj/Q5R/x0RsK6vUPX+E7Mq
-Og1n9B/sGoYe+2f6yYrMEfFHEXMC0LJtaXImsDZi7kdDb/fAyXct3N+AbXGEjwGU
-CFO28dVG2Vu9RiDo30L/Q8VVOrlf23Y95yFKKAwgjAZO5czuy4ckxDLqdMSs/Q5W
-JdyOtiETajOh0t6HCE+n5221UUAHYps/RGwFtb8S1gJhqlhMOf93HfmFw142S3vi
-QYO1LeyK5iCJ4uMNW4XCgoTTCgYTWwyfcjZuLUX5ODWVjZf0suXgh3+cTdZwMnLp
-+2Mgv6rTfzRMKWGGItu7
-=5Ymd
+iQIcBAEBCAAGBQJSslVMAAoJECRx6z5ArFrDtEcP/0l/PhllbBCYeXXltEGukVjK
+9vrxisx24CT8I3aZnUulP8aybfOwqyj4MabjhVn9CjU7wJDtUrlHEx3kAPGsWrzV
+hYcziR8aMy70JsjgjyzMgr5WFj94TtHOlkQvdzLSlw+++HuDZiWUksy72LLm3s3a
+BdHwlesU4hmHfO0xencSn9OACXN5BqsiFhV12mlMF923wFrVlOr4ufQUq27gc5bQ
+XCRBgj70lbeEn3e99yjUwNBfb96rnCsc2KEoMpBK8QQDGSKJH2J51tm+WX7WZkUZ
+loTrjq+JVD7S3WRe9Ztoh72Xvakc/AWBfqPfrpVFVyonLghYbyp3oc8Dxkg5pdnU
+ae0t6KGLl8jMqKyUDBa9eYm2VNG+9FAgkENCZXc2BNl6kUHPBNXYtabx7yevelZu
+TuEs9AB9xvT3+PJb4OUxJC+8pSmemRJK7jznjPuAehz3msl6OOvrO1bHGRbvots9
+bm4GECGcad5yoaOJOYya1jxtaoUVhja4hVac6vn77DVlxv3qrIkuF6gwwvdSg4FS
+ahVLqSeEUIpNPy3nhDRAhQ6Osuleg8k3q2vk2WPr5HFA/8MMfXx8ibMXS9JE0a+4
+8u1Z20z6jGQnfaMcySOTTXRpdNOfjOXrfDmWBF9sMJ5o3ppC114FzzLFDOZYCtas
+rH5hcieo5HrI2fmzNrPb
+=iE0S
 -----END PGP SIGNATURE-----
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}]