Version bump for bug 77616; added conf.d file as well.

(Portage version: 2.0.51-r14)

6 files changed, 59 insertions, 15 deletions

diff --git a/net-misc/iperf/ChangeLog b/net-misc/iperf/ChangeLog
index fe7f00158782..c074e3fb0251 100644
--- a/net-misc/iperf/ChangeLog
+++ b/net-misc/iperf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/iperf
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/ChangeLog,v 1.9 2005/01/21 23:47:11 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/ChangeLog,v 1.10 2005/01/23 10:52:13 ka0ttic Exp $
+
+*iperf-2.0.1 (23 Jan 2005)
+
+  23 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> +files/iperf.confd,
+  files/iperf.initd, +iperf-2.0.1.ebuild:
+  Version bump for bug 77616; added conf.d file as well.
 
   21 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> +files/iperf.initd,
   iperf-1.7.0.ebuild:
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index 058386a13add..580b9a1edad2 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -1,15 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 60bf574f1bcfb718ca180cd5123aca70 iperf-2.0.1.ebuild 947
 MD5 44c5634a576aafd997491f64bc94c2bd iperf-1.7.0.ebuild 939
-MD5 4dab5e771f55a7159d3b7b903b8ee19f ChangeLog 1015
+MD5 90b25f6a4efa6c0f7061a4b5fc148184 ChangeLog 1212
 MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
-MD5 38cdd3984bb355d4ab62c2eb4cb6a79a files/iperf.initd 506
+MD5 c10d89fc6a71962e9b06a0a0c6fd8d99 files/iperf.confd 213
+MD5 5d9bfc029a523ed9a7ff1accf512c431 files/iperf.initd 521
 MD5 8d7742f71fada23db6fa1398664a3c2e files/digest-iperf-1.7.0 70
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB8ZSIEZCkKN40op4RAizbAJsGGG2/LSt40Jw+Zrl3s5XrDx7HBwCgxCGm
-ep2HPtkOl/5eBbU1JSipBPs=
-=dHzt
------END PGP SIGNATURE-----
+MD5 99a03cce31fe2b9ff92f82359c48eae5 files/digest-iperf-2.0.1 63
diff --git a/net-misc/iperf/files/digest-iperf-2.0.1 b/net-misc/iperf/files/digest-iperf-2.0.1
new file mode 100644
index 000000000000..f57b94b5e8ba
--- /dev/null
+++ b/net-misc/iperf/files/digest-iperf-2.0.1
@@ -0,0 +1 @@
+MD5 a7a8f5797c68383722ff671ae18067a4 iperf-2.0.1.tar.gz 220446
diff --git a/net-misc/iperf/files/iperf.confd b/net-misc/iperf/files/iperf.confd
new file mode 100644
index 000000000000..adf238910ae6
--- /dev/null
+++ b/net-misc/iperf/files/iperf.confd
@@ -0,0 +1,6 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/files/iperf.confd,v 1.1 2005/01/23 10:52:13 ka0ttic Exp $
+
+# extra options (run iperf -h for a list of supported options)
+IPERF_OPTS="--format Mbytes"
diff --git a/net-misc/iperf/files/iperf.initd b/net-misc/iperf/files/iperf.initd
index ed6e407bd6b4..968257cf97f7 100644
--- a/net-misc/iperf/files/iperf.initd
+++ b/net-misc/iperf/files/iperf.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/files/iperf.initd,v 1.1 2005/01/21 23:47:11 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/files/iperf.initd,v 1.2 2005/01/23 10:52:13 ka0ttic Exp $
 
 depend() {
 	need net
@@ -10,7 +10,7 @@ depend() {
 start() {
 	ebegin "Starting iperf server"
 	start-stop-daemon --start --quiet \
-		--exec /usr/bin/iperf -- -s -D >/dev/null
+		--exec /usr/bin/iperf -- -s -D ${IPERF_OPTS} &>/dev/null
 	eend $?
 }
 
diff --git a/net-misc/iperf/iperf-2.0.1.ebuild b/net-misc/iperf/iperf-2.0.1.ebuild
new file mode 100644
index 000000000000..ee3c452df90f
--- /dev/null
+++ b/net-misc/iperf/iperf-2.0.1.ebuild
@@ -0,0 +1,38 @@
+# 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.1 2005/01/23 10:52:13 ka0ttic 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/Iperf/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+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
+}