Revision bump, add fix for bug #387129, bump to EAPI 4

Package-Manager: portage-2.2.0_alpha134/cvs/Linux x86_64

4 files changed, 82 insertions, 18 deletions

diff --git a/net-misc/iperf/ChangeLog b/net-misc/iperf/ChangeLog
index c5fb78e9e1e6..43bb0d715c81 100644
--- a/net-misc/iperf/ChangeLog
+++ b/net-misc/iperf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/iperf
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/ChangeLog,v 1.41 2011/12/11 21:51:04 maekke Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/ChangeLog,v 1.42 2012/10/06 13:37:47 pinkbyte Exp $
+
+*iperf-2.0.5-r1 (06 Oct 2012)
+
+  06 Oct 2012; Sergey Popov <pinkbyte@gentoo.org> +iperf-2.0.5-r1.ebuild,
+  +files/iperf-fix-bandwidth-limit.patch:
+  Revision bump, add fix for bug #387129, bump to EAPI 4
 
   11 Dec 2011; Markus Meier <maekke@gentoo.org> iperf-2.0.5.ebuild:
   add ~arm, bug #389451
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index 532fe21150af..602d854438fb 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX iperf.confd 308 RMD160 fcaf0a1be69f6265465abab1d0ef664c29923fca SHA1 21532c86c19942030d1b329da136f6cefe1be381 SHA256 11dfe3580458416c9a71b516655df0968f277197f090212d378efe62aacaef9f
-AUX iperf.initd 521 RMD160 05539f95e98815fcd6348b0ed785961ec174b04b SHA1 57265f028c655c2e676559a192376a8ac910643e SHA256 929f5f87ccff042d6b14a4cf4880218fea802cd1b2f66f9bdda8dfac3052c7d7
-DIST iperf-2.0.5.tar.gz 248583 RMD160 975d971974437136ae72bb17c0f776ea92eaf878 SHA1 7302792dcb1bd7aeba032fef6d3dcc310e4d113f SHA256 636b4eff0431cea80667ea85a67ce4c68698760a9837e1e9d13096d20362265b
-EBUILD iperf-2.0.5.ebuild 1010 RMD160 725af42b6258a3b7f5dd1738a8e03559ec149fb8 SHA1 4217bc6e084612dc56cc3fd826a4dfe4e418c3c5 SHA256 87e09df8f39544780f223c8e143bcdabd81d4ddea75fbef2e8e095d7f7df3747
-MISC ChangeLog 4434 RMD160 a32a8779c32c4b9b0e48d736dfadc1b76503dc1d SHA1 af8f0027b29d697dcdb4362b4660979277f0e4dc SHA256 96f1b8496908d03ae28663ae3ffd250303215033ea28fb03ba1ec1178115ed35
-MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk7lJi8ACgkQkKaRLQcq0GKfgwCfcvPiFjVKnvX84GNvmbz6wQ9R
-EqYAn2igDVQIt40VR8cVwyU64YKZcLjD
-=+s6c
------END PGP SIGNATURE-----
+AUX iperf-fix-bandwidth-limit.patch 757 SHA256 367bc42fbb90307ebc83972ef9e31358b0ab4112453e659b3423dc88d308aaff SHA512 fa2687fc311b5166d5f6e5cbda135bddd1a76481184b712dbf859df5bd68a65d339c8548c5cd9d67e8c55971bed9414f0e197f21b6f593527e3ea2eefb79331c WHIRLPOOL 24a64745aa7e8e0e051b45d5b8f5305f17f8e78dde42470d693a977b0f74166d8401dad778dea8f57cb24749bc9b2b23416c6fcf1bc1199e3cea0712821c945b
+AUX iperf.confd 308 SHA256 11dfe3580458416c9a71b516655df0968f277197f090212d378efe62aacaef9f SHA512 95a6184ed9c702ad3c45800f10a071a8ee5a4d3fdf249dd045b655cb5054b2ac2f8b6a8f1a609fa3e8d2824ffedb5c591a21f334606ecf87fa6a04fe24da2baa WHIRLPOOL 7b831dddd7988aa15408b227a421caf16d5ede45bb29cd3e38a2d738531064625c56cfac5bcaa2e66117615a17c0709b517a3435d8c3d04fb8104da1c7dd656e
+AUX iperf.initd 521 SHA256 929f5f87ccff042d6b14a4cf4880218fea802cd1b2f66f9bdda8dfac3052c7d7 SHA512 e725b92d1b682d73aa592e6a66052a27d474e9fa16c795a4998a7d6e7fef41f13374405d9720330875e6cdc68b507e7b4291979796de468d9cbb605f98a274a1 WHIRLPOOL 7e2a53a2c6f500b94951e55e2d02c417a235d01bfbf82fe986962846c4428c64212d8d462fda82a4d05a86cc8ec66a7aa9e6c08ce3de0a9c939e7cfcc3ba1c7b
+DIST iperf-2.0.5.tar.gz 248583 SHA256 636b4eff0431cea80667ea85a67ce4c68698760a9837e1e9d13096d20362265b SHA512 da9a0c01dea2a9dd33aa130b11d938d5f44dd6c3ab27526b0a43df5bf2550fede04238a00b7d54037426afe90ac6d8c4f4ae6861aa170ca7835b6664c9d6537f WHIRLPOOL d66b007fad372516c7f7377872b69ea450fa9ff6d1492f2a224a73f2fb3f7616bd2d57a34a815d4d95683d81fd02d76472d4727323e920410034ba725f6476ce
+EBUILD iperf-2.0.5-r1.ebuild 1032 SHA256 55299f993395141dacab8af175bbb8951fcc1669d669728e8f1dbae36885780b SHA512 70b8ef1a67841fdfa18ad01be33dd4770ccc0584530f63a1e88ebadd9b9aff3f2f00009b65a417ebf99607adfaad8f405fe0c2c04b06cc8c853aed7803facb1b WHIRLPOOL a85e6aafa6c6ed6ae6278636616a990988fc87c621dc95fc718f20c143f3fa24c4ff744e636ce9b94756003bac36b85dd554fb8c8eef11355431a7f827b1fe3b
+EBUILD iperf-2.0.5.ebuild 1010 SHA256 87e09df8f39544780f223c8e143bcdabd81d4ddea75fbef2e8e095d7f7df3747 SHA512 6a1dc353c0d682a7c5b8d164578520919def85a29274c19aa0492d3c1b5d61d35bed5d73fd902b60481a78d8dc49ace42e279ef56993f9ed3ca13217b4e4caa7 WHIRLPOOL 73d91803ebef376e8a7b7e2d183efe6fdfdee6589491db171fd4284a89b485d82c1051d87d66d0fd2cfa201003e408134b74985e239d9a9140a0fc70648b3371
+MISC ChangeLog 4641 SHA256 2c1c4a9432d8f6084b0fb3d179b6f45305d3dcfcd599eca0c35f64c816a2882e SHA512 d986adfe94111ee8980cf24366b2d604a0105a65f8549ac9aa5d2c3de968c3f87eb50cf4f9b16f550a2b6432e0f074705259457056b48675e33e9538fd738a0d WHIRLPOOL 24415d2e7d84cd1019a80600188d48f54ae4456cb9be7a613f6213e2fa020e312c5e65dee3703c4656461facb25671b607f74933b926d057acfd1c0efe213cc3
+MISC metadata.xml 159 SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 SHA512 2c104d2a804da0a38770b6f1ec26cd5b0a49e30392177d5794734a3f4129e82fd0971e5a8a1e48913bfaf1bab57e7bac1fe5ce4f5c618ce057aa5aaf9e59113b WHIRLPOOL 044dec64f8899582332d7fbd7612d2a7c5c7234c44bb9fc51a56f7d6400cd3066a154c3c49dd3f4b468f11e029aa24ff0097ab1387b9f322d57f1d9876afd601
diff --git a/net-misc/iperf/files/iperf-fix-bandwidth-limit.patch b/net-misc/iperf/files/iperf-fix-bandwidth-limit.patch
new file mode 100644
index 000000000000..12b8fb14e671
--- /dev/null
+++ b/net-misc/iperf/files/iperf-fix-bandwidth-limit.patch
@@ -0,0 +1,23 @@
+
+2011-10-14 Israel G. Lugo <israel.lugo@lugosys.com>
+
+* Fix delay_loop() for delays of 1s and greater. Was causing breakage when a
+low bandwidth limit was specified.
+
+
+Index: compat/delay.cpp
+===================================================================
+--- compat/delay.cpp	(revision 81)
++++ compat/delay.cpp	(working copy)
+@@ -63,8 +63,9 @@ void delay_loop(unsigned long usec)
+ {
+     struct timespec requested, remaining;
+ 
+-    requested.tv_sec  = 0;
+-    requested.tv_nsec = usec * 1000L;
++    /* convert to seconds; nanosleep requires 0 <= tv_nsec <= 999999999 */
++    requested.tv_sec  = usec / 1000000UL;
++    requested.tv_nsec = (usec % 1000000UL) * 1000UL;
+ 
+     while (nanosleep(&requested, &remaining) == -1)
+         if (errno == EINTR)
diff --git a/net-misc/iperf/iperf-2.0.5-r1.ebuild b/net-misc/iperf/iperf-2.0.5-r1.ebuild
new file mode 100644
index 000000000000..6484df547877
--- /dev/null
+++ b/net-misc/iperf/iperf-2.0.5-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/iperf-2.0.5-r1.ebuild,v 1.1 2012/10/06 13:37:47 pinkbyte Exp $
+
+EAPI="4"
+
+inherit base
+
+DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
+HOMEPAGE="http://iperf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+IUSE="ipv6 threads debug"
+
+DEPEND=""
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}"/"${PN}"-fix-bandwidth-limit.patch )
+DOCS="INSTALL README"
+
+src_configure() {
+	econf \
+		$(use_enable ipv6) \
+		$(use_enable threads) \
+		$(use_enable debug debuginfo)
+}
+
+src_install() {
+	default
+	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
+}