Remove IUSE=nls as it is a duplicate of each lingua.

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 37 insertions, 35 deletions

diff --git a/dev-util/debhelper/ChangeLog b/dev-util/debhelper/ChangeLog
index e51bc7f59f9b..51144b342785 100644
--- a/dev-util/debhelper/ChangeLog
+++ b/dev-util/debhelper/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/debhelper
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/ChangeLog,v 1.67 2013/05/05 14:08:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/ChangeLog,v 1.68 2013/05/05 15:13:43 jer Exp $
+
+  05 May 2013; Jeroen Roovers <jer@gentoo.org> debhelper-9.20130504.ebuild:
+  Remove IUSE=nls as it is a duplicate of each lingua.
 
 *debhelper-9.20130504 (05 May 2013)
 
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 6acb6fca99a4..cbe78c1fda46 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -5,13 +5,13 @@ AUX debhelper-7.4.13-conditional-nls.patch 837 SHA256 c1113c3dca083c42f4a765e313
 DIST debhelper_9.20120909.tar.gz 464785 SHA256 fabcdb9c41975ea0a1ccc66d6e065e424ed7a2119f6f1a6f7bfb7d06701370af SHA512 f1c417f0610b703d1b6ad9989078f03c67b11f45b1aa61f7d3f2fe8578dbc4d060da955c872c8e6326553ab4e7bbc21a1d9bebd9237e54d74c97f1297981384e WHIRLPOOL 72440752da24e29e5bb2e142d02b18b77472bf373b9c5a79ced790a5e6bb6e1cdec7521eb6e76b8833295441bd1062b9a94170d92dd9e9d5ed984e1ec6d9c88e
 DIST debhelper_9.20130504.tar.gz 470050 SHA256 7d6ee2657430afcb477396c32c4bc170aa7fae97332045aa8f4ebec889051f01 SHA512 79ac8c1f6eee72a69b759733f7cfd75eb28a2557eb10f7f8f5fee174a62a89436923c3ab28563b6e00e874224ed050bb5981f41a822a40cd35c1b796aec053f1 WHIRLPOOL 5d71fe9308268943adb1bfd97d3b7271b1aa0ef77001ff8fbe821a0e4aa373e89d9952401ccdf323bfaed0d9fcf033f15a0200753f723c6141afee8a618f9000
 EBUILD debhelper-9.20120909.ebuild 1754 SHA256 b56191d5109dec66b936801c36ad13c0eff2a3048d7317e23fd4653c30cacf98 SHA512 c8c49652d084e4283d7ea2a1cc6a7b6291af3ecbd011e101add6821c7466ab5220a32aaad006e5c10d586ebe2360f3891198e4b6d3dc005aee2d35a96232355c WHIRLPOOL e54dfc1e54dc6fd13483a3643cdaf014fbf01a46fe4abd5fc8554ba00f4ffb098fac40fbb72ce21c5fd579029d346a646b50a7125ff2591c482422fbc9af2ab5
-EBUILD debhelper-9.20130504.ebuild 1699 SHA256 6c4af7e10768779595b71201a01d200ed8ae202335ded56bad027eeb3cd50437 SHA512 84d2a694e014d65c7221cd21c428574f6217d5b6b9dbc6b8f44aa59abfbd0af82f5783e31780b36fb75ae0edb242651798d511ad085acffbadf0c527a8500d1d WHIRLPOOL 634f658dd1014d581e7dc9ac44fd02dd02107b5e3f9d6720c04f1640068dbbff7cc9997d6484c283aad06149a6cdefbcfaf4163d1e4351fe70983014e8d2120a
-MISC ChangeLog 10189 SHA256 38f92c7257f52b39176ae59e917eb6c9ca9596a9d27a21a37f12bde6ec91995a SHA512 6c0af1f01155edc1ef1edde415b6340561e4f40251930a3e1d826647b1a73947760f3ce58947dc9d14e4dc93bfc2a1012d057c99a4abe64a0544837458c0855f WHIRLPOOL f996fa03f9995d2eaef47aa9930e0cd892c9838962ff20d1f8eeab3f7ab9fea944cbc7e1046d97218b83989ea28289607335fed2e18a4cad631cb9487801b3dd
+EBUILD debhelper-9.20130504.ebuild 1620 SHA256 d1249917615922e142eee825ceb41c9e249fec8b4a4bc829693743af27442c0e SHA512 da42a1b40b2c8948dc710768b34b1bb963efe12242d48fe774d0df6c1c66d175aa4da4bcda850bfdd0671de0c86306bf7d2f2ba2249eed7f77e8100ed024e5d4 WHIRLPOOL a84e45709e8824a15d83ce3165d00a497f91108d1e246359fb8481a8f13b3d317aa8956a01bec5fa5dac2d9f30833f3fe3eaab39fd23489b80c394d1e29cbe05
+MISC ChangeLog 10321 SHA256 6868906476ea8868c02981344c5dd6b0fc2247b46a7cc6c1d1241715538c54d4 SHA512 897f55898d14884ddf641a6930335a114f5186a7ea01252dbb6cbee7b5d5fecf247d4c09c4c70009bc68e5b3d24f6b7b32edea71a4ad4d7f58929129d0d3a50a WHIRLPOOL 817181d6fb827083db2471024afabdd336fd90919b5cd714637645ad862cf0ee7429a7c5a8b8101ab7e3835d1105bb719b965d2659feb9ed36c01e7910595174
 MISC metadata.xml 162 SHA256 316a32c1e8ee9f6548707abec9a803d0a19feea1be10a19273cc04e0cd357644 SHA512 89446121b0be8d0f8bb5160fd33ecddf47ae2994022c0e6fe5caba7bbb9b0bb35337011373c20734bb683d8e172ff88a19aab3ea7354f7786832a5e5fcaf39a8 WHIRLPOOL b214dc4f7f8de7edc5034a877c2ca2c18fbe6b5a1db3a758f0e21328b25d7139961a6b18feed6ac5c09e09d8f61ebd38eed03362212d81aa6f468e8c41c7ca55
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGGZ/UACgkQVWmRsqeSphNzTgCfS3wv/LG0Da872kMc+Hc4NX3J
-/kMAmwf8sgNpkQvKL6f+/Qo3tyaJ8tYS
-=fXiI
+iEYEAREIAAYFAlGGdygACgkQVWmRsqeSphOd3gCdGqHgk4Yw9pdSZB0fSXvJa/w+
+7A8AnjqVOpnB4q3t0s5/rmgcVD+OeMlb
+=Q1yD
 -----END PGP SIGNATURE-----
