From 7a8a30fe9acc1a8e1b5cad04edb1094b9164f667 Mon Sep 17 00:00:00 2001
From: Ian Stakenvicius <axs@gentoo.org>
Date: Fri, 8 Jul 2016 23:43:20 -0400
Subject: 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.
---
 eclass/mozlinguas-v2.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/mozlinguas-v2.eclass b/eclass/mozlinguas-v2.eclass
index 4facb58e5438..215141cb44c7 100644
--- 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" \
-- 
cgit v1.2.3-65-gdbad