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

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

commit:     a6cafd794f10da069cc9d4a700016babefbc4783
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 13 23:52:08 2015 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sat Jun 13 23:52:08 2015 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=a6cafd79

Lightning is now totally included in thunderbird and built by default

 mail-client/thunderbird/Manifest                  |  2 --
 mail-client/thunderbird/thunderbird-38.0.1.ebuild | 29 ++---------------------
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index e809ac9..34f3d8d 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,7 +1,5 @@
 DIST enigmail-1.8.2.tar.gz 1604159 SHA256 1d2700799bc52aaa8e8c9f7a0f5111281ff9fbdffc093cdff070657d574eb2a6 SHA512 51eece988f466aeb4a343719a86dc7d95ec41dfc3ec7e3d8d2f360528675c605f8f2154f10aeea6ef82ed87c784f1d13bfc978e052a9ede0072b5137f6294b11 WHIRLPOOL e12a703899e0e4c98adc58b5f4bf1f74e24a2cf09c1a706a6edca6aca06140041b293f23e6e5b05c507177b4148533ebc3431fb75592aae07d791a899ba2c45c
 DIST firefox-38.0-patches-0.3.tar.xz 4796 SHA256 bfbef81748f76f5f80c3ce6e6b810b65f6266f71da02722b1e8c9fad865b02bd SHA512 a974e33759246153db7d83488f1326275efd12c44a6c8c539cbc35709b4dbd27e848bda32f302ac2baa5d8729ba20579ebc7f643419757f542972ca1a264d520 WHIRLPOOL 3549239db380c02a1575ff407ea684a14827f2250d991b5eb6c8a341ceebaca57cd2cc422e160f00dfab933385d677574cd84947da07bd282c68bb84c40fa42b
-DIST gdata-provider-1.0.3.tar.xz 55860 SHA256 2a6b8c1bed9c32dbb91bceadaf36986bffab4379ebf8ab1af83f9321b38f9cdd SHA512 d1a99e179f4bc57c98beef80c27c5f774dffdd177a0ee0adf27441aaea27f96d61e723e592f9fa813b943acb34f572d5769622e2dd45c5befec762e0cbe013fb WHIRLPOOL 2d896ae041ec8e6bd6f9474bf01ccc43925d89254cd6c719dfb70e1a5677f21fcc9536c2595f6b1b5823607d69248512d6dc9f5a1f208bd2e25a59f30a0c8c3f
-DIST lightning-3.3.xpi 4226096 SHA256 eedaf565bc253a6bc21618dcc95eb2cef121745c249734514bf37ebd6abb3e5a SHA512 c0ae9d259ec28eb6d7335426cbaeaf2701b4a1230de203a5bcccb86937cadca6622031e7a7de11fa5a733631d20a2362fbdc04a1ab649a9383a2ae9114ab9c34 WHIRLPOOL abebc35ca3eaddd50e8660e647c6382943327237375e1c31c567d03b4a91ced37c55d3e5e41b88d252d5fa025c56147ecb53e20dba98c08a2134b38848ffe98a
 DIST thunderbird-38.0-patches-0.1.tar.xz 684 SHA256 cd2a347b72a104e72d38e56bb92df3464e8820485119b4114dbd0bbda131a808 SHA512 52c83af301be959e861dfec55b3c4bc60035387c606976bd29232c4cba077230edcadef242491e699fba10027d0408dd4f33fa320bcf96727afe149166ca02de WHIRLPOOL a378a0fa1b152f17681a5e389662fedfacd45a137b224f038d3c98ab4a024bcf9e753fb2fe018cdb7126fb710ee8baabdf7882540450ead2985070d0d1f12eb0
 DIST thunderbird-38.0.1-ar.xpi 475294 SHA256 8c079d76766ba06538761cef2bb6a2fc88f4f6e07548c898bf4ec10e358dfb41 SHA512 53e986779bb4a561b19fe6d2a943958733de8c78e1e396ddb6a2b9eaa3774f36b49f500ac2c21ca88016443b14b60e1608632e05ce229b1d604fc83bb1d59467 WHIRLPOOL 41b301945e78b6fd392e13265fa9c8abd6fa6568127caa1ad0e43ddc104d3d9a06ac0169de5c22acaf9178211bfa9c9f3594629421585178afdcf1774c1b7170
 DIST thunderbird-38.0.1-ast.xpi 405894 SHA256 eb10f75cbe57e82e20f8e7c06a61fee1164326a332c9a54876930531991ba988 SHA512 20f6ddd3115ce9f9d8c1c13943b18c4b356ed394658845ff5d787f1bdc31afbf45ecd6b084d2658b36722e221377501ee0370fb6c8b9db159745edea2c54fa09 WHIRLPOOL 2939ac93a2d8d95c23f62580b272ab2ef980631ce8c7eb7ab201301bf8b1c575d609c28483019d0c3d88f2a44bc1cecb8cf71f53249d291201523084321691c7

diff --git a/mail-client/thunderbird/thunderbird-38.0.1.ebuild b/mail-client/thunderbird/thunderbird-38.0.1.ebuild
index 54accf5..198659e 100644
--- a/mail-client/thunderbird/thunderbird-38.0.1.ebuild
+++ b/mail-client/thunderbird/thunderbird-38.0.1.ebuild
@@ -1,13 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-31.7.0-r1.ebuild,v 1.2 2015/06/10 01:29:55 anarchy Exp $
+# $Header: $
 
 EAPI=5
 WANT_AUTOCONF="2.1"
 MOZ_ESR=""
-MOZ_LIGHTNING_VER="3.3"
-#MOZ_LIGHTNING_GDATA_VER="2.6.3"
-MOZ_LIGHTNING_GDATA_VER="1.0.3"
 
 # 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,17 +41,13 @@ HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"
 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist crypt hardened ldap +lightning +minimal mozdom selinux"
+IUSE="bindist crypt hardened ldap +minimal mozdom selinux"
 RESTRICT="!bindist? ( bindist )"
 
 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
-		http://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz
-	)
 	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
 	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz
 	http://dev.gentoo.org/~axs/distfiles/${PATCH}.tar.xz
@@ -127,11 +120,6 @@ src_unpack() {
 
 	# Unpack language packs
 	mozlinguas_src_unpack
-
-	# Unpack lightning for calendar locales
-	if use lightning ; then
-		xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
-	fi
 }
 
 src_prepare() {
@@ -169,15 +157,6 @@ 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=$(python "${S}"/calendar/lightning/build/makeversion.py ${PV})
-	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
 
@@ -215,7 +194,6 @@ src_configure() {
 	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
 	mozconfig_annotate '' --with-user-appdir=.thunderbird
 
-	mozconfig_use_enable lightning calendar
 	mozconfig_use_enable ldap
 
 	# Bug #72667
@@ -289,9 +267,6 @@ src_install() {
 	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
 	emake DESTDIR="${D}" install
 
-	# Install language packs
-	mozlinguas_src_install
-
 	if ! use bindist; then
 		newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png
 		domenu "${FILESDIR}"/icon/${PN}.desktop