Add patch for ARM OS detection, bug 327783

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 47 insertions, 4 deletions

diff --git a/x11-plugins/enigmail/ChangeLog b/x11-plugins/enigmail/ChangeLog
index 28bfc39c9a75..4e8e08e41602 100644
--- a/x11-plugins/enigmail/ChangeLog
+++ b/x11-plugins/enigmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-plugins/enigmail
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.189 2010/07/04 23:17:40 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/ChangeLog,v 1.190 2010/07/11 12:53:08 nirbheek Exp $
+
+  11 Jul 2010; Nirbheek Chauhan <nirbheek@gentoo.org> enigmail-1.1.2.ebuild,
+  +files/thunderbird-xul-1.9.2-arm-fixes.patch:
+  Add patch for ARM OS detection, bug 327783
 
 *enigmail-1.1.2 (04 Jul 2010)
 
diff --git a/x11-plugins/enigmail/Manifest b/x11-plugins/enigmail/Manifest
index 84bcd6f15dfb..c8edc0d10cc2 100644
--- a/x11-plugins/enigmail/Manifest
+++ b/x11-plugins/enigmail/Manifest
@@ -1,4 +1,5 @@
 AUX 70_enigmail-fix.patch 343 RMD160 a81caaa4cb6507b5a41b2593e26b984c8748a8b8 SHA1 7028cd7cf09c60325887fd0fb68a20ba3bb98b12 SHA256 895c5ffec6aa321290115f2c995658ae87f9bde027ac0414e5d76a7c9d451165
+AUX thunderbird-xul-1.9.2-arm-fixes.patch 603 RMD160 952db59f2c3d526b04323fec830cf04c28dfb84d SHA1 b1e2f12c0b204bf2c6434303c0638750dcb1b73d SHA256 19d230805cb5d62a99fef32dfc373661dcc3361bf8d1f6077854120a5e9a9821
 DIST enigmail-1.0.1.tar.gz 1201945 RMD160 2abd8e70fcfcd2e75e71a97a5a3c7d1e0c292666 SHA1 334e70723fffc0631dadb6fd4449afffdeafc3f2 SHA256 7bc8541eef483d67246f3d83682ba13263f001fa94b5982c0cfbe54e5bdfd32a
 DIST enigmail-1.1.1.tar.gz 1280598 RMD160 ea8daa4715957e59c5d39e3ced3a29edf61a15dd SHA1 1310e2569e65a384eea1605653cca6562a941129 SHA256 8e67c45f52ab858f78f6d13c00f312b6d4db97eeae4963aeba1f7cad8648824c
 DIST enigmail-1.1.2.tar.gz 1280923 RMD160 2c1fa3494c1c2458635a3d68929ce7ff8fdb48e7 SHA1 d29fce2b20a36d210b12c28fcbbee965007c95aa SHA256 dd6206f6622081b595d7bde7aaa8f63ca2c3f9db2acd13c751c7dd941def9e41
@@ -10,7 +11,7 @@ DIST thunderbird-3.1.source.tar.bz2 65633518 RMD160 bc55cf89dfe1f2c946fff8f5ec21
 DIST thunderbird-3.1rc2.source.tar.bz2 65626643 RMD160 e5112079166ad1b38f08a761587dc9d398efae88 SHA1 49bd4be60cfa584c12ec1f188b0aa9ff54112929 SHA256 02adf7b3b2c8e5db750cf94b6e518693b8ac1c2ea438dc6eaa976e37a38ede5d
 EBUILD enigmail-1.0.1-r3.ebuild 4108 RMD160 8706883241129e832b007eb466322083f3eef350 SHA1 cd04496787dd88196e12b289b5193759b4581015 SHA256 3202a5485200e9fa86adbbcabfdda1c08274a723a1243b7a92d62ee566c29550
 EBUILD enigmail-1.1.1.ebuild 4123 RMD160 48dd9c27216ca015b3c1c593a342e5ff7e2c58de SHA1 61cc16337859a64e8eb16411804282247368b967 SHA256 48db033a86ebb337ceece298b8c813af0050c048e9997d7ef857c365497d49ba
