nmap: 5.61TEST4 version bump

net-analyzer/nmap/Manifest

@@ -0,0 +1,8 @@
+AUX nmap-4.75-include.patch 476 RMD160 5ac50ccc48dbbc1c654558c97c0b6c5f777cc843 SHA1 10ec6eb55e60175417c37785f274d3872ccd22bf SHA256 ec9453954d1b84e77c1489c8a25d629ba300084c7020ed8b6045c0e839cdcdca
+AUX nmap-4.75-nolua.patch 364 RMD160 90ec068c5a267dd43737fb39828b3c9c372e19b1 SHA1 aab37cdb0a19891fd55038b05d1ab843d1fcf255 SHA256 52434a5d0e8b82fe325e1066c3851a2e862fc58c3a3d02f8463e7dcf1d603619
+AUX nmap-5.10_beta1-string.patch 252 RMD160 58dc7f4dfb660519a51af2f5619eca144cfd6480 SHA1 b080ef5618b3666bf85f011ce6edc969d8a2132d SHA256 6012685deb53985c73fa038d27b2f1472344fd6641c40103143fa15676454506
+AUX nmap-5.21-python.patch 1219 RMD160 87b07436f42950341403ee0f92edf02abfe88614 SHA1 6e82966a50b150ce3cb2b36d0ad57595f98dc2c8 SHA256 2d133db8f31d048de810fa3a3b8234f856bdfa9b830c6346d71cdc2357a16b74
+AUX nmap-5.51-su-to-zenmap-fix.patch 785 RMD160 44f30cdf13120d949792eb07e82d7b697c914bb0 SHA1 fcea2bb71901ed4c78e918f07a3da208f115a3d9 SHA256 f57d70bd98b0b395661dc2b85df15ae79b71fe339133967f7af4eee98feee8da
+AUX nmap-logo-64.png 3289 RMD160 0f0a9ec49ecffc97517b8d048888a6fd5dce0ab0 SHA1 c36250c662ee9058974a2215c579c3f45ddaf2d0 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa
+DIST nmap-5.61TEST4.tar.bz2 21757047 RMD160 549cf6cf1a3f1f4cce32fe3f93c2eb7e616c7524 SHA1 a7c78fcda2168e8f58737ffc1bfc8dfe4eb378bf SHA256 b914d42dd578ffd711e6e5a8ea136acbe367c356c03c967811e76bd24a1923ae
+EBUILD nmap-5.61_beta4.ebuild 1879 RMD160 341a1a1230571dbc8fcda9a86683d1747c8d636c SHA1 f3e5668a99d3322f2eb8430d5f381f2e4581ef45 SHA256 13e5c1059aec978bbc1a0d261ffeef846c510ef47b14d177d60c8da3033cd48b

net-analyzer/nmap/files/nmap-4.75-include.patch

@@ -0,0 +1,13 @@
+diff -Naurp nmap-4.75-orig/nmap_dns.h nmap-4.75/nmap_dns.h
+--- nmap-4.75-orig/nmap_dns.h	2008-09-09 08:51:59.000000000 +0200
++++ nmap-4.75/nmap_dns.h	2008-09-09 08:52:19.000000000 +0200
+@@ -95,6 +95,9 @@
+  *                                                                         *
+  ***************************************************************************/
+ 
++#include <list>
++#include <string>
++
+ class Target;
+ 
+ void nmap_mass_rdns(Target ** targets, int num_targets);

net-analyzer/nmap/files/nmap-4.75-nolua.patch

