From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5161F13835C for ; Tue, 4 May 2021 08:30:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 86D1CE0887; Tue, 4 May 2021 08:30:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6EEA0E0887 for ; Tue, 4 May 2021 08:30:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 80676335D08 for ; Tue, 4 May 2021 08:30:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EF5C84D2 for ; Tue, 4 May 2021 08:30:18 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1620117008.a011bebd36d41b5ab277a0354723895a2b8a2c99.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/seamonkey/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/seamonkey/seamonkey-2.53.7.1-r1.ebuild www-client/seamonkey/seamonkey-2.53.7.1.ebuild X-VCS-Directories: www-client/seamonkey/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: a011bebd36d41b5ab277a0354723895a2b8a2c99 X-VCS-Branch: master Date: Tue, 4 May 2021 08:30:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: faaa6ec8-d991-47e2-a934-c65ef694901c X-Archives-Hash: 8cf5b938b2bdf942f27f44e0ad9467c1 commit: a011bebd36d41b5ab277a0354723895a2b8a2c99 Author: Lars Wendler gentoo org> AuthorDate: Tue May 4 06:53:40 2021 +0000 Commit: Lars Wendler gentoo 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] black-net.org> Closes: https://bugs.gentoo.org/788004 Signed-off-by: Lars Wendler 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