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
commiteef474cb4b40c73869afb55f38d083a11bdf64cf (patch)
treed01116a1df78e1a58f861868eb17f31e68af8c62 /www-apps
parentFixed bad sqlalchemy dep per bug #353158; I think it originated from trying t... (diff)
downloadhistorical-eef474cb4b40c73869afb55f38d083a11bdf64cf.tar.gz
historical-eef474cb4b40c73869afb55f38d083a11bdf64cf.tar.bz2
historical-eef474cb4b40c73869afb55f38d083a11bdf64cf.zip
Use sqlite3 USE flag for >=php-5.3 (bug #353929 by Arne Stäcker) and prefer php-5.3 over php-5.2.
Package-Manager: portage-2.2.0_alpha20/cvs/Linux x86_64
Diffstat (limited to 'www-apps')
-rw-r--r--www-apps/mediawiki/ChangeLog6
-rw-r--r--www-apps/mediawiki/Manifest16
-rw-r--r--www-apps/mediawiki/mediawiki-1.16.2.ebuild8
3 files changed, 19 insertions, 11 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/Manifest b/www-apps/mediawiki/Manifest
index b860a3639cf7..d075037a1f63 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -9,13 +9,17 @@ DIST mediawiki-1.16.1.tar.gz 12651399 RMD160 4af3d31325682801062b898736eaecd7717
DIST mediawiki-1.16.2.tar.gz 13072216 RMD160 27173b5dbdca9733fa9e55b1c04c8d61071f68cd SHA1 cb8565fafc847d8a0d59f4fdb7a09183267c4d5c SHA256 c33be7df9f705df07ab8bdb53cf0ed2c993819b3feaffa96fbcd123b50c78454
EBUILD mediawiki-1.15.5.ebuild 3918 RMD160 a38eaf35d6610935041b9cfe927f696b97e46998 SHA1 c545ae0a1593555cc93884ea42c42cd28676b0d1 SHA256 af766da3d9002d426fe9fd025f5c511b91f42be36c2444ffcecd159c0dda0696
EBUILD mediawiki-1.16.1.ebuild 3738 RMD160 83bf30bf8bb1a24cf8d71e61fc6fd68395ed9ee8 SHA1 9830ae7646b8e6cef1877b8833f5e80c03e419d8 SHA256 50deab1b14108efca16aaca969c1c4280a1d8c4c0bb50a71269b882c8f9f0307
-EBUILD mediawiki-1.16.2.ebuild 3739 RMD160 ee9d9f3c3c1cb87bed2603bca6689ba626d4c5ff SHA1 a9a68241605f87e273a013b87e24f1999c996eac SHA256 a8df5daa844a119f5959ef036cc38d6fab8c2246926e8ce49db78dffd81fb6ce
-MISC ChangeLog 26362 RMD160 5628ef37ee7ff43f974839072dac3091facb1a88 SHA1 b7c43594e440c1943f4a0bc60a94cb7b4ec3bb4b SHA256 0357301d69543bb537ce75db6ca96185446a705e3b3a3cb3cb5677ee0258a117
+EBUILD mediawiki-1.16.2.ebuild 3788 RMD160 fae3143888df4cb1c5d2f032229dd147da51a0a6 SHA1 7e95b560f200855b33256412108cb662ee75b66a SHA256 a8bcc593aa357c9ed2dc65210e20dbac60ee7da79b79c44909c08047057f2253
+MISC ChangeLog 26544 RMD160 e44c860b29cd514167479d784acd6c4eef44bab9 SHA1 fc9f73ed3d4891cc7f4bfb6047b72170b10aea7a SHA256 10d9f3abc9dcb69ddbb4d9aeddb28f06a9a0a21860d22f9ad869de5af53bed75
MISC metadata.xml 295 RMD160 0e99ed39b17f196d96fa661725f18447202c793a SHA1 3d63cc41895a26fde229f1394541cf6792fbc016 SHA256 ac52057208794d9f818ca0f56f292885eac738678c8fcdf56e099e98ce953593
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk1MlM4ACgkQNQqtfCuFneM1fwCfeUCKzanXlPtqsMl/r+u/o5Y1
-a6wAn22Q4Pzs3BAcD1QmlRMbz3j7k8c8
-=2Rrb
+iQEcBAEBAgAGBQJNT+9QAAoJEEqz6FtPBkyjPT0H/0GMXj67tZsM4GY63IRunhcg
+eiG8Gl0vi//B7DIUCZRljtctIS30kQQ1Z48pTrdc/eayrKBIUAFgBFZpIUEwoAvn
++uccYNXm4E2aMkIqnNVc+uRk5ZQzbEE79IuU+nFQCg9sjS9bJZQ+tvnAm3giblZ5
+ZOLBLo68kGDrUjhurMki8fOXGnU4X6HktzZTFzdeSBcCcRGgU1QB6+BjjSdgf0YY
+SLzAkmOYuzGr/I9n4UU1qjOW+kvC8D8ZA0HRJoqOhIomPyhyyoaLXCPbH2NRBfuH
+/++dbsWAZkO52CULnAF5SwQzeYz/UonFo6Nr9YmpFFzch9bN8+Eap9OPRm3gyPg=
+=JcsH
-----END PGP SIGNATURE-----
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"