12 files changed, 20 insertions, 124 deletions
diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index 66a812b8c791..4912e65ca260 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/nmap
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.60 2004/07/31 21:45:50 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.61 2004/08/16 10:48:28 eldad Exp $
+
+  16 Aug 2004; Eldad Zack <eldad@gentoo.org> -nmap-3.30.ebuild,
+  -nmap-3.45.ebuild, nmap-3.55.ebuild:
+  x86 stable
 
   31 Jul 2004; Tom Gall <tgall@gentoo.org> nmap-3.55.ebuild:
   stable on ppc64, bug #57451
diff --git a/net-analyzer/nmap/files/digest-nmap-3.30 b/net-analyzer/nmap/files/digest-nmap-3.30
deleted file mode 100644
index dd1321a58c20..000000000000
--- a/net-analyzer/nmap/files/digest-nmap-3.30
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 639fc1c91f48319eca97401e74f9c90e nmap-3.30.tar.bz2 918954
-MD5 8b2d99c9ce76001cd3dcd91ef4bed9b7 nmap-3.20_statistics-1.diff 6323
diff --git a/net-analyzer/nmap/files/digest-nmap-3.45 b/net-analyzer/nmap/files/digest-nmap-3.45
deleted file mode 100644
index 8f3393e6ff1b..000000000000
--- a/net-analyzer/nmap/files/digest-nmap-3.45
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 9219fe0907a83bddbfd1b99a21ba35ac nmap-3.45.tar.bz2 1221032
-MD5 8b2d99c9ce76001cd3dcd91ef4bed9b7 nmap-3.20_statistics-1.diff 6323
diff --git a/net-analyzer/nmap/nmap-3.30.ebuild b/net-analyzer/nmap/nmap-3.30.ebuild
deleted file mode 100644
index 16eebcc9160e..000000000000
--- a/net-analyzer/nmap/nmap-3.30.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.12 2004/07/20 14:43:43 spock Exp $
-
-inherit gcc eutils
-
-DESCRIPTION="A utility for network exploration or security auditing"
-SRC_URI="http://www.insecure.org/nmap/dist/${P}.tar.bz2
-	http://www.packetstormsecurity.nl/UNIX/nmap/${PN}-3.20_statistics-1.diff"
-HOMEPAGE="http://www.insecure.org/nmap/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa amd64"
-IUSE="gtk gnome"
-
-DEPEND="virtual/libc
-	gtk? ( =x11-libs/gtk+-1.2* )"
-
-src_compile() {
-	epatch ${DISTDIR}/${PN}-3.20_statistics-1.diff
-	# fix header
-	if [ `gcc-major-version` -eq 3 ] ; then
-		cp nbase/nbase.h nbase/nbase.h.old
-		sed -e 's:char \*strcasestr://:' \
-			nbase/nbase.h.old > nbase/nbase.h
-	fi
-
-	econf `use_with gtk nmapfe` || die
-	emake || die
-}
-
-src_install() {
-	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
-	dohtml docs/*.html
-}
diff --git a/net-analyzer/nmap/nmap-3.45.ebuild b/net-analyzer/nmap/nmap-3.45.ebuild
deleted file mode 100644
index c02d4a762fd4..000000000000
--- a/net-analyzer/nmap/nmap-3.45.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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.11 2004/07/20 14:43:43 spock Exp $
-
-inherit gcc eutils
-
-DESCRIPTION="A utility for network exploration or security auditing"
-SRC_URI="http://www.insecure.org/nmap/dist/${P}.tar.bz2
-	http://www.packetstormsecurity.nl/UNIX/nmap/${PN}-3.20_statistics-1.diff"
-HOMEPAGE="http://www.insecure.org/nmap/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc ~alpha hppa ~amd64"
-IUSE="gtk gnome"
-
-DEPEND="virtual/libc
-	gtk? ( =x11-libs/gtk+-1.2* )"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd ${S}
-	epatch ${DISTDIR}/${PN}-3.20_statistics-1.diff
-}
-
-src_compile() {
-	econf `use_with gtk nmapfe` || die
-	emake || die
-}
-
-src_install() {
-	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
-	dohtml docs/*.html
-}
diff --git a/net-analyzer/nmap/nmap-3.55.ebuild b/net-analyzer/nmap/nmap-3.55.ebuild
index 83aa3bb2144a..259f38221618 100644
--- a/net-analyzer/nmap/nmap-3.55.ebuild
+++ b/net-analyzer/nmap/nmap-3.55.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-3.55.ebuild,v 1.4 2004/07/31 21:45:50 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-3.55.ebuild,v 1.5 2004/08/16 10:48:28 eldad Exp $
 
 inherit gcc eutils gnuconfig
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.insecure.org/nmap/dist/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~amd64 ppc64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~arm ~hppa ~amd64 ppc64"
 IUSE="gtk gnome"
 
 DEPEND="virtual/libc
diff --git a/net-analyzer/packit/ChangeLog b/net-analyzer/packit/ChangeLog
index 5e74e1064c0a..4517b4e4a494 100644
--- a/net-analyzer/packit/ChangeLog
+++ b/net-analyzer/packit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/packit
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/packit/ChangeLog,v 1.12 2004/07/27 13:24:41 alexander Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/packit/ChangeLog,v 1.13 2004/08/16 10:48:07 eldad Exp $
+
+  16 Aug 2004; Eldad Zack <eldad@gentoo.org> -packit-0.6.0c-r1.ebuild,
+  packit-1.0.ebuild:
+  x86 stable
 
   27 Jul 2004; Alexander Plank <alexander@gentoo.org> packit-1.0.ebuild:
   Added to ~macos (~ because fink libnet conflicts with it). Builds, but doesn't 
diff --git a/net-analyzer/packit/files/digest-packit-0.6.0c-r1 b/net-analyzer/packit/files/digest-packit-0.6.0c-r1
deleted file mode 100644
index 7a7ec2481622..000000000000
--- a/net-analyzer/packit/files/digest-packit-0.6.0c-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 972946d7134c1a35ff1a7308cbafa9ca packit-0.6.0c.tgz 114265
diff --git a/net-analyzer/packit/packit-0.6.0c-r1.ebuild b/net-analyzer/packit/packit-0.6.0c-r1.ebuild
deleted file mode 100644
index 88b0ef4b0972..000000000000
--- a/net-analyzer/packit/packit-0.6.0c-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/packit/packit-0.6.0c-r1.ebuild,v 1.6 2004/07/11 10:34:11 eldad Exp $
-
-inherit eutils
-
-DESCRIPTION="network auditing tool that allows you to monitor, manipulate, and inject customized IPv4 traffic"
-HOMEPAGE="http://www.packetfactory.net/projects/packit/"
-SRC_URI="http://www.packetfactory.net/projects/packit/downloads/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND=">=net-libs/libnet-1.1.0-r3"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	has_version '>=net-libs/libpcap-0.8.1' \
-		&& sed -i 's!^#include <net/bpf.h>$!#include <pcap-bpf.h>!' \
-		include/packit.h
-}
-
-src_compile() {
-	econf || die "configure failed"
-	emake || die "configure failed"
-}
-
-src_install() {
-	make install DESTDIR=${D} || die
-	dodoc INSTALL LICENSE VERSION docs/*
-}
diff --git a/net-analyzer/packit/packit-1.0.ebuild b/net-analyzer/packit/packit-1.0.ebuild
index d1d2d9139a3f..e935f806d3ce 100644
--- a/net-analyzer/packit/packit-1.0.ebuild
+++ b/net-analyzer/packit/packit-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/packit/packit-1.0.ebuild,v 1.3 2004/07/27 13:24:41 alexander Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/packit/packit-1.0.ebuild,v 1.4 2004/08/16 10:48:07 eldad Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.packetfactory.net/projects/packit/downloads/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~macos"
+KEYWORDS="x86 ~ppc ~macos"
 IUSE=""
 
 DEPEND=">=net-libs/libnet-1.1.2*"
diff --git a/net-analyzer/pmacct/ChangeLog b/net-analyzer/pmacct/ChangeLog
index 8edf2c3993ca..e157f67c957b 100644
--- a/net-analyzer/pmacct/ChangeLog
+++ b/net-analyzer/pmacct/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/pmacct
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.3 2004/07/17 09:58:17 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.4 2004/08/16 10:49:34 eldad Exp $
+
+  16 Aug 2004; Eldad Zack <eldad@gentoo.org> pmacct-0.7.1.ebuild:
+  x86 stable
 
   17 Jul 2004; David Holm <dholm@gentoo.org> pmacct-0.7.1.ebuild:
   Added to ~ppc.
diff --git a/net-analyzer/pmacct/pmacct-0.7.1.ebuild b/net-analyzer/pmacct/pmacct-0.7.1.ebuild
index 7ed52b6e2f60..661cfa29d62d 100644
--- a/net-analyzer/pmacct/pmacct-0.7.1.ebuild
+++ b/net-analyzer/pmacct/pmacct-0.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.7.1.ebuild,v 1.2 2004/07/17 09:58:17 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.7.1.ebuild,v 1.3 2004/08/16 10:49:34 eldad Exp $
 
 DESCRIPTION="A network tool to gather ip traffic informations"
 HOMEPAGE="http://www.ba.cnr.it/~paolo/pmacct/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.ba.cnr.it/~paolo/pmacct/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE="mysql postgres mmap"
 
 RDEPEND="net-libs/libpcap