version bump, trivial modifications to ebuild based on update

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

3 files changed, 170 insertions, 15 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index e85ccbfb5113..1d72d838b041 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.298 2013/03/15 13:30:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.299 2013/07/30 07:42:31 zerochaos Exp $
+
+*nmap-6.40 (30 Jul 2013)
+
+  30 Jul 2013; Rick Farina <zerochaos@gentoo.org> +nmap-6.40.ebuild:
+  version bump, trivial modifications to ebuild based on update
 
   15 Mar 2013; Agostino Sarubbo <ago@gentoo.org> nmap-6.25.ebuild:
   Stable for sh, wrt bug #461278
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 22871cc78a08..fcc0f480cade 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -12,25 +12,27 @@ AUX nmap-6.25-lua.patch 1607 SHA256 eeb125bdc22dc6cf7402ead711236701440b2276af0e
 AUX su-to-zenmap.sh.diff 407 SHA256 164664d9e1ff54279794fe2eb34f15d419a843e58d7633664be07be12a6cfe36 SHA512 bbab3e83d7c8365915ec948bb18b897afabbe574ed5c42ffecc528392cde5af7bc1f0a63b0b56af3616c6631e6402eda3526785221d43a02df22bfe15e63c73a WHIRLPOOL 2148ac5dd7e63ed218d2ab2d93d53da8ee605861029e83b66860ac18a39d1b5f5c1365d16c7d5533b1a6a5839e0d74bde07ba2d907bff413314714383d0ee92f
 DIST nmap-6.01.tar.bz2 21640157 SHA256 77f6635b677d28b546cbef97e4ead6c2d4a5aebcaa108fe3a3c135db6448617a SHA512 0b44542a0e33629d077c64129bac7e00b05b4e65a83b181b84fb5460a7da083bb29be00777a8d92c6f6b6fb0c009cebc330c02c7259166e8cea4109cdae50fc9 WHIRLPOOL 24b125997c8ae5b7a514a6bcc5780b9a8aec8516e19616b0890fd34c8b7b182d04142e012c981a0e125468a4ee49ea7b13416f79031ede346846e59b08919dfd
 DIST nmap-6.25.tar.bz2 7668639 SHA256 3349cc6d36b86b95ca2b8075d16615a3a598cef494920d6652f9a8bf9f7660b5 SHA512 6ec4d8f50621c86a3d0b6a22cf179a1874bf109736c5a79d6b29faec6859e165f7c0e6c3f8c284de8f384a8a607f071e2176c900b22df3ba0f158d36b081870d WHIRLPOOL b6cd57988827549762020e73ff263f5014d6c748291225d8c9792705da39188436004400b05a07414b4cc4b9ea56c75ebf7c753bbe11a5456b008041e72ebbc4
+DIST nmap-6.40.tar.bz2 7871636 SHA256 491f77d8b3fb3bb38ba4e3850011fe6fb43bbe197f9382b88cb59fa4e8f7a401 SHA512 b0ccb7634838e814dc0e36a0dbfc8c74853ef9dc6a119b73ffc90caab8875cbae893e0d24371ea568f9fff969440ed2a2e89953a6dbb6eb26313a4ea25b02b3b WHIRLPOOL 18424b67a8ace959c129e00e4b0d8a8e893aa08cfabb1b47b4fe9fc4316c29f713a2f83b789db28b4158c18bf80aea0bee071751187c0eb7e1a4b6693c3f4f98
 DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313
 EBUILD nmap-6.01.ebuild 2725 SHA256 d6744cae353c9569722aa1621d57e889b5c31cf4549b02f787507bf81d5cb138 SHA512 f081af9e8a34b05479cac9e3b93b385b3d48145cd126d3b47e3b5a11f92fa13452dc2469f33ba2223211e0f58b3976b8e0a150d685a3f73610016ded9322d3ae WHIRLPOOL 5a60103d940949e66fd228b222633f3ee7abd4dd32d55e04d6bb295452e13821356c3a490c3334ec6c1de7024ac06d695fcc898d3d182a58a9e8b0b32ee008e7
 EBUILD nmap-6.25.ebuild 3547 SHA256 b8b5c805d0c654156822861b4522ae52f9aa8edb07585e7f3851e84b93134223 SHA512 69a225fb727bd472b77142e999c417875e116530c797a46bd03c3ff5b7ee2317ee2a9f763bc2dea28d288c12bd8e26d029ff0dbd4206a340ba828f7288cf8ac0 WHIRLPOOL 79d1bb42f1c3cd310dc8517bd428d5ddbbcb0f714b0e444eebb5eb4d23f9fa5fdb0003d93ecda23c740ba7ed5a548c81ec5e7712ea5e14948445f2154c4cc974
