net-analyzer/nmap: Remove linguas_* from IUSE.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/net-analyzer/nmap/nmap-7.40.ebuild b/net-analyzer/nmap/nmap-7.40.ebuild
index 1582792f3e64ee1744ab3114321964da53a64142..75ad3bdc6aaab8c6c57cdcb796be9ec68ec2b36f 100644 (file)
--- 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 cfbafe0a31bfdc8c7786504f7ff4ad28865a74d8..4cef5f17ec7746ace34a59b0b785561708351b76 100644 (file)
--- 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 e925ad725d85677d5b26c21ddbe90ab8a7314d72..d6bd64a6b69e8c059c9e8441fb0b79770ff3cbd2 100644 (file)
--- 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 f92eba2649f12b9db4b2cd8e7fcbfde7e2e5f88f..3424bf9d8b6e19604e801217028a17da6798f5ee 100644 (file)
--- 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