apply gcc patch to fix #146493

(Portage version: 2.1.2_rc1-r1)

6 files changed, 85 insertions, 2 deletions

diff --git a/net-misc/gnomba/ChangeLog b/net-misc/gnomba/ChangeLog
index af1bdd62b400..b8bd137f437d 100644
--- a/net-misc/gnomba/ChangeLog
+++ b/net-misc/gnomba/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/gnomba
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/gnomba/ChangeLog,v 1.13 2005/05/27 19:26:05 gustavoz Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gnomba/ChangeLog,v 1.14 2006/11/05 20:03:33 allanonjl Exp $
+
+*gnomba-0.6.2-r2 (05 Nov 2006)
+
+  05 Nov 2006; John N. Laliberte <allanonjl@gentoo.org>
+  +files/gnomba-0.6.2-gcc-fix.patch, +gnomba-0.6.2-r2.ebuild:
+  apply gcc patch to fix #146493
 
   27 May 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   gnomba-0.6.2-r1.ebuild:
diff --git a/net-misc/gnomba/files/digest-gnomba-0.6.2 b/net-misc/gnomba/files/digest-gnomba-0.6.2
index 5b9e90cf5595..2c2e04647304 100644
--- a/net-misc/gnomba/files/digest-gnomba-0.6.2
+++ b/net-misc/gnomba/files/digest-gnomba-0.6.2
@@ -1 +1,3 @@
 MD5 698c40d2755c5b0d467e4de2f2119c0c gnomba-0.6.2.tar.gz 556655
+RMD160 516ab2f67f9d41f9546b6823c6d938c8098bece9 gnomba-0.6.2.tar.gz 556655
+SHA256 839941a5785c1b55dbd2af595c40dbdfe6e06f73ee29732346f07fd3131f5092 gnomba-0.6.2.tar.gz 556655
diff --git a/net-misc/gnomba/files/digest-gnomba-0.6.2-r1 b/net-misc/gnomba/files/digest-gnomba-0.6.2-r1
index 5b9e90cf5595..2c2e04647304 100644
--- a/net-misc/gnomba/files/digest-gnomba-0.6.2-r1
+++ b/net-misc/gnomba/files/digest-gnomba-0.6.2-r1
@@ -1 +1,3 @@
 MD5 698c40d2755c5b0d467e4de2f2119c0c gnomba-0.6.2.tar.gz 556655
+RMD160 516ab2f67f9d41f9546b6823c6d938c8098bece9 gnomba-0.6.2.tar.gz 556655
+SHA256 839941a5785c1b55dbd2af595c40dbdfe6e06f73ee29732346f07fd3131f5092 gnomba-0.6.2.tar.gz 556655
diff --git a/net-misc/gnomba/files/digest-gnomba-0.6.2-r2 b/net-misc/gnomba/files/digest-gnomba-0.6.2-r2
new file mode 100644
index 000000000000..2c2e04647304
--- /dev/null
+++ b/net-misc/gnomba/files/digest-gnomba-0.6.2-r2
@@ -0,0 +1,3 @@
+MD5 698c40d2755c5b0d467e4de2f2119c0c gnomba-0.6.2.tar.gz 556655
+RMD160 516ab2f67f9d41f9546b6823c6d938c8098bece9 gnomba-0.6.2.tar.gz 556655
+SHA256 839941a5785c1b55dbd2af595c40dbdfe6e06f73ee29732346f07fd3131f5092 gnomba-0.6.2.tar.gz 556655
diff --git a/net-misc/gnomba/files/gnomba-0.6.2-gcc-fix.patch b/net-misc/gnomba/files/gnomba-0.6.2-gcc-fix.patch
new file mode 100644
index 000000000000..b2cba92bd156
--- /dev/null
+++ b/net-misc/gnomba/files/gnomba-0.6.2-gcc-fix.patch
@@ -0,0 +1,27 @@
+--- src/net.c	2000-02-16 01:01:37.000000000 -0500
++++ src/net.c.new	2006-11-04 22:46:52.000000000 -0500
+@@ -369,10 +369,20 @@
+ 
+   sock_unblock(socket_client);
+ 
+-	if (SlowScan) loops = 50; else loops = 2;
+-  for (timeout = 0; timeout < loops; timeout++) {
+-    if (SlowScan) usleep(700000); else usleep(100000);
+-    if (recvfrom(socket_client, buffer, sizeof(buffer), 0, (struct sockaddr *) &sin_dst, &(int) longueur) != -1) {
++	if (SlowScan)
++        loops = 50;
++    else
++        loops = 2;
++
++  for (timeout = 0; timeout < loops; timeout++)
++  {
++    if (SlowScan)
++        usleep(700000);
++    else
++        usleep(100000);
++
++    if (recvfrom(socket_client, buffer, sizeof(buffer), 0, (struct sockaddr *) &sin_dst, longueur) != -1)
++    {
+       if (nmb->rep_num != 0) {
+ 
+ 	/*set to first nameblock after header */
diff --git a/net-misc/gnomba/gnomba-0.6.2-r2.ebuild b/net-misc/gnomba/gnomba-0.6.2-r2.ebuild
new file mode 100644
index 000000000000..ca6c4b780b8e
--- /dev/null
+++ b/net-misc/gnomba/gnomba-0.6.2-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gnomba/gnomba-0.6.2-r2.ebuild,v 1.1 2006/11/05 20:03:33 allanonjl Exp $
+
+inherit eutils
+
+DESCRIPTION="Gnome Samba Browser"
+SRC_URI="http://gnomba.sourceforge.net/src/${P}.tar.gz"
+HOMEPAGE="http://gnomba.sourceforge.net/"
+LICENSE="GPL-2"
+KEYWORDS="~sparc ~x86"
+SLOT="0"
+
+IUSE="debug"
+DEPEND="gnome-base/gnome-libs"
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-gcc-fix.patch"
+}
+
+src_compile() {
+	econf `use_enable debug` || die "econf failed"
+	# We touch the Makefile here, because the configure script
+	# touches Makefile.in and we want to avoid the recreation
+	touch Makefile
+	emake \
+		CODEPAGEDIR=/var/lib/samba/codepages \
+		LMHOSTSFILE=/etc/samba/lmhosts \
+		SMB_PASSWD_FILE=/etc/samba/private/smbpasswd \
+		PASSWD_PROGRAM=/usr/bin/passwd \
+		DRIVERFILE=/etc/samba/printers.def \
+		|| die "emake failed"
+}
+
+src_install() {
+	edos2unix gnomba.desktop
+
+	einstall || die "einstall failed"
+	dodoc AUTHORS BUGS COPYING ChangeLog HACKING INSTALL NEWS README TODO
+}