public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sys-auth/keystone: keystone-2014.2.9999.ebuild keystone-2014.2.2.ebuild ChangeLog keystone-9999.ebuild
@ 2015-02-08  1:59 Matt Thode (prometheanfire)
  0 siblings, 0 replies; only message in thread
From: Matt Thode (prometheanfire) @ 2015-02-08  1:59 UTC (permalink / raw
  To: gentoo-commits

prometheanfire    15/02/08 01:59:11

  Modified:             keystone-2014.2.9999.ebuild
                        keystone-2014.2.2.ebuild ChangeLog
  Removed:              keystone-9999.ebuild
  Log:
  fixing deps
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)

Revision  Changes    Path
1.4                  sys-auth/keystone/keystone-2014.2.9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/keystone/keystone-2014.2.9999.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/keystone/keystone-2014.2.9999.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/keystone/keystone-2014.2.9999.ebuild?r1=1.3&r2=1.4

Index: keystone-2014.2.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2014.2.9999.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- keystone-2014.2.9999.ebuild	9 Dec 2014 01:16:29 -0000	1.3
+++ keystone-2014.2.9999.ebuild	8 Feb 2015 01:59:11 -0000	1.4
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2014.2.9999.ebuild,v 1.3 2014/12/09 01:16:29 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2014.2.9999.ebuild,v 1.4 2015/02/08 01:59:11 prometheanfire Exp $
 
 EAPI=5
 
@@ -19,47 +19,52 @@
 IUSE="+sqlite mysql postgres ldap test"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
-#todo, seperate out rdepend via use flags
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
 	!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
 	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-			>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.10[${PYTHON_USEDEP}]
