Port over linguas changes from firefox-6.0, and updated the language pack list

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

3 files changed, 73 insertions, 35 deletions

diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog
index e9360865f4c3..153aa149f45b 100644
--- a/mail-client/thunderbird/ChangeLog
+++ b/mail-client/thunderbird/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/thunderbird
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.87 2011/08/21 17:55:30 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.88 2011/08/21 18:31:32 nirbheek Exp $
+
+  21 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> thunderbird-6.0.ebuild:
+  Port over linguas changes from firefox-6.0, and updated the language pack
+  list
 
 *thunderbird-6.0 (21 Aug 2011)
 
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index a01e00f0c296..639905f8c938 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1001-xulrunner_fix_jemalloc_vs_aslr.patch 1936 RMD160 4edd9e5ab5082f86cb66ad1fc158e4c105f861ce SHA1 20df285bac8e0704559c0479f7dfe02f030afa8a SHA256 0beb08f2b3fc504897b1024caabcf2887b55fae31c021341c66d3491dc63e32b
 AUX 1002_fix-system-hunspell-dict-detections.patch 3466 RMD160 f8fa846e5d7c80a15d0abf0c6aedb7302ead1f83 SHA1 091febd913c09c86c9242b1be8960fb012ee7c8d SHA256 7ce51cae6bbd6655c8bc543365370627e37d2fc5aa7f7e1270671f7482df344a
 AUX 2000-thunderbird_gentoo_install_dirs.patch 813 RMD160 802697aab947df43693d7330f5d83700a62a6b50 SHA1 d2621bc80130239d7d65562ce8de8488dcbf60e2 SHA256 f663f3e59ac1752d681ed5d09bd599693009a65f603c89fa6d2e851b3487a8c4
@@ -114,10 +117,14 @@ DIST thunderbird-3.1.11-zh-TW.xpi 220607 RMD160 9d5e191913300c6919a951deeaea2959
 DIST thunderbird-3.1.11.source.tar.bz2 68716700 RMD160 d37f4b4c015df7ed24adc252ab99d10196e1799e SHA1 9d67fab73fee9ab815d69d419e89d410cb1558b8 SHA256 3e78284661b1be1d35753550b7a183d583d7ee68c8bac683283d3931f90fdd1a
 DIST thunderbird-5.0-patches-0.1.tar.bz2 2660 RMD160 6a09ee90ace5c19a99f1dcd8041adc62b7003976 SHA1 a52d2bc593bf5f905cb61a3279fe61aee2a14247 SHA256 89ac374408b4c8350cf09af5ce844ea1173546187018f588992a8ee48f339e36
 DIST thunderbird-6.0-ar.xpi 427494 RMD160 4532e9315bc6fe5793b80314b235f016035a4c2b SHA1 c8104bdcc654388ea744cf1d17a5e3df374d6936 SHA256 3a451c2f0d127a9d27b8a350b08e4e081ad355465f11340d20cc0e451e8b8a89