-EBUILD enigmail-1.1.2.ebuild 4123 RMD160 3a58fb91249092262f858b268fda3062ffbca379 SHA1 b4aaa32e3e9819381e2ed1ffb3e7c8bbf58b592f SHA256 b196cc89d07a618c54bca07df3ed88864d55cee5a4cbaa6d54a5e1e7a6b66de5
+EBUILD enigmail-1.1.2.ebuild 4210 RMD160 94c06b21b91e88958b71f0bb5cd223ee4b36b16a SHA1 dade3fcc0b8c818d38421932857416ba2233d931 SHA256 1a3ef2bd1194197940b63a09d4ace49f08d96b847eb607b49eb960fd0eeda6cb
 EBUILD enigmail-1.1.ebuild 4124 RMD160 35b6c98f46e4592d7e1880f47425e885a1a864e7 SHA1 df0d5b118b31b7b9d0472d22e16b5ce16a021eb4 SHA256 778d03960494b17498301611eb6e32afd4101e5c1c810481d24ac66a58a6d230
-MISC ChangeLog 26148 RMD160 68495729b020a587fd8b0e20fbc6da53b100e2e6 SHA1 720f5ab844e827e5710982c4e270023a6deeb8ad SHA256 1496ac10afa25f5895c65a1fa7f72f8cbd6e68eb9bcc78760659190f59a89016
+MISC ChangeLog 26320 RMD160 ec3a571338c73b73e6b9b60bddf34422d7d70e22 SHA1 26d110f81e164270df8112f1dd2f0fd1a0b89c3a SHA256 8a98b56415f8b48d818d6579eabc9beea2c7f8de6cf8cf59dfd840d64376bb2f
 MISC metadata.xml 442 RMD160 a82cb8621928aa2ddb0dc98514764c8f105393ae SHA1 f86b5de607060bfdaab09b902f7a33379b6afceb SHA256 50b3622a408b9c241a2c6139b0eb6d1dc6bec95aa420aa60fe6eebeac36be4dd
diff --git a/x11-plugins/enigmail/enigmail-1.1.2.ebuild b/x11-plugins/enigmail/enigmail-1.1.2.ebuild
index c242b796222a..9d8fbb63532e 100644
--- a/x11-plugins/enigmail/enigmail-1.1.2.ebuild
+++ b/x11-plugins/enigmail/enigmail-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-1.1.2.ebuild,v 1.1 2010/07/04 23:17:40 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/enigmail/enigmail-1.1.2.ebuild,v 1.2 2010/07/11 12:53:08 nirbheek Exp $
 
 WANT_AUTOCONF="2.1"
 EAPI="2"
@@ -56,6 +56,9 @@ src_prepare(){
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}"
 
+	# ARM fixes, bug 327783
+	epatch "${FILESDIR}/thunderbird-xul-1.9.2-arm-fixes.patch"
+
 	cd mozilla
 	eautoreconf
 	cd js/src
diff --git a/x11-plugins/enigmail/files/thunderbird-xul-1.9.2-arm-fixes.patch b/x11-plugins/enigmail/files/thunderbird-xul-1.9.2-arm-fixes.patch
new file mode 100644
index 000000000000..c7d7a65bf43d
--- /dev/null
+++ b/x11-plugins/enigmail/files/thunderbird-xul-1.9.2-arm-fixes.patch
@@ -0,0 +1,35 @@
+Fix arm OS detection
+
+https://bugs.gentoo.org/327783
+https://bugzilla.mozilla.org/show_bug.cgi?id=577319
+---
+--- configure.in
++++ configure.in
+@@ -1424,9 +1424,11 @@
+     CPU_ARCH="$OS_TEST"
+     ;;
+ 
+-arm)
++arm*)
+     if test "$OS_TARGET" = "WINCE"; then
+         CPU_ARCH="$OS_TEST"
++    else
++        CPU_ARCH="arm"
+     fi
+     ;;
+ esac
+--- mozilla/js/src/configure.in
++++ mozilla/js/src/configure.in
+@@ -1162,9 +1162,11 @@
+     CPU_ARCH="$OS_TEST"
+     ;;
+ 
+-arm)
++arm*)
+     if test "$OS_TARGET" = "WINCE"; then
+         CPU_ARCH="$OS_TEST"
++    else
++        CPU_ARCH="arm"
+     fi
+     ;;
+ esac