-MISC ChangeLog 36721 SHA256 a5224480645b1b68d7f18877d958b452657b2f4c99eb6b540eac03b5c0325da5 SHA512 4ef5079b6dee2520652c80920fd2fe24737897f3d8134b5793aa59dc3e56e829025ac6824ab687526ac8bfe0ca08daec6fd388e0beb7ebf17d3663266f9a5456 WHIRLPOOL d0c74db96dc3f6103b91e8465f050bbdc7d75a28cf5782bf31a99ec550f420f2f0f40ece06e96febcc5aa2200f734a7845cea14748bcc54363bef55ba034abd6
+EBUILD nmap-6.40.ebuild 3483 SHA256 07d6d08b4f75db310a7dcbadd74e0c8aff49eba2a34374fc1e3e9856e0cdc42d SHA512 22c4c1a40193889cb0de6ded0436b91f3f2d9a7d8c6f4a3ac35b447bc537259aaf8b56fcf14ef9690c189f848738379bd086b631601179218f960e6f4f72cc00 WHIRLPOOL 8f59a6fc81eaa17b0f653f4d749756f06ae5bf3aaa4448c116d4316af6e9329eb288e96ee1614a89e499c30edbf822bcfe76c68ea02ef7fb088b50c61515b067
+MISC ChangeLog 36887 SHA256 6bd32986e0fb7b42a9378fabe426723d8498a224c5298c85737525dfc6c1c5a6 SHA512 c813d42366d8ecb1cf5f4040fa5bc4daa687d07ba2c8b50810a5cd7572cd0413dfe376a7f8fe16429d4b2136f21811eff4a828994c3fee0888074da197bdf074 WHIRLPOOL 7b3c33229ddd1104093fa6a513b79a7ce36917a6e863fa1425c5410324dbbbd07930a74cf2ee58d5b93569030e092cb30cf95b714c19e9491a7196572f84db55
 MISC metadata.xml 574 SHA256 e6e3cf0019fc9c4d17536fef3c1b5a5fcb1beeab750471eb02a1e3489df76a48 SHA512 c5fa120f3d8791b13981e8480e9ccdc6425fafe69bd30d4cbb8d81f55ffdea62fe3b7cb3024b4dc731a75a23221de255d80f1edbecd73badc22008966d2ebf3a WHIRLPOOL 766163e0f94f8596c4d800ab7a0dd19a1602da0e9b4ac0d452a9e6216c9efc7041204e1e4c912997257101225ae6be471eb1c7023f54d8e6a9da491065d3ae0c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRQyH1AAoJELp701BxlEWfclgQAI5H4WgJijMyCQ+PMLo4Mnzu
