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

Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/opera: opera-10.10-r1.ebuild opera-10.20_pre4744.ebuild opera-10.10.ebuild ChangeLog
Date: Tue, 16 Feb 2010 18:13:23
Message-Id: E1NhRvE-0004iS-1v@stork.gentoo.org
1 jer 10/02/16 18:13:20
2
3 Modified: opera-10.10-r1.ebuild opera-10.20_pre4744.ebuild
4 opera-10.10.ebuild ChangeLog
5 Log:
6 Remove qt3 support and hence ppc and x86-fbsd support (bug #283430). Remove unneeded qt-core dependency (qt-gui is enough).
7 (Portage version: 2.2_rc62/cvs/Linux i686)
8
9 Revision Changes Path
10 1.3 www-client/opera/opera-10.10-r1.ebuild
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/opera-10.10-r1.ebuild?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/opera-10.10-r1.ebuild?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/opera-10.10-r1.ebuild?r1=1.2&r2=1.3
15
16 Index: opera-10.10-r1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.10-r1.ebuild,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- opera-10.10-r1.ebuild 28 Jan 2010 21:52:44 -0000 1.2
23 +++ opera-10.10-r1.ebuild 16 Feb 2010 18:13:18 -0000 1.3
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2010 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.10-r1.ebuild,v 1.2 2010/01/28 21:52:44 jer Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.10-r1.ebuild,v 1.3 2010/02/16 18:13:18 jer Exp $
29
30 EAPI="2"
31
32 @@ -13,7 +13,7 @@
33
34 SLOT="0"
35 LICENSE="OPERA-10.10"
36 -KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
37 +KEYWORDS="~amd64 ~x86"
38
39 RESTRICT="mirror test"
40
41 @@ -32,7 +32,7 @@
42 opt/${PN}/lib/${PN}/${PV/_pre*}/operapluginwrapper-native
43 "
44
45 -IUSE="elibc_FreeBSD gnome qt3 qt-static"
46 +IUSE="gnome qt-static"
47 MY_LINGUAS="be bg cs da de el en-GB es-ES es-LA et fi fr fr-CA fy hi hr hu id it ja ka ko lt mk nb nl nn pl pt pt-BR ro ru sk sr sv ta te tr uk zh-CN zh-HK zh-TW"
48
49 for MY_LINGUA in ${MY_LINGUAS}; do
50 @@ -44,20 +44,12 @@
51 SRC_URI="
52 amd64? (
53 qt-static? ( ${O_U}x86_64/${P}.gcc4-bundled-qt4.x86_64.tar.bz2 )
54 - !qt-static? (
55 - qt3? ( ${O_U}x86_64/${P}.gcc4-shared-qt3.x86_64.tar.bz2 )
56 - !qt3? ( ${O_U}x86_64/${P}.gcc4-qt4.x86_64.tar.bz2 )
57 - )
58 + !qt-static? ( ${O_U}x86_64/${P}.gcc4-qt4.x86_64.tar.bz2 )
59 )
60 - ppc? ( ${O_U}ppc/shared/${P}.gcc4-shared-qt3.ppc.tar.bz2 )
61 x86? (
62 qt-static? ( ${O_U}i386/${P}.gcc4-bundled-qt4.i386.tar.bz2 )
63 - !qt-static? (
64 - qt3? ( ${O_U}i386/shared/${P}.gcc4-shared-qt3.i386.tar.bz2 )
65 - !qt3? ( ${O_U}i386/${P}.gcc4-qt4.i386.tar.bz2 )
66 - )
67 + !qt-static? ( ${O_U}i386/${P}.gcc4-qt4.i386.tar.bz2 )
68 )
69 - x86-fbsd? ( mirror://opera/unix/freebsd/1010/en/intel/shared/${P}-freebsd7-shared-qt3.i386.tar.bz2 )
70 "
71
72 DEPEND=">=sys-apps/sed-4"
73 @@ -78,20 +70,12 @@
74 x11-libs/libICE
75 amd64? (
76 qt-static? ( media-libs/nas )
77 - !qt-static? (
78 - qt3? ( =x11-libs/qt-3*[-immqt] )
79 - !qt3? ( x11-libs/qt-core x11-libs/qt-gui )
80 - )
81 + !qt-static? ( x11-libs/qt-gui )
82 )
83 - ppc? ( =x11-libs/qt-3*[-immqt] )
84 x86? (
85 qt-static? ( media-libs/nas )
86 - !qt-static? (
87 - qt3? ( =x11-libs/qt-3*[-immqt] )
88 - !qt3? ( x11-libs/qt-core x11-libs/qt-gui )
89 - )
90 + !qt-static? ( x11-libs/qt-gui )
91 )
92 - x86-fbsd? ( =x11-libs/qt-3*[-immqt] )
93 "
94
95 opera_linguas() {
96 @@ -128,11 +112,7 @@
97 epatch "${FILESDIR}/${PN}-freedesktop.patch"
98
99 # bug #181300:
100 - if use elibc_FreeBSD; then
101 - epatch "${FILESDIR}/${PN}-10.00-pluginpath-fbsd.patch"
102 - else
103 - epatch "${FILESDIR}/${PN}-10.00-pluginpath.patch"
104 - fi
105 + epatch "${FILESDIR}/${PN}-10.00-pluginpath.patch"
106
107 sed -e "s|config_dir=\"/etc\"|config_dir=\"${D}/etc/\"|g" \
108 -e "s|\(str_localdirplugin=\).*$|\1/opt/opera/lib/opera/plugins|" \
109 @@ -173,20 +153,6 @@
110 dodir /etc/revdep-rebuild
111 echo 'SEARCH_DIRS_MASK="/opt/opera/lib/opera/plugins"' > "${D}"/etc/revdep-rebuild/90opera
112
113 - # Change libz.so.3 to libz.so.1 for gentoo/freebsd
114 - if use elibc_FreeBSD; then
115 - scanelf -qR -N libz.so.3 -F "#N" "${D}"/opt/${PN}/ | \
116 - while read i; do
117 - if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]];
118 - then
119 - export SANITY_CHECK_LIBZ_FAILED=1
120 - break
121 - fi
122 - sed -i -e 's/libz\.so\.3/libz.so.1/g' "$i"
123 - done
124 - [[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die "failed to change libz.so.3 to libz.so.1"
125 - fi
126 -
127 # Add the Opera man dir to MANPATH:
128 insinto /etc/env.d
129 echo 'MANPATH="/opt/opera/share/man"' >> "${D}"/etc/env.d/90opera
130 @@ -201,12 +167,6 @@
131 elog "[General] tab, click on [Details...] then [Choose...] and point the"
132 elog "file chooser at /opt/opera/share/opera/locale/, then enter the"
133 elog "directory for the language you want and [Open] the .lng file."
134 -
135 - if use elibc_FreeBSD; then
136 - elog
137 - elog "To improve shared memory usage please set:"
138 - elog "$ sysctl kern.ipc.shm_allow_removed=1"
139 - fi
140 }
141
142 pkg_postrm() {
143
144
145
146 1.7 www-client/opera/opera-10.20_pre4744.ebuild
147
148 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/opera-10.20_pre4744.ebuild?rev=1.7&view=markup
149 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/opera-10.20_pre4744.ebuild?rev=1.7&content-type=text/plain
150 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/opera-10.20_pre4744.ebuild?r1=1.6&r2=1.7
151
152 Index: opera-10.20_pre4744.ebuild
153 ===================================================================
154 RCS file: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.20_pre4744.ebuild,v
155 retrieving revision 1.6
156 retrieving revision 1.7
157 diff -u -r1.6 -r1.7
158 --- opera-10.20_pre4744.ebuild 28 Jan 2010 21:52:44 -0000 1.6
159 +++ opera-10.20_pre4744.ebuild 16 Feb 2010 18:13:18 -0000 1.7
160 @@ -1,6 +1,6 @@
161 # Copyright 1999-2010 Gentoo Foundation
162 # Distributed under the terms of the GNU General Public License v2
163 -# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.20_pre4744.ebuild,v 1.6 2010/01/28 21:52:44 jer Exp $
164 +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.20_pre4744.ebuild,v 1.7 2010/02/16 18:13:18 jer Exp $
165
166 EAPI="2"
167
168 @@ -13,7 +13,7 @@
169
170 SLOT="0"
171 LICENSE="OPERA-10.10"
172 -KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
173 +KEYWORDS="~amd64 ~x86"
174
175 RESTRICT="mirror test"
176
177 @@ -32,7 +32,7 @@
178 opt/${PN}/lib/${PN}/${PV/_pre*}/operapluginwrapper-native
179 "
180
181 -IUSE="elibc_FreeBSD gnome qt3 qt-static"
182 +IUSE="gnome qt-static"
183 MY_LINGUAS="be bg cs da de el en-GB es-ES es-LA et fi fr fr-CA fy hi hr hu id it ja ka ko lt mk nb nl nn pl pt pt-BR ro ru sk sr sv ta te tr uk zh-CN zh-HK zh-TW"
184
185 for MY_LINGUA in ${MY_LINGUAS}; do
186 @@ -45,20 +45,12 @@
187 SRC_URI="
188 amd64? (
189 qt-static? ( ${O_U}x86_64-linux/${O_P}.gcc4-bundled-qt4.x86_64.tar.bz2 )
190 - !qt-static? (
191 - qt3? ( ${O_U}x86_64-linux/${O_P}.gcc4-shared-qt3.x86_64.tar.bz2 )
192 - !qt3? ( ${O_U}x86_64-linux/${O_P}.gcc4-qt4.x86_64.tar.bz2 )
193 - )
194 + !qt-static? ( ${O_U}x86_64-linux/${O_P}.gcc4-qt4.x86_64.tar.bz2 )
195 )
196 - ppc? ( ${O_U}ppc-linux/${O_P}.gcc4-shared-qt3.ppc.tar.bz2 )
197 x86? (
198 qt-static? ( ${O_U}intel-linux/${O_P}.gcc4-bundled-qt4.i386.tar.bz2 )
199 - !qt-static? (
200 - qt3? ( ${O_U}intel-linux/${O_P}.gcc4-shared-qt3.i386.tar.bz2 )
201 - !qt3? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
202 - )
203 + !qt-static? ( ${O_U}intel-linux/${O_P}.gcc4-qt4.i386.tar.bz2 )
204 )
205 - x86-fbsd? ( ${O_U}intel-freebsd/${O_P}.freebsd7-shared-qt3.i386.tar.bz2 )
206 "
207
208 DEPEND=">=sys-apps/sed-4"
209 @@ -79,18 +71,11 @@
210 x11-libs/libICE
211 amd64? (
212 qt-static? ( media-libs/nas )
213 - !qt-static? (
214 - qt3? ( =x11-libs/qt-3*[-immqt] )
215 - !qt3? ( x11-libs/qt-core x11-libs/qt-gui )
216 - )
217 + !qt-static? ( x11-libs/qt-gui )
218 )
219 - ppc? ( =x11-libs/qt-3*[-immqt] )
220 x86? (
221 qt-static? ( media-libs/nas )
222 - !qt-static? (
223 - qt3? ( =x11-libs/qt-3*[-immqt] )
224 - !qt3? ( x11-libs/qt-core x11-libs/qt-gui )
225 - )
226 + !qt-static? ( x11-libs/qt-gui )
227 )
228 x86-fbsd? ( =x11-libs/qt-3*[-immqt] )
229 "
230 @@ -133,11 +118,7 @@
231 epatch "${FILESDIR}/${PN}-freedesktop.patch"
232
233 # bug #181300:
234 - if use elibc_FreeBSD; then
235 - epatch "${FILESDIR}/${PN}-10.00-pluginpath-fbsd.patch"
236 - else
237 - epatch "${FILESDIR}/${PN}-10.00-pluginpath.patch"
238 - fi
239 + epatch "${FILESDIR}/${PN}-10.00-pluginpath.patch"
240
241 sed -e "s|config_dir=\"/etc\"|config_dir=\"${D}/etc/\"|g" \
242 -e "s|\(str_localdirplugin=\).*$|\1/opt/opera/lib/opera/plugins|" \
243 @@ -178,20 +159,6 @@
244 dodir /etc/revdep-rebuild
245 echo 'SEARCH_DIRS_MASK="/opt/opera/lib/opera/plugins"' > "${D}"/etc/revdep-rebuild/90opera
246
247 - # Change libz.so.3 to libz.so.1 for gentoo/freebsd
248 - if use elibc_FreeBSD; then
249 - scanelf -qR -N libz.so.3 -F "#N" "${D}"/opt/${PN}/ | \
250 - while read i; do
251 - if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]];
252 - then
253 - export SANITY_CHECK_LIBZ_FAILED=1
254 - break
255 - fi
256 - sed -i -e 's/libz\.so\.3/libz.so.1/g' "$i"
257 - done
258 - [[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die "failed to change libz.so.3 to libz.so.1"
259 - fi
260 -
261 # Add the Opera man dir to MANPATH:
262 insinto /etc/env.d
263 echo 'MANPATH="/opt/opera/share/man"' >> "${D}"/etc/env.d/90opera
264 @@ -206,12 +173,6 @@
265 elog "[General] tab, click on [Details...] then [Choose...] and point the"
266 elog "file chooser at /opt/opera/share/opera/locale/, then enter the"
267 elog "directory for the language you want and [Open] the .lng file."
268 -
269 - if use elibc_FreeBSD; then
270 - elog
271 - elog "To improve shared memory usage please set:"
272 - elog "$ sysctl kern.ipc.shm_allow_removed=1"
273 - fi
274 }
275
276 pkg_postrm() {
277
278
279
280 1.9 www-client/opera/opera-10.10.ebuild
281
282 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/opera-10.10.ebuild?rev=1.9&view=markup
283 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/opera-10.10.ebuild?rev=1.9&content-type=text/plain
284 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/opera-10.10.ebuild?r1=1.8&r2=1.9
285
286 Index: opera-10.10.ebuild
287 ===================================================================
288 RCS file: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.10.ebuild,v
289 retrieving revision 1.8
290 retrieving revision 1.9
291 diff -u -r1.8 -r1.9
292 --- opera-10.10.ebuild 2 Jan 2010 16:54:58 -0000 1.8
293 +++ opera-10.10.ebuild 16 Feb 2010 18:13:18 -0000 1.9
294 @@ -1,6 +1,6 @@
295 # Copyright 1999-2010 Gentoo Foundation
296 # Distributed under the terms of the GNU General Public License v2
297 -# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.10.ebuild,v 1.8 2010/01/02 16:54:58 jer Exp $
298 +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-10.10.ebuild,v 1.9 2010/02/16 18:13:18 jer Exp $
299
300 EAPI="2"
301
302 @@ -13,7 +13,7 @@
303
304 SLOT="0"
305 LICENSE="OPERA-10.10"
306 -KEYWORDS="amd64 ppc x86 ~x86-fbsd"
307 +KEYWORDS="amd64 x86"
308
309 RESTRICT="mirror test"
310
311 @@ -32,7 +32,7 @@
312 opt/${PN}/lib/${PN}/${PV/_pre*}/operapluginwrapper-native
313 "
314
315 -IUSE="elibc_FreeBSD gnome qt3 qt-static"
316 +IUSE="gnome qt-static"
317 MY_LINGUAS="be bg cs da de el en-GB es-ES es-LA et fi fr fr-CA fy hi hr hu id it ja ka ko lt mk nb nl nn pl pt pt-BR ro ru sk sr sv ta te tr uk zh-CN zh-HK zh-TW"
318
319 for MY_LINGUA in ${MY_LINGUAS}; do
320 @@ -44,20 +44,12 @@
321 SRC_URI="
322 amd64? (
323 qt-static? ( ${O_U}x86_64/${P}.gcc4-bundled-qt4.x86_64.tar.bz2 )
324 - !qt-static? (
325 - qt3? ( ${O_U}x86_64/${P}.gcc4-shared-qt3.x86_64.tar.bz2 )
326 - !qt3? ( ${O_U}x86_64/${P}.gcc4-qt4.x86_64.tar.bz2 )
327 - )
328 + !qt-static? ( ${O_U}x86_64/${P}.gcc4-qt4.x86_64.tar.bz2 )
329 )
330 - ppc? ( ${O_U}ppc/shared/${P}.gcc4-shared-qt3.ppc.tar.bz2 )
331 x86? (
332 qt-static? ( ${O_U}i386/${P}.gcc4-bundled-qt4.i386.tar.bz2 )
333 - !qt-static? (
334 - qt3? ( ${O_U}i386/shared/${P}.gcc4-shared-qt3.i386.tar.bz2 )
335 - !qt3? ( ${O_U}i386/${P}.gcc4-qt4.i386.tar.bz2 )
336 - )
337 + !qt-static? ( ${O_U}i386/${P}.gcc4-qt4.i386.tar.bz2 )
338 )
339 - x86-fbsd? ( mirror://opera/unix/freebsd/1010/en/intel/shared/${P}-freebsd7-shared-qt3.i386.tar.bz2 )
340 "
341
342 DEPEND=">=sys-apps/sed-4"
343 @@ -78,20 +70,12 @@
344 x11-libs/libICE
345 amd64? (
346 qt-static? ( media-libs/nas )
347 - !qt-static? (
348 - qt3? ( =x11-libs/qt-3*[-immqt] )
349 - !qt3? ( x11-libs/qt-core x11-libs/qt-gui )
350 - )
351 + !qt-static? ( x11-libs/qt-gui )
352 )
353 - ppc? ( =x11-libs/qt-3*[-immqt] )
354 x86? (
355 qt-static? ( media-libs/nas )
356 - !qt-static? (
357 - qt3? ( =x11-libs/qt-3*[-immqt] )
358 - !qt3? ( x11-libs/qt-core x11-libs/qt-gui )
359 - )
360 + !qt-static? ( x11-libs/qt-gui )
361 )
362 - x86-fbsd? ( =x11-libs/qt-3*[-immqt] )
363 "
364
365 opera_linguas() {
366 @@ -128,11 +112,7 @@
367 epatch "${FILESDIR}/${PN}-freedesktop.patch"
368
369 # bug #181300:
370 - if use elibc_FreeBSD; then
371 - epatch "${FILESDIR}/${PN}-10.00-pluginpath-fbsd.patch"
372 - else
373 - epatch "${FILESDIR}/${PN}-10.00-pluginpath.patch"
374 - fi
375 + epatch "${FILESDIR}/${PN}-10.00-pluginpath.patch"
376
377 sed -i -e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \
378 -e "s:\(str_localdirplugin=\).*$:\1/opt/opera/lib/opera/plugins:" \
379 @@ -173,20 +153,6 @@
380 dodir /etc/revdep-rebuild
381 echo 'SEARCH_DIRS_MASK="/opt/opera/lib/opera/plugins"' > "${D}"/etc/revdep-rebuild/90opera
382
383 - # Change libz.so.3 to libz.so.1 for gentoo/freebsd
384 - if use elibc_FreeBSD; then
385 - scanelf -qR -N libz.so.3 -F "#N" "${D}"/opt/${PN}/ | \
386 - while read i; do
387 - if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]];
388 - then
389 - export SANITY_CHECK_LIBZ_FAILED=1
390 - break
391 - fi
392 - sed -i -e 's/libz\.so\.3/libz.so.1/g' "$i"
393 - done
394 - [[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die "failed to change libz.so.3 to libz.so.1"
395 - fi
396 -
397 # Add the Opera man dir to MANPATH:
398 insinto /etc/env.d
399 echo 'MANPATH="/opt/opera/share/man"' >> "${D}"/etc/env.d/90opera
400 @@ -201,12 +167,6 @@
401 elog "[General] tab, click on [Details...] then [Choose...] and point the"
402 elog "file chooser at /opt/opera/share/opera/locale/, then enter the"
403 elog "directory for the language you want and [Open] the .lng file."
404 -
405 - if use elibc_FreeBSD; then
406 - elog
407 - elog "To improve shared memory usage please set:"
408 - elog "$ sysctl kern.ipc.shm_allow_removed=1"
409 - fi
410 }
411
412 pkg_postrm() {
413
414
415
416 1.447 www-client/opera/ChangeLog
417
418 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/ChangeLog?rev=1.447&view=markup
419 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/ChangeLog?rev=1.447&content-type=text/plain
420 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-client/opera/ChangeLog?r1=1.446&r2=1.447
421
422 Index: ChangeLog
423 ===================================================================
424 RCS file: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v
425 retrieving revision 1.446
426 retrieving revision 1.447
427 diff -u -r1.446 -r1.447
428 --- ChangeLog 11 Feb 2010 09:59:37 -0000 1.446
429 +++ ChangeLog 16 Feb 2010 18:13:18 -0000 1.447
430 @@ -1,6 +1,11 @@
431 # ChangeLog for www-client/opera
432 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
433 -# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.446 2010/02/11 09:59:37 jer Exp $
434 +# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.447 2010/02/16 18:13:18 jer Exp $
435 +
436 + 16 Feb 2010; Jeroen Roovers <jer@g.o> opera-10.10.ebuild,
437 + opera-10.10-r1.ebuild, opera-10.20_pre4744.ebuild:
438 + Remove qt3 support and hence ppc and x86-fbsd support (bug #283430).
439 + Remove unneeded qt-core dependency (qt-gui is enough).
440
441 *opera-10.50_pre6219 (11 Feb 2010)
Report Message
Find on MARC Find on Google Groups