Cleanup

Package-Manager: portage-2.1.3.7

102 files changed, 116 insertions, 1893 deletions

diff --git a/net-analyzer/ibmonitor/ChangeLog b/net-analyzer/ibmonitor/ChangeLog
index c78bae55ba79..d298aaaef53c 100644
--- a/net-analyzer/ibmonitor/ChangeLog
+++ b/net-analyzer/ibmonitor/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/ibmonitor
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ibmonitor/ChangeLog,v 1.15 2007/03/20 14:17:24 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ibmonitor/ChangeLog,v 1.16 2007/09/06 17:22:08 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -ibmonitor-1.3.ebuild:
+  Cleanup
 
   20 Mar 2007; Raúl Porcel <armin76@gentoo.org> ibmonitor-1.4.ebuild:
   x86 stable
diff --git a/net-analyzer/ibmonitor/files/digest-ibmonitor-1.3 b/net-analyzer/ibmonitor/files/digest-ibmonitor-1.3
deleted file mode 100644
index bac226dd9fcc..000000000000
--- a/net-analyzer/ibmonitor/files/digest-ibmonitor-1.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6f37ee0b00b62822823cdbabc9d7419e ibmonitor-1.3.tar.gz 17101
-RMD160 e6b284ad29880c6fbc07c6d58644f95f3e39d0ab ibmonitor-1.3.tar.gz 17101
-SHA256 eb88bd6849964d397f9c44802cf252486988e7f4126f3c1130f3022c84c2d758 ibmonitor-1.3.tar.gz 17101
diff --git a/net-analyzer/ibmonitor/ibmonitor-1.3.ebuild b/net-analyzer/ibmonitor/ibmonitor-1.3.ebuild
deleted file mode 100644
index 794c50f00ca8..000000000000
--- a/net-analyzer/ibmonitor/ibmonitor-1.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ibmonitor/ibmonitor-1.3.ebuild,v 1.5 2006/11/20 21:26:24 blubb Exp $
-
-DESCRIPTION="Interactive bandwidth monitor"
-HOMEPAGE="http://ibmonitor.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}.tar.gz"
-
-KEYWORDS="~amd64 ~hppa ~ppc x86"
-IUSE=""
-
-LICENSE="GPL-2"
-SLOT="0"
-
-S=${WORKDIR}/${PN}
-
-DEPEND="dev-perl/TermReadKey"
-
-src_compile() {
-	einfo "Nothing to compile."
-}
-
-src_install() {
-	dodir /usr/bin
-	dobin ibmonitor
-
-	dodoc AUTHORS ChangeLog README TODO
-}
diff --git a/net-analyzer/ike-scan/ChangeLog b/net-analyzer/ike-scan/ChangeLog
index ece1c3be9169..d5a1722fd5e6 100644
--- a/net-analyzer/ike-scan/ChangeLog
+++ b/net-analyzer/ike-scan/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/ike-scan
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ike-scan/ChangeLog,v 1.8 2007/07/01 09:37:10 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ike-scan/ChangeLog,v 1.9 2007/09/06 17:22:32 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -ike-scan-1.8-r1.ebuild:
+  Cleanup
 
   01 Jul 2007; Peter Weller <welp@gentoo.org> ike-scan-1.9.ebuild:
   Keyworded ~amd64 wrt bug 183634
diff --git a/net-analyzer/ike-scan/files/digest-ike-scan-1.8-r1 b/net-analyzer/ike-scan/files/digest-ike-scan-1.8-r1
deleted file mode 100644
index b1a7a0ec29c4..000000000000
--- a/net-analyzer/ike-scan/files/digest-ike-scan-1.8-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 961310e6f3c07d26c90447e392dfb97e ike-scan-1.8.tar.gz 1376995
-RMD160 25a55ef2679c5d42ab979d7b22e6ed0af33834b6 ike-scan-1.8.tar.gz 1376995
-SHA256 fc7b4aea32e4cf577411237410323c8bc327f65e54b88184b1a85118d79c918c ike-scan-1.8.tar.gz 1376995
diff --git a/net-analyzer/ike-scan/ike-scan-1.8-r1.ebuild b/net-analyzer/ike-scan/ike-scan-1.8-r1.ebuild
deleted file mode 100644
index 223932ed0f74..000000000000
--- a/net-analyzer/ike-scan/ike-scan-1.8-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ike-scan/ike-scan-1.8-r1.ebuild,v 1.2 2007/01/31 01:29:15 vanquirius Exp $
-
-DESCRIPTION="A utility for finding, fingerprinting and testing IKE VPN servers"
-HOMEPAGE="http://www.nta-monitor.com/ike-scan/"
-SRC_URI="http://www.nta-monitor.com/ike-scan/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc x86"
-IUSE="ssl"
-
-DEPEND="virtual/libc
-	ssl? ( dev-libs/openssl )"
-
-src_compile() {
-	# --disable-lookup prevents ike-scan from phoning home
-	# for more information, please see bug 157507
-	econf $(use_with ssl openssl) --disable-lookup || die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog NEWS README TODO
-	dodoc udp-backoff-fingerprinting-paper.txt
-}
diff --git a/net-analyzer/ipaudit/ChangeLog b/net-analyzer/ipaudit/ChangeLog
index 5d037636b4e6..ee38574043bf 100644
--- a/net-analyzer/ipaudit/ChangeLog
+++ b/net-analyzer/ipaudit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/ipaudit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipaudit/ChangeLog,v 1.8 2007/06/17 11:12:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipaudit/ChangeLog,v 1.9 2007/09/06 17:23:06 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -ipaudit-1.0_beta1.ebuild:
+  Cleanup
 
   17 Jun 2007; Raúl Porcel <armin76@gentoo.org> ipaudit-1.0_beta2.ebuild:
   x86 stable wrt #181590
