[gentoo-commits] proj/mozilla:master commit in: mail-client/thunderbird/, www-client/firefox/, www-client/seamonkey/, ...

[Nirbheek Chauhan]

commit:     93dff23dc9c8c4c7bbef80ea84972d75420bd35a
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  3 16:46:25 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Feb  3 16:46:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=93dff23d

More eclass changes according to review on -dev by vapier

---
 eclass/mozlinguas.eclass                           |   85 +++++++++++--------
 mail-client/thunderbird-bin/Manifest               |    2 +-
 .../thunderbird-bin/thunderbird-bin-10.0.ebuild    |   14 ++--
 mail-client/thunderbird/Manifest                   |    2 +-
 mail-client/thunderbird/thunderbird-10.0.ebuild    |    8 +-
 www-client/firefox-bin/Manifest                    |    2 +-
 www-client/firefox-bin/firefox-bin-10.0.ebuild     |   18 ++--
 www-client/firefox/Manifest                        |    2 +-
 www-client/firefox/firefox-10.0.ebuild             |   16 ++--
 www-client/seamonkey-bin/Manifest                  |    2 +-
 www-client/seamonkey-bin/seamonkey-bin-2.7.ebuild  |   14 ++--
 www-client/seamonkey/Manifest                      |    2 +-
 www-client/seamonkey/seamonkey-2.7.ebuild          |   14 ++--
 13 files changed, 97 insertions(+), 84 deletions(-)

diff --git a/eclass/mozlinguas.eclass b/eclass/mozlinguas.eclass
index d19149d..a6d3c30 100644
--- a/eclass/mozlinguas.eclass
+++ b/eclass/mozlinguas.eclass
@@ -3,11 +3,13 @@
 # $Header: $
 
 # @ECLASS: mozlinguas.eclass
-# @MAINTAINER: mozilla@g.o
-# @AUTHOR: Nirbheek Chauhan <nirbheek@g.o>
+# @MAINTAINER:
+# mozilla@g.o
+# @AUTHOR:
+# Nirbheek Chauhan <nirbheek@g.o>
 # @BLURB: Handle language packs for mozilla products
 # @DESCRIPTION:
-# Sets IUSE according to LANGS (language packs available). Also exports
+# Sets IUSE according to MOZ_LANGS (language packs available). Also exports
 # src_unpack and src_install for use in ebuilds.
 
 inherit mozextension
@@ -21,77 +23,88 @@ case "${EAPI:-0}" in
 		die "EAPI ${EAPI} is not supported, contact eclass maintainers";;
 esac
 
-# @ECLASS-VARIABLE: LANGS
+# @ECLASS-VARIABLE: MOZ_LANGS
 # @DEFAULT-UNSET
-# @DESCRIPTION: Array containing the list of language pack xpis available for
+# @DESCRIPTION:
+# Array containing the list of language pack xpis available for
 # this release. The list can be updated with scripts/get_langs.sh from the
 # mozilla overlay.
-: ${LANGS:=""}
+: ${MOZ_LANGS:=()}
 
 # @ECLASS-VARIABLE: MOZ_PV
-# @DESCRIPTION: Ebuild package version converted to equivalent upstream version.
+# @DESCRIPTION:
+# Ebuild package version converted to equivalent upstream version.
 # Defaults to ${PV}, and should be overridden for alphas, betas, and RCs
 : ${MOZ_PV:="${PV}"}
 
 # @ECLASS-VARIABLE: MOZ_PN
-# @DESCRIPTION: Ebuild package name converted to equivalent upstream name.
+# @DESCRIPTION:
+# Ebuild package name converted to equivalent upstream name.
 # Defaults to ${PN}, and should be overridden for binary ebuilds.
 : ${MOZ_PN:="${PN}"}
 
 # @ECLASS-VARIABLE: MOZ_P
-# @DESCRIPTION: Ebuild package name + version converted to upstream equivalent.
+# @DESCRIPTION:
+# Ebuild package name + version converted to upstream equivalent.
 # Defaults to ${MOZ_PN}-${MOZ_PV}
 : ${MOZ_P:="${MOZ_PN}-${MOZ_PV}"}
 
-# @ECLASS-VARIABLE: FTP_URI
+# @ECLASS-VARIABLE: MOZ_FTP_URI
 # @DEFAULT-UNSET
-# @DESCRIPTION: The ftp URI prefix for the release tarballs and language packs.
-: ${FTP_URI:=""}
+# @DESCRIPTION:
+# The ftp URI prefix for the release tarballs and language packs.
+: ${MOZ_FTP_URI:=""}
 
