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

["Ian Stakenvicius" <axs@gentoo.org>]

commit:     e42c22df29664cb2fe2365ac5247b2f2183c8bc4
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  2 15:17:43 2016 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> 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