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

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

commit:     c4f7b10dabffb0475f0d0bd86657cba97bd1c99f
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Fri May 25 00:16:27 2012 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Fri May 25 00:16:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=c4f7b10d

sync to tree

---
 mail-client/thunderbird/Manifest                   |    2 +-
 .../thunderbird/thunderbird-12.0.1-r1.ebuild       |   11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 8bc641b..bf08977 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -57,4 +57,4 @@ DIST thunderbird-12.0.1-vi.xpi 436847 RMD160 e40c7ea3c9be776fabad47daaa3980f0eb2
 DIST thunderbird-12.0.1-zh-CN.xpi 431545 RMD160 bd8ea0294775358f1125984417c3ac2190349b4e SHA1 a26aed0508e24f92aa2a51120e0507191c65b1e4 SHA256 267ece6fcafc4886908e80693853be28c745b59b7c57376521f6630ccc8741cd
 DIST thunderbird-12.0.1-zh-TW.xpi 432164 RMD160 4efb04c31feb828d86df5a3b649718f98281e37d SHA1 6d4eff3e899d4d3c5ec34996b264c4660e2182b6 SHA256 e0cb1c64a3b33ba741d46daeeaf3287a1c7d4551dafcda09134d7eb049cee104
 DIST thunderbird-12.0.1.source.tar.bz2 101253776 RMD160 5df12513dd8d3554e666ff938b84a67b18a78144 SHA1 b5fcfe23834722eaa441274e0e2882adf9ed7575 SHA256 d8914f27b0ec71d940475a8942c951b106ecda69fd3a2954047584663a6ab183
-EBUILD thunderbird-12.0.1-r1.ebuild 9549 RMD160 2124961c290fca1326d7f154dba0613cab58fe58 SHA1 d5f8041b0cdd1918e468ade0615b0eeecb77d82d SHA256 4f02ba828969ccb4895a60b89f510b3e84e1748d29d730bdceb0aa42f1710786
+EBUILD thunderbird-12.0.1-r1.ebuild 9744 RMD160 4b433b9456fd31a6e3b38f4a16b1f1d3253c6a53 SHA1 09a1289220e9f2142d64931ded6d5a3087c67c14 SHA256 2490461b3643fcc499500170e1baa4b0380e874c5e11d3d9da99da5b0ded4bdf

diff --git a/mail-client/thunderbird/thunderbird-12.0.1-r1.ebuild b/mail-client/thunderbird/thunderbird-12.0.1-r1.ebuild
index 97473d2..3117de5 100644
--- a/mail-client/thunderbird/thunderbird-12.0.1-r1.ebuild
+++ b/mail-client/thunderbird/thunderbird-12.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-8.0.ebuild,v 1.3 2011/11/13 17:13:47 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-12.0.1-r1.ebuild,v 1.3 2012/05/24 22:06:14 floppym Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -135,6 +135,13 @@ src_prepare() {
 		-i "${S}"/mozilla/config/system-headers \
 		-i "${S}"/mozilla/js/src/config/system-headers || die "Sed failed"
 
+	# Shell scripts sometimes contain DOS line endings; bug 391889
+	grep -rlZ --include="*.sh" $'\r$' . |
+	while read -r -d $'\0' file ; do
+		einfo edos2unix "${file}"
+		edos2unix "${file}"
+	done
+
 	# Allow user to apply any additional patches without modifing ebuild
 	epatch_user