From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RPyjc-0004bL-3k for garchives@archives.gentoo.org; Mon, 14 Nov 2011 15:46:14 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0799821C0DC; Mon, 14 Nov 2011 15:46:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AA9DD21C0DC for ; Mon, 14 Nov 2011 15:46:04 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1A3B31B400C for ; Mon, 14 Nov 2011 15:46:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7383680042 for ; Mon, 14 Nov 2011 15:46:03 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <7391997ae8f0702c8433490b742b7dcb8b6c1d1e.nirbheek@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/ X-VCS-Repository: proj/mozilla X-VCS-Files: mail-client/thunderbird/Manifest mail-client/thunderbird/thunderbird-8.0.ebuild X-VCS-Directories: mail-client/thunderbird/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 7391997ae8f0702c8433490b742b7dcb8b6c1d1e Date: Mon, 14 Nov 2011 15:46:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 9d9948ed-c57d-410b-8937-7ec18fa6dfa2 X-Archives-Hash: 2322a4be655686f36c0ad22c73ada3a7 commit: 7391997ae8f0702c8433490b742b7dcb8b6c1d1e Author: Nirbheek Chauhan gentoo org> AuthorDate: Mon Nov 14 15:45:02 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Mon Nov 14 15:45:02 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mozilla.git;a= =3Dcommit;h=3D7391997a thunderbird: sync linguas changes with tree --- mail-client/thunderbird/Manifest | 15 ++++- mail-client/thunderbird/thunderbird-8.0.ebuild | 77 ++++++++++++------= ------ 2 files changed, 52 insertions(+), 40 deletions(-) diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/M= anifest index 56a235c..5b6ac32 100644 --- a/mail-client/thunderbird/Manifest +++ b/mail-client/thunderbird/Manifest @@ -5,10 +5,15 @@ AUX thunderbird-gentoo-default-prefs-1.js 387 RMD160 5d= 7362448204c7ea6cf81b06446 DIST enigmail-1.3.3.tar.gz 1367995 RMD160 4c7ab726052b566f913612cfbdd767= 714486bf9c SHA1 a6d61b6dbdcfdb0dc4eaa8aac1b6277fed65c8c5 SHA256 7110d2f0e= ea8a9a7580ddc13ab56c262bbd33776ebdc34ab19ec90143f010be6 DIST firefox-8.0-patches-0.2.tar.xz 8032 RMD160 221500ed4f56e9c139f563d5= 98bf38df448e5652 SHA1 f41c04c659a253d464ab9bb2c169c1b99b22d443 SHA256 52d= 351133187dfb7b367950f4da543b06b9f0666f6c07b8bbb5b21cd3d40b0c3 DIST thunderbird-8.0-ar.xpi 429682 RMD160 ac02f62b746232efcbbf622e7d2a84= 269194441f SHA1 da148179119926bfb2305e2157ccbe6edee86e79 SHA256 ac50815d2= 6c950b51a930239facf46c1225f8c052dc7610106fa74573b187b96 +DIST thunderbird-8.0-be.xpi 388182 RMD160 b76fa607aef8a84430fd174f53bdca= 2d542e7f92 SHA1 7e606ae1e580242a62e6a136155b8a478ec09dce SHA256 c744b02fe= 1cb2acc1254d9c7b34af80710dc5de523d077187b87fd53e061aa9f +DIST thunderbird-8.0-bg.xpi 447619 RMD160 e13ac28e4b34e08308364418b5aab9= 7518bbde84 SHA1 25d48b7d9fbaea3ab2b60e3361185fa3d72e34fa SHA256 aec72e7de= 903f79775456926e255c39346f8b52d0e12db90246f9401055e6405 +DIST thunderbird-8.0-bn-BD.xpi 467423 RMD160 de9d84e240110fd178b4eb0807e= 9b18709306892 SHA1 cf1185820ee431ec1f8928526fd866316d80350b SHA256 f4812c= b69d83f94b31a6cab11672946dc9ae0afd3166553aa05df837971fc46f +DIST thunderbird-8.0-br.xpi 407854 RMD160 ce49a786c8608852d42d3230743fbb= 362a77e6b0 SHA1 f4b227d70f87b707cb1ab8ad203e2aefa5c5fa64 SHA256 bfe0a405d= b47e62cf4f2037f10592f37e6f4804ff141c98f03a708c8b76886c9 DIST thunderbird-8.0-ca.xpi 407844 RMD160 f0860202c3b3ca2117373a657f0858= 5e79b8fb23 SHA1 676c0b2904b282649323ee8287eede0fd011f31d SHA256 f9cbd6687= 5016bf18e84d0ffcae1b394d020c6166f1626b95cdb04ea431c20b8 DIST thunderbird-8.0-cs.xpi 410932 RMD160 efb7559493f30a25d0707b36240d28= c4fb5e9647 SHA1 4a1efdaa8b7cc497a48dc91d35e69464cfa2695c SHA256 1fd879a38= 02d455a10db9b94c74449663920b6dd9e7dec487c9a782898fc4c6e DIST thunderbird-8.0-da.xpi 353524 RMD160 ef82b894d5c104f20a301f498e4ecb= 778343c50f SHA1 f60819da07a43405faf6d88a9163ed964ac5095f SHA256 db28f6e24= 5304488923e153e5e692b3ade8d736bc42c2fd8c1af065c973370ef DIST thunderbird-8.0-de.xpi 409617 RMD160 65e0a6ff2e8f1dd192ae06235def1d= 269bef7202 SHA1 514cc2f40cca34be61a0e4287f1f01a00c96def8 SHA256 d8047dafb= cf85f520ec268c633e0a704bd276b0e46d972302d54356f558883f2 +DIST thunderbird-8.0-el.xpi 392612 RMD160 433f3350a94aa8e1c815a821c718de= a1b0af180a SHA1 7d026284b05903e5fe20eae6abc46246d9c3f79c SHA256 ebb6e4e5c= db20a3d19c72d5bc8967ff1d5ce65b479426ffa7f7cb2a367ea9d9f DIST thunderbird-8.0-en-GB.xpi 384202 RMD160 37331b2e48c0fc12c25d1e290c3= 52187ab326332 SHA1 95dbc9cd72a58d6d2b6cc7e6d38846eef15ff6cc SHA256 77a53b= 255f1a526166415eb2c7398a6d7a07a23f46d2737714bfbded8972bb8f DIST thunderbird-8.0-es-AR.xpi 402208 RMD160 7f9cb8d89f54e5b8e022b152f69= a542d978c3612 SHA1 83dba6b048b1fd6132bf9ff286e3e492208b1dc9 SHA256 3d2303= 2bc87e257a749ce7a877897ee4e05c64930ebec9e743eec07c52ac26dc DIST thunderbird-8.0-es-ES.xpi 345966 RMD160 87b19f178bcd1dae36dc2896b1e= 751efb934a7af SHA1 9f9e2965fb1786f44a9e4998d4bbceb6ffb2eb30 SHA256 9e4d21= fa3b1387977ae4a6bf69395b48de8560e0330ee964c210a06fbf0c0327 @@ -18,8 +23,11 @@ DIST thunderbird-8.0-fi.xpi 403666 RMD160 0889d030e832= d3f1a894bf3641ef3b98af3c72 DIST thunderbird-8.0-fr.xpi 406258 RMD160 8e6684d7cb942b34c69d467619c425= 99dd1f02cd SHA1 55d3d5117f36bb5451cf3e040317cdd67b444487 SHA256 5384e5e75= 061ab504ea3f6284d9f6232826f596d6785c392e795dbf27a2139b2 DIST thunderbird-8.0-fy-NL.xpi 406182 RMD160 18b02278929414909101c8d550a= 05ef5407484ac SHA1 b1df077e7fe68ebb69133655821f640915ea4a79 SHA256 fbf0e7= e59f36aa2770ddc129b0da453c5ccec1fc26ab08c1d37bb2ea1baec890 DIST thunderbird-8.0-ga-IE.xpi 414791 RMD160 5f5843a6fdfcbb47c84266ed57a= a03bed0d197f0 SHA1 e8f77908d61f82796fa80c974b821aed7a82f421 SHA256 6f193c= 7ab8d86e01bd305cb480ce4d1d3c40952b29d451ad53a87f7d25c399db +DIST thunderbird-8.0-gd.xpi 417258 RMD160 4fa9be2ddc45716832dc62a8d4d9a5= 613c6da22b SHA1 d699f7432c42b43ae339e7cb1fbbd6dd7a710a6f SHA256 a79cd6a96= 7aa6023953e1b24cf784e5600b05bd77f081c11fa1ab53c145f19e8 +DIST thunderbird-8.0-gl.xpi 401200 RMD160 53401ac6094f275ddb536da38ebaf5= 4cdfeda097 SHA1 dc343fcf130314eaef14bb70d6770f79c37a2edb SHA256 bd164a1c8= b5a1fa7514323a6fad15f43765c42886ab46cd0995edf29e19ec25e DIST thunderbird-8.0-he.xpi 429157 RMD160 cbcd11073637c0a8ffb4200ca7b93c= af6a78f1fc SHA1 d58b666d5a7ec7cd8c3ea6215f9a48a84fde8316 SHA256 15049fbc3= a1d41d4c69013ab18679994e6530a65c47051388dd51ec605e82562 DIST thunderbird-8.0-hu.xpi 418308 RMD160 d5c39902eb580bfe74cb0d9f8fd509= 27c52418b3 SHA1 47bd74822aafe1326d4a86bc998edafcec9bf45e SHA256 2ba9485a7= d3ed1fc7962f5776ab02856a7b6c847345b03fd54c6bb80e10a8e08 +DIST thunderbird-8.0-id.xpi 392824 RMD160 dcadd8a3480c88770da8189e37a39d= c656419b55 SHA1 564d1f8a6348def0d6ef21f10508dcd642606434 SHA256 a03a86b38= 8d79d15dc2ee09a99e11f492f9d11a6a72a75bc26896b09125a4604 DIST thunderbird-8.0-is.xpi 404491 RMD160 4b3f8f95b25bfcd49e1a58f90d0f11= 38a1134820 SHA1 88336dc416de62a1f021233fee8c66e9c88e07cc SHA256 60110ee7c= 61ccfeca0560a49eacb50423f73f183a964f58b74ae37d8e564443c DIST thunderbird-8.0-it.xpi 338611 RMD160 f5e5a492c30dcafa6d8858419dec3a= db2f551d88 SHA1 acdba9e5a105d855e18e244b73c7e6c348421e33 SHA256 61c243264= edee5bb95bc947b0732401f189b184863d2640128e00a19fac426b2 DIST thunderbird-8.0-ja.xpi 450381 RMD160 71cafc3ebe76704b22a976d446cecd= 0c82fdecb9 SHA1 40f500176e13716c2f74ddb620be3d3681a89751 SHA256 1ffc9c291= 893601172be91f50b25b651c18ea008def94b858a12147872da2ce9 @@ -28,19 +36,24 @@ DIST thunderbird-8.0-lt.xpi 527185 RMD160 eab4cf6c9db= a554aecd83647df27f79d217d99 DIST thunderbird-8.0-nb-NO.xpi 399860 RMD160 b959cdbe5e5e5e061c9e414f571= 9c76e4f0e9d80 SHA1 a37e40e894e4f1dfaf5b77555d533c000087a667 SHA256 83b800= ea6ddcf098f309a8e71f3de741973d0177c145be9b8bf896d23df5204d DIST thunderbird-8.0-nl.xpi 399870 RMD160 aa6068ebf5370de95b8118823b90e7= 6d08b820ae SHA1 d9b71812e16505867c3d64a48d91cf203a3c6ed8 SHA256 bce99a6e9= 5ae72bf6040d38c7fdfc5cd222b3362dd97e79e5af90f2e752adfcf DIST thunderbird-8.0-nn-NO.xpi 401462 RMD160 547fc9ea77a2e43c9c58f24f5c9= 299db9f793c50 SHA1 a91a42860fa6ab81e3ba381a2dd32bd16be8aa5a SHA256 7e93e1= e0ed7c6e942c6858b4e003be1e9a7180822a251436cc8349be1784d5f9 +DIST thunderbird-8.0-pa-IN.xpi 434683 RMD160 1b5f27a2f25e9af0404583e7a30= 47f49c25763e6 SHA1 ef1dccae1fb0c439aa48678827c84b0728389e6e SHA256 56c0e6= bd4e5cccbb486fadcf7cddd6b0a75acaddc07d319e9bf39e679b98f900 DIST thunderbird-8.0-patches-0.1.tar.xz 532 RMD160 4fd95b36f692fe6852eb6= 5fe8bb8052913132047 SHA1 61eb8c40ad4b31025cd21b096c00a45ab8483193 SHA256 = 7dfee7ee0289645a5de7e3132d16412cd93713188d86a0a1ff4570a25cbe92c4 DIST thunderbird-8.0-pl.xpi 386210 RMD160 9f393faab5504a98c876ac42fb6562= a5115fd270 SHA1 5aa92c952156673ef354a2763f59430622447221 SHA256 040b62774= df7f1e66b8af5d42031ac3bcd148c3646ee7815504aa2cc89322c4a DIST thunderbird-8.0-pt-BR.xpi 408964 RMD160 f53215aa67880eacea3108063b3= ec0d14895c202 SHA1 eed871c5b8af96bc7c36391d3796ae6feb7acaeb SHA256 669f7a= d7db9b02e8dd9e41be42cac56ff9a2826c971f656d17f0fee0a22bc397 DIST thunderbird-8.0-pt-PT.xpi 405968 RMD160 29121ec74b43cd321a94eb83f76= 1b091c4e272c2 SHA1 b2889c50eac0c0b583dd3f20e5d6d4f641f00397 SHA256 b2ff74= fa2f888b8e29ae158d55ded0ce7660498460930ff0697f17e6e481a91f +DIST thunderbird-8.0-rm.xpi 406577 RMD160 611076b8da1aaede20c05a50bbc708= d40bca8fdc SHA1 d6bf1db0ef2c5c2f0077933587dc50822f5be27e SHA256 0110cfd35= cd8354930ba5511ccde62539e75e69d31f4d428a20bd8aa113cfaef +DIST thunderbird-8.0-ro.xpi 430139 RMD160 9ed6a3c834d8c8d748f7d57d26129f= 0c2c2e0c51 SHA1 0c53963d16221bf0d609d3772994b14fdde2f4dc SHA256 57d2dfa73= 581629a305ea11fd98b7ff6e2ec971a1a031f635fad103104760084 DIST thunderbird-8.0-ru.xpi 400687 RMD160 8ad0c810a54131cc344edf662c34b2= 08f4e9c842 SHA1 823c97ed7a93c0c10c8cf2555ef4bb0556e0027a SHA256 a412dd6f6= 763972727007d76f837b5f1d8dd32ec35afc9490a3722437330dee6 DIST thunderbird-8.0-si.xpi 448334 RMD160 7340edc0cf0326213dc7832931779f= 186fa76eaf SHA1 c48cace01c7659a87dfcf9beb045728b958767fc SHA256 fce2b9533= 75d5b6fcf58d94bc4b676ae843103b5899fd3f5af5c5f7275e75631 DIST thunderbird-8.0-sk.xpi 416338 RMD160 573654a59aa83e083182b00b4c8160= 3d0ea5c83a SHA1 53b0146da50a8a5cbc3bbd9c4c3077c294e337af SHA256 e09edb347= 1eb06d3e21d85cbf2b889ccb041680150b28f43db2f46ae21ba6dff DIST thunderbird-8.0-sl.xpi 402625 RMD160 3da5c058d1953947b4fdb1f30371db= 296c3dc892 SHA1 34ac589a09b759507ef7a58e9e81d5a8fa367a66 SHA256 91c6151d3= c9c74ff937539c2c59a4f04f381403d72e43402a9466fffbdda5a71 DIST thunderbird-8.0-sq.xpi 351703 RMD160 9fe4bd4663d1c9eee57eb31feb98ff= 32e7e68f43 SHA1 775103b7eac89e52ad2600462146c20d16841da0 SHA256 f14b7ca5d= 4049ee6218fd6377759bd6cfc32d37d180204510737ad4814c56893 DIST thunderbird-8.0-sv-SE.xpi 470499 RMD160 edfe10d92fec7767b62782f34d0= 148a89608721c SHA1 4ecb7e9462fd43bb2665d6ed8dbdb6dc3d1fa0f2 SHA256 c7cc27= 527961c0435fa8bb1563fe04edee234188b0abe001e10159c48bda8a2b +DIST thunderbird-8.0-ta-LK.xpi 466437 RMD160 14e348e400a24d4e12679ce3b55= b2e4a127721e4 SHA1 a1fafc13181f41ba9b93854594807b3e5cf65b49 SHA256 a49d99= 9804b2925dc87b5fd990cbd373489b007bfd67a862ca1f775eb5448c04 DIST thunderbird-8.0-tr.xpi 405974 RMD160 4f80a26fc871135b850851bb06ddbd= 7b8de60574 SHA1 12c21c981fb65ee8c8d7a1720e567c1166da4177 SHA256 984f7bcae= 3a51a3dcbe83b2098037c43fe929d14713f8b0818c362122f507a2d DIST thunderbird-8.0-uk.xpi 456674 RMD160 95c1009e180d50940e8ecedc1d373c= 834c278bc1 SHA1 59cd3d8a0b47ba087d4493374bd6ba8b233758e8 SHA256 cdf663bdc= 0f85857cd41ead2c058abf01f6542089da94ada9f5a2bcf95214dbe +DIST thunderbird-8.0-vi.xpi 425968 RMD160 5412aefbf05179354fb4fa2f3865a5= 8b53552041 SHA1 561e797859bb118e54e50e24dbe826558900d96c SHA256 fa82a8f09= cc3adaa8e816c953bfef03a385e84662f886061d0a6712dfad576c0 DIST thunderbird-8.0-zh-CN.xpi 422519 RMD160 ef881e92de682aa3d807a53a7f5= 36f51e6740b94 SHA1 564f90305e0458f57cd27a876f90e8c12b5ade8f SHA256 bb46c2= b4d395488104528ac225f2c129e9c4ddb500e6f44082df549560013132 DIST thunderbird-8.0-zh-TW.xpi 423019 RMD160 3326d286df45aee39ea4dc9303c= 6e4459b41dba2 SHA1 a81c24ab001eb521a1b4e49da16c8f6914676641 SHA256 a6c78d= f16a242b1731709fdacae8fcfde630fe10469abfd6a696b46076e9059a DIST thunderbird-8.0.source.tar.bz2 89435206 RMD160 373420ec009a7f28f12a= 64a0d55e9d959573974e SHA1 18b77e44f1653eb3d59056870f535e3c373d99fd SHA256= f728bd2dbc04e6c3a096d79a9ee320740f53794a28be307da8655c8fd90f77f5 -EBUILD thunderbird-8.0.ebuild 9348 RMD160 24aad299b8837f592d3c31699f021c= ee2eafe090 SHA1 b2f41ddd0fa4de8751052d83f72f74e983db88b3 SHA256 827d41e04= a1bd439200e7fa729bb6ee75b395369324975342e54805c0bc88672 +EBUILD thunderbird-8.0.ebuild 9439 RMD160 df361bbc4060066a0028d6f8cd1841= 79c5b812ea SHA1 541c9ccf26b3d4f51319d79329f0122d06ce083e SHA256 90bcc7f30= 01fefa13ddc0ce22ddcf960dd49011f6fab9d61c585ee02bbed6406 diff --git a/mail-client/thunderbird/thunderbird-8.0.ebuild b/mail-client= /thunderbird/thunderbird-8.0.ebuild index d17616d..d2eaba4 100644 --- a/mail-client/thunderbird/thunderbird-8.0.ebuild +++ b/mail-client/thunderbird/thunderbird-8.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-5= .0.ebuild,v 1.4 2011/07/31 14:58:39 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-8= .0.ebuild,v 1.3 2011/11/13 17:13:47 polynomial-c Exp $ =20 EAPI=3D"3" WANT_AUTOCONF=3D"2.1" @@ -14,7 +14,7 @@ EMVER=3D"1.3.3" DESCRIPTION=3D"Thunderbird Mail Client" HOMEPAGE=3D"http://www.mozilla.com/en-US/thunderbird/" =20 -KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~= amd64-linux ~x86-linux" +KEYWORDS=3D"~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~= x86-linux" SLOT=3D"0" LICENSE=3D"|| ( MPL-1.1 GPL-2 LGPL-2.1 )" IUSE=3D"bindist gconf +crashreporter +crypt +ipc +lightning mozdom +webm= " @@ -28,25 +28,23 @@ SRC_URI=3D"${FTP_URI}/${TB_PV}/source/${TB_P}.source.= tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz" =20 if ! [[ ${PV} =3D~ alpha|beta ]]; then - # This list can be updated using get_langs.sh from the mozilla overlay - # Not supported yet bn-BD ro id be af el pa-IN bg - LANGS=3D"ar ca cs da de en en-GB en-US es-AR es-ES et eu fi fr \ - fy-NL ga-IE he hu is it ja ko lt nb-NO nl nn-NO pl pt-BR pt-PT ru si \ - sk sl sq sv-SE tr uk zh-TW zh-CN" - NOSHORTLANGS=3D"en-GB es-AR pt-BR zh-TW zh-CN" - - for X in ${LANGS} ; do - if [ "${X}" !=3D "en" ] && [ "${X}" !=3D "en-US" ]; then + # This list can be updated using scripts/get_langs.sh from the mozilla = overlay + LANGS=3D(ar be bg bn-BD br ca cs da de el en en-GB en-US es-AR es-ES et= eu fi + fr fy-NL ga-IE gd gl he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt= -BR + pt-PT rm ro ru si sk sl sq sv-SE ta-LK tr uk vi zh-CN zh-TW) + + for X in "${LANGS[@]}" ; do + # en and en_US are handled internally + if [[ ${X} !=3D en ]] && [[ ${X} !=3D en-US ]]; then SRC_URI=3D"${SRC_URI} - linguas_${X/-/_}? ( ${FTP_URI}/${TB_PV}/linux-i686/xpi/${X}.xpi -> $= {P}-${X}.xpi )" + linguas_${X/-/_}? ( ${FTP_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> $= {P}-${X}.xpi )" fi IUSE=3D"${IUSE} linguas_${X/-/_}" - # english is handled internally - if [ "${#X}" =3D=3D 5 ] && ! has ${X} ${NOSHORTLANGS}; then - if [ "${X}" !=3D "en-US" ]; then - SRC_URI=3D"${SRC_URI} - linguas_${X%%-*}? ( ${FTP_URI}/${TB_PV}/linux-i686/xpi/${X}.xpi -> = ${P}-${X}.xpi )" - fi + # Install all the specific locale xpis if there's no generic locale xp= i + # Example: there's no pt.xpi, so install all pt-*.xpi + if ! has ${X%%-*} "${LANGS[@]}"; then + SRC_URI=3D"${SRC_URI} + linguas_${X%%-*}? ( ${FTP_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> $= {P}-${X}.xpi )" IUSE=3D"${IUSE} linguas_${X%%-*}" fi done @@ -77,25 +75,31 @@ DEPEND=3D"${RDEPEND}" =20 S=3D"${WORKDIR}"/comm-release =20 +# TODO: Move all the linguas crap to an eclass linguas() { - local LANG SLANG - for LANG in ${LINGUAS}; do - if has ${LANG} en en_US; then - has en ${linguas} || linguas=3D"${linguas:+"${linguas} "}en" + # Generate the list of language packs called "linguas" + # This list is used to install the xpi language packs + local LINGUA + for LINGUA in ${LINGUAS}; do + if has ${LINGUA} en en_US; then + # For mozilla products, en and en_US are handled internally continue - elif has ${LANG} ${LANGS//-/_}; then - has ${LANG//_/-} ${linguas} || linguas=3D"${linguas:+"${linguas} "}${= LANG//_/-}" + # If this language is supported by ${P}, + elif has ${LINGUA} "${LANGS[@]//-/_}"; then + # Add the language to linguas, if it isn't already there + has ${LINGUA//_/-} "${linguas[@]}" || linguas+=3D(${LINGUA//_/-}) continue - elif [[ " ${LANGS} " =3D=3D *" ${LANG}-"* ]]; then - for X in ${LANGS}; do - if [[ "${X}" =3D=3D "${LANG}-"* ]] && \ - [[ " ${NOSHORTLANGS} " !=3D *" ${X} "* ]]; then - has ${X} ${linguas} || linguas=3D"${linguas:+"${linguas} "}${X}" + # For each short LINGUA that isn't in LANGS, + # add *all* long LANGS to the linguas list + elif ! has ${LINGUA%%-*} "${LANGS[@]}"; then + for LANG in "${LANGS[@]}"; do + if [[ ${LANG} =3D=3D ${LINGUA}-* ]]; then + has ${LANG} "${linguas[@]}" || linguas+=3D(${LANG}) continue 2 fi done fi - ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA" + ewarn "Sorry, but ${P} does not support the ${LINGUA} locale" done } =20 @@ -116,7 +120,6 @@ pkg_setup() { # Ensure we have enough disk space to compile CHECKREQS_DISK_BUILD=3D"4G" check-reqs_pkg_setup -=09 } =20 src_unpack() { @@ -124,13 +127,9 @@ src_unpack() { =20 if ! [[ ${PV} =3D~ alpha|beta ]]; then linguas - for X in ${linguas}; do - # FIXME: Add support for unpacking xpis to portage - [[ ${X} !=3D "en" ]] && xpi_unpack "${P}-${X}.xpi" + for X in "${linguas[@]}"; do + xpi_unpack "${P}-${X}.xpi" done - if [[ ${linguas} !=3D "" && ${linguas} !=3D "en" ]]; then - einfo "Selected language packs (first will be default): ${linguas}" - fi fi } =20 @@ -298,8 +297,8 @@ src_install() { =20 if ! [[ ${PV} =3D~ alpha|beta ]]; then linguas - for X in ${linguas}; do - [[ ${X} !=3D "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}" + for X in "${linguas[@]}"; do + xpi_install "${WORKDIR}/${P}-${X}" done fi =20