From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4B5B21382A4 for ; Thu, 2 Jun 2016 15:19:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2341421C039; Thu, 2 Jun 2016 15:19:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1FE2921C03E for ; Thu, 2 Jun 2016 15:19:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9AE6F340DF6 for ; Thu, 2 Jun 2016 15:19:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5806C983 for ; Thu, 2 Jun 2016 15:19:36 +0000 (UTC) From: "Ian Stakenvicius" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Stakenvicius" Message-ID: <1464880765.e42c22df29664cb2fe2365ac5247b2f2183c8bc4.axs@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: www-client/firefox/, eclass/ X-VCS-Repository: proj/mozilla X-VCS-Files: eclass/mozconfig-v6.45.eclass www-client/firefox/firefox-45.1.0.ebuild X-VCS-Directories: eclass/ www-client/firefox/ X-VCS-Committer: axs X-VCS-Committer-Name: Ian Stakenvicius X-VCS-Revision: e42c22df29664cb2fe2365ac5247b2f2183c8bc4 X-VCS-Branch: master Date: Thu, 2 Jun 2016 15:19:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3d847c6e-f822-4bd8-91d9-950039ab3575 X-Archives-Hash: a26091d64bb21da5bb32a77fee8cab56 commit: e42c22df29664cb2fe2365ac5247b2f2183c8bc4 Author: Ian Stakenvicius gentoo org> AuthorDate: Thu Jun 2 15:17:43 2016 +0000 Commit: Ian Stakenvicius gentoo org> CommitDate: Thu Jun 2 15:19:25 2016 +0000 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=e42c22df Make mozconfig-v6.45 use mozcoreconf-v4, and cleanup of firefox-45.1 ebuild to match eclass/mozconfig-v6.45.eclass | 2 +- www-client/firefox/firefox-45.1.0.ebuild | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/eclass/mozconfig-v6.45.eclass b/eclass/mozconfig-v6.45.eclass index 05127d2..544321f 100644 --- a/eclass/mozconfig-v6.45.eclass +++ b/eclass/mozconfig-v6.45.eclass @@ -27,7 +27,7 @@ case ${EAPI} in ;; esac -inherit flag-o-matic toolchain-funcs mozcoreconf-v3 +inherit flag-o-matic toolchain-funcs mozcoreconf-v4 # @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_WIFI # @DESCRIPTION: diff --git a/www-client/firefox/firefox-45.1.0.ebuild b/www-client/firefox/firefox-45.1.0.ebuild index 0404963..f0e2ba7 100644 --- a/www-client/firefox/firefox-45.1.0.ebuild +++ b/www-client/firefox/firefox-45.1.0.ebuild @@ -182,7 +182,6 @@ src_prepare() { } src_configure() { - MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" MEXTENSIONS="default" # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) # Note: These are for Gentoo Linux use ONLY. For your own distribution, please @@ -198,9 +197,6 @@ src_configure() { mozconfig_init mozconfig_config - # We want rpath support to prevent unneeded hacks on different libc variants - append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}" - # It doesn't compile on alpha without this LDFLAGS use alpha && append-ldflags "-Wl,--no-relax" @@ -217,9 +213,6 @@ src_configure() { mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" mozconfig_annotate '' --disable-mailnews - # Other ff-specific settings - mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} - # Allow for a proper pgo build if use pgo; then echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig @@ -272,8 +265,6 @@ src_compile() { } src_install() { - MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" - cd "${BUILD_OBJ_DIR}" || die # Add our default prefs for firefox