Fixes for incoming python-2.5, closing bug #166612.

Package-Manager: portage-2.1.2.11

4 files changed, 45 insertions, 27 deletions

diff --git a/www-apps/trac/ChangeLog b/www-apps/trac/ChangeLog
index a6eecdf179d1..da6b704b0ec0 100644
--- a/www-apps/trac/ChangeLog
+++ b/www-apps/trac/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/trac
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/ChangeLog,v 1.59 2007/07/29 17:41:24 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/ChangeLog,v 1.60 2007/08/19 10:05:14 dju Exp $
+
+  19 Aug 2007; Julien Allanos <dju@gentoo.org> trac-0.10.3.1.ebuild,
+  trac-0.10.4.ebuild:
+  Fixes for incoming python-2.5, closing bug #166612.
 
   29 Jul 2007; Christian Heim <phreak@gentoo.org> trac-0.10.3.1.ebuild,
   trac-0.10.4.ebuild:
diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest
index b988e3e74580..744445357790 100644
--- a/www-apps/trac/Manifest
+++ b/www-apps/trac/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.9.6-postinst-en.txt 2275 RMD160 5434d1d4174621455f3983daf56b6d60b071bee2 SHA1 4cce4d9e6514d6cb6ea425be23b5bcfa641aea37 SHA256 1b89d5b0d69da1aad5be058096e4237ddef9e0b1fd46909495f9297b6b63f85d
 MD5 1ef68ae7232130e8152d6e007afc4352 files/0.9.6-postinst-en.txt 2275
 RMD160 5434d1d4174621455f3983daf56b6d60b071bee2 files/0.9.6-postinst-en.txt 2275
@@ -20,22 +17,22 @@ SHA256 571c1e9b9501f3e271aceef7cd402fbea4be0269cc13691da65077517455955e files/tr
 DIST trac-0.10.3.1.tar.gz 443713 RMD160 02b34dbb41d858c999627ee2201cdbd43e592576 SHA1 4735f453f9bea15d65b71bcbd0e4817ee21f104a SHA256 35cc090d6338a8aae8a902e4b41782a140284381baa9474051ac27fc89261476
 DIST trac-0.10.4.tar.gz 449116 RMD160 9eb843eabf5f986b3d08cd2081f02fe9033abd1e SHA1 2b6db96665cb7753d02de4f7f75beef9a1d97afc SHA256 0061cf11d6d259505ff64252c40baf53e845095437eb56f98d3493fad9701100
 DIST trac-0.9.6.tar.gz 339647 RMD160 3bf086f8c5a6b3b7d6584359dbc916f6ee61dfdc SHA1 b64b193ec014113341f493149e0de2876a32fc7d SHA256 67862c30c2dd0852ba4778a23bba79ab2387e9b40a85b40865cb76c4fa878dfc
