From: Matthew Thode <mthode@mthode.org>
Date: Thu, 3 Sep 2015 21:56:42 +0000 (-0500)
Subject: dev-python/oslo-messaging: bup for liberty v2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=37b98f859821ea5b9171e9dc078da20ecf262b6c;p=gentoo.git

dev-python/oslo-messaging: bup for liberty v2

Package-Manager: portage-2.2.20.1
---

diff --git a/dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild b/dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild
index 0a0b6d9c490d..f1332c928a16 100644
--- a/dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild
+++ b/dev-python/oslo-messaging/oslo-messaging-2.4.0.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
 
 inherit distutils-r1
 
@@ -23,18 +23,15 @@ CDEPEND="
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	${CDEPEND}
 	test? (
-		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
-		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.2[${PYTHON_USEDEP}]
 		>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
 		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
 		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
-		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
-		dev-python/qpid-python[${PYTHON_USEDEP}]
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}]
+		dev-python/qpid-python[$(python_gen_usedep 'python2*')]
 		>=dev-python/redis-py-2.10.0[${PYTHON_USEDEP}]
 		>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
 		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
@@ -45,24 +42,32 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	)"
 RDEPEND="
 	${CDEPEND}
-	>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-0.2.0
-	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/futurist-0.1.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-0.6.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
+	>=dev-python/cachetools-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/kombu-2.5.8[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/futures-2.1.6[${PYTHON_USEDEP}]
+	>=dev-python/py-amqp-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/kombu-3.0.7[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-2.4.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-middleware-2.6.0[${PYTHON_USEDEP}]
 	>=dev-python/aioeventlet-0.4[${PYTHON_USEDEP}]
 	>=dev-python/trollius-1.0.0[${PYTHON_USEDEP}]
 "
 
-# This time half the doc files are missing; Do you want them?
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
 
 python_test() {
 	nosetests tests/ || die "test failed under ${EPYTHON}"