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

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xC4A92BF5

6 files changed, 35 insertions, 26 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/Manifest b/www-apps/mediawiki/Manifest
index fa6d20c0d126..0adec2606053 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -7,20 +7,20 @@ DIST mediawiki-1.18.6.tar.gz 17683490 SHA256 6af73915093b791fbb53cece3ebc89530a1
 DIST mediawiki-1.19.3.tar.gz 18447791 SHA256 d7049f230efd12789017867c65abdf1470567a81b5f9a5bccdfe9532f67ad63d SHA512 559ee1bd13a4b5c1f670c4bf572f8a23656d0a6b230f5a48e19457d2aea680be7b4d98cec366afde0527e89a4a8435daffe38fe7a76f0a5f3857c36837d77f47 WHIRLPOOL 7884bff2ddd025e95def429346be678cf72ef81f071eaa0506856a53fccc154ba151559da0ad8138f67b840732a5d7eda7192789f62fcf489c2d76c86fc5f713
 DIST mediawiki-1.20.1.tar.gz 18301714 SHA256 2f526f4e9100dcbdd89d7b1259810f272277f020520124315287e61bb8783b91 SHA512 72bcf6813e534245f23192229d21e0fcfdcc20d12fe81ec0f6da8d2d3cb85fc540fff3ed77d6b6a84fae3b92734a8956d2e747d804c9418469de3e0dad8c9900 WHIRLPOOL 5e9beca854688d413402670134079fef0765bcb50a82607a874501cd5669639eab8f92999d675e79209739c6d7b98b593ed560f3300e61f24a526d34b9a1bdf3
 DIST mediawiki-1.20.2.tar.gz 18301262 SHA256 ac29b11a297f556765210e65d5d5ad6b0f55055e345d2f3deba0f29853507a31 SHA512 afbb08ea967fe3f62d94155e189f3198d8e4974c66c67b2a2e2e479feec1dde8e2a935540f3d88ccee83f16a8e2e97f20ac441c7dd06a9f8468643045ef55532 WHIRLPOOL 40d9e8eb4786cba1aa9691c9869a5929c669eb7001511ff7fa63a8f42f3fbb24813aa70c6712be19bd9118642d6bb3548a0d408c0e451501acd30fe35931e5db