-EBUILD trac-0.10.3.1.ebuild 3940 RMD160 304599914bb2588d859e93a7ca9398f7e50dee7a SHA1 ca63a723a82b11d57da98e43c2f53ec8428e2fa6 SHA256 6c9202acd75277ff2f7824cb5073a61aea25ae0c058c5b992fca36249b22fc2c
-MD5 a1195d1ac76c487a96a5e02008d91976 trac-0.10.3.1.ebuild 3940
-RMD160 304599914bb2588d859e93a7ca9398f7e50dee7a trac-0.10.3.1.ebuild 3940
-SHA256 6c9202acd75277ff2f7824cb5073a61aea25ae0c058c5b992fca36249b22fc2c trac-0.10.3.1.ebuild 3940
-EBUILD trac-0.10.4.ebuild 3922 RMD160 3bf3767afacb069a31ec6ba01237af9cc533d481 SHA1 27909758ef45d2dd10e25857a279fa8a762c74ca SHA256 03007acf41ae1bb8b94b214c10a275562bd5c10318f96c4e3ab178bc9d65b106
-MD5 0530acd19487538d4e60f22302176bf0 trac-0.10.4.ebuild 3922
-RMD160 3bf3767afacb069a31ec6ba01237af9cc533d481 trac-0.10.4.ebuild 3922
-SHA256 03007acf41ae1bb8b94b214c10a275562bd5c10318f96c4e3ab178bc9d65b106 trac-0.10.4.ebuild 3922
+EBUILD trac-0.10.3.1.ebuild 4431 RMD160 f2d0d87f61299e19d07c08e94b53cac38dd9c8ce SHA1 98b26246db7a5c08b64aeb61b93a0ac67a307ad2 SHA256 655a476728c0e56f658a042d383d613aa8b3a988158081fab3ef703d37fa6149
+MD5 ba9b88654a76fb2706afb7265d9a0b7f trac-0.10.3.1.ebuild 4431
+RMD160 f2d0d87f61299e19d07c08e94b53cac38dd9c8ce trac-0.10.3.1.ebuild 4431
+SHA256 655a476728c0e56f658a042d383d613aa8b3a988158081fab3ef703d37fa6149 trac-0.10.3.1.ebuild 4431
+EBUILD trac-0.10.4.ebuild 4413 RMD160 028ce54844f8eeaee17e697e4fb2e1842c19c634 SHA1 9cc53f83d0179d20d225f7cc821092ad7791802f SHA256 25c2ac793aab82d5407b050a39e70b9ef413bc50e94ee10961302b001e177ac9
+MD5 0c2390aaa70e72eb40dfa26af5ee21cb trac-0.10.4.ebuild 4413
+RMD160 028ce54844f8eeaee17e697e4fb2e1842c19c634 trac-0.10.4.ebuild 4413
+SHA256 25c2ac793aab82d5407b050a39e70b9ef413bc50e94ee10961302b001e177ac9 trac-0.10.4.ebuild 4413
 EBUILD trac-0.9.6.ebuild 3158 RMD160 5133838b24c969d64e51b121485152082a850d52 SHA1 fcd2ea1473b96d5bff95b275149b2bf923784612 SHA256 13a05b01957917fe42f14e3efa2984262fcbed94ef88665c0f9040a1d711fe42
 MD5 014108e0d18c79770a9d89f01f2f0dae trac-0.9.6.ebuild 3158
 RMD160 5133838b24c969d64e51b121485152082a850d52 trac-0.9.6.ebuild 3158
 SHA256 13a05b01957917fe42f14e3efa2984262fcbed94ef88665c0f9040a1d711fe42 trac-0.9.6.ebuild 3158
-MISC ChangeLog 10260 RMD160 b4d3a011f06b7d095e44bbe4c00337ce87afc18c SHA1 51a883b383360ddf77211ccee070d16428c64e0f SHA256 392edd73a32af1fa1eef9b3a03a313a306936d444ef7a475fadc5b314a94958f
-MD5 17faca785e50a2a0839bfcab9222c3f4 ChangeLog 10260
-RMD160 b4d3a011f06b7d095e44bbe4c00337ce87afc18c ChangeLog 10260
-SHA256 392edd73a32af1fa1eef9b3a03a313a306936d444ef7a475fadc5b314a94958f ChangeLog 10260
+MISC ChangeLog 10403 RMD160 2b6e3c647d08d9aa0775a631350aa6a20ad1cc00 SHA1 100c3e188a3682c1576446a48d1b0f635c8a6e43 SHA256 4b0a0567fbc2f785d7922657511750cb221bf07311598d5e54672dc6df24c846
+MD5 6ac23903bbd4c0e88e868059796d476f ChangeLog 10403
+RMD160 2b6e3c647d08d9aa0775a631350aa6a20ad1cc00 ChangeLog 10403
+SHA256 4b0a0567fbc2f785d7922657511750cb221bf07311598d5e54672dc6df24c846 ChangeLog 10403
 MISC metadata.xml 220 RMD160 dcc7b97d4b6eb6a017014b427fa9fd9c2ce04583 SHA1 2cf693a9408713395fdedb16da9edd6b33e5c2e7 SHA256 09bece3580791397bbf0b4d68ff9ac4abbc37150cf11fe7848f924119ca76b84
 MD5 fc3b5dec4ccef02547c54bf840024aa6 metadata.xml 220
 RMD160 dcc7b97d4b6eb6a017014b427fa9fd9c2ce04583 metadata.xml 220
