[gentoo-commits] gentoo-x86 commit in net-analyzer/nmap: nmap-6.25.ebuild metadata.xml ChangeLog

[gentoo-commits] gentoo-x86 commit in net-analyzer/nmap: nmap-6.25.ebuild metadata.xml ChangeLog

[Jeroen Roovers (jer)]

jer         12/12/03 13:07:11

  Modified:             nmap-6.25.ebuild metadata.xml ChangeLog
  Log:
  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)

Revision  Changes    Path
1.4                  net-analyzer/nmap/nmap-6.25.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild?r1=1.3&r2=1.4

Index: nmap-6.25.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nmap-6.25.ebuild	3 Dec 2012 12:45:45 -0000	1.3
+++ nmap-6.25.ebuild	3 Dec 2012 13:07:11 -0000	1.4
@@ -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 @@
 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 @@
 		-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 \



1.7                  net-analyzer/nmap/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/metadata.xml?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/metadata.xml?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/metadata.xml?r1=1.6&r2=1.7

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/metadata.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- metadata.xml	20 Jun 2012 17:33:05 -0000	1.6
+++ metadata.xml	3 Dec 2012 13:07:11 -0000	1.7
@@ -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>



1.266                net-analyzer/nmap/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?rev=1.266&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?rev=1.266&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/nmap/ChangeLog?r1=1.265&r2=1.266

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -r1.265 -r1.266
--- ChangeLog	3 Dec 2012 12:45:45 -0000	1.265
+++ ChangeLog	3 Dec 2012 13:07:11 -0000	1.266
@@ -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).