-EBUILD mediawiki-1.18.6.ebuild 2549 SHA256 f6f21c02a051f86177dd276ac8515441ceeb52d5aced48a463f7cfd2a63c3266 SHA512 9049458708016ff6821566703e536eeac07b4ff9e3d96b7165380fbf10f2de373219939f36010b654a0d05ca86beb59b863992965cf20c01a553795ba703a17b WHIRLPOOL 7cc827ae9d910a4a8a14c60fe20a2d68b667c3275f03da20d640271cc2d83dbe10134d39d6ad296be16d52a42d314bc0bcd26dd942e4ecf25a3ce8738c41a56d
-EBUILD mediawiki-1.19.3.ebuild 2546 SHA256 45cc2d2d45023ec3ea7cc86839927c01b9cb8e476f12c27a5020fa1356551b58 SHA512 65967f5ee15e3a352976c43d56cc3b67fbff5118bfe04c4a8a8f7cce126dccf1f4a5f47c1addd5593a385d5e25d36d6c87f8c867625d7884d7d2d2de321d0b5f WHIRLPOOL 39ad60ee092e77d63b529f4247ecc3fbf78e01e3a7fd8ade89f8e9c2778457a2fce37082464771b40da1cc04ddd1785188d2e42a9965bff05d03354d4ee638a3
-EBUILD mediawiki-1.20.1.ebuild 2553 SHA256 fc30d8baa1048cdc572816355fd03d1170b3947b8faa9e34d5879f6ab3640757 SHA512 722f19c9200094ae8c26eec429dccc5803f44618ad246ffb328c0df1c4dfee204450f5a613a1f495cdc24c96b97963177cab8dd447707f219ab49a2f3aba2686 WHIRLPOOL 14dfb935ffccf14bc3a1ce663dc2811ac84bfd7bc4e180f96c8800eb4a52bd98a2d686e4226eed6ce6cccc288109d5be67be99b25b8e324a32287884dd9c0a19
-EBUILD mediawiki-1.20.2.ebuild 2553 SHA256 07e53143edc6765cb6b8f7d08feedd5f34443b550395fa5fb1b668b92da2e94f SHA512 f383d5e517e64964c68ae7730422af32be33a8e1ca99297a43384c6aebf830175b612525edf6a2630727f73e07afae13f2dc8e61a3e99072b9db835447a43070 WHIRLPOOL 5a64c2b6f4354a72118b68e6163329066d6dc14244a4d76c2f07c68ed05e6df7a1351f589f67a3f79f04f3d57cedca395e4357940502bf929eaa25a66ed76422
-MISC ChangeLog 34164 SHA256 56f6629d8e42def1151703b961ff8fd1c03acefee22a7f78421699335309e56d SHA512 3b69f50080fc6477e1ad5c9dd9f770c5f051585ba5e4d4fc47fac8245119545d36128621bf6a024efacacc2d5b12d2dab4889d9713beb89ee90efb399f593eb0 WHIRLPOOL f276725c7d2a87383b9532fca6732ccb4abfb2cbf82279353a9176d32722efb44295fbb71877f0951e54b9fffcf748881b4d26083575cd166fb43aeb3cb728e1
+EBUILD mediawiki-1.18.6.ebuild 2593 SHA256 96c450943930d411c448a7c1119f78fe3947c9371bba7fc89562dc5b1e98232d SHA512 98b47943d86cc1a1e8ee388da5f63d7521a32d54d926e1114bb3f8cba1486dc971de0c6805f3355f6c29141bd2b082d40a5f0faddeafe9e5f28f9c1957b68968 WHIRLPOOL 56cad393fae07b94cb00c62b2d6c7c9ba5a7991720137d709df6c5323493c85dbf1a02160437a1f35a599488fbaaf4670dc4f1919e8bc3942897f56f8b28a138
+EBUILD mediawiki-1.19.3.ebuild 2590 SHA256 46efbb85bfcf7eb0d589702b91386697b86010a374850c7b9aba4b30b7a412dd SHA512 03e797ef1479ed4e41ad7c3050d20d4f96a55cd59d6c380dceb72fb09d3627bda53d26f238a97d08dcd1623314179bff39854e5d50ba411798bbb37fdc12e5f7 WHIRLPOOL ee46245bc0b9c80b82335202673935e94d0ecc425a2e3494362ec60501391fb2309ec2d9bd353fca12727fdc22eabc853026658c7d331be852419ccde14ac013
+EBUILD mediawiki-1.20.1.ebuild 2597 SHA256 f11decf5fe13a2bf9331c79c4b956a3ce8171b86075c8940bfc10463a44c8c6d SHA512 01ab03443fecb76e1c514b7fef9c95cc2acc0d995066b9be23f0a484879a9f69a2a087e8baf2662c5c8fdd05eeec29c178fa11278a7d0b50aad0237b72f4feaa WHIRLPOOL 79792b7ad3febad3d57d89afef6b7d1348b8e95668d372501f64e4aff88e128776ea7e280ebd4adc05e39b563507a6f8bb7b7b060966b40c489f69568fc1cfaf
+EBUILD mediawiki-1.20.2.ebuild 2597 SHA256 d58789c045ba0c34de60448f260d6de2477ea92cffcb312f513e1b2a40826768 SHA512 6686cd93a08b9a830fd10dbf30f5866e3bcd60e51809d53b247199ad18afe91f1d0e179a2ae5358dfdf1f2b6968d4037aff0b25609eb3575ab4063df96963e92 WHIRLPOOL ca856592af02eaf61db64fafe56072fc9723c1d0cd57e6c92b0740608bd9e2841238d3fa62983dd03c8e664387dadd903f2fa53dcd7988414a788855426b3b30
+MISC ChangeLog 34457 SHA256 fb027c5888bd87e1cc461aed5d4e04456ba086eda9f85dba6f9c5dc6d5550302 SHA512 5a1dfcbad8bf90c0d90415e5a01e80f5f21b14b91ed0b4ade7b43f4780642b9b3e2cd8bb7da02d3c84130160739f1d8402456340681da24fce31a1149d92cf49 WHIRLPOOL 4c87115eb1a8f21353c8a714bd83090261c867cfe8fe670626a234eba2e34c52e46a880d3c18d0fd7d27bf395aacd645858cbba9d645ac57e49041d841b29633
 MISC metadata.xml 161 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 SHA512 da8733f12ac4bebcfa485138fd9880683c1196efc0312a588ffce412ed14c1dd831e005129b6598d027af44d381fceb844453a433d0c982348e21f2d9c49f52e WHIRLPOOL 2b56ebef4f0870596c32c35c96e6dfbc911f6a3d8fe0e8c463df76dfa73dde112948c814b9a9ee996b7d71a85e4a723033ee3b92f4cde0f31d0770404d7dba61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQv3WMAAoJEEqz6FtPBkyjlAoIAJAMxU3g6gUuywHoVnoabBma
-r4Bsc51ovOF8Nar929qHIiekYhvuJsCV5AwtBsAMLEMhZ01RwA8lNGJGqHw1dPy8
-diZW6l4vvznpXQE8OndYk2awFbjFYjRZ68wdT8bAHCgm1blW6WAzSg+Aawo0nr+o
-Ic613bvp+ex0BG4DdKFlSJ95Efi1SMtEijel6LRkHqxMwE6SlSegAexltb6uv2yT
-qR6OrTro0g2dvIQqzngp9btPdg8QRIasKL050/1A+UBX9MWGTXh+XypVvJG9o/pk
-rggH7S7vwY4VFpoiUuw6Og63s89TqhoOJBVY/ngZERMv9ZtQHU5ud0FznbmtGbg=
-=8llU
+iQEcBAEBCAAGBQJQ7VBxAAoJEGurSuXEqSv13a4H/3r56gcMZd6ntt7UtVG4gay8
+16B2h8MBJulvdNY/BVHZYRLHgS4a0K5oj3rUM30xNiyO44HG8tF47mBM8soAE3Hv
+Yot+sI0ArlwUteHQvYbVyRlk4YlW82Skw9W2RCGYhLsbSZBxnec7xRlW5CcwSVi2
+rLhm5P31hig0YPuuj7Lrvfc6SSRld5DZ6IiFQITZ/XVwbwBggWT/1VKDuah68REf
++mK22+Y+67mwd97lCp5OXxZN402ofi0S3kASJ6uoKiXgVEjlQ9x9VEsvs3KPDoKU
+bjIZpfDjbrZKvD9klbmhFuIqXjAVKv6wjDW3jqnNB5DiNfRexrGuA+BS8P2sYpE=
+=vN2L
 -----END PGP SIGNATURE-----
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"