@@ -49,10 +46,3 @@ SHA256 aded48f35c3d907d50a01159ce364037b4e1f14fdd286416d5fbe0dc84ade3e5 files/di
 MD5 ef7e6e6a4bfbbaa52235699344830326 files/digest-trac-0.9.6 232
 RMD160 7e8faa5459569fc27f03dc441c9d7b9c34e00d9b files/digest-trac-0.9.6 232
 SHA256 a44608e686cc8466aa7c2fe9a8722b43bb7b4c2436e032801b02703c27820742 files/digest-trac-0.9.6 232
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
-
-iD8DBQFGrNFRyuNVb5qfaOYRAhcZAJ90+vNbyewkEnY3g5F10/wMd1DkIwCfRbSx
-hS3XLt4onIJ67NRM06Xssls=
-=Tesc
------END PGP SIGNATURE-----
diff --git a/www-apps/trac/trac-0.10.3.1.ebuild b/www-apps/trac/trac-0.10.3.1.ebuild
index 6dbbbe7da7b8..e05768efdc02 100644
--- a/www-apps/trac/trac-0.10.3.1.ebuild
+++ b/www-apps/trac/trac-0.10.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.10.3.1.ebuild,v 1.4 2007/07/29 17:41:24 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.10.3.1.ebuild,v 1.5 2007/08/19 10:05:14 dju Exp $
 
 inherit distutils webapp
 
@@ -32,7 +32,7 @@ DEPEND="${DEPEND}
 	)
 	sqlite? (
 		>=dev-db/sqlite-3.3.4
-		>=dev-python/pysqlite-2.3
+		|| ( >=dev-lang/python-2.5 >=dev-python/pysqlite-2.3 )
 	)
 	postgres? ( >=dev-python/psycopg-2 )
 	enscript? ( app-text/enscript )
@@ -75,6 +75,18 @@ pkg_setup () {
 		die "no database backend selected"
 	fi
 
+	# python has built-in sqlite support starting from 2.5
+	if use sqlite && \
+		has_version ">=dev-lang/python-2.5" && \
+		! has_version ">=dev-python/pysqlite-2.3" && \
+		! built_with_use dev-lang/python sqlite ; then
+		eerror "To use the sqlite database backend, you must either:"
+		eerror "- build dev-lang/python with sqlite support, using the 'sqlite'"
+		eerror "  USE flag, or"
+		eerror "- emerge dev-python/pysqlite"
+		die "missing python sqlite support"
+	fi
+
 	if ! built_with_use dev-util/subversion python ; then
 		built_with_use_error dev-util/subversion python
 	fi
diff --git a/www-apps/trac/trac-0.10.4.ebuild b/www-apps/trac/trac-0.10.4.ebuild
index cc9a95e3a3df..7dbbb7b18232 100644
--- a/www-apps/trac/trac-0.10.4.ebuild
+++ b/www-apps/trac/trac-0.10.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.10.4.ebuild,v 1.2 2007/07/29 17:41:24 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/trac/trac-0.10.4.ebuild,v 1.3 2007/08/19 10:05:14 dju Exp $
 
 inherit distutils webapp
 
@@ -32,7 +32,7 @@ DEPEND="${DEPEND}
 	)
 	sqlite? (
 		>=dev-db/sqlite-3.3.4
-		>=dev-python/pysqlite-2.3
+		|| ( >=dev-lang/python-2.5 >=dev-python/pysqlite-2.3 )
 	)
 	postgres? ( >=dev-python/psycopg-2 )
 	enscript? ( app-text/enscript )
@@ -75,6 +75,18 @@ pkg_setup () {
 		die "no database backend selected"
 	fi
 
+	# python has built-in sqlite support starting from 2.5
+	if use sqlite && \
+		has_version ">=dev-lang/python-2.5" && \
+		! has_version ">=dev-python/pysqlite-2.3" && \
+		! built_with_use dev-lang/python sqlite ; then
+		eerror "To use the sqlite database backend, you must either:"
+		eerror "- build dev-lang/python with sqlite support, using the 'sqlite'"
+		eerror "  USE flag, or"
+		eerror "- emerge dev-python/pysqlite"
+		die "missing python sqlite support"
+	fi
+
 	if ! built_with_use dev-util/subversion python ; then
 		built_with_use_die dev-util/subversion python
 	fi