From: "Ian Stakenvicius" <axs@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/mozilla:master commit in: eclass/
Date: Tue, 2 Jun 2015 19:48:58 +0000 (UTC) [thread overview]
Message-ID: <1433274523.9b9caf4e21803660ed73770fb0f4b66a171f2fbb.axs@gentoo> (raw)
commit: 9b9caf4e21803660ed73770fb0f4b66a171f2fbb
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 2 19:48:43 2015 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Tue Jun 2 19:48:43 2015 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=9b9caf4e
sync eclasses with updated versions from the portage tree
eclass/mozconfig-v5.31.eclass | 13 +++++++++----
eclass/mozconfig-v5.33.eclass | 17 ++++++++++-------
eclass/mozconfig-v5.36.eclass | 5 +++--
3 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/eclass/mozconfig-v5.31.eclass b/eclass/mozconfig-v5.31.eclass
index 297c072..4a6020c 100644
--- a/eclass/mozconfig-v5.31.eclass
+++ b/eclass/mozconfig-v5.31.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v5.31.eclass,v 1.2 2014/12/03 23:10:06 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v5.31.eclass,v 1.4 2015/05/27 19:00:31 axs Exp $
#
# @ECLASS: mozconfig-v5.31.eclass
# @MAINTAINER:
@@ -78,12 +78,17 @@ RDEPEND=">=app-text/hunspell-1.2
x11-libs/libXrender
x11-libs/libXt
system-cairo? ( >=x11-libs/cairo-1.12[X] >=x11-libs/pixman-0.19.2 )
- system-icu? ( >=dev-libs/icu-51.1 )
+ system-icu? ( >=dev-libs/icu-51.1:= )
system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
system-sqlite? ( >=dev-db/sqlite-3.8.4.2:3[secure-delete,debug=] )
- system-libvpx? ( =media-libs/libvpx-1.3.0* )
"
+# firefox-31.0-patches-0.3 and above carry a patch making newer libvpx compatible
+case ${PATCHFF##*31.0-patches-} in
+ 0.3) RDEPEND+=" system-libvpx? ( >=media-libs/libvpx-1.3.0 )" ;;
+ *) RDEPEND+=" system-libvpx? ( =media-libs/libvpx-1.3.0* )" ;;
+esac
+
if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then
IUSE+=" +wifi"
diff --git a/eclass/mozconfig-v5.33.eclass b/eclass/mozconfig-v5.33.eclass
index 7e604a3..dd4ee05 100644
--- a/eclass/mozconfig-v5.33.eclass
+++ b/eclass/mozconfig-v5.33.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v5.33.eclass,v 1.5 2015/05/28 06:37:16 polynomial-c Exp $
#
# @ECLASS: mozconfig-v5.33.eclass
# @MAINTAINER:
@@ -21,7 +21,8 @@
inherit multilib flag-o-matic toolchain-funcs mozcoreconf-v3
case ${EAPI} in
- 0|1|2|3|4) die "EAPI=${EAPI} not supported"
+ 0|1|2|3|4) die "EAPI=${EAPI} not supported" ;;
+ *) die "This eclass has been disabled and will be removed on 2015-06-30. If you need it, copy to your overlay and remove this line." ;;
esac
# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI
@@ -53,7 +54,6 @@ IUSE="${IUSE} dbus debug gstreamer pulseaudio selinux startup-notification syste
RDEPEND=">=app-text/hunspell-1.2
dev-libs/atk
- dev-libs/expat
>=dev-libs/libevent-1.4.7
>=x11-libs/cairo-1.10[X]
>=x11-libs/gtk+-2.14:2
@@ -79,11 +79,14 @@ RDEPEND=">=app-text/hunspell-1.2
>=media-plugins/gst-plugins-libav-1.1.0_pre20130128-r1:1.0
)
x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXfixes
x11-libs/libXext
x11-libs/libXrender
x11-libs/libXt
system-cairo? ( >=x11-libs/cairo-1.12[X] >=x11-libs/pixman-0.19.2 )
- system-icu? ( >=dev-libs/icu-51.1:= )
+ system-icu? ( >=dev-libs/icu-51.1 )
system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
system-sqlite? ( >=dev-db/sqlite-3.8.5:3[secure-delete,debug=] )
system-libvpx? ( =media-libs/libvpx-1.3.0*[postproc] )
@@ -138,8 +141,7 @@ mozconfig_config() {
mozconfig_annotate 'system_libs' \
--with-system-zlib \
--enable-pango \
- --enable-svg \
- --with-system-bz2
+ --enable-svg
mozconfig_annotate '' --enable-default-toolkit=cairo-gtk2
@@ -200,6 +202,7 @@ mozconfig_config() {
mozconfig_annotate '' --disable-gconf
# We must force-enable jemalloc 3 via .mozconfig
+ # Except this doesn't actually enable jemalloc3.
echo "export MOZ_JEMALLOC=1" >> "${S}"/.mozconfig || die
mozconfig_annotate '' --enable-jemalloc
mozconfig_annotate '' --enable-replace-malloc
diff --git a/eclass/mozconfig-v5.36.eclass b/eclass/mozconfig-v5.36.eclass
index a79eb99..1137f24 100644
--- a/eclass/mozconfig-v5.36.eclass
+++ b/eclass/mozconfig-v5.36.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v5.36.eclass,v 1.1 2015/02/26 20:41:10 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mozconfig-v5.36.eclass,v 1.2 2015/04/25 09:13:40 polynomial-c Exp $
#
# @ECLASS: mozconfig-v5.33.eclass
# @MAINTAINER:
@@ -89,7 +89,7 @@ RDEPEND=">=app-text/hunspell-1.2
system-icu? ( >=dev-libs/icu-51.1:= )
system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
system-sqlite? ( >=dev-db/sqlite-3.8.7.4:3[secure-delete,debug=] )
- system-libvpx? ( =media-libs/libvpx-1.3.0*[postproc] )
+ system-libvpx? ( >=media-libs/libvpx-1.3.0[postproc] )
"
if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then
@@ -184,6 +184,7 @@ mozconfig_config() {
if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then
mozconfig_use_enable jit ion
+ mozconfig_use_enable jit yarr-jit
fi
# These are enabled by default in all mozilla applications
next reply other threads:[~2015-06-02 19:49 UTC|newest]
Thread overview: 123+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-02 19:48 Ian Stakenvicius [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-03-20 17:26 [gentoo-commits] proj/mozilla:master commit in: eclass/ Jory Pratt
2018-08-16 16:48 Ian Stakenvicius
2018-08-15 21:11 Ian Stakenvicius
2018-08-15 19:30 Ian Stakenvicius
2018-08-15 17:18 Ian Stakenvicius
2018-06-18 4:41 Jory Pratt
2018-05-22 13:44 Jory Pratt
2018-05-22 1:19 Jory Pratt
2018-05-13 9:09 Lars Wendler
2018-02-19 12:25 Jory Pratt
2018-01-31 15:35 Ian Stakenvicius
2018-01-29 5:12 Ian Stakenvicius
2018-01-26 4:28 Ian Stakenvicius
2018-01-26 4:28 Ian Stakenvicius
2017-12-21 14:16 Jory Pratt
2017-11-14 16:18 Ian Stakenvicius
2017-10-26 8:52 Lars Wendler
2017-09-28 17:07 Ian Stakenvicius
2017-09-10 21:56 Jory Pratt
2017-08-29 0:11 Jory Pratt
2017-08-22 14:57 Lars Wendler
2017-08-17 9:31 Lars Wendler
2017-07-25 1:58 Ian Stakenvicius
2017-06-06 18:01 Jory Pratt
2017-05-31 20:38 Jory Pratt
2017-05-31 20:37 Jory Pratt
2017-05-31 20:37 Jory Pratt
2017-05-31 20:19 Jory Pratt
2017-05-04 17:46 Ian Stakenvicius
2017-04-28 13:58 Ian Stakenvicius
2017-04-19 21:00 Ian Stakenvicius
2017-04-19 21:00 Ian Stakenvicius
2017-04-19 21:00 Ian Stakenvicius
2017-04-13 17:34 Ian Stakenvicius
2017-04-04 19:42 Ian Stakenvicius
2017-04-04 15:02 Ian Stakenvicius
2017-03-20 21:46 Andrew Savchenko
2017-03-20 19:22 Andrew Savchenko
2017-03-20 17:31 Andrew Savchenko
2017-02-06 2:30 Jory Pratt
2017-02-04 18:30 Jory Pratt
2017-02-03 3:41 Jory Pratt
2017-02-02 3:02 Jory Pratt
2016-12-01 8:55 Lars Wendler
2016-11-29 17:17 Lars Wendler
2016-10-16 21:49 Jory Pratt
2016-10-09 17:59 Jory Pratt
2016-10-09 14:35 Ian Stakenvicius
2016-09-08 22:18 Ian Stakenvicius
2016-09-04 23:31 Jory Pratt
2016-09-04 23:31 Jory Pratt
2016-08-04 16:09 Ian Stakenvicius
2016-07-25 21:27 Ian Stakenvicius
2016-07-25 20:14 Ian Stakenvicius
2016-07-25 20:12 Ian Stakenvicius
2016-07-12 19:45 Ian Stakenvicius
2016-07-11 18:05 Ian Stakenvicius
2016-07-09 3:25 Ian Stakenvicius
2016-07-09 0:57 Ian Stakenvicius
2016-07-05 1:15 Ian Stakenvicius
2016-04-28 5:50 Lars Wendler
2016-04-27 21:27 Ian Stakenvicius
2016-03-28 14:57 Ian Stakenvicius
2016-03-28 14:57 Ian Stakenvicius
2016-02-04 16:39 Ian Stakenvicius
2016-01-11 1:25 Jory Pratt
2016-01-11 1:19 Jory Pratt
2016-01-11 1:19 Jory Pratt
2016-01-04 21:09 Ian Stakenvicius
2016-01-01 22:29 Jory Pratt
2015-12-31 22:05 Jory Pratt
2015-11-27 19:24 [gentoo-commits] proj/mozilla:crossdev " Ian Stakenvicius
2015-11-27 19:25 ` [gentoo-commits] proj/mozilla:master " Ian Stakenvicius
2015-11-10 8:33 Lars Wendler
2015-11-09 21:55 Jory Pratt
2015-11-09 21:53 Jory Pratt
2015-11-09 19:12 Jory Pratt
2015-10-30 18:41 Jory Pratt
2015-08-14 16:24 Ian Stakenvicius
2015-07-17 18:27 Ian Stakenvicius
2015-07-17 17:34 Ian Stakenvicius
2015-07-16 17:48 Ian Stakenvicius
2015-07-16 16:56 Ian Stakenvicius
2015-07-16 16:22 Ian Stakenvicius
2015-07-16 16:15 Ian Stakenvicius
2015-07-16 15:41 Ian Stakenvicius
2015-07-14 22:16 Ian Stakenvicius
2015-07-14 22:16 Ian Stakenvicius
2015-03-10 14:07 Ian Stakenvicius
2014-11-06 14:46 Ian Stakenvicius
2014-10-27 19:12 Ian Stakenvicius
2014-10-16 21:18 Ian Stakenvicius
2014-08-25 19:25 Ian Stakenvicius
2013-10-29 13:39 Jory Pratt
2013-10-26 2:30 Jory Pratt
2013-08-28 15:24 Ian Stakenvicius
2013-08-26 14:40 Jory Pratt
2013-05-27 21:52 Jory Pratt
2013-05-22 23:37 Jory Pratt
2013-05-22 13:32 Lars Wendler
2013-04-10 2:01 Jory Pratt
2013-03-25 13:10 Jory Pratt
2013-03-24 19:09 Jory Pratt
2013-03-10 0:14 Jory Pratt
2012-12-03 15:45 Lars Wendler
2012-09-09 16:23 Jory Pratt
2012-08-02 1:59 Jory Pratt
2012-07-18 0:17 Jory Pratt
2012-03-26 3:40 Jory Pratt
2012-03-04 14:17 Jory Pratt
2012-02-28 5:03 Jory Pratt
2012-02-04 6:10 Nirbheek Chauhan
2012-02-01 20:54 Nirbheek Chauhan
2012-01-26 14:58 Nirbheek Chauhan
2011-11-21 16:34 Jory Pratt
2011-11-21 16:33 Jory Pratt
2011-11-21 15:49 Jory Pratt
2011-11-16 14:53 Jory Pratt
2011-03-17 13:33 Jory Pratt
2011-03-16 13:41 Jory Pratt
2011-03-16 4:27 Jory Pratt
2011-03-14 6:58 Nirbheek Chauhan
2011-03-09 2:30 Mounir Lamouri
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1433274523.9b9caf4e21803660ed73770fb0f4b66a171f2fbb.axs@gentoo \
--to=axs@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox