version bump, #123743; remove old versions

(Portage version: 2.1_pre7-r5)

7 files changed, 19 insertions, 138 deletions

diff --git a/net-p2p/gtk-gnutella/ChangeLog b/net-p2p/gtk-gnutella/ChangeLog
index ecdd1d20e004..2fb2766aaebd 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/ChangeLog,v 1.60 2006/02/13 09:21:28 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/ChangeLog,v 1.61 2006/04/23 04:39:01 squinky86 Exp $
+
+*gtk-gnutella-0.96.1 (23 Apr 2006)
+
+  23 Apr 2006; Jon Hood <squinky86@gentoo.org> -files/0.95-gtk2.6.patch,
+  -gtk-gnutella-0.95-r2.ebuild, -gtk-gnutella-0.96_beta.ebuild,
+  +gtk-gnutella-0.96.1.ebuild:
+  Version bump, #123743. Remove old versions.
 
   13 Feb 2006; Marcin Kryczek <mkay@gentoo.org> -gtk-gnutella-0.95.ebuild,
   -gtk-gnutella-0.95-r1.ebuild, -gtk-gnutella-0.95.4.ebuild:
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index e6fad17ea8da..e153eaa23c8d 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,36 +1,27 @@
 MD5 a7cba7f5952cd0aad9bf2fac21f3141c ChangeLog 10110
 RMD160 4135a51cca1a89d00cc8cc7fe11971fce95ba08f ChangeLog 10110
 SHA256 9539aafb2f07bac9fddcad929a9616f2f3c951dc37c8ef8c4bb4c50c7c3bd4e0 ChangeLog 10110
-MD5 ae9bb9e16331554a4cb95a17526ae2e5 files/0.95-gtk2.6.patch 1475
-RMD160 81df932276619989662e10c025ddded8a0e5d938 files/0.95-gtk2.6.patch 1475
-SHA256 9a9633568656d391cc6a506c9f80e3959b57fbe0fa29c38ba0e9328582aadd75 files/0.95-gtk2.6.patch 1475
-MD5 4fe4d39aa46ee9377a21fd889a537111 files/digest-gtk-gnutella-0.95-r2 71
-RMD160 ea100fac9784a533478ad1149faca1b50b3c1c69 files/digest-gtk-gnutella-0.95-r2 71
-SHA256 5983aadbd7473893e0bd6e1dac1adb8e4708fba466fdf0533c27252d3c7ac5c5 files/digest-gtk-gnutella-0.95-r2 71
 MD5 e689dedf277485b89ebda8f977041c72 files/digest-gtk-gnutella-0.95.4-r1 73
 RMD160 d7cebe551a89c8ec71c13fa8d317196879d74842 files/digest-gtk-gnutella-0.95.4-r1 73
 SHA256 621d889250a47866fa389e1f1cc45a6a15085319d69ba4533b90623afb28c8f5 files/digest-gtk-gnutella-0.95.4-r1 73
 MD5 0d614cf668375ebca2c0e8584198591f files/digest-gtk-gnutella-0.96 71
 RMD160 c284bc57ba3b55c13cbfdca6ac31ce3096586935 files/digest-gtk-gnutella-0.96 71
 SHA256 262f28e3d66c00fdd30bdc8b3a9c2b3729d573c0a2ee04a8deb3fd7b9f5bf8a4 files/digest-gtk-gnutella-0.96 71
-MD5 c853cca1cdb98ecc95612841790820ac files/digest-gtk-gnutella-0.96_beta 72
-RMD160 179acf7af69c8c85f419c0fe2b661664f2143335 files/digest-gtk-gnutella-0.96_beta 72
-SHA256 0fe800a44d632fe727cadf87a487ba8df87e8fdc8aa1db14e3f80fa214ed9469 files/digest-gtk-gnutella-0.96_beta 72
+MD5 499288999bea0b18c4bf0adaa03d6f73 files/digest-gtk-gnutella-0.96.1 265
+RMD160 63eb55ba5a12b23237045074754ba3a3a3f94465 files/digest-gtk-gnutella-0.96.1 265
+SHA256 50ad39963c1653b98d99b9bb4a66fec5527eb17cb5a2207764be469e19625e01 files/digest-gtk-gnutella-0.96.1 265
 MD5 1edaa8e1c79da47114bd08eeec6f50c3 files/gtk-gnutella.desktop 186
 RMD160 41df4a9c5031ae5aa45bc2cb635e1f71459f73ad files/gtk-gnutella.desktop 186
 SHA256 bcb41a10f49f1ed29bb220f51203fed1832adfd5615d96e3d05dd6127a70a177 files/gtk-gnutella.desktop 186
