Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/seamonkey/
Date: Tue, 04 May 2021 08:30:23
Message-Id: 1620117008.a011bebd36d41b5ab277a0354723895a2b8a2c99.polynomial-c@gentoo
1 commit: a011bebd36d41b5ab277a0354723895a2b8a2c99
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 4 06:53:40 2021 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue May 4 08:30:08 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a011bebd
7
8 www-client/seamonkey: Revbump to fix installation of extensions
9
10 Thanks-to: Petr Cerny [:hrosik] <p.c-bugzilla <AT> black-net.org>
11 Closes: https://bugs.gentoo.org/788004
12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
13
14 ...amonkey-2.53.7.1.ebuild => seamonkey-2.53.7.1-r1.ebuild} | 13 ++++++-------
15 1 file changed, 6 insertions(+), 7 deletions(-)
16
17 diff --git a/www-client/seamonkey/seamonkey-2.53.7.1.ebuild b/www-client/seamonkey/seamonkey-2.53.7.1-r1.ebuild
18 similarity index 98%
19 rename from www-client/seamonkey/seamonkey-2.53.7.1.ebuild
20 rename to www-client/seamonkey/seamonkey-2.53.7.1-r1.ebuild
21 index 79cd3a849a6..c3a2e4925ff 100644
22 --- a/www-client/seamonkey/seamonkey-2.53.7.1.ebuild
23 +++ b/www-client/seamonkey/seamonkey-2.53.7.1-r1.ebuild
24 @@ -388,19 +388,18 @@ src_configure() {
25 # Linking fails without this due to memory exhaustion
26 use x86 && append-ldflags "-Wl,--no-keep-memory"
27
28 - if ! use chatzilla ; then
29 - MEXTENSIONS+=",-irc"
30 - fi
31 if ! use roaming ; then
32 MEXTENSIONS+=",-sroaming"
33 fi
34
35 # Setup api key for location services
36 - echo -n "${_google_api_key}" > "${S}"/google-api-key
37 + printf '%s' "${_google_api_key}" > "${S}"/google-api-key
38 mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
39 mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
40
41 mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
42 + mozconfig_use_enable chatzilla irc
43 + mozconfig_annotate '' --enable-dominspector
44
45 # use startup-cache for faster startup time
46 mozconfig_annotate '' --enable-startupcache
47 @@ -504,8 +503,8 @@ src_install() {
48 emid='{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}'
49
50 # remove the en_US-only xpi file so a version with all requested locales can be installed
51 - if [[ -e "${ED}"/${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi ]] ; then
52 - rm -f "${ED}"/${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
53 + if [[ -e "${ED}"/${MOZILLA_FIVE_HOME}/extensions/${emid}.xpi ]] ; then
54 + rm -f "${ED}"/${MOZILLA_FIVE_HOME}/extensions/${emid}.xpi || die
55 fi
56
57 # merge the extra locales into the main extension
58 @@ -514,7 +513,7 @@ src_install() {
59 # install the merged extension
60 mkdir -p "${T}/${emid}" || die
61 cp -RLp -t "${T}/${emid}" dist/xpi-stage/chatzilla/* || die
62 - insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
63 + insinto ${MOZILLA_FIVE_HOME}/extensions
64 doins -r "${T}/${emid}"
65 fi