mozlinguas-v2.eclass: minor corrections related to L10N migration

Some of the L10N-migrated code did not work properly when generating
langpacks as part of the build process.  This commit fixes those issues.

diff --git a/eclass/mozlinguas-v2.eclass b/eclass/mozlinguas-v2.eclass
index 4facb58e543823dff171b5b26fd1fccfda45a4b9..215141cb44c7416299d08deac2b12ff8b7adf61c 100644 (file)
--- a/eclass/mozlinguas-v2.eclass
+++ b/eclass/mozlinguas-v2.eclass
@@ -175,7 +175,7 @@ else
                if [[ -n ${MOZ_L10N_URI_PREFIX} ]]; then
                        SRC_URI+=" l10n_${xflag/[_@]/-}? ( ${MOZ_L10N_URI_PREFIX}${x}${MOZ_L10N_URI_SUFFIX} )"
                fi
-               IUSE+=" l10n_${x/[_@]/-}"
+               IUSE+=" l10n_${xflag/[_@]/-}"
        done
 fi
 unset x xflag
@@ -348,9 +348,9 @@ mozlinguas_xpistage_langpacks() {
 mozlinguas_src_install() {
        local x
        mozlinguas_export
-       if [[ -n ${MOZ_GENERATE_LANGPACKS} ]]; then
+       if [[ -n ${MOZ_GENERATE_LANGPACKS} ]] && [[ -n ${mozlinguas[*]} ]]; then
                local repopath="${WORKDIR}/${PN}-generated-langpacks"
-               mkdir -p "${repopath}"
+               mkdir -p "${repopath}" || die
                pushd "${BUILD_OBJ_DIR:-.}"/dist/*/xpi > /dev/null || die
                for x in "${mozlinguas[@]}"; do
                        cp "${MOZ_P}.${x}.langpack.xpi" \