Cleanup

Package-Manager: portage-2.1.3.7

21 files changed, 27 insertions, 420 deletions

diff --git a/net-analyzer/arping/ChangeLog b/net-analyzer/arping/ChangeLog
index b41807e5fd20..450402b16903 100644
--- a/net-analyzer/arping/ChangeLog
+++ b/net-analyzer/arping/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/arping
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arping/ChangeLog,v 1.28 2007/04/30 13:21:57 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arping/ChangeLog,v 1.29 2007/09/06 16:13:07 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org>
+  -files/1.06-libnet-1.0.patch, -arping-1.06-r1.ebuild:
+  Cleanup
 
   30 Apr 2007; Cedric Krier <cedk@gentoo.org> arping-2.05.ebuild:
   Fix HOMEPAGE and add script for bug #175591
diff --git a/net-analyzer/arping/arping-1.06-r1.ebuild b/net-analyzer/arping/arping-1.06-r1.ebuild
deleted file mode 100644
index ff23463246ee..000000000000
--- a/net-analyzer/arping/arping-1.06-r1.ebuild
+++ /dev/null
@@ -1,35 +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/arping/arping-1.06-r1.ebuild,v 1.11 2006/02/15 21:51:15 jokey Exp $
-
-inherit eutils
-
-DESCRIPTION="A utility to see if a specific IP address is taken and what MAC address owns it"
-HOMEPAGE="http://www.habets.pp.se/synscan/programs.php?prog=ARPing"
-SRC_URI="ftp://ftp.habets.pp.se/pub/synscan/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="1"
-KEYWORDS="x86 ppc sparc"
-IUSE=""
-
-DEPEND="net-libs/libpcap
-	<net-libs/libnet-1.1
-	>=net-libs/libnet-1.0.2a-r3"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-libnet-1.0.patch
-	sed -i "s/CFLAGS=-g/CFLAGS=-g ${CFLAGS}/" Makefile
-}
-
-src_compile() {
-	make linux || die
-}
-
-src_install() {
-	newsbin arping arping1
-	newman arping.8 arping1.8
-	dodoc LICENSE README
-}
diff --git a/net-analyzer/arping/files/1.06-libnet-1.0.patch b/net-analyzer/arping/files/1.06-libnet-1.0.patch
deleted file mode 100644
index 7f8e70dd71ab..000000000000
--- a/net-analyzer/arping/files/1.06-libnet-1.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.orig	2003-08-19 01:24:27.934875432 -0400
-+++ Makefile	2003-08-19 01:24:27.943874064 -0400
-@@ -62 +62 @@
--	gcc -Wall $(CFLAGS) -c `libnet-config --defines` `libnet-config --cflags` arping.c
-+	gcc -Wall $(CFLAGS) -c `libnet-1.0-config --defines` `libnet-1.0-config --cflags` arping.c
-@@ -66 +66 @@
--	gcc $(CFLAGS) -g -o $@ $(O_arping) `libnet-config --libs` -lpcap
-+	gcc $(CFLAGS) -g -o $@ $(O_arping) `libnet-1.0-config --libs` -lpcap
---- arping.c.orig	2003-08-19 01:24:27.938874824 -0400
-+++ arping.c	2003-08-19 01:24:27.955872240 -0400
-@@ -63 +63 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>
diff --git a/net-analyzer/arping/files/digest-arping-1.06-r1 b/net-analyzer/arping/files/digest-arping-1.06-r1
deleted file mode 100644
index 3f7aa6aa0404..000000000000
--- a/net-analyzer/arping/files/digest-arping-1.06-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e6291334ba4c4c63e2001c0bccf9274d arping-1.06.tar.gz 28771
-RMD160 9e8596c78da9441d4255cc75729756f2e7a7a7a0 arping-1.06.tar.gz 28771
-SHA256 70f11f63090243478b76973dba4d58040586e5634ec81cd634f4aad6bb37bc85 arping-1.06.tar.gz 28771
diff --git a/net-analyzer/arptools/ChangeLog b/net-analyzer/arptools/ChangeLog
index 647aa677653d..07b170150626 100644
--- a/net-analyzer/arptools/ChangeLog
+++ b/net-analyzer/arptools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/arptools
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arptools/ChangeLog,v 1.2 2007/03/31 16:02:43 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arptools/ChangeLog,v 1.3 2007/09/06 16:14:22 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -arptools-1.0.0.ebuild:
+  Cleanup
 
 *arptools-1.0.2 (31 Mar 2007)
 