-oUjSSKrvS12thj72wUuhpvlnSROyfuL3ieEYwwS6JKUY/tSaCEK2RTsm+ZPQQ1Ls
-Xx3WWTWQd4NN51DSnNo3lj3GBQEkv9w/3rbtXF1Yzjh5U+LX8Lg/62tZ34OCkkHP
-nQZXxJG8HhCMGLSfFJVwKSe4T3BU+Z7FREGIxjND5xX4EV5nPJ+0vXh4RKcmXhch
-/bN+08kAP66kRBGXYlsda8v+tPlTBq3C6ReiEzqyPWQIFAK/P9+fKbQT9Sf7ThEl
-ro5TQfnLuwYh1tJ1yHn69bUPHXtQn7j5WFZtFlb6M/QULhAy6wudTq2kgcjvnlC6
-rmQYopYtqweU9xy0yr2QG8PgmeUBnT0kbrSd0eUN/m7t3dPfnhq+QLYkQL5fos8Z
-AbgzO0SeHlWS90LpTh+olPTceXyMGMtikR5LEcQvmyer9r5wNW6nx2yFNHXc7kKC
-3mZOsXWSHrpxJOso3ZFdZ6mM0N2yF7VwpEmqOeB+kgdq+Glp4O/ct9edY7rh24lE
-W+OLJHzli0UYUCH5rweGm7eqTpOmdaN8rRdCEs699plfaS92efxv4BRw5lL3DY6h
-/TQyu1g415thc9m7b9zswiiGt0Rl4UOyIm0Y7qBALUZ8u3585rZnIiVsKzimTxvn
-s6t84kFfquCOoqp+U74x
-=+NaS
+iQIcBAEBCgAGBQJR926DAAoJEKXdFCfdEflKpDIQAJWCBaBp9TL6otl19Kb9JS0b
+hsNTkvOxXi8dru+4KW2YffBHUrTeD0jZWpyBKSq10v3zMgeqN56JtLtdWFQ0bnb8
+/98Ng4GTj4SOGpPM6uOe2IrrapLUazixqCsrI22KfN4sDP6eJ7eoTaEA459TI4e2
+WDegriWMDMmgfS1VeMjlqXdVBR7Veb8K4wuOmF8FwmvFb4i7dtULN6S+LgZEVBOm
+k8bFeovYROBcMNN1VyzrResUTd81ZXwJQzli55m2ZWPGwvyLBQem2MWFk9BaWVFu
+FfJO4sXUEe1YsxFKcdBRjjyb1Z7WQk12D5synXvCYjcJXD87A8PsS/9jljqCppq2
+vrtl3kZ886LkixlORqZ+ZYclcOFo6gpD6TJD6qYTvstCuJlXwhQ0kJMBgqDFgNV1
+yQNQqnes5dKWB+59ZEbmF9k6YkAsvkvgmmua5x7O+HPP2fBMidrv2kMn5kFpSsmq
+fl+8LF3pafQZXqQjR3pFzdAJi/bkyaxDdauqWmeHIWfs1w4wC5ylNKcWCFzTmNDn
+SK/uET4gPSrpl79ZLn9lTr3PF2bzVmI2j4Z4n3GI5PGrLPZmZ/DgPhpKArab1wwr
+zbBtGq7UNBW2piOqx71uGLeTF/tfCa2/iDQ0CkPtd4b4neEOOzS+6AZu3EceFUcn
+2kJwOYhfsDuzqXJO3jDy
+=Ib0f
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/nmap-6.40.ebuild b/net-analyzer/nmap/nmap-6.40.ebuild
new file mode 100644
index 000000000000..d2d8a8b77326
--- /dev/null
+++ b/net-analyzer/nmap/nmap-6.40.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.40.ebuild,v 1.1 2013/07/30 07:42:31 zerochaos Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic python toolchain-funcs
+
+MY_P=${P/_beta/BETA}
+
+DESCRIPTION="A utility for network exploration or security auditing"
+HOMEPAGE="http://nmap.org/"
+SRC_URI="
+	http://nmap.org/dist/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~jer/nmap-logo-64.png
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE="gtk ipv6 +lua ncat ndiff nls nmap-update nping ssl"
+NMAP_LINGUAS="de es fr hr hu id it ja pl pt_BR pt_PT ro ru sk zh"
+for lingua in ${NMAP_LINGUAS}; do
+	IUSE+=" linguas_${lingua}"
+done
+
+NMAP_PYTHON_DEPEND="
+|| (
+	dev-lang/python:2.7[sqlite]
+	dev-lang/python:2.6[sqlite]
+	dev-lang/python:2.5[sqlite]
+	dev-python/pysqlite:2
+)
+"
+RDEPEND="
+	dev-libs/apr
+	dev-libs/libpcre
+	net-libs/libpcap[ipv6?]
+	gtk? (
+		>=x11-libs/gtk+-2.6:2
+		>=dev-python/pygtk-2.6
+		${NMAP_PYTHON_DEPEND}
+	)
+	lua? ( >=dev-lang/lua-5.1.4-r1[deprecated] )
+	ndiff? ( ${NMAP_PYTHON_DEPEND} )
+	nls? ( virtual/libintl )
+	nmap-update? ( dev-libs/apr dev-vcs/subversion )
+	ssl? ( dev-libs/openssl )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use gtk || use ndiff; then
+		python_set_active_version 2
+	fi
+}
+
+src_unpack() {
+	unpack ${MY_P}.tar.bz2
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-4.75-nolua.patch \
+		"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
+		"${FILESDIR}"/${PN}-5.21-python.patch \
+		"${FILESDIR}"/${PN}-6.01-make.patch \
+		"${FILESDIR}"/${PN}-6.25-liblua-ar.patch
+	sed -i \
+		-e 's/-m 755 -s ncat/-m 755 ncat/' \
+		ncat/Makefile.in || die
+
+	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
+		done
+	fi
+
+	sed -i \
+		-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
+		Makefile.in || die
+
+	# Fix desktop files wrt bug #432714
+	sed -i \
+		-e '/^Encoding/d' \
+		-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
+		zenmap/install_scripts/unix/zenmap-root.desktop \
+		zenmap/install_scripts/unix/zenmap.desktop || die
+
+}
+
+src_configure() {
+	# The bundled libdnet is incompatible with the version available in the
+	# tree, so we cannot use the system library here.
+	econf \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_with gtk zenmap) \
+		$(use_with lua liblua) \
+		$(use_with ncat) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		--with-libdnet=included
+}
+
+src_compile() {
+	emake \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB )
+}
+
+src_install() {
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
+	if use nmap-update;then
+		LC_ALL=C emake -j1 \
+			-C nmap-update \
+			DESTDIR="${D}" \
+			STRIP=: \
+			nmapdatadir="${EPREFIX}"/usr/share/nmap \
+			install
+	fi
+
+	dodoc CHANGELOG HACKING docs/README docs/*.txt
+
+	use gtk && doicon "${DISTDIR}/nmap-logo-64.png"
+}