gentoo resync : 06.01.2018

5 files changed, 16 insertions, 20 deletions

diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 2f3925effdae..a2c1c842cdcb 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -12,8 +12,8 @@ DIST nmap-7.40.tar.bz2 9043221 BLAKE2B ddbc2f9d8b96aa2ddd53bb250acb5b0829dd79caf
 DIST nmap-7.50.tar.bz2 9309616 BLAKE2B 79f257f4c19762729ddfe7bb950263253d98b0902d22f0bf87ff64b7400c5e0c8e8c1a6b5a8c75e3f835dedbf7087808b1bd8444126655138382ea2db1ccb748 SHA512 b74c5711f03bae363164cdb7e62923ab938c81c7bbcd080eaa2d1acc89f09eb0a7e0f5deb9628b81057c7a35ecd487a2d09dfe3b58b0db6c84cf0b39f526e5f2
 DIST nmap-7.60.tar.bz2 10394925 BLAKE2B bb3a392292adeebe60dc9716ee61ee09a2f86703a1370ffd6a6c63969a75733660046279d122b1b529a3ea25083bde9334d5e13496ad6a9bd9d6562031b8ae09 SHA512 74ba8f6de026ade9ee6bb2252bee18a57210f8207977df7f1c04556629dcdc1e6127f33febc8a52ef88a1dac876116d590564dee4f1c23798c3ac37529991aa4
 DIST nmap-logo-64.png 3289 BLAKE2B 9563f57d126e6fa38dc777391c2887112836b4f5b521311bde64d5c5a04c45a3f420abba0750f776658015c0018b2afeb381c691bc8784e4f39abc78b9c2d2c7 SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3
-EBUILD nmap-7.40.ebuild 4352 BLAKE2B fb1bbeb49e8757d204fc4ca7fe4347d1f57860131bd1d0e928b808e393056dc38fd4291a0ffa63502da40b66c1866e55f2237fa52e31ba24e2b8ef97460f779e SHA512 e7f602c98215e2583a88360493e24c4ade72994154bd24b524426edb64aa5a3c688aa5e841fb1bfedf73566f8e494108636c2d7f29201e7fe179a7aa13117f90
-EBUILD nmap-7.50.ebuild 4353 BLAKE2B 6675a7bfc94c4ea0fbf5d8c4b5e741a742724e099269bb9eb05a0085a2bd5b22a0f7d6fa95924fd902928c3f08d5c9d04d1b29ff97cc4ee3995437078abca465 SHA512 f061ce79bc7c48fc30be3105c70e24621fcf0d0cfbfbe8416e67d10b497998117e4a782e073e14a52490d668916a180e2dab266ccdc2524733caff03d4aff482
-EBUILD nmap-7.60.ebuild 4567 BLAKE2B 6daea092084abc2cb3e9bb14860210565f4b35d191a7c59f8ca6aebc449703a87a8229c0d51246cdfd8c51660b2907f93856a0da5f64278d8ca4b84cc67c621c SHA512 8648fbb304949199b84d4e74faf281dd2893fcd3eca75ed07d3424ef4c97b00f8bfac795d08bd3fa72620122f71eb8c4054366c029ba82b4f76bc2d1d44f50b1
-EBUILD nmap-9999.ebuild 4382 BLAKE2B 2517a01240e47bc7de49e8d5761a8db1633276851504e4e2dd9486e9d6324230346a21cf7afbd2c82ddcd26d108321826987893fc65030ad5632f19eb6a360c5 SHA512 cf7694cb46891ce0e8fcd231085eb2adbced0e2ad9ad88e4fee5df72b4c34c81ff07fe55a0ef9fe661d98a1c4062e66f2963b33e23eb3728c2a8943da240d45b
+EBUILD nmap-7.40.ebuild 4323 BLAKE2B 6a7ee5f39c348282a5e251b3e85e0f1fc60fcde4c00e3f66e6e67491065b5af57f9d3d868fa5ec2be7e0c652cd0737274b0f8ddb65e4b6efb18c2738808a620e SHA512 4062635e101e17b2acfd8f6af986ac7ffc0fd734178a1ebdc6e528cc2f76996ca6b5b4b8a5682a89a3665c23f3525e19872aef976e121dffc8342160f594ee14
+EBUILD nmap-7.50.ebuild 4324 BLAKE2B 086ed32a2369e05e86594602152310b0b4ff0571e9665be98d2f3dc3f29f7cb792d6bc4d5b29956e8eaf65544ada29b396e7d3b57051b6f5d3886476691a02ef SHA512 ae8f7fef956c851cb2fed8e37409aeba6910704b6d0f9d10e6c100a5aaaf4c67111cc3f0fe7af4e6a90b282a8618c85418796e38c2752ce2c37b5225e1c29e07
+EBUILD nmap-7.60.ebuild 4538 BLAKE2B e40bb2b98d7836982f6bd7408a536ee05d35e21badc0775c9b4541534202ec02b48a3907929e53e323f1e8ff61a6f628043cd83e60f60b839f8d0bf380c8d3a6 SHA512 daa592a9693c1f3ff544459583b606c7beb4d98c394de22a03ac609457da1324d1b03629aa15a39b20cf64ba30579bcdf0d4e3bb5bb743137013c2352a0a875d
+EBUILD nmap-9999.ebuild 4353 BLAKE2B fcea0a8760336a5283931547cf055b8f13d62afc88add8889fe6cd8705be0e4754b17b13bbaf168c9cf9f4794bd49beeb6b2eca16de5e954f67ef23fbd78c301 SHA512 dca14cb1250ab48c691ce0e661aa8ab9ea6b7548c4571255fa9000b0a321e765df145d0e4ea3e5af2ddf2e11b3258977f2fb2cfc5472e73a9300e88d1a8377a9
 MISC metadata.xml 920 BLAKE2B c07add545e072588022e15d9de0595f1924fe10fdbec7a11cd401429a76a56ee0a53e4675b3e784f5e2e44372f531073cbdc3da717e4a7f3f906b5c1987530d8 SHA512 56d44c71139e48b75a89140bedd2c4a1bc20c8fe99e16ee8b71fb490cb606997571de95d6ac93147bdee81bbcbb736588c87c43b9cd4f9fac71280416a499185
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