diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2012-12-03 13:07:11 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2012-12-03 13:07:11 +0000 |
| commit | e0f0b6482357549caa74e6475b143747f6d4c060 (patch) | |
| tree | ba970006b1cd8334ba13c5d6b77ce93252b1f5d2 /net-analyzer | |
| parent | Add IUSE=ipv6, IUSE=nls and LINGUAS (bug #445752 by Alex Turbov). (diff) | |
| download | gentoo-2-e0f0b6482357549caa74e6475b143747f6d4c060.tar.gz gentoo-2-e0f0b6482357549caa74e6475b143747f6d4c060.tar.bz2 gentoo-2-e0f0b6482357549caa74e6475b143747f6d4c060.zip | |
Describe USE=lua better, prefer USE=lua. Enforce USE=-nls.
(Portage version: 2.2.0_alpha143/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-analyzer')
| -rw-r--r-- | net-analyzer/nmap/ChangeLog | 5 | ||||
| -rw-r--r-- | net-analyzer/nmap/metadata.xml | 5 | ||||
| -rw-r--r-- | net-analyzer/nmap/nmap-6.25.ebuild | 24 |
3 files changed, 22 insertions, 12 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/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 \ |