+DIST thunderbird-6.0-be.xpi 386317 RMD160 99ff0d78932a82f8e9c9bd1ebbcb0a09a193d4e3 SHA1 a3b18de8291ed8506e0eb3c59ccadd7e998591c1 SHA256 21f88f8e3c358c443bb2ce0680958864f0c66eba99baa8c28fdb8968820bc8fb
+DIST thunderbird-6.0-bn-BD.xpi 464527 RMD160 edf2e295b02e228a6f47fd0def697670914b1d6c SHA1 d6facc7fe373ab7cd370ba04411035149d7c06dc SHA256 d6d16cd89673c1ef3abab059a849b2a6678434cfd0f683b71ec8632fd29565ea
+DIST thunderbird-6.0-br.xpi 357402 RMD160 a15771cc7093e1bc9eabe219e7403c52a987f75d SHA1 80dab22293feb5767bfd12866c938eda982ea113 SHA256 d38de60d65bea16a779642a2232425d4d17bb4020c8ff2b42c210ce4a4127bd6
 DIST thunderbird-6.0-ca.xpi 408682 RMD160 a752d1fbf7129ab61babbca8a251c14e8b6b52d1 SHA1 0845c857e5d78a278eb19ef923bfe303f669c1f8 SHA256 9fc006759723c597b6263ba57b84cf295008ebb84bf77c11c16bb585bd2f1b2e
 DIST thunderbird-6.0-cs.xpi 409069 RMD160 e0257d9638ccaeed152242d24b7e777a0a4ce8c2 SHA1 a96ab64f254d0ee83688312be451236c35dc79a6 SHA256 8251b8f6968ff6c4a085fbc49ad771ec560f6c380477da70d7a05e9076149d1f
 DIST thunderbird-6.0-da.xpi 351543 RMD160 f114e5206e585422b8f901fc67faafad245ad08b SHA1 d0b052f76a7de05bca3c038a3ee884d39f7a487b SHA256 c5146a29b714fb9ce0f6b1ee026c17875219b2e65aec3142764f0ee0c36e2bc6
 DIST thunderbird-6.0-de.xpi 407453 RMD160 e8bc6bb0e952db8668b2eff81b6e5e32fdcf8637 SHA1 6467cb81334a88a8e8c71b6d52dc1fe64c446843 SHA256 4e37fdc9e08acdd8c89e896db7d1bcfb0adcd50d95e96723beda486c26c6f6ca
+DIST thunderbird-6.0-el.xpi 393401 RMD160 8071642c45a5ff77e48707cbd84a9db74f99d272 SHA1 3d9a036696e989184c684ec46258adf2271db10a SHA256 d7033c14788c08775e32467d1cf82d727cb99bd92aeedd43a1b3ae7c8c3b9f4a
 DIST thunderbird-6.0-en-GB.xpi 382371 RMD160 9ad2eded77c080e18fee100f1ef4b98be367dd1b SHA1 c1bf054b086dfcb6d241bb617579db64eb4edd91 SHA256 0caf4a881992c2d96a37398bc0be126133a2f0a297b9955293bc362885c23889
 DIST thunderbird-6.0-es-AR.xpi 400278 RMD160 70e8372159f140bec712792bc097d0956085ed14 SHA1 936d8671058548fca4bcee3db40dcd6c84a8d8fa SHA256 9042e7533f8d3e86f586907581c2d22710848fe46c26cccfa667a4f2963d35e6
 DIST thunderbird-6.0-es-ES.xpi 344500 RMD160 c6d5c990010f559d8ca2f15ea1520d834a70b3bf SHA1 90671a883dc3b058133a94dae9f46c8c0fcb61df SHA256 97fa112a00644fd8b0ae94fc4638501855876e8270aa14ee739191935d3fa801
@@ -127,8 +134,11 @@ DIST thunderbird-6.0-fi.xpi 401789 RMD160 6c6dac856190d5441b079853cc0c40d689f135
 DIST thunderbird-6.0-fr.xpi 404210 RMD160 dd91f9af4c1dd8abdf07d3a4c209c0caa363f85c SHA1 9455f7636970cf730d17e0859dd21c2cbc81797d SHA256 d357085563e0edd71241a09ad3d7c63c0737ae3e70cf07692884ae176a648378
 DIST thunderbird-6.0-fy-NL.xpi 404129 RMD160 d6d8e19e194cff2e768b0ca38742d364577e5d22 SHA1 ebadc1b566eab17fe22337abc2e5fc7e5494de26 SHA256 d9cab2a49a76da9d421b6969c6f3abf565bd37340c0a69a396a8f6e515db1837
 DIST thunderbird-6.0-ga-IE.xpi 412669 RMD160 cfd5bee0afe85faf5bf372fd05ab2e02443dad70 SHA1 bb81d7c5dd14ab8a5457c23bdb9b16ca0f27e173 SHA256 9e2d5dd92cf1dec950f791e2dfb396da860ca5e666d31b972e6e02613f2c279b
