Port tbd-bin to the new mozlinguas.eclass

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

3 files changed, 57 insertions, 72 deletions

diff --git a/mail-client/thunderbird-bin/ChangeLog b/mail-client/thunderbird-bin/ChangeLog
index 1d1b015b1188..f8697a4f7ea4 100644
--- a/mail-client/thunderbird-bin/ChangeLog
+++ b/mail-client/thunderbird-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/thunderbird-bin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/ChangeLog,v 1.51 2012/01/31 20:35:16 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/ChangeLog,v 1.52 2012/02/04 18:35:28 nirbheek Exp $
+
+  04 Feb 2012; Nirbheek Chauhan <nirbheek@gentoo.org>
+  thunderbird-bin-10.0.ebuild:
+  Port tbd-bin to the new mozlinguas.eclass
 
 *thunderbird-bin-10.0 (31 Jan 2012)
 
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index de8ec5ec3f8b..096a3e681dff 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -1,9 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 10thunderbird-bin 36 RMD160 a1b06f9b7f2833c253a71a99a3e6e0521487a813 SHA1 ea9ab715ceef5c61d75ae14e15ef52d61f5cbaa8 SHA256 6e49ce8f02cd128d353625d04c74103ae83c25baf41c76323c61465acb6ca116
 AUX icon/thunderbird-bin-icon.png 6499 RMD160 1aeece7719c1c1629b98fc11870641769681a048 SHA1 651d244e96fa0edf13f68f5ef9047432eb6ed3bf SHA256 ff9749e42b82b80425bb52883d63baa53298af7be98870ee6b73f0a6cf0ab22d
 AUX icon/thunderbird-bin.desktop 229 RMD160 050b70c065e4c07dc8a215a8e1efeae00ca8ee82 SHA1 4f6f829c7f5d5fd6b0d4b3b0bf4915b63a80a3da SHA256 dc8084e9de919c2cc9a3d86da0248c007a2183e07f50fbc8646940d711e9391c
 AUX thunderbird-gentoo-default-prefs.js 404 RMD160 b1e25cb473be88add84548093a9112762f7ea852 SHA1 defabe8badaf5c6d8d1df789ee4de3a946a5e06c SHA256 cf676a8454d625e9cb4bd908adc51c0452cf50ae90edcf555dc3a1bbfc59e4a8
 DIST libnotify.so.1.bz2 11228 RMD160 459dd9f8de3a4a421348c3ad0e793e868a09c228 SHA1 6b6aeff3e4a55b09d6791c2c9cde767a0659efae SHA256 fa0082cf266108da8ef9ef366de1ac044d2df5d4799e359f009c5a5c58f38395
 DIST thunderbird-10.0-ar.xpi 441461 RMD160 34ce98e7bc66d1bc0e5944d278e992b6d7618f91 SHA1 20705daadb85d32669430beefb188f1bf0bb025c SHA256 d965e230142815f65e428b95426321a6b2e87c9a543653c45c869d613414b4af
+DIST thunderbird-10.0-ast.xpi 362705 RMD160 a299705501a957500492f996cde6fd96a86f6718 SHA1 964b3ad063b3440674a2295c25764cdbc43c0d4d SHA256 f3bf10f410020fd4c5131bb93db111826a2de0216135718085dfe9ea4cf74845
 DIST thunderbird-10.0-be.xpi 397803 RMD160 ef82ec8c8d0ce54daf534884848a646e900be46f SHA1 558f5f763d895d3b2583e7eac3fccd88fbc46ce1 SHA256 4fd62963d23d6cedb0862c34fa0fe899d2e8941e7c2593583fa494759489f017
 DIST thunderbird-10.0-bg.xpi 460809 RMD160 082ab98a11b5f39c7dc5ab771d3091d73b1d0c4d SHA1 5db17a275d1fa53eb0f4af976117820831d49b1b SHA256 202d5d66cfbc4c5d4289411ce54f8b533862f19bbfe0f0d144ab16b5cf33f66d
 DIST thunderbird-10.0-bn-BD.xpi 478142 RMD160 1ad08ff7c4481002befc98dea97d6a775d4ead34 SHA1 fdf5f3ac3c212bc46b4210ae1f1d8513af92aff7 SHA256 f35ee85b8b3ed9ad3a279edf4d07397f8bfe2956a2a3922bce019ab3952cf9a9
