version bump, cleanup old versions

9 files changed, 17 insertions, 170 deletions

diff --git a/net-p2p/gtk-gnutella/ChangeLog b/net-p2p/gtk-gnutella/ChangeLog
index fdd3f2581090..139d4a64e706 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 Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/ChangeLog,v 1.34 2004/08/22 23:29:33 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/ChangeLog,v 1.35 2004/11/28 22:01:50 squinky86 Exp $
+
+*gtk-gnutella-0.95 (28 Nov 2004)
+
+  28 Nov 2004; Jon Hood <squinky86@gentoo.org> -files/0.93-Configure.patch,
+  -files/0.93.4-gcc34.patch, -gtk-gnutella-0.91.1.ebuild,
+  -gtk-gnutella-0.93.4.ebuild, +gtk-gnutella-0.95.ebuild:
+  Version bump and cleanup old versions.
 
   22 Aug 2004; Jason Wever <weeve@gentoo.org> gtk-gnutella-0.94.ebuild:
   Stable on sparc.
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index 2f215de676be..4dea4a54e839 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,13 +1,15 @@
-MD5 8450622d42e06fead77d1c251b1e225a ChangeLog 6473
-MD5 ce7e6ee71ad26511e209ec35f7651f39 gtk-gnutella-0.91.1.ebuild 864
-MD5 4dc203e83278b8ac3f22b6160b61c8c3 gtk-gnutella-0.93.3.ebuild 2170
 MD5 afaf7d6d89f1614db1ae7a1d1fe7f89b gtk-gnutella-0.93.4.ebuild 2266
+MD5 294bb31515a44112e192d5d2d49a8d50 gtk-gnutella-0.95.ebuild 2169
+MD5 4dc203e83278b8ac3f22b6160b61c8c3 gtk-gnutella-0.93.3.ebuild 2170
 MD5 294bb31515a44112e192d5d2d49a8d50 gtk-gnutella-0.94.ebuild 2169
+MD5 8450622d42e06fead77d1c251b1e225a ChangeLog 6473
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
-MD5 dd86fcdefbd3fdb0a115c277b0087e60 files/0.93-Configure.patch 498
+MD5 ce7e6ee71ad26511e209ec35f7651f39 gtk-gnutella-0.91.1.ebuild 864
 MD5 777703229937bea0cf00343c10c186b6 files/0.93.4-gcc34.patch 3206
+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 0083753249fe618068f133b145544070 files/digest-gtk-gnutella-0.94 71
+MD5 4fe4d39aa46ee9377a21fd889a537111 files/digest-gtk-gnutella-0.95 71
 MD5 d567f5847cfc94df6b1c79436514016f files/gtk-gnutella.desktop 155
diff --git a/net-p2p/gtk-gnutella/files/0.93-Configure.patch b/net-p2p/gtk-gnutella/files/0.93-Configure.patch
deleted file mode 100644
index eec473350e36..000000000000
--- a/net-p2p/gtk-gnutella/files/0.93-Configure.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- Configure	2003-11-16 13:49:14.733126480 -0600
-+++ Configure.new	2003-11-16 13:48:57.754707592 -0600
-@@ -692,15 +692,15 @@
- esac
- 
- : Sanity checks
--case "$fastread$alldone" in
--yescont|yesexit) ;;
--*)
--	if test ! -t 0; then
--		echo "Say 'sh Configure', not 'sh <Configure'"
--		exit 1
--	fi
--	;;
--esac
-+#case "$fastread$alldone" in
-+#yescont|yesexit) ;;
-+#*)
-+#	if test ! -t 0; then
-+#		echo "Say 'sh Configure', not 'sh <Configure'"
-+#		exit 1
-+#	fi
-+#	;;
-+#esac
- 
- exec 4>&1
- case "$silent" in
diff --git a/net-p2p/gtk-gnutella/files/0.93.4-gcc34.patch b/net-p2p/gtk-gnutella/files/0.93.4-gcc34.patch
deleted file mode 100644
index cbe928061974..000000000000
--- a/net-p2p/gtk-gnutella/files/0.93.4-gcc34.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-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.91.1 b/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.91.1
deleted file mode 100644
index 02ad5d633dc7..000000000000
--- a/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.91.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bd00261511cd38326357085050423a39 gtk-gnutella-0.91.1.tar.gz 681315
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
deleted file mode 100644
index 33f9356dd777..000000000000
--- a/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.93.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d7eac5792b01694ddcb5969030ec9bbb gtk-gnutella-0.93.4.tar.bz2 1284961
diff --git a/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.95 b/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.95
new file mode 100644
index 000000000000..ce69308b780b
--- /dev/null
+++ b/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.95
@@ -0,0 +1 @@
+MD5 de2ff4973c975ee16cdd69ca72c06bcd gtk-gnutella-0.95.tar.bz2 2191028
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-0.91.1.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-0.91.1.ebuild
deleted file mode 100644
index b2d3c1a4b769..000000000000
--- a/net-p2p/gtk-gnutella/gtk-gnutella-0.91.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.91.1.ebuild,v 1.11 2004/07/15 03:50:16 agriffis Exp $
-
-IUSE="gnome"
-
-DESCRIPTION="A GTK+ Gnutella client"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
-HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc"
-
-DEPEND="=x11-libs/gtk+-1.2*"
-
-src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO || die
-
-	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.4.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-0.95.ebuild
index c534b979a2da..1f87b0fb10d7 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-0.93.4.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-0.95.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.93.4.ebuild,v 1.4 2004/10/04 22:01:32 pvdabeel Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.95.ebuild,v 1.1 2004/11/28 22:01:50 squinky86 Exp $
 
 IUSE="gnome gtk2 xml2 nls"
 
@@ -13,7 +11,7 @@ HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~sparc ~amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 
 DEPEND="xml2? ( dev-libs/libxml2 )
 	gtk2? ( =dev-libs/glib-2* =x11-libs/gtk+-2* )
@@ -21,12 +19,6 @@ 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