+DIST thunderbird-6.0-gd.xpi 415265 RMD160 dd2f15334075700d1d37736ce24ce8a34e5e9452 SHA1 84a1ff9eadb1171370fc24381716cae846fd27fe SHA256 d86e05f537b4746ab655e4161ad1a18d5558645b9b95dc891db713cd21aa8dc2
+DIST thunderbird-6.0-gl.xpi 399351 RMD160 da0cbc5b102e2414d719bebaf9ea4a7136c33021 SHA1 87568de0ef2971243c61e5906cc4091d6b7591b7 SHA256 c3faac2259d7396f34b71f05627dd6e8d62abd617200aae892a26b1d9c4d7742
 DIST thunderbird-6.0-he.xpi 415986 RMD160 4dfe258f23e9afbebd8083730a3e0394167375e2 SHA1 1f6d423ef3fad4a2a6ca96b56f5ccf1662bfcc96 SHA256 f330351e4f2810da09d08a8332529337484b04512c87e69b70ea815636e423ed
 DIST thunderbird-6.0-hu.xpi 416271 RMD160 85329b820e94f42a0ebb65f606cf20736413e787 SHA1 97b1dfbf3d14a3841df20649f89a9a3d5d767e54 SHA256 6e5aec41df3d9fcbb7671d5ed0264be96d8a3f3c5d3a18f2cc4db0059fc1d742
+DIST thunderbird-6.0-id.xpi 390926 RMD160 aa7b4886829c655d114ebf60095324c7eeb5a47c SHA1 8d7cdf7cfa5866eefe79b8eeb3110276df1414a4 SHA256 747d9b4b13d180453890cc15e54e4b5816fbd0264d26428569dc7e8fdce30897
 DIST thunderbird-6.0-is.xpi 402535 RMD160 2da7bed1da4d92ec2c24154c9a708b16eca30bf3 SHA1 bbe5ea4b784964049838c3b0d29551559e501263 SHA256 05afdf13888edef7fa6e95ac5b088e6828b1ca7d196cced5f13f79090dbd49f5
 DIST thunderbird-6.0-it.xpi 336843 RMD160 3ded50e7419ee492f4a7dcdb7ebddc7e17b8514c SHA1 ef1a21292fb570fab3df0dc308ff991508fe7e51 SHA256 e301f259468f0d2f42813fade0942be0d8968db71aaecf89de59be8ec06d6431
 DIST thunderbird-6.0-ja.xpi 448030 RMD160 7c8a225e77aa0b21ec64638499652cea316941d6 SHA1 34df3a16b883e5e1d465bfe4a8ea22e2cc93d638 SHA256 1c44d010f91bc71584f4b1551cc6f042f2f54eb23627b733747f346594017330
@@ -140,18 +150,36 @@ DIST thunderbird-6.0-nn-NO.xpi 399482 RMD160 476753b8f96a6405fd4190407c49e7dfadc
 DIST thunderbird-6.0-pl.xpi 384740 RMD160 3ba3f5e32b6c02746ff3c0215647616ffc7ec75e SHA1 e555588ddaba5c3c36b814b029088c95ab0dac66 SHA256 abffe09ca4f72c19d17e6dcbd1d9c2b64bf77170e1c54153a45b2dadb7159250
 DIST thunderbird-6.0-pt-BR.xpi 406991 RMD160 6ac65ea049545b492911fb05067fc81086298c18 SHA1 dbf86f56f3a39f333ef56b2ae5d7e77da503fb90 SHA256 3fa4331317435d3cb4376f79dcef4c0af4c820221ac03a456111ce92db17b9c8
 DIST thunderbird-6.0-pt-PT.xpi 403984 RMD160 e7498d36330ee4f9b426c169269ffaf703070de1 SHA1 b12c245b4100358c6f5cfcc5796e450038a222a9 SHA256 60d724aed7550840d7dfcc7de405117b704f7fdfbec8a34f2ff7999b8569a039
