10 files changed, 14 insertions, 310 deletions
diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index d990cbddea6e..3c8581e1282b 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,12 @@
 # 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.276 2013/01/11 16:49:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.277 2013/01/15 17:03:14 jer Exp $
+
+  15 Jan 2013; Jeroen Roovers <jer@gentoo.org> -files/nmap-5.00-python.patch,
+  -files/nmap-5.20-nolua.patch, -files/nmap-5.21-openssl-1.patch,
+  -nmap-5.51.ebuild, -nmap-5.51.6.ebuild, -nmap-6.00.ebuild, nmap-6.01.ebuild,
+  nmap-6.25.ebuild, -files/nmap-logo-64.png:
+  Go back to depend on net-libs/libpcap[ipv6] (bug #451162).
 
   11 Jan 2013; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Remove spock (bug #35242).
diff --git a/net-analyzer/nmap/files/nmap-5.00-python.patch b/net-analyzer/nmap/files/nmap-5.00-python.patch
deleted file mode 100644
index 82726bc33f4c..000000000000
--- a/net-analyzer/nmap/files/nmap-5.00-python.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naurp nmap-5.00-orig//Makefile.in nmap-5.00/Makefile.in
---- nmap-5.00-orig//Makefile.in	2010-04-04 11:39:01.000000000 +0200
-+++ nmap-5.00/Makefile.in	2010-04-04 11:39:29.000000000 +0200
-@@ -236,7 +236,7 @@ build-zenmap: $(ZENMAPDIR)/setup.py $(ZE
- 
- install-zenmap: $(ZENMAPDIR)/setup.py
- 	$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
--	cd $(ZENMAPDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)")
-+	cd $(ZENMAPDIR) && $(PYTHON) setup.py 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.
-@@ -250,7 +250,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
diff --git a/net-analyzer/nmap/files/nmap-5.20-nolua.patch b/net-analyzer/nmap/files/nmap-5.20-nolua.patch
deleted file mode 100644
index 5e158c568b3b..000000000000
--- a/net-analyzer/nmap/files/nmap-5.20-nolua.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naurp nmap-5.20/portlist.cc nmap-5.20-fixed/portlist.cc
---- nmap-5.20/portlist.cc	2009-12-20 04:22:19.000000000 +0100
-+++ nmap-5.20-fixed/portlist.cc	2010-01-23 09:59:21.000000000 +0100
-@@ -412,7 +412,7 @@ void PortList::setRPCProbeResults(u16 po
-   }
- }
- 
--
-+#ifndef NOLUA
- void PortList::addScriptResult(u16 portno, int protocol, ScriptResult& sr) {
-   Port *port;
- 
-@@ -420,6 +420,7 @@ void PortList::addScriptResult(u16 portn
- 
-   port->scriptResults.push_back(sr);
- }
-+#endif
- 
- /*****************************************************************************/
- /* Convert protocol name from in.h to enum portlist_proto.
-diff -Naurp nmap-5.20/portlist.h nmap-5.20-fixed/portlist.h
---- nmap-5.20/portlist.h	2009-12-20 04:22:19.000000000 +0100
-+++ nmap-5.20-fixed/portlist.h	2010-01-23 09:56:20.000000000 +0100
-@@ -278,7 +278,9 @@ class PortList {
-   void setRPCProbeResults(u16 portno, int proto, int rpc_status, unsigned long rpc_program, 
- 			  unsigned int rpc_lowver, unsigned int rpc_highver);
- 
-+#ifndef NOLUA
-   void addScriptResult(u16 portno, int protocol, ScriptResult& sr);
-+#endif
- 
-   /* Cycles through the 0 or more "ignored" ports which should be
-    consolidated for Nmap output.  They are returned sorted by the
diff --git a/net-analyzer/nmap/files/nmap-5.21-openssl-1.patch b/net-analyzer/nmap/files/nmap-5.21-openssl-1.patch
deleted file mode 100644
index b22fd38d8a81..000000000000
--- a/net-analyzer/nmap/files/nmap-5.21-openssl-1.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-http://bugs.gentoo.org/326531
-http://trac.macports.org/ticket/25593
-
---- nse_openssl.cc
-+++ nse_openssl.cc
-@@ -8,7 +8,6 @@
- #include <openssl/crypto.h>
- #include <openssl/bn.h>
- #include <openssl/rand.h>
--#include <openssl/md2.h>
- #include <openssl/md4.h>
- #include <openssl/md5.h>
- #include <openssl/sha.h>
-@@ -206,16 +205,6 @@
-   return 1;
- }
- 
--static int l_md2(lua_State *L)     /** md2(string s) */
--{
--  size_t len;
--  const unsigned char *s = (unsigned char *) luaL_checklstring( L, 1, &len );
--  unsigned char digest[16];
-- 
--  lua_pushlstring( L, (char *) MD2( s, len, digest ), 16 );
--  return 1;
--}
--
- static int l_md4(lua_State *L)     /** md4(string s) */
- {
-   size_t len;
-@@ -469,7 +458,6 @@
-   { "bignum_mod_exp", l_bignum_mod_exp },
-   { "rand_bytes", l_rand_bytes },
-   { "rand_pseudo_bytes", l_rand_pseudo_bytes },
--  { "md2", l_md2 },
-   { "md4", l_md4 },
-   { "md5", l_md5 },
-   { "sha1", l_sha1 },
diff --git a/net-analyzer/nmap/files/nmap-logo-64.png b/net-analyzer/nmap/files/nmap-logo-64.png
deleted file mode 100644
index ef0af9b1dfc2..000000000000
--- a/net-analyzer/nmap/files/nmap-logo-64.png
+++ /dev/null
diff --git a/net-analyzer/nmap/nmap-5.51.6.ebuild b/net-analyzer/nmap/nmap-5.51.6.ebuild
deleted file mode 100644
index 9a94b59a2c50..000000000000
--- a/net-analyzer/nmap/nmap-5.51.6.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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-5.51.6.ebuild,v 1.1 2012/09/25 18:54:58 pinkbyte Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-
-inherit eutils flag-o-matic python
-
-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"
-
-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
-
-	# 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
-}
-
-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 \
-		$(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"
-}
-
-pkg_postinst() {
-	if use gtk; then
-		python_mod_optimize radialnet zenmapCore zenmapGUI
-	fi
-}
-
-pkg_postrm() {
-	if use gtk; then
-		python_mod_cleanup radialnet zenmapCore zenmapGUI
-	fi
-}
diff --git a/net-analyzer/nmap/nmap-5.51.ebuild b/net-analyzer/nmap/nmap-5.51.ebuild
deleted file mode 100644
index 46bf79a10390..000000000000
--- a/net-analyzer/nmap/nmap-5.51.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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-5.51.ebuild,v 1.11 2012/09/23 09:14:51 pinkbyte Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-
-inherit eutils flag-o-matic python
-
-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"
-
-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
-
-	# 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
-}
-
-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 \
-		$(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"
-}
diff --git a/net-analyzer/nmap/nmap-6.00.ebuild b/net-analyzer/nmap/nmap-6.00.ebuild
deleted file mode 100644
index 36ce131c1fb3..000000000000
--- a/net-analyzer/nmap/nmap-6.00.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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.00.ebuild,v 1.5 2012/08/31 16:54:12 jer Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-
-inherit eutils flag-o-matic python
-
-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"
-
-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[ipv6]
-	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 )
-		 )
-	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 \
-		$(use_with gtk zenmap) \
-		$(use_with lua liblua) \
-		$(use_with ssl openssl)
-}
-
-src_compile() {
-	# bug #416987
-	emake -j1
-}
-
-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"
-}
diff --git a/net-analyzer/nmap/nmap-6.01.ebuild b/net-analyzer/nmap/nmap-6.01.ebuild
index 14603074fd63..0484a9dc18ba 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.16 2013/01/01 19:03:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.01.ebuild,v 1.17 2013/01/15 17:03:14 jer Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -19,7 +19,7 @@ SRC_URI="
 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 ipv6 lua ncat ndiff nmap-update nping ssl"