diff --git a/dev-util/debhelper/debhelper-9.20130504.ebuild b/dev-util/debhelper/debhelper-9.20130504.ebuild
index ee90401b7988..5b082d0421af 100644
--- a/dev-util/debhelper/debhelper-9.20130504.ebuild
+++ b/dev-util/debhelper/debhelper-9.20130504.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20130504.ebuild,v 1.1 2013/05/05 14:08:52 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debhelper/debhelper-9.20130504.ebuild,v 1.2 2013/05/05 15:13:43 jer Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs
@@ -12,10 +12,14 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nls test"
+IUSE="test"
 DH_LINGUAS=( de es fr )
 IUSE+=" ${DH_LINGUAS[@]/#/linguas_}"
 
+NLS_DEPEND=$(
+	printf "linguas_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LINGUAS[@]}
+)
+
 RDEPEND="
 	>=dev-lang/perl-5.10
 	app-arch/dpkg
@@ -23,7 +27,7 @@ RDEPEND="
 	virtual/perl-Getopt-Long
 "
 DEPEND="${RDEPEND}
-	nls? ( >=app-text/po4a-0.24 )
+	${NLS_DEPEND}
 	test? ( dev-perl/Test-Pod )
 "
 
@@ -32,17 +36,15 @@ S=${WORKDIR}/${PN}
 src_compile() {
 	tc-export CC
 
-	if use nls; then
-		local LANGS="" lingua
-		for lingua in ${DH_LINGUAS[@]}; do
-			use linguas_${lingua} && LANGS+=" ${lingua}"
-		done
-	fi
+	local LANGS="" USE_NLS=no lingua
+	for lingua in ${DH_LINGUAS[@]}; do
+		if use linguas_${lingua}; then
+			LANGS+=" ${lingua}"
+			USE_NLS=yes
+		fi
+	done
 
-	emake \
-		USE_NLS=$(usex nls) \
-		LANGS="${LANGS}" \
-		build
+	emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
 }
 
 src_install() {
@@ -50,22 +52,19 @@ src_install() {
 	dodoc doc/* debian/changelog
 	docinto examples
 	dodoc examples/*
+	local lingua
 	for manfile in *.1 *.7 ; do
-		case ${manfile} in
-			*.de.?)	use linguas_de \
-					&& cp ${manfile} "${T}"/${manfile/.de/} \
-					&& doman -i18n=de "${T}"/${manfile/.de/}
-				;;
-			*.es.?)	use linguas_es \
-					&& cp ${manfile} "${T}"/${manfile/.es/} \
-					&& doman -i18n=es "${T}"/${manfile/.es/}
-				;;
-			*.fr.?)	use linguas_fr \
-					&& cp ${manfile} "${T}"/${manfile/.fr/} \
-					&& doman -i18n=fr "${T}"/${manfile/.fr/}
-				;;
-			*)	doman ${manfile}
-				;;
-		esac
+		for lingua in ${DH_LINGUAS[@]}; do
+			case ${manfile} in
+				*.${lingua}.?)
+					use linguas_${lingua} \
+						&& cp ${manfile} "${T}"/${manfile/.${lingua}/} \
+						&& doman -i18n=${lingua} "${T}"/${manfile/.${lingua}/}
+					;;
+				*)
+					doman ${manfile}
+					;;
+			esac
+		done
 	done
 }