@@ -46,6 +50,7 @@ DIST thunderbird-10.0-si.xpi 456603 RMD160 9008eaeff7c6206fbbeda33b5fe06ce5262a2
 DIST thunderbird-10.0-sk.xpi 425025 RMD160 e6875f826ca43b7a630095703a9a6fb5d82085d8 SHA1 8c4d68146094f549bbd14d3adf608d4b14b5bf6c SHA256 245a01e3d8cc97ec4ef1bb5c0604bbdc41ffee4ee1f95eadfc8408a6c728fd85
 DIST thunderbird-10.0-sl.xpi 410427 RMD160 24aa7e2a50ffd15e8ae1f7ac4bdf407aab54384e SHA1 173f9a7f48e63b186799b11e82e28da8486a6523 SHA256 082d923807e4057990d4f4358d09bc8378a9e96ae2b316e618e8a48170f2b56f
 DIST thunderbird-10.0-sq.xpi 360474 RMD160 2523025391558bd4db83f6df00e3b5d7e42d4100 SHA1 9649281314470648da41274b90d5a2249e8df97a SHA256 6c6856b5abae07ebde28ad203f1f6021883762556b4b7ca5943cc3076da3fe3c
+DIST thunderbird-10.0-sr.xpi 460272 RMD160 6e05c0cd483690f174ef65e3f30c807ae20648f8 SHA1 77f6a952c1e2599b9161dcd94349f9f3d6ae28e6 SHA256 adc01a6d1d6a13400e2a9e5bb77996cbabb3af8a90ae22fa4c974bb09f6e6fe2
 DIST thunderbird-10.0-sv-SE.xpi 478277 RMD160 95b9b9cdc26c692b0e2b24e2ba8f7d9fc57c10d4 SHA1 e18078114c1fe7c969800cc9c1fecd681cecff15 SHA256 04becec85d19adad59c3f4fff04935a364cbe76739053d9fdaeb7d1874bc4824
 DIST thunderbird-10.0-ta-LK.xpi 475714 RMD160 d39230b0721a297b148b057e1214d66acb1268d8 SHA1 25bfa6fcdd210caf07b9106172ad702655b4bc77 SHA256 d35ecb88e7563907854878f7685dec3f2cb66ef6fa94a1325c149e161ddc682c
 DIST thunderbird-10.0-tr.xpi 418205 RMD160 7aed1bc9107519b2a43d8e6017d24d2d82cdcf32 SHA1 692ca282be586f72d36f58fa060a3d3a4b93e662 SHA256 ea14dc15f8c0ca2ce9ade00a83d5c49b3a19f1e93617a95e81bb5f7df82bb98f
@@ -255,10 +260,27 @@ DIST thunderbird-bin_i686-9.0.1.tar.bz2 18995445 RMD160 46370c2e124fa71671a13748
 DIST thunderbird-bin_x86_64-10.0.tar.bz2 21417018 RMD160 3a51a39f5daf88a2fd2048f2dc7ab56d04e4415c SHA1 dbf2087598429dfa9002a296f1030e62b0cdf651 SHA256 41cc69e60ae3e022052aeeba1b670f09b8b5ff48d5114fe876817ccd1ac834f7
 DIST thunderbird-bin_x86_64-8.0.tar.bz2 20886942 RMD160 c271c3021d9ccc246be21d519930ed444672ec32 SHA1 c2f2fd60386eefe6abd56a46d10ee5faa47cd219 SHA256 c921b31ecef27cdb9c526824f728c47d20bfe4cf8af529bc16ceaedd94585761
 DIST thunderbird-bin_x86_64-9.0.1.tar.bz2 22025281 RMD160 74ad4c1acf68aedb91e0e3be6fba80360a5c2558 SHA1 0e18402491a4c112fec633c6427db4a4b5ef9ec5 SHA256 536ab6fbdad0ff3bde2c9406b718888c3128f8def8d8d8c1f395a44611d849e8
