summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2011-02-07 13:10:29 +0000
committerTim Harder <radhermit@gentoo.org>2011-02-07 13:10:29 +0000
commit0acc46780e50bc6ab0d62e6a7603955b634a3255 (patch)
treea04de656da61bcaf39dafcd82cfd469311ff4efd /www-apps/mediawiki
parentFixed bad sqlalchemy dep per bug #353158; I think it originated from trying t... (diff)
downloadgentoo-2-0acc46780e50bc6ab0d62e6a7603955b634a3255.tar.gz
gentoo-2-0acc46780e50bc6ab0d62e6a7603955b634a3255.tar.bz2
gentoo-2-0acc46780e50bc6ab0d62e6a7603955b634a3255.zip
Use sqlite3 USE flag for >=php-5.3 (bug #353929 by Arne Stäcker) and prefer php-5.3 over php-5.2.
(Portage version: 2.2.0_alpha20/cvs/Linux x86_64)
Diffstat (limited to 'www-apps/mediawiki')
-rw-r--r--www-apps/mediawiki/ChangeLog6
-rw-r--r--www-apps/mediawiki/mediawiki-1.16.2.ebuild8
2 files changed, 9 insertions, 5 deletions
diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index 5f36516e518b..dc68443dcb59 100644
--- a/www-apps/mediawiki/ChangeLog
+++ b/www-apps/mediawiki/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for www-apps/mediawiki
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.151 2011/02/05 00:07:31 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.152 2011/02/07 13:10:29 radhermit Exp $
+
+ 07 Feb 2011; Tim Harder <radhermit@gentoo.org> mediawiki-1.16.2.ebuild:
+ Use sqlite3 USE flag for >=php-5.3 (bug #353929 by Arne Stäcker) and prefer
+ php-5.3 over php-5.2.
05 Feb 2011; Christian Faulhammer <fauli@gentoo.org>
mediawiki-1.16.2.ebuild:
diff --git a/www-apps/mediawiki/mediawiki-1.16.2.ebuild b/www-apps/mediawiki/mediawiki-1.16.2.ebuild
index 4dbfb08cefb2..602b985ad7c2 100644
--- a/www-apps/mediawiki/mediawiki-1.16.2.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.16.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.16.2.ebuild,v 1.2 2011/02/05 00:07:31 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.16.2.ebuild,v 1.3 2011/02/07 13:10:29 radhermit Exp $
EAPI="3"
inherit webapp depend.php versionator eutils
@@ -25,10 +25,10 @@ RDEPEND="${DEPEND}
)
imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
!imagemagick? ( || ( dev-lang/php[gd] dev-lang/php[gd-external] ) )
- || ( <dev-lang/php-5.3[mysql?,pcre,postgres?,session,spl,xml]
- >=dev-lang/php-5.3[mysql?,postgres?,session,xml] )
+ || ( >=dev-lang/php-5.3[mysql?,postgres?,session,xml]
+ <dev-lang/php-5.3[mysql?,pcre,postgres?,session,spl,xml] )
sqlite? ( dev-db/sqlite:3[fts3]
- dev-lang/php[sqlite,pdo] )"
+ || ( >=dev-lang/php-5.3[sqlite3,pdo] <dev-lang/php-5.3[sqlite,pdo] ) )"
RESTRICT="test"