Version bump. Removed old ebuilds.

(Portage version: 2.1_pre4-r1)

6 files changed, 22 insertions, 40 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index ffd99e1f7189..c7ac9aa0d0bd 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.107 2006/01/29 22:49:44 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.108 2006/02/02 15:37:40 spock Exp $
+
+*nmap-4.00 (02 Feb 2006)
+
+  02 Feb 2006; Michał Januszewski <spock@gentoo.org> -nmap-3.90.ebuild,
+  -nmap-3.93.ebuild, +nmap-4.00.ebuild:
+  Version bump. Removed old ebuilds.
 
 *nmap-3.9999 (29 Jan 2006)
 
diff --git a/net-analyzer/nmap/files/digest-nmap-3.90 b/net-analyzer/nmap/files/digest-nmap-3.90
deleted file mode 100644
index 6985f991737f..000000000000
--- a/net-analyzer/nmap/files/digest-nmap-3.90
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0288e464b5de54c5f8cea265474c0f72 nmap-3.90.tar.bz2 1973930
diff --git a/net-analyzer/nmap/files/digest-nmap-3.93 b/net-analyzer/nmap/files/digest-nmap-3.93
deleted file mode 100644
index fbe098baf0ee..000000000000
--- a/net-analyzer/nmap/files/digest-nmap-3.93
+++ /dev/null
@@ -1 +0,0 @@
-MD5 92e69a2e8db0eb59b5d71b8b363892f2 nmap-3.93.tar.bz2 2029943
diff --git a/net-analyzer/nmap/files/digest-nmap-4.00 b/net-analyzer/nmap/files/digest-nmap-4.00
new file mode 100644
index 000000000000..c2840c264e4d
--- /dev/null
+++ b/net-analyzer/nmap/files/digest-nmap-4.00
@@ -0,0 +1,3 @@
+MD5 b409d632d753588f5691562209b83eed nmap-4.00.tar.bz2 1896480
+RMD160 42ba5d40dfe523a1265d741b2e42658a88f07b01 nmap-4.00.tar.bz2 1896480
+SHA256 bbcf97aa6afff3ff4485d6e060853d1a29e68965d0e79a6ae6c0e4a2a9fe370f nmap-4.00.tar.bz2 1896480
diff --git a/net-analyzer/nmap/nmap-3.90.ebuild b/net-analyzer/nmap/nmap-3.90.ebuild
deleted file mode 100644
index 03645df02db5..000000000000
--- a/net-analyzer/nmap/nmap-3.90.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-3.90.ebuild,v 1.2 2005/09/17 08:26:43 vapier Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="A utility for network exploration or security auditing"
-HOMEPAGE="http://www.insecure.org/nmap/"
-SRC_URI="http://download.insecure.org/nmap/dist/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="gtk ssl"
-
-DEPEND="virtual/libc
-	dev-libs/libpcre
-	gtk? ( =x11-libs/gtk+-1.2* )
-	ssl? ( dev-libs/openssl )"
-
-src_compile() {
-	use ppc-macos && filter-flags -fstrict-aliasing -O2
-	econf \
-		$(use_with gtk nmapfe) \
-		$(use_with ssl openssl) || die
-	emake -j1 || die
-}
-
-src_install() {
-	einstall -j1 nmapdatadir=${D}/usr/share/nmap install || die
-	dodoc CHANGELOG HACKING INSTALL docs/README docs/*.txt
-	dohtml docs/*.html
-}
diff --git a/net-analyzer/nmap/nmap-3.93.ebuild b/net-analyzer/nmap/nmap-4.00.ebuild
index c1ae6dbb2452..7d9eacee8f32 100644
--- a/net-analyzer/nmap/nmap-3.93.ebuild
+++ b/net-analyzer/nmap/nmap-4.00.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-3.93.ebuild,v 1.3 2005/11/29 21:23:00 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-4.00.ebuild,v 1.1 2006/02/02 15:37:40 spock Exp $
 
 inherit eutils flag-o-matic
 
@@ -15,12 +15,14 @@ IUSE="gtk ssl"
 
 DEPEND="virtual/libc
 	dev-libs/libpcre
-	gtk? ( =x11-libs/gtk+-1.2* )
+	gtk? ( =x11-libs/gtk+-2* )
 	ssl? ( dev-libs/openssl )"
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/nmap-3.93-gcc41.patch
+	cd ${S}
+	sed 's:Icon=icon-network:Icon=nmap-logo-64.png:' -i nmapfe.desktop
+	echo ";" >> nmapfe.desktop
 }
 
 src_compile() {
@@ -35,4 +37,10 @@ src_install() {
 	einstall -j1 nmapdatadir=${D}/usr/share/nmap install || die
 	dodoc CHANGELOG HACKING INSTALL docs/README docs/*.txt
 	dohtml docs/*.html
+
+	if use gtk; then
+		dodir /usr/share/pixmaps
+		insinto /usr/share/pixmaps
+		doins ${FILESDIR}/nmap-logo-64.png
+	fi
 }