-EBUILD thunderbird-bin-10.0.ebuild 4274 RMD160 0d3f95135f1581a6c2fe79b09761ccd7f9f05c8f SHA1 43dab1b1ad0d93abaccce64276b0de7ee8d3d608 SHA256 e4f55152ce1bc08231ec7faaf0a893d41487b2a116413485da5ea5a185b6227c
+EBUILD thunderbird-bin-10.0.ebuild 2944 RMD160 6ce1a78353389aa451492cedc884c6368be4569f SHA1 ad9b095afe67a5c3acda170e710dc14b36ff6a4a SHA256 85d2e165c448fb99a8407ae880f007d805409f9a7d52cbe00df71a20d013297f
 EBUILD thunderbird-bin-3.1.12.ebuild 4847 RMD160 8ba9f37aa11d9875793bec7895c5decebb3d5510 SHA1 e76357f1bf5039a7cedb481f94bbc7d305c5398c SHA256 b36b78fd249880313848b77eb9f14f40f3e25fa041dbae34c0555668dcbef5d9
 EBUILD thunderbird-bin-3.1.16.ebuild 4859 RMD160 df542ba9a85cbeab45a808a166a4d969e9c7412b SHA1 c53b8b2347111d4be49902c8e71570b3f08babc3 SHA256 f8ac78482629c42b67345b66b4513d6d500f661d40952ea4664af676969477c7
 EBUILD thunderbird-bin-8.0.ebuild 3960 RMD160 853ac38974b8d083c7e75f2311be758726bfd8d7 SHA1 c113babe876b6df31b0ff08712b04b6fed38603a SHA256 3b7c5a05a6a09f6a1e57707ebc61b75aec4a46315d7c52d462cff396dd86a559
 EBUILD thunderbird-bin-9.0.1.ebuild 4180 RMD160 0e653ef2a595d8f9d30683ef0a4da348e2ea4a07 SHA1 d6dd9b8491d34547316f7bdfdc79375a2b257945 SHA256 cd0d2183da48d8aac0d56a7ace114a48b296f4e7868029c383a8a965ac3dd02d
-MISC ChangeLog 33958 RMD160 9ef9b3530c72f040417a9a957351ac8c2fbe8cfa SHA1 b1995aea23b42365ab04b3a6868dbf8dc7e5f5af SHA256 11a0f91ddcd89e0fbfe6900f40c3fa79a12d5200af56773ca25f6ea83352d348
+MISC ChangeLog 34090 RMD160 5b05687def34867edd68917729d0cfcedbe27788 SHA1 c09a1cdc639b3b4b32d357b6f2e7c545533d7230 SHA256 b366500bbc1df86d6824dbad4b6568c33e41d1044951de1ac191f7bb50fa35e6
 MISC metadata.xml 239 RMD160 1ae864a1acabe6bbce1c44a39d0ea55e04ccfaa7 SHA1 2760f4017fb87bfec958b0472cd86151bb3c3ab3 SHA256 7dc1b4cbb0d49bbe877f0978fc8cd278614f95982a4375336dfb5b72e866efd0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPLXqBAAoJEO/kOhxWD91kGzQQAKKzd5ULFX7lQGQz7ggfsrZo
+jrimYal5AtqFyXkbRoxKZXQsWHVWY+O6tVqVjJiypaSsMyJAS7EsRBb/0Y/L9k0d
+bBXvx2lE4+J9CCMcCW3T8kK+3Mdm9ja6TwXKr9HWDmqQUAgdlH0hGMei9XImoN1V
+tQVRLVhdDwRVG3p9UZ/PX1I7isSBcRMNPLIyE6C63oXOUpon5FS01p4SkifWTIEU
+514DTuUY/vNF9EvYz26mKXIi3rfmT00xnfQaPn7QF0UKGzsB0O+vRB2dHtoGyOqW
+vHYA/5Y7rYrNj5cpD6+9JDFzPBEbCwrm0QD5y/Jp/tNtvKnI+syDzAV7PXWzTk+s
+v/edxFYJa81e6E7XKZ3cpCA2YL62z14pYd1Ore4fApKRF/zBeOXCR7vQtVSE4egV
+WgCUHOK87bUTVT8lWjIyuzKe1snLAFwahTrb/kI8IoKNbE3LhygE2venVST5FiFi
+UljlxRuwNANU1aMtqyOmJpAxjQZ4EpABuymUhz7JZti6yQ3nFrfBkjL7tfxiyGtO
+8FKU/sGphf1afUM0R0afQygAdwoeftNmUFMEBlijLrOKnBGz1ABMM6giHTekMG9V
+Cf8b3Jd/eWuyiP3tpNSoTsEJT32uEF2dAsGisLFNUGh8okcQg5ozBrAYfRAf4sZs
+okQes7nT3LW5P5Aq92uN
+=yUqc
+-----END PGP SIGNATURE-----
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-10.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-10.0.ebuild
index bda670be9a4a..a0895541ba20 100644
--- a/mail-client/thunderbird-bin/thunderbird-bin-10.0.ebuild
+++ b/mail-client/thunderbird-bin/thunderbird-bin-10.0.ebuild
@@ -1,27 +1,34 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-10.0.ebuild,v 1.1 2012/01/31 20:35:16 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-10.0.ebuild,v 1.2 2012/02/04 18:35:28 nirbheek Exp $
 
 EAPI="3"
 
