commit: a011bebd36d41b5ab277a0354723895a2b8a2c99 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Tue May 4 06:53:40 2021 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Tue May 4 08:30:08 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a011bebd
www-client/seamonkey: Revbump to fix installation of extensions Thanks-to: Petr Cerny [:hrosik] <p.c-bugzilla <AT> black-net.org> Closes: https://bugs.gentoo.org/788004 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> ...amonkey-2.53.7.1.ebuild => seamonkey-2.53.7.1-r1.ebuild} | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/www-client/seamonkey/seamonkey-2.53.7.1.ebuild b/www-client/seamonkey/seamonkey-2.53.7.1-r1.ebuild similarity index 98% rename from www-client/seamonkey/seamonkey-2.53.7.1.ebuild rename to www-client/seamonkey/seamonkey-2.53.7.1-r1.ebuild index 79cd3a849a6..c3a2e4925ff 100644 --- a/www-client/seamonkey/seamonkey-2.53.7.1.ebuild +++ b/www-client/seamonkey/seamonkey-2.53.7.1-r1.ebuild @@ -388,19 +388,18 @@ src_configure() { # Linking fails without this due to memory exhaustion use x86 && append-ldflags "-Wl,--no-keep-memory" - if ! use chatzilla ; then - MEXTENSIONS+=",-irc" - fi if ! use roaming ; then MEXTENSIONS+=",-sroaming" fi # Setup api key for location services - echo -n "${_google_api_key}" > "${S}"/google-api-key + printf '%s' "${_google_api_key}" > "${S}"/google-api-key mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key" mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key" mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" + mozconfig_use_enable chatzilla irc + mozconfig_annotate '' --enable-dominspector # use startup-cache for faster startup time mozconfig_annotate '' --enable-startupcache @@ -504,8 +503,8 @@ src_install() { emid='{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}' # remove the en_US-only xpi file so a version with all requested locales can be installed - if [[ -e "${ED}"/${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi ]] ; then - rm -f "${ED}"/${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die + if [[ -e "${ED}"/${MOZILLA_FIVE_HOME}/extensions/${emid}.xpi ]] ; then + rm -f "${ED}"/${MOZILLA_FIVE_HOME}/extensions/${emid}.xpi || die fi # merge the extra locales into the main extension @@ -514,7 +513,7 @@ src_install() { # install the merged extension mkdir -p "${T}/${emid}" || die cp -RLp -t "${T}/${emid}" dist/xpi-stage/chatzilla/* || die - insinto ${MOZILLA_FIVE_HOME}/distribution/extensions + insinto ${MOZILLA_FIVE_HOME}/extensions doins -r "${T}/${emid}" fi
