apply gcc patch to fix #146493

Package-Manager: portage-2.1.2_rc1-r1

7 files changed, 116 insertions, 15 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/Manifest b/net-misc/gnomba/Manifest
index f1e3735fc4fb..4928e75b0746 100644
--- a/net-misc/gnomba/Manifest
+++ b/net-misc/gnomba/Manifest
@@ -1,16 +1,34 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX gnomba-0.6.2-gcc-fix.patch 824 RMD160 01525f50d1f2a046d389871480a5560294fbbc47 SHA1 d2741ac3f47520f54ec3c7d8f8873b02ea50f1b3 SHA256 e82066a17bc9b6b03d712b6010c5a319e7c56fdd286359015d614352e3c60fdf
+MD5 140eab9ea5bd5a1f9de201412d4b9476 files/gnomba-0.6.2-gcc-fix.patch 824
+RMD160 01525f50d1f2a046d389871480a5560294fbbc47 files/gnomba-0.6.2-gcc-fix.patch 824
+SHA256 e82066a17bc9b6b03d712b6010c5a319e7c56fdd286359015d614352e3c60fdf files/gnomba-0.6.2-gcc-fix.patch 824
+DIST gnomba-0.6.2.tar.gz 556655 RMD160 516ab2f67f9d41f9546b6823c6d938c8098bece9 SHA1 4e1fd729b071397d400f5704ea3787f3e08e6860 SHA256 839941a5785c1b55dbd2af595c40dbdfe6e06f73ee29732346f07fd3131f5092
+EBUILD gnomba-0.6.2-r1.ebuild 1048 RMD160 c1f404c397a596b33f7c3e9624ce795f3beab2ee SHA1 0f9fa9060d2a2c2a0f1733fefbbba2ce49455b1b SHA256 daf8e077866e4f343fa4f7fd2bf70fbbddfa43af0fbdeec1f5ea2a7db3a263d3
 MD5 974c2cf1abaef0c2912ef48576664529 gnomba-0.6.2-r1.ebuild 1048
+RMD160 c1f404c397a596b33f7c3e9624ce795f3beab2ee gnomba-0.6.2-r1.ebuild 1048
+SHA256 daf8e077866e4f343fa4f7fd2bf70fbbddfa43af0fbdeec1f5ea2a7db3a263d3 gnomba-0.6.2-r1.ebuild 1048
+EBUILD gnomba-0.6.2-r2.ebuild 1137 RMD160 719d893edf3215b6d09566ebdab484d24c191621 SHA1 0a990806805aa47faf4042dba7ef6f1cf581623a SHA256 2f8663fce5720bc7be7676b4048f0d7dee01c65dacab00bf777fbe5f83b9c9dc
+MD5 b992df611534139aa5b6a755b5c51167 gnomba-0.6.2-r2.ebuild 1137
+RMD160 719d893edf3215b6d09566ebdab484d24c191621 gnomba-0.6.2-r2.ebuild 1137
+SHA256 2f8663fce5720bc7be7676b4048f0d7dee01c65dacab00bf777fbe5f83b9c9dc gnomba-0.6.2-r2.ebuild 1137
+EBUILD gnomba-0.6.2.ebuild 897 RMD160 fbf9b153941b5c15a75937200ebafa2f122ac1b9 SHA1 eef110d8fb250e507fd9612dd24f0907664d9721 SHA256 e056564e1c72e741c65863b1772d4f5591ee6042456eea4050b5791cefb97a3c
 MD5 2172ae164f492fe0967e80b58927c768 gnomba-0.6.2.ebuild 897
-MD5 99ff8251cd23deb3b613ae87793fc82e ChangeLog 1702
+RMD160 fbf9b153941b5c15a75937200ebafa2f122ac1b9 gnomba-0.6.2.ebuild 897
+SHA256 e056564e1c72e741c65863b1772d4f5591ee6042456eea4050b5791cefb97a3c gnomba-0.6.2.ebuild 897
+MISC ChangeLog 1887 RMD160 368963e65b458e98947ec0a8db2c2462f6ed0e2e SHA1 5f5db25dfc84671eedc30f7b375273498cf7d86b SHA256 a8168b49e5af9e0c5eb65990852afb3f00826f6bbb204bcd14744d401be1d10f
+MD5 80ff5f180c4616299b441578489327cb ChangeLog 1887
+RMD160 368963e65b458e98947ec0a8db2c2462f6ed0e2e ChangeLog 1887
+SHA256 a8168b49e5af9e0c5eb65990852afb3f00826f6bbb204bcd14744d401be1d10f ChangeLog 1887
+MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 900ccd7d2abcc3d34cc0858830561440 files/digest-gnomba-0.6.2-r1 64
-MD5 900ccd7d2abcc3d34cc0858830561440 files/digest-gnomba-0.6.2 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC1w+3BXaUFmZvwyMRAqPjAKCBnOoJstUJhx7kE25qQzwrCJ4iGgCfQ8VN
-/4RhthIPohyedQKn4cCiOkc=
-=qSnM
------END PGP SIGNATURE-----
+RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
+SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
+MD5 b249163f2b26d44b8357bcc61b94fad9 files/digest-gnomba-0.6.2 238
+RMD160 5873eeee9316427b79214a18bce6e272a91ba84d files/digest-gnomba-0.6.2 238
+SHA256 72ff464db6fc7a88ba5df9efee456066c7f1d7215f8d2e3a35f6ac354aabb6f1 files/digest-gnomba-0.6.2 238
+MD5 b249163f2b26d44b8357bcc61b94fad9 files/digest-gnomba-0.6.2-r1 238
+RMD160 5873eeee9316427b79214a18bce6e272a91ba84d files/digest-gnomba-0.6.2-r1 238
+SHA256 72ff464db6fc7a88ba5df9efee456066c7f1d7215f8d2e3a35f6ac354aabb6f1 files/digest-gnomba-0.6.2-r1 238
+MD5 b249163f2b26d44b8357bcc61b94fad9 files/digest-gnomba-0.6.2-r2 238
+RMD160 5873eeee9316427b79214a18bce6e272a91ba84d files/digest-gnomba-0.6.2-r2 238
+SHA256 72ff464db6fc7a88ba5df9efee456066c7f1d7215f8d2e3a35f6ac354aabb6f1 files/digest-gnomba-0.6.2-r2 238
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
+}