-inherit eutils multilib mozextension pax-utils fdo-mime gnome2-utils nsplugins
-
 # Can be updated using scripts/get_langs.sh from mozilla overlay
-LANGS=(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)
+MOZ_LANGS=(ar ast 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 sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
+
+# Convert the ebuild version to the upstream mozilla version, used by
+MOZ_PN="${PN/-bin}"
+MOZ_PV="${PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+# Upstream fail...
+MY_TEN_PV="10.0-real"
+MOZ_LANGPACK_PREFIX="${MY_TEN_PV}/linux-i686/xpi/"
 
-MY_PN="${PN/-bin}"
-MY_PV="${PV/_beta/b}"
-# This is a ugly hack, but what can ya do?
-MY_TEN_PV="${MY_PV/10.0/10.0-real}"
-MY_P="${MY_PN}-${MY_PV}"
+# Upstream ftp release URI that's used by mozlinguas.eclass
+# We don't use the http mirror because it deletes old tarballs.
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+
+inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas
 
 DESCRIPTION="Thunderbird Mail Client"
-FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MY_PN}/releases/"
-SRC_URI="
-	amd64? ( ${FTP_URI}/${MY_TEN_PV}/linux-x86_64/en-US/${MY_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${FTP_URI}/${MY_TEN_PV}/linux-i686/en-US/${MY_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+SRC_URI="${SRC_URI}
+	amd64? ( ${MOZ_FTP_URI}/${MY_TEN_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_FTP_URI}/${MY_TEN_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
 HOMEPAGE="http://www.mozilla.com/thunderbird"
 RESTRICT="strip"
 
@@ -30,22 +37,6 @@ SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 IUSE="+crashreporter"
 
-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}/${MY_TEN_PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin}-${X}.xpi )"
-	fi
-	IUSE="${IUSE} linguas_${X/-/_}"
-	# 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}/${MY_TEN_PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin}-${X}.xpi )"
-		IUSE="${IUSE} linguas_${X%%-*}"
-	fi
-done
-
 DEPEND="app-arch/unzip"
 RDEPEND="x11-libs/libXrender
 	x11-libs/libXt
@@ -54,56 +45,24 @@ RDEPEND="x11-libs/libXrender
 	>=media-libs/alsa-lib-1.0.16
 	crashreporter? ( net-misc/curl ) "
 
-S="${WORKDIR}/${MY_PN}"
-
-# TODO: Move all the linguas crap to an eclass
-linguas() {
-	# 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
-		# 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
-		# 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 ${P} does not support the ${LINGUA} locale"
-	done
-}
+S="${WORKDIR}/${MOZ_PN}"
 
 src_unpack() {
 	unpack ${A}
 
-	linguas
-	for X in "${linguas[@]}"; do
-		xpi_unpack "${P/-bin}-${X}.xpi"
-	done
+	# Unpack language packs
+	mozlinguas_src_unpack
 }
 
 src_install() {
-	declare MOZILLA_FIVE_HOME="/opt/${MY_PN}"
+	declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
 
 	# Install thunderbird in /opt
 	dodir ${MOZILLA_FIVE_HOME%/*}
 	mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
 
-	linguas
-	for X in "${linguas[@]}"; do
-		xpi_install "${WORKDIR}/${P/-bin}-${X}"
-	done
+	# Install language packs
+	mozlinguas_src_install
 
 	# Create /usr/bin/thunderbird-bin
 	dodir /usr/bin/