Version bump and removing broken version

6 files changed, 20 insertions, 125 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 17ee51945b3b..2a59db67e58d 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.234 2004/08/27 13:52:37 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.235 2004/08/27 14:12:20 rizzo Exp $
+
+*gaim-0.82.1 (27 Aug 2004)
+
+  27 Aug 2004; Don Seiler <rizzo@gentoo.org>
+  -files/gaim-0.83cvs-iconcrash.diff, -gaim-0.82-r1.ebuild,
+  +gaim-0.82.1.ebuild:
+  Version bump and removing broken version
 
   27 Aug 2004; Brandon Low <lostlogic@gentoo.org> gaim-0.82-r1.ebuild:
   Put crypt back in
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index c234e0ab5277..8e3ca550f1dc 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,10 +1,12 @@
+MD5 0c0c01b2bc9e89755905a629df6df7c5 ChangeLog 37465
 MD5 85e0911b1cf51d0054c342d93de141d4 gaim-0.81-r5.ebuild 3477
 MD5 628b2cea6d1167af50bb5c5e2f360e84 gaim-0.82-r1.ebuild 3427
-MD5 0c0c01b2bc9e89755905a629df6df7c5 ChangeLog 37465
 MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481
-MD5 9f2fa9ae8de6d285902cb2b46389c681 files/gaim-0.81-security2.diff 10297
-MD5 e5139bdf87b04d542ccce3195ea78d79 files/gaim-0.83cvs-iconcrash.diff 3920
-MD5 22aae7173f7cbf5d93d1db9907740064 files/syslog_fd_leak.diff 8423
+MD5 d095264532e89f7c43c2fd3d90218ab9 gaim-0.82.1.ebuild 3261
 MD5 ed679fa262748c5626af4d9dcfd4b278 files/digest-gaim-0.81-r5 63
 MD5 e0a48363ecde3b7f0c2cfc6ffbe488bd files/digest-gaim-0.82-r1 63
 MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644
