[gentoo-commits] proj/mozilla:master commit in: eclass/, www-client/firefox/

["Jory Pratt" <anarchy@gentoo.org>]

commit:     cd64d7a99838e64000fa9d95da3b94da4b2e28ed
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 21 14:09:10 2017 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 14:09:10 2017 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=cd64d7a9

www-client/firefox - Revert eclass and remove unsupported configure
option via ebuild

 eclass/mozcoreconf-v5.eclass                  | 6 ++----
 www-client/firefox/firefox-58.0_beta12.ebuild | 3 +++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/eclass/mozcoreconf-v5.eclass b/eclass/mozcoreconf-v5.eclass
index e62193d..02ade39 100644
--- a/eclass/mozcoreconf-v5.eclass
+++ b/eclass/mozcoreconf-v5.eclass
@@ -87,7 +87,7 @@ moz_pkgsetup() {
 	# Ensure we use correct toolchain
 	export HOST_CC="$(tc-getBUILD_CC)"
 	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD PKG_CONFIG AR RANLIB
+	tc-export CC CXX LD PKG_CONFIG
 
 	# Ensure that we have a sane build enviroment
 	export MOZILLA_CLIENT=1
@@ -224,9 +224,7 @@ mozconfig_init() {
 	# Use the MOZILLA_FIVE_HOME for the rpath
 	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
 	# Set MOZILLA_FIVE_HOME in mozconfig
-	if [[ ${PV} -lt 58.0 ]]; then
-		mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
-	fi
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
 
 	####################################
 	#

diff --git a/www-client/firefox/firefox-58.0_beta12.ebuild b/www-client/firefox/firefox-58.0_beta12.ebuild
index 4b786b2..cf52f93 100644
--- a/www-client/firefox/firefox-58.0_beta12.ebuild
+++ b/www-client/firefox/firefox-58.0_beta12.ebuild
@@ -211,6 +211,9 @@ src_configure() {
 	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
 	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
 
+	# Default mozilla_five_home no longer valid option
+	sed '/with-default-mozilla-five-home=/d' -i "${S}"/.mozconfig
+
 	# Finalize and report settings
 	mozconfig_final