Fix race condition in enigmail build, bug #494094

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xB4D088B4)

3 files changed, 47 insertions, 2 deletions

diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog
index ad8e3c57c955..fe52b3c98d32 100644
--- a/mail-client/thunderbird/ChangeLog
+++ b/mail-client/thunderbird/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/thunderbird
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.259 2013/12/12 14:52:33 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.260 2013/12/14 00:54:52 anarchy Exp $
+
+  14 Dec 2013; Jory A. Pratt <anarchy@gentoo.org>
+  +files/enigmail-1.6.0-parallel-fix.patch, thunderbird-24.2.0.ebuild:
+  Fix race condition in enigmail build, bug #494094
 
 *thunderbird-24.2.0 (12 Dec 2013)
 
diff --git a/mail-client/thunderbird/files/enigmail-1.6.0-parallel-fix.patch b/mail-client/thunderbird/files/enigmail-1.6.0-parallel-fix.patch
new file mode 100644
index 000000000000..ab4b613c364b
--- /dev/null
+++ b/mail-client/thunderbird/files/enigmail-1.6.0-parallel-fix.patch
@@ -0,0 +1,38 @@
+commit dd4ad2eebd36c84307222ca56c10c073527d7054
+Author: Patrick Brunschwig <patrick@enigmail.net>
+Date:   Sun Nov 24 19:06:23 2013 +0100
+
+    fixed broken parallel full build of TB (patch by Fabio Rossi)
+
+diff --git a/lang/Makefile.in b/lang/Makefile.in
+index 2334d4f..38688e0 100644
+--- a/lang/Makefile.in
++++ b/lang/Makefile.in
+@@ -16,12 +16,12 @@ include $(topsrcdir)/config/config.mk
+ 
+ include $(srcdir)/../util/build.mk
+ 
+-all: export jar
++all: jar
+ 
+ export:
+ 	$(PERL) $(srcdir)/make-lang-xpi.pl $(srcdir)/current-languages.txt $(srcdir)
+ 
+-jar:
++jar: export
+ 	$(MAKEJAR)
+ 
+ clean:
+diff --git a/ui/Makefile.in b/ui/Makefile.in
+index 6309525..13c98ee 100644
+--- a/ui/Makefile.in
++++ b/ui/Makefile.in
+@@ -28,7 +28,7 @@ include $(topsrcdir)/config/config.mk
+ 
+ include $(srcdir)/../util/build.mk
+ 
+-jar:
++jar: dirs
+ 	$(MAKEJAR)
+ 
+ clean:
diff --git a/mail-client/thunderbird/thunderbird-24.2.0.ebuild b/mail-client/thunderbird/thunderbird-24.2.0.ebuild
index 1d52a3fb1bb4..ca382e0280eb 100644
--- a/mail-client/thunderbird/thunderbird-24.2.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-24.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-24.2.0.ebuild,v 1.1 2013/12/12 14:52:33 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-24.2.0.ebuild,v 1.2 2013/12/14 00:54:52 anarchy Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -143,6 +143,9 @@ src_prepare() {
 
 	if use crypt ; then
 		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
+		pushd "${S}"/mailnews/extensions/enigmail &>/dev/null || die
+		epatch "${FILESDIR}"/enigmail-1.6.0-parallel-fix.patch
+		popd &>/dev/null || die
 	fi
 
 	# Ensure that are plugins dir is enabled as default