diff options
| -rw-r--r-- | net-analyzer/nmap/ChangeLog | 5 | ||||
| -rw-r--r-- | net-analyzer/nmap/Manifest | 12 | ||||
| -rw-r--r-- | net-analyzer/nmap/metadata.xml | 5 | ||||
| -rw-r--r-- | net-analyzer/nmap/nmap-6.25.ebuild | 24 |
4 files changed, 28 insertions, 18 deletions
diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog index 0d0fcd632865..056869945ba0 100644 --- a/net-analyzer/nmap/ChangeLog +++ b/net-analyzer/nmap/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-analyzer/nmap # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.265 2012/12/03 12:45:45 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.266 2012/12/03 13:07:11 jer Exp $ + + 03 Dec 2012; Jeroen Roovers <jer@gentoo.org> nmap-6.25.ebuild, metadata.xml: + Describe USE=lua better, prefer USE=lua. Enforce USE=-nls. 03 Dec 2012; Jeroen Roovers <jer@gentoo.org> nmap-6.25.ebuild: Add IUSE=ipv6, IUSE=nls and LINGUAS (bug #445752 by Alex Turbov). diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest index 399c83c0f0db..3f8e39caff66 100644 --- a/net-analyzer/nmap/Manifest +++ b/net-analyzer/nmap/Manifest @@ -23,13 +23,13 @@ EBUILD nmap-5.51.6.ebuild 2511 SHA256 850b135e0e52d513380f4b5bad99fe2a1c1dc69ff4 EBUILD nmap-5.51.ebuild 2312 SHA256 8ed9723767076f6e5cc5a8290fdcb3d4ffe68361ddbf9b3c60dd94b4d2df204b SHA512 286c6f5367e34107d5273a8aa0bbad62666a43e97ff3a76a8227b539df8fe0ed9f6ac8de2b8422ce9f2291ec31c242bb0d7927dde462070464be02a7eedc794f WHIRLPOOL 2eedff89970dbe4ff9da4b8ec04be84b4a2961e246ac87bba22669977f3226755d5cd77a0961219a11ffd1bbba94819295c3a6d9b012458cc44b09f9831a794f EBUILD nmap-6.00.ebuild 1926 SHA256 67de5181a2d6f2176c0072c5ff8c35b2848555d69ee81438c1fd730978269b43 SHA512 751ad3017869c1425e7d5e85ac2ceaff81ff62fd88f5b0ca1c907b839181ffed640645e4418e6c5a5cac0ae811961a73de2989c04f2e0eb7e6a386190f6c471c WHIRLPOOL 64712da501a31edfa826aba60afc1b6336153b1ff3756c053e837f48d2ec7b4536f29d49ef12fa0668dea94f7d5e9097fdbc023375200f7082f2b163cb81bd20 EBUILD nmap-6.01.ebuild 2687 SHA256 0f1ff3d84de80203251b931a08a51914331b178c03965c55c792943ba06ae001 SHA512 79571b7454f74dd8d1241b1f43ff14bb556fe2fb3a5de01ea4fffd2de6e77ccb0686a6a50b921e9c0b8dc2ea6a2a9bd6e6e060d35330b586515438e6baabd951 WHIRLPOOL 19232e74d7d2e07b28fccff2496dae843c0c4d94a454da2f4620bc1fd890a6139c1585f346d09776e2db03ac348af77c3ad26f4eabd0c96e8e5f0fe091e26f0a -EBUILD nmap-6.25.ebuild 3049 SHA256 5409f054a70b7a82fdb9d3f4b75d78049c86a4264c7f7fa2cee2da4d3db86162 SHA512 683eed2e7492cd120db975d8501437efbbc177052f0fc97b5bfc3b05f99e6552efcac138990576362ee85f9ecffb0d0bc02ee75186084fdf81fb532ef914c1b8 WHIRLPOOL 34753dd5ebacd0e6224a667a680d21c09a28256406b6532904542fee8e7c877039d7f98c46696f8a1b3af8d93953968ca0939b3f9d4948c07a03b3210b3f8ac4 -MISC ChangeLog 32701 SHA256 cfc4e60a79956c10fcb01f8fc3bb08a1009a4cf70a703bc9892ce5766b550848 SHA512 a977ff30601a636b1d406e2c2c37eb2ba87f5ab15b6cd08058236f0c1e76bbe4c7329e39237f14fb1e259b2844102adee14495340d0dfe2e12abb95f58933c99 WHIRLPOOL dbe173be45b5920e846fdae6da2aefeaea28759692ef417b5cc76ad25f9e7bf2e0ddc0711dc9e3825a3c8ef2f1627d3df0cc51956984a1c00b4796b6e96c0884 -MISC metadata.xml 527 SHA256 f6291faba996b899beb0f35b3d5feb0a0a5a7e71e684b10f8386f0707e73d982 SHA512 7a0f0afdf604a997d8722f8b62b4829b980344b86a80faf346848abaab337e3b687f83ec1f1e1bca861619238466b1ce775deca538786721cdcba41d2166a77f WHIRLPOOL abc3f8636b57e7260916d96866b2c360e336077f0dc613339002ca86c4b78e59590c6b23beccdc47f9f5e282ad23ec330e5f6ec46a1da72cf9c9bd2d6fbe5450 +EBUILD nmap-6.25.ebuild 3266 SHA256 18ef3bc49bde5a677a4beaeb58842c825c705c93a0007c2361a1a0ab12a91d82 SHA512 a40485d48b2da7e40ed49287f829691f68e9ea198b04bedab57e9b8fc7147bc3931a5486032be1d8005f9efad515e9df4a950ce20b98ca5a4e587daefebcfbd5 WHIRLPOOL fe8e568e00da9821dff02f6b972d061b0aaabfe9f6acefea0ff788f00703a360ec4a5230b61fdc1ba79132e29e37e41be2cc8e6cbcbc7ef1cba77c93882da320 +MISC ChangeLog 32842 SHA256 74d579169031ced51c1ae1495e583bb67e5f3f5d6efbe46ce00ccb8e8dfc50e4 SHA512 9675fa3591b82f22bd8300bc320e67d7f3da243c383c0ff9239a6b814fba826f18518d798a69310ba240f9e09e9702b75456c4e937e8a3365efceba459832e62 WHIRLPOOL 07bccdbf78147b7dc25fb7c126eb9dc7f8c4e8d151abd80e9d4d0b2f115f221ce3b3d7c5f73328981bc1b9cafb52b38e77b542e359b5568b4f9f15397ccea545 +MISC metadata.xml 635 SHA256 168aef67d759682a1002a544492fbc95f59466029770bdbc94ad66ee3174878a SHA512 c197c9c3ae95cfed94072ed9a68e76a27cb921acf1267a5a8269b4b4538769ce84b580cb3e10fd866c08b38124e54dc92161c29d2eb72336fe7a1adbb184473f WHIRLPOOL c3ec2efa9549f8f148f816005dabcb368fc54243d8fb08096970552e623a33cf1491526848b514881ad7b2a409b796a415ca404f6224d2de4b9e3fa053c5a3ed -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlC8nvoACgkQVWmRsqeSphMhlwCcCM5neRKGddCigaEgYDTekkBd -Ey4Anjly6ifo/ws0E2ELz62fPnAtkWcW -=A2TA +iEYEAREIAAYFAlC8pAAACgkQVWmRsqeSphPd6wCfUDMU9CP3QmBjMm2A4Z7pa2Ob +MEAAnjrRaQsOASiXNSdzE9bP/kP8hYkJ +=jha+ -----END PGP SIGNATURE----- diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml index b5e3b19fee28..bac0ef371244 100644 --- a/net-analyzer/nmap/metadata.xml +++ b/net-analyzer/nmap/metadata.xml @@ -6,11 +6,10 @@ <email>spock@gentoo.org</email> </maintainer> <use> +<flag name="lua">Include support for the Nmap Scripting Engine (NSE) through <pkg>dev-lang/lua</pkg></flag> <flag name="ncat">Install the ncat utility</flag> <flag name="ndiff">Install the ndiff utility</flag> -<flag name="nmap-update">Install nmap-update, which uses -<pkg>dev-vcs/subversion</pkg> to update nmap scripts in your home -directory</flag> +<flag name="nmap-update">Install nmap-update, which uses <pkg>dev-vcs/subversion</pkg> to update nmap scripts in your home directory</flag> <flag name="nping">Install the nping utility</flag> </use> </pkgmetadata> diff --git a/net-analyzer/nmap/nmap-6.25.ebuild b/net-analyzer/nmap/nmap-6.25.ebuild index 01b3cefcb370..91db0a5092ae 100644 --- a/net-analyzer/nmap/nmap-6.25.ebuild +++ b/net-analyzer/nmap/nmap-6.25.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild,v 1.3 2012/12/03 12:45:45 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild,v 1.4 2012/12/03 13:07:11 jer Exp $ EAPI="4" PYTHON_DEPEND="2" @@ -20,7 +20,7 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="gtk ipv6 lua ncat ndiff nls nmap-update nping ssl" +IUSE="gtk ipv6 +lua ncat ndiff nls nmap-update nping ssl" NMAP_LINGUAS="de fr hr it ja pt_BR ru" for lingua in ${NMAP_LINGUAS}; do IUSE+=" linguas_${lingua}" @@ -76,13 +76,21 @@ src_prepare() { -e 's/-m 755 -s ncat/-m 755 ncat/' \ ncat/Makefile.in || die - local lingua='' - for lingua in ${NMAP_LINGUAS}; do - rm -rf zenmap/share/zenmap/locale/${lingua} - if ! use linguas_${lingua}; then + if use nls; then + local lingua='' + for lingua in ${NMAP_LINGUAS}; do + if ! use linguas_${lingua}; then + rm -rf zenmap/share/zenmap/locale/${lingua} + rm -f zenmap/share/zenmap/locale/${lingua}.po + fi + done + else + # configure/make ignores --disable-nls + for lingua in ${NMAP_LINGUAS}; do + rm -rf zenmap/share/zenmap/locale/${lingua} rm -f zenmap/share/zenmap/locale/${lingua}.po - fi - done + done + fi # Fix desktop files wrt bug #432714 sed -i \ |