[gentoo-commits] repo/gentoo:master commit in: sys-apps/shadow/

[Ulrich Müller]

commit:     1fdc4e1c5c23fc6d760363b27d7eb422f005ef89
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  6 15:11:28 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jan  6 15:11:28 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fdc4e1c

sys-apps/shadow: Remove linguas_* from IUSE.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sys-apps/shadow/shadow-4.4-r2.ebuild | 5 ++---
 sys-apps/shadow/shadow-4.5.ebuild    | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/sys-apps/shadow/shadow-4.4-r2.ebuild 
b/sys-apps/shadow/shadow-4.4-r2.ebuild
index 429fa198d37..8226ece4336 100644
--- a/sys-apps/shadow/shadow-4.4-r2.ebuild
+++ b/sys-apps/shadow/shadow-4.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,7 +15,6 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc 
ppc64 s390 sh sparc x86
 IUSE="acl audit +cracklib nls pam selinux skey xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
-IUSE+=" $(printf 'linguas_%s ' ${LANGS[*]})"
 
 RDEPEND="acl? ( sys-apps/acl:0= )
        audit? ( >=sys-process/audit-2.6:0= )
@@ -69,7 +68,7 @@ src_configure() {
        if use nls ; then
                local l langs="po" # These are the pot files.
                for l in ${LANGS[*]} ; do
-                       use linguas_${l} && langs+=" ${l}"
+                       has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
                done
                sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
        fi

diff --git a/sys-apps/shadow/shadow-4.5.ebuild 
b/sys-apps/shadow/shadow-4.5.ebuild
index e1ca2b3ce59..0863851a2f6 100644
--- a/sys-apps/shadow/shadow-4.5.ebuild
+++ b/sys-apps/shadow/shadow-4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -15,7 +15,6 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc 
ppc64 ~s390 ~sh sparc
 IUSE="acl audit +cracklib nls pam selinux skey xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
-IUSE+=" $(printf 'linguas_%s ' ${LANGS[*]})"
 
 RDEPEND="acl? ( sys-apps/acl:0= )
        audit? ( >=sys-process/audit-2.6:0= )
@@ -65,7 +64,7 @@ src_configure() {
        if use nls ; then
                local l langs="po" # These are the pot files.
                for l in ${LANGS[*]} ; do
-                       use linguas_${l} && langs+=" ${l}"
+                       has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
                done
                sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
        fi