-# @ECLASS-VARIABLE: LANGPACK_PREFIX
-# @DESCRIPTION: The relative path till the lang code in the langpack file URI.
+# @ECLASS-VARIABLE: MOZ_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/"}
+: ${MOZ_LANGPACK_PREFIX:="${MOZ_PV}/linux-i686/xpi/"}
 
-# @ECLASS-VARIABLE: LANGPACK_SUFFIX
-# @DESCRIPTION: The suffix after the lang code in the langpack file URI.
+# @ECLASS-VARIABLE: MOZ_LANGPACK_SUFFIX
+# @DESCRIPTION:
+# The suffix after the lang code in the langpack file URI.
 # Defaults to '.xpi'
-: ${LANGPACK_SUFFIX:=".xpi"}
+: ${MOZ_LANGPACK_SUFFIX:=".xpi"}
 
 # Add linguas_* to IUSE according to available language packs
 # No language packs for alphas and betas
 if ! [[ ${PV} =~ alpha|beta ]]; then
-	for x in "${LANGS[@]}" ; do
+	for x in "${MOZ_LANGS[@]}" ; do
 		# en and en_US are handled internally
-		if [[ ${x} = en ]] || [[ ${x} = en-US ]]; then
+		if [[ ${x} == en ]] || [[ ${x} == en-US ]]; then
 			continue
 		fi
-		SRC_URI="${SRC_URI}
+		SRC_URI+="
 			linguas_${x/-/_}?
-				( ${FTP_URI}/${LANGPACK_PREFIX}${x}${LANGPACK_SUFFIX} -> ${MOZ_P}-${x}.xpi )"
-		IUSE="${IUSE} linguas_${x/-/_}"
+				( ${MOZ_FTP_URI}/${MOZ_LANGPACK_PREFIX}${x}${MOZ_LANGPACK_SUFFIX} -> ${MOZ_P}-${x}.xpi )"
+		IUSE+=" linguas_${x/-/_}"
 		# We used to do some magic if specific/generic locales were missing, but
 		# we stopped doing that due to bug 325195.
 	done
 fi
+unset x
 
