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

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

commit:     dab79ae9b346b97eaacf0f2032bd96c34a04708b
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 15 06:17:59 2015 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Sat Aug 15 06:17:59 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dab79ae9

mail-client/thunderbird-38.2.0: switched lightning locale distfile to upstream

Package-Manager: portage-2.2.20

 mail-client/thunderbird/Manifest                  | 2 +-
 mail-client/thunderbird/thunderbird-38.2.0.ebuild | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 76e2d70..0d6ff9e 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -10,7 +10,7 @@ DIST gdata-provider-2.6.3.xpi 115020 SHA256 008a302410b152e956cf56fc0abe4f6cc191
 DIST lightning-2.6.5.xpi 3645840 SHA256 c4bc84f7e21148d6d06f4f61de70c7b4e331b53dce12979309e91294d4289b31 SHA512 880002e1c01a06b22ca20a120a5e4d893c364b058d7d52d12dddcdd3f4215652ae2c20332c3ca29fa6c5012df71330abda05bf3b862485043ddd481628ef801b WHIRLPOOL 5003a341a174cbe7da8b069d9f5d6ade0a7c0e8d842a0c25f74702e997942b3ea43be1e0eb6913d75bc78ef23fb2ee57551860d02b331db039cd6adbfcfa1f5c
 DIST lightning-3.3.xpi 4226096 SHA256 eedaf565bc253a6bc21618dcc95eb2cef121745c249734514bf37ebd6abb3e5a SHA512 c0ae9d259ec28eb6d7335426cbaeaf2701b4a1230de203a5bcccb86937cadca6622031e7a7de11fa5a733631d20a2362fbdc04a1ab649a9383a2ae9114ab9c34 WHIRLPOOL abebc35ca3eaddd50e8660e647c6382943327237375e1c31c567d03b4a91ced37c55d3e5e41b88d252d5fa025c56147ecb53e20dba98c08a2134b38848ffe98a
 DIST lightning-4.0.1.xpi 6637522 SHA256 a93af3b8548a82e5709ed1c0d06d0a103e3fcdd5e554b1124e42166a814be3a6 SHA512 ed8ae62eb6b339a4108756934142dbc2aeb7e039d6fd856067bf3f24ce5a2450336e281dd018b5a14c359c5f58fc20668e5cad4b3929955572f44002be1a940c WHIRLPOOL caa23550eab6cc8f4b8ec63dd6c34282944cb9f150885ab2120d315db0910b640fab3fdb466d97cc7e15364e88bdc09c7041f107d11bf508f361979de1bf2722
-DIST lightning-4.0.2.tar.xz 2319588 SHA256 d1d4c4523e8060f92b8cc16e48aeb4d870a8a4ddbf57e43862bce666597d7dc1 SHA512 dc4c991a3b8d3cc7a93688c36f5a8bbfd1a5fe8e5d87e2685ebb9193a2ded233e18b4636824f0d2b78d542f2d6b9b72c2eb2eeb9f4bd65565c32884a1327cdc1 WHIRLPOOL b195e6f79d9abbf764191bedbaaac9054d7ec5a57f2bfa7a1da33f405c2b1d00a78c1d77c730f044ea8e6df0e9f82178ab80f6458b0cabb2421b1111a2623c28
+DIST lightning-4.0.2.xpi 6637618 SHA256 d2d4985058dc2755243fb60a7869cf07e835f871fb098ccc2c7faa5d07f63ea6 SHA512 f73afe1e4ee0e822102226a39f657fdcc397dd4bdd3824d9b793f6fab667fc70eb5bbee48cf088a5c1efe229ac8d564bf36c8998c2e10210f70612d380b7e2c9 WHIRLPOOL 7488b49ba36f385552951eb34c36098af522161ec9784cc10db5659efe002d415e5df13ae11b9eba06a1fa329e85f75adb0a025b8cbc71814f3f7195e6b4ad77
 DIST thunderbird-24.0-patches-0.1.tar.xz 1056 SHA256 2a4e128a6f5c35c865fbef77c006e6b24b98f89ceee5de6cfbf572e2c5fdca70 SHA512 aa411270fa4b6ffebbbb210a57a4b5c900ae5a696b7d6050dab2ee439365f3fc7e348c5c45b7632279d6f3c54009e7b29f1acb42501960489157875d79891361 WHIRLPOOL b7e7329d1eb78b222cc18c7b1750e737706e66f64b31ccd94ddf27733d0b8c651d001798d2319e544ac558affe76f69be71a225e246b99a36cee4fd0808dcf5f
 DIST thunderbird-24.8.0-ar.xpi 457862 SHA256 e954ec8c64356b82006b01f3bb30d247994ce81f37a7e96de93c606b464c55cc SHA512 f8267f4ef885d900e15bc8609503ea6da37dde39b17362b0e35d384ec51416847c4c898a638708dcbc792bfb1a819bacc1b1f9f8bbff45623ea521c902929cce WHIRLPOOL 8116a679e37eae740e880fcadb48ade6d49cb96732a4f4212038f1ed03c15288219fc7be9a308709a658882872dc79aa794907643df7ab2c139358192635eb98
 DIST thunderbird-24.8.0-ast.xpi 373831 SHA256 acdfeef9612eb4ec261ffadb8f5ea494aef4200f9758df55365646a99a6bd47c SHA512 5968a948bfc69f82982890ac3414fe6d9c8c587fe9b815dd29ab3d4a01b27e67d99270d5f915f5c86edab430fa3c4e57ee2dae73be1d32bc06088831180d2e14 WHIRLPOOL b3edbf4b1f70df7d8d08e24f801b82961174b5e78b0d8977b0a070c18a4dae0871063e0f177f2388b8dad1589a2e33d0f87a876dc63bd3f558cf645dd3d46718

diff --git a/mail-client/thunderbird/thunderbird-38.2.0.ebuild b/mail-client/thunderbird/thunderbird-38.2.0.ebuild
index dccc56b..0bca464 100644
--- a/mail-client/thunderbird/thunderbird-38.2.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-38.2.0.ebuild
@@ -46,14 +46,11 @@ RESTRICT="!bindist? ( bindist )"
 PATCH_URIS=( http://dev.gentoo.org/~{anarchy,axs,polynomial-c}/mozilla/patchsets/{${PATCH},${PATCHFF}}.tar.xz )
 SRC_URI="${SRC_URI}
 	${MOZ_HTTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
-	http://dev.gentoo.org/~axs/distfiles/lightning-${MOZ_LIGHTNING_VER}.tar.xz
+	${MOZ_HTTP_URI/${PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
 	lightning? ( http://dev.gentoo.org/~axs/distfiles/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.tar.xz )
 	crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )
 	${PATCH_URIS[@]}"
 
-# using a self-rolled release for locales this time, usually will want to use the official one
-#	${MOZ_HTTP_URI/${PN}/calendar/lightning}/${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi
-
 ASM_DEPEND=">=dev-lang/yasm-1.1"
 
 CDEPEND="
@@ -121,8 +118,7 @@ src_unpack() {
 	# Unpack language packs
 	mozlinguas_src_unpack
 
-	# this version of lightning is a .tar.xz , no xpi needed
-	#xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
+	xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi
 	# this version of gdata-provider is a .tar.xz , no xpi needed
 	#use lightning && xpi_unpack gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.xpi
 }