Move USE=gtk to USE=zenmap in accordance with other USE flags. Clean up dependencies. Migrate to python-*-r1. Remove pysqlite dep (bug #408835).

Package-Manager: portage-2.2.0_alpha191/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

6 files changed, 157 insertions, 12 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index c5038fe71e4f..b7d27af8fac1 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,13 @@
 # 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.303 2013/08/01 16:50:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.304 2013/08/02 13:52:45 jer Exp $
+
+*nmap-6.40-r1 (02 Aug 2013)
+
+  02 Aug 2013; Jeroen Roovers <jer@gentoo.org> nmap-6.01.ebuild,
+  nmap-6.25.ebuild, +nmap-6.40-r1.ebuild, metadata.xml:
+  Move USE=gtk to USE=zenmap in accordance with other USE flags. Clean up
+  dependencies. Migrate to python-*-r1. Remove pysqlite dep (bug #408835).
 
   01 Aug 2013; Jeroen Roovers <jer@gentoo.org> nmap-6.40.ebuild,
   +files/nmap-6.40-uninstaller.patch:
diff --git a/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 1958c606ed1a..70a8b4ee3d6f 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -15,15 +15,16 @@ DIST nmap-6.01.tar.bz2 21640157 SHA256 77f6635b677d28b546cbef97e4ead6c2d4a5aebca
 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
+EBUILD nmap-6.01.ebuild 2702 SHA256 b514a45c86b72fb3ec7da0ea74ca92d65d6e2a9b1e4ac4e6003fd7f120fd58e4 SHA512 34ff2c6e56ea2b577944fd577498bae6a361e84183ff851ff02ac5d5612c60c813d9f6175542ae4feb4c0c9c3e9f50206832ef8d0db77ea3fb6124ba5b07adb2 WHIRLPOOL 04e3feceec75a4256eb0cae060c507e87fe490fa74c994a1d82925b4ae1afa68e2e41ede28360e9ada8fc4b55001b57412641f32a1c9b7e7bfdb0c26a77043b3
+EBUILD nmap-6.25.ebuild 3524 SHA256 b1520818561088c9af35d73aac7fbf253840b75b80836c340330e3e5fcbea68b SHA512 8fbc3275ddedeef28eb845423c8de0d87acae0b400169c27297b5939021522b74165311417d589e79eb89e089a6da2a47f8032190e047ede4772277bb071f215 WHIRLPOOL e2e226fc24c32a81963f37295999de5f009e065450edfcaeb8b447706a52fb53894859636024998f65432a1ea3bbd12f07e5fc344e66363af353c1ed45a65341
+EBUILD nmap-6.40-r1.ebuild 3419 SHA256 e0900a786701f226420454c9618a05c7af53097b1d5d2c1493621ee2ea9354da SHA512 cb4198df5e93d45d3af7249f51a97f32215b7973c9625b146051e3005e08838020f12b59b36bfb15e8cf5c302b74f3ab4f2e92b4e482db85ffc358c869c5f6a3 WHIRLPOOL 01054af9c9839db275b3d9b642d59ba286fa05bf4c5a9f2e4a6b68934ec45eb3b9f94d739f4a65addbc6dc61d341cbb3def7471d03fa33b1c4dd8ad2dc6b41ed
 EBUILD nmap-6.40.ebuild 3557 SHA256 eabb2dafe759296675f9742990b2402f51f661e3f82d882980dacf0282d8c688 SHA512 c1bb7dc38c4249585e2b48d9c32d6ef459f95a962efb568fca3510d84b54516f83bafd3b41b1a840cc0107e9f1ec767f1829daa637c38d330fd6ab337311e984 WHIRLPOOL c41659c5d85a8da65ef3067297b2c5c6a938ac14896319b76c412e94cb25332dbb0e61f856eb8cf0a5233619b3cf51b31c2567273c40edd23ece4f78d1a1d412
-MISC ChangeLog 37311 SHA256 46fae586e92db35ec31b75f39c02bfee2372e0701a3644c613dcdf590dd51eda SHA512 4df732651f0ff463a9fd7d6eb7b6c0273433134b3abde6603a017d738a76bb83a4d42099751d25458eb1aea366d9d78a38de84a8c40989c2251a0d7a19d764df WHIRLPOOL f6aa644f3a45f9e0e522fbbb9fb80bea43568721fdf98adf41c9a67d88443c8b62d2ac8dd6dfc5c06e8cbaa7419e76c8cee08d163e46e8de45470ee5dc5adf2e
-MISC metadata.xml 574 SHA256 e6e3cf0019fc9c4d17536fef3c1b5a5fcb1beeab750471eb02a1e3489df76a48 SHA512 c5fa120f3d8791b13981e8480e9ccdc6425fafe69bd30d4cbb8d81f55ffdea62fe3b7cb3024b4dc731a75a23221de255d80f1edbecd73badc22008966d2ebf3a WHIRLPOOL 766163e0f94f8596c4d800ab7a0dd19a1602da0e9b4ac0d452a9e6216c9efc7041204e1e4c912997257101225ae6be471eb1c7023f54d8e6a9da491065d3ae0c
+MISC ChangeLog 37611 SHA256 39ff56162eae0e9c1b6779b133634a06e6a55c7a13e4acf3769b6068f2866dc7 SHA512 d5d9332460a36695ad04ac0c527b2a5480db5a3f5af9cade402d5dda17b276fc59e6510d821495c982661eab31228917724892d23ac841bf179a52ebae45d9f3 WHIRLPOOL 302df1d4d74c078bb96ebfeb23045024898d519499617c62d879b2483730bd9785a9067914a8642389c51ad72bac70ba235149418e6f6c95b7bbebf97d3fa2fd
+MISC metadata.xml 639 SHA256 5bb4193809c829dc5c8f9101355e6f4626bf616df5f6a477e1651a53c25ca9ce SHA512 d20ddd6bdb400bf0cffde6e5530e457ff49631ffc9413a4262ac197441338b19d0a9168b8d73c79a01cfc6244e34bceb3139c8c6e45bebbfec0a192b88fc21f2 WHIRLPOOL 036edb4b7dc0f24d84d214917ab18026dc4cd5da85e3da803ed8510634cf8c5b46c06dadebbb900442d4fe2eb877ec491b337a7a26f33256847b91d4b513f2cd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlH6kcIACgkQVWmRsqeSphMSXQCdFyXesTLjuM2dRQpYG9i4RPNv
-WqgAn1V4cF1IBAy6QX2YefovLktBKPxG
-=0pi9
+iEYEAREIAAYFAlH7ua8ACgkQVWmRsqeSphO+kACZAdPdP05srRMaoo9SmJo/J5PS
+qz0An1eaeAJ/t5nbWOIfSnu7Cq01Y0PY
+=CKUm
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index 2fc58c4b77f9..3d0dd7c50725 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -8,5 +8,6 @@
 <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="nping">Install the nping utility</flag>
+<flag name="zenmap">Install the GTK+ based zenmap utility</flag>
 </use>
 </pkgmetadata>
diff --git a/net-analyzer/nmap/nmap-6.01.ebuild b/net-analyzer/nmap/nmap-6.01.ebuild
index 90d16e78940f..075605f32f82 100644
--- a/net-analyzer/nmap/nmap-6.01.ebuild
+++ b/net-analyzer/nmap/nmap-6.01.ebuild
@@ -1,6 +1,6 @@
 # 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.01.ebuild,v 1.24 2013/01/26 18:18:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild,v 1.25 2013/08/02 13:52:45 jer Exp $
 
 EAPI="4"
 
@@ -25,7 +25,6 @@ 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
 )
 "
 DEPEND="
diff --git a/net-analyzer/nmap/nmap-6.25.ebuild b/net-analyzer/nmap/nmap-6.25.ebuild
index 9b71804836c6..9983753118be 100644
--- a/net-analyzer/nmap/nmap-6.25.ebuild
+++ b/net-analyzer/nmap/nmap-6.25.ebuild
@@ -1,6 +1,6 @@
 # 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.25.ebuild,v 1.27 2013/03/15 13:30:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild,v 1.28 2013/08/02 13:52:45 jer Exp $
 
 EAPI="4"
 
@@ -30,7 +30,6 @@ 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="
diff --git a/net-analyzer/nmap/nmap-6.40-r1.ebuild b/net-analyzer/nmap/nmap-6.40-r1.ebuild
new file mode 100644
index 000000000000..992c2a84c9a8
--- /dev/null
+++ b/net-analyzer/nmap/nmap-6.40-r1.ebuild
@@ -0,0 +1,138 @@
+# 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-r1.ebuild,v 1.1 2013/08/02 13:52:45 jer Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_{5,6,7} )
+PYTHON_REQ_USE="sqlite"
+inherit eutils flag-o-matic python-single-r1 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="ipv6 +lua ncat ndiff nls nmap-update nping ssl zenmap"
+NMAP_LINGUAS=( de es fr hr hu id it ja pl pt_BR pt_PT ro ru sk zh )
+IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
+
+NMAP_PYTHON_DEPEND="
+	|| ( ${PYTHON_DEPS} )
+"
+RDEPEND="
+	dev-libs/libpcre
+	net-libs/libpcap[ipv6?]
+	zenmap? (
+		dev-python/pygtk:2
+		${NMAP_PYTHON_DEPEND}
+	)
+	lua? ( >=dev-lang/lua-5.2[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}"
+
+src_unpack() {
+	# prevent unpacking the logo
+	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 \
+		"${FILESDIR}"/${P}-uninstaller.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 zenmap) \
+		$(usex lua --with-liblua=/usr --without-liblua) \
+		$(use_with ncat) \
+		$(use_with ndiff) \
+		$(use_with nmap-update) \
+		$(use_with nping) \
+		$(use_with ssl openssl) \
+		--with-libdnet=included \
+		--with-pcre=/usr
+}
+
+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 zenmap && doicon "${DISTDIR}/nmap-logo-64.png"
+}