For a transitional period, both php[sqlite] and php[sqlite3] means sqlite3. The sqlite3 USE flag will be removed in the near future

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key C4A92BF5)

5 files changed, 23 insertions, 14 deletions

diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index 469665db9718..fab79b34a7eb 100644
--- a/www-apps/mediawiki/ChangeLog
+++ b/www-apps/mediawiki/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apps/mediawiki
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.209 2012/12/05 16:25:42 radhermit Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.210 2013/01/09 11:11:37 olemarkus Exp $
+
+  09 Jan 2013; Ole Markus With <olemarkus@gentoo.org> mediawiki-1.18.6.ebuild,
+  mediawiki-1.19.3.ebuild, mediawiki-1.20.1.ebuild, mediawiki-1.20.2.ebuild:
+  For a transitional period, both php[sqlite] and php[sqlite3] means sqlite3.
+  The sqlite3 USE flag will be removed in the near future
 
 *mediawiki-1.20.2 (05 Dec 2012)
 
diff --git a/www-apps/mediawiki/mediawiki-1.18.6.ebuild b/www-apps/mediawiki/mediawiki-1.18.6.ebuild
index 93510b9098eb..c32ca82904fc 100644
--- a/www-apps/mediawiki/mediawiki-1.18.6.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.18.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.18.6.ebuild,v 1.1 2012/11/30 04:36:09 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.18.6.ebuild,v 1.2 2013/01/09 11:11:37 olemarkus Exp $
 
 EAPI="5"
 inherit webapp versionator
@@ -20,7 +20,8 @@ RDEPEND=">=dev-lang/php-5.3[mysql?,postgres?,session,xml,xmlreader]
 	!imagemagick? ( dev-lang/php[gd] )
 	sqlite? (
 		dev-db/sqlite:3[fts3]
-		>=dev-lang/php-5.3[sqlite3,pdo]
+		>=dev-lang/php-5.3[pdo]
+		|| ( dev-lang/php[sqlite] dev-lang/php[sqlite3] )
 	)
 	virtual/httpd-php"
 
diff --git a/www-apps/mediawiki/mediawiki-1.19.3.ebuild b/www-apps/mediawiki/mediawiki-1.19.3.ebuild
index 40304a9ad785..d2ad7e2ba387 100644
--- a/www-apps/mediawiki/mediawiki-1.19.3.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.19.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.19.3.ebuild,v 1.4 2012/12/03 13:10:31 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.19.3.ebuild,v 1.5 2013/01/09 11:11:37 olemarkus Exp $
 
 EAPI="5"
 inherit webapp versionator
@@ -20,7 +20,8 @@ RDEPEND=">=dev-lang/php-5.3[mysql?,postgres?,session,xml,xmlreader]
 	!imagemagick? ( dev-lang/php[gd] )
 	sqlite? (
 		dev-db/sqlite:3[fts3]
-		>=dev-lang/php-5.3[sqlite3,pdo]
+		>=dev-lang/php-5.3[pdo]
+		|| ( dev-lang/php[sqlite] dev-lang/php[sqlite3] )
 	)
 	virtual/httpd-php"
 
diff --git a/www-apps/mediawiki/mediawiki-1.20.1.ebuild b/www-apps/mediawiki/mediawiki-1.20.1.ebuild
index 987e7c9aeb86..a3a38affc10c 100644
--- a/www-apps/mediawiki/mediawiki-1.20.1.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.20.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.20.1.ebuild,v 1.1 2012/11/30 04:36:09 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.20.1.ebuild,v 1.2 2013/01/09 11:11:37 olemarkus Exp $
 
 EAPI="5"
 inherit webapp versionator
@@ -20,7 +20,8 @@ RDEPEND=">=dev-lang/php-5.3.2[mysql?,postgres?,session,xml,xmlreader]
 	!imagemagick? ( dev-lang/php[gd] )
 	sqlite? (
 		dev-db/sqlite:3[fts3]
-		>=dev-lang/php-5.3.2[sqlite3,pdo]
+		>=dev-lang/php-5.3.2[pdo]
+		|| ( dev-lang/php[sqlite] dev-lang/php[sqlite3] )
 	)
 	virtual/httpd-php"
 
diff --git a/www-apps/mediawiki/mediawiki-1.20.2.ebuild b/www-apps/mediawiki/mediawiki-1.20.2.ebuild
index bf2aec3c9a06..1c35782b8e27 100644
--- a/www-apps/mediawiki/mediawiki-1.20.2.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.20.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.20.2.ebuild,v 1.1 2012/12/05 16:25:42 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.20.2.ebuild,v 1.2 2013/01/09 11:11:37 olemarkus Exp $
 
 EAPI="5"
 inherit webapp versionator
@@ -20,7 +20,8 @@ RDEPEND=">=dev-lang/php-5.3.2[mysql?,postgres?,session,xml,xmlreader]
 	!imagemagick? ( dev-lang/php[gd] )
 	sqlite? (
 		dev-db/sqlite:3[fts3]
-		>=dev-lang/php-5.3.2[sqlite3,pdo]
+		>=dev-lang/php-5.3.2[pdo]
+		|| ( dev-lang/php[sqlite] dev-lang/php[sqlite3] )
 	)
 	virtual/httpd-php"