diff --git a/net-analyzer/arptools/arptools-1.0.0.ebuild b/net-analyzer/arptools/arptools-1.0.0.ebuild
deleted file mode 100644
index 1ac52d692059..000000000000
--- a/net-analyzer/arptools/arptools-1.0.0.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/arptools/arptools-1.0.0.ebuild,v 1.1 2006/06/07 00:50:17 robbat2 Exp $
-
-DESCRIPTION="a collection of libnet and libpcap based ARP utilities."
-HOMEPAGE="http://www.burghardt.pl/wiki/software/arptools"
-SRC_URI="http://www.burghardt.pl/wiki/_media/software/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-
-DEPEND="net-libs/libnet
-		net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	# BUG: the tools are installed under /usr/sbin
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/net-analyzer/arptools/files/digest-arptools-1.0.0 b/net-analyzer/arptools/files/digest-arptools-1.0.0
deleted file mode 100644
index b32b942f261c..000000000000
--- a/net-analyzer/arptools/files/digest-arptools-1.0.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b0ffbbacbc5433390d3d492ac46c2dd0 arptools-1.0.0.tar.gz 103657
-RMD160 46e981dc57ed3c7fe592dd00d4a84c7f88e60f4e arptools-1.0.0.tar.gz 103657
-SHA256 02c84696d1a9d9338986cb09008f6d96617de3535cf85db3acf13e29e5f87de8 arptools-1.0.0.tar.gz 103657
diff --git a/net-analyzer/base/ChangeLog b/net-analyzer/base/ChangeLog
index 38ab3ee07b27..31995c4275fc 100644
--- a/net-analyzer/base/ChangeLog
+++ b/net-analyzer/base/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/base
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/base/ChangeLog,v 1.11 2007/05/23 07:15:31 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/base/ChangeLog,v 1.12 2007/09/06 16:15:42 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -base-1.2.7-r2.ebuild:
+  Cleanup
 
 *base-1.3.6 (23 May 2007)
 
