Gentoo Archives: gentoo-commits

From: "Anthony G. Basile (blueness)" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-apps/moodle: moodle-2.1.7.ebuild moodle-2.0.10.ebuild moodle-1.9.19.ebuild moodle-2.3.1.ebuild ChangeLog moodle-2.2.4.ebuild
Date: Fri, 24 Aug 2012 10:23:00
Message-Id: 20120824102246.79A5A20577@flycatcher.gentoo.org
1 blueness 12/08/24 10:22:46
2
3 Modified: moodle-2.1.7.ebuild moodle-2.0.10.ebuild
4 moodle-1.9.19.ebuild moodle-2.3.1.ebuild ChangeLog
5 moodle-2.2.4.ebuild
6 Log:
7 Use REQUIRED_USE so at least one backend db is provided, bug #432354
8
9 (Portage version: 2.1.11.9/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.3 www-apps/moodle/moodle-2.1.7.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/moodle/moodle-2.1.7.ebuild?rev=1.3&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/moodle/moodle-2.1.7.ebuild?rev=1.3&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/moodle/moodle-2.1.7.ebuild?r1=1.2&r2=1.3
17
18 Index: moodle-2.1.7.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.1.7.ebuild,v
21 retrieving revision 1.2
22 retrieving revision 1.3
23 diff -u -r1.2 -r1.3
24 --- moodle-2.1.7.ebuild 11 Jul 2012 23:00:12 -0000 1.2
25 +++ moodle-2.1.7.ebuild 24 Aug 2012 10:22:46 -0000 1.3
26 @@ -1,6 +1,6 @@
27 # Copyright 1999-2012 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.1.7.ebuild,v 1.2 2012/07/11 23:00:12 blueness Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.1.7.ebuild,v 1.3 2012/08/24 10:22:46 blueness Exp $
31
32 EAPI="4"
33
34 @@ -31,6 +31,7 @@
35 PHP_FLAGS_53="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53}"
36
37 IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
38 +REQUIRED_USE="|| ( ${DB_TYPES} )"
39
40 # No forced dependency on
41 # mysql? ( virtual/mysql )
42 @@ -55,15 +56,16 @@
43 fi
44 done
45
46 - if [[ ${DB_COUNT} -eq 0 ]]; then
47 - eerror
48 - eerror "\033[1;31m**************************************************\033[00m"
49 - eerror "No database selected in your USE flags,"
50 - eerror "You must select at least one."
51 - eerror "\033[1;31m**************************************************\033[00m"
52 - eerror
53 - die
54 - fi
55 + # REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
56 + #if [[ ${DB_COUNT} -eq 0 ]]; then
57 + # eerror
58 + # eerror "\033[1;31m**************************************************\033[00m"
59 + # eerror "No database selected in your USE flags,"
60 + # eerror "You must select at least one."
61 + # eerror "\033[1;31m**************************************************\033[00m"
62 + # eerror
63 + # die
64 + #fi
65
66 if [[ ${DB_COUNT} -gt 1 ]]; then
67 MYDB=""
68
69
70
71 1.3 www-apps/moodle/moodle-2.0.10.ebuild
72
73 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/moodle/moodle-2.0.10.ebuild?rev=1.3&view=markup
74 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/moodle/moodle-2.0.10.ebuild?rev=1.3&content-type=text/plain
75 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/moodle/moodle-2.0.10.ebuild?r1=1.2&r2=1.3
76
77 Index: moodle-2.0.10.ebuild
78 ===================================================================
79 RCS file: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.0.10.ebuild,v
80 retrieving revision 1.2
81 retrieving revision 1.3
82 diff -u -r1.2 -r1.3
83 --- moodle-2.0.10.ebuild 11 Jul 2012 23:00:12 -0000 1.2
84 +++ moodle-2.0.10.ebuild 24 Aug 2012 10:22:46 -0000 1.3
85 @@ -1,6 +1,6 @@
86 # Copyright 1999-2012 Gentoo Foundation
87 # Distributed under the terms of the GNU General Public License v2
88 -# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.0.10.ebuild,v 1.2 2012/07/11 23:00:12 blueness Exp $
89 +# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.0.10.ebuild,v 1.3 2012/08/24 10:22:46 blueness Exp $
90
91 EAPI="4"
92
93 @@ -31,6 +31,7 @@
94 PHP_FLAGS_53="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53}"
95
96 IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
97 +REQUIRED_USE="|| ( ${DB_TYPES} )"
98
99 # No forced dependency on
100 # mysql? ( virtual/mysql )
101 @@ -55,15 +56,16 @@
102 fi
103 done
104
105 - if [[ ${DB_COUNT} -eq 0 ]]; then
106 - eerror
107 - eerror "\033[1;31m**************************************************\033[00m"
108 - eerror "No database selected in your USE flags,"
109 - eerror "You must select at least one."
110 - eerror "\033[1;31m**************************************************\033[00m"
111 - eerror
112 - die
113 - fi
114 + # REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
115 + #if [[ ${DB_COUNT} -eq 0 ]]; then
116 + # eerror
117 + # eerror "\033[1;31m**************************************************\033[00m"
118 + # eerror "No database selected in your USE flags,"
119 + # eerror "You must select at least one."
120 + # eerror "\033[1;31m**************************************************\033[00m"
121 + # eerror
122 + # die
123 + #fi
124
125 if [[ ${DB_COUNT} -gt 1 ]]; then
126 MYDB=""
127
128
129
130 1.3 www-apps/moodle/moodle-1.9.19.ebuild
131
132 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/moodle/moodle-1.9.19.ebuild?rev=1.3&view=markup
133 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/moodle/moodle-1.9.19.ebuild?rev=1.3&content-type=text/plain
134 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/moodle/moodle-1.9.19.ebuild?r1=1.2&r2=1.3
135
136 Index: moodle-1.9.19.ebuild
137 ===================================================================
138 RCS file: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-1.9.19.ebuild,v
139 retrieving revision 1.2
140 retrieving revision 1.3
141 diff -u -r1.2 -r1.3
142 --- moodle-1.9.19.ebuild 11 Jul 2012 23:00:12 -0000 1.2
143 +++ moodle-1.9.19.ebuild 24 Aug 2012 10:22:46 -0000 1.3
144 @@ -1,6 +1,6 @@
145 # Copyright 1999-2012 Gentoo Foundation
146 # Distributed under the terms of the GNU General Public License v2
147 -# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-1.9.19.ebuild,v 1.2 2012/07/11 23:00:12 blueness Exp $
148 +# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-1.9.19.ebuild,v 1.3 2012/08/24 10:22:46 blueness Exp $
149
150 EAPI="4"
151
152 @@ -29,6 +29,7 @@
153 PHPFLAGS="ctype,curl,gd,iconv,session,ssl,tokenizer,xml,xmlrpc,zlib"
154
155 IUSE="${DBTYPES} ${AUTHMODES} vhosts"
156 +REQUIRED_USE="|| ( ${DBTYPES} )"
157
158 # No forced dependency on
159 # mysql? ( virtual/mysql )
160 @@ -53,15 +54,16 @@
161 fi
162 done
163
164 - if [[ ${DB_COUNT} -eq 0 ]]; then
165 - eerror
166 - eerror "\033[1;31m**************************************************\033[00m"
167 - eerror "No database selected in your USE flags,"
168 - eerror "You must select at least one."
169 - eerror "\033[1;31m**************************************************\033[00m"
170 - eerror
171 - die
172 - fi
173 + # REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
174 + #if [[ ${DB_COUNT} -eq 0 ]]; then
175 + # eerror
176 + # eerror "\033[1;31m**************************************************\033[00m"
177 + # eerror "No database selected in your USE flags,"
178 + # eerror "You must select at least one."
179 + # eerror "\033[1;31m**************************************************\033[00m"
180 + # eerror
181 + # die
182 + #fi
183
184 if [[ ${DB_COUNT} -gt 1 ]]; then
185 MYDB=""
186
187
188
189 1.3 www-apps/moodle/moodle-2.3.1.ebuild
190
191 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/moodle/moodle-2.3.1.ebuild?rev=1.3&view=markup
192 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/moodle/moodle-2.3.1.ebuild?rev=1.3&content-type=text/plain
193 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/moodle/moodle-2.3.1.ebuild?r1=1.2&r2=1.3
194
195 Index: moodle-2.3.1.ebuild
196 ===================================================================
197 RCS file: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.3.1.ebuild,v
198 retrieving revision 1.2
199 retrieving revision 1.3
200 diff -u -r1.2 -r1.3
201 --- moodle-2.3.1.ebuild 11 Jul 2012 23:00:12 -0000 1.2
202 +++ moodle-2.3.1.ebuild 24 Aug 2012 10:22:46 -0000 1.3
203 @@ -1,6 +1,6 @@
204 # Copyright 1999-2012 Gentoo Foundation
205 # Distributed under the terms of the GNU General Public License v2
206 -# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.3.1.ebuild,v 1.2 2012/07/11 23:00:12 blueness Exp $
207 +# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.3.1.ebuild,v 1.3 2012/08/24 10:22:46 blueness Exp $
208
209 EAPI="4"
210
211 @@ -31,6 +31,7 @@
212 PHP_FLAGS_53="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53}"
213
214 IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
215 +REQUIRED_USE="|| ( ${DB_TYPES} )"
216
217 # No forced dependency on
218 # mysql? ( virtual/mysql )
219 @@ -55,15 +56,16 @@
220 fi
221 done
222
223 - if [[ ${DB_COUNT} -eq 0 ]]; then
224 - eerror
225 - eerror "\033[1;31m**************************************************\033[00m"
226 - eerror "No database selected in your USE flags,"
227 - eerror "You must select at least one."
228 - eerror "\033[1;31m**************************************************\033[00m"
229 - eerror
230 - die
231 - fi
232 + # REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
233 + #if [[ ${DB_COUNT} -eq 0 ]]; then
234 + # eerror
235 + # eerror "\033[1;31m**************************************************\033[00m"
236 + # eerror "No database selected in your USE flags,"
237 + # eerror "You must select at least one."
238 + # eerror "\033[1;31m**************************************************\033[00m"
239 + # eerror
240 + # die
241 + #fi
242
243 if [[ ${DB_COUNT} -gt 1 ]]; then
244 MYDB=""
245
246
247
248 1.29 www-apps/moodle/ChangeLog
249
250 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/moodle/ChangeLog?rev=1.29&view=markup
251 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/moodle/ChangeLog?rev=1.29&content-type=text/plain
252 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/moodle/ChangeLog?r1=1.28&r2=1.29
253
254 Index: ChangeLog
255 ===================================================================
256 RCS file: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v
257 retrieving revision 1.28
258 retrieving revision 1.29
259 diff -u -r1.28 -r1.29
260 --- ChangeLog 11 Jul 2012 23:00:12 -0000 1.28
261 +++ ChangeLog 24 Aug 2012 10:22:46 -0000 1.29
262 @@ -1,6 +1,11 @@
263 # ChangeLog for www-apps/moodle
264 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
265 -# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v 1.28 2012/07/11 23:00:12 blueness Exp $
266 +# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/ChangeLog,v 1.29 2012/08/24 10:22:46 blueness Exp $
267 +
268 + 24 Aug 2012; Anthony G. Basile <blueness@g.o> moodle-1.9.19.ebuild,
269 + moodle-2.0.10.ebuild, moodle-2.1.7.ebuild, moodle-2.2.4.ebuild,
270 + moodle-2.3.1.ebuild:
271 + Use REQUIRED_USE so at least one backend db is provided, bug #432354
272
273 11 Jul 2012; Anthony G. Basile <blueness@g.o> moodle-1.9.19.ebuild,
274 moodle-2.0.10.ebuild, moodle-2.1.7.ebuild, moodle-2.2.4.ebuild,
275
276
277
278 1.3 www-apps/moodle/moodle-2.2.4.ebuild
279
280 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/moodle/moodle-2.2.4.ebuild?rev=1.3&view=markup
281 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/moodle/moodle-2.2.4.ebuild?rev=1.3&content-type=text/plain
282 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/moodle/moodle-2.2.4.ebuild?r1=1.2&r2=1.3
283
284 Index: moodle-2.2.4.ebuild
285 ===================================================================
286 RCS file: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.2.4.ebuild,v
287 retrieving revision 1.2
288 retrieving revision 1.3
289 diff -u -r1.2 -r1.3
290 --- moodle-2.2.4.ebuild 11 Jul 2012 23:00:12 -0000 1.2
291 +++ moodle-2.2.4.ebuild 24 Aug 2012 10:22:46 -0000 1.3
292 @@ -1,6 +1,6 @@
293 # Copyright 1999-2012 Gentoo Foundation
294 # Distributed under the terms of the GNU General Public License v2
295 -# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.2.4.ebuild,v 1.2 2012/07/11 23:00:12 blueness Exp $
296 +# $Header: /var/cvsroot/gentoo-x86/www-apps/moodle/moodle-2.2.4.ebuild,v 1.3 2012/08/24 10:22:46 blueness Exp $
297
298 EAPI="4"
299
300 @@ -31,6 +31,7 @@
301 PHP_FLAGS_53="${PHP_REQUIRED_FLAGS_53},${PHP_OPTIONAL_FLAGS_53}"
302
303 IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
304 +REQUIRED_USE="|| ( ${DB_TYPES} )"
305
306 # No forced dependency on
307 # mysql? ( virtual/mysql )
308 @@ -55,15 +56,16 @@
309 fi
310 done
311
312 - if [[ ${DB_COUNT} -eq 0 ]]; then
313 - eerror
314 - eerror "\033[1;31m**************************************************\033[00m"
315 - eerror "No database selected in your USE flags,"
316 - eerror "You must select at least one."
317 - eerror "\033[1;31m**************************************************\033[00m"
318 - eerror
319 - die
320 - fi
321 + # REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
322 + #if [[ ${DB_COUNT} -eq 0 ]]; then
323 + # eerror
324 + # eerror "\033[1;31m**************************************************\033[00m"
325 + # eerror "No database selected in your USE flags,"
326 + # eerror "You must select at least one."
327 + # eerror "\033[1;31m**************************************************\033[00m"
328 + # eerror
329 + # die
330 + #fi
331
332 if [[ ${DB_COUNT} -gt 1 ]]; then
333 MYDB=""