[gentoo-commits] proj/mozilla:master commit in: www-client/seamonkey/, eclass/, www-client/seamonkey-bin/

[Nirbheek Chauhan]

commit:     f057185027e1eb508efed14710072a9d949c84f2
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  1 18:44:59 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Feb  1 18:44:59 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=f0571850

Port seamonkey to the new mozlinguas.eclass

* Eclass needed some changes to allow this

---
 eclass/mozlinguas.eclass                          |   23 ++++-
 www-client/seamonkey-bin/Manifest                 |    3 +-
 www-client/seamonkey-bin/seamonkey-bin-2.7.ebuild |   96 ++++---------------
 www-client/seamonkey/Manifest                     |    3 +-
 www-client/seamonkey/seamonkey-2.7.ebuild         |  105 ++++++---------------
 5 files changed, 68 insertions(+), 162 deletions(-)

diff --git a/eclass/mozlinguas.eclass b/eclass/mozlinguas.eclass
index f7415ca..ebc7de7 100644
--- a/eclass/mozlinguas.eclass
+++ b/eclass/mozlinguas.eclass
@@ -28,11 +28,6 @@ esac
 # mozilla overlay.
 : ${LANGS:=""}
 
-# @ECLASS-VARIABLE: FTP_URI
-# @DEFAULT-UNSET
-# @DESCRIPTION: The ftp URI prefix for the release tarballs and language packs.
-: ${FTP_URI:=""}
-
 # @ECLASS-VARIABLE: MOZ_PV
 # @DESCRIPTION: Ebuild package version converted to equivalent upstream version.
 # Defaults to ${PV}, and should be overridden for alphas, betas, and RCs
@@ -48,6 +43,21 @@ esac
 # Defaults to ${MOZ_PN}-${MOZ_PV}
 : ${MOZ_P:="${MOZ_PN}-${MOZ_PV}"}
 
+# @ECLASS-VARIABLE: FTP_URI
+# @DEFAULT-UNSET
+# @DESCRIPTION: The ftp URI prefix for the release tarballs and language packs.
+: ${FTP_URI:=""}
+
+# @ECLASS-VARIABLE: LANGPACK_PREFIX
+# @DESCRIPTION: The relative path till the lang code in the langpack file URI.
+# Defaults to ${MOZ_PV}/linux-i686/xpi/
+: ${LANGPACK_PREFIX:="${MOZ_PV}/linux-i686/xpi/"}
+
+# @ECLASS-VARIABLE: LANGPACK_SUFFIX
+# @DESCRIPTION: The suffix after the lang code in the langpack file URI.
+# Defaults to '.xpi'
+: ${LANGPACK_SUFFIX:=".xpi"}
+
 # Add linguas_* to IUSE according to available language packs
 # No language packs for alphas and betas
 if ! [[ ${PV} =~ alpha|beta ]]; then
@@ -57,7 +67,8 @@ if ! [[ ${PV} =~ alpha|beta ]]; then
 			continue
 		fi
 		SRC_URI="${SRC_URI}
-			linguas_${X/-/_}? ( ${FTP_URI}/${MOZ_PV}/linux-i686/xpi/${X}.xpi -> ${MOZ_P}-${X}.xpi )"
+			linguas_${X/-/_}?
+				( ${FTP_URI}/${LANGPACK_PREFIX}${X}${LANGPACK_SUFFIX} -> ${MOZ_P}-${X}.xpi )"
 		IUSE="${IUSE} linguas_${X/-/_}"
 		# We used to do some magic if specific/generic locales were missing, but
 		# we stopped doing that due to bug 325195.

diff --git a/www-client/seamonkey-bin/Manifest b/www-client/seamonkey-bin/Manifest
index c7e3a19..95ca8c3 100644
--- a/www-client/seamonkey-bin/Manifest
+++ b/www-client/seamonkey-bin/Manifest
@@ -6,7 +6,6 @@ DIST seamonkey-2.7-ca.xpi 818013 RMD160 8ac8e44f515454d28c26234b072a5de8bd4d3ed5
 DIST seamonkey-2.7-cs.xpi 823251 RMD160 706ec874e59e76a14e6f82a126d730b2d42a9300 SHA1 af967c7ec03e6d0daa00932c71a4f1c0fe3ed55b SHA256 44eb89865c5c6ccbadecefb71656348dcf67714c476b5d766893ba0edfcf6edc
 DIST seamonkey-2.7-de.xpi 864251 RMD160 c3007b16c3d1260ef29d6e788fb568156887594d SHA1 ed56e09257b0eb7a5f589220c137ce02870d6bde SHA256 583e7f35ae091d150d962aa7b966e944e7d49922ce9cbcd6aa5c918930122908
 DIST seamonkey-2.7-en-GB.xpi 793485 RMD160 0928aba47c36f09f3f64e4aa170e8fe1fc8e801c SHA1 66335712c839404cc658d9f968f386249c1bd26b SHA256 2e741dc1d709df3e23bfac40bb8ece7ba19dbc9bb49f4afc12998f4bae455a4e