diff --git a/net-analyzer/ipaudit/files/digest-ipaudit-1.0_beta1 b/net-analyzer/ipaudit/files/digest-ipaudit-1.0_beta1
deleted file mode 100644
index 5d37f3acbba4..000000000000
--- a/net-analyzer/ipaudit/files/digest-ipaudit-1.0_beta1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3e84ade8c2adb52c644e7d76a80b4a1d ipaudit-1.0BETA1.tar.gz 132549
-RMD160 05f74332ef292351e25b55cebdc7fe9e401147bb ipaudit-1.0BETA1.tar.gz 132549
-SHA256 c896e1cbefe213b926bf0ad808c1cfe9d979bc767fac763084e75150af1db298 ipaudit-1.0BETA1.tar.gz 132549
diff --git a/net-analyzer/ipaudit/ipaudit-1.0_beta1.ebuild b/net-analyzer/ipaudit/ipaudit-1.0_beta1.ebuild
deleted file mode 100644
index 2ed78d81fe68..000000000000
--- a/net-analyzer/ipaudit/ipaudit-1.0_beta1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipaudit/ipaudit-1.0_beta1.ebuild,v 1.3 2006/11/23 19:48:11 vivo Exp $
-
-inherit eutils
-DESCRIPTION="IPAudit monitors network activity on a network by host, protocol and port."
-HOMEPAGE="http://ipaudit.sourceforge.net/"
-MY_P="${PN}-${PV/_beta/BETA}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="mysql"
-DEPEND="virtual/libpcap
-		mysql? ( virtual/mysql )"
-#RDEPEND=""
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	econf `use_with mysql` || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS README
-}
diff --git a/net-analyzer/iptraf/ChangeLog b/net-analyzer/iptraf/ChangeLog
index b5b8451c1811..28324ec5c74b 100644
--- a/net-analyzer/iptraf/ChangeLog
+++ b/net-analyzer/iptraf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/iptraf
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.59 2007/09/03 05:40:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.60 2007/09/06 17:23:45 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -iptraf-3.0.0.ebuild:
+  Cleanup
 
   03 Sep 2007; Jeroen Roovers <jer@gentoo.org> iptraf-3.0.0-r4.ebuild:
   Back to ~arch (bug #190032).
diff --git a/net-analyzer/iptraf/files/digest-iptraf-3.0.0 b/net-analyzer/iptraf/files/digest-iptraf-3.0.0
deleted file mode 100644
index 335cb474aa92..000000000000
--- a/net-analyzer/iptraf/files/digest-iptraf-3.0.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 377371c28ee3c21a76f7024920649ea8 iptraf-3.0.0.tar.gz 575169
-RMD160 aaef797076056d6b788a9c9eff29500060594526 iptraf-3.0.0.tar.gz 575169
-SHA256 9ee433d95573d612539da4b452e6cdcbca6ab6674a88bfbf6eaf12d4902b5163 iptraf-3.0.0.tar.gz 575169
diff --git a/net-analyzer/iptraf/iptraf-3.0.0.ebuild b/net-analyzer/iptraf/iptraf-3.0.0.ebuild
deleted file mode 100644
index 6c6dad3759c0..000000000000
--- a/net-analyzer/iptraf/iptraf-3.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/iptraf-3.0.0.ebuild,v 1.2 2006/03/05 20:53:03 jokey Exp $
-
-inherit eutils
-
-DESCRIPTION="IPTraf is an ncurses-based IP LAN monitor"
-HOMEPAGE="http://iptraf.seul.org/"
-SRC_URI="ftp://iptraf.seul.org/pub/iptraf/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=sys-libs/ncurses-5.2-r1"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-atheros.patch
-	epatch "${FILESDIR}"/${P}-build.patch
-	epatch "${FILESDIR}"/${P}-linux-headers.patch
-	sed -i \
-		-e 's:/var/local/iptraf:/var/lib/iptraf:g' \
-		-e "s:Documentation/:/usr/share/doc/${PF}:g" \
-		Documentation/*.* || die "sed doc paths"
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" LDOPTS="${LDFLAGS}" TARGET="/usr/sbin" WORKDIR="/var/lib/iptraf" -C src || die
-}
-
-src_install() {
-	dosbin src/{iptraf,rawtime,rvnamed} || die
-	dodoc FAQ README* CHANGES RELEASE-NOTES
-	doman Documentation/*.8
-	dohtml -r Documentation/*
-	keepdir /var/{lib,run,log}/iptraf
-}
diff --git a/net-analyzer/iptstate/ChangeLog b/net-analyzer/iptstate/ChangeLog
index d63c89e6616c..889be11ea9a8 100644
--- a/net-analyzer/iptstate/ChangeLog
+++ b/net-analyzer/iptstate/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/iptstate
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptstate/ChangeLog,v 1.28 2007/08/08 14:13:17 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptstate/ChangeLog,v 1.29 2007/09/06 17:25:02 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -iptstate-1.4.ebuild:
+  Cleanup
 
   08 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org> iptstate-2.2.1.ebuild:
   Stable on sparc
diff --git a/net-analyzer/iptstate/files/digest-iptstate-1.4 b/net-analyzer/iptstate/files/digest-iptstate-1.4
deleted file mode 100644
index b3c5ae07b693..000000000000
--- a/net-analyzer/iptstate/files/digest-iptstate-1.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 717b13d5b6521ac1b8683caf1dc247a0 iptstate-1.4.tar.bz2 13834
-RMD160 464db9790f62f65652677f1b3d2db64395c00f33 iptstate-1.4.tar.bz2 13834
-SHA256 441b64f618efd4bbe90eb19ce9521cbae99ce6e4ef884d5532ab37857ddcc803 iptstate-1.4.tar.bz2 13834
diff --git a/net-analyzer/iptstate/iptstate-1.4.ebuild b/net-analyzer/iptstate/iptstate-1.4.ebuild
deleted file mode 100644
index 82efce881a2c..000000000000
--- a/net-analyzer/iptstate/iptstate-1.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptstate/iptstate-1.4.ebuild,v 1.6 2006/03/20 19:46:04 gustavoz Exp $
-
-DESCRIPTION="IP Tables State displays states being kept by iptables in a top-like format"
-SRC_URI="http://www.phildev.net/iptstate/${P}.tar.bz2"
-HOMEPAGE="http://www.phildev.net/iptstate/"
-
-DEPEND="sys-libs/ncurses"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~amd64 ~hppa ~ppc sparc x86"
-IUSE=""
-
-src_compile() {
-	make CXXFLAGS="${CXXFLAGS} -g -Wall" all || die
-}
-
-src_install() {
-	make PREFIX=${D}/usr install || die
-	dodoc README Changelog BUGS CONTRIB LICENSE WISHLIST
-}
diff --git a/net-analyzer/isic/ChangeLog b/net-analyzer/isic/ChangeLog
index 8e580037b38e..1de2498c29d6 100644
--- a/net-analyzer/isic/ChangeLog
+++ b/net-analyzer/isic/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/isic
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/isic/ChangeLog,v 1.13 2007/03/20 14:34:06 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/isic/ChangeLog,v 1.14 2007/09/06 17:25:44 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org>
+  -files/isic-0.06-gcc4.patch, -files/isic-0.06-makefile.patch,
+  -isic-0.06.ebuild:
+  Cleanup
 
   20 Mar 2007; Raúl Porcel <armin76@gentoo.org> isic-0.07.ebuild:
   x86 stable
diff --git a/net-analyzer/isic/files/digest-isic-0.06 b/net-analyzer/isic/files/digest-isic-0.06
deleted file mode 100644
index 4375a98ec186..000000000000
--- a/net-analyzer/isic/files/digest-isic-0.06
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 289304088b6bd34008449ec20b3af423 isic-0.06.tgz 27611
-RMD160 2f6a336d4a4a59f4e85b51c45bab83ff3f1390b5 isic-0.06.tgz 27611
-SHA256 e198c4061798d47fd4b00f9f90cd56336145e551ca763571c2023624dfa7bc5f isic-0.06.tgz 27611
diff --git a/net-analyzer/isic/files/isic-0.06-gcc4.patch b/net-analyzer/isic/files/isic-0.06-gcc4.patch
deleted file mode 100644
index a2b9087650bd..000000000000
--- a/net-analyzer/isic/files/isic-0.06-gcc4.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -urN ../tmp-orig/isic-0.05/icmpsic.c ./icmpsic.c
---- ../tmp-orig/isic-0.05/icmpsic.c	2000-01-25 18:35:25.000000000 +0100
-+++ ./icmpsic.c	2004-12-20 14:29:04.714661648 +0100
-@@ -253,7 +253,7 @@
- 
- 		payload = (short int *)((u_char *) icmp + 4);
- 		for(cx = 0; cx <= (payload_s >> 1); cx+=1)
--				(u_short) payload[cx] = rand() & 0xffff;
-+				payload[cx] = rand() & 0xffff;
- 
- 
- 		if ( rand() <= (RAND_MAX * ICMPCksm) )
-diff -urN ../tmp-orig/isic-0.05/isic.c ./isic.c
---- ../tmp-orig/isic-0.05/isic.c	2000-01-30 22:55:25.000000000 +0100
-+++ ./isic.c	2004-12-20 14:28:13.952378688 +0100
-@@ -232,8 +232,8 @@
- 		
- 		payload = (short int *)(buf + IP_H);
- 		for(cx = 0; cx <= (payload_s >> 1); cx+=1)
--				(u_int16_t) payload[cx] = rand() & 0xffff;
--		(u_int16_t) payload[payload_s] = rand() & 0xffff;
-+				payload[cx] = rand() & 0xffff;
-+		payload[payload_s] = rand() & 0xffff;
- 		
- 		if ( printout ) {
- 			printf("%s ->",
-diff -urN ../tmp-orig/isic-0.05/tcpsic.c ./tcpsic.c
---- ../tmp-orig/isic-0.05/tcpsic.c	2000-01-29 20:04:13.000000000 +0100
-+++ ./tcpsic.c	2004-12-20 14:28:36.223992888 +0100
-@@ -304,7 +304,7 @@
- 
- 		payload = (short int *)((u_char *) tcp + 20);
- 		for(cx = 0; cx <= (payload_s >> 1); cx+=1)
--				(u_int16_t) payload[cx] = rand() & 0xffff;
-+				payload[cx] = rand() & 0xffff;
- 
- 		if ( rand() <= (RAND_MAX * TCPCksm) )
- 			libnet_do_checksum(buf, IPPROTO_TCP, (tcp->th_off << 2)
-diff -urN ../tmp-orig/isic-0.05/udpsic.c ./udpsic.c
---- ../tmp-orig/isic-0.05/udpsic.c	2000-01-29 20:04:14.000000000 +0100
-+++ ./udpsic.c	2004-12-20 14:28:51.290702400 +0100
-@@ -279,7 +279,7 @@
- 
- 		payload = (short int *)((u_char *) udp + UDP_H);
- 		for(cx = 0; cx <= (payload_s >> 1); cx+=1)
--				(u_int16_t) payload[cx] = rand() & 0xffff;
-+				payload[cx] = rand() & 0xffff;
- 
- 		if ( printout ) {
- 			printf("%s,%i ->",
diff --git a/net-analyzer/isic/files/isic-0.06-makefile.patch b/net-analyzer/isic/files/isic-0.06-makefile.patch
deleted file mode 100644
index 242652af7cca..000000000000
--- a/net-analyzer/isic/files/isic-0.06-makefile.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- Makefile.in.orig	2005-01-08 19:17:21.034270168 +0930
-+++ Makefile.in	2005-01-08 19:19:10.175678152 +0930
-@@ -2,7 +2,7 @@
- # To build for Trinux, add '-static' to LDFLAGS
- # and 'strip *sic' after they compile
- 
--PREFIX ?= /usr/local
-+BINDIR	= @bindir@
- 
- CC	= @CC@
- DEFS	= @DEFS@ `libnet-config --defines`
-@@ -20,19 +20,19 @@
- all: $(BINS)
- 
- isic:	isic.c isic.h
--	gcc -o isic isic.c -Wall -W $(CFLAGS) $(DEFS) $(LIBS) $(LDFLAGS)
-+	$(CC) -o isic isic.c -Wall -W $(CFLAGS) $(DEFS) $(LIBS) $(LDFLAGS)
- 
- tcpsic:	tcpsic.c isic.h
--	gcc -o tcpsic tcpsic.c -Wall -W $(CFLAGS) $(DEFS) $(LIBS) $(LDFLAGS)
-+	$(CC) -o tcpsic tcpsic.c -Wall -W $(CFLAGS) $(DEFS) $(LIBS) $(LDFLAGS)
- 
- udpsic:	udpsic.c isic.h
--	gcc -o udpsic udpsic.c -Wall -W $(CFLAGS) $(DEFS) $(LIBS) $(LDFLAGS)
-+	$(CC) -o udpsic udpsic.c -Wall -W $(CFLAGS) $(DEFS) $(LIBS) $(LDFLAGS)
- 
- icmpsic: icmpsic.c isic.h
--	gcc -o icmpsic icmpsic.c -Wall -W $(CFLAGS) $(DEFS) $(LIBS) $(LDFLAGS)
-+	$(CC) -o icmpsic icmpsic.c -Wall -W $(CFLAGS) $(DEFS) $(LIBS) $(LDFLAGS)
- 
- esic: esic.c isic.h
--	gcc -o esic esic.c -Wall -W $(CFLAGS) $(DEFS) $(LIBS) $(LDFLAGS)
-+	$(CC) -o esic esic.c -Wall -W $(CFLAGS) $(DEFS) $(LIBS) $(LDFLAGS)
- 
- realclean: distclean
- distclean: clean
-@@ -48,5 +48,5 @@
- 	  tar -czvf isic-$(VERSION).tgz isic-$(VERSION)/* )
- 
- install: $(BINS)
--	$(INSTALL) -m 0755 -d ${PREFIX}/bin
--	$(INSTALL) -m 0755 -c $(BINS) ${PREFIX}/bin
-+	$(INSTALL) -m 0755 -d $(DESTDIR)$(BINDIR)
-+	$(INSTALL) -m 0755 -c $(BINS) $(DESTDIR)$(BINDIR)
diff --git a/net-analyzer/isic/isic-0.06.ebuild b/net-analyzer/isic/isic-0.06.ebuild
deleted file mode 100644
index 9fcb7626359d..000000000000
--- a/net-analyzer/isic/isic-0.06.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/isic/isic-0.06.ebuild,v 1.6 2005/08/16 19:25:29 blubb Exp $
-
-inherit eutils
-
-DESCRIPTION="IP Stack Integrity Checker"
-HOMEPAGE="http://www.packetfactory.net/projects/ISIC/"
-SRC_URI="http://www.packetfactory.net/projects/ISIC/${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-DEPEND=">=net-libs/libnet-1.1"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-makefile.patch
-	epatch ${FILESDIR}/${P}-gcc4.patch
-}
-
-src_compile() {
-	econf --bindir=/usr/bin || die "configure died"
-	emake || die "make died"
-}
-
-src_install() {
-	make install DESTDIR=${D} || die
-	dodoc README
-}
diff --git a/net-analyzer/knetscan/ChangeLog b/net-analyzer/knetscan/ChangeLog
index 5989233b5e56..5d99026ef4d0 100644
--- a/net-analyzer/knetscan/ChangeLog
+++ b/net-analyzer/knetscan/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/knetscan
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/knetscan/ChangeLog,v 1.27 2007/02/01 12:14:04 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/knetscan/ChangeLog,v 1.28 2007/09/06 17:26:40 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -knetscan-1.0.ebuild:
+  Cleanup
 
   01 Feb 2007; Markus Rothe <corsair@gentoo.org> knetscan-1.0-r1.ebuild:
   Stable on ppc64
diff --git a/net-analyzer/knetscan/files/digest-knetscan-1.0 b/net-analyzer/knetscan/files/digest-knetscan-1.0
deleted file mode 100644
index c0ec10c09b39..000000000000
--- a/net-analyzer/knetscan/files/digest-knetscan-1.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 556922ce27cf4516af5dcb3e48e153fd knetscan-1.0.tar.gz 520842
-RMD160 6d558caec0ba2bed527aed2c625d4ae7a695d410 knetscan-1.0.tar.gz 520842
-SHA256 4651d434e42e64e3aa41c17dd09e9400553f10ff91ceafa1a4dc40c2147ef824 knetscan-1.0.tar.gz 520842
diff --git a/net-analyzer/knetscan/knetscan-1.0.ebuild b/net-analyzer/knetscan/knetscan-1.0.ebuild
deleted file mode 100644
index f34d8f4171c6..000000000000
--- a/net-analyzer/knetscan/knetscan-1.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/knetscan/knetscan-1.0.ebuild,v 1.15 2006/07/10 15:19:27 blubb Exp $
-
-ARTS_REQUIRED="yes"
-inherit kde eutils
-
-DESCRIPTION="KDE frontend for nmap, ping, whois and traceroute"
-HOMEPAGE="http://sourceforge.net/projects/knetscan"
-SRC_URI="mirror://sourceforge/knetscan/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND=">=net-analyzer/nmap-2.54_beta36
-	>=net-analyzer/traceroute-1.4_p12
-	>=net-misc/whois-4.5.28-r1
-	>=sys-apps/netkit-base-0.17-r5"
-
-need-kde 3
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-desktop.diff
-}
diff --git a/net-analyzer/linkchecker/ChangeLog b/net-analyzer/linkchecker/ChangeLog
index bcaab3569725..40ce1ffebf3d 100644
--- a/net-analyzer/linkchecker/ChangeLog
+++ b/net-analyzer/linkchecker/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/linkchecker
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/ChangeLog,v 1.31 2007/08/14 21:06:41 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/ChangeLog,v 1.32 2007/09/06 17:29:03 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -linkchecker-4.6.ebuild:
+  Cleanup
 
   14 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   linkchecker-4.7.ebuild:
diff --git a/net-analyzer/linkchecker/files/digest-linkchecker-4.6 b/net-analyzer/linkchecker/files/digest-linkchecker-4.6
deleted file mode 100644
index dce5859af0f4..000000000000
--- a/net-analyzer/linkchecker/files/digest-linkchecker-4.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 310a8fce39ef502687d4f6e0d771899d linkchecker-4.6.tar.gz 607101
-RMD160 2af71f51b39d839d8afc275dd8b0ec295629ae9a linkchecker-4.6.tar.gz 607101
-SHA256 e65df696bd1a65934ee4982fc363943b6c1a200a95e2d428c23f89d3f2a4cd87 linkchecker-4.6.tar.gz 607101
diff --git a/net-analyzer/linkchecker/linkchecker-4.6.ebuild b/net-analyzer/linkchecker/linkchecker-4.6.ebuild
deleted file mode 100644
index c881d55d343b..000000000000
--- a/net-analyzer/linkchecker/linkchecker-4.6.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-4.6.ebuild,v 1.3 2007/07/14 17:18:32 mabi Exp $
-
-inherit distutils
-
-DESCRIPTION="LinkChecker can check HTML documents for broken links."
-HOMEPAGE="http://linkchecker.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-DEPEND=">=dev-lang/python-2.4"
diff --git a/net-analyzer/mrtg/ChangeLog b/net-analyzer/mrtg/ChangeLog
index 71dc07f4ff3c..5cf38dd3f872 100644
--- a/net-analyzer/mrtg/ChangeLog
+++ b/net-analyzer/mrtg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/mrtg
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/ChangeLog,v 1.83 2007/08/04 11:05:21 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/ChangeLog,v 1.84 2007/09/06 17:29:52 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -mrtg-2.14.5.ebuild,
+  -mrtg-2.15.0.ebuild, -mrtg-2.15.1.ebuild:
+  Cleanup
 
   04 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org> mrtg-2.15.2.ebuild:
   ppc stable, bug #184623
diff --git a/net-analyzer/mrtg/files/digest-mrtg-2.14.5 b/net-analyzer/mrtg/files/digest-mrtg-2.14.5
deleted file mode 100644
index 61ab971f72f4..000000000000
--- a/net-analyzer/mrtg/files/digest-mrtg-2.14.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2840275a76ad9ce1f00c07047814b0a4 mrtg-2.14.5.tar.gz 1100574
-RMD160 08597e98a555c5e7dc8e2e3eca23fedf2fbef487 mrtg-2.14.5.tar.gz 1100574
-SHA256 8274d440165d3b6d6daaf976a9b240d311184f7fa86cd1b3a72b39834bc949f1 mrtg-2.14.5.tar.gz 1100574
diff --git a/net-analyzer/mrtg/files/digest-mrtg-2.15.0 b/net-analyzer/mrtg/files/digest-mrtg-2.15.0
deleted file mode 100644
index df174b2b931f..000000000000
--- a/net-analyzer/mrtg/files/digest-mrtg-2.15.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3417d8d43c25f5bcdeebff70e68ccb82 mrtg-2.15.0.tar.gz 1068297
-RMD160 69905525f63082f701f9eeafd8471050f4db4f98 mrtg-2.15.0.tar.gz 1068297
-SHA256 a5eee677b77db669c1552e3e7d7cd31ae83f7d6683ca9b0638c7a0604983736c mrtg-2.15.0.tar.gz 1068297
diff --git a/net-analyzer/mrtg/files/digest-mrtg-2.15.1 b/net-analyzer/mrtg/files/digest-mrtg-2.15.1
deleted file mode 100644
index 8b0dedfefab6..000000000000
--- a/net-analyzer/mrtg/files/digest-mrtg-2.15.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 32f5c62c0b6fc9b2f9cb00fe3098811d mrtg-2.15.1.tar.gz 1069188
-RMD160 0db71cfa6cd0f0db9ab973b51ce8cca403760505 mrtg-2.15.1.tar.gz 1069188
-SHA256 6d9bd56d511939268b17100b98937f599f1c6c49a4f40b3df16fcf5b0a3b07bc mrtg-2.15.1.tar.gz 1069188
diff --git a/net-analyzer/mrtg/mrtg-2.14.5.ebuild b/net-analyzer/mrtg/mrtg-2.14.5.ebuild
deleted file mode 100644
index 09cc3d6cdea2..000000000000
--- a/net-analyzer/mrtg/mrtg-2.14.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.14.5.ebuild,v 1.11 2007/05/01 18:00:04 genone Exp $
-
-DESCRIPTION="A tool to monitor the traffic load on network-links"
-HOMEPAGE="http://oss.oetiker.ch/mrtg/"
-SRC_URI="http://oss.oetiker.ch/mrtg/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="virtual/libc
-	dev-lang/perl
-	>=media-libs/gd-1.8.4"
-
-src_install () {
-	keepdir /var/lib/mrtg
-
-	make DESTDIR="${D}" install || die "make install failed"
-	mv "${D}"/usr/share/doc/mrtg2  "${D}"/usr/share/doc/${PF}
-
-	newinitd "${FILESDIR}"/mrtg.rc ${PN}
-	newconfd "${FILESDIR}"/mrtg.confd ${PN}
-
-}
-
-pkg_postinst(){
-	elog "You must configure mrtg before being able to run it. Try cfgmaker."
-	elog "The following thread may be useful:"
-	elog "http://forums.gentoo.org/viewtopic-t-105862.html"
-}
diff --git a/net-analyzer/mrtg/mrtg-2.15.0.ebuild b/net-analyzer/mrtg/mrtg-2.15.0.ebuild
deleted file mode 100644
index 0aed170fc2aa..000000000000
--- a/net-analyzer/mrtg/mrtg-2.15.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.15.0.ebuild,v 1.8 2007/05/01 18:00:04 genone Exp $
-
-DESCRIPTION="A tool to monitor the traffic load on network-links"
-HOMEPAGE="http://oss.oetiker.ch/mrtg/"
-SRC_URI="http://oss.oetiker.ch/mrtg/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="virtual/libc
-	dev-lang/perl
-	>=media-libs/gd-1.8.4"
-
-src_install () {
-	keepdir /var/lib/mrtg
-
-	make DESTDIR="${D}" install || die "make install failed"
-	mv "${D}"/usr/share/doc/mrtg2  "${D}"/usr/share/doc/${PF}
-
-	newinitd "${FILESDIR}"/mrtg.rc ${PN}
-	newconfd "${FILESDIR}"/mrtg.confd ${PN}
-
-}
-
-pkg_postinst(){
-	elog "You must configure mrtg before being able to run it. Try cfgmaker."
-	elog "The following thread may be useful:"
-	elog "http://forums.gentoo.org/viewtopic-t-105862.html"
-}
diff --git a/net-analyzer/mrtg/mrtg-2.15.1.ebuild b/net-analyzer/mrtg/mrtg-2.15.1.ebuild
deleted file mode 100644
index 899ae4d4bea2..000000000000
--- a/net-analyzer/mrtg/mrtg-2.15.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.15.1.ebuild,v 1.7 2007/05/17 20:20:34 armin76 Exp $
-
-DESCRIPTION="A tool to monitor the traffic load on network-links"
-HOMEPAGE="http://oss.oetiker.ch/mrtg/"
-SRC_URI="http://oss.oetiker.ch/mrtg/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ~hppa ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="virtual/libc
-	dev-lang/perl
-	>=media-libs/gd-1.8.4"
-
-src_install () {
-	keepdir /var/lib/mrtg
-
-	make DESTDIR="${D}" install || die "make install failed"
-	mv "${D}"/usr/share/doc/mrtg2  "${D}"/usr/share/doc/${PF}
-
-	newinitd "${FILESDIR}"/mrtg.rc ${PN}
-	newconfd "${FILESDIR}"/mrtg.confd ${PN}
-
-}
-
-pkg_postinst(){
-	elog "You must configure mrtg before being able to run it. Try cfgmaker."
-	elog "The following thread may be useful:"
-	elog "http://forums.gentoo.org/viewtopic-t-105862.html"
-}
diff --git a/net-analyzer/mtr/ChangeLog b/net-analyzer/mtr/ChangeLog
index dfd212673f07..d78196fc12d2 100644
--- a/net-analyzer/mtr/ChangeLog
+++ b/net-analyzer/mtr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/mtr
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.69 2007/07/19 17:55:30 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.70 2007/09/06 17:30:56 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -mtr-0.69.ebuild,
+  -mtr-0.69-r1.ebuild, -mtr-0.71.ebuild:
+  Cleanup
 
   19 Jul 2007; Fabian Groffen <grobian@gentoo.org> mtr-0.69.ebuild,
   mtr-0.69-r1.ebuild, mtr-0.71.ebuild, mtr-0.72.ebuild:
diff --git a/net-analyzer/mtr/files/digest-mtr-0.69 b/net-analyzer/mtr/files/digest-mtr-0.69
deleted file mode 100644
index 57bb920a4145..000000000000
--- a/net-analyzer/mtr/files/digest-mtr-0.69
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 58904d6d8d70114195cdeb653d56914c mtr-0.69.tar.gz 183216
-RMD160 e95e0f27253d8d94587b429cbb65311035e93c2e mtr-0.69.tar.gz 183216
-SHA256 39363164cf411f2fa265f422a87ec3ccfe34b38b955a29114774b1bb5039e216 mtr-0.69.tar.gz 183216
diff --git a/net-analyzer/mtr/files/digest-mtr-0.69-r1 b/net-analyzer/mtr/files/digest-mtr-0.69-r1
deleted file mode 100644
index 57bb920a4145..000000000000
--- a/net-analyzer/mtr/files/digest-mtr-0.69-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 58904d6d8d70114195cdeb653d56914c mtr-0.69.tar.gz 183216
-RMD160 e95e0f27253d8d94587b429cbb65311035e93c2e mtr-0.69.tar.gz 183216
-SHA256 39363164cf411f2fa265f422a87ec3ccfe34b38b955a29114774b1bb5039e216 mtr-0.69.tar.gz 183216
diff --git a/net-analyzer/mtr/files/digest-mtr-0.71 b/net-analyzer/mtr/files/digest-mtr-0.71
deleted file mode 100644
index 82f096d2fc66..000000000000
--- a/net-analyzer/mtr/files/digest-mtr-0.71
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8c1c9f5db2c599eea3b12bfed8b80618 mtr-0.71.tar.gz 205442
-RMD160 9979721f39a83f4ad6d41d3e9f4c7848b7a99745 mtr-0.71.tar.gz 205442
-SHA256 b742c46797ba23000e149c99127580d541ed44a69b5bbc44323211665c95e02a mtr-0.71.tar.gz 205442
diff --git a/net-analyzer/mtr/mtr-0.69-r1.ebuild b/net-analyzer/mtr/mtr-0.69-r1.ebuild
deleted file mode 100644
index 0388e72fc533..000000000000
--- a/net-analyzer/mtr/mtr-0.69-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.69-r1.ebuild,v 1.15 2007/07/20 09:15:42 grobian Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="My TraceRoute. Excellent network diagnostic tool."
-HOMEPAGE="http://www.bitwizard.nl/mtr/"
-SRC_URI="ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sparc x86"
-IUSE="gtk ipv6"
-
-DEPEND="dev-util/pkgconfig
-	sys-libs/ncurses
-	gtk? ( >=x11-libs/gtk+-2 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-ac-res_mkquery.patch"
-	# bug 104718
-	epatch "${FILESDIR}/${P}-debian.patch"
-}
-
-src_compile() {
-	autoconf || die "autoconf failed"
-
-	local myconf
-	use gtk || myconf="${myconf} --without-gtk"
-
-	[[ ${CHOST} == *-darwin* ]] && append-flags "-DBIND_8_COMPAT"
-	append-ldflags $(bindnow-flags)
-
-	econf ${myconf} \
-		$(use_enable gtk gtk2) \
-		$(use_enable ipv6) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	# this binary is universal. ie: it does both console and gtk.
-	make DESTDIR="${D}" sbindir=/usr/bin install || die "make install failed"
-
-	insinto /usr/share/${PN} ; doins img/mtr_icon.xpm
-
-	fowners root:wheel /usr/bin/mtr
-	fperms 4710 /usr/bin/mtr
-
-	dodoc AUTHORS ChangeLog FORMATS NEWS README SECURITY TODO
-}
diff --git a/net-analyzer/mtr/mtr-0.69.ebuild b/net-analyzer/mtr/mtr-0.69.ebuild
deleted file mode 100644
index 2111dcb5d31c..000000000000
--- a/net-analyzer/mtr/mtr-0.69.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.69.ebuild,v 1.14 2007/08/25 14:30:36 vapier Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="My TraceRoute. Excellent network diagnostic tool."
-HOMEPAGE="http://www.bitwizard.nl/mtr/"
-SRC_URI="ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc s390 sparc x86"
-IUSE="gtk ipv6"
-
-DEPEND="dev-util/pkgconfig
-	sys-libs/ncurses
-	gtk? ( >=x11-libs/gtk+-2 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-ac-res_mkquery.patch"
-}
-
-src_compile() {
-	autoconf || die "autoconf failed"
-
-	local myconf
-	use gtk || myconf="${myconf} --without-gtk"
-
-	append-ldflags -Wl,-z,now
-
-	econf ${myconf} \
-		$(use_enable gtk gtk2) \
-		$(use_enable ipv6) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	# this binary is universal. ie: it does both console and gtk.
-	make DESTDIR="${D}" sbindir=/usr/bin install || die "make install failed"
-
-	insinto /usr/share/${PN} ; doins img/mtr_icon.xpm
-
-	fowners root:wheel /usr/bin/mtr
-	fperms 4710 /usr/bin/mtr
-
-	dodoc AUTHORS ChangeLog FORMATS NEWS README SECURITY TODO
-}
diff --git a/net-analyzer/mtr/mtr-0.71.ebuild b/net-analyzer/mtr/mtr-0.71.ebuild
deleted file mode 100644
index a60a9a6ba332..000000000000
--- a/net-analyzer/mtr/mtr-0.71.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.71.ebuild,v 1.4 2007/07/20 09:15:42 grobian Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="My TraceRoute. Excellent network diagnostic tool."
-HOMEPAGE="http://www.bitwizard.nl/mtr/"
-SRC_URI="ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86"
-IUSE="gtk ipv6"
-
-DEPEND="dev-util/pkgconfig
-	sys-libs/ncurses
-	gtk? ( >=x11-libs/gtk+-2 )"
-
-src_compile() {
-	autoconf || die "autoconf failed"
-
-	local myconf
-	use gtk || myconf="${myconf} --without-gtk"
-
-	[[ ${CHOST} == *-darwin* ]] && append-flags "-DBIND_8_COMPAT"
-	append-ldflags $(bindnow-flags)
-
-	econf ${myconf} \
-		$(use_enable gtk gtk2) \
-		$(use_enable ipv6) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	# this binary is universal. ie: it does both console and gtk.
-	make DESTDIR="${D}" sbindir=/usr/bin install || die "make install failed"
-
-	insinto /usr/share/${PN} ; doins img/mtr_icon.xpm
-
-	fowners root:wheel /usr/bin/mtr
-	fperms 4710 /usr/bin/mtr
-
-	dodoc AUTHORS ChangeLog FORMATS NEWS README SECURITY TODO
-}
diff --git a/net-analyzer/nb/ChangeLog b/net-analyzer/nb/ChangeLog
index 2bb0a22345ac..5de464f0e0cc 100644
--- a/net-analyzer/nb/ChangeLog
+++ b/net-analyzer/nb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/nb
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/ChangeLog,v 1.5 2006/10/08 22:01:16 jokey Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/ChangeLog,v 1.6 2007/09/06 17:33:08 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -nb-0.6.2.ebuild:
+  Cleanup
 
   08 Oct 2006; Markus Ullmann <jokey@gentoo.org> nb-0.6.5.ebuild:
   Adding samples and docs
diff --git a/net-analyzer/nb/files/digest-nb-0.6.2 b/net-analyzer/nb/files/digest-nb-0.6.2
deleted file mode 100644
index 918d32d2ee94..000000000000
--- a/net-analyzer/nb/files/digest-nb-0.6.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 669b1404eace19b76ae52e0586209a99 nb-0.6.2-source.tar.gz 514411
-RMD160 fd136cdf41efce87a86557c4d24f763fd70b500c nb-0.6.2-source.tar.gz 514411
-SHA256 09c05456f5aa1bde562c4658de0a452c4fd0a8da6997b9e8aaec353993a80d58 nb-0.6.2-source.tar.gz 514411
diff --git a/net-analyzer/nb/nb-0.6.2.ebuild b/net-analyzer/nb/nb-0.6.2.ebuild
deleted file mode 100644
index b45e921668e2..000000000000
--- a/net-analyzer/nb/nb-0.6.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/nb-0.6.2.ebuild,v 1.3 2007/07/11 23:49:24 mr_bones_ Exp $
-
-DESCRIPTION="Nodebrain is a tool to monitor and do event correlation."
-HOMEPAGE="http://www.nodebrain.org/"
-SRC_URI="mirror://sourceforge/nodebrain/${P}-source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-
-src_compile() {
-	./build-nb || die
-}
-
-src_install() {
-	DIR=${D}/usr ./install-nb || die
-
-	exeinto /usr/bin
-	doexe bin/nb*
-
-	dodoc AUTHORS NEWS README THANKS sample/*
-	dohtml html/*
-}
diff --git a/net-analyzer/nbtscan/ChangeLog b/net-analyzer/nbtscan/ChangeLog
index 62b8bbc638e0..e30ba6953eef 100644
--- a/net-analyzer/nbtscan/ChangeLog
+++ b/net-analyzer/nbtscan/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/nbtscan
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nbtscan/ChangeLog,v 1.23 2006/10/28 10:46:05 opfer Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nbtscan/ChangeLog,v 1.24 2007/09/06 17:33:37 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -nbtscan-1.5.1.ebuild:
+  Cleanup
 
   28 Oct 2006; Christian Faulhammer <opfer@gentoo.org>
   nbtscan-1.5.1-r1.ebuild:
diff --git a/net-analyzer/nbtscan/files/digest-nbtscan-1.5.1 b/net-analyzer/nbtscan/files/digest-nbtscan-1.5.1
deleted file mode 100644
index 3e66278102c6..000000000000
--- a/net-analyzer/nbtscan/files/digest-nbtscan-1.5.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 85bb085077c380b82a6ff73e0de0c154 nbtscan-1.5.1.tar.gz 82107
-RMD160 5130d9e6decd3346859281f45f8a179aa0286a42 nbtscan-1.5.1.tar.gz 82107
-SHA256 f9f95d5555356c8d467a576e69d9d348bf2a821ded9a85f895b5e6d21e2aa7eb nbtscan-1.5.1.tar.gz 82107
diff --git a/net-analyzer/nbtscan/nbtscan-1.5.1.ebuild b/net-analyzer/nbtscan/nbtscan-1.5.1.ebuild
deleted file mode 100644
index 20bc9155c75b..000000000000
--- a/net-analyzer/nbtscan/nbtscan-1.5.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nbtscan/nbtscan-1.5.1.ebuild,v 1.13 2006/10/16 00:29:41 jokey Exp $
-
-inherit eutils
-
-DESCRIPTION="NBTscan is a program for scanning IP networks for NetBIOS name information"
-HOMEPAGE="http://www.inetcat.org/software/nbtscan.html"
-SRC_URI="http://www.sourcefiles.org/Networking/Tools/Miscellanenous/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc-macos sparc x86"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-S=${WORKDIR}/${P}a
-
-src_compile() {
-	./configure --host=${CHOST} --prefix=/usr  || die
-	emake CFLAGS="${CFLAGS}" || die
-}
-
-src_install () {
-	dobin nbtscan
-	dodoc ChangeLog README
-}
diff --git a/net-analyzer/netdiscover/ChangeLog b/net-analyzer/netdiscover/ChangeLog
index 90e64768621a..178711c52692 100644
--- a/net-analyzer/netdiscover/ChangeLog
+++ b/net-analyzer/netdiscover/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/netdiscover
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netdiscover/ChangeLog,v 1.5 2007/02/20 00:17:02 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netdiscover/ChangeLog,v 1.6 2007/09/06 17:37:14 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org>
+  -netdiscover-0.3_beta5.ebuild:
+  Cleanup
 
   20 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/net-analyzer/netdiscover/files/digest-netdiscover-0.3_beta5 b/net-analyzer/netdiscover/files/digest-netdiscover-0.3_beta5
deleted file mode 100644
index bbe7b3082b19..000000000000
--- a/net-analyzer/netdiscover/files/digest-netdiscover-0.3_beta5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 de30ff57b01584789d6bec0d1466e66d netdiscover-0.3-beta5.tar.gz 394639
-RMD160 0663b5943c529ffad84f5a0aa3fbe4b4489577b4 netdiscover-0.3-beta5.tar.gz 394639
-SHA256 c81d5a2bbcbfc79dde4c229a0597a5a45aefded887fffb632203a1f3fc99e279 netdiscover-0.3-beta5.tar.gz 394639
diff --git a/net-analyzer/netdiscover/netdiscover-0.3_beta5.ebuild b/net-analyzer/netdiscover/netdiscover-0.3_beta5.ebuild
deleted file mode 100644
index 52dca97652aa..000000000000
--- a/net-analyzer/netdiscover/netdiscover-0.3_beta5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netdiscover/netdiscover-0.3_beta5.ebuild,v 1.2 2006/02/10 05:04:39 deltacow Exp $
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-IUSE=""
-
-DESCRIPTION="An active/passive address reconnaissance tool."
-HOMEPAGE="http://nixgeneration.com/~jaime/netdiscover/"
-SRC_URI="http://nixgeneration.com/~jaime/netdiscover/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=net-libs/libnet-1.1.2.1-r1
-	>=net-libs/libpcap-0.8.3-r1"
-
-S=${WORKDIR}/${MY_P}
-
-src_install()
-{
-	dobin src/netdiscover
-	dodoc AUTHORS README TODO
-}
diff --git a/net-analyzer/neti/ChangeLog b/net-analyzer/neti/ChangeLog
index 89697c252c41..15f765dd33e3 100644
--- a/net-analyzer/neti/ChangeLog
+++ b/net-analyzer/neti/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/neti
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/neti/ChangeLog,v 1.16 2007/04/28 17:41:13 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/neti/ChangeLog,v 1.17 2007/09/06 17:38:44 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -files/neti-init,
+  -neti-1.01-r2.ebuild:
+  Cleanup
 
   28 Apr 2007; Sven Wegener <swegener@gentoo.org> neti-1.01-r2.ebuild:
   Fix *initd, *confd and *envd calls (#173884, #174266)
diff --git a/net-analyzer/neti/files/digest-neti-1.01-r2 b/net-analyzer/neti/files/digest-neti-1.01-r2
deleted file mode 100644
index 108caa5aecce..000000000000
--- a/net-analyzer/neti/files/digest-neti-1.01-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4f349c70fc499b6c06ae01516e6748bb neti-1.01.tar.gz 118884
-RMD160 d4026190fea41d8364b27437cd0802d1d09899b6 neti-1.01.tar.gz 118884
-SHA256 dce2fd1cddb1356bac823109a0c5991962c4bb7c356cfa7de11e1a92f4c2e016 neti-1.01.tar.gz 118884
diff --git a/net-analyzer/neti/files/neti-init b/net-analyzer/neti/files/neti-init
deleted file mode 100644
index b41b348845e7..000000000000
--- a/net-analyzer/neti/files/neti-init
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/neti/files/neti-init,v 1.3 2005/04/29 22:47:24 dragonheart Exp $
-
-depend() {
-    need net
-}
-
-start() {
-	ebegin "Starting netiathome"
-	start-stop-daemon --start --background --quiet --exec /usr/sbin/NETIStart
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping netiathome"
-	start-stop-daemon --stop --quiet --exec /usr/bin/tethereal
-	eend $?
-}
diff --git a/net-analyzer/neti/neti-1.01-r2.ebuild b/net-analyzer/neti/neti-1.01-r2.ebuild
deleted file mode 100644
index dd31f86d3947..000000000000
--- a/net-analyzer/neti/neti-1.01-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/neti/neti-1.01-r2.ebuild,v 1.3 2007/04/28 17:41:13 swegener Exp $
-
-DESCRIPTION="NETI@Home research project from GATech"
-HOMEPAGE="http://www.neti.gatech.edu"
-SRC_URI="mirror://sourceforge/neti/${P}.tar.gz"
-KEYWORDS="~ppc x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="zlib java"
-
-RDEPEND="java? ( || ( >=virtual/jdk-1.2 >=virtual/jre-1.2 ) )
-	net-analyzer/wireshark
-	virtual/libc"
-
-DEPEND="java? ( >=virtual/jdk-1.2 )
-	net-libs/libpcap"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# start-stop-daemon asks for this
-	sed -i -e "1i\#\!/bin/sh" NETIStart || die "sed NETIStart failed"
-}
-
-src_compile() {
-	econf \
-		`use_with zlib` \
-		 || die "failed to configure"
-
-	emake NETILogParse neti \
-		|| die "failed to make"
-
-	if use java;
-	then
-		emake javadir=/usr/share/${PN} classjava.stamp
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-sbinPROGRAMS install-sbinSCRIPTS \
-		install-sysconfDATA install-man || die "install failed"
-
-	if use java;
-	then
-		emake javadir=/usr/share/${PN} \
-			 DESTDIR="${D}" install-javaJAVA install-javaDATA || die "java install failed"
-	fi
-
-	dobin /usr/bin
-	echo java -cp /usr/share/${PN} NETIMap > "${D}"/usr/bin/NETIMap
-	fperms ugo+x /usr/bin/NETIMap
-	dodoc COPYING
-	newinitd "${FILESDIR}"/neti-init neti
-	sed -i -e s/ethereal/shark/g "${D}"/etc/init.d/neti "${D}"/usr/sbin/NETIStart
-}
diff --git a/net-analyzer/nfdump/ChangeLog b/net-analyzer/nfdump/ChangeLog
index 5dd417828ae2..5d0944728eb3 100644
--- a/net-analyzer/nfdump/ChangeLog
+++ b/net-analyzer/nfdump/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/nfdump
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.3 2007/03/22 14:47:50 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/ChangeLog,v 1.4 2007/09/06 17:41:07 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -nfdump-1.5.ebuild:
+  Cleanup
 
 *nfdump-1.5.1 (22 Mar 2007)
 
diff --git a/net-analyzer/nfdump/files/digest-nfdump-1.5 b/net-analyzer/nfdump/files/digest-nfdump-1.5
deleted file mode 100644
index 4d653ca33b55..000000000000
--- a/net-analyzer/nfdump/files/digest-nfdump-1.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 47a823b88210d979ad36a55bc4eebcae nfdump-1.5.tar.gz 187689
-RMD160 aa35eb5102f8ce42eb57e60150af5f7c8af50d17 nfdump-1.5.tar.gz 187689
-SHA256 d1c70b0f7340d1c1bdc016132310a7656f085d3c84f20eb9a6eff646344fb48d nfdump-1.5.tar.gz 187689
diff --git a/net-analyzer/nfdump/nfdump-1.5.ebuild b/net-analyzer/nfdump/nfdump-1.5.ebuild
deleted file mode 100644
index c35a411ee986..000000000000
--- a/net-analyzer/nfdump/nfdump-1.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nfdump/nfdump-1.5.ebuild,v 1.1 2006/03/27 22:24:15 jokey Exp $
-
-inherit eutils
-
-DESCRIPTION="A set of tools to collect and process netflow data"
-HOMEPAGE="http://nfdump.sourceforge.net/"
-SRC_URI="mirror://sourceforge/nfdump/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/perl"
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc README
-}
diff --git a/net-analyzer/nstats/ChangeLog b/net-analyzer/nstats/ChangeLog
index 5179a29ee75c..ac2209cd108a 100644
--- a/net-analyzer/nstats/ChangeLog
+++ b/net-analyzer/nstats/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/nstats
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nstats/ChangeLog,v 1.15 2006/08/16 00:58:03 squinky86 Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nstats/ChangeLog,v 1.16 2007/09/06 17:46:03 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -nstats-0.4.ebuild:
+  Cleanup
 
   16 Aug 2006; Jon Hood <squinky86@gentoo.org> nstats-0.4-r1.ebuild:
   Stable on amd64, bug #143909. Thanks postmodern <brodigan@pdx.edu>.
diff --git a/net-analyzer/nstats/files/digest-nstats-0.4 b/net-analyzer/nstats/files/digest-nstats-0.4
deleted file mode 100644
index 1cd6129b6dad..000000000000
--- a/net-analyzer/nstats/files/digest-nstats-0.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 92e737781d918ae68fd27b5fa16d5dec nstats-0.4.tar.gz 71526
-RMD160 af5f7f5b3bc1be052d2b979d890f7b14d959d87b nstats-0.4.tar.gz 71526
-SHA256 ab36626ca06e734800a31ec64f76bf1dc0d9e579f3542155a7ce89030f74aaf4 nstats-0.4.tar.gz 71526
diff --git a/net-analyzer/nstats/nstats-0.4.ebuild b/net-analyzer/nstats/nstats-0.4.ebuild
deleted file mode 100644
index e9cecf72b008..000000000000
--- a/net-analyzer/nstats/nstats-0.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nstats/nstats-0.4.ebuild,v 1.13 2006/02/15 23:39:26 jokey Exp $
-
-inherit eutils
-
-DESCRIPTION="Displays statistics about ethernet traffic including protocol breakdown"
-SRC_URI="http://trash.net/~reeler/nstats/files/${P}.tar.gz"
-HOMEPAGE="http://trash.net/~reeler/nstats/"
-
-SLOT="0"
-LICENSE="Artistic"
-KEYWORDS="~amd64 ~ppc sparc x86"
-IUSE=""
-
-DEPEND="net-libs/libpcap"
-
-src_unpack(){
-	unpack ${A}
-	#rename bmon to bmon.nstats to avoid conflict with net-analyzer/bmon
-	epatch ${FILESDIR}/${P}-makefile.patch
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc BUGS COPYING doc/TODO doc/ChangeLog
-}
diff --git a/net-analyzer/p0f/ChangeLog b/net-analyzer/p0f/ChangeLog
index 95382daca5a3..fec328ac07a6 100644
--- a/net-analyzer/p0f/ChangeLog
+++ b/net-analyzer/p0f/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/p0f
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/ChangeLog,v 1.37 2007/07/12 15:21:07 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/ChangeLog,v 1.38 2007/09/06 17:47:40 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -files/p0f.initd,
+  -p0f-2.0.3.ebuild, -p0f-2.0.5.ebuild, -p0f-2.0.6.ebuild:
+  Cleanup
 
   12 Jul 2007; Gustavo Zacarias <gustavoz@gentoo.org> p0f-2.0.8-r1.ebuild:
   Stable on sparc
diff --git a/net-analyzer/p0f/files/digest-p0f-2.0.3 b/net-analyzer/p0f/files/digest-p0f-2.0.3
deleted file mode 100644
index b31f633465ac..000000000000
--- a/net-analyzer/p0f/files/digest-p0f-2.0.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 583688a4c5718eec0bb34102b3ac457b p0f-2.0.3.tgz 119407
-RMD160 dfd960f51040289fc28aca5e4505654965094906 p0f-2.0.3.tgz 119407
-SHA256 e2d58c71a5e014e8391789f48f787c493b1c81901001c55d5ce888aba5b84a41 p0f-2.0.3.tgz 119407
diff --git a/net-analyzer/p0f/files/digest-p0f-2.0.5 b/net-analyzer/p0f/files/digest-p0f-2.0.5
deleted file mode 100644
index 6c3b8b5796fa..000000000000
--- a/net-analyzer/p0f/files/digest-p0f-2.0.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 78235749e8ada6ad2b16b40fe15081f6 p0f-2.0.5.tgz 130002
-RMD160 34ee678aa721ee38959419808ed798aa23228a16 p0f-2.0.5.tgz 130002
-SHA256 563c62f63acfbef79e79659c3f483813816c7d032ef73e96e462a3b4f9a2fc7f p0f-2.0.5.tgz 130002
diff --git a/net-analyzer/p0f/files/digest-p0f-2.0.6 b/net-analyzer/p0f/files/digest-p0f-2.0.6
deleted file mode 100644
index 8bfdb2ca91f0..000000000000
--- a/net-analyzer/p0f/files/digest-p0f-2.0.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d6333198027b90e05ccb3412d8f25d05 p0f-2.0.6.tgz 131668
-RMD160 926ae9a8ec382d158df000175612421f7bddc6d1 p0f-2.0.6.tgz 131668
-SHA256 95aaf7861475c76929a08aeb4b7dca3ee912a5405fbbb1e4b80b8cadc3600441 p0f-2.0.6.tgz 131668
diff --git a/net-analyzer/p0f/files/p0f.initd b/net-analyzer/p0f/files/p0f.initd
deleted file mode 100755
index 09d1ce333b3d..000000000000
--- a/net-analyzer/p0f/files/p0f.initd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/files/p0f.initd,v 1.1 2005/03/11 10:46:08 ka0ttic Exp $
-
-start() {
-	ebegin "Starting p0f"
-	# The 'tcp and tcp[13] & 2 = 2' requires at least syn set.
-	# An alternative would be 'tcp and tcp[13] & 0x3f = 2', which
-	# is syn and no other major flags (but ECN enabled packets are OK)
-	if [ -z "$BpfFilter" ]; then
-		BpfFilter='tcp and tcp[13] & 2 = 2'
-	else
-		BpfFilter="$BpfFilter and tcp and tcp[13] & 2 = 2"
-	fi
-
-	# The command in backticks returns all the local IP addresses on this machine.
-	for OneIP in `/sbin/ifconfig 2>/dev/null | grep 'inet addr' | sed -e 's/.*addr://' -e 's/ .*//'` ; do
-		BpfFilter="$BpfFilter and not src host $OneIP"
-	done
-	
-	# Create a lock file.
-	mkdir -p /var/lock/subsys
-	touch /var/lock/subsys/p0f
-	
-	# Start up p0f and filter out all packets originating from any of this machines IP's.
-	einfo "Logfile: ${P0FLOGFILE}"
-	start-stop-daemon --start --quiet --exec /usr/sbin/p0f -- -v "$BpfFilter" >>"/var/log/p0f" 2>&1 &
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping p0f"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/p0f
-	rm -f /var/lock/subsys/p0f
-	eend ${?}
-}
diff --git a/net-analyzer/p0f/p0f-2.0.3.ebuild b/net-analyzer/p0f/p0f-2.0.3.ebuild
deleted file mode 100644
index 7087d0ba737a..000000000000
--- a/net-analyzer/p0f/p0f-2.0.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/p0f-2.0.3.ebuild,v 1.13 2006/02/15 23:43:40 jokey Exp $
-
-inherit eutils
-
-DESCRIPTION="p0f performs passive OS detection based on SYN packets."
-HOMEPAGE="http://lcamtuf.coredump.cx/p0f.shtml"
-SRC_URI="http://lcamtuf.coredump.cx/p0f/${P}.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ~amd64 sparc ppc-macos"
-IUSE=""
-
-DEPEND="net-libs/libpcap"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A} && cd ${S}
-	sed -i 's;#include <net/bpf.h>;;' p0f.c || die "sed p0f.c failed"
-	sed -i -e 's|^\(all: $(FILE)\).*$|\1|' \
-		-e "s|^\(CFLAGS.*=\).*$|\1${CFLAGS}|" mk/* || die "sed makefiles failed"
-}
-
-src_install () {
-	dosbin p0f p0frep || die
-
-	insinto /etc/p0f
-	doins p0f.fp p0fa.fp p0fr.fp
-
-	doman p0f.1 || die
-	cd doc
-	dodoc ChangeLog CREDITS KNOWN_BUGS README TODO
-}
diff --git a/net-analyzer/p0f/p0f-2.0.5.ebuild b/net-analyzer/p0f/p0f-2.0.5.ebuild
deleted file mode 100644
index f6da76234dc4..000000000000
--- a/net-analyzer/p0f/p0f-2.0.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/p0f-2.0.5.ebuild,v 1.5 2006/02/15 23:43:40 jokey Exp $
-
-inherit eutils
-
-DESCRIPTION="p0f performs passive OS detection based on SYN packets."
-HOMEPAGE="http://lcamtuf.coredump.cx/p0f.shtml"
-SRC_URI="http://lcamtuf.coredump.cx/p0f/${P}.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc-macos sparc x86"
-IUSE="static"
-
-DEPEND="net-libs/libpcap"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A} && cd ${S}
-	sed -i 's;#include <net/bpf.h>;;' p0f.c || die "sed p0f.c failed"
-	sed -i -e 's|^\(all: $(FILE)\).*$|\1|' \
-		-e "s|^\(CFLAGS.*=\).*$|\1${CFLAGS}|" mk/* || die "sed makefiles failed"
-}
-
-src_compile() {
-	local static
-	use static && static="static"
-	emake ${static} || die "emake ${static} failed"
-}
-
-src_install () {
-	use static && mv p0f-static p0f
-	dosbin p0f p0frep || die
-
-	insinto /etc/p0f
-	doins p0f.fp p0fa.fp p0fr.fp
-
-	doman p0f.1 || die
-	cd doc
-	dodoc ChangeLog CREDITS KNOWN_BUGS README TODO
-
-	newinitd ${FILESDIR}/${PN}.initd ${PN} || die "newinitd failed"
-}
diff --git a/net-analyzer/p0f/p0f-2.0.6.ebuild b/net-analyzer/p0f/p0f-2.0.6.ebuild
deleted file mode 100644
index dce7f9a075c4..000000000000
--- a/net-analyzer/p0f/p0f-2.0.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/p0f-2.0.6.ebuild,v 1.2 2007/05/01 22:22:51 genone Exp $
-
-inherit eutils
-
-DESCRIPTION="p0f performs passive OS detection based on SYN packets."
-HOMEPAGE="http://lcamtuf.coredump.cx/p0f.shtml"
-SRC_URI="http://lcamtuf.coredump.cx/p0f/${P}.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~x86"
-IUSE="static"
-
-DEPEND="net-libs/libpcap"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A} && cd ${S}
-	sed -i 's;#include <net/bpf.h>;;' p0f.c || die "sed p0f.c failed"
-	sed -i -e 's|^\(all: $(FILE)\).*$|\1|' \
-		-e "s|^\(CFLAGS.*=\).*$|\1${CFLAGS}|" mk/* || die "sed makefiles failed"
-}
-
-src_compile() {
-	local static
-	use static && static="static"
-	emake ${static} || die "emake ${static} failed"
-	emake ${static} p0fq || die "emake ${static} p0fq failed"
-}
-
-src_install () {
-	use static && mv p0f-static p0f
-	dosbin p0f p0frep test/p0fq || die
-
-	insinto /etc/p0f
-	doins p0f.fp p0fa.fp p0fr.fp
-
-	doman p0f.1 || die
-	cd doc
-	dodoc ChangeLog CREDITS KNOWN_BUGS README TODO
-
-	newconfd "${FILESDIR}"/${PN}.confd ${PN} || die "newconfd failed"
-	newinitd "${FILESDIR}"/${PN}.initd2 ${PN} || die "newinitd failed"
-}
-
-pkg_postinst(){
-	elog "Adjust /etc/conf.d/p0f to your liking before using the"
-	elog "init script. For more information on options, read man p0f."
-}
diff --git a/net-analyzer/pktstat/ChangeLog b/net-analyzer/pktstat/ChangeLog
index 02e4d2c87269..67bad66be4b8 100644
--- a/net-analyzer/pktstat/ChangeLog
+++ b/net-analyzer/pktstat/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/pktstat
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pktstat/ChangeLog,v 1.16 2007/05/13 17:33:33 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pktstat/ChangeLog,v 1.17 2007/09/06 17:48:41 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -pktstat-1.7.5.ebuild,
+  -pktstat-1.8.1.ebuild:
+  Cleanup
 
   13 May 2007; Steve Dibb <beandog@gentoo.org> pktstat-1.8.3.ebuild:
   amd64 stable
diff --git a/net-analyzer/pktstat/files/digest-pktstat-1.7.5 b/net-analyzer/pktstat/files/digest-pktstat-1.7.5
deleted file mode 100644
index 544b0fdef621..000000000000
--- a/net-analyzer/pktstat/files/digest-pktstat-1.7.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8ce237a23f7598c06d7996d15b7cd2fb pktstat-1.7.5.tar.gz 36499
-RMD160 87d8d190abafd61135fa89ed9e1aee30270a1224 pktstat-1.7.5.tar.gz 36499
-SHA256 a0a4be71350bc0c38f02565f64ebf3191a2e6350709266a6ff5155cd14776639 pktstat-1.7.5.tar.gz 36499
diff --git a/net-analyzer/pktstat/files/digest-pktstat-1.8.1 b/net-analyzer/pktstat/files/digest-pktstat-1.8.1
deleted file mode 100644
index 6f5b05b9d00a..000000000000
--- a/net-analyzer/pktstat/files/digest-pktstat-1.8.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 974783a6b645c14f54908067be5f3a76 pktstat-1.8.1.tar.gz 112884
-RMD160 b58bb2a26e86716d76699dda97f5b8eca5a66c0d pktstat-1.8.1.tar.gz 112884
-SHA256 4f27f60de340c9dd83a4c7bccfb92239e02940815f2d3e06a4e1c00540375757 pktstat-1.8.1.tar.gz 112884
diff --git a/net-analyzer/pktstat/pktstat-1.7.5.ebuild b/net-analyzer/pktstat/pktstat-1.7.5.ebuild
deleted file mode 100644
index 1f18248dfa93..000000000000
--- a/net-analyzer/pktstat/pktstat-1.7.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pktstat/pktstat-1.7.5.ebuild,v 1.7 2006/08/15 09:13:16 blubb Exp $
-
-DESCRIPTION="A network monitoring tool, with bandwidth tracking"
-SRC_URI="http://www.adaptive-enterprises.com.au/~d/software/pktstat/${P}.tar.gz"
-HOMEPAGE="http://www.adaptive-enterprises.com.au/~d/software/pktstat/"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="net-libs/libpcap
-	>=sys-libs/ncurses-5.3-r1"
-
-src_compile() {
-	#Package doesn't use autoconf
-	emake || die
-}
-
-src_install() {
-	dosbin pktstat
-	doman pktstat.1
-	dodoc README
-}
diff --git a/net-analyzer/pktstat/pktstat-1.8.1.ebuild b/net-analyzer/pktstat/pktstat-1.8.1.ebuild
deleted file mode 100644
index 86ceb7f13702..000000000000
--- a/net-analyzer/pktstat/pktstat-1.8.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pktstat/pktstat-1.8.1.ebuild,v 1.3 2006/12/09 05:24:42 vanquirius Exp $
-
-DESCRIPTION="A network monitoring tool, with bandwidth tracking"
-SRC_URI="http://www.adaptive-enterprises.com.au/~d/software/pktstat/${P}.tar.gz"
-HOMEPAGE="http://www.adaptive-enterprises.com.au/~d/software/pktstat/"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="net-libs/libpcap
-	>=sys-libs/ncurses-5.3-r1"
-
-src_install() {
-	dosbin pktstat
-	doman pktstat.1
-	dodoc README
-}
diff --git a/net-analyzer/portmon/ChangeLog b/net-analyzer/portmon/ChangeLog
index f39c880a1cb8..8e11134b296a 100644
--- a/net-analyzer/portmon/ChangeLog
+++ b/net-analyzer/portmon/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/portmon
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portmon/ChangeLog,v 1.12 2007/04/28 17:41:29 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portmon/ChangeLog,v 1.13 2007/09/06 17:49:16 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -portmon-1.9.ebuild:
+  Cleanup
 
   28 Apr 2007; Sven Wegener <swegener@gentoo.org> portmon-1.9.ebuild:
   Fix *initd, *confd and *envd calls (#173884, #174266)
diff --git a/net-analyzer/portmon/files/digest-portmon-1.9 b/net-analyzer/portmon/files/digest-portmon-1.9
deleted file mode 100644
index 81e9388a839d..000000000000
--- a/net-analyzer/portmon/files/digest-portmon-1.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 95ae1352fb6d877b36839a1f90fc2b81 portmon-1.9.tar.gz 143698
-RMD160 ab6bbec571bfa4847bc7fe4527ea6cafc654970b portmon-1.9.tar.gz 143698
-SHA256 26d01c4c41ec3872e5b04b6174b2eb58b8a7143ef90a01573a9be849997caab1 portmon-1.9.tar.gz 143698
diff --git a/net-analyzer/portmon/portmon-1.9.ebuild b/net-analyzer/portmon/portmon-1.9.ebuild
deleted file mode 100644
index 483862f73391..000000000000
--- a/net-analyzer/portmon/portmon-1.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portmon/portmon-1.9.ebuild,v 1.9 2007/04/28 17:41:29 swegener Exp $
-
-DESCRIPTION="Portmon is a network service monitoring daemon."
-SRC_URI="http://aboleo.net/software/portmon/downloads/${P}.tar.gz"
-HOMEPAGE="http://aboleo.net/software/portmon/"
-
-KEYWORDS="x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	econf --sysconfdir=/etc/portmon || die "Configure failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	into /usr
-	dosbin src/portmon
-	doman extras/portmon.8
-
-	insinto /etc/portmon
-	doins extras/portmon.hosts.sample
-	dodoc AUTHORS BUGS README
-
-	newinitd ${FILESDIR}/portmon.init portmon
-}
diff --git a/net-analyzer/portsentry/ChangeLog b/net-analyzer/portsentry/ChangeLog
index 6d6a523ca7a6..cb6c241c70e1 100644
--- a/net-analyzer/portsentry/ChangeLog
+++ b/net-analyzer/portsentry/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/portsentry
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portsentry/ChangeLog,v 1.21 2007/04/22 08:53:44 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portsentry/ChangeLog,v 1.22 2007/09/06 17:50:03 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -portsentry-1.1-r7.ebuild:
+  Cleanup
 
   22 Apr 2007; <pva@gentoo.org> portsentry-1.1-r7.ebuild,
   portsentry-1.2.ebuild:
diff --git a/net-analyzer/portsentry/files/digest-portsentry-1.1-r7 b/net-analyzer/portsentry/files/digest-portsentry-1.1-r7
deleted file mode 100644
index f47bc27c037a..000000000000
--- a/net-analyzer/portsentry/files/digest-portsentry-1.1-r7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 782839446b7eca554bb1880ef0882670 portsentry-1.1.tar.gz 45871
-RMD160 07ddd73040834bd700f0d9e03c23a2d0c8872016 portsentry-1.1.tar.gz 45871
-SHA256 eb06f3c328614365a9fe61b8878acb76cbf364cb695dda37536a3b0e07a13f1f portsentry-1.1.tar.gz 45871
diff --git a/net-analyzer/portsentry/portsentry-1.1-r7.ebuild b/net-analyzer/portsentry/portsentry-1.1-r7.ebuild
deleted file mode 100644
index ee586204bd82..000000000000
--- a/net-analyzer/portsentry/portsentry-1.1-r7.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portsentry/portsentry-1.1-r7.ebuild,v 1.12 2007/04/22 08:53:44 pva Exp $
-
-DESCRIPTION="Automated port scan detector and response tool"
-# Seems like CISCO took the site down?
-HOMEPAGE="http://sourceforge.net/projects/sentrytools/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc"
-IUSE=""
-
-DEPEND=">=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A} ; cd "${S}"
-
-	# Setting the portsentry.conf file location
-	sed -i \
-		-e 's:/usr/local/psionic/portsentry/portsentry.conf:/etc/portsentry/portsentry.conf:' \
-		portsentry_config.h || die "sed portsentry_config.h failed"
-
-	# presetting the other file locations in portsentry.conf
-	sed -i \
-		-e 's:\(^IGNORE_FILE\).*:\1="/etc/portsentry/portsentry.ignore":g' \
-	    -e 's:^\(HISTORY_FILE\).*:\1="/etc/portsentry/portsentry.history":g' \
-	    -e 's:^\(BLOCKED_FILE\).*:\1="/etc/portsentry/portsentry.blocked":g' \
-		portsentry.conf || die "sed portsentry.conf failed"
-
-	sed -i \
-		-e "s:^set SENTRYDIR.*:set SENTRYDIR=/etc/portsentry:g" \
-		ignore.csh || die "sed ignore.csh failed"
-}
-
-src_compile() {
-	make CFLAGS="${CFLAGS}" linux || die
-}
-
-src_install() {
-	dobin portsentry ignore.csh
-	dodoc README* CHANGES LICENSE CREDITS
-	newdoc portsentry.ignore portsentry.ignore.sample
-	newdoc portsentry.conf portsentry.conf.sample
-
-	insinto /etc/portsentry
-	newins portsentry.ignore portsentry.ignore.sample
-	newins portsentry.conf portsentry.conf.sample
-
-	newinitd "${FILESDIR}"/portsentry.rc6 portsentry
-	newconfd "${FILESDIR}"/portsentry.confd portsentry
-}
diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index 0db8249501c8..5e57df6b96a7 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/rrdtool
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.129 2007/09/05 19:41:44 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.130 2007/09/06 17:54:16 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org>
+  -files/rrdtool-1.2.19-as-needed.patch,
+  -files/rrdtool-1.2.19-as-needed.patch-new,
+  -files/rrdtool-1.2.19-tclbindings.patch, -rrdtool-1.0.49.ebuild,
+  -rrdtool-1.2.19.ebuild, -rrdtool-1.2.23.ebuild:
+  Cleanup
 
   05 Sep 2007; <solar@gentoo.org> rrdtool-1.2.23-r1.ebuild:
   - remove failing patch that is no longer need for uclibc. Bug 191345
diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.0.49 b/net-analyzer/rrdtool/files/digest-rrdtool-1.0.49
deleted file mode 100644
index d6349af35891..000000000000
--- a/net-analyzer/rrdtool/files/digest-rrdtool-1.0.49
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fbe492dbf3d68abb1d86c2322e7ed44a rrdtool-1.0.49.tar.gz 1466897
-RMD160 965cf352b4d3da64fdf44e0af5d1cf95072a283e rrdtool-1.0.49.tar.gz 1466897
-SHA256 20acb0aa347f1629c4d5529ab8afbe4986fe820555049af3f905653300e5ea74 rrdtool-1.0.49.tar.gz 1466897
diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.2.19 b/net-analyzer/rrdtool/files/digest-rrdtool-1.2.19
deleted file mode 100644
index d760d385bb3d..000000000000
--- a/net-analyzer/rrdtool/files/digest-rrdtool-1.2.19
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 df625d12e0585042a398ff946e32e3e7 rrdtool-1.2.19.tar.gz 1060598
-RMD160 05c46a7f035949923245da287e5faae0b02f45f1 rrdtool-1.2.19.tar.gz 1060598
-SHA256 7899cd034ac15cf15c1b78c22d4d6241a73d3079d5e756eb2a741ff93a952af1 rrdtool-1.2.19.tar.gz 1060598
diff --git a/net-analyzer/rrdtool/files/digest-rrdtool-1.2.23 b/net-analyzer/rrdtool/files/digest-rrdtool-1.2.23
deleted file mode 100644
index d79e00721831..000000000000
--- a/net-analyzer/rrdtool/files/digest-rrdtool-1.2.23
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 dafa161bc9c61e57636a6085c87c1fe8 rrdtool-1.2.23.tar.gz 1061530
-RMD160 0c1147242adf476f5e93f4d59b553ee3ea378b23 rrdtool-1.2.23.tar.gz 1061530
-SHA256 4b1df00b23a74a1c81734dd274e72e00d8bb29b11e1f3d2938ff87691ece1f0f rrdtool-1.2.23.tar.gz 1061530
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.2.19-as-needed.patch b/net-analyzer/rrdtool/files/rrdtool-1.2.19-as-needed.patch
deleted file mode 100644
index debb4195804d..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.2.19-as-needed.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -urN ./rrdtool-1.2.19/bindings/python/Makefile.am ./rrdtool-1.2.18/bindings/python/Makefile.am
---- ./rrdtool-1.2.19-orig/bindings/python/Makefile.am	2007-02-01 06:51:38.000000000 +0100
-+++ ./rrdtool-1.2.19/bindings/python/Makefile.am	2007-01-23 21:54:50.000000000 +0100
-@@ -2,10 +2,11 @@
- 
- pyexec_PROGRAMS = rrdtoolmodule.so
- 
-+rrdtoolmodule_so_LDFLAGS = -module -shared
- rrdtoolmodule_so_LDADD = $(top_builddir)/src/librrd.la
--rrdtoolmodule_so_SOURCES = rrdtoolmodule.c
-+rrdtoolmodule_so_SOURCES =     rrdtoolmodule.c
- 
--noinst_HEADERS =           rrd_extra.h
-+noinst_HEADERS =                rrd_extra.h
- 
- clean-local:
- 	rm -rf build
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.2.19-as-needed.patch-new b/net-analyzer/rrdtool/files/rrdtool-1.2.19-as-needed.patch-new
deleted file mode 100644
index b492021108eb..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.2.19-as-needed.patch-new
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -urN ./rrdtool-1.2.19/bindings/python/Makefile.am ./rrdtool-1.2.18/bindings/python/Makefile.am
---- ./rrdtool-1.2.19-orig/bindings/python/Makefile.am	2007-02-01 06:51:38.000000000 +0100
-+++ ./rrdtool-1.2.19/bindings/python/Makefile.am	2007-01-23 21:54:50.000000000 +0100
-@@ -2,10 +2,11 @@
- 
- pyexec_PROGRAMS = rrdtoolmodule.so
- 
-+rrdtoolmodule_so_LDFLAGS = -module -shared
- rrdtoolmodule_so_LDADD = $(top_builddir)/src/librrd.la
--rrdtoolmodule_so_SOURCES = rrdtoolmodule.c
-+rrdtoolmodule_so_SOURCES =     rrdtoolmodule.c
- 
--noinst_HEADERS =           rrd_extra.h
-+noinst_HEADERS =                rrd_extra.h
- 
- clean-local:
- 	rm -rf build
-diff -urN ./rrdtool-1.2.19/bindings/python/Makefile.in ./rrdtool-1.2.18/bindings/python/Makefile.in
---- ./rrdtool-1.2.19-orig/bindings/python/Makefile.in	2007-02-01 06:52:06.000000000 +0100
-+++ ./rrdtool-1.2.19/bindings/python/Makefile.in	2007-01-23 21:55:36.000000000 +0100
-@@ -233,6 +233,7 @@
- target_os = @target_os@
- target_vendor = @target_vendor@
- AM_CPPFLAGS = @CFLAGS@ -I$(top_srcdir)/src @PYTHON_INCLUDES@
-+rrdtoolmodule_so_LDFLAGS = -module -shared
- rrdtoolmodule_so_LDADD = $(top_builddir)/src/librrd.la
- rrdtoolmodule_so_SOURCES = rrdtoolmodule.c
- noinst_HEADERS = rrd_extra.h
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.2.19-tclbindings.patch b/net-analyzer/rrdtool/files/rrdtool-1.2.19-tclbindings.patch
deleted file mode 100644
index 35c729d43536..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.2.19-tclbindings.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -urN ./rrdtool-1.2.19/bindings/tcl/tclrrd.c ./rrdtool-1.2.19-new/bindings/tcl/tclrrd.c
---- ./rrdtool-1.2.19-orig/bindings/tcl/tclrrd.c	2007-02-01 06:51:38.000000000 +0100
-+++ ./rrdtool-1.2.19/bindings/tcl/tclrrd.c	2007-02-01 14:40:33.000000000 +0100
-@@ -18,8 +18,8 @@
- #include <time.h>
- #include <unistd.h>
- #include <tcl.h>
--#include <rrd_tool.h>
--#include <rrd_format.h>
-+#include "../../src/rrd_tool.h"
-+#include "../../src/rrd_format.h"
- 
- /* support pre-8.4 tcl */
- 
-diff -urN ./rrdtool-1.2.19-orig/configure.ac ./rrdtool-1.2.19/configure.ac
---- ./rrdtool-1.2.19-orig/configure.ac	2007-02-01 06:51:40.000000000 +0100
-+++ ./rrdtool-1.2.19/configure.ac	2007-02-01 14:45:55.000000000 +0100
-@@ -554,7 +554,7 @@
-         AC_MSG_WARN([tclConfig.sh not found - Tcl interface won't be built])
-   else
- 	. $tcl_config
--	TCL_PACKAGE_DIR="$TCL_PACKAGE_PATH/tclrrd$VERSION"
-+	TCL_PACKAGE_DIR="${TCL_PACKAGE_PATH% *}/tclrrd$VERSION"
-   fi
-   AC_ARG_ENABLE(tcl,[  --enable-tcl-site        install the tcl extension in the tcl tree],
-   [],[enable_tcl_site=yes])
diff --git a/net-analyzer/rrdtool/rrdtool-1.0.49.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.49.ebuild
deleted file mode 100644
index ea6025acc94d..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.0.49.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.49.ebuild,v 1.10 2007/01/05 07:09:32 flameeyes Exp $
-
-inherit perl-module flag-o-matic eutils
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/"
-SRC_URI="http://people.ee.ethz.ch/%7Eoetiker/webtools/${PN}/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
-IUSE="perl tcl"
-
-DEPEND="perl? ( dev-lang/perl )
-	sys-apps/gawk
-	>=media-libs/gd-1.8.3"
-RDEPEND="tcl? ( dev-lang/tcl )"
-
-TCL_VER=""
-
-pkg_setup() {
-	if use perl ; then
-		perl-module_pkg_setup
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -e 's/^LTCOMPILE = $(LIBTOOL) --mode=compile $(CC)/& -prefer-pic/' -i src/Makefile.in
-
-	if [[ ! $(grep '^LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) -prefer-pic' src/Makefile.in) ]]; then
-		die "Makefile.in sed failed"
-	fi
-}
-
-src_compile() {
-	filter-mfpmath sse
-	filter-flags -ffast-math
-
-	local myconf
-	myconf="${myconf} --datadir=/usr/share --enable-shared"
-
-	if use tcl ; then
-		myconf="${myconf} --with-tcllib=/usr/lib"
-	else
-		myconf="${myconf} --without-tcllib"
-	fi
-
-	if use perl; then
-		econf ${myconf} --with-perl-options='PREFIX=/usr INSTALLDIRS=vendor DESTDIR=${D}' || die "econf failed"
-
-		# libraries without -fPIC? feh!
-		for libdir in cgilib* gd* libpng* zlib*; do
-			sed -i -e 's/^CFLAGS.*/& -fPIC/' ${libdir}/Makefile
-		done
-	else
-		econf ${myconf} || die "econf failed"
-	fi
-
-	make || die "make failed"
-}
-
-src_install() {
-	einstall || die
-
-	# this package completely ignores mandir settings
-
-	doman doc/*.1
-	dohtml doc/*.html
-	dodoc doc/*.pod
-	dodoc doc/*.txt
-
-	rm -rf ${D}/usr/doc
-	rm -rf ${D}/usr/html
-	rm -rf ${D}/usr/man
-	rm -rf ${D}/usr/contrib
-	rm -rf ${D}/usr/examples
-
-	insinto /usr/share/doc/${PF}/examples
-	doins examples/*
-	insinto /usr/share/doc/${PF}/contrib
-	doins contrib/*
-
-	if use perl ; then
-		perlinfo
-		mytargets="site-perl-install"
-		perl-module_src_install || die
-
-		# remove duplicate installation into /usr/lib/perl
-		rm -Rf ${D}/usr/lib/perl
-	fi
-
-	if use tcl ; then
-#		mv ${S}/tcl/tclrrd.so ${S}/tcl/tclrrd${PV}.so
-#		insinto /usr/lib/tcl${TCL_VER}/tclrrd${PV}
-#		doins ${S}/tcl/tclrrd${PV}.so
-		echo "package ifneeded Rrd ${PV} [list load [file join \$$dir .. tclrrd${PV}.so]]" \
-			>> ${D}/usr/lib/tcl${TCL_VER}/tclrrd${PV}/pkgIndex.tcl
-	fi
-
-	dodoc COPY* CONTR* README TODO
-}
-
-pkg_preinst() {
-	use perl && perl-module_pkg_preinst
-}
-
-pkg_postinst() {
-	use perl && perl-module_pkg_postinst
-}
-
-pkg_prerm() {
-	use perl && perl-module_pkg_prerm
-}
-
-pkg_postrm() {
-	use perl && perl-module_pkg_postrm
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.2.19.ebuild b/net-analyzer/rrdtool/rrdtool-1.2.19.ebuild
deleted file mode 100644
index a998bacc2511..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.2.19.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.2.19.ebuild,v 1.1 2007/02/01 14:48:52 jokey Exp $
-
-inherit autotools eutils flag-o-matic multilib perl-module
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/"
-SRC_URI="http://people.ee.ethz.ch/~oetiker/webtools/${PN}/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="doc perl python rrdcgi tcl uclibc"
-
-RDEPEND="tcl? ( dev-lang/tcl )
-	>=sys-libs/zlib-1.2.1
-	>=media-libs/freetype-2.1.5
-	>=media-libs/libart_lgpl-2.3.16
-	>=media-libs/libpng-1.2.5
-	rrdcgi? ( >=dev-libs/cgilib-0.5 )"
-
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/perl )
-	python? ( dev-lang/python )
-	sys-apps/gawk"
-
-TCLVER=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.2.15-newstyle-resize.patch
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	epatch "${FILESDIR}"/${P}-tclbindings.patch
-	use uclibc && epatch "${FILESDIR}"/${PN}-1.2.15-no-man.patch
-	eautoreconf
-}
-
-pkg_setup() {
-	use perl && perl-module_pkg_setup
-}
-
-src_compile() {
-	filter-mfpmath sse
-	filter-flags -ffast-math
-
-	local myconf
-	myconf="--datadir=/usr/share --enable-shared $(use_enable rrdcgi)"
-
-	use python || myconf="${myconf} --disable-python"
-
-	if use tcl ; then
-		myconf="${myconf} --with-tcllib=/usr/$(get_libdir)"
-	else
-		myconf="${myconf} --disable-tcl"
-	fi
-
-	if use perl ; then
-		econf ${myconf} --with-perl-options='PREFIX=/usr INSTALLDIRS=vendor DESTDIR=${D}' || die "econf failed"
-	else
-		econf ${myconf} --disable-perl || die "econf failed"
-	fi
-
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	rm -fr "${D}"/usr/examples
-	rm -fr "${D}"/usr/shared
-
-	if use doc ; then
-		dohtml doc/*.html
-		dodoc doc/*.pod doc/*.txt
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*
-		insinto /usr/share/doc/${PF}/contrib
-		doins contrib/*
-	fi
-
-	if use perl ; then
-		perlinfo
-		mytargets="site-perl-install"
-		perl-module_src_install || die
-	fi
-
-	dodoc CONTRIBUTORS README TODO
-}
-
-pkg_preinst() {
-	use perl && perl-module_pkg_preinst
-}
-
-pkg_postinst() {
-	use perl && perl-module_pkg_postinst
-}
-
-pkg_prerm() {
-	use perl && perl-module_pkg_prerm
-}
-
-pkg_postrm() {
-	use perl && perl-module_pkg_postrm
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.2.23.ebuild b/net-analyzer/rrdtool/rrdtool-1.2.23.ebuild
deleted file mode 100644
index caabc90aa73b..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.2.23.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.2.23.ebuild,v 1.1 2007/05/05 15:29:47 cedk Exp $
-
-inherit autotools eutils flag-o-matic multilib perl-module
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
-SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="doc perl python rrdcgi tcl uclibc"
-
-RDEPEND="tcl? ( dev-lang/tcl )
-	>=sys-libs/zlib-1.2.1
-	>=media-libs/freetype-2.1.5
-	>=media-libs/libart_lgpl-2.3.16
-	>=media-libs/libpng-1.2.5
-	rrdcgi? ( >=dev-libs/cgilib-0.5 )"
-
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/perl )
-	python? ( dev-lang/python )
-	sys-apps/gawk"
-
-TCLVER=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.2.15-newstyle-resize.patch
-	epatch "${FILESDIR}"/${P}-tclbindings.patch
-	use uclibc && epatch "${FILESDIR}"/${PN}-1.2.15-no-man.patch
-	eautoreconf
-}
-
-pkg_setup() {
-	use perl && perl-module_pkg_setup
-}
-
-src_compile() {
-	filter-mfpmath sse
-	filter-flags -ffast-math
-
-	local myconf
-	myconf="--datadir=/usr/share --enable-shared $(use_enable rrdcgi)"
-
-	use python || myconf="${myconf} --disable-python"
-
-	if use tcl ; then
-		myconf="${myconf} --with-tcllib=/usr/$(get_libdir)"
-	else
-		myconf="${myconf} --disable-tcl"
-	fi
-
-	if use perl ; then
-		econf ${myconf} --with-perl-options='PREFIX=/usr INSTALLDIRS=vendor DESTDIR=${D}' || die "econf failed"
-	else
-		econf ${myconf} --disable-perl || die "econf failed"
-	fi
-
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	rm -fr "${D}"/usr/examples
-	rm -fr "${D}"/usr/shared
-
-	if use doc ; then
-		dohtml doc/*.html
-		dodoc doc/*.pod doc/*.txt
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*
-		insinto /usr/share/doc/${PF}/contrib
-		doins contrib/*
-	fi
-
-	if use perl ; then
-		perlinfo
-		mytargets="site-perl-install"
-		perl-module_src_install || die
-	fi
-
-	dodoc CONTRIBUTORS README TODO
-}
-
-pkg_preinst() {
-	use perl && perl-module_pkg_preinst
-}
-
-pkg_postinst() {
-	use perl && perl-module_pkg_postinst
-}
-
-pkg_prerm() {
-	use perl && perl-module_pkg_prerm
-}
-
-pkg_postrm() {
-	use perl && perl-module_pkg_postrm
-}
diff --git a/net-analyzer/sancp/ChangeLog b/net-analyzer/sancp/ChangeLog
index 6ef8b82878bf..5177df09f1e6 100644
--- a/net-analyzer/sancp/ChangeLog
+++ b/net-analyzer/sancp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/sancp
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sancp/ChangeLog,v 1.9 2007/05/20 08:29:47 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sancp/ChangeLog,v 1.10 2007/09/06 17:54:28 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -sancp-1.6.1-r1.ebuild:
+  Cleanup
 
   20 May 2007; Christian Faulhammer <opfer@gentoo.org>
   sancp-1.6.1-r2.ebuild:
diff --git a/net-analyzer/sancp/files/digest-sancp-1.6.1-r1 b/net-analyzer/sancp/files/digest-sancp-1.6.1-r1
deleted file mode 100644
index 190513471f70..000000000000
--- a/net-analyzer/sancp/files/digest-sancp-1.6.1-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 7b357ec3371fc399c7589261f0d8d11b sancp-1.6.1.fix200511.a.patch 662
-RMD160 cd0fbff5b5eb143c585453ad1bd5ef916364dd43 sancp-1.6.1.fix200511.a.patch 662
-SHA256 f80ea77873f03de40399c2c9247590829f02421d68758425cd139c48151eb13c sancp-1.6.1.fix200511.a.patch 662
-MD5 747aa31c477d726ce6a9b233e3e5f4ee sancp-1.6.1.fix200511.b.patch 870
-RMD160 519932df5a6645cac639862e67325d63200b97bd sancp-1.6.1.fix200511.b.patch 870
-SHA256 0bbcf2797d689f9eaa46933262edc3badd644636fb8821832264bab454a870c0 sancp-1.6.1.fix200511.b.patch 870
-MD5 b83e2f4abb2bf7b10fd874aa58f6324c sancp-1.6.1.tar.gz 69986
-RMD160 033c64427f8a61f77823e48ea89c0d8e510f0083 sancp-1.6.1.tar.gz 69986
-SHA256 58e487a4bd83716e90ff19d0d7fab352e28bbe143be60f4ee61c34d5fa6380a3 sancp-1.6.1.tar.gz 69986
diff --git a/net-analyzer/sancp/sancp-1.6.1-r1.ebuild b/net-analyzer/sancp/sancp-1.6.1-r1.ebuild
deleted file mode 100644
index 3b72a269ce25..000000000000
--- a/net-analyzer/sancp/sancp-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sancp/sancp-1.6.1-r1.ebuild,v 1.2 2007/05/01 22:26:27 genone Exp $
-
-inherit eutils
-
-DESCRIPTION="SANCP is a network security tool designed to collect statistical \
-	information regarding network traffic and collect the traffic itself in pcap format."
-HOMEPAGE="http://www.metre.net/sancp.html"
-SRC_URI="http://www.metre.net/files/${P}.tar.gz
-	http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.a.patch
-	http://sancp.sourceforge.net/${PN}-1.6.1.fix200511.b.patch"
-
-LICENSE="QPL"
-
-SLOT="0"
-KEYWORDS="~x86"
-
-IUSE="sguil"
-
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	enewgroup sancp
-	enewuser sancp -1 -1 /dev/null sancp
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${DISTDIR}"/${PN}-1.6.1.fix200511.a.patch
-	epatch "${DISTDIR}"/${PN}-1.6.1.fix200511.b.patch
-}
-
-src_install() {
-	keepdir /var/log/sancp/
-	dodoc docs/CHANGES docs/fields.LIST docs/README docs/SETUP \
-		"${FILESDIR}"/sguil_sancp.conf etc/sancp/sancp.conf
-
-	insinto /etc/sancp
-	if use sguil ; then
-		newins "${FILESDIR}"/sguil_sancp.conf sancp.conf
-	else
-		doins etc/sancp/sancp.conf
-	fi
-
-	exeinto /usr/bin
-	doexe sancp
-
-	newinitd "${FILESDIR}"/sancp.rc1 sancp
-	newconfd "${FILESDIR}"/sancp.confd sancp
-	if use sguil ; then
-		sed -i -e /^SANCP_OPTS/s:'sancp':"sguil":g \
-			-e s:'-d $LOGDIR/today':"-d /var/lib/sguil/$(hostname)/sancp": \
-			"${D}/etc/conf.d/sancp"
-	fi
-
-	fowners sancp:sancp /var/log/sancp
-	fperms 0770 /var/log/sancp
-}
-
-pkg_postinst() {
-	elog
-	elog "Please modify /etc/sancp/sancp.conf to suit your environment"
-	elog
-}
diff --git a/net-analyzer/sara/ChangeLog b/net-analyzer/sara/ChangeLog
index 649868043006..956a47eeedc7 100644
--- a/net-analyzer/sara/ChangeLog
+++ b/net-analyzer/sara/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/sara
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sara/ChangeLog,v 1.22 2007/07/22 08:02:14 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sara/ChangeLog,v 1.23 2007/09/06 17:55:11 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -sara-6.0.7d.ebuild:
+  Cleanup
 
   22 Jul 2007; <pva@gentoo.org> sara-6.0.4.ebuild, sara-6.0.7d.ebuild,
   sara-7.0.3b.ebuild:
diff --git a/net-analyzer/sara/files/digest-sara-6.0.7d b/net-analyzer/sara/files/digest-sara-6.0.7d
deleted file mode 100644
index a966c3cdc314..000000000000
--- a/net-analyzer/sara/files/digest-sara-6.0.7d
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 961c60187eda2df91b023160a7776ae4 sara-6.0.7d.tgz 5745696
-RMD160 5f9dd65855f9cda6495b97aa6090de3af40a73e0 sara-6.0.7d.tgz 5745696
-SHA256 8cacfb3ed1381adac3b8cedb10600f9c0c3eb0f811e7cef6775a7ed92fdaf639 sara-6.0.7d.tgz 5745696
diff --git a/net-analyzer/sara/sara-6.0.7d.ebuild b/net-analyzer/sara/sara-6.0.7d.ebuild
deleted file mode 100644
index a697dfac8945..000000000000
--- a/net-analyzer/sara/sara-6.0.7d.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sara/sara-6.0.7d.ebuild,v 1.7 2007/07/22 08:02:14 pva Exp $
-
-DESCRIPTION="SARA Security Auditor's Research Assistant is a derived work of Security Administrator Tool for Analyzing Networks SATAN"
-SRC_URI="http://www-arc.com/sara/downloads/${P}.tgz"
-RESTRICT="mirror"
-HOMEPAGE="http://www-arc.com/sara/"
-
-SLOT="0"
-LICENSE="satan"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="X"
-
-DEPEND=">=dev-lang/perl-5.8
-	>=app-shells/tcsh-6.14-r3
-	net-misc/netkit-rsh
-	app-arch/sharutils
-	net-misc/netkit-fingerd
-	net-analyzer/nmap
-	net-ftp/ftp
-	X? ( x11-libs/libX11
-		x11-proto/xproto )"
-
-SARA_HOME=/opt/sara
-
-src_compile(){
-	econf || die
-	# does not like to build in parallel
-	emake -j1 || die
-}
-
-src_install(){
-	dodir ${SARA_HOME}
-	insinto ${SARA_HOME}
-	doins add_user reconfig
-	exeinto ${SARA_HOME}
-	doexe sara
-	dodir ${SARA_HOME}/administrators
-	dodir ${SARA_HOME}/bin
-	exeinto ${SARA_HOME}/bin ; doexe bin/*
-	dodir ${SARA_HOME}/config
-	insinto ${SARA_HOME}/config ; doins config/*
-	dodir ${SARA_HOME}/perl
-	insinto ${SARA_HOME}/perl ;  doins perl/*.pl
-	dodir ${SARA_HOME}/perl/contrib
-	insinto ${SARA_HOME}/perl/contrib ; doins perl/contrib/*
-	dodir ${SARA_HOME}/perl/Modules/Net
-	insinto ${SARA_HOME}/perl/Modules/Net ; doins perl/Modules/Net/*
-	dodir ${SARA_HOME}/rules
-	insinto ${SARA_HOME}/rules
-	doins rules/drop rules/corrections.default rules/facts rules/hosttype rules/*.rules \
-		rules/services rules/timing rules/todo rules/trust
-	dodir ${SARA_HOME}/plugins ; dodir ${SARA_HOME}/plugins/images
-	insinto ${SARA_HOME}/plugins ; doins plugins/cis* plugins/README
-	insinto ${SARA_HOME}/plugins/images ; doins plugins/images/*
-	dodir ${SARA_HOME}/sss
-	insinto ${SARA_HOME}/sss ; doins sss/*
-	dodir ${SARA_HOME}/perllib
-	insinto ${SARA_HOME}/perllib; doins perllib/*
-	dodir ${SARA_HOME}/encoded
-	insinto ${SARA_HOME}/encoded; doins encoded/*
-	#html stuff
-
-	dodir ${SARA_HOME}/html
-	dodir ${SARA_HOME}/html/{admin,cve,data,docs,dots,images,reporting,running,search,update}
-	dodir ${SARA_HOME}/html/tutorials
-	dodir ${SARA_HOME}/html/tutorials/{first_time,vulnerability}
-	dodir ${SARA_HOME}/html/tutorials/vulnerability/{base,cert,no_cve}
-
-	insinto ${SARA_HOME}/html ; doins html/*.pl html/*.html
-	insinto ${SARA_HOME}/html/admin ; doins html/admin/*
-	insinto ${SARA_HOME}/html/cve ; doins html/cve/*
-	insinto ${SARA_HOME}/html/data ; doins html/data/*
-	insinto ${SARA_HOME}/html/docs ; doins html/docs/*
-	insinto ${SARA_HOME}/html/dots ; doins html/dots/*
-	insinto ${SARA_HOME}/html/images ; doins html/images/*
-	insinto ${SARA_HOME}/html/reporting ; doins html/reporting/*
-	insinto ${SARA_HOME}/html/running ; doins html/running/*
-	insinto ${SARA_HOME}/html/search ; doins html/search/*
-	insinto ${SARA_HOME}/html/tutorials ; doins html/tutorials/*pl
-	insinto ${SARA_HOME}/html/tutorials/first_time ; doins html/tutorials/first_time/*
-	insinto ${SARA_HOME}/html/tutorials/vulnerability ; doins html/tutorials/vulnerability/*html
-	insinto ${SARA_HOME}/html/tutorials/vulnerability/base
-	doins html/tutorials/vulnerability/base/*
-	insinto ${SARA_HOME}/html/tutorials/vulnerability/cert
-	doins html/tutorials/vulnerability/cert/*
-	insinto ${SARA_HOME}/html/tutorials/vulnerability/no_cve
-	doins html/tutorials/vulnerability/no_cve/*
-
-	dodir /usr/sbin
-	exeinto /usr/sbin; doexe "${FILESDIR}"/sara
-	doman docs/sara.8
-}
-
-pkg_postinst() {
-	elog "Read the documentation in ${SARA_HOME}/html before running this program."
-	elog "You must have installed a web browser."
-}
diff --git a/net-analyzer/sbd/ChangeLog b/net-analyzer/sbd/ChangeLog
index 20ebae55397e..dedab65b6508 100644
--- a/net-analyzer/sbd/ChangeLog
+++ b/net-analyzer/sbd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/sbd
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sbd/ChangeLog,v 1.4 2007/03/20 18:52:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sbd/ChangeLog,v 1.5 2007/09/06 17:58:43 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -sbd-1.36.ebuild:
+  Cleanup
 
   20 Mar 2007; Raúl Porcel <armin76@gentoo.org> sbd-1.37.ebuild:
   x86 stable
diff --git a/net-analyzer/sbd/files/digest-sbd-1.36 b/net-analyzer/sbd/files/digest-sbd-1.36
deleted file mode 100644
index d748ce0765d7..000000000000
--- a/net-analyzer/sbd/files/digest-sbd-1.36
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 866d1bf2fe156bbaf94bfcec2014767e sbd-1.36.tar.gz 84093
-RMD160 4c54710aaa954bc27569b85df44406053073de00 sbd-1.36.tar.gz 84093
-SHA256 a15ce468e7e04cc12fe2686e0a44e1201d7c67986681d51e255cba9362ab0676 sbd-1.36.tar.gz 84093
diff --git a/net-analyzer/sbd/sbd-1.36.ebuild b/net-analyzer/sbd/sbd-1.36.ebuild
deleted file mode 100644
index 9a35fb8478a8..000000000000
--- a/net-analyzer/sbd/sbd-1.36.ebuild
+++ /dev/null
@@ -1,29 +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/sbd/sbd-1.36.ebuild,v 1.1 2005/10/14 00:53:33 vapier Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="Netcat-clone, designed to be portable and offer strong encryption"
-HOMEPAGE="http://tigerteam.se/dl/sbd/"
-SRC_URI="http://tigerteam.se/dl/sbd/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE=""
-
-DEPEND=""
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		UNIX_CFLAGS="" \
-		UNIX_LDFLAGS="" \
-		unix || die "emake failed"
-}
-
-src_install() {
-	dobin sbd || die "dobin failed"
-	dodoc CHANGES README || die "dodoc failed"
-}
diff --git a/net-analyzer/scanlogd/ChangeLog b/net-analyzer/scanlogd/ChangeLog
index b391b149874d..927b22ee5354 100644
--- a/net-analyzer/scanlogd/ChangeLog
+++ b/net-analyzer/scanlogd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/scanlogd
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scanlogd/ChangeLog,v 1.26 2007/08/13 21:26:36 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scanlogd/ChangeLog,v 1.27 2007/09/06 17:59:14 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -scanlogd-2.2.ebuild,
+  -scanlogd-2.2.6-r1.ebuild:
+  Cleanup
 
   13 Aug 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   scanlogd-2.2.6-r2.ebuild:
diff --git a/net-analyzer/scanlogd/files/digest-scanlogd-2.2 b/net-analyzer/scanlogd/files/digest-scanlogd-2.2
deleted file mode 100644
index f885e9fb2d67..000000000000
--- a/net-analyzer/scanlogd/files/digest-scanlogd-2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bb4586e116c579dbdd359da9c6560556 scanlogd-2.2.tar.gz 9029
-RMD160 348fa425f67999bc957e8930a9004d70cb8563d1 scanlogd-2.2.tar.gz 9029
-SHA256 e257be420e3aab29821f6d513bcf720c764fb611dbd9f6a187f9dd52fb809b37 scanlogd-2.2.tar.gz 9029
diff --git a/net-analyzer/scanlogd/files/digest-scanlogd-2.2.6-r1 b/net-analyzer/scanlogd/files/digest-scanlogd-2.2.6-r1
deleted file mode 100644
index 6d888741d830..000000000000
--- a/net-analyzer/scanlogd/files/digest-scanlogd-2.2.6-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7b8187ea718ebe47f22805b921b909ab scanlogd-2.2.6.tar.gz 10975
-RMD160 29b1df23c8a44b2d98e12fb2cfe8fe6127566b6f scanlogd-2.2.6.tar.gz 10975
-SHA256 4a2621037270f88576c8770261c53761edc875984f126872c880c2a98a8f63fa scanlogd-2.2.6.tar.gz 10975
diff --git a/net-analyzer/scanlogd/scanlogd-2.2.6-r1.ebuild b/net-analyzer/scanlogd/scanlogd-2.2.6-r1.ebuild
deleted file mode 100644
index 8c63f80e2692..000000000000
--- a/net-analyzer/scanlogd/scanlogd-2.2.6-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scanlogd/scanlogd-2.2.6-r1.ebuild,v 1.7 2007/05/01 22:30:04 genone Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Scanlogd - detects and logs TCP port scans"
-SRC_URI="http://www.openwall.com/scanlogd/${P}.tar.gz"
-HOMEPAGE="http://www.openwall.com/scanlogd/"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND="virtual/libc"
-
-pkg_setup() {
-	enewgroup scanlogd
-	enewuser scanlogd -1 -1 /dev/null scanlogd
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-Makefile.patch"
-}
-
-src_compile() {
-	make CC="$(tc-getCC)" linux || die "make failed"
-}
-
-src_install() {
-	dosbin scanlogd
-	doman scanlogd.8
-
-	newinitd "${FILESDIR}"/scanlogd.rc scanlogd
-}
-
-pkg_postinst() {
-	elog "You can start the scanlogd monitoring program at boot by running"
-	elog "rc-update add scanlogd default"
-}
diff --git a/net-analyzer/scanlogd/scanlogd-2.2.ebuild b/net-analyzer/scanlogd/scanlogd-2.2.ebuild
deleted file mode 100644
index 9ad61b77992f..000000000000
--- a/net-analyzer/scanlogd/scanlogd-2.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scanlogd/scanlogd-2.2.ebuild,v 1.16 2007/05/01 22:30:04 genone Exp $
-
-IUSE=""
-DESCRIPTION="Scanlogd - detects and logs TCP port scans"
-SRC_URI="http://www.openwall.com/scanlogd/${P}.tar.gz"
-HOMEPAGE="http://www.openwall.com/scanlogd/"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 sparc ppc"
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	make linux || die
-}
-
-src_install() {
-	dosbin scanlogd
-	doman scanlogd.8
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/scanlogd.rc scanlogd
-}
-
-pkg_postinst() {
-	elog "Before you can run scanlogd you need to create the user "
-	elog "scanlog by running the following command"
-	elog "adduser -s /bin/false scanlogd"
-	elog "You can start the scanlogd monitoring program at boot by running"
-	elog "rc-update add scanlogd default"
-}