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

["Ian Stakenvicius" <axs@gentoo.org>]

commit:     f2bb6b35e8718aac3b49d0bf179807c6f0800d52
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  9 03:57:52 2013 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 03:58:49 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=f2bb6b35

Add locale support for lightning an gdata-provider, bug 333945

---
 mail-client/thunderbird/Manifest                   |  2 +
 ....1.0-r1.ebuild => thunderbird-24.1.0-r2.ebuild} | 51 +++++++++++++++++++++-
 2 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 56f3ccd..cfabad7 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,5 +1,7 @@
 DIST enigmail-1.6.tar.gz 1231111 SHA256 10d5eb7ba364b9b6e6275aae8bba1d0e4321ed7d55a715337d566ccf2a56ea4d SHA512 877ca75a0ed1538f156307dc181ce8808deb96f58250d26d4d2c1f474d637959347c2305cb3b8f92f12d3ebd95bfa9d4d35aaaa1f4670728f205be7ae76852b8 WHIRLPOOL 91a11a81cc7b4c05c4a0a320284bc362b13f6aecb4fb20b04f38080bffbc5b94ab1913cf7e2d4480a452a916fd0d4297830ce0ba36867c7418b11deb1e060b06
 DIST firefox-24.0-patches-0.6.tar.xz 9104 SHA256 1135f97625e23822309e5b2ce65ab0331cd8c7ebb1896d7b9daf2d77d1a11d4d SHA512 b8746373a7e9d2d5775dd2a73ca7d3675f2cbe32b81eacdf6a2208077f39fb842b454c49bb0a750e48c84c3d2ea73fa9c27f6135e7d1a08be2fc73afc520f172 WHIRLPOOL 5d8b89d1849709835611e0ef306dd4814e6ac10fcf9cfee10f6aa72b5e938546c505827441fe2d935eb63605434f77bc72ec201005693534b43dc19635caaf82
+DIST gdata-provider-2.6.2.xpi 115020 SHA256 008a302410b152e956cf56fc0abe4f6cc191ae51ab367abb7e0467ee65d44093 SHA512 38d2a581842de0937a96b7498db06aca120b8cd6b9de96a0285e90f57c28118193a24f32c9fdbee72233db0675a35c7bc51fd3ba6ec41bcf4521adf48107624e WHIRLPOOL 70d87e73d355559879daf4a00c9ff45c24a455af5fb2f93e8034811b0c444799bd754cb00ef63c321c3f7d85e98a62148fd0e9524fcc07edccb5c02772d7b515
+DIST lightning-2.6.2.xpi 3644848 SHA256 5d130a10d8ba29ea52b22f4c0de5b92b05cbae0e7681fb7009c9e24d9c2823bc SHA512 71918d4797faa08f908593d77563a87ae6e65938a92f3bbc896622ba020461cd9ef982aa7f10bd477fa3d1b5f7959ada041e714283def30a26d6e448e523c452 WHIRLPOOL 617543cbee7fa53ac3f75fce8a813c35ff10b64706bccd968e72eb155339494f76fa69927b4024e34431a1d65324c630793bd4932f3dd2ba2d9ab5b098405ab7
 DIST thunderbird-24.0-patches-0.1.tar.xz 1056 SHA256 2a4e128a6f5c35c865fbef77c006e6b24b98f89ceee5de6cfbf572e2c5fdca70 SHA512 aa411270fa4b6ffebbbb210a57a4b5c900ae5a696b7d6050dab2ee439365f3fc7e348c5c45b7632279d6f3c54009e7b29f1acb42501960489157875d79891361 WHIRLPOOL b7e7329d1eb78b222cc18c7b1750e737706e66f64b31ccd94ddf27733d0b8c651d001798d2319e544ac558affe76f69be71a225e246b99a36cee4fd0808dcf5f
 DIST thunderbird-24.1.0-ar.xpi 457861 SHA256 c1ae369bd2e7a43ef25be76b7865ec9cdf902ae0c9a37d5fd994e8905854b7a6 SHA512 c9e6ac99e62944da3fdce7939c7dc606e8cbba6ce99327f3e97fabc2c0f14e399c39951fb9b116c8d3f95b88ebbe9f5da383a85f4e89930fc8d24daac061bd96 WHIRLPOOL bbfeeecafc2a17742a4203d23caf9b2dffc59c69d39052b047f36b12119d742aba372c95f4aece8cedf0dd56bb73927aaa617231490990ffc297d6f10bb0137c
 DIST thunderbird-24.1.0-ast.xpi 373830 SHA256 0f1777c390f81070deca42c2f9cd440e0964c84267c8b4532d21e12f31354433 SHA512 adc91774f55d581bfb37ad630248bc51294d453990c0d08ae6e72faa46b710156269160b6ebf3381fadd37523337a4d7839eb31d69c7ba3b1e8daa68a434c6f2 WHIRLPOOL d49d6b712be2e50f5eeb1cd72e92c73ba293527a237de92778d69af591dd883573c17282c7c01eac76a7ee6c39bd6c81a8faae60bb721c3cd8c64f3928d2453b