-			>=dev-python/bashate-0.2[${PYTHON_USEDEP}]
-			dev-lang/python[sqlite]
-			>=dev-python/python-memcached-1.48[${PYTHON_USEDEP}]
-			>=dev-python/pymongo-2.4[${PYTHON_USEDEP}]
-			ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}]
-					>=dev-python/ldappool-1.0[${PYTHON_USEDEP}]
-			)
-			dev-python/pysaml2[${PYTHON_USEDEP}]
-			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-			>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-			>=dev-python/oslotest-1.1.0[${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/webtest-2.0[${PYTHON_USEDEP}]
-			>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-			>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-			>=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
-			!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
-			>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
-			!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
-			>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
-			>=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
-			>=dev-python/lockfile-0.8[${PYTHON_USEDEP}]
-			>=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.10[${PYTHON_USEDEP}]
+		>=dev-python/bashate-0.2[${PYTHON_USEDEP}]
+		dev-lang/python[sqlite]
+		>=dev-python/python-memcached-1.48[${PYTHON_USEDEP}]
+		>=dev-python/pymongo-2.4[${PYTHON_USEDEP}]
+		ldap? (
+			dev-python/python-ldap[${PYTHON_USEDEP}]
+			>=dev-python/ldappool-1.0[${PYTHON_USEDEP}]
+		)
+		dev-python/pysaml2[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.1.0[${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/webtest-2.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+		>=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
+		!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/keyring-2.1[${PYTHON_USEDEP}]
+		!~dev-python/keyring-3.3[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/lockfile-0.8[${PYTHON_USEDEP}]
+		>=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
 	)"
-RDEPEND=">=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+RDEPEND="
+	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
 	>=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.16.0[${PYTHON_USEDEP}]
 	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
 	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
 	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
@@ -68,45 +73,20 @@
 	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
 	sqlite? (
-		|| (
-			(
-				>=dev-python/sqlalchemy-0.8.4[sqlite,${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.8.99[sqlite,${PYTHON_USEDEP}]
-			)
-			(
-				>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
-			)
-		)
+		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
 	)
 	mysql? (
 		dev-python/mysql-python
-		|| (
-			(
-				>=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
-			)
-			(
-				>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-			)
-		)
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
 	)
 	postgres? (
 		dev-python/psycopg:2
-		|| (
-			(
-				>=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
-			)
-			(
-				>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-			)
-		)
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
 	)
-	>=dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
-	!~dev-python/sqlalchemy-migrate-0.9.2[${PYTHON_USEDEP}]
+	~dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
 	dev-python/passlib[${PYTHON_USEDEP}]
 	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
 	>=dev-python/python-keystoneclient-0.10.0[${PYTHON_USEDEP}]
@@ -114,7 +94,9 @@
 	>=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}]
 	!~dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-messaging-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-db-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-serialization-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-1.0.0[${PYTHON_USEDEP}]



1.3                  sys-auth/keystone/keystone-2014.2.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/keystone/keystone-2014.2.2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/keystone/keystone-2014.2.2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/keystone/keystone-2014.2.2.ebuild?r1=1.2&r2=1.3

Index: keystone-2014.2.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2014.2.2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- keystone-2014.2.2.ebuild	8 Feb 2015 01:26:26 -0000	1.2
+++ keystone-2014.2.2.ebuild	8 Feb 2015 01:59:11 -0000	1.3
@@ -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/sys-auth/keystone/keystone-2014.2.2.ebuild,v 1.2 2015/02/08 01:26:26 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2014.2.2.ebuild,v 1.3 2015/02/08 01:59:11 prometheanfire Exp $
 
 EAPI=5
 
@@ -18,8 +18,8 @@
 IUSE="+sqlite mysql postgres ldap test"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
-#todo, seperate out rdepend via use flags
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
 	!~dev-python/pbr-0.7[${PYTHON_USEDEP}]
 	<dev-python/pbr-1.0[${PYTHON_USEDEP}]
@@ -60,8 +60,10 @@
 		>=dev-python/lockfile-0.8[${PYTHON_USEDEP}]
 		>=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
 	)"
-RDEPEND=">=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+RDEPEND="
+	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
 	>=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}]
+	<dev-python/eventlet-0.16.0[${PYTHON_USEDEP}]
 	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
 	>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
 	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
@@ -70,45 +72,20 @@
 	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
 	sqlite? (
-		|| (
-			(
-				>=dev-python/sqlalchemy-0.8.4[sqlite,${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.8.99[sqlite,${PYTHON_USEDEP}]
-			)
-			(
-				>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
-			)
-		)
+		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
 	)
 	mysql? (
 		dev-python/mysql-python
-		|| (
-			(
-				>=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
-			)
-			(
-				>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-			)
-		)
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
 	)
 	postgres? (
 		dev-python/psycopg:2
-		|| (
-			(
-				>=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
-			)
-			(
-				>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
-				<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
-			)
-		)
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
 	)
-	>=dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
-	!~dev-python/sqlalchemy-migrate-0.9.2[${PYTHON_USEDEP}]
+	~dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
 	dev-python/passlib[${PYTHON_USEDEP}]
 	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
 	>=dev-python/python-keystoneclient-0.10.0[${PYTHON_USEDEP}]
@@ -116,7 +93,9 @@
 	>=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}]
 	!~dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-messaging-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-db-1.1.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-serialization-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-utils-1.0.0[${PYTHON_USEDEP}]



1.87                 sys-auth/keystone/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/keystone/ChangeLog?rev=1.87&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/keystone/ChangeLog?rev=1.87&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/keystone/ChangeLog?r1=1.86&r2=1.87

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- ChangeLog	8 Feb 2015 01:26:26 -0000	1.86
+++ ChangeLog	8 Feb 2015 01:59:11 -0000	1.87
@@ -1,6 +1,10 @@
 # ChangeLog for sys-auth/keystone
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.86 2015/02/08 01:26:26 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.87 2015/02/08 01:59:11 prometheanfire Exp $
+
+  08 Feb 2015; Matthew Thode <prometheanfire@gentoo.org> -keystone-9999.ebuild,
+  keystone-2014.2.2.ebuild, keystone-2014.2.9999.ebuild:
+  fixing deps
 
   08 Feb 2015; Matthew Thode <prometheanfire@gentoo.org>
   keystone-2014.2.2.ebuild:





^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2015-02-08  1:59 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-08  1:59 [gentoo-commits] gentoo-x86 commit in sys-auth/keystone: keystone-2014.2.9999.ebuild keystone-2014.2.2.ebuild ChangeLog keystone-9999.ebuild Matt Thode (prometheanfire)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox