commit:     29945375567a11ba088d76b72d52bcdb54f1486a
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 23 23:59:01 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Sep 24 00:55:26 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29945375

www-client/firefox: don't install firefox-bin

firefox and firefox-bin are identical. So instead of installing
the same file twice, we will now install a symlink only.

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 www-client/firefox/firefox-60.2.1.ebuild | 6 +++++-
 www-client/firefox/firefox-62.0.2.ebuild | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/www-client/firefox/firefox-60.2.1.ebuild 
b/www-client/firefox/firefox-60.2.1.ebuild
index 51a218b24b4..2d2e154e846 100644
--- a/www-client/firefox/firefox-60.2.1.ebuild
+++ b/www-client/firefox/firefox-60.2.1.ebuild
@@ -354,8 +354,12 @@ PROFILE_EOF
                        || die
        fi
 
+       # firefox and firefox-bin are identical
+       rm "${ED%/}"${MOZILLA_FIVE_HOME}/firefox-bin || die
+       dosym firefox ${MOZILLA_FIVE_HOME}/firefox-bin
+
        # Required in order to use plugins and even run firefox on hardened.
-       pax-mark m 
"${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+       pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,plugin-container}
 }
 
 pkg_preinst() {

diff --git a/www-client/firefox/firefox-62.0.2.ebuild 
b/www-client/firefox/firefox-62.0.2.ebuild
index efa2aff5083..569e8d139db 100644
--- a/www-client/firefox/firefox-62.0.2.ebuild
+++ b/www-client/firefox/firefox-62.0.2.ebuild
@@ -542,8 +542,12 @@ PROFILE_EOF
                        || die
        fi
 
+       # firefox and firefox-bin are identical
+       rm "${ED%/}"${MOZILLA_FIVE_HOME}/firefox-bin || die
+       dosym firefox ${MOZILLA_FIVE_HOME}/firefox-bin
+
        # Required in order to use plugins and even run firefox on hardened.
-       pax-mark m 
"${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+       pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,plugin-container}
 }
 
 pkg_preinst() {

Reply via email to