fix gwebcaches correctly this time

5 files changed, 29 insertions, 6 deletions

diff --git a/net-p2p/gift-gnutella/ChangeLog b/net-p2p/gift-gnutella/ChangeLog
index 92ecca304912..8cf6fb321cf1 100644
--- a/net-p2p/gift-gnutella/ChangeLog
+++ b/net-p2p/gift-gnutella/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/gift-gnutella
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift-gnutella/ChangeLog,v 1.16 2004/09/01 19:49:40 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift-gnutella/ChangeLog,v 1.17 2004/09/12 04:26:26 squinky86 Exp $
+
+  11 Sep 2004; Jon Hood <squinky86@gentoo.org> -files/0.0.9.2-nodes.patch.bz2,
+  +files/cacheupdate.sh, gift-gnutella-0.0.9.2.ebuild:
+  Remove gwebcache patch and create a nice updating script instead.
 
   01 Sep 2004; Jon Hood <squinky86@gentoo.org> +files/0.0.9.2-nodes.patch.bz2,
   gift-gnutella-0.0.9.2.ebuild:
diff --git a/net-p2p/gift-gnutella/Manifest b/net-p2p/gift-gnutella/Manifest
index 88b4665ef54c..8bc7e2f6bedb 100644
--- a/net-p2p/gift-gnutella/Manifest
+++ b/net-p2p/gift-gnutella/Manifest
@@ -1,6 +1,6 @@
-MD5 8970a4a903c70122e67df7f39a64159c gift-gnutella-0.0.9.2.ebuild 1255
-MD5 261cd19f8b638b722e003ad9089819d5 ChangeLog 2413
+MD5 4324157013d6f6aeac819a47760152b3 gift-gnutella-0.0.9.2.ebuild 1393
+MD5 7cec74b0299b882dc3eea20601c330a3 ChangeLog 2616
 MD5 875f23093b78af2d864a7a7ba464f126 metadata.xml 223
 MD5 c464f118c813212dd2f6e7ddbfd0bef4 files/digest-gift-gnutella-0.0.9.2 74
 MD5 3a2b71fe09957a425acb0f40be079266 files/gift-gnutella-gcc35.patch 457
-MD5 95dca9f60f18e513b09b1c19f2e07121 files/0.0.9.2-nodes.patch.bz2 1693
+MD5 cd1a2ac4d31dc12dc5adfa8b5d5a4277 files/cacheupdate.sh 669
diff --git a/net-p2p/gift-gnutella/files/0.0.9.2-nodes.patch.bz2 b/net-p2p/gift-gnutella/files/0.0.9.2-nodes.patch.bz2
deleted file mode 100644
index 6386a2827c34..000000000000
--- a/net-p2p/gift-gnutella/files/0.0.9.2-nodes.patch.bz2
+++ /dev/null
diff --git a/net-p2p/gift-gnutella/files/cacheupdate.sh b/net-p2p/gift-gnutella/files/cacheupdate.sh
new file mode 100644
index 000000000000..a86eebdc65c3
--- /dev/null
+++ b/net-p2p/gift-gnutella/files/cacheupdate.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift-gnutella/files/cacheupdate.sh,v 1.1 2004/09/12 04:26:26 squinky86 Exp $
+
+if [ -d ~/.giFT/Gnutella/ ]; then
+	cd ~/.giFT/Gnutella
+	wget http://gwebcache.squinky.gotdns.com/perlgcache.cgi?get=1\&hostfile=1\&net=gnutella2\&client=GEN2\&version=0.1 -O gwebcaches.new || die
+	grep "u|" gwebcaches.new > gwebcaches.new1
+	sed -i -e 's:u|::g' gwebcaches.new1
+	sed -i -e 's:|.*::g' gwebcaches.new1
+	mv gwebcaches.new1 gwebcaches
+	rm gwebcaches.new
+else
+	echo "Please emerge gift-gnutella and run gift-setup."
+fi
diff --git a/net-p2p/gift-gnutella/gift-gnutella-0.0.9.2.ebuild b/net-p2p/gift-gnutella/gift-gnutella-0.0.9.2.ebuild
index 8ea8723c8994..a2e468d85b10 100644
--- a/net-p2p/gift-gnutella/gift-gnutella-0.0.9.2.ebuild
+++ b/net-p2p/gift-gnutella/gift-gnutella-0.0.9.2.ebuild
@@ -1,6 +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/gift-gnutella/gift-gnutella-0.0.9.2.ebuild,v 1.14 2004/09/01 19:49:40 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift-gnutella/gift-gnutella-0.0.9.2.ebuild,v 1.15 2004/09/12 04:26:26 squinky86 Exp $
 
 inherit eutils
 
@@ -25,7 +25,6 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-gcc35.patch
-	epatch ${FILESDIR}/${PV}-nodes.patch.bz2
 }
 
 src_compile() {
@@ -48,4 +47,8 @@ pkg_postinst() {
 	einfo "Alternatively you can add the following line to"
 	einfo "your ~/.giFT/giftd.conf configuration file:"
 	einfo "plugins = Gnutella"
+	echo
+	ewarn "This version of gift-gnutella does not install proper gwebcaches."
+	ewarn "To update your caches, run:"
+	ewarn "\tsh /usr/portage/net-p2p/${PN}/files/cacheupdate.sh"
 }