cleanup

5 files changed, 14 insertions, 60 deletions

diff --git a/net-misc/iperf/files/digest-iperf-1.6.3 b/net-misc/iperf/files/digest-iperf-1.6.3
deleted file mode 100644
index 132951b25192..000000000000
--- a/net-misc/iperf/files/digest-iperf-1.6.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 958894904f7abddef9239d2fa12b40da iperf-1.6.3-source.tar.gz 215837
diff --git a/net-misc/iperf/files/iperf-1.6.3-Makefile-gentoo.diff b/net-misc/iperf/files/iperf-1.6.3-Makefile-gentoo.diff
deleted file mode 100644
index f454823ce7fe..000000000000
--- a/net-misc/iperf/files/iperf-1.6.3-Makefile-gentoo.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- Makefile.org	2002-10-31 13:03:27.000000000 +0100
-+++ Makefile	2002-10-31 13:03:51.000000000 +0100
-@@ -62,13 +62,6 @@
- 
- install: $(PROG)
- 	@echo
--	@echo "Where should the iperf binary be installed? [/usr/local/bin]"
--	@read  INSTALL_DIR;                                                 \
--	export INSTALL_DIR;                                                 \
--	INSTALL_DIR=`echo $$INSTALL_DIR | perl -p -e 's/~/$$ENV{"HOME"}/'`; \
--	if test -z "$$INSTALL_DIR"; then                                    \
--	  INSTALL_DIR=/usr/local/bin;                                       \
--	fi;                                                                 \
- 	echo ; (cd src  ; make install);                                    \
- 	echo ; (cd jsrc ; make install)
- 
diff --git a/net-misc/iperf/iperf-1.6.3.ebuild b/net-misc/iperf/iperf-1.6.3.ebuild
deleted file mode 100644
index 4b7152be2632..000000000000
--- a/net-misc/iperf/iperf-1.6.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# Maintainer: Martin Holzer <mholzer@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/iperf-1.6.3.ebuild,v 1.5 2003/09/05 22:13:37 msterret Exp $
-
-# This ebuild was generated by Ebuilder v0.4.
-
-S="${WORKDIR}/${P}"
-DESCRIPTION="Iperf is a tool to measure IP bandwidth using UDP or TCP. It allows for tuning various parameters, and reports bandwidth, delay jitter, and packet loss. It supports IPv6 and multicast."
-SRC_URI="http://dast.nlanr.net/Projects/Iperf/${P}-source.tar.gz"
-HOMEPAGE="http://dast.nlanr.net/Projects/Iperf"
-DEPEND=""
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	patch -p0 < ${FILESDIR}/${P}-Makefile-gentoo.diff
-}
-
-src_compile() {
-	cd cfg
-	econf || die
-	cd ..
-	emake || die
-}
-
-src_install () {
-	make INSTALL_DIR=${D}/usr/bin install || die
-	dodoc INSTALL README VERSION
-}
diff --git a/net-misc/iperf/iperf-1.7.0.ebuild b/net-misc/iperf/iperf-1.7.0.ebuild
index 59001ba754e5..77b9be33b3cc 100644
--- a/net-misc/iperf/iperf-1.7.0.ebuild
+++ b/net-misc/iperf/iperf-1.7.0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/iperf-1.7.0.ebuild,v 1.2 2003/09/05 22:13:37 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/iperf-1.7.0.ebuild,v 1.3 2004/04/19 06:42:07 vapier Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="Iperf is a tool to measure IP bandwidth using UDP or TCP. It allows for tuning various parameters, and reports bandwidth, delay jitter, and packet loss. It supports IPv6 and multicast."
-SRC_URI="http://dast.nlanr.net/Projects/Iperf/${P}-source.tar.gz"
+DESCRIPTION="tool to measure IP bandwidth using UDP or TCP"
 HOMEPAGE="http://dast.nlanr.net/Projects/Iperf"
-DEPEND="virtual/glibc"
+SRC_URI="http://dast.nlanr.net/Projects/Iperf/${P}-source.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="x86"
+
+DEPEND="virtual/glibc"
 
 src_unpack() {
 	unpack ${A}
@@ -25,7 +25,7 @@ src_compile() {
 	emake || die
 }
 
-src_install () {
+src_install() {
 	make INSTALL_DIR=${D}/usr/bin install || die
 	dodoc INSTALL README VERSION
 }
diff --git a/net-misc/iperf/metadata.xml b/net-misc/iperf/metadata.xml
new file mode 100644
index 000000000000..03aa50bab7e3
--- /dev/null
+++ b/net-misc/iperf/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>netmon</herd>
+</pkgmetadata>