Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-apps/mediawiki: mediawiki-1.16.0.ebuild mediawiki-1.15.5.ebuild ChangeLog
Date: Sun, 28 Nov 2010 09:35:13
Message-Id: 20101128093508.EB31E20051@flycatcher.gentoo.org
1 radhermit 10/11/28 09:35:08
2
3 Modified: mediawiki-1.16.0.ebuild mediawiki-1.15.5.ebuild
4 ChangeLog
5 Log:
6 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@×××.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.
7
8 (Portage version: 2.2.0_alpha5/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.2 www-apps/mediawiki/mediawiki-1.16.0.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/mediawiki/mediawiki-1.16.0.ebuild?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/mediawiki/mediawiki-1.16.0.ebuild?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/mediawiki/mediawiki-1.16.0.ebuild?r1=1.1&r2=1.2
16
17 Index: mediawiki-1.16.0.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.16.0.ebuild,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- mediawiki-1.16.0.ebuild 9 Oct 2010 21:30:45 -0000 1.1
24 +++ mediawiki-1.16.0.ebuild 28 Nov 2010 09:35:08 -0000 1.2
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2010 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.16.0.ebuild,v 1.1 2010/10/09 21:30:45 radhermit Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.16.0.ebuild,v 1.2 2010/11/28 09:35:08 radhermit Exp $
30
31 EAPI="3"
32 inherit webapp depend.php versionator eutils
33 @@ -13,7 +13,7 @@
34
35 LICENSE="GPL-2"
36 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
37 -IUSE="imagemagick math mysql postgres +ocamlopt sqlite3"
38 +IUSE="imagemagick math mysql postgres +ocamlopt sqlite"
39
40 DEPEND="math? ( >=dev-lang/ocaml-3.0.6[ocamlopt?] )"
41 RDEPEND="${DEPEND}
42 @@ -21,13 +21,14 @@
43 app-text/dvipng
44 virtual/tex-base
45 app-text/ghostscript-gpl
46 - media-gfx/imagemagick
47 + || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
48 )
49 - imagemagick? ( media-gfx/imagemagick )
50 + imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
51 + !imagemagick? ( || ( dev-lang/php[gd] dev-lang/php[gd-external] ) )
52 || ( <dev-lang/php-5.3[mysql?,pcre,postgres?,session,spl,xml]
53 >=dev-lang/php-5.3[mysql?,postgres?,session,xml] )
54 - || ( dev-lang/php[gd] dev-lang/php[gd-external] )
55 - sqlite3? ( >=dev-db/sqlite-3.6[fts3] )"
56 + sqlite? ( dev-db/sqlite:3[fts3]
57 + dev-lang/php[sqlite,pdo] )"
58
59 RESTRICT="test"
60
61
62
63
64 1.6 www-apps/mediawiki/mediawiki-1.15.5.ebuild
65
66 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/mediawiki/mediawiki-1.15.5.ebuild?rev=1.6&view=markup
67 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/mediawiki/mediawiki-1.15.5.ebuild?rev=1.6&content-type=text/plain
68 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/mediawiki/mediawiki-1.15.5.ebuild?r1=1.5&r2=1.6
69
70 Index: mediawiki-1.15.5.ebuild
71 ===================================================================
72 RCS file: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.15.5.ebuild,v
73 retrieving revision 1.5
74 retrieving revision 1.6
75 diff -u -r1.5 -r1.6
76 --- mediawiki-1.15.5.ebuild 24 Oct 2010 17:53:25 -0000 1.5
77 +++ mediawiki-1.15.5.ebuild 28 Nov 2010 09:35:08 -0000 1.6
78 @@ -1,6 +1,6 @@
79 # Copyright 1999-2010 Gentoo Foundation
80 # Distributed under the terms of the GNU General Public License v2
81 -# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.15.5.ebuild,v 1.5 2010/10/24 17:53:25 armin76 Exp $
82 +# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.15.5.ebuild,v 1.6 2010/11/28 09:35:08 radhermit Exp $
83
84 EAPI="3"
85 inherit webapp depend.php versionator eutils
86 @@ -13,7 +13,7 @@
87
88 LICENSE="GPL-2"
89 KEYWORDS="~alpha amd64 ppc sparc x86"
90 -IUSE="imagemagick math mysql postgres +ocamlopt"
91 +IUSE="imagemagick math mysql postgres +ocamlopt sqlite"
92
93 DEPEND="math? ( >=dev-lang/ocaml-3.0.6[ocamlopt?] )"
94 RDEPEND="${DEPEND}
95 @@ -21,11 +21,14 @@
96 app-text/dvipng
97 virtual/tex-base
98 app-text/ghostscript-gpl
99 - media-gfx/imagemagick
100 + || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )
101 )
102 - imagemagick? ( media-gfx/imagemagick )
103 + imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) )
104 + !imagemagick? ( || ( dev-lang/php[gd] dev-lang/php[gd-external] ) )
105 || ( <dev-lang/php-5.3[mysql?,pcre,postgres?,session,spl,xml]
106 - >=dev-lang/php-5.3[mysql?,postgres?,session,xml] )"
107 + >=dev-lang/php-5.3[mysql?,postgres?,session,xml] )
108 + sqlite? ( dev-db/sqlite:3
109 + dev-lang/php[sqlite,pdo] )"
110
111 RESTRICT="test"
112
113
114
115
116 1.145 www-apps/mediawiki/ChangeLog
117
118 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/mediawiki/ChangeLog?rev=1.145&view=markup
119 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/mediawiki/ChangeLog?rev=1.145&content-type=text/plain
120 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/mediawiki/ChangeLog?r1=1.144&r2=1.145
121
122 Index: ChangeLog
123 ===================================================================
124 RCS file: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v
125 retrieving revision 1.144
126 retrieving revision 1.145
127 diff -u -r1.144 -r1.145
128 --- ChangeLog 24 Oct 2010 19:27:20 -0000 1.144
129 +++ ChangeLog 28 Nov 2010 09:35:08 -0000 1.145
130 @@ -1,6 +1,14 @@
131 # ChangeLog for www-apps/mediawiki
132 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
133 -# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.144 2010/10/24 19:27:20 radhermit Exp $
134 +# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.145 2010/11/28 09:35:08 radhermit Exp $
135 +
136 + 28 Nov 2010; Tim Harder <radhermit@g.o> mediawiki-1.15.5.ebuild,
137 + mediawiki-1.16.0.ebuild:
138 + Add sqlite USE flag to mediawiki-1.15.5, change sqlite3 USE flag to sqlite
139 + for mediawiki-1.16.0, and fix php dependencies with sqlite (bug #343275 by
140 + UnclePain@×××.de). Add graphicsmagick alternative to imagemagick (bug #314389
141 + by Wojciech Porczyk) and depend on GD support via php if the imagemagick USE
142 + flag is not enabled.
143
144 24 Oct 2010; Tim Harder <radhermit@g.o>
145 -files/postinstall-1.11-en.txt, -mediawiki-1.14.1.ebuild,
Report Message
Find on MARC Find on Google Groups