-DIST seamonkey-2.7-en-US.xpi 793094 RMD160 d1a3cfd8d4e773581e57b4aa9ee0343a4610224b SHA1 a241fb4132c647b30c1a1268ac5be6c8dd3771b9 SHA256 a017534fef14fbfc8127422cb39766448756b5f68c7a8f6362f6937803e2343f
 DIST seamonkey-2.7-es-AR.xpi 864071 RMD160 2a5c1c05bff14efe513a7625ea9233f982ce364a SHA1 1a882fdae77c259390207e8f87cfc990a7902c7b SHA256 931428884e68fc5f1fb0d4a3b2060c2857e9c9bc16c581b64e05b33190df10ec
 DIST seamonkey-2.7-es-ES.xpi 793320 RMD160 1a25362f9671804be23c9be4b4d1da2efe503344 SHA1 f7c3840b251e1b733b17f7b019f31eb38859e63e SHA256 96a188bc2ef091e9f8acdfa2f2ebe7a6e4f863fbcc9a802fe54fd19ef78b280c
 DIST seamonkey-2.7-fi.xpi 813471 RMD160 8acf8aa57c7f9bfda29745845d60c5845add1f5e SHA1 9f70c89999907c80826c250fa5bc7ab92d1bf8a4 SHA256 90e089a458d5127037cc1a78e96a3fdf45153e4ef6011ac040c8760f44febf4e
@@ -27,4 +26,4 @@ DIST seamonkey-2.7-tr.xpi 813356 RMD160 de9fb4fd401ba36dd3e09ba7c6e78e4778794d26
 DIST seamonkey-2.7-zh-CN.xpi 842340 RMD160 bdadbb97da6536a7d8ff9dfb9363941f4499fba9 SHA1 0c26e89e297c4958900a498c4540a9a1d2a7063a SHA256 dd656ade4233c51cd75c51739a5b770f26d6fe6ee6f5151da5823dd529cac063
 DIST seamonkey-bin_i686-2.7.tar.bz2 21185362 RMD160 9484c10a5d0a6aa8f093f9058ecd9a311224077d SHA1 e8c2a113777d2611c61d0887a80503dd92d8785e SHA256 f5249c6c4fdaa0bcd684c0697d9bc20b27af32ad47d18618bfae3e311ef7f0ec
 DIST seamonkey-bin_x86_64-2.7.tar.bz2 24150663 RMD160 873fdc5cc540d01c5c478b3ebcd8cf07b8484948 SHA1 fa0ebbe2128eadc4afe368e0a7ded8e360bb4982 SHA256 bc7d62c67b36f4879f185670d504a6e58eafca931f43a47f96ca8596e5c8c29d
-EBUILD seamonkey-bin-2.7.ebuild 4657 RMD160 9585695036724c940493af76c0568c8fc74ebca8 SHA1 6f47952bf7cd02d43ea37a426cef8735a962ab74 SHA256 b3be252bb3343f97e5a6a361ddc82b6a04fab22a3818fee5955f98aaf7635792
+EBUILD seamonkey-bin-2.7.ebuild 2836 RMD160 cfbf578618ddf229f5c8035e84a50eff45b3f47e SHA1 cc846fadf1b452c293b2974346d83b9fc7c7b0e9 SHA256 85bd16424757d6edae5d61688c83efae7e4ec14654b76ba456b9ca22da3d5673

diff --git a/www-client/seamonkey-bin/seamonkey-bin-2.7.ebuild b/www-client/seamonkey-bin/seamonkey-bin-2.7.ebuild
index a9f1498..be691ba 100644
--- a/www-client/seamonkey-bin/seamonkey-bin-2.7.ebuild
+++ b/www-client/seamonkey-bin/seamonkey-bin-2.7.ebuild
@@ -4,20 +4,27 @@
 
 EAPI="4"
 
