Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/shadow/
Date: Sat, 06 Jan 2018 15:13:07
Message-Id: 1515251488.1fdc4e1c5c23fc6d760363b27d7eb422f005ef89.ulm@gentoo
1 commit: 1fdc4e1c5c23fc6d760363b27d7eb422f005ef89
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 6 15:11:28 2018 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 6 15:11:28 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fdc4e1c
7
8 sys-apps/shadow: Remove linguas_* from IUSE.
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 sys-apps/shadow/shadow-4.4-r2.ebuild | 5 ++---
13 sys-apps/shadow/shadow-4.5.ebuild | 5 ++---
14 2 files changed, 4 insertions(+), 6 deletions(-)
15
16 diff --git a/sys-apps/shadow/shadow-4.4-r2.ebuild b/sys-apps/shadow/shadow-4.4-r2.ebuild
17 index 429fa198d37..8226ece4336 100644
18 --- a/sys-apps/shadow/shadow-4.4-r2.ebuild
19 +++ b/sys-apps/shadow/shadow-4.4-r2.ebuild
20 @@ -1,4 +1,4 @@
21 -# Copyright 1999-2017 Gentoo Foundation
22 +# Copyright 1999-2018 Gentoo Foundation
23 # Distributed under the terms of the GNU General Public License v2
24
25 EAPI="5"
26 @@ -15,7 +15,6 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
27 IUSE="acl audit +cracklib nls pam selinux skey xattr"
28 # Taken from the man/Makefile.am file.
29 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
30 -IUSE+=" $(printf 'linguas_%s ' ${LANGS[*]})"
31
32 RDEPEND="acl? ( sys-apps/acl:0= )
33 audit? ( >=sys-process/audit-2.6:0= )
34 @@ -69,7 +68,7 @@ src_configure() {
35 if use nls ; then
36 local l langs="po" # These are the pot files.
37 for l in ${LANGS[*]} ; do
38 - use linguas_${l} && langs+=" ${l}"
39 + has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
40 done
41 sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
42 fi
43
44 diff --git a/sys-apps/shadow/shadow-4.5.ebuild b/sys-apps/shadow/shadow-4.5.ebuild
45 index e1ca2b3ce59..0863851a2f6 100644
46 --- a/sys-apps/shadow/shadow-4.5.ebuild
47 +++ b/sys-apps/shadow/shadow-4.5.ebuild
48 @@ -1,4 +1,4 @@
49 -# Copyright 1999-2017 Gentoo Foundation
50 +# Copyright 1999-2018 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52
53 EAPI="5"
54 @@ -15,7 +15,6 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc
55 IUSE="acl audit +cracklib nls pam selinux skey xattr"
56 # Taken from the man/Makefile.am file.
57 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
58 -IUSE+=" $(printf 'linguas_%s ' ${LANGS[*]})"
59
60 RDEPEND="acl? ( sys-apps/acl:0= )
61 audit? ( >=sys-process/audit-2.6:0= )
62 @@ -65,7 +64,7 @@ src_configure() {
63 if use nls ; then
64 local l langs="po" # These are the pot files.
65 for l in ${LANGS[*]} ; do
66 - use linguas_${l} && langs+=" ${l}"
67 + has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
68 done
69 sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
70 fi