@@ -0,0 +1,10 @@
+diff -Naur nmap-4.75-orig/Makefile.in nmap-4.75/Makefile.in
+--- nmap-4.75-orig/Makefile.in	2008-09-05 07:32:06.000000000 +0200
++++ nmap-4.75/Makefile.in	2008-09-09 16:34:38.000000000 +0200
+@@ -258,5 +258,5 @@
+ 	./config.status --recheck
+ 
+ makefile.dep:
+-	$(CXX) -MM $(CPPFLAGS) $(SRCS) > $@
++	$(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $(SRCS) > $@
+ include makefile.dep

net-analyzer/nmap/files/nmap-5.10_beta1-string.patch

@@ -0,0 +1,11 @@
+--- nmap-5.10BETA1/Target.h.org	2009-12-08 08:21:59.000000000 +0100
++++ nmap-5.10BETA1/Target.h	2009-12-08 08:22:02.000000000 +0100
+@@ -99,6 +99,8 @@
+ 
+ #ifndef NOLUA
+ #include "nse_main.h"
++#else
++#include <string>
+ #endif
+ 
+ #include "portreasons.h"

net-analyzer/nmap/files/nmap-5.21-python.patch

@@ -0,0 +1,21 @@
+diff -Naurp nmap-5.21-orig/Makefile.in nmap-5.21/Makefile.in
+--- nmap-5.21-orig/Makefile.in	2010-01-31 09:53:53.000000000 +0100
++++ nmap-5.21/Makefile.in	2010-01-31 09:54:48.000000000 +0100
+@@ -253,7 +253,7 @@ build-zenmap: $(ZENMAPDIR)/setup.py $(ZE
+ 
+ install-zenmap: $(ZENMAPDIR)/setup.py
+ 	$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
+-	cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)")
++	cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)") --no-compile
+ 	$(INSTALL) -c -m 644 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/
+ # Create a symlink from nmapfe to zenmap if nmapfe doesn't exist or is
+ # already a link.
+@@ -267,7 +267,7 @@ build-ndiff:
+ 	cd $(NDIFFDIR) && $(PYTHON) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON_PATH)")
+ 
+ install-ndiff:
+-	cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)")
++	cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)") --no-compile
+ 
+ NSE_FILES = scripts/script.db scripts/*.nse
+ NSE_LIB_LUA_FILES = nselib/*.lua

net-analyzer/nmap/files/nmap-5.51-su-to-zenmap-fix.patch

@@ -0,0 +1,14 @@
+diff -Naurp nmap-5.51-orig/zenmap/install_scripts/unix/su-to-zenmap.sh nmap-5.51/zenmap/install_scripts/unix/su-to-zenmap.sh
+--- nmap-5.51-orig/zenmap/install_scripts/unix/su-to-zenmap.sh	2011-06-13 00:08:06.141000195 +0200
++++ nmap-5.51/zenmap/install_scripts/unix/su-to-zenmap.sh	2011-06-13 00:09:00.487000200 +0200
+@@ -40,8 +40,8 @@ else
+     fi
+     case $SU_TO_ROOT_X in
+       gksu) gksu -u "$PRIV" "$COMMAND";;
+-      kdesu) kdesu -u "$PRIV" "$COMMAND";;
+-      kde4su) /usr/lib/kde4/libexec/kdesu -u "$PRIV" "$COMMAND";;
++      kdesu) kdesu -u "$PRIV" $COMMAND;;
++      kde4su) /usr/lib/kde4/libexec/kdesu -u "$PRIV" $COMMAND;;
+       ktsuss) ktsuss -u "$PRIV" "$COMMAND";;
+   # As a last resort, open a new xterm use sudo/su
+       sdterm) xterm -e "sudo -u $PRIV $COMMAND";;

net-analyzer/nmap/nmap-5.61_beta4.ebuild

@@ -0,0 +1,61 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-5.51.ebuild,v 1.10 2011/06/12 22:14:04 spock Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit eutils flag-o-matic python
+
+MY_P=${P/_beta/TEST}
+
+DESCRIPTION="A utility for network exploration or security auditing"
+HOMEPAGE="http://nmap.org/"
+SRC_URI="http://nmap.org/dist/${MY_P}.tar.bz2"
+
+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 lua ssl"
+
+DEPEND="dev-libs/libpcre
+	net-libs/libpcap
+	gtk? ( >=x11-libs/gtk+-2.6:2
+		   >=dev-python/pygtk-2.6
+		   || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 )
+		 )
+	lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] )
+	ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.75-include.patch
+	epatch "${FILESDIR}"/${PN}-4.75-nolua.patch
+	epatch "${FILESDIR}"/${PN}-5.10_beta1-string.patch
+	epatch "${FILESDIR}"/${PN}-5.21-python.patch
+	epatch "${FILESDIR}"/${PN}-5.51-su-to-zenmap-fix.patch
+	sed -i -e 's/-m 755 -s ncat/-m 755 ncat/' ncat/Makefile.in
+}
+
+src_configure() {
+	# The bundled libdnet is incompatible with the version available in the
+	# tree, so we cannot use the system library here.
+	econf --with-libdnet=included \
+		--without-nmap-update \
+		$(use_with gtk zenmap) \
+		$(use_with lua liblua) \
+		$(use_with ssl openssl)
+}
+
+src_install() {
+	LC_ALL=C emake DESTDIR="${D}" -j1 STRIP=: nmapdatadir="${EPREFIX}"/usr/share/nmap install || die
+	dodoc CHANGELOG HACKING docs/README docs/*.txt || die
+
+	use gtk && doicon "${FILESDIR}/nmap-logo-64.png"
+}