Removed old, small cleanup.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

6 files changed, 13 insertions, 131 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/Manifest b/net-misc/iperf/Manifest
index 1bde3f745ab1..a56c4e3f7650 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -1,12 +1,6 @@
 AUX iperf.confd 308 RMD160 fcaf0a1be69f6265465abab1d0ef664c29923fca SHA1 21532c86c19942030d1b329da136f6cefe1be381 SHA256 11dfe3580458416c9a71b516655df0968f277197f090212d378efe62aacaef9f
 AUX iperf.initd 521 RMD160 05539f95e98815fcd6348b0ed785961ec174b04b SHA1 57265f028c655c2e676559a192376a8ac910643e SHA256 929f5f87ccff042d6b14a4cf4880218fea802cd1b2f66f9bdda8dfac3052c7d7
-DIST iperf-1.7.0-source.tar.gz 182773 RMD160 573d325528d5dfdc7c6279ed942bf72948e32bdc SHA1 6f8058616f2105f8342e3a39366a3362b0f85589 SHA256 f54fabaf344b1120e8682c7e5f1ef80d08d88f0b8640037f92e261e51c9c1672
-DIST iperf-2.0.1.tar.gz 220446 RMD160 c7a4fa09c2a00b76c7660db3321ab59c92d37273 SHA1 880cd6bcdfe43832288a1ce63d0d7453e1860d0c SHA256 fe8f98c082b6b752b868d6126583a70558345c116b83d9c188c33b864b1e1c49
-DIST iperf-2.0.2.tar.gz 233595 RMD160 8e3627f718ddc9aea109fceb0c8a0359cd054447 SHA1 5cbda4199c2c6c9417d0d0d0cd840de3009fa36a SHA256 e9baea8cb516b5d83013f746f9fa104abb45fcf15d444a03add06769916e41d6
 DIST iperf-2.0.4.tar.gz 248493 RMD160 b021cc5f2a05465ff04d4b914c94692489e49a9e SHA1 78b6b78789eccf42b5deb783bd8a92469d1383e1 SHA256 3b52f1c178d6a99c27114929d5469c009197d15379c967b329bafb956f397944
-EBUILD iperf-1.7.0.ebuild 945 RMD160 e336945d6bee2484288e1217d28383fdd48f51de SHA1 0c54cdabc39d7f8f03e574763230bd1078a484e5 SHA256 2ce82fa6e5d3880f73359801bf659f33a71c6751543c81ab01d014213c9f8c9f
-EBUILD iperf-2.0.1.ebuild 959 RMD160 0bc73aa792c474ed875088d747e27149a9e6898b SHA1 c158253fb3cc037ee2066030e6e10a14c6ded22d SHA256 35edea9925f7e15317b6a1be7d0419f9e8b48af642731c2b54fda12467f809ed
-EBUILD iperf-2.0.2.ebuild 976 RMD160 64f1f7d25858177133c98a46cb2c470428128559 SHA1 9a7e7b98e3d4c5e31052bbb2269f49a27933a5ed SHA256 b414c18d10086b139d8a944c381986b6642c94a265d0a9256777b7eef3b3ec08
-EBUILD iperf-2.0.4.ebuild 964 RMD160 2aa899f4561c528647ccb092f28d57f9bbe1f1d7 SHA1 7b7b39b392b5b5a558a3047ea35f19340cfdf301 SHA256 bfd343a2ea0119d050684885beed27da4856784788e4f105c49284801637dff2
-MISC ChangeLog 3413 RMD160 32e969392bdc2f6cb3a38957b5922646b04d8c78 SHA1 a1b08ce8f97ce5c0bb46168cc476dc277e9c8960 SHA256 3d3e5d49e719677be3fd678f6b5a0ef0a69d6511962ca17b82d2eeb74c1fe82f
+EBUILD iperf-2.0.4.ebuild 949 RMD160 543d3f01d1ab164ad28345f5ce1b2d865902d9bf SHA1 90488c780ea09f230456f925209da8513a1a96a7 SHA256 7ef2fd5dfbe271005820f81c4c270bd5bca6843a10e4a07209bf84415b364188
+MISC ChangeLog 3571 RMD160 fc3054cb813a87ba4646a59353b76954bc7d0882 SHA1 fab2fd70da2a1d44c9645de63f692362bc6e9ff3 SHA256 e6cd10ade8480d5edfb30e330aa60ee67c48ecac94fba6615b8be29e2165390b
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
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() {