diff --git a/mail-client/thunderbird/thunderbird-24.1.0-r1.ebuild b/mail-client/thunderbird/thunderbird-24.1.0-r2.ebuild
similarity index 82%
rename from mail-client/thunderbird/thunderbird-24.1.0-r1.ebuild
rename to mail-client/thunderbird/thunderbird-24.1.0-r2.ebuild
index c8d16dc..4267a9b 100644
--- a/mail-client/thunderbird/thunderbird-24.1.0-r1.ebuild
+++ b/mail-client/thunderbird/thunderbird-24.1.0-r2.ebuild
@@ -1,10 +1,11 @@
 # 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.0-r1.ebuild,v 1.4 2013/10/26 02:15:17 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-24.1.0-r1.ebuild,v 1.1 2013/11/04 13:41:14 anarchy Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
 MOZ_ESR=""
+MOZ_LIGHTNING_VER="2.6.2"
 
 # This list can be updated using scripts/get_langs.sh from the mozilla overlay
 MOZ_LANGS=(ar ast be bg bn-BD br ca cs da de el en en-GB en-US es-AR
@@ -44,6 +45,10 @@ SRC_URI="${SRC_URI}
 	${MOZ_FTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
 	${MOZ_HTTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
 	crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )
+	lightning? (
+		${MOZ_HTTP_URI/${PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
+		${MOZ_HTTP_URI/${PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/gdata-provider.xpi -> gdata-provider-${MOZ_LIGHTNING_VER}.xpi
+	)
 	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
 	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz
 	http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz"
@@ -114,6 +119,12 @@ src_unpack() {
 
 	# Unpack language packs
 	mozlinguas_src_unpack
+
+	# Unpack lightning for calendar locales
+	if use lightning ; then
+		xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
+		xpi_unpack gdata-provider-${MOZ_LIGHTNING_VER}.xpi
+	fi
 }
 
 src_prepare() {
@@ -155,6 +166,15 @@ src_prepare() {
 		edos2unix "${file}"
 	done
 
+	# Confirm the version of lightning being grabbed for langpacks is the same
+	# as that used in thunderbird
+	local THIS_MOZ_LIGHTNING_VER=$(cat "${S}"/calendar/sunbird/config/version.txt)
+	if [[ ${MOZ_LIGHTNING_VER} != ${THIS_MOZ_LIGHTNING_VER} ]]; then
+		eqawarn "The version of lightning used for localization differs from the version"
+		eqawarn "in thunderbird.  Please update MOZ_LIGHTNING_VER in the ebuild from ${MOZ_LIGHTNING_VER}"
+		eqawarn "to ${THIS_MOZ_LIGHTNING_VER}"
+	fi
+
 	# Allow user to apply any additional patches without modifing ebuild
 	epatch_user
 
@@ -304,15 +324,42 @@ src_install() {
 	fi
 
 	if use lightning ; then
-		emid="{3550f703-e582-4d05-9a08-453d09bdfdc6}"
+		local l c
+		mozlinguas_export
+
+		emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}"
 		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
 		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
 		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/gdata-provider-*.xpi
+		# Install locales for gdata-provider -- each locale is a directory tree
+		insinto ${MOZILLA_FIVE_HOME}/extensions/${emid}/chrome
+		cd "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_VER}/chrome
+		for l in "${mozlinguas[@]}"; do if [[ -d gdata-provider-${l} ]]; then
+			doins -r gdata-provider-${l}
+			echo "locale gdata-provider ${l} chrome/gdata-provider-${l}/locale/${l}/" \
+				>> "${ED}"/${MOZILLA_FIVE_HOME}/extensions/${emid}/chrome.manifest \
+				|| die "Error adding gdata-provider-${l} to chrome.manifest"
+		else
+			ewarn "Sorry, but lightning gdata-provider in ${P} does not support the ${l} locale"
+		fi; done
 
 		emid="{e2fda1a4-762b-4020-b5ad-a41df1933103}"
 		dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
 		cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid}
 		unzip "${S}"/${obj_dir}/mozilla/dist/xpi-stage/lightning-*.xpi
+		# Install locales for lightning - each locale is a jar file
+		insinto ${MOZILLA_FIVE_HOME}/extensions/${emid}/chrome
+		cd "${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER}/chrome
+		for l in "${mozlinguas[@]}"; do if [[ -e calendar-${l}.jar ]]; then
+			for c in calendar lightning; do
+				doins ${c}-${l}.jar
+				echo "locale ${c} $l jar:chrome/${c}-${l}.jar!/locale/${l}/${c}/" \
+					>> "${ED}"/${MOZILLA_FIVE_HOME}/extensions/${emid}/chrome.manifest \
+					|| die "Error adding ${c}-${l} to chrome.manifest"
+			done
+		else
+			ewarn "Sorry, but lightning calendar in ${P} does not support the ${l} locale"
+		fi; done
 
 		# Fix mimetype so it shows up as a calendar application in GNOME 3
 		# This requires that the .desktop file was already installed earlier