Gentoo Archives: gentoo-commits

From: Ian Stakenvicius <axs@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mozilla:crossdev commit in: eclass/
Date: Fri, 27 Nov 2015 19:24:09
Message-Id: 1448652048.0c4033e3a1315df51f758b6462de447fd499148c.axs@gentoo
1 commit: 0c4033e3a1315df51f758b6462de447fd499148c
2 Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 27 18:40:21 2015 +0000
4 Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
5 CommitDate: Fri Nov 27 19:20:48 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=0c4033e3
7
8 old eclass cleanup
9
10 eclass/mozconfig-v5.34.eclass | 232 -------------------------------------
11 eclass/mozconfig-v5.36.eclass | 232 -------------------------------------
12 eclass/mozconfig-v5.38.eclass | 231 -------------------------------------
13 eclass/mozconfig-v6.40.eclass | 263 ------------------------------------------
14 4 files changed, 958 deletions(-)
15
16 diff --git a/eclass/mozconfig-v5.34.eclass b/eclass/mozconfig-v5.34.eclass
17 deleted file mode 100644
18 index aa73966..0000000
19 --- a/eclass/mozconfig-v5.34.eclass
20 +++ /dev/null
21 @@ -1,232 +0,0 @@
22 -# Copyright 1999-2014 Gentoo Foundation
23 -# Distributed under the terms of the GNU General Public License v2
24 -# $Id$
25 -#
26 -# @ECLASS: mozconfig-v5.33.eclass
27 -# @MAINTAINER:
28 -# mozilla team <mozilla@g.o>
29 -# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v5
30 -# @DESCRIPTION:
31 -# This eclass is used in mozilla ebuilds (firefox, thunderbird, seamonkey)
32 -# to provide a single common place for the common mozilla engine compoments.
33 -#
34 -# The eclass provides all common dependencies as well as common use flags.
35 -#
36 -# Some use flags which may be optional in particular mozilla packages can be
37 -# supported through setting eclass variables.
38 -#
39 -# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v3,
40 -# and so ebuilds inheriting this eclass do not need to inherit that.
41 -
42 -inherit multilib flag-o-matic toolchain-funcs mozcoreconf-v3
43 -
44 -case ${EAPI} in
45 - 0|1|2|3|4) die "EAPI=${EAPI} not supported"
46 -esac
47 -
48 -# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI
49 -# @DESCRIPTION:
50 -# Set this variable before the inherit line, when an ebuild needs to provide
51 -# optional necko-wifi support via IUSE="wifi". Currently this would include
52 -# ebuilds for firefox, and potentially seamonkey.
53 -#
54 -# Leave the variable UNSET if necko-wifi support should not be available.
55 -# Set the variable to "enabled" if the use flag should be enabled by default.
56 -# Set the variable to any value if the use flag should exist but not be default-enabled.
57 -
58 -# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_JIT
59 -# @DESCRIPTION:
60 -# Set this variable before the inherit line, when an ebuild needs to provide
61 -# optional necko-wifi support via IUSE="jit". Currently this would include
62 -# ebuilds for firefox, and potentially seamonkey.
63 -#
64 -# Leave the variable UNSET if optional jit support should not be available.
65 -# Set the variable to "enabled" if the use flag should be enabled by default.
66 -# Set the variable to any value if the use flag should exist but not be default-enabled.
67 -
68 -# use-flags common among all mozilla ebuilds
69 -IUSE="${IUSE} dbus debug gstreamer pulseaudio selinux startup-notification system-cairo system-icu system-jpeg system-sqlite system-libvpx"
70 -
71 -# some notes on deps:
72 -# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 2.14
73 -# media-libs/mesa needs to be 10.2 or above due to a bug with flash+vdpau
74 -
75 -RDEPEND=">=app-text/hunspell-1.2
76 - dev-libs/atk
77 - dev-libs/expat
78 - >=dev-libs/libevent-1.4.7
79 - >=x11-libs/cairo-1.10[X]
80 - >=x11-libs/gtk+-2.14:2
81 - x11-libs/gdk-pixbuf
82 - >=x11-libs/pango-1.22.0
83 - >=media-libs/libpng-1.6.13:0=[apng]
84 - >=media-libs/mesa-10.2:*
85 - media-libs/fontconfig
86 - >=media-libs/freetype-2.4.10
87 - kernel_linux? ( media-libs/alsa-lib )
88 - pulseaudio? ( media-sound/pulseaudio )
89 - virtual/freedesktop-icon-theme
90 - dbus? ( >=sys-apps/dbus-0.60
91 - >=dev-libs/dbus-glib-0.72 )
92 - startup-notification? ( >=x11-libs/startup-notification-0.8 )
93 - >=dev-libs/glib-2.26:2
94 - >=sys-libs/zlib-1.2.3
95 - virtual/libffi
96 - gstreamer? (
97 - >=media-libs/gstreamer-1.2.3:1.0
98 - >=media-libs/gst-plugins-base-1.2.3:1.0
99 - >=media-libs/gst-plugins-good-1.2.3:1.0
100 - >=media-plugins/gst-plugins-libav-1.1.0_pre20130128-r1:1.0
101 - )
102 - x11-libs/libX11
103 - x11-libs/libXcomposite
104 - x11-libs/libXdamage
105 - x11-libs/libXext
106 - x11-libs/libXfixes
107 - x11-libs/libXrender
108 - x11-libs/libXt
109 - system-cairo? ( >=x11-libs/cairo-1.12[X] >=x11-libs/pixman-0.19.2 )
110 - system-icu? ( >=dev-libs/icu-51.1:= )
111 - system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
112 - system-sqlite? ( >=dev-db/sqlite-3.8.6:3[secure-delete,debug=] )
113 - system-libvpx? ( =media-libs/libvpx-1.3.0*[postproc] )
114 -"
115 -
116 -if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
117 - if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then
118 - IUSE+=" +wifi"
119 - else
120 - IUSE+=" wifi"
121 - fi
122 - RDEPEND+="
123 - wifi? ( >=sys-apps/dbus-0.60
124 - >=dev-libs/dbus-glib-0.72
125 - net-wireless/wireless-tools )"
126 -fi
127 -if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
128 - if [[ ${MOZCONFIG_OPTIONAL_JIT} = "enabled" ]]; then
129 - IUSE+=" +jit"
130 - else
131 - IUSE+=" jit"
132 - fi
133 -fi
134 -
135 -DEPEND="app-arch/zip
136 - app-arch/unzip
137 - >=sys-devel/binutils-2.16.1
138 - ${RDEPEND}"
139 -
140 -RDEPEND+="
141 - selinux? ( sec-policy/selinux-mozilla )"
142 -
143 -# @FUNCTION: mozconfig_config
144 -# @DESCRIPTION:
145 -# Set common configure options for mozilla packages.
146 -# Call this within src_configure() phase, after mozconfig_init
147 -#
148 -# Example:
149 -#
150 -# inherit mozconfig-v5.33
151 -#
152 -# src_configure() {
153 -# mozconfig_init
154 -# mozconfig_config
155 -# # ... misc ebuild-unique settings via calls to
156 -# # ... mozconfig_{annotate,use_with,use_enable}
157 -# mozconfig_final
158 -# }
159 -
160 -mozconfig_config() {
161 - # Migrated from mozcoreconf-2
162 - mozconfig_annotate 'system_libs' \
163 - --with-system-zlib \
164 - --enable-pango \
165 - --enable-svg \
166 - --with-system-bz2
167 -
168 - mozconfig_annotate '' --enable-default-toolkit=cairo-gtk2
169 -
170 - if has bindist ${IUSE}; then
171 - mozconfig_use_enable !bindist official-branding
172 - if [[ ${PN} == firefox ]] && use bindist ; then
173 - mozconfig_annotate '' --with-branding=browser/branding/aurora
174 - fi
175 - fi
176 -
177 - mozconfig_use_enable debug
178 - mozconfig_use_enable debug tests
179 -
180 - if ! use debug ; then
181 - mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
182 - else
183 - mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
184 - fi
185 -
186 - mozconfig_use_enable startup-notification
187 -
188 - if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]] ; then
189 - # wifi pulls in dbus so manage both here
190 - mozconfig_use_enable wifi necko-wifi
191 - if use wifi && ! use dbus; then
192 - echo "Enabling dbus support due to wifi request"
193 - mozconfig_annotate 'dbus required by necko-wifi' --enable-dbus
194 - else
195 - mozconfig_use_enable dbus
196 - fi
197 - else
198 - mozconfig_use_enable dbus
199 - mozconfig_annotate 'disabled' --disable-necko-wifi
200 - fi
201 -
202 - # These are forced-on for webm support
203 - mozconfig_annotate 'required' --enable-ogg
204 - mozconfig_annotate 'required' --enable-wave
205 -
206 - if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
207 - mozconfig_use_enable jit ion
208 - mozconfig_use_enable jit yarr-jit
209 - fi
210 -
211 - # These are enabled by default in all mozilla applications
212 - mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr
213 - mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
214 - mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir)
215 - mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
216 - mozconfig_annotate '' --prefix="${EPREFIX}"/usr
217 - mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
218 - mozconfig_annotate 'Gentoo default' --enable-system-hunspell
219 - mozconfig_annotate '' --disable-gnomevfs
220 - mozconfig_annotate '' --disable-gnomeui
221 - mozconfig_annotate '' --enable-gio
222 - mozconfig_annotate '' --disable-crashreporter
223 - mozconfig_annotate 'Gentoo default' --with-system-png
224 - mozconfig_annotate '' --enable-system-ffi
225 - mozconfig_annotate 'Gentoo default to honor system linker' --disable-gold
226 - mozconfig_annotate '' --disable-gconf
227 -
228 - # Use jemalloc unless libc is not glibc >= 2.4
229 - # at this time the minimum glibc in the tree is 2.9 so we should be safe.
230 - if use elibc_glibc; then
231 - # We must force-enable jemalloc 3 via .mozconfig
232 - echo "export MOZ_JEMALLOC3=1" >> "${S}"/.mozconfig || die
233 - mozconfig_annotate '' --enable-jemalloc
234 - mozconfig_annotate '' --enable-replace-malloc
235 - fi
236 -
237 - mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
238 - mozconfig_annotate '' --build="${CTARGET:-${CHOST}}"
239 -
240 - if use gstreamer; then
241 - mozconfig_annotate '+gstreamer' --enable-gstreamer=1.0
242 - else
243 - mozconfig_annotate '' --disable-gstreamer
244 - fi
245 - mozconfig_use_enable pulseaudio
246 -
247 - mozconfig_use_enable system-cairo
248 - mozconfig_use_enable system-sqlite
249 - mozconfig_use_with system-jpeg
250 - mozconfig_use_with system-icu
251 - mozconfig_use_enable system-icu intl-api
252 - mozconfig_use_with system-libvpx
253 -}
254
255 diff --git a/eclass/mozconfig-v5.36.eclass b/eclass/mozconfig-v5.36.eclass
256 deleted file mode 100644
257 index d86fe55..0000000
258 --- a/eclass/mozconfig-v5.36.eclass
259 +++ /dev/null
260 @@ -1,232 +0,0 @@
261 -# Copyright 1999-2015 Gentoo Foundation
262 -# Distributed under the terms of the GNU General Public License v2
263 -# $Id$
264 -#
265 -# @ECLASS: mozconfig-v5.33.eclass
266 -# @MAINTAINER:
267 -# mozilla team <mozilla@g.o>
268 -# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v5
269 -# @DESCRIPTION:
270 -# This eclass is used in mozilla ebuilds (firefox, thunderbird, seamonkey)
271 -# to provide a single common place for the common mozilla engine compoments.
272 -#
273 -# The eclass provides all common dependencies as well as common use flags.
274 -#
275 -# Some use flags which may be optional in particular mozilla packages can be
276 -# supported through setting eclass variables.
277 -#
278 -# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v3,
279 -# and so ebuilds inheriting this eclass do not need to inherit that.
280 -
281 -inherit multilib flag-o-matic toolchain-funcs mozcoreconf-v3
282 -
283 -case ${EAPI} in
284 - 0|1|2|3|4) die "EAPI=${EAPI} not supported"
285 -esac
286 -
287 -# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI
288 -# @DESCRIPTION:
289 -# Set this variable before the inherit line, when an ebuild needs to provide
290 -# optional necko-wifi support via IUSE="wifi". Currently this would include
291 -# ebuilds for firefox, and potentially seamonkey.
292 -#
293 -# Leave the variable UNSET if necko-wifi support should not be available.
294 -# Set the variable to "enabled" if the use flag should be enabled by default.
295 -# Set the variable to any value if the use flag should exist but not be default-enabled.
296 -
297 -# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_JIT
298 -# @DESCRIPTION:
299 -# Set this variable before the inherit line, when an ebuild needs to provide
300 -# optional necko-wifi support via IUSE="jit". Currently this would include
301 -# ebuilds for firefox, and potentially seamonkey.
302 -#
303 -# Leave the variable UNSET if optional jit support should not be available.
304 -# Set the variable to "enabled" if the use flag should be enabled by default.
305 -# Set the variable to any value if the use flag should exist but not be default-enabled.
306 -
307 -# use-flags common among all mozilla ebuilds
308 -IUSE="${IUSE} dbus debug gstreamer pulseaudio selinux startup-notification system-cairo system-icu system-jpeg system-sqlite system-libvpx"
309 -
310 -# some notes on deps:
311 -# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 2.14
312 -# media-libs/mesa needs to be 10.2 or above due to a bug with flash+vdpau
313 -
314 -RDEPEND=">=app-text/hunspell-1.2
315 - dev-libs/atk
316 - dev-libs/expat
317 - >=dev-libs/libevent-1.4.7
318 - >=x11-libs/cairo-1.10[X]
319 - >=x11-libs/gtk+-2.18:2
320 - x11-libs/gdk-pixbuf
321 - >=x11-libs/pango-1.22.0
322 - >=media-libs/libpng-1.6.14:0=[apng]
323 - >=media-libs/mesa-10.2:*
324 - media-libs/fontconfig
325 - >=media-libs/freetype-2.4.10
326 - kernel_linux? ( media-libs/alsa-lib )
327 - pulseaudio? ( media-sound/pulseaudio )
328 - virtual/freedesktop-icon-theme
329 - dbus? ( >=sys-apps/dbus-0.60
330 - >=dev-libs/dbus-glib-0.72 )
331 - startup-notification? ( >=x11-libs/startup-notification-0.8 )
332 - >=dev-libs/glib-2.26:2
333 - >=sys-libs/zlib-1.2.3
334 - >=virtual/libffi-3.0.10
335 - gstreamer? (
336 - >=media-libs/gstreamer-1.2.3:1.0
337 - >=media-libs/gst-plugins-base-1.2.3:1.0
338 - >=media-libs/gst-plugins-good-1.2.3:1.0
339 - >=media-plugins/gst-plugins-libav-1.1.0_pre20130128-r1:1.0
340 - )
341 - x11-libs/libX11
342 - x11-libs/libXcomposite
343 - x11-libs/libXdamage
344 - x11-libs/libXext
345 - x11-libs/libXfixes
346 - x11-libs/libXrender
347 - x11-libs/libXt
348 - system-cairo? ( >=x11-libs/cairo-1.12[X] >=x11-libs/pixman-0.19.2 )
349 - system-icu? ( >=dev-libs/icu-51.1:= )
350 - system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
351 - system-sqlite? ( >=dev-db/sqlite-3.8.7.4:3[secure-delete,debug=] )
352 - system-libvpx? ( >=media-libs/libvpx-1.3.0:0=[postproc] )
353 -"
354 -
355 -if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
356 - if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then
357 - IUSE+=" +wifi"
358 - else
359 - IUSE+=" wifi"
360 - fi
361 - RDEPEND+="
362 - wifi? ( >=sys-apps/dbus-0.60
363 - >=dev-libs/dbus-glib-0.72
364 - net-wireless/wireless-tools )"
365 -fi
366 -if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
367 - if [[ ${MOZCONFIG_OPTIONAL_JIT} = "enabled" ]]; then
368 - IUSE+=" +jit"
369 - else
370 - IUSE+=" jit"
371 - fi
372 -fi
373 -
374 -DEPEND="app-arch/zip
375 - app-arch/unzip
376 - >=sys-devel/binutils-2.16.1
377 - ${RDEPEND}"
378 -
379 -RDEPEND+="
380 - selinux? ( sec-policy/selinux-mozilla )"
381 -
382 -# @FUNCTION: mozconfig_config
383 -# @DESCRIPTION:
384 -# Set common configure options for mozilla packages.
385 -# Call this within src_configure() phase, after mozconfig_init
386 -#
387 -# Example:
388 -#
389 -# inherit mozconfig-v5.33
390 -#
391 -# src_configure() {
392 -# mozconfig_init
393 -# mozconfig_config
394 -# # ... misc ebuild-unique settings via calls to
395 -# # ... mozconfig_{annotate,use_with,use_enable}
396 -# mozconfig_final
397 -# }
398 -
399 -mozconfig_config() {
400 - # Migrated from mozcoreconf-2
401 - mozconfig_annotate 'system_libs' \
402 - --with-system-zlib \
403 - --enable-pango \
404 - --enable-svg \
405 - --with-system-bz2
406 -
407 - mozconfig_annotate '' --enable-default-toolkit=cairo-gtk2
408 -
409 - if has bindist ${IUSE}; then
410 - mozconfig_use_enable !bindist official-branding
411 - if [[ ${PN} == firefox ]] && use bindist ; then
412 - mozconfig_annotate '' --with-branding=browser/branding/aurora
413 - fi
414 - fi
415 -
416 - mozconfig_use_enable debug
417 - mozconfig_use_enable debug tests
418 -
419 - if ! use debug ; then
420 - mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
421 - else
422 - mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
423 - fi
424 -
425 - mozconfig_use_enable startup-notification
426 -
427 - if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]] ; then
428 - # wifi pulls in dbus so manage both here
429 - mozconfig_use_enable wifi necko-wifi
430 - if use wifi && ! use dbus; then
431 - echo "Enabling dbus support due to wifi request"
432 - mozconfig_annotate 'dbus required by necko-wifi' --enable-dbus
433 - else
434 - mozconfig_use_enable dbus
435 - fi
436 - else
437 - mozconfig_use_enable dbus
438 - mozconfig_annotate 'disabled' --disable-necko-wifi
439 - fi
440 -
441 - # These are forced-on for webm support
442 - mozconfig_annotate 'required' --enable-ogg
443 - mozconfig_annotate 'required' --enable-wave
444 -
445 - if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
446 - mozconfig_use_enable jit ion
447 - mozconfig_use_enable jit yarr-jit
448 - fi
449 -
450 - # These are enabled by default in all mozilla applications
451 - mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr
452 - mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
453 - mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir)
454 - mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
455 - mozconfig_annotate '' --prefix="${EPREFIX}"/usr
456 - mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
457 - mozconfig_annotate 'Gentoo default' --enable-system-hunspell
458 - mozconfig_annotate '' --disable-gnomevfs
459 - mozconfig_annotate '' --disable-gnomeui
460 - mozconfig_annotate '' --enable-gio
461 - mozconfig_annotate '' --disable-crashreporter
462 - mozconfig_annotate 'Gentoo default' --with-system-png
463 - mozconfig_annotate '' --enable-system-ffi
464 - mozconfig_annotate 'Gentoo default to honor system linker' --disable-gold
465 - mozconfig_annotate '' --disable-gconf
466 -
467 - # Use jemalloc unless libc is not glibc >= 2.4
468 - # at this time the minimum glibc in the tree is 2.9 so we should be safe.
469 - if use elibc_glibc; then
470 - # We must force-enable jemalloc 3 via .mozconfig
471 - echo "export MOZ_JEMALLOC3=1" >> "${S}"/.mozconfig || die
472 - mozconfig_annotate '' --enable-jemalloc
473 - mozconfig_annotate '' --enable-replace-malloc
474 - fi
475 -
476 - mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
477 - mozconfig_annotate '' --build="${CTARGET:-${CHOST}}"
478 -
479 - if use gstreamer; then
480 - mozconfig_annotate '+gstreamer' --enable-gstreamer=1.0
481 - else
482 - mozconfig_annotate '' --disable-gstreamer
483 - fi
484 - mozconfig_use_enable pulseaudio
485 -
486 - mozconfig_use_enable system-cairo
487 - mozconfig_use_enable system-sqlite
488 - mozconfig_use_with system-jpeg
489 - mozconfig_use_with system-icu
490 - mozconfig_use_enable system-icu intl-api
491 - mozconfig_use_with system-libvpx
492 -}
493
494 diff --git a/eclass/mozconfig-v5.38.eclass b/eclass/mozconfig-v5.38.eclass
495 deleted file mode 100644
496 index 2882b8b..0000000
497 --- a/eclass/mozconfig-v5.38.eclass
498 +++ /dev/null
499 @@ -1,231 +0,0 @@
500 -# Copyright 1999-2015 Gentoo Foundation
501 -# Distributed under the terms of the GNU General Public License v2
502 -# $Id$
503 -#
504 -# @ECLASS: mozconfig-v5.33.eclass
505 -# @MAINTAINER:
506 -# mozilla team <mozilla@g.o>
507 -# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v5
508 -# @DESCRIPTION:
509 -# This eclass is used in mozilla ebuilds (firefox, thunderbird, seamonkey)
510 -# to provide a single common place for the common mozilla engine compoments.
511 -#
512 -# The eclass provides all common dependencies as well as common use flags.
513 -#
514 -# Some use flags which may be optional in particular mozilla packages can be
515 -# supported through setting eclass variables.
516 -#
517 -# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v3,
518 -# and so ebuilds inheriting this eclass do not need to inherit that.
519 -
520 -inherit multilib flag-o-matic toolchain-funcs mozcoreconf-v3
521 -
522 -case ${EAPI} in
523 - 0|1|2|3|4) die "EAPI=${EAPI} not supported"
524 -esac
525 -
526 -# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI
527 -# @DESCRIPTION:
528 -# Set this variable before the inherit line, when an ebuild needs to provide
529 -# optional necko-wifi support via IUSE="wifi". Currently this would include
530 -# ebuilds for firefox, and potentially seamonkey.
531 -#
532 -# Leave the variable UNSET if necko-wifi support should not be available.
533 -# Set the variable to "enabled" if the use flag should be enabled by default.
534 -# Set the variable to any value if the use flag should exist but not be default-enabled.
535 -
536 -# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_JIT
537 -# @DESCRIPTION:
538 -# Set this variable before the inherit line, when an ebuild needs to provide
539 -# optional necko-wifi support via IUSE="jit". Currently this would include
540 -# ebuilds for firefox, and potentially seamonkey.
541 -#
542 -# Leave the variable UNSET if optional jit support should not be available.
543 -# Set the variable to "enabled" if the use flag should be enabled by default.
544 -# Set the variable to any value if the use flag should exist but not be default-enabled.
545 -
546 -# use-flags common among all mozilla ebuilds
547 -IUSE="${IUSE} dbus debug gstreamer +jemalloc3 pulseaudio selinux startup-notification system-cairo system-icu system-jpeg system-sqlite system-libvpx"
548 -
549 -# some notes on deps:
550 -# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 2.14
551 -# media-libs/mesa needs to be 10.2 or above due to a bug with flash+vdpau
552 -
553 -RDEPEND=">=app-text/hunspell-1.2
554 - dev-libs/atk
555 - dev-libs/expat
556 - >=dev-libs/libevent-1.4.7
557 - >=x11-libs/cairo-1.10[X]
558 - >=x11-libs/gtk+-2.18:2
559 - x11-libs/gdk-pixbuf
560 - >=x11-libs/pango-1.22.0
561 - >=media-libs/libpng-1.6.16:0=[apng]
562 - >=media-libs/mesa-10.2:*
563 - media-libs/fontconfig
564 - >=media-libs/freetype-2.4.10
565 - kernel_linux? ( media-libs/alsa-lib )
566 - pulseaudio? ( media-sound/pulseaudio )
567 - virtual/freedesktop-icon-theme
568 - dbus? ( >=sys-apps/dbus-0.60
569 - >=dev-libs/dbus-glib-0.72 )
570 - startup-notification? ( >=x11-libs/startup-notification-0.8 )
571 - >=dev-libs/glib-2.26:2
572 - >=sys-libs/zlib-1.2.3
573 - >=virtual/libffi-3.0.10
574 - gstreamer? (
575 - >=media-libs/gstreamer-1.2.3:1.0
576 - >=media-libs/gst-plugins-base-1.2.3:1.0
577 - >=media-libs/gst-plugins-good-1.2.3:1.0
578 - >=media-plugins/gst-plugins-libav-1.1.0_pre20130128-r1:1.0
579 - )
580 - x11-libs/libX11
581 - x11-libs/libXcomposite
582 - x11-libs/libXdamage
583 - x11-libs/libXext
584 - x11-libs/libXfixes
585 - x11-libs/libXrender
586 - x11-libs/libXt
587 - system-cairo? ( >=x11-libs/cairo-1.12[X] >=x11-libs/pixman-0.19.2 )
588 - system-icu? ( >=dev-libs/icu-51.1:= )
589 - system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
590 - system-sqlite? ( >=dev-db/sqlite-3.8.8.2:3[secure-delete,debug=] )
591 - system-libvpx? ( >=media-libs/libvpx-1.3.0:0=[postproc] )
592 -"
593 -
594 -if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
595 - if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then
596 - IUSE+=" +wifi"
597 - else
598 - IUSE+=" wifi"
599 - fi
600 - RDEPEND+="
601 - wifi? ( >=sys-apps/dbus-0.60
602 - >=dev-libs/dbus-glib-0.72
603 - net-wireless/wireless-tools )"
604 -fi
605 -if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
606 - if [[ ${MOZCONFIG_OPTIONAL_JIT} = "enabled" ]]; then
607 - IUSE+=" +jit"
608 - else
609 - IUSE+=" jit"
610 - fi
611 -fi
612 -
613 -DEPEND="app-arch/zip
614 - app-arch/unzip
615 - >=sys-devel/binutils-2.16.1
616 - ${RDEPEND}"
617 -
618 -RDEPEND+="
619 - selinux? ( sec-policy/selinux-mozilla )"
620 -
621 -# @FUNCTION: mozconfig_config
622 -# @DESCRIPTION:
623 -# Set common configure options for mozilla packages.
624 -# Call this within src_configure() phase, after mozconfig_init
625 -#
626 -# Example:
627 -#
628 -# inherit mozconfig-v5.33
629 -#
630 -# src_configure() {
631 -# mozconfig_init
632 -# mozconfig_config
633 -# # ... misc ebuild-unique settings via calls to
634 -# # ... mozconfig_{annotate,use_with,use_enable}
635 -# mozconfig_final
636 -# }
637 -
638 -mozconfig_config() {
639 - # Migrated from mozcoreconf-2
640 - mozconfig_annotate 'system_libs' \
641 - --with-system-zlib \
642 - --enable-pango \
643 - --enable-svg \
644 - --with-system-bz2
645 -
646 - mozconfig_annotate '' --enable-default-toolkit=cairo-gtk2
647 -
648 - if has bindist ${IUSE}; then
649 - mozconfig_use_enable !bindist official-branding
650 - if [[ ${PN} == firefox ]] && use bindist ; then
651 - mozconfig_annotate '' --with-branding=browser/branding/aurora
652 - fi
653 - fi
654 -
655 - mozconfig_use_enable debug
656 - mozconfig_use_enable debug tests
657 -
658 - if ! use debug ; then
659 - mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
660 - else
661 - mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
662 - fi
663 -
664 - mozconfig_use_enable startup-notification
665 -
666 - if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]] ; then
667 - # wifi pulls in dbus so manage both here
668 - mozconfig_use_enable wifi necko-wifi
669 - if use wifi && ! use dbus; then
670 - echo "Enabling dbus support due to wifi request"
671 - mozconfig_annotate 'dbus required by necko-wifi' --enable-dbus
672 - else
673 - mozconfig_use_enable dbus
674 - fi
675 - else
676 - mozconfig_use_enable dbus
677 - mozconfig_annotate 'disabled' --disable-necko-wifi
678 - fi
679 -
680 - # These are forced-on for webm support
681 - mozconfig_annotate 'required' --enable-ogg
682 - mozconfig_annotate 'required' --enable-wave
683 -
684 - if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
685 - mozconfig_use_enable jit ion
686 - fi
687 -
688 - # These are enabled by default in all mozilla applications
689 - mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr
690 - mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
691 - mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir)
692 - mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
693 - mozconfig_annotate '' --prefix="${EPREFIX}"/usr
694 - mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
695 - mozconfig_annotate 'Gentoo default' --enable-system-hunspell
696 - mozconfig_annotate '' --disable-gnomevfs
697 - mozconfig_annotate '' --disable-gnomeui
698 - mozconfig_annotate '' --enable-gio
699 - mozconfig_annotate '' --disable-crashreporter
700 - mozconfig_annotate 'Gentoo default' --with-system-png
701 - mozconfig_annotate '' --enable-system-ffi
702 - mozconfig_annotate 'Gentoo default to honor system linker' --disable-gold
703 - mozconfig_annotate '' --disable-gconf
704 -
705 - # Use jemalloc unless libc is not glibc >= 2.4
706 - # at this time the minimum glibc in the tree is 2.9 so we should be safe.
707 - if use elibc_glibc && use jemalloc3; then
708 - # We must force-enable jemalloc 3 via .mozconfig
709 - echo "export MOZ_JEMALLOC3=1" >> "${S}"/.mozconfig || die
710 - mozconfig_annotate '' --enable-jemalloc
711 - mozconfig_annotate '' --enable-replace-malloc
712 - fi
713 -
714 - mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
715 - mozconfig_annotate '' --build="${CTARGET:-${CHOST}}"
716 -
717 - if use gstreamer; then
718 - mozconfig_annotate '+gstreamer' --enable-gstreamer=1.0
719 - else
720 - mozconfig_annotate '' --disable-gstreamer
721 - fi
722 - mozconfig_use_enable pulseaudio
723 -
724 - mozconfig_use_enable system-cairo
725 - mozconfig_use_enable system-sqlite
726 - mozconfig_use_with system-jpeg
727 - mozconfig_use_with system-icu
728 - mozconfig_use_enable system-icu intl-api
729 - mozconfig_use_with system-libvpx
730 -}
731
732 diff --git a/eclass/mozconfig-v6.40.eclass b/eclass/mozconfig-v6.40.eclass
733 deleted file mode 100644
734 index f763a34..0000000
735 --- a/eclass/mozconfig-v6.40.eclass
736 +++ /dev/null
737 @@ -1,263 +0,0 @@
738 -# Copyright 1999-2015 Gentoo Foundation
739 -# Distributed under the terms of the GNU General Public License v2
740 -# $Id$
741 -#
742 -# @ECLASS: mozconfig-v6.40.eclass
743 -# @MAINTAINER:
744 -# mozilla team <mozilla@g.o>
745 -# @BLURB: the new mozilla common configuration eclass for FF33 and newer, v6
746 -# @DESCRIPTION:
747 -# This eclass is used in mozilla ebuilds (firefox, thunderbird, seamonkey)
748 -# to provide a single common place for the common mozilla engine compoments.
749 -#
750 -# The eclass provides all common dependencies as well as common use flags.
751 -#
752 -# Some use flags which may be optional in particular mozilla packages can be
753 -# supported through setting eclass variables.
754 -#
755 -# This eclass inherits mozconfig helper functions as defined in mozcoreconf-v3,
756 -# and so ebuilds inheriting this eclass do not need to inherit that.
757 -
758 -inherit multilib flag-o-matic toolchain-funcs mozcoreconf-v3
759 -
760 -case ${EAPI} in
761 - 0|1|2|3|4) die "EAPI=${EAPI} not supported"
762 -esac
763 -
764 -# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI
765 -# @DESCRIPTION:
766 -# Set this variable before the inherit line, when an ebuild needs to provide
767 -# optional necko-wifi support via IUSE="wifi". Currently this would include
768 -# ebuilds for firefox, and potentially seamonkey.
769 -#
770 -# Leave the variable UNSET if necko-wifi support should not be available.
771 -# Set the variable to "enabled" if the use flag should be enabled by default.
772 -# Set the variable to any value if the use flag should exist but not be default-enabled.
773 -
774 -# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_JIT
775 -# @DESCRIPTION:
776 -# Set this variable before the inherit line, when an ebuild needs to provide
777 -# optional necko-wifi support via IUSE="jit". Currently this would include
778 -# ebuilds for firefox, and potentially seamonkey.
779 -#
780 -# Leave the variable UNSET if optional jit support should not be available.
781 -# Set the variable to "enabled" if the use flag should be enabled by default.
782 -# Set the variable to any value if the use flag should exist but not be default-enabled.
783 -
784 -# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_GTK3
785 -# @DESCRIPTION:
786 -# Set this variable before the inherit line, when an ebuild can provide
787 -# optional gtk3 support via IUSE="gtk3". Currently this would include
788 -# ebuilds for firefox, but thunderbird and seamonkey could follow in the future.
789 -#
790 -# Leave the variable UNSET if gtk3 support should not be available.
791 -# Set the variable to "enabled" if the use flag should be enabled by default.
792 -# Set the variable to any value if the use flag should exist but not be default-enabled.
793 -
794 -# use-flags common among all mozilla ebuilds
795 -IUSE="${IUSE} dbus debug gstreamer gstreamer-0 +jemalloc3 pulseaudio selinux startup-notification system-cairo system-icu system-jpeg system-sqlite system-libvpx"
796 -
797 -# some notes on deps:
798 -# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 2.14
799 -# media-libs/mesa needs to be 10.2 or above due to a bug with flash+vdpau
800 -
801 -RDEPEND=">=app-text/hunspell-1.2
802 - dev-libs/atk
803 - dev-libs/expat
804 - >=dev-libs/libevent-1.4.7
805 - >=x11-libs/cairo-1.10[X]
806 - >=x11-libs/gtk+-2.18:2
807 - x11-libs/gdk-pixbuf
808 - >=x11-libs/pango-1.22.0
809 - >=media-libs/libpng-1.6.17:0=[apng]
810 - >=media-libs/mesa-10.2:*
811 - media-libs/fontconfig
812 - >=media-libs/freetype-2.4.10
813 - kernel_linux? ( media-libs/alsa-lib )
814 - pulseaudio? ( media-sound/pulseaudio )
815 - virtual/freedesktop-icon-theme
816 - dbus? ( >=sys-apps/dbus-0.60
817 - >=dev-libs/dbus-glib-0.72 )
818 - startup-notification? ( >=x11-libs/startup-notification-0.8 )
819 - >=dev-libs/glib-2.26:2
820 - >=sys-libs/zlib-1.2.3
821 - >=virtual/libffi-3.0.10
822 - gstreamer? (
823 - >=media-libs/gstreamer-1.4.5:1.0
824 - >=media-libs/gst-plugins-base-1.4.5:1.0
825 - >=media-libs/gst-plugins-good-1.4.5:1.0
826 - >=media-plugins/gst-plugins-libav-1.4.5:1.0
827 - )
828 - gstreamer-0? (
829 - >=media-libs/gstreamer-0.10.25:0.10
830 - media-plugins/gst-plugins-meta:0.10[ffmpeg]
831 - )
832 - x11-libs/libX11
833 - x11-libs/libXcomposite
834 - x11-libs/libXdamage
835 - x11-libs/libXext
836 - x11-libs/libXfixes
837 - x11-libs/libXrender
838 - x11-libs/libXt
839 - system-cairo? ( >=x11-libs/cairo-1.12[X] >=x11-libs/pixman-0.19.2 )
840 - system-icu? ( >=dev-libs/icu-51.1:= )
841 - system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
842 - system-sqlite? ( >=dev-db/sqlite-3.8.9:3[secure-delete,debug=] )
843 - system-libvpx? ( >=media-libs/libvpx-1.3.0:0=[postproc] )
844 -"
845 -
846 -if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
847 - if [[ ${MOZCONFIG_OPTIONAL_GTK3} = "enabled" ]]; then
848 - IUSE+=" +gtk3"
849 - else
850 - IUSE+=" gtk3"
851 - fi
852 - RDEPEND+="
853 - gtk3? ( >=x11-libs/gtk+-3.14.0:3 )"
854 -fi
855 -if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
856 - if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then
857 - IUSE+=" +wifi"
858 - else
859 - IUSE+=" wifi"
860 - fi
861 - RDEPEND+="
862 - wifi? ( >=sys-apps/dbus-0.60
863 - >=dev-libs/dbus-glib-0.72
864 - net-wireless/wireless-tools )"
865 -fi
866 -if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
867 - if [[ ${MOZCONFIG_OPTIONAL_JIT} = "enabled" ]]; then
868 - IUSE+=" +jit"
869 - else
870 - IUSE+=" jit"
871 - fi
872 -fi
873 -
874 -DEPEND="app-arch/zip
875 - app-arch/unzip
876 - >=sys-devel/binutils-2.16.1
877 - ${RDEPEND}"
878 -
879 -RDEPEND+="
880 - selinux? ( sec-policy/selinux-mozilla )"
881 -
882 -# only one of gstreamer and gstreamer-0 can be enabled at a time, so set REQUIRED_USE to signify this
883 -REQUIRED_USE="?? ( gstreamer gstreamer-0 )"
884 -
885 -# @FUNCTION: mozconfig_config
886 -# @DESCRIPTION:
887 -# Set common configure options for mozilla packages.
888 -# Call this within src_configure() phase, after mozconfig_init
889 -#
890 -# Example:
891 -#
892 -# inherit mozconfig-v5.33
893 -#
894 -# src_configure() {
895 -# mozconfig_init
896 -# mozconfig_config
897 -# # ... misc ebuild-unique settings via calls to
898 -# # ... mozconfig_{annotate,use_with,use_enable}
899 -# mozconfig_final
900 -# }
901 -
902 -mozconfig_config() {
903 - # Migrated from mozcoreconf-2
904 - mozconfig_annotate 'system_libs' \
905 - --with-system-zlib \
906 - --enable-pango \
907 - --enable-svg \
908 - --with-system-bz2
909 -
910 - if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then
911 - mozconfig_annotate 'gtk3 use flag' --enable-default-toolkit=$(usex gtk3 cairo-gtk3 cairo-gtk2)
912 - else
913 - mozconfig_annotate '' --enable-default-toolkit=cairo-gtk2
914 - fi
915 -
916 - if has bindist ${IUSE}; then
917 - mozconfig_use_enable !bindist official-branding
918 - if [[ ${PN} == firefox ]] && use bindist ; then
919 - mozconfig_annotate '' --with-branding=browser/branding/aurora
920 - fi
921 - fi
922 -
923 - mozconfig_use_enable debug
924 - mozconfig_use_enable debug tests
925 -
926 - if ! use debug ; then
927 - mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
928 - else
929 - mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
930 - fi
931 -
932 - mozconfig_use_enable startup-notification
933 -
934 - if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]] ; then
935 - # wifi pulls in dbus so manage both here
936 - mozconfig_use_enable wifi necko-wifi
937 - if use wifi && ! use dbus; then
938 - echo "Enabling dbus support due to wifi request"
939 - mozconfig_annotate 'dbus required by necko-wifi' --enable-dbus
940 - else
941 - mozconfig_use_enable dbus
942 - fi
943 - else
944 - mozconfig_use_enable dbus
945 - mozconfig_annotate 'disabled' --disable-necko-wifi
946 - fi
947 -
948 - # These are forced-on for webm support
949 - mozconfig_annotate 'required' --enable-ogg
950 - mozconfig_annotate 'required' --enable-wave
951 -
952 - if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
953 - mozconfig_use_enable jit ion
954 - fi
955 -
956 - # These are enabled by default in all mozilla applications
957 - mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${EPREFIX}"/usr
958 - mozconfig_annotate '' --with-system-nss --with-nss-prefix="${EPREFIX}"/usr
959 - mozconfig_annotate '' --x-includes="${EPREFIX}"/usr/include --x-libraries="${EPREFIX}"/usr/$(get_libdir)
960 - mozconfig_annotate '' --with-system-libevent="${EPREFIX}"/usr
961 - mozconfig_annotate '' --prefix="${EPREFIX}"/usr
962 - mozconfig_annotate '' --libdir="${EPREFIX}"/usr/$(get_libdir)
963 - mozconfig_annotate 'Gentoo default' --enable-system-hunspell
964 - mozconfig_annotate '' --disable-gnomevfs
965 - mozconfig_annotate '' --disable-gnomeui
966 - mozconfig_annotate '' --enable-gio
967 - mozconfig_annotate '' --disable-crashreporter
968 - mozconfig_annotate 'Gentoo default' --with-system-png
969 - mozconfig_annotate '' --enable-system-ffi
970 - mozconfig_annotate 'Gentoo default to honor system linker' --disable-gold
971 - mozconfig_annotate '' --disable-gconf
972 -
973 - # Use jemalloc unless libc is not glibc >= 2.4
974 - # at this time the minimum glibc in the tree is 2.9 so we should be safe.
975 - if use elibc_glibc && use jemalloc3; then
976 - # We must force-enable jemalloc 3 via .mozconfig
977 - echo "export MOZ_JEMALLOC3=1" >> "${S}"/.mozconfig || die
978 - mozconfig_annotate '' --enable-jemalloc
979 - mozconfig_annotate '' --enable-replace-malloc
980 - fi
981 -
982 - mozconfig_annotate '' --target="${CTARGET:-${CHOST}}"
983 - mozconfig_annotate '' --build="${CTARGET:-${CHOST}}"
984 -
985 - if use gstreamer ; then
986 - mozconfig_annotate '+gstreamer' --enable-gstreamer=1.0
987 - elif use gstreamer-0 ; then
988 - mozconfig_annotate '+gstreamer-0' --enable-gstreamer=0.10
989 - else
990 - mozconfig_annotate '' --disable-gstreamer
991 - fi
992 - mozconfig_use_enable pulseaudio
993 -
994 - mozconfig_use_enable system-cairo
995 - mozconfig_use_enable system-sqlite
996 - mozconfig_use_with system-jpeg
997 - mozconfig_use_with system-icu
998 - mozconfig_use_enable system-icu intl-api
999 - mozconfig_use_with system-libvpx
1000 -}