+MD5 9f2fa9ae8de6d285902cb2b46389c681 files/gaim-0.81-security2.diff 10297
+MD5 e5139bdf87b04d542ccce3195ea78d79 files/gaim-0.83cvs-iconcrash.diff 3920
+MD5 22aae7173f7cbf5d93d1db9907740064 files/syslog_fd_leak.diff 8423
+MD5 c8c73743c47ef3956b6b499fa0d91347 files/digest-gaim-0.82.1 65
diff --git a/net-im/gaim/files/digest-gaim-0.82-r1 b/net-im/gaim/files/digest-gaim-0.82-r1
deleted file mode 100644
index 74fa96f2df12..000000000000
--- a/net-im/gaim/files/digest-gaim-0.82-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e47420012e9c026c2563d074e267d49b gaim-0.82.tar.bz2 4603356
diff --git a/net-im/gaim/files/digest-gaim-0.82.1 b/net-im/gaim/files/digest-gaim-0.82.1
new file mode 100644
index 000000000000..7c78fa36511d
--- /dev/null
+++ b/net-im/gaim/files/digest-gaim-0.82.1
@@ -0,0 +1 @@
+MD5 94484a0328dbe8073c8a97c572ce959b gaim-0.82.1.tar.bz2 4604261
diff --git a/net-im/gaim/files/gaim-0.83cvs-iconcrash.diff b/net-im/gaim/files/gaim-0.83cvs-iconcrash.diff
deleted file mode 100644
index c8934cb79191..000000000000
--- a/net-im/gaim/files/gaim-0.83cvs-iconcrash.diff
+++ /dev/null
@@ -1,111 +0,0 @@
-Index: gtkconv.c
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v
-retrieving revision 1.467
-retrieving revision 1.468
-diff -u -d -p -r1.467 -r1.468
---- gtkconv.c	25 Aug 2004 23:45:16 -0000	1.467
-+++ gtkconv.c	26 Aug 2004 13:32:49 -0000	1.468
-@@ -3705,7 +3705,8 @@ setup_im_buttons(GaimConversation *conv,
- 	/* Remove anything else in our parent */
- 	children = gtk_container_get_children(GTK_CONTAINER(parent));
- 	while (children != NULL) {
--		gtk_container_remove(GTK_CONTAINER(parent), children->data);
-+		if(children->data != gtkim->icon_container)
-+			gtk_container_remove(GTK_CONTAINER(parent), children->data);
- 		children = g_list_remove(children, children->data);
- 	}
- 
-@@ -5620,7 +5621,6 @@ gaim_gtkconv_update_buddy_icon(GaimConve
- 
- 	GdkPixbuf *buf;
- 
--	GtkWidget *vbox;
- 	GtkWidget *event;
- 	GtkWidget *frame;
- 	GdkPixbuf *scale;
-@@ -5650,8 +5650,9 @@ gaim_gtkconv_update_buddy_icon(GaimConve
- 		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(account->gc->prpl);
- 
- 	/* Remove the current icon stuff */
--	if (gtkconv->u.im->icon != NULL)
--		gtk_widget_destroy(gtkconv->u.im->icon->parent->parent->parent);
-+	if (gtkconv->u.im->icon_container != NULL)
-+		gtk_widget_destroy(gtkconv->u.im->icon_container);
-+	gtkconv->u.im->icon_container = NULL;
- 
- 	if (gtkconv->u.im->anim != NULL)
- 		g_object_unref(G_OBJECT(gtkconv->u.im->anim));
-@@ -5670,8 +5671,6 @@ gaim_gtkconv_update_buddy_icon(GaimConve
- 	if (gaim_conversation_get_gc(conv) == NULL)
- 		return;
- 
--
--
- 	icon = gaim_conv_im_get_icon(GAIM_CONV_IM(conv));
- 
- 	if (icon == NULL)
-@@ -5696,7 +5695,6 @@ gaim_gtkconv_update_buddy_icon(GaimConve
- 	/* make sure we remove the file as soon as possible */
- 	unlink(filename);
- 
--
- 	if (err) {
- 		gaim_debug(GAIM_DEBUG_ERROR, "gtkconv",
- 				   "Buddy icon error: %s\n", err->message);
-@@ -5730,12 +5728,13 @@ gaim_gtkconv_update_buddy_icon(GaimConve
- 	g_object_unref(G_OBJECT(scale));
- 
- 
--	vbox = gtk_vbox_new(FALSE, 0);
-+	gtkconv->u.im->icon_container = gtk_vbox_new(FALSE, 0);
- 
- 	frame = gtk_frame_new(NULL);
- 	gtk_frame_set_shadow_type(GTK_FRAME(frame),
- 							  (bm ? GTK_SHADOW_NONE : GTK_SHADOW_IN));
--	gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
-+	gtk_box_pack_start(GTK_BOX(gtkconv->u.im->icon_container), frame,
-+					   FALSE, FALSE, 0);
- 
- 	event = gtk_event_box_new();
- 	gtk_container_add(GTK_CONTAINER(frame), event);
-@@ -5757,14 +5756,17 @@ gaim_gtkconv_update_buddy_icon(GaimConve
- 	/* the button seems to get its size before the box, so... */
- 	gtk_widget_size_request(gtkconv->send, &requisition);
- 	if (button_type == GAIM_BUTTON_NONE || requisition.height * 1.5 < scale_height) {
--		gtk_box_pack_start(GTK_BOX(gtkconv->lower_hbox), vbox, FALSE, FALSE, 0);
-+		gtk_box_pack_start(GTK_BOX(gtkconv->lower_hbox),
-+						   gtkconv->u.im->icon_container, FALSE, FALSE, 0);
- /*		gtk_box_reorder_child(GTK_BOX(gtkconv->lower_hbox), vbox, 0); */
- 	} else {
--		gtk_box_pack_start(GTK_BOX(gtkconv->bbox), vbox, FALSE, FALSE, 0);
--		gtk_box_reorder_child(GTK_BOX(gtkconv->bbox), vbox, 0);
-+		gtk_box_pack_start(GTK_BOX(gtkconv->bbox),
-+						   gtkconv->u.im->icon_container, FALSE, FALSE, 0);
-+		gtk_box_reorder_child(GTK_BOX(gtkconv->bbox),
-+							  gtkconv->u.im->icon_container, 0);
- 	}
- 
--	gtk_widget_show(vbox);
-+	gtk_widget_show(gtkconv->u.im->icon_container);
- 	gtk_widget_show(frame);
- 
- 	/* The buddy icon code needs badly to be fixed. */
-
-Index: gtkconv.h
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/gtkconv.h,v
-retrieving revision 1.54
-retrieving revision 1.55
-diff -u -d -p -r1.54 -r1.55
---- gtkconv.h	20 Aug 2004 05:11:30 -0000	1.54
-+++ gtkconv.h	26 Aug 2004 13:32:50 -0000	1.55
-@@ -114,6 +114,7 @@ struct _GaimGtkImPane
- 	gboolean a_virgin;
- 
- 	/* Buddy icon stuff */
-+	GtkWidget *icon_container;
- 	GtkWidget *icon;
- 	gboolean show_icon;
- 	gboolean animate;
-
diff --git a/net-im/gaim/gaim-0.82-r1.ebuild b/net-im/gaim/gaim-0.82.1.ebuild
index ad90bcd1901f..55ef33b031b6 100644
--- a/net-im/gaim/gaim-0.82-r1.ebuild
+++ b/net-im/gaim/gaim-0.82.1.ebuild
@@ -1,18 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.82-r1.ebuild,v 1.2 2004/08/27 13:52:37 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.82.1.ebuild,v 1.1 2004/08/27 14:12:20 rizzo Exp $
 
 inherit flag-o-matic eutils gcc debug
 
-IUSE="nls perl spell nas cjk gnutls silc evo crypt"
-
-DESCRIPTION="GTK2-based Instant Messenger client"
+DESCRIPTION="GTK Instant Messenger client"
 HOMEPAGE="http://gaim.sourceforge.net/"
 SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~alpha ~ia64 ~mips ~hppa"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ia64"
+IUSE="nls perl spell nas crypt cjk gnutls silc evo"
 
 DEPEND=">=x11-libs/gtk+-2.0
 	>=dev-libs/glib-2.0
@@ -65,8 +64,6 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	use cjk && epatch ${FILESDIR}/gaim-0.76-xinput.patch
-	cd ${S}/src/
-	epatch ${FILESDIR}/gaim-0.83cvs-iconcrash.diff
 }
 
 src_compile() {