-inherit eutils multilib mozextension pax-utils nsplugins fdo-mime gnome2-utils
-
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
 LANGS=(be ca cs de en-GB en-US es-AR es-ES fi fr gl hu it
 ja lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN)
 
-MY_PV="${PV/_alpha/a}"
-MY_P="${PN}-${MY_PV}"
-MY_PN="${PN/-bin}"
+MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
+MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+MOZ_PN="${PN/-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+LANGPACK_PREFIX="${MOZ_PV}/langpack/${MOZ_P}."
+LANGPACK_SUFFIX=".langpack.xpi"
+
+FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+
+inherit eutils multilib mozextension pax-utils nsplugins fdo-mime gnome2-utils mozlinguas
 
 DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
-FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MY_PN}/releases/"
-SRC_URI="
-	amd64? ( ${FTP_URI}/${MY_PV}/contrib/seamonkey-${MY_PV}.en-US.linux-x86_64.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${FTP_URI}/${MY_PV}/linux-i686/en-US/seamonkey-${MY_PV}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+SRC_URI="${SRC_URI}
+	amd64? ( ${FTP_URI}/${MOZ_PV}/contrib/${MOZ_P}.en-US.linux-x86_64.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
 HOMEPAGE="http://www.seamonkey-project.org/"
 RESTRICT="strip"
 QA_EXECSTACK="opt/seamonkey/*"
@@ -36,64 +43,13 @@ RDEPEND="dev-libs/dbus-glib
 	x11-libs/libXmu
 	!<www-client/seamonkey-bin-2"
 
-S="${WORKDIR}/seamonkey"
-
-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_PV}/langpack/seamonkey-${MY_PV}.${X}.langpack.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_PV}/langpack/seamonkey-${MY_PV}.${X}.langpack.xpi -> ${P/-bin/}-${X}.xpi )"
-	IUSE="${IUSE} linguas_${X%%-*}"
-	fi
-done
-
-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
-		# FIXME: Add support for unpacking xpis to portage
-		[[ ${X} != "en" ]] && xpi_unpack "${P/-bin/}-${X}.xpi"
-	done
-	if [[ "${linguas[*]}" != "" && "${linguas[*]}" != "en" ]]; then
-		einfo "Selected language packs (first will be default): ${linguas[*]}"
-	fi
+	# Unpack language packs
+	mozlinguas_src_unpack
 }
 
 src_install() {
@@ -103,18 +59,8 @@ src_install() {
 	dodir ${MOZILLA_FIVE_HOME%/*}
 	mv "${S}" "${D}${MOZILLA_FIVE_HOME}"
 
-	linguas
-	for X in "${linguas[@]}"; do
-		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P/-bin/}-${X}"
-	done
-
-	local LANG=${linguas%% *}
-	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
-		elog "Setting default locale to ${LANG}"
-		echo "pref(\"general.useragent.locale\", \"${LANG}\");" \
-			>> "${D}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \
-			die "sed failed to change locale"
-	fi
+	# Install language packs
+	mozlinguas_src_install
 
 	# Create /usr/bin/seamonkey-bin
 	dodir /usr/bin/

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 270da9d..6adddf2 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -10,7 +10,6 @@ DIST seamonkey-2.7-ca.xpi 818013 RMD160 8ac8e44f515454d28c26234b072a5de8bd4d3ed5
 DIST seamonkey-2.7-cs.xpi 823251 RMD160 706ec874e59e76a14e6f82a126d730b2d42a9300 SHA1 af967c7ec03e6d0daa00932c71a4f1c0fe3ed55b SHA256 44eb89865c5c6ccbadecefb71656348dcf67714c476b5d766893ba0edfcf6edc
 DIST seamonkey-2.7-de.xpi 864251 RMD160 c3007b16c3d1260ef29d6e788fb568156887594d SHA1 ed56e09257b0eb7a5f589220c137ce02870d6bde SHA256 583e7f35ae091d150d962aa7b966e944e7d49922ce9cbcd6aa5c918930122908
 DIST seamonkey-2.7-en-GB.xpi 793485 RMD160 0928aba47c36f09f3f64e4aa170e8fe1fc8e801c SHA1 66335712c839404cc658d9f968f386249c1bd26b SHA256 2e741dc1d709df3e23bfac40bb8ece7ba19dbc9bb49f4afc12998f4bae455a4e
-DIST seamonkey-2.7-en-US.xpi 793094 RMD160 d1a3cfd8d4e773581e57b4aa9ee0343a4610224b SHA1 a241fb4132c647b30c1a1268ac5be6c8dd3771b9 SHA256 a017534fef14fbfc8127422cb39766448756b5f68c7a8f6362f6937803e2343f
 DIST seamonkey-2.7-es-AR.xpi 864071 RMD160 2a5c1c05bff14efe513a7625ea9233f982ce364a SHA1 1a882fdae77c259390207e8f87cfc990a7902c7b SHA256 931428884e68fc5f1fb0d4a3b2060c2857e9c9bc16c581b64e05b33190df10ec
 DIST seamonkey-2.7-es-ES.xpi 793320 RMD160 1a25362f9671804be23c9be4b4d1da2efe503344 SHA1 f7c3840b251e1b733b17f7b019f31eb38859e63e SHA256 96a188bc2ef091e9f8acdfa2f2ebe7a6e4f863fbcc9a802fe54fd19ef78b280c
 DIST seamonkey-2.7-fi.xpi 813471 RMD160 8acf8aa57c7f9bfda29745845d60c5845add1f5e SHA1 9f70c89999907c80826c250fa5bc7ab92d1bf8a4 SHA256 90e089a458d5127037cc1a78e96a3fdf45153e4ef6011ac040c8760f44febf4e
@@ -57,5 +56,5 @@ DIST seamonkey-2.7_beta5-sv-SE.xpi 875470 RMD160 57fe2c7ca3b2fa0a2fb7f1fb6393d7a
 DIST seamonkey-2.7_beta5-tr.xpi 813356 RMD160 7b0518477bdcfaceb0accf356aa0af9f41562613 SHA1 70ff19f8f9b6ed60db04e63f5d24961344441363 SHA256 be65b4d9991053612d3e7bb0cad857a5202ab99867593ecc42b0bd0a75c8f94b
 DIST seamonkey-2.7_beta5-zh-CN.xpi 842340 RMD160 dbcba7076abf77e68cd1d3b5ed9205589161e01e SHA1 252c8b6e1014a2b8fb0443d9c15c2444a20ada10 SHA256 7edb75ee23e8b76bb93b2ebfe9ad1376bf93ce838a49cd00d28f06dac2d00106
 DIST seamonkey-2.7_beta5.source.tar.bz2 98498151 RMD160 2ca468fb44b87ba03ea8ac3fdbe1b40ddf45782d SHA1 e42ceef6ac638f85d8023080f2692ca68ed95c64 SHA256 0091077c3e9ae8ff29d5e8f8e750d8d6075af0dd2a3e2ba5c3a1b2063988c576
-EBUILD seamonkey-2.7.ebuild 9383 RMD160 cccefb025f245557f66e6f44fea8a2acc341ab9f SHA1 b63f1f76651e0e8b5afee501d325ef668ee4d0b6 SHA256 d100f4a27fd14e877bc617f9616a129223631dd214e0e571ab4d82bc59936826
+EBUILD seamonkey-2.7.ebuild 7806 RMD160 d481ef51a2890accf58c4fa1a7135a45ec343f58 SHA1 1077d9da63f808252030e29139abe3f83e2cba11 SHA256 98810ab4263fd4bfc975d52ede1e7acfb82ea8e6b371cb5b6eca4b754a3d904b
 EBUILD seamonkey-2.7_beta5.ebuild 9383 RMD160 23a02eff0ac89fd425a296296d5b8f4479d39c81 SHA1 2b765a1ef3034f27b220571a0b8aa403d451ee5c SHA256 2e494b410a751dfb7a4758a938956213ca98ab7f22cc2548687e4b187da1a456

diff --git a/www-client/seamonkey/seamonkey-2.7.ebuild b/www-client/seamonkey/seamonkey-2.7.ebuild
index d9577cc..f91bde5 100644
--- a/www-client/seamonkey/seamonkey-2.7.ebuild
+++ b/www-client/seamonkey/seamonkey-2.7.ebuild
@@ -5,66 +5,50 @@
 EAPI="3"
 WANT_AUTOCONF="2.1"
 
-inherit flag-o-matic toolchain-funcs eutils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension versionator python nsplugins
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+LANGS=(be ca cs de en-GB en-US es-AR es-ES fi fr gl hu it
+ja lt nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN)
+
+MOZ_PV="${PV/_pre*}"
+MOZ_PV="${MOZ_PV/_alpha/a}"
+MOZ_PV="${MOZ_PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+MOZ_P="${PN}-${MOZ_PV}"
+
+if [[ ${PV} == *_pre* ]] ; then
+	FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${PN}/nightly/${MOZ_PV}-candidates/build${PV##*_pre}"
+	# And the langpack stuff stays at eclass defaults
+else
+	FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
+	LANGPACK_PREFIX="${MOZ_PV}/langpack/${MOZ_P}."
+	LANGPACK_SUFFIX=".langpack.xpi"
+fi
+
+inherit flag-o-matic toolchain-funcs eutils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension python nsplugins mozlinguas
 
 PATCH="${PN}-2.7-patches-02"
 EMVER="1.3.5"
 
-MY_PV="${PV/_pre*}"
-MY_PV="${MY_PV/_alpha/a}"
-MY_PV="${MY_PV/_beta/b}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
+DESCRIPTION="Seamonkey Web Browser"
+HOMEPAGE="http://www.seamonkey-project.org"
 
-LANGPACK_PREFIX="${MY_P}."
-LANGPACK_SUFFIX=".langpack"
 if [[ ${PV} == *_pre* ]] ; then
 	# pre-releases. No need for arch teams to change KEYWORDS here.
-
-	REL_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${PN}/nightly/${MY_PV}-candidates/build${PV##*_pre}"
-	LANG_URI="${REL_URI}/linux-i686/xpi"
-	LANGPACK_PREFIX=""
-	LANGPACK_SUFFIX=""
 	KEYWORDS=""
 else
 	# This is where arch teams should change the KEYWORDS.
-
-	#REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases/${MY_PV}"
-	REL_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/${MY_PV}"
-	LANG_URI="${REL_URI}/langpack"
 	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
 fi
 
-DESCRIPTION="Seamonkey Web Browser"
-HOMEPAGE="http://www.seamonkey-project.org"
-
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 IUSE="+alsa +chatzilla +crypt +ipc +methodjit +roaming system-sqlite +webm"
 
-SRC_URI="${REL_URI}/source/${MY_P}.source.tar.bz2 -> ${P}.source.tar.bz2
+SRC_URI="${SRC_URI}
+	${FTP_URI}/source/${MOZ_P}.source.tar.bz2 -> ${P}.source.tar.bz2
 	http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
 	crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )"
 
-LANGS=(be ca cs de en en-GB en-US es-AR es-ES fi fr gl hu it ja lt
-	nb-NO nl pl pt-PT ru sk sv-SE tr zh-CN)
-
-for X in "${LANGS[@]}" ; do
-	# en is handled internally
-	if [[ ${X} != en ]] ; then
-		SRC_URI+="
-			linguas_${X/-/_}? ( ${LANG_URI}/${LANGPACK_PREFIX}${X}${LANGPACK_SUFFIX}.xpi -> ${P}-${X}.xpi )"
-	fi
-	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+="
-			linguas_${X%%-*}? ( ${LANG_URI}/${LANGPACK_PREFIX}${X}${LANGPACK_SUFFIX}.xpi -> ${P}-${X}.xpi )"
-		IUSE+=" linguas_${X%%-*}"
-	fi
-done
-
 ASM_DEPEND=">=dev-lang/yasm-1.1"
 
 # Mesa 7.10 needed for WebGL + bugfixes
@@ -94,42 +78,11 @@ else
 	S="${WORKDIR}/comm-release"
 fi
 
-# 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 ; 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
-}
-
 src_unpack() {
 	unpack ${A}
 
-	linguas
-	for X in "${linguas[@]}"; do
-		# FIXME: Add support for unpacking xpis to portage
-		xpi_unpack "${P}-${X}.xpi"
-	done
+	# Unpack language packs
+	mozlinguas_src_unpack
 }
 
 pkg_setup() {
@@ -287,10 +240,8 @@ src_install() {
 	sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
 		|| die
 
-	linguas
-	for X in ${linguas}; do
-		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
-	done
+	# Install language packs
+	mozlinguas_src_install
 
 	# Add StartupNotify=true bug 290401
 	if use startup-notification ; then