Fix dependencies.

(Portage version: 2.2.0_alpha4_p23/cvs/Linux x86_64)

5 files changed, 14 insertions, 21 deletions

diff --git a/www-apps/trac/ChangeLog b/www-apps/trac/ChangeLog
index fcb6f00f5c8d..bc36ab58e837 100644
--- a/www-apps/trac/ChangeLog
+++ b/www-apps/trac/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/trac
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/ChangeLog,v 1.110 2010/10/20 11:22:52 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/ChangeLog,v 1.111 2010/11/15 15:36:06 arfrever Exp $
+
+  15 Nov 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  trac-0.11.7.ebuild, trac-0.12.ebuild, trac-0.12-r1.ebuild,
+  trac-0.12.1.ebuild:
+  Fix dependencies.
 
 *trac-0.12.1 (20 Oct 2010)
 
diff --git a/www-apps/trac/trac-0.11.7.ebuild b/www-apps/trac/trac-0.11.7.ebuild
index e4d0b1f71a00..79cc3e3cca53 100644
--- a/www-apps/trac/trac-0.11.7.ebuild
+++ b/www-apps/trac/trac-0.11.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.11.7.ebuild,v 1.6 2010/06/22 18:55:13 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.11.7.ebuild,v 1.7 2010/11/15 15:36:06 arfrever Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
@@ -47,10 +47,7 @@ RDEPEND="
 	)
 	sqlite? (
 		>=dev-db/sqlite-3.3.4
-		|| (
-			>=dev-lang/python-2.5[sqlite]
-			>=dev-python/pysqlite-2.3.2
-		)
+		|| ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] >=dev-python/pysqlite-2.3.2 )
 	)
 	subversion? (
 		>=dev-vcs/subversion-1.4.2[python]
diff --git a/www-apps/trac/trac-0.12-r1.ebuild b/www-apps/trac/trac-0.12-r1.ebuild
index 39f593773408..c21e8a13ad2d 100644
--- a/www-apps/trac/trac-0.12-r1.ebuild
+++ b/www-apps/trac/trac-0.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.12-r1.ebuild,v 1.1 2010/08/13 13:23:44 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.12-r1.ebuild,v 1.2 2010/11/15 15:36:06 arfrever Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
@@ -38,10 +38,7 @@ RDEPEND="
 	postgres? ( >=dev-python/psycopg-2 )
 	sqlite? (
 		>=dev-db/sqlite-3.3.4
-		|| (
-			>=dev-lang/python-2.5[sqlite]
-			>=dev-python/pysqlite-2.3.2
-		)
+		|| ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] >=dev-python/pysqlite-2.3.2 )
 	)
 	subversion? ( dev-vcs/subversion[python] )
 	!www-apps/trac-webadmin
diff --git a/www-apps/trac/trac-0.12.1.ebuild b/www-apps/trac/trac-0.12.1.ebuild
index 39570b45dd18..4c1118719f5b 100644
--- a/www-apps/trac/trac-0.12.1.ebuild
+++ b/www-apps/trac/trac-0.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.12.1.ebuild,v 1.1 2010/10/20 11:22:52 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.12.1.ebuild,v 1.2 2010/11/15 15:36:06 arfrever Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
@@ -38,10 +38,7 @@ RDEPEND="
 	postgres? ( >=dev-python/psycopg-2 )
 	sqlite? (
 		>=dev-db/sqlite-3.3.4
-		|| (
-			>=dev-lang/python-2.5[sqlite]
-			>=dev-python/pysqlite-2.3.2
-		)
+		|| ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] >=dev-python/pysqlite-2.3.2 )
 	)
 	subversion? ( dev-vcs/subversion[python] )
 	!www-apps/trac-webadmin
diff --git a/www-apps/trac/trac-0.12.ebuild b/www-apps/trac/trac-0.12.ebuild
index 6407e39a9db9..9fad9710f270 100644
--- a/www-apps/trac/trac-0.12.ebuild
+++ b/www-apps/trac/trac-0.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.12.ebuild,v 1.6 2010/10/19 18:10:26 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.12.ebuild,v 1.7 2010/11/15 15:36:06 arfrever Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
@@ -42,10 +42,7 @@ RDEPEND="
 	postgres? ( >=dev-python/psycopg-2 )
 	sqlite? (
 		>=dev-db/sqlite-3.3.4
-		|| (
-			>=dev-lang/python-2.5[sqlite]
-			>=dev-python/pysqlite-2.3.2
-		)
+		|| ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] >=dev-python/pysqlite-2.3.2 )
 	)
 	subversion? ( >=dev-vcs/subversion-1.4.2[python] )
 	!www-apps/trac-webadmin