nmap: push latest improvments to the 9999 version

net-analyzer/nmap/Manifest

@@ -12,5 +12,5 @@ AUX nmap-6.25-su-to-zenmap.patch 667 SHA256 f59f82368f633e7de1cc3a546d513d18ad52
 AUX nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313
 AUX su-to-zenmap.sh.diff 407 SHA256 164664d9e1ff54279794fe2eb34f15d419a843e58d7633664be07be12a6cfe36 SHA512 bbab3e83d7c8365915ec948bb18b897afabbe574ed5c42ffecc528392cde5af7bc1f0a63b0b56af3616c6631e6402eda3526785221d43a02df22bfe15e63c73a WHIRLPOOL 2148ac5dd7e63ed218d2ab2d93d53da8ee605861029e83b66860ac18a39d1b5f5c1365d16c7d5533b1a6a5839e0d74bde07ba2d907bff413314714383d0ee92f
 DIST nmap-6.25.tar.bz2 7668639 SHA256 3349cc6d36b86b95ca2b8075d16615a3a598cef494920d6652f9a8bf9f7660b5 SHA512 6ec4d8f50621c86a3d0b6a22cf179a1874bf109736c5a79d6b29faec6859e165f7c0e6c3f8c284de8f384a8a607f071e2176c900b22df3ba0f158d36b081870d WHIRLPOOL b6cd57988827549762020e73ff263f5014d6c748291225d8c9792705da39188436004400b05a07414b4cc4b9ea56c75ebf7c753bbe11a5456b008041e72ebbc4
-EBUILD nmap-6.25.ebuild 3369 SHA256 f148b797b4c09da92c1a0b730ecd8a7159b223402e083aa7cab1e57751185697 SHA512 a633d616f9f27ccbd3a1b120e3c0c2efd64be23283235f15fa3f6c010b557823f86902ab7619eb0b974e3efc73bb28fd6354ee1379dc895de8b5889051e70656 WHIRLPOOL 1bcb12f9742635370228c3519f204a677e7242a26074bb09b7c0ce24ef999f10f174c2acb58cee43665ab2baec24459bcd8b46ffe4c8b166cb32b9209741f244
-EBUILD nmap-9999.ebuild 2553 SHA256 8f59c7b7457e03204a4cc6f06d40eddde7bfcc969b77e8d15521da93a0323d4b SHA512 c344fa405c9bba8117db0b008dfa0021ce6b734fa463d180a5f9245d9410af27e4254f1aa9be35f2479b76228cafd5295efe997c51685fc27562b15c65177fd6 WHIRLPOOL ddad83b78e188e321dc269a98d54d787e8a70dd87444978812010a647a71885f8a2e8e451ef902b70b62c1d1b0acc0c8f321f5020b7cfda136ac499f8008d245
+EBUILD nmap-6.25.ebuild 3367 SHA256 d8d234a33efe97545403f5d560dbae60cd276dc79f478011b1d4b80115f5f9cb SHA512 8e6e3f80befd5e9513da81ebf96ca56cd50ee68b7d8b8e5c948d37157dc1a72d7f8de95350929867080d06889eb20b39d54c8ec609ea9d8ee69f11cd657bf939 WHIRLPOOL bf195e660c31353eb4e8001792ef0ba07be8808b0e43f514c894e85754e179ed98548ca918503e695dc17615d8d5e38f7dcffe2c568802a8d68a505d1f4ea3ee
+EBUILD nmap-9999.ebuild 3131 SHA256 c332507dfb70065b5262c754313879e43e6944cf2f24d9de9fd036b7b78863da SHA512 3ad90c442fb2654143a129c10529637890df4c73546ea8fa379a4bbe8fd6d4c5a7d7b77f18622cd1979e87139faf8134183f0190fd26ac8f69a7d1a6d87b3abd WHIRLPOOL 0c7b6df67921d774fb83c0800b56e6f96b50a71cc1724fc309fab50a48392f665216898635c7650d1530cf3fd56c3d2b29999664421bfd809ec8802f2a0eb8a8

net-analyzer/nmap/nmap-6.25.ebuild

@@ -15,7 +15,7 @@ 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"
+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 python ssl"
 NMAP_LINGUAS="de es fr hr hu id it ja pl pt_BR pt_PT ro ru sk zh"

net-analyzer/nmap/nmap-9999.ebuild

@@ -1,9 +1,9 @@
 # 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.01.ebuild,v 1.3 2012/09/23 09:14:51 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild,v 1.5 2012/12/03 19:52:32 jer Exp $
 
 EAPI="4"
-PYTHON_DEPEND="2"
+PYTHON_DEPEND="python? 2"
 
 inherit eutils flag-o-matic python subversion
 
@@ -17,63 +17,118 @@ ESVN_REPO_URI="https://svn.nmap.org/nmap/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="gtk lua ncat ndiff nmap-update nping ssl"
 
-DEPEND="dev-libs/libpcre
-	net-libs/libpcap[ipv6]
+IUSE="gtk ipv6 +lua ncat ndiff nls nmap-update nping python 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
-	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 )
-		 )
+	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 )"
-RDEPEND="${DEPEND}"
+	ssl? ( dev-libs/openssl )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+REQUIRED_USE="gtk? ( python )
+	ndiff? ( python )
+"
 
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
-	python_set_active_version 2
+	use python && 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
+	epatch "${FILESDIR}"/${PN}-5.10_beta1-string.patch \
+		"${FILESDIR}"/${PN}-5.21-python.patch \
+		"${FILESDIR}"/${PN}-6.01-make.patch
+	sed -i \
+		-e 's/-m 755 -s ncat/-m 755 ncat/' \
+		ncat/Makefile.in || die
 
-	# bug #416987
-	epatch "${FILESDIR}"/${PN}-6.01-make.patch
+	mv docs/man-xlate/${PN}-j{p,a}.1 || 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' zenmap/install_scripts/unix/zenmap.desktop
-	sed -i -e '/^Encoding/d' zenmap/install_scripts/unix/zenmap-root.desktop
-	sed -i -e 's/Categories=Application;Network;Security/Categories=Network;System;Security/' zenmap/install_scripts/unix/zenmap.desktop
-	sed -i -e 's/Categories=Application;Network;Security/Categories=Network;System;Security/' zenmap/install_scripts/unix/zenmap-root.desktop
+	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 --with-libdnet=included \
+	econf \
 		$(use_with gtk zenmap) \
 		$(use_with lua liblua) \
 		$(use_with ncat) \
 		$(use_with ndiff) \
+		$(use_enable nls) \
 		$(use_with nmap-update) \
 		$(use_with nping) \
-		$(use_with ssl openssl)
+		$(use_with ssl openssl) \
+		--with-libdnet=included
 }
 
 src_install() {
-	LC_ALL=C emake DESTDIR="${D}" -j1 STRIP=: nmapdatadir="${EPREFIX}"/usr/share/nmap install
+	LC_ALL=C emake -j1 \
+		DESTDIR="${D}" \
+		STRIP=: \
+		nmapdatadir="${EPREFIX}"/usr/share/nmap \
+		install
 	if use nmap-update;then
-		LC_ALL=C emake DESTDIR="${D}" -j1 STRIP=: \
-			nmapdatadir="${EPREFIX}"/usr/share/nmap -C nmap-update install
+		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 "${FILESDIR}/nmap-logo-64.png"