From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DE140138330 for ; Sat, 6 Jan 2018 15:13:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F18C1E0903; Sat, 6 Jan 2018 15:13:05 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CA8EFE0903 for ; Sat, 6 Jan 2018 15:13:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 60833335C02 for ; Sat, 6 Jan 2018 15:13:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B2C22133 for ; Sat, 6 Jan 2018 15:13:02 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1515251488.1fdc4e1c5c23fc6d760363b27d7eb422f005ef89.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/shadow/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/shadow/shadow-4.4-r2.ebuild sys-apps/shadow/shadow-4.5.ebuild X-VCS-Directories: sys-apps/shadow/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 1fdc4e1c5c23fc6d760363b27d7eb422f005ef89 X-VCS-Branch: master Date: Sat, 6 Jan 2018 15:13:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8df06aeb-099f-4c40-b782-70779e3fb88a X-Archives-Hash: 742bbeee3e5025c36ae0eaf9945b9366 commit: 1fdc4e1c5c23fc6d760363b27d7eb422f005ef89 Author: Ulrich Müller gentoo org> AuthorDate: Sat Jan 6 15:11:28 2018 +0000 Commit: Ulrich Müller gentoo 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