diff --git a/net-analyzer/base/base-1.2.7-r2.ebuild b/net-analyzer/base/base-1.2.7-r2.ebuild
deleted file mode 100644
index 16cbd86d9590..000000000000
--- a/net-analyzer/base/base-1.2.7-r2.ebuild
+++ /dev/null
@@ -1,213 +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/base/base-1.2.7-r2.ebuild,v 1.3 2007/05/01 17:42:04 genone Exp $
-
-inherit webapp versionator eutils depend.apache depend.php
-
-CONF_DIR="/etc/${PN}"
-CONF_OLD="base_conf.php.dist"
-CONF_NEW="base_conf.php"
-MIDDLEMAN="base_path.php"
-DBTYPES="mssql mysql oracle postgres"
-
-DESCRIPTION="A web-based front-end to the Snort IDS."
-HOMEPAGE="http://base.secureideas.net"
-SRC_URI="mirror://sourceforge/secureideas/${P}.tar.gz
-	signatures? ( http://www.snort.org/pub-bin/downloads.cgi/Download/vrt_pr/snortrules-pr-2.4.tar.gz )"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-# SLOT is intentionally omitted because this package uses webapp-config
-IUSE="gd signatures ${DBTYPES}"
-
-# BASE *should* work with any php-driven web server, so only require Apache
-# when the user has an apache use-flag set.
-want_apache
-
-DEPEND=">=app-arch/tar-1.14
-	>=sys-libs/zlib-1.2.1-r3
-	>=app-arch/gzip-1.3.5-r4
-	>=sys-apps/coreutils-5.2.1-r2
-	>=sys-apps/sed-4.0.9"
-RDEPEND="${DEPEND}
-	>=dev-php/adodb-4.68
-	gd? ( || ( >=dev-php4/jpgraph-1.19 >=dev-php5/jpgraph-2.0_beta )
-		>=dev-php/PEAR-PEAR-1.3.6-r1
-		>=dev-php/PEAR-Image_Color-1.0.2
-		>=dev-php/PEAR-Log-1.9.3
-		>=dev-php/PEAR-Numbers_Roman-0.2.0
-		>=dev-php/PEAR-Numbers_Words-0.14.0
-		>=dev-php/PEAR-Image_Canvas-0.2.4
-		>=dev-php/PEAR-Image_Graph-0.7.1
-		>=media-libs/gd-2.0.32 )"
-	# A local database isn't necessary, so only require one when the user
-	# has use-flags set for one of the supported DBs.
-	# Snort can also be installed on a remote system, so don't require it.
-
-# Require PHP.
-need_php
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	# Set the group ownership for /etc/base/base_conf.php so it can be read by
-	# the user's web server.
-	if use apache2 || use apache; then
-		HTTPD_GROUP="apache"
-	else
-		# Set a safe default group.
-		HTTPD_GROUP="root"
-	fi
-
-	# Check and setup selected DB type
-	dbtypecnt=0
-	for db in ${DBTYPES}; do
-		if use ${db}; then
-			if [ ${dbtypecnt} -eq 0 ]; then
-				BASE_DBTYPE=${db}
-				let dbtypecnt++
-			elif [ ${dbtypecnt} -ge 1 ]; then
-				ewarn "You set multiple database types in your USE flags."
-				ewarn "You will have to setup DBtype configuration manually."
-			fi
-		fi
-	done
-
-	if [ ${dbtypecnt} -eq 0 ]; then
-		ewarn "No database type selected in your USE flags."
-		ewarn "You will have to setup DBtype manually."
-	fi
-
-	# Make sure php was built with the necessary USE flags.
-	require_php_with_use session
-	useq gd && require_gd
-	useq mssql && require_php_with_use mssql
-	useq mysql && require_php_with_use mysql
-	useq postgres && require_php_with_use postgres
-	if use oracle && ! built_with_use virtual/php oci8-instant-client ; then
-		ewarn "PHP with oci8-instant-client support not found!"
-		ewarn "It is your responsibility to ensure that PHP will work"
-		ewarn "with commercial Oracle implementation."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Help the user configure /etc/base/base_conf.php so BASE works out of the
-	# box in most environments. The user will still be warned to edit the
-	# file manually at the pkg_postinst() stage.
-	sed -i -e 's:$BASE_urlpath.*:$BASE_urlpath = "/base";:g' \
-		${CONF_OLD}
-
-	sed -i -e 's:$DBlib_path.*:$DBlib_path = "/usr/share/php/adodb";:g' \
-			${CONF_OLD}
-
-	if [[ "${BASE_DBTYPE}" == "postgres" ]]; then
-		sed -i -e 's:$DBtype.*:$DBtype = "postgres";:g' \
-			${CONF_OLD}
-	fi
-	if [[ "${BASE_DBTYPE}" == "mssql" ]]; then
-		sed -i -e 's:$DBtype.*:$DBtype = "mssql";:g' \
-			${CONF_OLD}
-	fi
-	if [[ "${BASE_DBTYPE}" == "oracle" ]]; then
-		sed -i -e 's:$DBtype.*:$DBtype = "oci8";:g' \
-			${CONF_OLD}
-	fi
-
-	# Install the configuration files in the usual /etc/${PN} location so that
-	# etc-update functions properly (it also improves security somewhat, since
-	# the config file contains plain-text passwords and should not be located
-	# inside the web-root). This requires changing the BASE source a tad to
-	# recognize the new location for base_conf.php.
-	for PHP in *.php */*.php; do
-		sed -i -e "s:${CONF_NEW}:${MIDDLEMAN}:g" \
-			${CONF_OLD} "${PHP}"
-	done
-
-	# Create the file ${MIDDLEMAN} to determine the web-root and to change
-	# the location of "include" to /etc/base/base_conf.php.
-	echo "<?php" > ${MIDDLEMAN}
-	echo '  $BASE_path = dirname(__FILE__);' >> ${MIDDLEMAN}
-	echo "  include(\"${CONF_DIR}/${CONF_NEW}\");" >> ${MIDDLEMAN}
-	echo "?>" >> ${MIDDLEMAN}
-
-	# Delete the $BASE_path variable from the config file because we
-	# now handle it with ${MIDDLEMAN} created above.
-	sed -i -e 's:$BASE_path =.*::g' ${CONF_OLD}
-
-	# Modify the HTML headers so search engines don't index BASE.
-	sed -i -e \
-		's:<HEAD>:<HEAD>\n  <META name="robots" content="noindex,nofollow">:g' \
-			index.php
-	sed -i -e \
-		's:<HEAD>:<HEAD>\n  <META name="robots" content="noindex,nofollow">:g' \
-			base_main.php
-}
-
-src_install() {
-	webapp_src_preinst
-
-	# Install the docs once in the standard /usr/share/doc/${PF}/DOCDESTREE
-	# location instead of installing them in every virtual host directory.
-	cd docs
-	dodoc *
-	if use signatures ; then
-		cd "${WORKDIR}"
-		insinto ${MY_HTDOCSDIR}/signatures
-		doins doc/signatures/*
-	fi
-	cd "${S}"
-	rm -rf docs
-
-	# Install the config files in the normal location (/etc/${PN}).
-	insinto ${CONF_DIR} || die "Unable to insinto ${CONF_DIR}"
-	doins ${CONF_OLD} || die "Unable to doins ${CONF_OLD}"
-	newins ${CONF_OLD} ${CONF_NEW} || die "Unable to create ${CONF_NEW}"
-
-	# Install BASE for webapp-config
-	insinto ${MY_HTDOCSDIR} || die "Unable to insinto ${MY_HTDOCSDIR}"
-	doins -r *
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	# Set the proper permissions on /etc/base/base_conf.php
-	chmod 640 ${CONF_DIR}/${CONF_NEW} || FPERMS="FALSE"
-	chown root:${HTTPD_GROUP} ${CONF_DIR}/${CONF_NEW} || FOWNERS="FALSE"
-
-	# Notify the user of any problems at the very end.
-	if [ "${HTTPD_GROUP}" == "root" ]; then
-			ewarn ""
-			ewarn "It looks like you are not using Apache"
-			ewarn "as your web server. For BASE to work properly, you will"
-			ewarn "need to change the ownership of ${CONF_DIR}/${CONF_NEW} to"
-	fi
-	if [ "${FPERMS}" == "FALSE" ]; then
-			ewarn ""
-			ewarn "Unable to change the permissions on ${CONF_DIR}/${CONF_NEW}".
-			ewarn "Please change them manually by issuing:"
-			ewarn "chmod 640 ${CONF_DIR}/${CONF_NEW}"
-	fi
-	if [ "${FOWNERS}" == "FALSE" ]; then
-			ewarn ""
-			ewarn "Unable to change the group ownership of the file:"
-			ewarn "${CONF_DIR}/${CONF_NEW}"
-			ewarn "Please change this manually by issuing:"
-			ewarn "chown root:${HTTPD_GROUP} ${CONF_DIR}/${CONF_NEW}"
-	fi
-
-	elog ""
-	elog "You should edit \"${CONF_DIR}/${CONF_NEW}\" before using BASE."
-	elog ""
-	elog "To setup your initial database, direct your web browser to the"
-	elog "location you installed BASE/base_db_setup.php"
-	elog "You can find instructions in /usr/share/doc/${P}/README"
-	elog "There is a guide at http://gentoo-wiki.com/HOWTO_Apache2_with_BASE"
-	elog ""
-}
diff --git a/net-analyzer/base/files/digest-base-1.2.7-r2 b/net-analyzer/base/files/digest-base-1.2.7-r2
deleted file mode 100644
index 9ec0dbdde6c2..000000000000
--- a/net-analyzer/base/files/digest-base-1.2.7-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 bb61fa3f694dff1ea938ea52e50a02be base-1.2.7.tar.gz 364282
-RMD160 a078acf49da55a957f659e52f4e37f978bb1246c base-1.2.7.tar.gz 364282
-SHA256 615bdc6cd3cfb45143bff5f23d3edfed025702d572086e473506acdd745d132f base-1.2.7.tar.gz 364282
-MD5 35d9a2486f8c0280bb493aa03c011927 snortrules-pr-2.4.tar.gz 789097
-RMD160 dd2179b3ce8a55699d2e1b857426e5489191a121 snortrules-pr-2.4.tar.gz 789097
-SHA256 19d2545a2a150dff8b4dbcbd0def389b6865c4c70f5084172d08a7b151e1a504 snortrules-pr-2.4.tar.gz 789097
diff --git a/net-analyzer/bwm-ng/ChangeLog b/net-analyzer/bwm-ng/ChangeLog
index feca9f867ee5..33081253cca1 100644
--- a/net-analyzer/bwm-ng/ChangeLog
+++ b/net-analyzer/bwm-ng/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/bwm-ng
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwm-ng/ChangeLog,v 1.7 2007/05/14 06:13:42 bangert Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwm-ng/ChangeLog,v 1.8 2007/09/06 16:16:39 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -bwm-ng-0.4.ebuild:
+  Cleanup
 
   13 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
   add <herd>no-herd</herd>
diff --git a/net-analyzer/bwm-ng/bwm-ng-0.4.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.4.ebuild
deleted file mode 100644
index 499241ffcaf6..000000000000
--- a/net-analyzer/bwm-ng/bwm-ng-0.4.ebuild
+++ /dev/null
@@ -1,21 +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/bwm-ng/bwm-ng-0.4.ebuild,v 1.1 2005/01/22 20:14:00 hollow Exp $
-
-DESCRIPTION="Bandwidth Monitor NG is a small and simple console-based bandwidth monitor for Linux, BSD, and Mac OS X"
-SRC_URI="http://gropp.org/${PN}-${PV}.tar.gz"
-HOMEPAGE="http://gropp.org/"
-
-KEYWORDS="~x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="virtual/libc
-	>=sys-libs/ncurses-5.4-r4
-	>=sys-apps/net-tools-1.60-r1"
-
-src_install() {
-	dobin bwm-ng
-	dodoc README
-}
diff --git a/net-analyzer/bwm-ng/files/digest-bwm-ng-0.4 b/net-analyzer/bwm-ng/files/digest-bwm-ng-0.4
deleted file mode 100644
index 9b22eb1cfedb..000000000000
--- a/net-analyzer/bwm-ng/files/digest-bwm-ng-0.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4fc0839ae212bc0b805fc4adeb55a3ac bwm-ng-0.4.tar.gz 54403
-RMD160 87453155cefe85cbc9539274ffe2c269719bbb9a bwm-ng-0.4.tar.gz 54403
-SHA256 5c7b22177b217d5de2afe66d61a575abc5da827efff66552dcbafe6b1e38e637 bwm-ng-0.4.tar.gz 54403
diff --git a/net-analyzer/cacti-cactid/ChangeLog b/net-analyzer/cacti-cactid/ChangeLog
index 8a0e43ec45dd..0967ae1aec6b 100644
--- a/net-analyzer/cacti-cactid/ChangeLog
+++ b/net-analyzer/cacti-cactid/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/cacti-cactid
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/ChangeLog,v 1.35 2007/07/19 13:27:10 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/ChangeLog,v 1.36 2007/09/06 16:17:30 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org>
+  -cacti-cactid-0.8.6g.ebuild:
+  Cleanup
 
   19 Jul 2007; Christoph Mende <angelos@gentoo.org>
   cacti-cactid-0.8.6i-r1.ebuild:
diff --git a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6g.ebuild b/net-analyzer/cacti-cactid/cacti-cactid-0.8.6g.ebuild
deleted file mode 100644
index d23451b51d40..000000000000
--- a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6g.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/cacti-cactid/cacti-cactid-0.8.6g.ebuild,v 1.9 2007/05/01 17:45:16 genone Exp $
-
-WANT_AUTOCONF="latest"
-inherit autotools
-
-MY_PV=${PV/_p/-}
-DESCRIPTION="Cactid is a poller for Cacti that primarily strives to be as fast
-as possible"
-HOMEPAGE="http://cacti.net/cactid_info.php"
-SRC_URI="http://www.cacti.net/downloads/cactid/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="net-analyzer/net-snmp
-		virtual/mysql
-		>=sys-devel/autoconf-2.59"
-RDEPEND="net-analyzer/cacti
-		net-analyzer/net-snmp
-		virtual/mysql"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-	sed -i -e 's/^bin_PROGRAMS/sbin_PROGRAMS/' Makefile.am
-	sed -i -e 's/mysqlclient/mysqlclient_r/g' configure.ac
-	sed -i -e 's/wwwroot\/cacti\/log/var\/log/g' cactid.h
-}
-
-src_compile() {
-	eaclocal
-	eautoconf
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	exeinto usr/sbin ; doexe ${S}/cactid
-	insinto etc/ ; insopts -m0640 -o root -g apache ; doins ${S}/cactid.conf
-	dodoc CHANGELOG INSTALL README
-}
-
-pkg_postinst() {
-	elog "Please see cacti's site for installation instructions."
-	elog "Theres no need to change the crontab for this, just"
-	elog "read the instructions on how to implement it"
-	elog
-	elog "http://cacti.net/cactid_install.php"
-}
diff --git a/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6g b/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6g
deleted file mode 100644
index 7f145dcf57ae..000000000000
--- a/net-analyzer/cacti-cactid/files/digest-cacti-cactid-0.8.6g
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8cd35272d86dc112ba1e82393d9f07c3 cacti-cactid-0.8.6g.tar.gz 148921
-RMD160 359deb8077b8ec8cc8072982e477c5c0b3efa573 cacti-cactid-0.8.6g.tar.gz 148921
-SHA256 823d77fac9c7fd34d07004c7980bd621daaa1230c2e9c91fd9405a5bd05bfd80 cacti-cactid-0.8.6g.tar.gz 148921
diff --git a/net-analyzer/chaosreader/ChangeLog b/net-analyzer/chaosreader/ChangeLog
index 75514df2296e..b541ec6a4109 100644
--- a/net-analyzer/chaosreader/ChangeLog
+++ b/net-analyzer/chaosreader/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/chaosreader
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/chaosreader/ChangeLog,v 1.10 2007/02/20 00:49:19 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/chaosreader/ChangeLog,v 1.11 2007/09/06 16:18:09 jokey Exp $
+
+  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -chaosreader-0.92.ebuild,
+  -chaosreader-0.93.ebuild:
+  Cleanup
 
   20 Feb 2007; Markus Ullmann <jokey@gentoo.org>
   files/digest-chaosreader-0.92, files/digest-chaosreader-0.93, Manifest:
diff --git a/net-analyzer/chaosreader/chaosreader-0.92.ebuild b/net-analyzer/chaosreader/chaosreader-0.92.ebuild
deleted file mode 100644
index ecfd24ca1efa..000000000000
--- a/net-analyzer/chaosreader/chaosreader-0.92.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/chaosreader/chaosreader-0.92.ebuild,v 1.3 2004/06/24 21:58:40 agriffis Exp $
-
-DESCRIPTION="A tool to trace TCP/UDP/... sessions and fetch application data from snoop or tcpdump logs."
-HOMEPAGE="http://users.tpg.com.au/bdgcvb/chaosreader.html"
-SRC_URI="http://dev.gentoo.org/~spock/portage/distfiles/${P}.bz2"
-SLOT="0"
-KEYWORDS="x86"
-LICENSE="GPL-2"
-IUSE=""
-DEPEND=">=dev-lang/perl-5.8.0"
-S=${WORKDIR}
-
-src_install() {
-	newbin ${S}/${P} chaosreader
-}
diff --git a/net-analyzer/chaosreader/chaosreader-0.93.ebuild b/net-analyzer/chaosreader/chaosreader-0.93.ebuild
deleted file mode 100644
index 1e8a967e3cdc..000000000000
--- a/net-analyzer/chaosreader/chaosreader-0.93.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/chaosreader/chaosreader-0.93.ebuild,v 1.4 2004/06/24 21:58:40 agriffis Exp $
-
-DESCRIPTION="A tool to trace TCP/UDP/... sessions and fetch application data from snoop or tcpdump logs."
-HOMEPAGE="http://users.tpg.com.au/bdgcvb/chaosreader.html"
-SRC_URI="http://dev.gentoo.org/~spock/portage/distfiles/${P}.bz2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-LICENSE="GPL-2"
-IUSE=""
-DEPEND=">=dev-lang/perl-5.8.0"
-S=${WORKDIR}
-
-src_install() {
-	newbin ${S}/${P} chaosreader
-}
diff --git a/net-analyzer/chaosreader/files/digest-chaosreader-0.92 b/net-analyzer/chaosreader/files/digest-chaosreader-0.92
deleted file mode 100644
index 5a17ee4e83e7..000000000000
--- a/net-analyzer/chaosreader/files/digest-chaosreader-0.92
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f450b1036ced957fd07141a95e7fd06a chaosreader-0.92.bz2 34308
-RMD160 284ff1845e7c6e30ddba3483cdaf02effaad54a3 chaosreader-0.92.bz2 34308
-SHA256 9b69a3460355623e04aed0cccdadbcc484391463e38dde953e78b15c7010b093 chaosreader-0.92.bz2 34308
diff --git a/net-analyzer/chaosreader/files/digest-chaosreader-0.93 b/net-analyzer/chaosreader/files/digest-chaosreader-0.93
deleted file mode 100644
index 23e297a9b082..000000000000
--- a/net-analyzer/chaosreader/files/digest-chaosreader-0.93
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 413745df6d40dc6824a5a5e49e642419 chaosreader-0.93.bz2 36291
-RMD160 eb77e69b7fe71859e949817776e4b9574ecfacfa chaosreader-0.93.bz2 36291
-SHA256 a06e849da9fe7f0e438c42aae966b01f3d653130dd1500c337c566b59c696f4a chaosreader-0.93.bz2 36291