Clean up and trim old ebuild

8 files changed, 16 insertions, 77 deletions

diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index 29c8ccf9fcba..78c27bc4418f 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.54 2004/06/05 15:22:18 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.55 2004/06/09 18:24:02 agriffis Exp $
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> -nmap-3.00.ebuild,
+  nmap-3.30.ebuild, nmap-3.45.ebuild, nmap-3.48.ebuild, nmap-3.50-r1.ebuild,
+  nmap-3.50.ebuild:
+  Clean up and trim old ebuild
 
   05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> nmap-3.50-r1.ebuild:
   Stable on alpha.
diff --git a/net-analyzer/nmap/files/digest-nmap-3.00 b/net-analyzer/nmap/files/digest-nmap-3.00
deleted file mode 100644
index e7c718429c08..000000000000
--- a/net-analyzer/nmap/files/digest-nmap-3.00
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2b648bc66f1cedbeed230ef56f6549a8 nmap-3.00.tgz 922293
diff --git a/net-analyzer/nmap/nmap-3.00.ebuild b/net-analyzer/nmap/nmap-3.00.ebuild
deleted file mode 100644
index a9fc841a20a6..000000000000
--- a/net-analyzer/nmap/nmap-3.00.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-3.00.ebuild,v 1.8 2004/01/20 19:52:13 spock Exp $
-
-IUSE="gtk gnome ipv6"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Portscanner"
-SRC_URI="http://www.insecure.org/nmap/dist/${P}.tgz"
-HOMEPAGE="http://www.insecure.org/nmap/"
-DEPEND="virtual/glibc
-	gtk? ( =x11-libs/gtk+-1.2* )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha"
-
-src_compile() {
-	if [ `use ipv6` ]; then
-		econf --enable-ipv6	|| die
-	else
-		econf || die
-	fi
-
-	use gtk && ( \
-		make || die
-	) || (
-		make nmap || die
-	)
-}
-
-src_install() {
-	local myinst
-
-	# If gnome does not exist on the system, there is no need for the gnome
-	# menu item.
-	use gnome || myinst="${myinst} deskdir=${S}"
-
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		nmapdatadir=${D}/usr/share/nmap \
-	install || die
-
-	dodoc CHANGELOG COPYING HACKING README*
-	cd docs
-	dodoc *.txt
-	dohtml *.html
-}
-
diff --git a/net-analyzer/nmap/nmap-3.30.ebuild b/net-analyzer/nmap/nmap-3.30.ebuild
index 4f3891fdceb7..a4f4911247d3 100644
--- a/net-analyzer/nmap/nmap-3.30.ebuild
+++ b/net-analyzer/nmap/nmap-3.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-3.30.ebuild,v 1.8 2004/01/20 19:52:13 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-3.30.ebuild,v 1.9 2004/06/09 18:24:02 agriffis Exp $
 
 inherit gcc eutils
 
@@ -31,10 +31,7 @@ src_compile() {
 }
 
 src_install() {
-	einstall \
-		nmapdatadir=${D}/usr/share/nmap \
-		install \
-		|| die
+	einstall install nmapdatadir=${D}/usr/share/nmap || die
 	use gnome || rm -rf ${D}/usr/share/gnome/
 
 	dodoc CHANGELOG COPYING HACKING INSTALL README* docs/README docs/*.txt
diff --git a/net-analyzer/nmap/nmap-3.45.ebuild b/net-analyzer/nmap/nmap-3.45.ebuild
index 01c5f0c8afef..4e2a5d11411c 100644
--- a/net-analyzer/nmap/nmap-3.45.ebuild
+++ b/net-analyzer/nmap/nmap-3.45.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-3.45.ebuild,v 1.7 2004/01/20 19:52:13 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-3.45.ebuild,v 1.8 2004/06/09 18:24:02 agriffis Exp $
 
 inherit gcc eutils
 
@@ -29,10 +29,7 @@ src_compile() {
 }
 
 src_install() {
-	einstall \
-		nmapdatadir=${D}/usr/share/nmap \
-		install \
-		|| die
+	einstall install nmapdatadir=${D}/usr/share/nmap install || die
 	use gnome || rm -rf ${D}/usr/share/gnome/
 
 	dodoc CHANGELOG HACKING INSTALL docs/README docs/*.txt
diff --git a/net-analyzer/nmap/nmap-3.48.ebuild b/net-analyzer/nmap/nmap-3.48.ebuild
index 7d8f22a403f8..e78272d7f12b 100644
--- a/net-analyzer/nmap/nmap-3.48.ebuild
+++ b/net-analyzer/nmap/nmap-3.48.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-3.48.ebuild,v 1.7 2004/02/07 02:10:46 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-3.48.ebuild,v 1.8 2004/06/09 18:24:02 agriffis Exp $
 
 inherit gcc eutils
 
@@ -29,10 +29,7 @@ src_compile() {
 }
 
 src_install() {
-	einstall \
-		nmapdatadir=${D}/usr/share/nmap \
-		install \
-		|| die
+	einstall nmapdatadir=${D}/usr/share/nmap install || die
 	use gnome || rm -rf ${D}/usr/share/gnome/
 
 	dodoc CHANGELOG HACKING INSTALL docs/README docs/*.txt
diff --git a/net-analyzer/nmap/nmap-3.50-r1.ebuild b/net-analyzer/nmap/nmap-3.50-r1.ebuild
index fa5056de4e4d..195f1121da38 100644
--- a/net-analyzer/nmap/nmap-3.50-r1.ebuild
+++ b/net-analyzer/nmap/nmap-3.50-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-3.50-r1.ebuild,v 1.4 2004/06/05 15:22:18 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-3.50-r1.ebuild,v 1.5 2004/06/09 18:24:02 agriffis Exp $
 
 inherit gcc eutils
 
@@ -30,10 +30,7 @@ src_compile() {
 }
 
 src_install() {
-	einstall \
-		nmapdatadir=${D}/usr/share/nmap \
-		install \
-		|| die
+	einstall nmapdatadir=${D}/usr/share/nmap install || die
 	use gnome || rm -rf ${D}/usr/share/gnome/
 
 	dodoc CHANGELOG HACKING INSTALL docs/README docs/*.txt
diff --git a/net-analyzer/nmap/nmap-3.50.ebuild b/net-analyzer/nmap/nmap-3.50.ebuild
index 3d2f612b5c53..3d743c022c10 100644
--- a/net-analyzer/nmap/nmap-3.50.ebuild
+++ b/net-analyzer/nmap/nmap-3.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-3.50.ebuild,v 1.3 2004/02/03 15:58:17 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-3.50.ebuild,v 1.4 2004/06/09 18:24:02 agriffis Exp $
 
 inherit gcc eutils
 
@@ -29,10 +29,7 @@ src_compile() {
 }
 
 src_install() {
-	einstall \
-		nmapdatadir=${D}/usr/share/nmap \
-		install \
-		|| die
+	einstall install nmapdatadir=${D}/usr/share/nmap || die
 	use gnome || rm -rf ${D}/usr/share/gnome/
 
 	dodoc CHANGELOG HACKING INSTALL docs/README docs/*.txt