Fix dependencies.

Package-Manager: portage-2.2.0_alpha4_p23/cvs/Linux x86_64

6 files changed, 19 insertions, 26 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/Manifest b/www-apps/trac/Manifest
index 7f9e8cb1110d..fc0bd7e953dc 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -5,9 +5,9 @@ AUX tracd.initd 939 RMD160 e488e124127eae14ea5dd637b31562bd64df872b SHA1 ffcb533
 DIST Trac-0.11.7.tar.gz 757073 RMD160 d55cc6095f00df4736b677163405b31cdd285341 SHA1 0a1b756ca580ecaac7e76531e80890728b976122 SHA256 c6af8cc9fa0cb8fd74611896e46a436cef9660b77be1972a99b0d3ddb894232f
 DIST Trac-0.12.1.tar.gz 2170563 RMD160 3f5e61e27d6217995a9c87401c0c57e4d353d8aa SHA1 062e335a2f5bf6dd5f858711cf38419f73f286b1 SHA256 7ab452a99e61be9cc6b6fd7dbcfa6e4f5d1760480a132dc41c6fe2fce10c73a4
 DIST Trac-0.12.tar.gz 2107428 RMD160 aca8d024a582519cefef07053517d14722f87609 SHA1 f13a5caf2ab353248f696dc5320df7a27c102e06 SHA256 a1c15c0c3a0c717e6d50d4e4f949b8e8c510a308611013c45c6253c675e805cf
-EBUILD trac-0.11.7.ebuild 2512 RMD160 8e40293e34a781158272bf3368fe5a69978e1c8e SHA1 952296553933c676173e53bdb94d6f350ea1fb1b SHA256 7a03c1db12331a0f79d0c6fee1661a2922240cd4defc772431b1c3e1d52295ee
-EBUILD trac-0.12-r1.ebuild 2744 RMD160 8dea5d5400aa91629301dc4f421c777f171a1426 SHA1 d2f19cccdafe5435dbf0b6fe5ba8d00c542eff62 SHA256 dcd44a0461a4050bbb7fdf231bed9c52f60625e8980a7ada8cd6495da38e3288
-EBUILD trac-0.12.1.ebuild 2743 RMD160 71987bcfded467b5fc6c359d8212f638b52849ce SHA1 15e79d6f8693323994970551bda6ad218a112d6b SHA256 dd178162b5fbcc0be00626e5c3737bc4ff970ce1031653e26147865a3953c70c
-EBUILD trac-0.12.ebuild 2813 RMD160 d8da140f004c833742a800ba9511cbc6a12348c9 SHA1 c6abb0e86db82644795bb21d76617fb55918aa2a SHA256 6ab01cd22f8593f9e2c59494fc74721691dba1dbcc3f179218e709d9b6800e06
-MISC ChangeLog 16793 RMD160 7c97d2a59150a0c123d7d32a91e11b90fbad93d9 SHA1 0d4dd9a30281c2a7b78396b38533612b6e765ad5 SHA256 d14a1be3e29eacef50f3abd993b42094a2a4014a5465e7fd6c1d10291301c78e
+EBUILD trac-0.11.7.ebuild 2558 RMD160 703644caf0dddb4daf13a7fb404145af48bb2906 SHA1 c51ca55afe85539a0160c1f7753ff5788699381a SHA256 f2d2866b10a50e9a023265b7d5344a8870f185a42d1d46bc982f72d2d6e7c61d
+EBUILD trac-0.12-r1.ebuild 2795 RMD160 bc2c5bb7b1c1f26e56bcd8ff547db51332ba2816 SHA1 2df59ef225c2037f4ac15d131b302a28f7d350fb SHA256 19cbd64fd9523bb7af7395299a637e64c8c433ca4971c8c2207b5162a7676a66
+EBUILD trac-0.12.1.ebuild 2794 RMD160 a3fbfcaf17abca4f1a573c50960bf1bec003c1ac SHA1 cba6ffafc3a11d02c4a3c3acacc454b21f0be95f SHA256 af23016d65597e9424c8e6c80fc91a1953a408aee843ceb07eb7f27ea7a9c448
+EBUILD trac-0.12.ebuild 2861 RMD160 b218b9a80b6fdb9627b8075dd05c5490c5b4a7f2 SHA1 eb52be18898315384ab815d7f8f6fe085ddc4ea8 SHA256 7d5823a9991d9e5c1f5a86a3bb83ab3ab69758783251cfa1f7952108f35e2322
+MISC ChangeLog 16975 RMD160 582d7ef676c3aa04bbabb1ba6db985ad6e1d068f SHA1 e455b1f9e4a717c5c052b0b19a41ded01d1e3e63 SHA256 04664c4f7f8f31d63fb1714e3aaee554c24a28ea553715b5094c12b252cf9451
 MISC metadata.xml 353 RMD160 f4472ab9ab13edf764e019de289cd8658c8c9f41 SHA1 0d13970ae85fc0d2ebe0960ea78457b0b1da29c3 SHA256 12d6ceeed2212b5daf258a1dc4fee3fb6acd607e866e4062a907c157ac387059
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