Removed old, small cleanup.

(Portage version: 2.2_rc33/cvs/Linux i686)

5 files changed, 11 insertions, 123 deletions

diff --git a/net-misc/iperf/ChangeLog b/net-misc/iperf/ChangeLog
index 3f6bcf2d42c4..b9d992589a4f 100644
--- a/net-misc/iperf/ChangeLog
+++ b/net-misc/iperf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/iperf
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/ChangeLog,v 1.32 2009/05/31 18:17:23 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/ChangeLog,v 1.33 2009/06/01 20:03:18 pva Exp $
+
+  01 Jun 2009; Peter Volkov <pva@gentoo.org> -iperf-1.7.0.ebuild,
+  -iperf-2.0.1.ebuild, -iperf-2.0.2.ebuild, iperf-2.0.4.ebuild:
+  Removed old, small cleanup.
 
   31 May 2009; Brent Baude <ranger@gentoo.org> iperf-2.0.4.ebuild:
   stable ppc64, bug 263878
diff --git a/net-misc/iperf/iperf-1.7.0.ebuild b/net-misc/iperf/iperf-1.7.0.ebuild
deleted file mode 100644
index ea495f8a7574..000000000000
--- a/net-misc/iperf/iperf-1.7.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# 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.8 2005/08/09 19:12:45 ranger Exp $
-
-IUSE=""
-DESCRIPTION="tool to measure IP bandwidth using UDP or TCP"
-HOMEPAGE="http://dast.nlanr.net/Projects/Iperf"
-SRC_URI="http://dast.nlanr.net/Projects/Iperf/${P}-source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~ppc64 x86"
-
-DEPEND="virtual/libc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i 's:@read  INSTALL_DIR;::' Makefile || die "sed Makefile failed"
-}
-
-src_compile() {
-	cd cfg
-	econf || die "econf failed"
-	cd ..
-	emake || die "emake failed"
-}
-
-src_install() {
-	make INSTALL_DIR=${D}/usr/bin install || die "make install failed"
-	dodoc INSTALL README VERSION
-	newinitd ${FILESDIR}/${PN}.initd ${PN}
-}
-
-pkg_postinst() {
-	echo
-	einfo "To run iperf in server mode, run:"
-	einfo "  /etc/init.d/iperf start"
-	echo
-}
diff --git a/net-misc/iperf/iperf-2.0.1.ebuild b/net-misc/iperf/iperf-2.0.1.ebuild
deleted file mode 100644
index 2e78f0853db9..000000000000
--- a/net-misc/iperf/iperf-2.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/iperf-2.0.1.ebuild,v 1.7 2005/12/04 21:21:25 tgall Exp $
-
-DESCRIPTION="tool to measure IP bandwidth using UDP or TCP"
-HOMEPAGE="http://dast.nlanr.net/Projects/Iperf"
-SRC_URI="http://dast.nlanr.net/Projects/Iperf2.0/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86"
-IUSE="ipv6 threads debug"
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable threads) \
-		$(use_enable debug debuginfo) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc INSTALL README
-	dohtml doc/*
-	newinitd ${FILESDIR}/${PN}.initd ${PN}
-	newconfd ${FILESDIR}/${PN}.confd ${PN}
-}
-
-pkg_postinst() {
-	echo
-	einfo "To run iperf in server mode, run:"
-	einfo "  /etc/init.d/iperf start"
-	echo
-}
diff --git a/net-misc/iperf/iperf-2.0.2.ebuild b/net-misc/iperf/iperf-2.0.2.ebuild
deleted file mode 100644
index 51bf073fa558..000000000000
--- a/net-misc/iperf/iperf-2.0.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/iperf-2.0.2.ebuild,v 1.6 2007/06/12 17:54:39 lavajoe Exp $
-
-DESCRIPTION="tool to measure IP bandwidth using UDP or TCP"
-HOMEPAGE="http://dast.nlanr.net/Projects/Iperf"
-SRC_URI="http://dast.nlanr.net/Projects/Iperf2.0/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ppc64 x86 ~x86-fbsd"
-IUSE="ipv6 threads debug"
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable threads) \
-		$(use_enable debug debuginfo) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc INSTALL README
-	dohtml doc/*
-	newinitd ${FILESDIR}/${PN}.initd ${PN}
-	newconfd ${FILESDIR}/${PN}.confd ${PN}
-}
-
-pkg_postinst() {
-	echo
-	einfo "To run iperf in server mode, run:"
-	einfo "  /etc/init.d/iperf start"
-	echo
-}
diff --git a/net-misc/iperf/iperf-2.0.4.ebuild b/net-misc/iperf/iperf-2.0.4.ebuild
index 32f7e85bab62..51c48c7204f4 100644
--- a/net-misc/iperf/iperf-2.0.4.ebuild
+++ b/net-misc/iperf/iperf-2.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/iperf-2.0.4.ebuild,v 1.9 2009/05/31 18:17:23 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/iperf-2.0.4.ebuild,v 1.10 2009/06/01 20:03:18 pva Exp $
 
 DESCRIPTION="tool to measure IP bandwidth using UDP or TCP"
 HOMEPAGE="http://iperf.sourceforge.net/"
@@ -11,14 +11,14 @@ SLOT="0"
 KEYWORDS="amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="ipv6 threads debug"
 
-DEPEND="virtual/libc"
+DEPEND=""
+RDEPEND=""
 
 src_compile() {
 	econf \
 		$(use_enable ipv6) \
 		$(use_enable threads) \
-		$(use_enable debug debuginfo) \
-		|| die "econf failed"
+		$(use_enable debug debuginfo)
 	emake || die "emake failed"
 }
 
@@ -26,8 +26,8 @@ src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 	dodoc INSTALL README
 	dohtml doc/*
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
+	newconfd "${FILESDIR}"/${PN}.confd ${PN} || die
 }
 
 pkg_postinst() {