From ad7e2c5488de5294b9cf5a02c5d096a2a988c245 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Tue, 16 Jul 2019 12:12:20 +0200
Subject: x11-plugins/enigmail: Synced live ebuild

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---
 x11-plugins/enigmail/enigmail-9999.ebuild | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'x11-plugins/enigmail')

diff --git a/x11-plugins/enigmail/enigmail-9999.ebuild b/x11-plugins/enigmail/enigmail-9999.ebuild
index 752b1acb8637..d2c798ea5030 100644
--- a/x11-plugins/enigmail/enigmail-9999.ebuild
+++ b/x11-plugins/enigmail/enigmail-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -44,14 +44,19 @@ DEPEND="${RDEPEND}
 	dev-lang/perl
 	"
 
+PATCHES=( "${FILESDIR}"/enigmail-no_pEp_auto_download.patch )
+
 src_compile() {
+	# Required or parallel make fails
+	emake -C stdlib createlib
+
 	emake ipc public ui package lang stdlib
 	emake xpi
 
 }
 
 src_install() {
-	local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/install.rdf)
+	local emid=$(sed -n '/"id":/!d; s/.*\({.*}\).*/\1/; p; q' build/dist/manifest.json)
 	[[ -n ${emid} ]] || die "Could not scrape EM:ID from install.rdf"
 
 	mv build/enigmail*.xpi build/"${emid}.xpi" || die 'Could not rename XPI to match EM:ID'
-- 
cgit v1.2.3-65-gdbad