Fix recv call (bug #336755), add some more includes. Use make command line variables instead of patching Makefile. Remove empty DEPEND.

Package-Manager: portage-2.2.0_alpha6/cvs/Linux i686

4 files changed, 70 insertions, 3 deletions

diff --git a/net-analyzer/ethloop/ChangeLog b/net-analyzer/ethloop/ChangeLog
index c5d5845a0c05..d9736cf894e2 100644
--- a/net-analyzer/ethloop/ChangeLog
+++ b/net-analyzer/ethloop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/ethloop
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethloop/ChangeLog,v 1.5 2006/07/23 23:40:18 vanquirius Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethloop/ChangeLog,v 1.6 2010/12/01 01:03:37 jer Exp $
+
+*ethloop-10-r2 (01 Dec 2010)
+
+  01 Dec 2010; Jeroen Roovers <jer@gentoo.org> +ethloop-10-r2.ebuild,
+  +files/ethloop-10-gcc44.patch:
+  Fix recv call (bug #336755), add some more includes. Use make command line
+  variables instead of patching Makefile. Remove empty DEPEND.
 
   23 Jul 2006; Marcelo Goes <vanquirius@gentoo.org> -ethloop-10.ebuild,
   ethloop-10-r1.ebuild:
diff --git a/net-analyzer/ethloop/Manifest b/net-analyzer/ethloop/Manifest
index ed1bbab27d14..f5de68efb326 100644
--- a/net-analyzer/ethloop/Manifest
+++ b/net-analyzer/ethloop/Manifest
@@ -1,5 +1,7 @@
 AUX ethloop-10-gcc4.diff 566 RMD160 0e935be4c69c8857511cb53233ad9da892208386 SHA1 8c59048cf0b7875692455f8c53a28ff9eeeeee4d SHA256 b2ad05b04bb7e9204e58bec9327ebf388f5fe4c44fcdfcac2424d3fc2ffb75d6
+AUX ethloop-10-gcc44.patch 699 RMD160 561f6d3c66a7747d031cec88ea0a8d0df88747e6 SHA1 27b7d4dcf12f5adc601b0f983840f486e46cdc3d SHA256 90985687cd2d5c846a2bdff2a4b65627a08f3918bdea09ff52e7d50e90311379
 DIST ethloop10.tgz 3912 RMD160 5e08c0da94a686c55daff04152a667548161fc5c SHA1 de85bf1303b5b53e2b5cce61d35b3a470733c95b SHA256 d1f7b4500946dc6c0e6fe031fcebc789d9e061645cd775fe4005820a75039b86
 EBUILD ethloop-10-r1.ebuild 685 RMD160 1a7eeb9e0d345e56506dcd356584160bc94fcccf SHA1 dc88fa0600fd597a88de284bee35868643385d4c SHA256 c4f2934f95e004e1ba7ac4f274ecc2bbb8e969e8df3297458668a4b6f5a1d974
-MISC ChangeLog 994 RMD160 1f9f3ab66ea1b8f255ccc5a6f314a5c772c71dac SHA1 5b93d74c93ea4c3333455ed629e256f11d878eb6 SHA256 e5bcda985e83725e00e88089c71e68e9cc3d25a84dd133f3ae87144172a746a3
+EBUILD ethloop-10-r2.ebuild 675 RMD160 d4e622221e083bfebd2b2375751d76e461977fc2 SHA1 45493124bc5ec3881622bf094c91bbf2de2966b8 SHA256 536166b56019096878a2cb23824cd774ef36a39ca189379a1e3203f56d85bd3b
+MISC ChangeLog 1261 RMD160 8c93363e8eff2a86e2126af7b89f6e5551d477ec SHA1 d1acf0e9568694ebad39f257b6894c2f20960405 SHA256 a294496c235174424d856100300324a0594c4785b6f7388809562d4bb0fb7686
 MISC metadata.xml 244 RMD160 1706e1664e3e6f905b5ab55f255aff0a0c244158 SHA1 535a1c5171ece46f762ed58a1dc6153912b78c4b SHA256 f63f1dc31aa10aec308b80e6d274fab9a03b84516a215da989eae0b8bef5375b
diff --git a/net-analyzer/ethloop/ethloop-10-r2.ebuild b/net-analyzer/ethloop/ethloop-10-r2.ebuild
new file mode 100644
index 000000000000..f4511333b68a
--- /dev/null
+++ b/net-analyzer/ethloop/ethloop-10-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethloop/ethloop-10-r2.ebuild,v 1.1 2010/12/01 01:03:37 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Local simulator for testing Linux QoS disciplines"
+HOMEPAGE="http://luxik.cdi.cz/~devik/qos/ethloop/"
+SRC_URI="http://luxik.cdi.cz/~devik/qos/ethloop/ethloop10.tgz"
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	dosbin ethloop
+}
diff --git a/net-analyzer/ethloop/files/ethloop-10-gcc44.patch b/net-analyzer/ethloop/files/ethloop-10-gcc44.patch
new file mode 100644
index 000000000000..be7f4ddec51a
--- /dev/null
+++ b/net-analyzer/ethloop/files/ethloop-10-gcc44.patch
@@ -0,0 +1,29 @@
+Fix recv call (bug #336755), add some more includes
+
+--- a/ethloop.c	2002-05-03 15:13:20.000000000 +0200
++++ b/ethloop.c	2010-12-01 01:51:58.000000000 +0100
+@@ -1,5 +1,7 @@
+ /* vim: cin sw=4 ts=4
+ */
++#include <arpa/inet.h> /* htons() */
++#include <sys/types.h> /* recv() */
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #include <sys/poll.h>
+@@ -13,6 +15,7 @@
+ #include <stdlib.h>
+ #include <sys/time.h>
+ #include <signal.h>
++#include <string.h>
+ 
+ int sock;
+ 
+@@ -133,7 +136,7 @@
+ int recv_raw(int tmo)
+ {
+ 	struct pollfd pf = {sock,POLLIN,0};
+-	int r; unsigned short proto;
++	ssize_t r; unsigned short proto;
+ 	if(poll(&pf,1,tmo) <= 0) return 0;
+ 	r = recv(sock,&buf,1550,0);
+ 	if (r <= 0) {