+DIST thunderbird-6.0-rm.xpi 404561 RMD160 546d3470094c9b08b2b89f08523980366ca8e65f SHA1 94d65a592ed908843a4e112fd3a87de73d151292 SHA256 754aba44bfe48932f30a192d3f7296b8dc8901adda66df5813e0c73dea4f8b54
 DIST thunderbird-6.0-ru.xpi 398962 RMD160 2b1b01d1b60347b0cc66543c54ec806d1aff49de SHA1 73be3f0b48111aa6f188fbfffe4351a5cf970fc8 SHA256 b0fc8d5d7ff89f1ccc9d662da7e9a3120900e50003a2281f056abfce3708903e
 DIST thunderbird-6.0-si.xpi 446393 RMD160 de92990ba0117bbc5dbec09595047b1ecc4b2c94 SHA1 489d90f5495757cb22223c94b64333287bc696c3 SHA256 f9618dcd779b0a6d3f33d77777e400acf547237ae14269150764df259fb9045a
 DIST thunderbird-6.0-sk.xpi 414265 RMD160 1d3a5c567ae1c047697af0940d1e37306260a580 SHA1 48d05fff22c1864adae2e5f7d5e613511ef6bb1a SHA256 1f18758211c456335ee335b135c4ad06a20ed734d2abe6541caac589395337ad
 DIST thunderbird-6.0-sl.xpi 400275 RMD160 3eb120d378d87c4f597fd01265a653986434627b SHA1 3ace222f610930541a864e575960a983fa820ee6 SHA256 4fc68f3a7f5b15c4e3314c81ad2945be0881d32da94aa9b118c4911031353ed1
 DIST thunderbird-6.0-sq.xpi 348955 RMD160 e329886e3e9778125da4dd6f7d3b0c32f7d189c1 SHA1 6294e733d7eed976d7e1439a29f249d2eb10244e SHA256 e7ef33b2802aa983e3985f6162490f7be6a0ca32d82d2540ea71cbc80102d0b0
 DIST thunderbird-6.0-sv-SE.xpi 468587 RMD160 63139d49daa44d05036f7bcb657beab5c3d6051e SHA1 7c94cda659c110027af6e8e37653d7c54f15c01e SHA256 6d5b5c1a48c6a2d5918f534800777ddf5e61b5b81374ccc3bb2cc09fc75a2c52
+DIST thunderbird-6.0-ta-LK.xpi 463618 RMD160 8d44ca9b451d034cde2bc52bc0a66bb6f9a851f2 SHA1 9bee4431eb5f2461d1fcacd61fb9c83b0f3a930f SHA256 6614445d8c29a4287469dc781d62630f580e240b0156931d8f32f886effa1963
 DIST thunderbird-6.0-tr.xpi 403273 RMD160 0a1bbbae82a0378016d0dd6185d604b5b608da15 SHA1 5d44b1a3e50015e5a92f672aac6882025b61af99 SHA256 595b22151201dc4b9d08a0321530c1f1f2494d5b6edb5527cd56648b245f1493
 DIST thunderbird-6.0-uk.xpi 452775 RMD160 f1915e4ae3fa8f667540dde3d31c3e36749c0b57 SHA1 54e21c3baff6bf833d18df047cc849d2b9258c65 SHA256 a7030f7f6aa9d52b4a39c344ef1d5aeae9114dca9590e2eabf24b3c2849601ec
