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 ACE0A138334 for ; Sat, 16 Feb 2019 22:30:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E313E082B; Sat, 16 Feb 2019 22:30:20 +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 58DF2E082B for ; Sat, 16 Feb 2019 22:30:20 +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 09D93335D02 for ; Sat, 16 Feb 2019 22:30:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6FBD3544 for ; Sat, 16 Feb 2019 22:30:08 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1550356158.fc1d3e9fde0dee6a6bc37196621b4b1ebe0e4116.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-plugins/passff/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-plugins/passff/metadata.xml www-plugins/passff/passff-1.6.3.ebuild X-VCS-Directories: www-plugins/passff/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: fc1d3e9fde0dee6a6bc37196621b4b1ebe0e4116 X-VCS-Branch: master Date: Sat, 16 Feb 2019 22:30:08 +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: 6b76c5f4-841b-446a-a703-3d8d9ea0d390 X-Archives-Hash: 8ca77766115c9944c0f860c3ef7174ba commit: fc1d3e9fde0dee6a6bc37196621b4b1ebe0e4116 Author: Haelwenn (lanodan) Monnier hacktivis me> AuthorDate: Fri Feb 15 16:15:36 2019 +0000 Commit: Patrice Clement gentoo org> CommitDate: Sat Feb 16 22:29:18 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc1d3e9f www-plugins/passff: fix installation method. Closes: https://bugs.gentoo.org/677984 Signed-off-by: Haelwenn (lanodan) Monnier hacktivis.me> Signed-off-by: Patrice Clement gentoo.org> www-plugins/passff/metadata.xml | 4 ---- www-plugins/passff/passff-1.6.3.ebuild | 21 ++++++--------------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/www-plugins/passff/metadata.xml b/www-plugins/passff/metadata.xml index 234e183d237..af94d61a342 100644 --- a/www-plugins/passff/metadata.xml +++ b/www-plugins/passff/metadata.xml @@ -8,10 +8,6 @@ proxy-maint@gentoo.org Proxy Maintainers - - Install plugin for www-client/firefox - Install plugin for www-client/firefox-bin - passff/passff diff --git a/www-plugins/passff/passff-1.6.3.ebuild b/www-plugins/passff/passff-1.6.3.ebuild index 884acd904a9..80c02c29368 100644 --- a/www-plugins/passff/passff-1.6.3.ebuild +++ b/www-plugins/passff/passff-1.6.3.ebuild @@ -3,8 +3,6 @@ EAPI=7 -inherit mozextension - MY_XPINAME="${P}-fx" DESCRIPTION="zx2c4 pass manager extension for Firefox" @@ -14,26 +12,19 @@ SRC_URI="https://addons.mozilla.org/firefox/downloads/file/1681210/${MY_XPINAME} LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="firefox firefox-bin" +IUSE="" RDEPEND="www-plugins/passff-host[firefox]" -REQUIRED_USE="|| ( firefox firefox-bin )" S="${WORKDIR}" src_unpack() { - xpi_unpack "${MY_XPINAME}.xpi" + cp "${DISTDIR}/${MY_XPINAME}.xpi" . || die } src_install() { - local MOZILLA_FIVE_HOME - if use firefox; then - MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox" - xpi_install "${MY_XPINAME}" - fi - - if use firefox-bin; then - MOZILLA_FIVE_HOME="/opt/firefox" - xpi_install "${MY_XPINAME}" - fi + # See https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Distribution_options/Sideloading_add-ons#Installation_using_the_standard_extension_folders + insinto "/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/" + # passff@invicem.pro is the extension id found in the manifest.json + newins "${MY_XPINAME}.xpi" "passff@invicem.pro.xpi" }