-MD5 24e2ea86d85eb6fbaeb4fd1cd1738e15 gtk-gnutella-0.95-r2.ebuild 1805
-RMD160 fe8be03ddd68d013930a1bfee63a082c5bba5ffe gtk-gnutella-0.95-r2.ebuild 1805
-SHA256 7e32cec8accfd82371c43a14f141e41aa32f79c433fabd048a1fbc5374fca66c gtk-gnutella-0.95-r2.ebuild 1805
 MD5 4793b6f85a8fad9572aec4d42b800138 gtk-gnutella-0.95.4-r1.ebuild 1258
 RMD160 48eb69772041274b32a9e34b06b25654d2b7d460 gtk-gnutella-0.95.4-r1.ebuild 1258
 SHA256 3f6e626f0c48eb641cb26fa7d149a300bfa3fbdfe12a8bf3a04d3a308ea86928 gtk-gnutella-0.95.4-r1.ebuild 1258
+MD5 4ffdf2060ab5f0c73334d16806ee241a gtk-gnutella-0.96.1.ebuild 1302
+RMD160 3bb0948b7c02d7eec4f34329efb56e706cfbd0d5 gtk-gnutella-0.96.1.ebuild 1302
+SHA256 78064815b216ffa62cd10d700e9f46413e04ba4a5b00a52b26f63384b9541d27 gtk-gnutella-0.96.1.ebuild 1302
 MD5 4ffdf2060ab5f0c73334d16806ee241a gtk-gnutella-0.96.ebuild 1302
 RMD160 3bb0948b7c02d7eec4f34329efb56e706cfbd0d5 gtk-gnutella-0.96.ebuild 1302
 SHA256 78064815b216ffa62cd10d700e9f46413e04ba4a5b00a52b26f63384b9541d27 gtk-gnutella-0.96.ebuild 1302
-MD5 c17330531437d61fc9751668ffbdfaf0 gtk-gnutella-0.96_beta.ebuild 1351
-RMD160 b1949e7e376f975a682160fdb8a7a3f0bfee979a gtk-gnutella-0.96_beta.ebuild 1351
-SHA256 f2295947220e86c0fe587b79c73b8543acdf7a4c16dcaab49e8bdb32ac9c8419 gtk-gnutella-0.96_beta.ebuild 1351
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd metadata.xml 160
 SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f metadata.xml 160
