From 6a0e29a70af811da20c95cbd5a89771db03c99f8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulrich=20M=C3=BCller?= Date: Sat, 6 Jan 2018 19:30:06 +0100 Subject: [PATCH] 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 1582792f3e64..75ad3bdc6aaa 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 cfbafe0a31bf..4cef5f17ec77 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 e925ad725d85..d6bd64a6b69e 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 f92eba2649f1..3424bf9d8b6e 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 -- 2.26.2