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 16EDD138330 for ; Sat, 6 Jan 2018 18:32:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6179BE0951; Sat, 6 Jan 2018 18:32:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 35EFFE0951 for ; Sat, 6 Jan 2018 18:32:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 0B351335C04 for ; Sat, 6 Jan 2018 18:32:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C3118195 for ; Sat, 6 Jan 2018 18:32:33 +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: <1515263522.6a0e29a70af811da20c95cbd5a89771db03c99f8.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/nmap/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/nmap/nmap-7.40.ebuild net-analyzer/nmap/nmap-7.50.ebuild net-analyzer/nmap/nmap-7.60.ebuild net-analyzer/nmap/nmap-9999.ebuild X-VCS-Directories: net-analyzer/nmap/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 6a0e29a70af811da20c95cbd5a89771db03c99f8 X-VCS-Branch: master Date: Sat, 6 Jan 2018 18:32:33 +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: ef8fb5b1-5f16-4f8a-8ee2-93f3860e17a4 X-Archives-Hash: f2a0313f6dd3f7a7173c98a4c41d583c commit: 6a0e29a70af811da20c95cbd5a89771db03c99f8 Author: Ulrich Müller gentoo org> AuthorDate: Sat Jan 6 18:30:06 2018 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sat Jan 6 18:32:02 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a0e29a7 net-analyzer/nmap: Remove linguas_* from IUSE. Package-Manager: Portage-2.3.19, Repoman-2.3.6 net-analyzer/nmap/nmap-7.40.ebuild | 7 +++---- net-analyzer/nmap/nmap-7.50.ebuild | 7 +++---- net-analyzer/nmap/nmap-7.60.ebuild | 7 +++---- net-analyzer/nmap/nmap-9999.ebuild | 7 +++---- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/net-analyzer/nmap/nmap-7.40.ebuild b/net-analyzer/nmap/nmap-7.40.ebuild index 1582792f3e6..75ad3bdc6aa 100644 --- a/net-analyzer/nmap/nmap-7.40.ebuild +++ b/net-analyzer/nmap/nmap-7.40.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=6 @@ -22,7 +22,6 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap" NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh ) -IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}" REQUIRED_USE=" system-lua? ( nse ) @@ -82,10 +81,10 @@ src_prepare() { default + local lingua if use nls; then - local lingua='' for lingua in ${NMAP_LINGUAS[@]}; do - if ! use linguas_${lingua}; then + if ! has ${linguas} ${LINGUAS-${lingua}}; then rm -r zenmap/share/zenmap/locale/${lingua} || die rm zenmap/share/zenmap/locale/${lingua}.po || die fi diff --git a/net-analyzer/nmap/nmap-7.50.ebuild b/net-analyzer/nmap/nmap-7.50.ebuild index cfbafe0a31b..4cef5f17ec7 100644 --- a/net-analyzer/nmap/nmap-7.50.ebuild +++ b/net-analyzer/nmap/nmap-7.50.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=6 @@ -22,7 +22,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa IUSE="ipv6 libressl +nse system-lua ncat ndiff nls nmap-update nping ssl zenmap" NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh ) -IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}" REQUIRED_USE=" system-lua? ( nse ) @@ -82,10 +81,10 @@ src_prepare() { default + local lingua if use nls; then - local lingua='' for lingua in ${NMAP_LINGUAS[@]}; do - if ! use linguas_${lingua}; then + if ! has ${linguas} ${LINGUAS-${lingua}}; then rm -r zenmap/share/zenmap/locale/${lingua} || die rm zenmap/share/zenmap/locale/${lingua}.po || die fi diff --git a/net-analyzer/nmap/nmap-7.60.ebuild b/net-analyzer/nmap/nmap-7.60.ebuild index e925ad725d8..d6bd64a6b69 100644 --- a/net-analyzer/nmap/nmap-7.60.ebuild +++ b/net-analyzer/nmap/nmap-7.60.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=6 @@ -25,7 +25,6 @@ IUSE=" zenmap " NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh ) -IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}" REQUIRED_USE=" system-lua? ( nse ) @@ -88,10 +87,10 @@ src_prepare() { default + local lingua if use nls; then - local lingua='' for lingua in ${NMAP_LINGUAS[@]}; do - if ! use linguas_${lingua}; then + if ! has ${linguas} ${LINGUAS-${lingua}}; then rm -r zenmap/share/zenmap/locale/${lingua} || die rm zenmap/share/zenmap/locale/${lingua}.po || die fi diff --git a/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild index f92eba2649f..3424bf9d8b6 100644 --- a/net-analyzer/nmap/nmap-9999.ebuild +++ b/net-analyzer/nmap/nmap-9999.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=6 @@ -22,7 +22,6 @@ IUSE=" zenmap " NMAP_LINGUAS=( de fr hi hr it ja pl pt_BR ru zh ) -IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}" REQUIRED_USE=" system-lua? ( nse ) ndiff? ( ${PYTHON_REQUIRED_USE} ) @@ -83,10 +82,10 @@ src_prepare() { default + local lingua if use nls; then - local lingua='' for lingua in ${NMAP_LINGUAS[@]}; do - if ! use linguas_${lingua}; then + if ! has ${linguas} ${LINGUAS-${lingua}}; then rm -r zenmap/share/zenmap/locale/${lingua} || die rm zenmap/share/zenmap/locale/${lingua}.po || die fi