Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/firefox/
Date: Mon, 24 Sep 2018 00:55:52
Message-Id: 1537750526.29945375567a11ba088d76b72d52bcdb54f1486a.whissi@gentoo
1 commit: 29945375567a11ba088d76b72d52bcdb54f1486a
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 23 23:59:01 2018 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 24 00:55:26 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29945375
7
8 www-client/firefox: don't install firefox-bin
9
10 firefox and firefox-bin are identical. So instead of installing
11 the same file twice, we will now install a symlink only.
12
13 Package-Manager: Portage-2.3.49, Repoman-2.3.10
14
15 www-client/firefox/firefox-60.2.1.ebuild | 6 +++++-
16 www-client/firefox/firefox-62.0.2.ebuild | 6 +++++-
17 2 files changed, 10 insertions(+), 2 deletions(-)
18
19 diff --git a/www-client/firefox/firefox-60.2.1.ebuild b/www-client/firefox/firefox-60.2.1.ebuild
20 index 51a218b24b4..2d2e154e846 100644
21 --- a/www-client/firefox/firefox-60.2.1.ebuild
22 +++ b/www-client/firefox/firefox-60.2.1.ebuild
23 @@ -354,8 +354,12 @@ PROFILE_EOF
24 || die
25 fi
26
27 + # firefox and firefox-bin are identical
28 + rm "${ED%/}"${MOZILLA_FIVE_HOME}/firefox-bin || die
29 + dosym firefox ${MOZILLA_FIVE_HOME}/firefox-bin
30 +
31 # Required in order to use plugins and even run firefox on hardened.
32 - pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
33 + pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,plugin-container}
34 }
35
36 pkg_preinst() {
37
38 diff --git a/www-client/firefox/firefox-62.0.2.ebuild b/www-client/firefox/firefox-62.0.2.ebuild
39 index efa2aff5083..569e8d139db 100644
40 --- a/www-client/firefox/firefox-62.0.2.ebuild
41 +++ b/www-client/firefox/firefox-62.0.2.ebuild
42 @@ -542,8 +542,12 @@ PROFILE_EOF
43 || die
44 fi
45
46 + # firefox and firefox-bin are identical
47 + rm "${ED%/}"${MOZILLA_FIVE_HOME}/firefox-bin || die
48 + dosym firefox ${MOZILLA_FIVE_HOME}/firefox-bin
49 +
50 # Required in order to use plugins and even run firefox on hardened.
51 - pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
52 + pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,plugin-container}
53 }
54
55 pkg_preinst() {