-mozlinguas() {
+mozlinguas_export() {
 	[[ ${PV} =~ alpha|beta ]] && return
-	# Generate the list of language packs called "linguas"
+	# Generate the list of language packs called "mozlinguas"
 	# This list is used to unpack and install the xpi language packs
 	local lingua
+	mozlinguas=()
 	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//_/-})
+		elif has ${lingua} "${MOZ_LANGS[@]//-/_}"; then
+			# Add the language to mozlinguas, if it isn't already there
+			has ${lingua//_/-} "${mozlinguas[@]}" || mozlinguas+=(${lingua//_/-})
 			continue
-		# For each short lingua that isn't in LANGS,
-		# We used to add *all* long LANGS to the linguas list,
+		# For each short lingua that isn't in MOZ_LANGS,
+		# We used to add *all* long MOZ_LANGS to the mozlinguas list,
 		# but we stopped doing that due to bug 325195.
+		else
+			:
 		fi
 		ewarn "Sorry, but ${P} does not support the ${lingua} locale"
 	done
@@ -102,13 +115,13 @@ mozlinguas() {
 # Unpack xpi language packs according to the user's LINGUAS settings
 mozlinguas_src_unpack() {
 	local x
-	mozlinguas
-	for x in "${linguas[@]}"; do
+	mozlinguas_export
+	for x in "${mozlinguas[@]}"; do
 		# FIXME: Add support for unpacking xpis to portage
 		xpi_unpack "${MOZ_P}-${x}.xpi"
 	done
-	if [[ "${linguas[*]}" != "" && "${linguas[*]}" != "en" ]]; then
-		einfo "Selected language packs (first will be default): ${linguas[*]}"
+	if [[ "${mozlinguas[*]}" != "" && "${mozlinguas[*]}" != "en" ]]; then
+		einfo "Selected language packs (first will be default): ${mozlinguas[*]}"
 	fi
 }
 
@@ -117,8 +130,8 @@ mozlinguas_src_unpack() {
 # Install xpi language packs according to the user's LINGUAS settings
 mozlinguas_src_install() {
 	local x
-	mozlinguas
-	for x in "${linguas[@]}"; do
+	mozlinguas_export
+	for x in "${mozlinguas[@]}"; do
 		xpi_install "${WORKDIR}/${MOZ_P}-${x}"
 	done
 }

diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index 5b3d99c..679a496 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -56,5 +56,5 @@ DIST thunderbird-10.0-zh-CN.xpi 431229 RMD160 ff491c003702b77587c9c29403219ad47c
 DIST thunderbird-10.0-zh-TW.xpi 431822 RMD160 bded27fe855ad1e4cf1d12486e1f7d51f8f1f7bd SHA1 df1171db0cd7265071eba70983ad95fdb18cd375 SHA256 fa9011c615d20cf8337e9fbd0dbfd5ee668cbf76d8f797d353b3c5cde8d9d032
 DIST thunderbird-bin_i686-10.0.tar.bz2 18550236 RMD160 ab38a680bb685877eddda9109fa32d9c69c3cca2 SHA1 4e7faaf2b8414eb025dda8f32a1c1d2585c8672c SHA256 6883051f45d50c3e16386c7e11385daf1d3bb808fea00b4503654916332a8568
 DIST thunderbird-bin_x86_64-10.0.tar.bz2 21417018 RMD160 3a51a39f5daf88a2fd2048f2dc7ab56d04e4415c SHA1 dbf2087598429dfa9002a296f1030e62b0cdf651 SHA256 41cc69e60ae3e022052aeeba1b670f09b8b5ff48d5114fe876817ccd1ac834f7
-EBUILD thunderbird-bin-10.0.ebuild 2925 RMD160 50805a452b699299a26e56b80e47db362c655d75 SHA1 518a08c8e1750fcdaee66c1bcb48e70f2fe8be07 SHA256 e38fd5ecc5dbc33506fd2a5e4e827f72f66a90ea548a65ce33cb026917473353
+EBUILD thunderbird-bin-10.0.ebuild 2945 RMD160 24746c470b5295ffee1a9c875a2c533853fcb50f SHA1 3efb37ed457c86da6816b7e66c6a0325a0001d8c SHA256 195636ede847b9e218ab08950ba4c6af2959d742b7e7e0324e3accae31aaba03
 MISC metadata.xml 239 RMD160 1ae864a1acabe6bbce1c44a39d0ea55e04ccfaa7 SHA1 2760f4017fb87bfec958b0472cd86151bb3c3ab3 SHA256 7dc1b4cbb0d49bbe877f0978fc8cd278614f95982a4375336dfb5b72e866efd0

diff --git a/mail-client/thunderbird-bin/thunderbird-bin-10.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-10.0.ebuild
index b5fca2b..da88c5d 100644
--- a/mail-client/thunderbird-bin/thunderbird-bin-10.0.ebuild
+++ b/mail-client/thunderbird-bin/thunderbird-bin-10.0.ebuild
@@ -5,9 +5,9 @@
 EAPI="3"
 
 # Can be updated using scripts/get_langs.sh from mozilla overlay
-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)
+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}"
@@ -17,18 +17,18 @@ MOZ_P="${MOZ_PN}-${MOZ_PV}"
 
 # Upstream fail...
 MY_TEN_PV="10.0-real"
-LANGPACK_PREFIX="${MY_TEN_PV}/linux-i686/xpi/"
+MOZ_LANGPACK_PREFIX="${MY_TEN_PV}/linux-i686/xpi/"
 
 # Upstream ftp release URI that's used by mozlinguas.eclass
 # We don't use the http mirror because it deletes old tarballs.
-FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+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"
 SRC_URI="${SRC_URI}
-	amd64? ( ${FTP_URI}/${MY_TEN_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${FTP_URI}/${MY_TEN_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+	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"
 

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index ad3008f..d0677d5 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -55,4 +55,4 @@ DIST thunderbird-10.0-zh-CN.xpi 431229 RMD160 ff491c003702b77587c9c29403219ad47c
 DIST thunderbird-10.0-zh-TW.xpi 431822 RMD160 bded27fe855ad1e4cf1d12486e1f7d51f8f1f7bd SHA1 df1171db0cd7265071eba70983ad95fdb18cd375 SHA256 fa9011c615d20cf8337e9fbd0dbfd5ee668cbf76d8f797d353b3c5cde8d9d032
 DIST thunderbird-10.0.source.tar.bz2 97700962 RMD160 cd3acaf16e38fe4a1f04badedb50db1cdb51c29e SHA1 4765446295a20cc3b4d73a7bc244d19011136581 SHA256 ea5d3df1227f0c344224eeaf4b24c12391425b9746515e784875edd6863ebcfd
 DIST thunderbird-9.0-patches-0.1.tar.xz 696 RMD160 986ad69f21f6eddf46b73258b0a2aa8eb85fb9c4 SHA1 62dd6e724e2e3a1b76eaed3d165e2e9f47385f8a SHA256 64028e8ca37e1259ed196dfe6e8a87cd08153047f80639ca36cfd276eaa9aaea
-EBUILD thunderbird-10.0.ebuild 8307 RMD160 5c91a1d45dfc2ea2c8d6f3fc42aa788151a46620 SHA1 30b8b4721da05eabd5bf4caebd1ad2064dac3523 SHA256 25d2465d968428b189ee087ee6657439f5be537017fc7b17cf18e37443ff37e0
+EBUILD thunderbird-10.0.ebuild 8318 RMD160 0d78524f7b75c531be1c5639cf60dec0a1b47f26 SHA1 0fb53e9b8e313cd4978208a806eaf1dc13e5a086 SHA256 3f4f26157e6695a951c750371f9fc57a1f34b7640582850b59b82fd0d55186c6

diff --git a/mail-client/thunderbird/thunderbird-10.0.ebuild b/mail-client/thunderbird/thunderbird-10.0.ebuild
index f7438a3..08c9700 100644
--- a/mail-client/thunderbird/thunderbird-10.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-10.0.ebuild
@@ -7,9 +7,9 @@ WANT_AUTOCONF="2.1"
 
 # This list can be updated using scripts/get_langs.sh from the mozilla overlay
 # Add 'ast sr' soon as mirrors finish syncing.
-LANGS=(ar be bg bn-BD br ca cs da de el en en-GB en-US es-AR es-ES et eu fi
+MOZ_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 )
+rm ro ru si sk sl sq sv-SE ta-LK tr uk vi zh-CN zh-TW)
 
 # Convert the ebuild version to the upstream mozilla version, used by mozlinguas
 MOZ_PV="${PV/_beta/b}"
@@ -19,7 +19,7 @@ MOZ_P="${PN}-${MOZ_PV}"
 EMVER="1.3.5"
 # Upstream ftp release URI that's used by mozlinguas.eclass
 # We don't use the http mirror because it deletes old tarballs.
-FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
 
 inherit flag-o-matic toolchain-funcs mozconfig-3 makeedit multilib autotools pax-utils python check-reqs nsplugins mozlinguas
 
@@ -35,7 +35,7 @@ PATCH="thunderbird-9.0-patches-0.1"
 PATCHFF="firefox-${PV}-patches-0.4"
 
 SRC_URI="${SRC_URI}
-	${FTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
+	${MOZ_FTP_URI}/${MOZ_PV}/source/${MOZ_P}.source.tar.bz2
 	crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz )
 	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
 	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz"

diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index f026da7..69e9384 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -87,5 +87,5 @@ DIST firefox-10.0-zh-TW.xpi 257487 RMD160 899ab1ff8b090dc595e6757dcbbb24c93b8057
 DIST firefox-10.0-zu.xpi 246390 RMD160 bc01dbc63d760a66cb888a14edce6e592fbc5059 SHA1 7ec656dd3369ef2ac9084cc0e3d57785942eac80 SHA256 9ff09a88ea8780162f3bec509a64ed1f79eaf84d581a50fdc8dac2a15374dd48
 DIST firefox-bin_i686-10.0.tar.bz2 17160460 RMD160 1b635f47d716cb108342d548209b4b06c7262956 SHA1 0f2a716bf0e8ebdd2d6ae8694af2d49aa44d1b95 SHA256 6ac2899d82a098ee8efd9662b62504ab13a04ee4b6bf4354b1706bab9e99c4e7
 DIST firefox-bin_x86_64-10.0.tar.bz2 18889032 RMD160 a484da5d9828388bb71894c7dd0508d04622b9aa SHA1 a7fd149fb592b84482987bbb44723a6be5dca4e1 SHA256 081d781432327add3ad5bce8c142bdac90a392629bd6863a1f5e761e63841820
-EBUILD firefox-bin-10.0.ebuild 3996 RMD160 d9383387ce2c77357d3592864da3bdcc0101453b SHA1 d41135c211180012b73654a16f4aabc49a4c059e SHA256 a84fdc015f8162943da7764b9bb62c9255fbd34bd9839e95a84b337b6ed4eff2
+EBUILD firefox-bin-10.0.ebuild 4016 RMD160 3c2f4fc8853d7f2acf18b9be4097a991f9764c83 SHA1 b9ee4f1004c73facd55363e914879f0876097a35 SHA256 4d70bb860977ca57b0c2f45716f45b998577b9a02ccac9fcd7068c35ca7c6e09
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b

diff --git a/www-client/firefox-bin/firefox-bin-10.0.ebuild b/www-client/firefox-bin/firefox-bin-10.0.ebuild
index 64b8e8a..771c52e 100644
--- a/www-client/firefox-bin/firefox-bin-10.0.ebuild
+++ b/www-client/firefox-bin/firefox-bin-10.0.ebuild
@@ -5,11 +5,11 @@
 EAPI="3"
 
 # Can be updated using scripts/get_langs.sh from mozilla overlay
-LANGS=(af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en en-GB
-en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he
-hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl nn-NO
-nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK te th tr
-uk vi zh-CN zh-TW zu)
+MOZ_LANGS=(af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en
+en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl
+gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO
+nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK
+te th tr uk vi zh-CN zh-TW zu)
 
 # Convert the ebuild version to the upstream mozilla version, used by mozlinguas
 MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
@@ -19,15 +19,15 @@ MOZ_P="${MOZ_PN}-${MOZ_PV}"
 
 # Upstream ftp release URI that's used by mozlinguas.eclass
 # We don't use the http mirror because it deletes old tarballs.
-FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
 
 inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas
 
 DESCRIPTION="Firefox Web Browser"
-FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases"
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases"
 SRC_URI="${SRC_URI}
-	amd64? ( ${FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.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 )"
+	amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
 HOMEPAGE="http://www.mozilla.com/firefox"
 RESTRICT="strip mirror"
 

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 81203d1..6caaa9f 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -86,4 +86,4 @@ DIST firefox-10.0-zh-CN.xpi 256543 RMD160 d8f1c6554c9cdb1a59752e675044db1bad377b
 DIST firefox-10.0-zh-TW.xpi 257487 RMD160 899ab1ff8b090dc595e6757dcbbb24c93b8057d5 SHA1 d54f419ebf680711d49bda3b279f4eadcbf03db2 SHA256 31cd7b3369ce5bf31676ab7a9fedf5f7612f843c7a96c7467197abe7ccc384cd
 DIST firefox-10.0-zu.xpi 246390 RMD160 bc01dbc63d760a66cb888a14edce6e592fbc5059 SHA1 7ec656dd3369ef2ac9084cc0e3d57785942eac80 SHA256 9ff09a88ea8780162f3bec509a64ed1f79eaf84d581a50fdc8dac2a15374dd48
 DIST firefox-10.0.source.tar.bz2 75538360 RMD160 5ebd640a4ce858c4c3c88dc5a8c2981d60016853 SHA1 cbf1fb0efe0a3a2b2dafaa324b136736e93de70c SHA256 b7392508c75ee5f326168883f696ea5ba6ae6ad57926588889e46648e5cfedb1
-EBUILD firefox-10.0.ebuild 10164 RMD160 42a28cfd443608d78f52e19975cacc966ffd73cf SHA1 1b596388ffe36d40f453ee37836683fd0bea75aa SHA256 ce1d59a3049edb397a7c96e5aea1cc31031c2af7a97830e3357c2773bd5a2628
+EBUILD firefox-10.0.ebuild 10175 RMD160 fc66e89794420a32c15f66d8eb1b09b9a9293e83 SHA1 93520770178f1277ebcc3133a182a6d110925564 SHA256 c4306a11a93af507dc13690f2c32431d92a18f6c97138751d201ebbd03d0ca3c

diff --git a/www-client/firefox/firefox-10.0.ebuild b/www-client/firefox/firefox-10.0.ebuild
index 0fb3df0..16f927e 100644
--- a/www-client/firefox/firefox-10.0.ebuild
+++ b/www-client/firefox/firefox-10.0.ebuild
@@ -7,11 +7,11 @@ VIRTUALX_REQUIRED="pgo"
 WANT_AUTOCONF="2.1"
 
 # This list can be updated with scripts/get_langs.sh from the mozilla overlay
-LANGS=(af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en en-GB 
-en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN 
-he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl 
-nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK 
-te th tr uk vi zh-CN zh-TW zu )
+MOZ_LANGS=(af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en
+en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl
+gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO
+nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK
+te th tr uk vi zh-CN zh-TW zu)
 
 # Convert the ebuild version to the upstream mozilla version, used by mozlinguas
 MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI
@@ -24,7 +24,7 @@ CHANGESET="e56ecd8b3a68"
 PATCH="${PN}-10.0-patches-0.4"
 # Upstream ftp release URI that's used by mozlinguas.eclass
 # We don't use the http mirror because it deletes old tarballs.
-FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/"
 
 inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-3 multilib pax-utils fdo-mime autotools python virtualx nsplugins mozlinguas
 
@@ -71,11 +71,11 @@ if [[ ${PV} =~ alpha ]]; then
 	S="${WORKDIR}/mozilla-central"
 elif [[ ${PV} =~ beta ]]; then
 	SRC_URI="${SRC_URI}
-		${FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
+		${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
 	S="${WORKDIR}/mozilla-beta"
 else
 	SRC_URI="${SRC_URI}
-		${FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
+		${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2"
 	S="${WORKDIR}/mozilla-release"
 fi
 

diff --git a/www-client/seamonkey-bin/Manifest b/www-client/seamonkey-bin/Manifest
index 95ca8c3..25bffd5 100644
--- a/www-client/seamonkey-bin/Manifest
+++ b/www-client/seamonkey-bin/Manifest
@@ -26,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 2836 RMD160 cfbf578618ddf229f5c8035e84a50eff45b3f47e SHA1 cc846fadf1b452c293b2974346d83b9fc7c7b0e9 SHA256 85bd16424757d6edae5d61688c83efae7e4ec14654b76ba456b9ca22da3d5673
+EBUILD seamonkey-bin-2.7.ebuild 2860 RMD160 c1bcad4cf65eb5a20439b6c6e320087638dab94a SHA1 6267a614c100515f7fff454625e25f02dd7a5f0f SHA256 072b9fd6eed23013267725a825643b776f5a7372ac2ae74f7c4d12e6c903d683

diff --git a/www-client/seamonkey-bin/seamonkey-bin-2.7.ebuild b/www-client/seamonkey-bin/seamonkey-bin-2.7.ebuild
index be691ba..e30291b 100644
--- a/www-client/seamonkey-bin/seamonkey-bin-2.7.ebuild
+++ b/www-client/seamonkey-bin/seamonkey-bin-2.7.ebuild
@@ -5,8 +5,8 @@
 EAPI="4"
 
 # 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_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/_alpha/a}" # Handle alpha for SRC_URI
 MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI
@@ -14,17 +14,17 @@ 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"
+MOZ_LANGPACK_PREFIX="${MOZ_PV}/langpack/${MOZ_P}."
+MOZ_LANGPACK_SUFFIX=".langpack.xpi"
 
-FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+MOZ_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"
 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 )"
+	amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/contrib/${MOZ_P}.en-US.linux-x86_64.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_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/*"

diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 6adddf2..56bc188 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -56,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 7806 RMD160 d481ef51a2890accf58c4fa1a7135a45ec343f58 SHA1 1077d9da63f808252030e29139abe3f83e2cba11 SHA256 98810ab4263fd4bfc975d52ede1e7acfb82ea8e6b371cb5b6eca4b754a3d904b
+EBUILD seamonkey-2.7.ebuild 7830 RMD160 a7312c442b07bb4ae163ee1d8af1f0102f0bbbe9 SHA1 ea3446a102b4635dc0b04eba47b2e96590fdd43a SHA256 9524d792bbd4fe0db4a650c0a6ca63b8e569d6e0448d7f37feb0eae8a0b25c9c
 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 f91bde5..8f25db4 100644
--- a/www-client/seamonkey/seamonkey-2.7.ebuild
+++ b/www-client/seamonkey/seamonkey-2.7.ebuild
@@ -6,8 +6,8 @@ EAPI="3"
 WANT_AUTOCONF="2.1"
 
 # 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_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}"
@@ -16,12 +16,12 @@ 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}"
+	MOZ_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"
+	MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
+	MOZ_LANGPACK_PREFIX="${MOZ_PV}/langpack/${MOZ_P}."
+	MOZ_LANGPACK_SUFFIX=".langpack.xpi"
 fi
 
 inherit flag-o-matic toolchain-funcs eutils mozconfig-3 multilib pax-utils fdo-mime autotools mozextension python nsplugins mozlinguas
@@ -45,7 +45,7 @@ LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 IUSE="+alsa +chatzilla +crypt +ipc +methodjit +roaming system-sqlite +webm"
 
 SRC_URI="${SRC_URI}
-	${FTP_URI}/source/${MOZ_P}.source.tar.bz2 -> ${P}.source.tar.bz2
+	${MOZ_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 )"