diff options
| author |   Julien Allanos <dju@gentoo.org> | 2007-08-19 10:05:14 +0000 |
|---|---|---|
| committer | Julien Allanos <dju@gentoo.org> | 2007-08-19 10:05:14 +0000 |
| commit | 82dc69dadb0749f40951a8e3cb2624e7c1751a08 (patch) | |
| tree | eea7df9350af39ecfd468c293ee47cba2d4b8280 /www-apps | |
| parent | New package for bug #188568 (diff) | |
| download | gentoo-2-82dc69dadb0749f40951a8e3cb2624e7c1751a08.tar.gz gentoo-2-82dc69dadb0749f40951a8e3cb2624e7c1751a08.tar.bz2 gentoo-2-82dc69dadb0749f40951a8e3cb2624e7c1751a08.zip | |
Fixes for incoming python-2.5, closing bug #166612.
(Portage version: 2.1.2.11)
Diffstat (limited to 'www-apps')
| -rw-r--r-- | www-apps/trac/ChangeLog | 6 | ||||
| -rw-r--r-- | www-apps/trac/trac-0.10.3.1.ebuild | 16 | ||||
| -rw-r--r-- | www-apps/trac/trac-0.10.4.ebuild | 16 |
3 files changed, 33 insertions, 5 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/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 |