* [gentoo-commits] gentoo-x86 commit in www-apps/mediawiki: mediawiki-1.16.0.ebuild mediawiki-1.15.5.ebuild ChangeLog
@ 2010-11-28 9:35 Tim Harder (radhermit)
0 siblings, 0 replies; only message in thread
From: Tim Harder (radhermit) @ 2010-11-28 9:35 UTC (permalink / raw
To: gentoo-commits
radhermit 10/11/28 09:35:08
Modified: mediawiki-1.16.0.ebuild mediawiki-1.15.5.ebuild
ChangeLog
Log:
Add sqlite USE flag to mediawiki-1.15.5, change sqlite3 USE flag to sqlite for mediawiki-1.16.0, and fix php dependencies with sqlite (bug #343275 by UnclePain@gmx.de). Add graphicsmagick alternative to imagemagick (bug #314389 by Wojciech Porczyk) and depend on GD support via php if the imagemagick USE flag is not enabled.
(Portage version: 2.2.0_alpha5/cvs/Linux x86_64)
Revision Changes Path
1.2 www-apps/mediawiki/mediawiki-1.16.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/mediawiki/mediawiki-1.16.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/mediawiki/mediawiki-1.16.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/mediawiki/mediawiki-1.16.0.ebuild?r1=1.1&r2=1.2
Index: mediawiki-1.16.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.16.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mediawiki-1.16.0.ebuild 9 Oct 2010 21:30:45 -0000 1.1
+++ mediawiki-1.16.0.ebuild 28 Nov 2010 09:35:08 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.16.0.ebuild,v 1.1 2010/10/09 21:30:45 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.16.0.ebuild,v 1.2 2010/11/28 09:35:08 radhermit Exp $
EAPI="3"
inherit webapp depend.php versionator eutils
@@ -13,7 +13,7 @@
LICENSE="GPL-2"
KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="imagemagick math mysql postgres +ocamlopt sqlite3"
+IUSE="imagemagick math mysql postgres +ocamlopt sqlite"
DEPEND="math? ( >=dev-lang/ocaml-3.0.6[ocamlopt?] )"
RDEPEND="${DEPEND}
@@ -21,13 +21,14 @@
app-text/dvipng
virtual/tex-base
app-text/ghostscript-gpl
- media-gfx/imagemagick
+ || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
)
- imagemagick? ( media-gfx/imagemagick )
+ 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[gd] dev-lang/php[gd-external] )
- sqlite3? ( >=dev-db/sqlite-3.6[fts3] )"
+ sqlite? ( dev-db/sqlite:3[fts3]
+ dev-lang/php[sqlite,pdo] )"
RESTRICT="test"
1.6 www-apps/mediawiki/mediawiki-1.15.5.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/mediawiki/mediawiki-1.15.5.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/mediawiki/mediawiki-1.15.5.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/mediawiki/mediawiki-1.15.5.ebuild?r1=1.5&r2=1.6
Index: mediawiki-1.15.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.15.5.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mediawiki-1.15.5.ebuild 24 Oct 2010 17:53:25 -0000 1.5
+++ mediawiki-1.15.5.ebuild 28 Nov 2010 09:35:08 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.15.5.ebuild,v 1.5 2010/10/24 17:53:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.15.5.ebuild,v 1.6 2010/11/28 09:35:08 radhermit Exp $
EAPI="3"
inherit webapp depend.php versionator eutils
@@ -13,7 +13,7 @@
LICENSE="GPL-2"
KEYWORDS="~alpha amd64 ppc sparc x86"
-IUSE="imagemagick math mysql postgres +ocamlopt"
+IUSE="imagemagick math mysql postgres +ocamlopt sqlite"
DEPEND="math? ( >=dev-lang/ocaml-3.0.6[ocamlopt?] )"
RDEPEND="${DEPEND}
@@ -21,11 +21,14 @@
app-text/dvipng
virtual/tex-base
app-text/ghostscript-gpl
- media-gfx/imagemagick
+ || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
)
- imagemagick? ( media-gfx/imagemagick )
+ 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] )
+ sqlite? ( dev-db/sqlite:3
+ dev-lang/php[sqlite,pdo] )"
RESTRICT="test"
1.145 www-apps/mediawiki/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/mediawiki/ChangeLog?rev=1.145&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/mediawiki/ChangeLog?rev=1.145&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/mediawiki/ChangeLog?r1=1.144&r2=1.145
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- ChangeLog 24 Oct 2010 19:27:20 -0000 1.144
+++ ChangeLog 28 Nov 2010 09:35:08 -0000 1.145
@@ -1,6 +1,14 @@
# ChangeLog for www-apps/mediawiki
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.144 2010/10/24 19:27:20 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.145 2010/11/28 09:35:08 radhermit Exp $
+
+ 28 Nov 2010; Tim Harder <radhermit@gentoo.org> mediawiki-1.15.5.ebuild,
+ mediawiki-1.16.0.ebuild:
+ Add sqlite USE flag to mediawiki-1.15.5, change sqlite3 USE flag to sqlite
+ for mediawiki-1.16.0, and fix php dependencies with sqlite (bug #343275 by
+ UnclePain@gmx.de). Add graphicsmagick alternative to imagemagick (bug #314389
+ by Wojciech Porczyk) and depend on GD support via php if the imagemagick USE
+ flag is not enabled.
24 Oct 2010; Tim Harder <radhermit@gentoo.org>
-files/postinstall-1.11-en.txt, -mediawiki-1.14.1.ebuild,
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-11-28 9:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-28 9:35 [gentoo-commits] gentoo-x86 commit in www-apps/mediawiki: mediawiki-1.16.0.ebuild mediawiki-1.15.5.ebuild ChangeLog Tim Harder (radhermit)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox