version bump with gcc-3.4 segfault patch

10 files changed, 114 insertions, 134 deletions

diff --git a/net-p2p/gtk-gnutella/ChangeLog b/net-p2p/gtk-gnutella/ChangeLog
index d2a1f3659f09..af1486b15a46 100644
--- a/net-p2p/gtk-gnutella/ChangeLog
+++ b/net-p2p/gtk-gnutella/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/gtk-gnutella
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/ChangeLog,v 1.28 2004/06/15 02:37:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/ChangeLog,v 1.29 2004/06/24 17:26:08 squinky86 Exp $
+
+*gtk-gnutella-0.93.4 (24 Jun 2004)
+
+  24 Jun 2004; Jon Hood <squinky86@gentoo.org> +files/0.93.4-gcc34.patch,
+  -gtk-gnutella-0.92.ebuild, -gtk-gnutella-0.93-r1.ebuild,
+  +gtk-gnutella-0.93.4.ebuild, -gtk-gnutella-0.93.ebuild:
+  version bump, ebuild cleanups; add patch for gcc-3.4 segfaults
 
   14 Jun 2004; Aron Griffis <agriffis@gentoo.org> gtk-gnutella-0.91.1.ebuild,
   gtk-gnutella-0.92.ebuild, gtk-gnutella-0.93-r1.ebuild,
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index a2d916d7b845..6e51a676862b 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,5 +1,6 @@
 MD5 77dbf6cce8883108ce1af3448ac3a283 gtk-gnutella-0.93-r1.ebuild 2175
 MD5 beb7a1fe1c268e019f1a9d4ba4da0a21 gtk-gnutella-0.93.ebuild 1663
+MD5 fcc2be970b2d8ffc890ade314c10b2ef gtk-gnutella-0.93.4.ebuild 2182
 MD5 02bd0011d8775dfebe0121ce53b15d5d gtk-gnutella-0.92.ebuild 1018
 MD5 a2b09ed920af8aebb1fac43ef926107b gtk-gnutella-0.93.3.ebuild 2179
 MD5 915e6303b7f5fdb1d06fdab0a5fb6fb0 ChangeLog 5881
@@ -9,6 +10,7 @@ MD5 3154e3f696fa08ebda08196cd6291459 files/digest-gtk-gnutella-0.93-r1 71
 MD5 dd86fcdefbd3fdb0a115c277b0087e60 files/0.93-Configure.patch 498
 MD5 f3ea5611e91933a99e10202e5b6860b1 files/digest-gtk-gnutella-0.91.1 71
 MD5 e65fa40ee2f1d02bdb6f329e7ed2f577 files/digest-gtk-gnutella-0.93.3 73
+MD5 f97705c20e81c1367a7563f35c5e8090 files/digest-gtk-gnutella-0.93.4 73
 MD5 0ad72608092146aa034f372e4230dc05 files/digest-gtk-gnutella-0.92 70
 MD5 3154e3f696fa08ebda08196cd6291459 files/digest-gtk-gnutella-0.93 71
 MD5 d567f5847cfc94df6b1c79436514016f files/gtk-gnutella.desktop 155
diff --git a/net-p2p/gtk-gnutella/files/0.93.4-gcc34.patch b/net-p2p/gtk-gnutella/files/0.93.4-gcc34.patch
new file mode 100644
index 000000000000..cbe928061974
--- /dev/null
+++ b/net-p2p/gtk-gnutella/files/0.93.4-gcc34.patch
@@ -0,0 +1,91 @@
+diff -Naur gtk-gnutella-0.93.4.vanilla/src/glib-missing.h gtk-gnutella-0.93.4/src/glib-missing.h
+--- gtk-gnutella-0.93.4.vanilla/src/glib-missing.h	2004-06-09 03:49:36.000000000 -0500
++++ gtk-gnutella-0.93.4/src/glib-missing.h	2004-06-24 12:13:32.797554320 -0500
+@@ -62,7 +62,7 @@
+ 		GList *_l = (list); \
+ 		gpointer _user_data = (user_data); \
+ 		while (NULL != _l) { \
+-			(*(func))(_l->data, _user_data); \
++			func(_l->data, _user_data); \
+ 			_l = g_list_next(_l); \
+ 		} \
+ 	} while(0)
+@@ -72,7 +72,7 @@
+ 		GList *_l = (list); \
+ 		gpointer _user_data = (user_data); \
+ 		while (NULL != _l) { \
+-			(*(func))(_user_data, _l->data); \
++			func(_user_data, _l->data); \
+ 			_l = g_list_next(_l); \
+ 		} \
+ 	} while(0)
+@@ -83,7 +83,7 @@
+ 		GSList *_sl = (slist); \
+ 		gpointer _user_data = (user_data); \
+ 		while (NULL != _sl) { \
+-			(*(func))(_sl->data, _user_data); \
++			func(_sl->data, _user_data); \
+ 			_sl = g_slist_next(_sl); \
+ 		} \
+ 	} while(0)
+@@ -94,7 +94,7 @@
+ 		GSList *_sl = (slist); \
+ 		gpointer _user_data = (user_data); \
+ 		while (NULL != _sl) { \
+-			(*(func))(_user_data, _sl->data); \
++			func(_user_data, _sl->data); \
+ 			_sl = g_slist_next(_sl); \
+ 		} \
+ 	} while(0)
+diff -Naur gtk-gnutella-0.93.4.vanilla/src/nodes_gui2.c gtk-gnutella-0.93.4/src/nodes_gui2.c
+--- gtk-gnutella-0.93.4.vanilla/src/nodes_gui2.c	2004-06-09 03:49:41.000000000 -0500
++++ gtk-gnutella-0.93.4/src/nodes_gui2.c	2004-06-24 12:13:51.250749008 -0500
+@@ -432,7 +432,7 @@
+ 
+     if (last_update + 1 < now) {
+ 		last_update = now;
+-		G_LIST_FOREACH(list_nodes, (GFunc) update_row, &now);
++		G_LIST_FOREACH(list_nodes, update_row, &now);
+ 	}
+ }
+ 
+diff -Naur gtk-gnutella-0.93.4.vanilla/src/uploads_gui2.c gtk-gnutella-0.93.4/src/uploads_gui2.c
+--- gtk-gnutella-0.93.4.vanilla/src/uploads_gui2.c	2004-06-09 03:49:44.000000000 -0500
++++ gtk-gnutella-0.93.4/src/uploads_gui2.c	2004-06-24 12:14:23.681818736 -0500
+@@ -524,12 +524,12 @@
+     locked = TRUE;
+ 
+ 	/* Remove all rows with `removed' uploads. */
+-	G_SLIST_FOREACH(sl_removed_uploads, (GFunc) remove_row, &ctx);
++	G_SLIST_FOREACH(sl_removed_uploads, remove_row, &ctx);
+ 	g_slist_free(sl_removed_uploads);
+ 	sl_removed_uploads = ctx.sl_remaining;
+ 
+ 	/* Update the status column for all active uploads. */ 
+-	G_LIST_FOREACH(list_uploads, (GFunc) update_row, &now);
++	G_LIST_FOREACH(list_uploads, update_row, &now);
+        
+ 	if (NULL == sl_removed_uploads)
+ 		gtk_widget_set_sensitive(button_uploads_clear_completed, FALSE);
+@@ -548,7 +548,7 @@
+ 
+ 	/* Remove all rows with `removed' uploads. */
+ 
+-	G_SLIST_FOREACH(sl_removed_uploads, (GFunc) remove_row, &ctx);
++	G_SLIST_FOREACH(sl_removed_uploads, remove_row, &ctx);
+ 	g_slist_free(sl_removed_uploads);
+ 	sl_removed_uploads = ctx.sl_remaining;
+ 
+@@ -602,10 +602,10 @@
+ 
+ 	g_hash_table_destroy(upload_handles);
+ 	upload_handles = NULL;
+-	G_LIST_FOREACH(list_uploads, (GFunc) free_row_data, NULL);
++	G_LIST_FOREACH(list_uploads, free_row_data, NULL);
+ 	g_list_free(list_uploads);
+ 	list_uploads = NULL;
+-	G_SLIST_FOREACH(sl_removed_uploads, (GFunc) free_row_data, NULL);
++	G_SLIST_FOREACH(sl_removed_uploads, free_row_data, NULL);
+ 	g_slist_free(sl_removed_uploads);
+ 	sl_removed_uploads = NULL;
+ }
diff --git a/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.92 b/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.92
deleted file mode 100644
index 91a4626f8c62..000000000000
--- a/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.92
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c31e5386f30c777c8576e1fc87861672 gtk-gnutella-0.92.tar.bz2 888374
diff --git a/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.93 b/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.93
deleted file mode 100644
index b3f1de4fae63..000000000000
--- a/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.93
+++ /dev/null
@@ -1 +0,0 @@
-MD5 78d099392a61064ca30fac84c888550b gtk-gnutella-0.93.tar.bz2 1164124
diff --git a/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.93-r1 b/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.93-r1
deleted file mode 100644
index b3f1de4fae63..000000000000
--- a/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.93-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 78d099392a61064ca30fac84c888550b gtk-gnutella-0.93.tar.bz2 1164124
diff --git a/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.93.4 b/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.93.4
new file mode 100644
index 000000000000..33f9356dd777
--- /dev/null
+++ b/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.93.4
@@ -0,0 +1 @@
+MD5 d7eac5792b01694ddcb5969030ec9bbb gtk-gnutella-0.93.4.tar.bz2 1284961
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-0.92.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-0.92.ebuild
deleted file mode 100644
index 5bda0439a88a..000000000000
--- a/net-p2p/gtk-gnutella/gtk-gnutella-0.92.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.92.ebuild,v 1.6 2004/06/15 02:37:59 agriffis Exp $
-
-IUSE="gnome"
-
-MY_P=${P/_r}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A GTK+ Gnutella client"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-RESTRICT="nomirror"
-HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc"
-
-#DEPEND="( gtk2? ( =dev-libs/glib-2* =x11-libs/gtk+-2* )
-#	      : ( =dev-libs/glib-1.2* =x11-libs/gtk+-1.2* ) )"
-DEPEND="=x11-libs/gtk+-1.2*
-	=dev-libs/glib-1.2*"
-
-src_compile() {
-#	econf `use_enable gtk2`|| die "Configure failed"
-	econf || die "Configure failed"
-	emake || die "Make failed"
-}
-
-src_install () {
-	einstall || die "Install failed"
-	dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
-
-	if use gnome; then
-		insinto /usr/share/gnome/apps/Internet
-		doins ${FILESDIR}/gtk-gnutella.desktop || die
-	fi
-}
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-0.93-r1.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-0.93.4.ebuild
index b1277871e4e2..b1fc4f94bd97 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-0.93-r1.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-0.93.4.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.93-r1.ebuild,v 1.6 2004/06/15 02:37:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.93.4.ebuild,v 1.1 2004/06/24 17:26:08 squinky86 Exp $
+
+inherit eutils
 
 IUSE="gnome gtk2 xml2 nls"
 
@@ -11,7 +13,7 @@ HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 
 DEPEND="xml2? ( dev-libs/libxml2 )
 	gtk2? ( =dev-libs/glib-2* =x11-libs/gtk+-2* )
@@ -19,6 +21,12 @@ DEPEND="xml2? ( dev-libs/libxml2 )
 	dev-util/yacc
 	nls? ( >=sys-devel/gettext-0.11.5 )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-gcc34.patch
+}
+
 src_compile() {
 	local myconf
 
@@ -58,8 +66,8 @@ src_install() {
 	dodoc AUTHORS ChangeLog README TODO
 
 	if use gnome; then
-		insinto /usr/share/gnome/apps/Internet || die
-		doins ${FILESDIR}/gtk-gnutella.desktop
+		insinto /usr/share/gnome/apps/Internet
+		doins ${FILESDIR}/gtk-gnutella.desktop || die
 	fi
 }
 
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-0.93.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-0.93.ebuild
deleted file mode 100644
index 499ec3236aa6..000000000000
--- a/net-p2p/gtk-gnutella/gtk-gnutella-0.93.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.93.ebuild,v 1.7 2004/06/15 02:37:59 agriffis Exp $
-
-IUSE="gnome gtk2 nls"
-
-MY_P=${P/_r}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A GTK+ Gnutella client"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-RESTRICT="nomirror"
-HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc"
-
-DEPEND="gtk2? ( =dev-libs/glib-2* =x11-libs/gtk+-2* )
-	    !gtk2? ( =dev-libs/glib-1.2* =x11-libs/gtk+-1.2* )"
-#DEPEND="=x11-libs/gtk+-1.2*
-#	=dev-libs/glib-1.2*"
-DEPEND="${DEPEND} || ( dev-util/yacc sys-devel/bison )"
-
-src_compile() {
-	if use gtk2; then
-		GTK_VER=2
-	else
-		GTK_VER=1
-	fi
-	if use nls; then
-		USE_NLS=y
-	else
-		USE_NLS=n
-	fi
-
-#	econf `use_enable gtk2`|| die "Configure failed"
-	patch Configure < ${FILESDIR}/0.93-Configure.patch
-	#FIXME: This should use the commandline defaults modification
-	#stuff, fix this before next build
-	cat << EOF | ./Configure || die "Configure Failed"
-
-
-
-
-y
-n
-${GTK_VER}
-y
-/usr
-
-
-
-
-${CC}
-
-
-${CFLAGS}
-
-
-
-
-${USE_NLS}
-
-
-
-
-
-
-EOF
-	emake || die "Make failed"
-}
-
-src_install () {
-	make INSTALL_PREFIX=${D} install || die "Install failed"
-	dodoc AUTHORS ChangeLog LICENSE MANIFEST README TODO doc
-	if use gnome; then
-		insinto /usr/share/gnome/apps/Internet
-		doins ${FILESDIR}/gtk-gnutella.desktop || die
-	fi
-}
-
-pkg_postinst () {
-	if use gtk2; then
-		ewarn "You have enabled the GTK2 build of gtk-gnutella, there"
-		ewarn "is a known bug which causes an invalid assertion if"
-		ewarn "you select passive search"
-	fi
-}
-