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 C2D9A138D1F for ; Thu, 16 Jul 2015 15:41:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AF68FE078C; Thu, 16 Jul 2015 15:41:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 40DE7E078C for ; Thu, 16 Jul 2015 15:41:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8BF1E340A9D for ; Thu, 16 Jul 2015 15:41:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E0E81619 for ; Thu, 16 Jul 2015 15:41:36 +0000 (UTC) From: "Ian Stakenvicius" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Stakenvicius" Message-ID: <1437061277.384863a639243bca26e457c3536c4c33cd32f9c1.axs@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: eclass/ X-VCS-Repository: proj/mozilla X-VCS-Files: eclass/mozextension.eclass X-VCS-Directories: eclass/ X-VCS-Committer: axs X-VCS-Committer-Name: Ian Stakenvicius X-VCS-Revision: 384863a639243bca26e457c3536c4c33cd32f9c1 X-VCS-Branch: master Date: Thu, 16 Jul 2015 15:41:36 +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: 0de4aa5f-1d25-4cfa-a3ae-ba6a861edff7 X-Archives-Hash: 2b1e7040df71bc51099a06518f94c02a commit: 384863a639243bca26e457c3536c4c33cd32f9c1 Author: Ian Stakenvicius gentoo org> AuthorDate: Thu Jul 16 15:39:40 2015 +0000 Commit: Ian Stakenvicius gentoo org> CommitDate: Thu Jul 16 15:41:17 2015 +0000 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=384863a6 mozextension.eclass - add variable to allow setting of extension install basepath eclass/mozextension.eclass | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/eclass/mozextension.eclass b/eclass/mozextension.eclass index ef410d3..bced3a1 100644 --- a/eclass/mozextension.eclass +++ b/eclass/mozextension.eclass @@ -1,14 +1,22 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/mozextension.eclass,v 1.8 2013/04/05 15:27:40 floppym Exp $ +# $Header: $ # # @ECLASS: mozextension.eclass # @MAINTAINER: # Mozilla team # @BLURB: Install extensions for use in mozilla products. - +# if [[ ! ${_MOZEXTENSION} ]]; then +# @ECLASS-VARIABLE: MOZEXTENSION_TARGET +# @DESCRIPTION: +# This variable allows the installation path for xpi_install +# to be overridden from the default app-global extensions path. +# Default is empty, which installs to predetermined hard-coded +# paths specified in the eclass. +: ${MOZEXTENSION_TARGET:=""} + inherit eutils DEPEND="app-arch/unzip" @@ -66,7 +74,9 @@ 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_extension_location) ; then + if [[ -n ${MOZEXTENSION_TARGET} ]]; then + insinto "${MOZILLA_FIVE_HOME}"/${MOZEXTENSION_TARGET%/}/${emid} + elif $(mozversion_extension_location) ; then insinto "${MOZILLA_FIVE_HOME}"/browser/extensions/${emid} else insinto "${MOZILLA_FIVE_HOME}"/extensions/${emid}