-DIST thunderbird-6.0-zh-TW.xpi 420983 RMD160 739aaf7ce018f0bcf938436d324ab75f4559869e SHA1 462357caafdcd7dcea824d3d2958e545a9101422 SHA256 5c07cc4f35a827e9b533888cdfb482b44f8cebd2a079b5b370ce656e8ecc8de0
 DIST thunderbird-6.0.source.tar.bz2 86286245 RMD160 758a274ec2b12aba52574922cd9526fd3596a505 SHA1 7a9ea62aa11522230327574b245a2f793015b5f4 SHA256 3c56af448ebd4805c7997d8e0e41f4333d110ad2c4ad4873204bd4d68bbd8189
 EBUILD thunderbird-3.1.10.ebuild 8099 RMD160 9e2ec0d45a430372381aa16c73310f71828de468 SHA1 ad55471c15be6a3654547885ef52451b75b1ec4f SHA256 ea88b5e990a738390f05e098868dada49b8d77d120f27320b0f403770121d039
 EBUILD thunderbird-3.1.11.ebuild 8110 RMD160 9169e25659f945d5bd85f00e04e868a0a2492b80 SHA1 8b007af3541a8f566e5b4d58632adfee1ba380ca SHA256 b1f28e28a42c70b0516d928b8bbe43bb67547639abb898199532ff037386442b
-EBUILD thunderbird-6.0.ebuild 8421 RMD160 e2657c4ae3b89cd72d256f2fb351cdccd1b1df4a SHA1 5d865aa00a7665872137431962e037d2524d03a7 SHA256 822fb79a9746ef91645c9825d1059694299fdb9a9d3ba8153a71edf93b028839
-MISC ChangeLog 64114 RMD160 e4e92e08e7d48b0b71b911ff64fd46acdfd5be6f SHA1 565d30019ac0984e1dce004ed6880c6a28cde45e SHA256 77173c3f4ef118feeceac3633ee57e30dd2008efb7d99aca6fe8f9955d4e7ec3
+EBUILD thunderbird-6.0.ebuild 8724 RMD160 f5c092062f1bc5458c3f1a6355838430adfc1ae0 SHA1 85b84f29215f8a9bd731d787563737355c8d3e00 SHA256 3e7064ef591c9ceaea78dfc2c2a7361affa8c1b99642bedff789e960543ed8ab
+MISC ChangeLog 64277 RMD160 11e19dd9f89e9ce48968fe9b528c371ff0e7db6a SHA1 c4017f403bf07922ada8f1e4244ae4347e73d8fa SHA256 b43fa426272d62912e3194c08d236ff00ef5791f0656586b0b85118a8d0c5d44
 MISC metadata.xml 732 RMD160 87468b1b9c1c1ec539c026f04e05265a4dc32cdd SHA1 283661cc3d68f2f7c2a3b82455692f7239bed63b SHA256 3b0e7f6f49598b82aaeee92a5f96f99877713866fbbb73c797bfa65f2c0b4d75
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJOUU8MAAoJEO/kOhxWD91kELsQAJha3BdSwfOApIJb9vsz0klx
+qnypbYOVgNuNmTQqCz7aEWGMr5Q+JL8WzJzoXuLDEY1sP8FsNNSkF30nby4e1NuW
+GCDL+uwW8FSfrqJ4gMqEUmrhf1Sh/aBT7poIIqtOeodqNJeqACFqGIizDZs7Vi/w
+eLLiD1xg4pX5GudHIWvjcOItBOhisAJGa8shUmNgxvyoGJEgPBmVPszd2ydFEMz4
+bTWpcR8Y5qGBex1p6WLMRIxmxGcQOcczBfQeEH6teqGwHKDud8WYm0xQHuaFpTDr
+FjImaOhZPOFa731r+YG1pwPMoN04UsvBGuzcB55tYQYYrUkQ+NSBDH3R6bEJDJ68
+a7AzLGOvRw0HmdbBmXKPiLoES1KOIBzUJnrd/G2wZIj2nZjzkiyGHUeI5+rxF4XB
+QLFf3UN7Wx48fyY1UhpJixO1hjiQudceWlPEOUJgOfgPHfe+c93pI5tZA9UfVqVQ
+jNie6uEjdSRCaS3Rt+KJrGlEw6f1f8FJcAAwcl+cCikTl9ila84wmo/CohxZTxsi
+GmOcrUx4b6rH2sd53hVbygQ5wSgfijlRieVRnNN7ZvODocK2DHA210Y6HHB9GSZZ
+YI/8E2fL7cCsGfw1TVYT0z4ly+81fxvYgrjq0bUYB6eHrMkyqYbqkMOQnpniflEo
+NdLftTjOsTdBfeXXjT6d
+=bDOD
+-----END PGP SIGNATURE-----
diff --git a/mail-client/thunderbird/thunderbird-6.0.ebuild b/mail-client/thunderbird/thunderbird-6.0.ebuild
index 05d979ce8975..b9dd20c0f117 100644
--- a/mail-client/thunderbird/thunderbird-6.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-6.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-6.0.ebuild,v 1.1 2011/08/21 17:55:30 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-6.0.ebuild,v 1.2 2011/08/21 18:31:32 nirbheek Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -28,23 +28,22 @@ SRC_URI="${FTP_URI}/${TB_PV}/source/${TB_P}.source.tar.bz2
 if ! [[ ${PV} =~ alpha|beta ]]; then
 	# This list can be updated using get_langs.sh from the mozilla overlay
 	# Not supported yet bn-BD ro id zh-CN be af el pa-IN bg
