[gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, mail-client/thunderbird/files/

["Jory Pratt" <anarchy@gentoo.org>]

commit:     1b6810a26219cd1b1c5873fd43c17c7b028fd0e1
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 23 21:13:12 2013 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Sep 23 21:13:12 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=1b6810a2

Thunderbird: Finish fixing build failure, enigmail breakage

---
 .../files/enigmail_mailnews_extensions_genxpi.patch   | 19 +++++++++++++++++++
 mail-client/thunderbird/thunderbird-24.0.ebuild       |  4 +++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/mail-client/thunderbird/files/enigmail_mailnews_extensions_genxpi.patch b/mail-client/thunderbird/files/enigmail_mailnews_extensions_genxpi.patch
new file mode 100644
index 0000000..a945cf2
--- /dev/null
+++ b/mail-client/thunderbird/files/enigmail_mailnews_extensions_genxpi.patch
@@ -0,0 +1,19 @@
+$OpenBSD$
+https://bugzilla.mozilla.org/show_bug.cgi?id=886095
+--- mailnews/extensions/enigmail/genxpi.orig	Wed Jul  3 13:21:33 2013
++++ mailnews/extensions/enigmail/genxpi	Thu Jul 11 09:33:44 2013
+@@ -78,6 +78,7 @@ fi
+ subprocessDll=${libPrefix}subprocess${dllSuffix}
+ spDllFile=platform/${platform}/lib/${libPrefix}subprocess-${xpcomAbi}${dllSuffix}
+ 
++cp ${targetDir}/chrome.manifest ${targetDir}/chrome.manifest.save
+ # Prepare chrome.manifest
+ cat  ${srcDir}/package/chrome.manifest | \
+ sed  's/##ENIGMIMEDLL-PLACEHOLDER##/binary-component platform\/'${platform}'\/components\/'`basename ${enigDllFile}`' ABI='${platform}'/' \
+@@ -151,4 +152,5 @@ zip ${xpiFile} \
+     chrome.manifest \
+     install.rdf
+ 
+-rm install.rdf chrome.manifest
++rm install.rdf
++mv chrome.manifest.save chrome.manifest

diff --git a/mail-client/thunderbird/thunderbird-24.0.ebuild b/mail-client/thunderbird/thunderbird-24.0.ebuild
index 1fed86f..7cb66a9 100644
--- a/mail-client/thunderbird/thunderbird-24.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-24.0.ebuild
@@ -132,7 +132,9 @@ src_prepare() {
 
 	if use crypt ; then
 		mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail
-		cd "${S}"
+		pushd "${S}"/mailnews/extensions/enigmail &>/dev/null || die
+		epatch "${FILESDIR}"/enigmail_mailnews_extensions_genxpi.patch
+		popd &>/dev/null || die
 	fi
 
 	# Ensure that are plugins dir is enabled as default