From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 594E91381F3 for ; Mon, 27 May 2013 21:53:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8515FE0A6B; Mon, 27 May 2013 21:53:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 063C7E0A6B for ; Mon, 27 May 2013 21:53:01 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EF53233E119 for ; Mon, 27 May 2013 21:53:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 73687E4402 for ; Mon, 27 May 2013 21:52:59 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1369691569.18ba2d4d735c6770079293930280778752494b67.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: eclass/ X-VCS-Repository: proj/mozilla X-VCS-Files: eclass/mozcoreconf-2.eclass eclass/mozextension.eclass X-VCS-Directories: eclass/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 18ba2d4d735c6770079293930280778752494b67 X-VCS-Branch: master Date: Mon, 27 May 2013 21:52:59 +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-Archives-Salt: 3bcc59dd-b775-4c3f-8c5d-0f85111d3ba1 X-Archives-Hash: daa7fe6de7403a72fbf15636c7f3e84e commit: 18ba2d4d735c6770079293930280778752494b67 Author: Jory A. Pratt gentoo org> AuthorDate: Mon May 27 21:50:58 2013 +0000 Commit: Jory Pratt gentoo org> CommitDate: Mon May 27 21:52:49 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=18ba2d4d Basic fix for extensions installation for >=firefox-21.0 --- eclass/mozcoreconf-2.eclass | 19 ++++++++++++++++--- eclass/mozextension.eclass | 16 ++++++++++++++-- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/eclass/mozcoreconf-2.eclass b/eclass/mozcoreconf-2.eclass index 986c252..67f4947 100644 --- a/eclass/mozcoreconf-2.eclass +++ b/eclass/mozcoreconf-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: $ +# $Header: /var/cvsroot/gentoo-x86/eclass/mozcoreconf-2.eclass,v 1.29 2013/03/25 13:08:39 anarchy Exp $ # # mozcoreconf.eclass : core options for mozilla # inherit mozconfig-2 if you need USE flags @@ -66,12 +66,12 @@ mozconfig_use_extension() { mozversion_is_new_enough() { case ${PN} in firefox|thunderbird) - if [[ $(get_version_component_range 1) -ge 21 ]] ; then + if [[ $(get_version_component_range 1) -ge 17 ]] ; then return 0 fi ;; seamonkey) - if [[ $(get_version_component_range 1) -eq 2 ]] && [[ $(get_version_component_range 2) -ge 18 ]] ; then + if [[ $(get_version_component_range 1) -eq 2 ]] && [[ $(get_version_component_range 2) -ge 14 ]] ; then return 0 fi ;; @@ -208,16 +208,29 @@ mozconfig_init() { --with-system-zlib \ --enable-pango \ --enable-system-cairo + if ! $(mozversion_is_new_enough) ; then + mozconfig_annotate system-libs --enable-svg + fi mozconfig_annotate disable_update_strip \ --disable-pedantic \ --disable-updater \ --disable-strip \ --disable-install-strip + if ! $(mozversion_is_new_enough) ; then + mozconfig_annotate disable_update_strip \ + --disable-installer \ + --disable-strip-libs + fi if [[ ${PN} != seamonkey ]]; then mozconfig_annotate basic_profile \ --disable-profilelocking + if ! $(mozversion_is_new_enough) ; then + mozconfig_annotate basic_profile \ + --enable-single-profile \ + --disable-profilesharing + fi fi # Here is a strange one... diff --git a/eclass/mozextension.eclass b/eclass/mozextension.eclass index 08c1b53..42cee2f 100644 --- a/eclass/mozextension.eclass +++ b/eclass/mozextension.eclass @@ -8,10 +8,22 @@ # @BLURB: Install extensions for use in mozilla products. -inherit eutils mozcoreconf-2 +inherit eutils DEPEND="app-arch/unzip" +mozversion_extension_location() { + case ${PN} in + firefox|firefox-bin) + if [[ $(get_version_component_range 1) -ge 21 ]] ; then + return 0 + fi + ;; + esac + + return 1 +} + xpi_unpack() { local xpi xpiname srcdir @@ -53,7 +65,7 @@ xpi_install() { # determine id for extension emid="$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${x}"/install.rdf)" \ || die "failed to determine extension id" - if $(mozversion_is_new_enough) ; then + if $(mozversion_extension_location) ; then insinto "${MOZILLA_FIVE_HOME}"/browser/extensions/${emid} else insinto "${MOZILLA_FIVE_HOME}"/extensions/${emid}