diff --git a/net-p2p/gtk-gnutella/files/0.95-gtk2.6.patch b/net-p2p/gtk-gnutella/files/0.95-gtk2.6.patch
deleted file mode 100644
index 12f41943e173..000000000000
--- a/net-p2p/gtk-gnutella/files/0.95-gtk2.6.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -ur gtk-gnutella-0.95-old/src/ui/gtk/gtk2/pbarcellrenderer.c gtk-gnutella-0.95/src/ui/gtk/gtk2/pbarcellrenderer.c
---- gtk-gnutella-0.95-old/src/ui/gtk/gtk2/pbarcellrenderer.c	2005-01-25 01:24:15.291080696 -0500
-+++ gtk-gnutella-0.95/src/ui/gtk/gtk2/pbarcellrenderer.c	2005-01-25 01:37:07.614669664 -0500
-@@ -51,6 +51,9 @@
-  * Boston, MA 02111-1307, USA.
-  */
- 
-+/* If we're using GTK 2.6, this is obsolete - Tim Hentenaar */
-+#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 6
-+
- #include "gtk/gui.h"
- 
- RCSID("$Id: 0.95-gtk2.6.patch,v 1.1 2005/01/30 20:46:05 squinky86 Exp $");
-@@ -426,5 +429,5 @@
- 	G_FREE_NULL(cellprogress->priv);
- 	(*G_OBJECT_CLASS(parent_class)->finalize)(object);
- }
--
-+#endif		/* GTK < 2.6 */
- /* vi: set ts=4: */
-diff -ur gtk-gnutella-0.95-old/src/ui/gtk/gtk2/pbarcellrenderer.h gtk-gnutella-0.95/src/ui/gtk/gtk2/pbarcellrenderer.h
---- gtk-gnutella-0.95-old/src/ui/gtk/gtk2/pbarcellrenderer.h	2005-01-25 01:24:15.291080696 -0500
-+++ gtk-gnutella-0.95/src/ui/gtk/gtk2/pbarcellrenderer.h	2005-01-25 01:35:55.844580376 -0500
-@@ -49,6 +49,9 @@
- #ifndef _gtk2_pbarcellrenderer_h_
- #define _gtk2_pbarcellrenderer_h_
- 
-+/* If we're using GTK 2.6, this is obsolete - Tim Hentenaar */
-+#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 6
-+
- #include <gtk/gtkcellrenderer.h>
- #include "gtk/gui.h"
- 
-@@ -76,5 +79,5 @@
- GtkCellRenderer* gtk_cell_renderer_progress_new(void);
- 
- G_END_DECLS
--
-+#endif	/* GTK < 2.6 */
- #endif	/* _gtk2_pbarcellrenderer_h_ */
diff --git a/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.96.1 b/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.96.1
new file mode 100644
index 000000000000..d2c2963c808b
--- /dev/null
+++ b/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.96.1
@@ -0,0 +1,3 @@
+MD5 6529379cc105c1e98f501a67e8e875fd gtk-gnutella-0.96.1.tar.bz2 2661487
+RMD160 58fc8eb3aea991e81d96435f11665d6f50ccc1de gtk-gnutella-0.96.1.tar.bz2 2661487
+SHA256 a56b53f8ecd2d246b66603cebcaafccbf3fd2ff2ebf05fd2c2e57fd804cf030a gtk-gnutella-0.96.1.tar.bz2 2661487
diff --git a/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.96_beta b/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.96_beta
deleted file mode 100644
index 5e08521745bf..000000000000
--- a/net-p2p/gtk-gnutella/files/digest-gtk-gnutella-0.96_beta
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5ecd6baa91a19250217fd6911c6a932f gtk-gnutella-0.96b.tar.bz2 2570856
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-0.95-r2.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-0.95-r2.ebuild
deleted file mode 100644
index 44d5261a5ec5..000000000000
--- a/net-p2p/gtk-gnutella/gtk-gnutella-0.95-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2005 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.95-r2.ebuild,v 1.1 2005/09/20 18:00:05 mkay Exp $
-
-inherit eutils
-
-IUSE="gnome xml2 nls"
-
-DESCRIPTION="A GTK+ Gnutella client"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-RESTRICT="nomirror"
-HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha"
-
-DEPEND="xml2? ( dev-libs/libxml2 )
-	=dev-libs/glib-1.2* =x11-libs/gtk+-1.2*
-	dev-util/yacc
-	nls? ( >=sys-devel/gettext-0.11.5 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-gtk2.6.patch
-}
-
-src_compile() {
-	local myconf
-
-	if use xml2; then
-		myconf="${myconf} -Dd_libxml2"
-	else
-		myconf="${myconf} -Ud_libxml2"
-	fi
-
-	if use nls; then
-		myconf="${myconf} -Dd_enablenls -Dgmsgfmt=\"/usr/bin/msgfmt\" -Dmsgfmt=\"/usr/bin/msgfmt\""
-	else
-		myconf="${myconf} -Ud_enablenls"
-	fi
-
-	./Configure -d -s -e \
-		-Dprefix="/usr" \
-		-Dprivlib="/usr/share/gtk-gnutella" \
-		-Dccflags="${CFLAGS}" \
-		-Dgtkversion=1 \
-		${myconf} \
-		-Doptimize=" " \
-		-Dofficial="true" || die "Configure failed"
-
-	emake || die "Compile failed"
-}
-
-src_install() {
-	dodir /usr/bin
-	make INSTALL_PREFIX=${D} install || die "Install failed"
-	find ${D}/usr/share -type f -exec chmod a-x {} \;
-	dodoc AUTHORS ChangeLog README TODO
-
-	if use gnome; then
-		insinto /usr/share/gnome/apps/Internet
-		doins ${FILESDIR}/gtk-gnutella.desktop || die
-	fi
-}
-
-pkg_postinst() {
-	if ! use xml2; then
-		ewarn "You have installed gtk-gnutella without xml2 support. As such, your"
-		ewarn "search filters may not be saved when you quit the application."
-		einfo "If you would like this feature enabled, re-emerge with USE=\"xml2\"."
-		echo
-	fi
-}
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-0.96_beta.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-0.96.1.ebuild
index 056c74297731..a32d07cedae9 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-0.96_beta.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-0.96.1.ebuild
@@ -1,17 +1,13 @@
 # Copyright 1999-2006 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.96_beta.ebuild,v 1.1 2006/01/28 12:53:50 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.96.1.ebuild,v 1.1 2006/04/23 04:39:01 squinky86 Exp $
 
 inherit eutils
 
 IUSE="gnome nls dbus"
 
 DESCRIPTION="A GTK+ Gnutella client"
-
-MY_P=${P/_beta/b}
-S=${WORKDIR}/${MY_P}
-
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 RESTRICT="nomirror"
 HOMEPAGE="http://gtk-gnutella.sourceforge.net/"