From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-811705-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 4E663138CE2
for <garchives@archives.gentoo.org>; Fri, 12 Jun 2015 23:05:29 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B352EE0802;
Fri, 12 Jun 2015 23:05:26 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 6531AE0802
for <gentoo-commits@lists.gentoo.org>; Fri, 12 Jun 2015 23:05:26 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 16C39340A5D
for <gentoo-commits@lists.gentoo.org>; Fri, 12 Jun 2015 23:05:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 076BCA1C
for <gentoo-commits@lists.gentoo.org>; Fri, 12 Jun 2015 23:05:23 +0000 (UTC)
From: "Jory Pratt" <anarchy@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" <anarchy@gentoo.org>
Message-ID: <1434150293.e1f6f4172827ba444b8b3d1ebf34ff1fc8d23194.anarchy@gentoo>
Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/firefox/, eclass/
X-VCS-Repository: proj/mozilla
X-VCS-Files: eclass/mozconfig-v5.38.eclass www-client/firefox/firefox-38.0.5.ebuild
X-VCS-Directories: www-client/firefox/ eclass/
X-VCS-Committer: anarchy
X-VCS-Committer-Name: Jory Pratt
X-VCS-Revision: e1f6f4172827ba444b8b3d1ebf34ff1fc8d23194
X-VCS-Branch: master
Date: Fri, 12 Jun 2015 23:05:23 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 62982227-7c32-4f33-b34c-8ce786c27897
X-Archives-Hash: 5088ed723df495235059275d2c234cf0
commit: e1f6f4172827ba444b8b3d1ebf34ff1fc8d23194
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 12 23:04:53 2015 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Fri Jun 12 23:04:53 2015 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=e1f6f417
migrate gtk3 change to mozconfig-v5.38 eclass
eclass/mozconfig-v5.38.eclass | 8 ++++++--
www-client/firefox/firefox-38.0.5.ebuild | 2 --
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/eclass/mozconfig-v5.38.eclass b/eclass/mozconfig-v5.38.eclass
index ad1b197..6acd44e 100644
--- a/eclass/mozconfig-v5.38.eclass
+++ b/eclass/mozconfig-v5.38.eclass
@@ -45,7 +45,7 @@ esac
# Set the variable to any value if the use flag should exist but not be default-enabled.
# use-flags common among all mozilla ebuilds
-IUSE="${IUSE} dbus debug gstreamer +jemalloc3 pulseaudio selinux startup-notification system-cairo system-icu system-jpeg system-sqlite system-libvpx"
+IUSE="${IUSE} dbus debug gstreamer gtk3 +jemalloc3 pulseaudio selinux startup-notification system-cairo system-icu system-jpeg system-sqlite system-libvpx"
# some notes on deps:
# gtk:2 minimum is technically 2.10 but gio support (enabled by default) needs 2.14
@@ -144,7 +144,11 @@ mozconfig_config() {
--enable-svg \
--with-system-bz2
- mozconfig_annotate '' --enable-default-toolkit=cairo-gtk2
+ if use gtk3 ; then
+ mozconfig_annotate 'Enable Cairo Gtk+3 support' --enable-default-toolkit=cairo-gtk3
+ else
+ mozconfig_annotate '' --enable-default-toolkit=cairo-gtk2
+ fi
if has bindist ${IUSE}; then
mozconfig_use_enable !bindist official-branding
diff --git a/www-client/firefox/firefox-38.0.5.ebuild b/www-client/firefox/firefox-38.0.5.ebuild
index 0ac1f57..8061ce3 100644
--- a/www-client/firefox/firefox-38.0.5.ebuild
+++ b/www-client/firefox/firefox-38.0.5.ebuild
@@ -232,8 +232,6 @@ src_configure() {
fi
fi
- use gtk3 && mozconfig_annotate 'Enable Cairo Gtk+3 support' --enable-default-toolkit=cairo-gtk3
-
use egl && mozconfig_annotate 'Enable EGL as GL provider' --with-gl-provider=EGL
# Setup api key for location services