-	LANGS="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"
-	NOSHORTLANGS="en-GB es-AR pt-BR zh-TW"
+	LANGS=(ar be 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 pl pt-BR pt-PT rm
+	ru si sk sl sq sv-SE ta-LK tr uk)
 
-	for X in ${LANGS} ; do
-		if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
+	for X in "${LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${X} != en ]] && [[ ${X} != en-US ]]; then
 			SRC_URI="${SRC_URI}
 				linguas_${X/-/_}? ( ${FTP_URI}/${TB_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
 		fi
 		IUSE="${IUSE} linguas_${X/-/_}"
-		# english is handled internally
-		if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
-			if [ "${X}" != "en-US" ]; then
-				SRC_URI="${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 xpi
+		# Example: there's no pt.xpi, so install all pt-*.xpi
+		if ! has ${X%%-*} "${LANGS[@]}"; then
+			SRC_URI="${SRC_URI}
+				linguas_${X%%-*}? ( ${FTP_URI}/${TB_PV}/linux-i686/xpi/${X}.xpi -> ${P}-${X}.xpi )"
 			IUSE="${IUSE} linguas_${X%%-*}"
 		fi
 	done
@@ -72,28 +71,35 @@ DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"/comm-release
 
+# 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="${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="${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+=(${LINGUA//_/-})
 			continue
-		elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
-			for X in ${LANGS}; do
-				if [[ "${X}" == "${LANG}-"* ]] && \
-					[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
-					has ${X} ${linguas} || linguas="${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} == ${LINGUA}-* ]]; then
+					has ${LANG} "${linguas[@]}" || linguas+=(${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
 }
 
+
 pkg_setup() {
 	moz_pkgsetup
 
@@ -110,12 +116,12 @@ src_unpack() {
 
 	if ! [[ ${PV} =~ alpha|beta ]]; then
 		linguas
-		for X in ${linguas}; do
+		for X in "${linguas[@]}"; do
 			# FIXME: Add support for unpacking xpis to portage
-			[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
+			xpi_unpack "${P}-${X}.xpi"
 		done
-		if [[ ${linguas} != "" && ${linguas} != "en" ]]; then
-			einfo "Selected language packs (first will be default): ${linguas}"
+		if [[ "${linguas[*]}" != "" ]]; then
+			einfo "Selected language packs (first will be default): ${linguas[*]}"
 		fi
 	fi
 }
@@ -259,8 +265,8 @@ src_install() {
 
 	if ! [[ ${PV} =~ alpha|beta ]]; then
 		linguas
-		for X in ${linguas}; do
-			[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
+		for X in "${linguas[@]}"; do
+			xpi_install "${WORKDIR}/${P}-${X}"
 		done
 	fi