[gentoo-commits] proj/mozilla:master commit in: eclass/

[Nirbheek Chauhan]

commit:     5c86018267cfd9881271c66f43ab418b8ab24f1d
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  1 20:54:03 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Feb  1 20:54:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=5c860182

mozlinguas.eclass: Add mgorny's suggestions

---
 eclass/mozlinguas.eclass |   42 +++++++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/eclass/mozlinguas.eclass b/eclass/mozlinguas.eclass
index ebc7de7..d19149d 100644
--- a/eclass/mozlinguas.eclass
+++ b/eclass/mozlinguas.eclass
@@ -61,39 +61,39 @@ esac
 # 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 "${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}
-			linguas_${X/-/_}?
-				( ${FTP_URI}/${LANGPACK_PREFIX}${X}${LANGPACK_SUFFIX} -> ${MOZ_P}-${X}.xpi )"
-		IUSE="${IUSE} linguas_${X/-/_}"
+			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.
 	done
 fi
 
-linguas() {
+mozlinguas() {
 	[[ ${PV} =~ alpha|beta ]] && return
 	# Generate the list of language packs called "linguas"
 	# This list is used to unpack and install the xpi language packs
-	local LINGUA
-	for LINGUA in ${LINGUAS}; do
-		if has ${LINGUA} en en_US; then
+	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
+		elif has ${lingua} "${LANGS[@]//-/_}"; then
 			# Add the language to linguas, if it isn't already there
-			has ${LINGUA//_/-} "${linguas[@]}" || linguas+=(${LINGUA//_/-})
+			has ${lingua//_/-} "${linguas[@]}" || linguas+=(${lingua//_/-})
 			continue
-		# For each short LINGUA that isn't in LANGS,
+		# For each short lingua that isn't in LANGS,
 		# We used to add *all* long LANGS to the linguas list,
 		# but we stopped doing that due to bug 325195.
 		fi
-		ewarn "Sorry, but ${P} does not support the ${LINGUA} locale"
+		ewarn "Sorry, but ${P} does not support the ${lingua} locale"
 	done
 }
 
@@ -101,11 +101,11 @@ linguas() {
 # @DESCRIPTION:
 # Unpack xpi language packs according to the user's LINGUAS settings
 mozlinguas_src_unpack() {
-	local X
-	linguas
-	for X in "${linguas[@]}"; do
+	local x
+	mozlinguas
+	for x in "${linguas[@]}"; do
 		# FIXME: Add support for unpacking xpis to portage
-		xpi_unpack "${MOZ_P}-${X}.xpi"
+		xpi_unpack "${MOZ_P}-${x}.xpi"
 	done
 	if [[ "${linguas[*]}" != "" && "${linguas[*]}" != "en" ]]; then
 		einfo "Selected language packs (first will be default): ${linguas[*]}"
@@ -116,9 +116,9 @@ mozlinguas_src_unpack() {
 # @DESCRIPTION:
 # Install xpi language packs according to the user's LINGUAS settings
 mozlinguas_src_install() {
-	local X
-	linguas
-	for X in "${linguas[@]}"; do
-		xpi_install "${WORKDIR}/${MOZ_P}-${X}"
+	local x
+	mozlinguas
+	for x in "${linguas[@]}"; do
+		xpi_install "${WORKDIR}/${MOZ_P}-${x}"
 	done
 }