+IUSE="gtk lua ncat ndiff nmap-update nping ssl"
 
 NMAP_PYTHON_DEPEND="
 || (
@@ -32,7 +32,7 @@ NMAP_PYTHON_DEPEND="
 DEPEND="
 	dev-libs/apr
 	dev-libs/libpcre
-	net-libs/libpcap[ipv6?]
+	net-libs/libpcap[ipv6]
 	gtk? (
 		>=x11-libs/gtk+-2.6:2
 		>=dev-python/pygtk-2.6
diff --git a/net-analyzer/nmap/nmap-6.25.ebuild b/net-analyzer/nmap/nmap-6.25.ebuild
index 1e74a4ae736e..effca50ced65 100644
--- a/net-analyzer/nmap/nmap-6.25.ebuild
+++ b/net-analyzer/nmap/nmap-6.25.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.5 2012/12/03 19:52:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.25.ebuild,v 1.6 2013/01/15 17:03:14 jer Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -20,7 +20,7 @@ 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 ipv6 +lua ncat ndiff nls nmap-update nping ssl"
+IUSE="gtk +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}"
@@ -37,7 +37,7 @@ NMAP_PYTHON_DEPEND="
 RDEPEND="
 	dev-libs/apr
 	dev-libs/libpcre
-	net-libs/libpcap[ipv6?]
+	net-libs/libpcap[ipv6]
 	gtk? (
 		>=x11-libs/gtk+-2.6:2
 		>=dev-python/pygtk-2.6