Huge cleanup of old obsolete files.

21 files changed, 19 insertions, 1676 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 5da5c0dcacd5..2ffe29d19b45 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,22 @@
 # 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.192 2004/06/28 18:45:32 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.193 2004/06/28 19:02:42 rizzo Exp $
+
+  28 Jun 2004; Don Seiler <rizzo@gentoo.org>
+  -files/gaim-0.74-gnome-url-handler.patch,
+  -files/gaim-0.74_cjk_gtkconv.patch, -files/gaim-0.75-static-prpls.patch,
+  -files/gaim-0.75-yahoo-security.diff,
+  -files/gaim-0.76cvs-signals-varargs.diff,
+  -files/gaim-0.76cvs-yahoo-login-fix.diff,
+  -files/gaim-0.76cvs-yahoo-misc-fixes-1.diff,
+  -files/gaim-0.77-newtrayicon.patch,
+  -files/gaim-0.78-jabber_disconnect.patch,
+  -files/gaim-0.78-log_find_click.patch,
+  -files/gaim-0.78-msn_disconnect_fix.patch,
+  -files/gaim-0.78-paste_html_img_crash.patch,
+  -files/gaim-0.79cvs-gtkimhtml-font.diff, -gaim-0.75-r10.ebuild,
+  -gaim-0.78-r3.ebuild, -gaim-0.79.ebuild:
+  Removing obsolete files
 
 *gaim-0.79-r1 (28 Jun 2004)
 
diff --git a/net-im/gaim/files/digest-gaim-0.75-r10 b/net-im/gaim/files/digest-gaim-0.75-r10
deleted file mode 100644
index 63510235452c..000000000000
--- a/net-im/gaim/files/digest-gaim-0.75-r10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9935155985c25dfc9b59183de0da3c30 gaim-0.75.tar.bz2 3370977
diff --git a/net-im/gaim/files/digest-gaim-0.78-r3 b/net-im/gaim/files/digest-gaim-0.78-r3
deleted file mode 100644
index fb5c8eabe831..000000000000
--- a/net-im/gaim/files/digest-gaim-0.78-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 079f3286333ed51cc72c65b5efe1b989 gaim-0.78.tar.bz2 4219726
diff --git a/net-im/gaim/files/digest-gaim-0.79 b/net-im/gaim/files/digest-gaim-0.79
deleted file mode 100644
index fed11afa4e60..000000000000
--- a/net-im/gaim/files/digest-gaim-0.79
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8d8758e4ef00187fcfe3ab14e4a3283e gaim-0.79.tar.bz2 4377687
diff --git a/net-im/gaim/files/gaim-0.74-gnome-url-handler.patch b/net-im/gaim/files/gaim-0.74-gnome-url-handler.patch
deleted file mode 100644
index e322b7608ae6..000000000000
--- a/net-im/gaim/files/gaim-0.74-gnome-url-handler.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -u -ru gaim-0.74-orig/src/gtknotify.c gaim-0.74/src/gtknotify.c
---- gaim-0.74-orig/src/gtknotify.c	2003-11-07 01:40:07.000000000 -0500
-+++ gaim-0.74/src/gtknotify.c	2004-01-04 22:47:44.000000000 -0500
-@@ -393,6 +393,15 @@
- 		gtk_widget_destroy(GTK_WIDGET(ui_handle));
- }
- 
-+gboolean 
-+running_gnome(void)
-+{
-+	if (g_getenv ("GNOME_DESKTOP_SESSION_ID") && g_find_program_in_path ("gnome-open") != NULL) {
-+		return TRUE;
-+	}
-+	return FALSE;
-+}
-+
- static void *
- gaim_gtk_notify_uri(const char *uri)
- {
-@@ -403,7 +412,10 @@
- 
- 	web_browser = gaim_prefs_get_string("/gaim/gtk/browsers/browser");
- 
--	if (!strcmp(web_browser, "netscape")) {
-+	/* if they are running gnome, use the gnome web browser */
-+	if (running_gnome() == TRUE) {
-+		command = g_strdup_printf("gnome-open \"%s\"", uri);
-+	} else if (!strcmp(web_browser, "netscape")) {
- 		command = g_strdup_printf("netscape \"%s\"", uri);
- 	} else if (!strcmp(web_browser, "opera")) {
- 		if (gaim_prefs_get_bool("/gaim/gtk/browsers/new_window"))
-diff -u -ru gaim-0.74-orig/src/gtkprefs.c gaim-0.74/src/gtkprefs.c
---- gaim-0.74-orig/src/gtkprefs.c	2003-11-18 18:28:40.000000000 -0500
-+++ gaim-0.74/src/gtkprefs.c	2004-01-04 22:51:21.000000000 -0500
-@@ -2268,7 +2268,10 @@
- 	prefs_notebook_add_page(_("Proxy"), NULL, proxy_page(), &p, NULL, notebook_page++);
- #ifndef _WIN32
- 	/* We use the registered default browser in windows */
--	prefs_notebook_add_page(_("Browser"), NULL, browser_page(), &p, NULL, notebook_page++);
-+	/* if the user is running gnome 2.x, hide the browsers tab */
-+	if (running_gnome() == FALSE) {
-+		prefs_notebook_add_page(_("Browser"), NULL, browser_page(), &p, NULL, notebook_page++);
-+	}
- #endif
- 	prefs_notebook_add_page(_("Logging"), NULL, logging_page(), &p, NULL, notebook_page++);
- 	prefs_notebook_add_page(_("Sounds"), NULL, sound_page(), &p, NULL, notebook_page++);
diff --git a/net-im/gaim/files/gaim-0.74_cjk_gtkconv.patch b/net-im/gaim/files/gaim-0.74_cjk_gtkconv.patch
deleted file mode 100644
index 206a193b6ce1..000000000000
--- a/net-im/gaim/files/gaim-0.74_cjk_gtkconv.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ruN gaim-0.74.orig/src/gtkconv.c gaim-0.74/src/gtkconv.c
---- gaim-0.74.orig/src/gtkconv.c	2003-11-21 12:12:55.000000000 -0600
-+++ gaim-0.74/src/gtkconv.c	2003-11-22 10:04:46.000000000 -0600
-@@ -1279,12 +1279,28 @@
- 	GaimConversation *conv;
- 	GaimGtkConversation *gtkconv;
- 	GaimGtkWindow *gtkwin;
-+	gboolean im_context_retval = FALSE;
-+	static guint32 last_event_time;
- 
- 	conv    = (GaimConversation *)data;
- 	gtkconv = GAIM_GTK_CONVERSATION(conv);
- 	win     = gaim_conversation_get_window(conv);
- 	gtkwin  = GAIM_GTK_WINDOW(win);
- 
-+	/*
-+	 * Check if the input method handles this keyevent or we can use it.
-+	 * We need to check the event time, otherwise the gtk xim module gets into an event loop (bug?)
-+	 * Maybe this is not the best solution, but it works.
-+	 */
-+
-+	if (last_event_time != event->time) {
-+		im_context_retval = gtk_im_context_filter_keypress(GTK_TEXT_VIEW(gtkconv->entry)->im_context, event);
-+	}
-+	last_event_time = event->time;
-+	if (im_context_retval == TRUE) {
-+		return TRUE;
-+	}
-+
- 	if (event->keyval == GDK_Page_Up) {
- 		g_signal_stop_emission_by_name(G_OBJECT(entry), "key_press_event");
- 
diff --git a/net-im/gaim/files/gaim-0.75-static-prpls.patch b/net-im/gaim/files/gaim-0.75-static-prpls.patch
deleted file mode 100644
index 62405c10f7ea..000000000000
--- a/net-im/gaim/files/gaim-0.75-static-prpls.patch
+++ /dev/null
@@ -1,131 +0,0 @@
---- src/plugin.h 2004-01-09 22:04:56.000000000 -0600
-+++ src/plugin.h      2004-01-11 23:47:56.000000000 -0600
-@@ -117,7 +117,7 @@
- /**
-  * Handles the initialization of modules.
-  */
--#if !defined(GAIM_PLUGINS) || defined(STATIC)
-+#if !defined(GAIM_PLUGINS) || defined(GAIM_STATIC_PRPL)
- # define GAIM_INIT_PLUGIN(pluginname, initfunc, plugininfo) \
- 	gboolean gaim_init_##pluginname##_plugin(void) { \
- 		GaimPlugin *plugin = gaim_plugin_new(TRUE, NULL); \
-@@ -125,7 +125,7 @@
- 		initfunc((plugin)); \
- 		return gaim_plugin_register(plugin); \
- 	}
--#else /* GAIM_PLUGINS  && !STATIC */
-+#else /* GAIM_PLUGINS  && !GAIM_STATIC_PRPL */
- # define GAIM_INIT_PLUGIN(pluginname, initfunc, plugininfo) \
- 	G_MODULE_EXPORT gboolean gaim_init_plugin(GaimPlugin *plugin) { \
- 		plugin->info = &(plugininfo); \
---- src/protocols/zephyr/Makefile.am	2003/08/31 22:45:17	1.11
-+++ src/protocols/zephyr/Makefile.am	2004/01/12 05:47:57	1.12
-@@ -73,7 +73,7 @@
- 
- if STATIC_ZEPHYR
- 
--st = -DSTATIC -Dlint
-+st = -DGAIM_STATIC_PRPL -Dlint
- noinst_LIBRARIES = libzephyr.a
- libzephyr_a_SOURCES = $(ZEPHYRSOURCES)
- libzephyr_a_CFLAGS  = $(AM_CFLAGS)
---- src/protocols/yahoo/Makefile.am	2003/11/29 03:30:01	1.19
-+++ src/protocols/yahoo/Makefile.am	2004/01/12 05:47:57	1.20
-@@ -19,7 +19,7 @@
- 
- if STATIC_YAHOO
- 
--st = -DSTATIC
-+st = -DGAIM_STATIC_PRPL
- noinst_LIBRARIES   = libyahoo.a
- libyahoo_a_SOURCES = $(YAHOOSOURCES)
- libyahoo_a_CFLAGS  = $(AM_CFLAGS)
---- src/protocols/trepia/Makefile.am	2003/10/30 15:39:01	1.5
-+++ src/protocols/trepia/Makefile.am	2004/01/12 05:47:57	1.6
-@@ -14,7 +14,7 @@
- 
- if STATIC_TREPIA
- 
--st = -DSTATIC
-+st = -DGAIM_STATIC_PRPL
- noinst_LIBRARIES = libtrepia.a
- libtrepia_a_SOURCES = $(TREPIASOURCES)
- libtrepia_a_CFLAGS  = $(AM_CFLAGS)
---- src/protocols/toc/Makefile.am	2003/10/06 21:55:43	1.10
-+++ src/protocols/toc/Makefile.am	2004/01/12 05:47:57	1.11
-@@ -12,7 +12,7 @@
- 
- if STATIC_TOC
- 
--st = -DSTATIC
-+st = -DGAIM_STATIC_PRPL
- noinst_LIBRARIES = libtoc.a
- libtoc_a_SOURCES = $(TOCSOURCES)
- libtoc_a_CFLAGS  = $(AM_CFLAGS)
---- src/protocols/oscar/Makefile.am	2003/10/14 03:12:28	1.22
-+++ src/protocols/oscar/Makefile.am	2004/01/12 05:47:57	1.23
-@@ -52,7 +52,7 @@
- 
- if STATIC_OSCAR
- 
--st = -DSTATIC
-+st = -DGAIM_STATIC_PRPL
- noinst_LIBRARIES   = liboscar.a
- liboscar_a_SOURCES = $(OSCARSOURCES)
- liboscar_a_CFLAGS  = $(AM_CFLAGS)
---- src/protocols/napster/Makefile.am	2003/08/05 10:55:03	1.7
-+++ src/protocols/napster/Makefile.am	2004/01/12 05:47:57	1.8
-@@ -8,7 +8,7 @@
- 
- if STATIC_NAPSTER
- 
--st = -DSTATIC
-+st = -DGAIM_STATIC_PRPL
- noinst_LIBRARIES     = libnapster.a
- libnapster_a_SOURCES = $(NAPSTERSOURCES)
- libnapster_a_CFLAGS  = $(AM_CFLAGS)
---- src/protocols/msn/Makefile.am	2003/10/17 14:57:59	1.22
-+++ src/protocols/msn/Makefile.am	2004/01/12 05:47:56	1.23
-@@ -44,7 +44,7 @@
- 
- if STATIC_MSN
- 
--st = -DSTATIC
-+st = -DGAIM_STATIC_PRPL
- noinst_LIBRARIES = libmsn.a
- libmsn_a_SOURCES = $(MSNSOURCES)
- libmsn_a_CFLAGS  = $(AM_CFLAGS)
---- src/protocols/jabber/Makefile.am	2003/12/23 17:36:07	1.15
-+++ src/protocols/jabber/Makefile.am	2004/01/12 05:47:56	1.16
-@@ -38,7 +38,7 @@
- 
- if STATIC_JABBER
- 
--st = -DSTATIC
-+st = -DGAIM_STATIC_PRPL
- noinst_LIBRARIES = libjabber.a
- pkg_LTLIBRARIES =
- 
---- src/protocols/irc/Makefile.am	2003/08/05 10:55:02	1.11
-+++ src/protocols/irc/Makefile.am	2004/01/12 05:47:56	1.12
-@@ -10,7 +10,7 @@
- 
- if STATIC_IRC
- 
--st = -DSTATIC
-+st = -DGAIM_STATIC_PRPL
- noinst_LIBRARIES = libirc.a
- pkg_LTLIBRARIES =
- 
---- src/protocols/gg/Makefile.am	2003/08/06 07:31:33	1.11
-+++ src/protocols/gg/Makefile.am	2004/01/12 05:47:56	1.12
-@@ -16,7 +16,7 @@
- 
- if STATIC_GG
- 
--st = -DSTATIC
-+st = -DGAIM_STATIC_PRPL
- noinst_LIBRARIES = libgg.a
- 
- libgg_a_SOURCES = $(GGSOURCES)
-
diff --git a/net-im/gaim/files/gaim-0.75-yahoo-security.diff b/net-im/gaim/files/gaim-0.75-yahoo-security.diff
deleted file mode 100644
index 7aa4ca70ff1e..000000000000
--- a/net-im/gaim/files/gaim-0.75-yahoo-security.diff
+++ /dev/null
@@ -1,147 +0,0 @@
-diff -ur gaim-0.75/src/proxy.c gaim-0.76-preSecurity.plasmaroo/src/proxy.c
---- gaim-0.75/src/proxy.c	2004-01-10 04:04:56.000000000 +0000
-+++ gaim-0.76-preSecurity.plasmaroo/src/proxy.c	2004-01-26 19:05:59.000000000 +0000
-@@ -974,7 +974,7 @@
- 
- 	gaim_input_remove(phb->inpa);
- 
--	while ((nlc != 2) && (read(source, &inputline[pos++], 1) == 1)) {
-+	while ((pos < sizeof(inputline)-1) && (nlc != 2) && (read(source, &inputline[pos++], 1) == 1)) {
- 		if (inputline[pos - 1] == '\n')
- 			nlc++;
- 		else if (inputline[pos - 1] != '\r')
-diff -ur gaim-0.75/src/util.c gaim-0.76-preSecurity.plasmaroo/src/util.c
---- gaim-0.75/src/util.c	2004-01-10 04:04:56.000000000 +0000
-+++ gaim-0.76-preSecurity.plasmaroo/src/util.c	2004-01-26 19:05:59.000000000 +0000
-@@ -247,24 +247,71 @@
- /**************************************************************************
-  * Quoted Printable Functions
-  **************************************************************************/
--void
--gaim_quotedp_decode(const char *str, char **ret_str, int *ret_len)
-+static void hex(const char **p, const char *end, unsigned char *n)
- {
--	char *p, *n, *new;
-+	int i, c;
- 
--	n = new = g_malloc(strlen (str) + 1);
-+	for (i = 0, c = 0; i < 2 && *p < end; ++i, ++*p) {
-+		c <<= 4;
-+		switch (**p) {
-+		case '0': break;
-+		case '1': c += 1; break;
-+		case '2': c += 2; break;
-+		case '3': c += 3; break;
-+		case '4': c += 4; break;
-+		case '5': c += 5; break;
-+		case '6': c += 6; break;
-+		case '7': c += 7; break;
-+		case '8': c += 8; break;
-+		case '9': c += 9; break;
-+		case 'a': c += 10; break;
-+		case 'b': c += 11; break;
-+		case 'c': c += 12; break;
-+		case 'd': c += 13; break;
-+		case 'e': c += 14; break;
-+		case 'f': c += 15; break;
-+		case 'A': c += 10; break;
-+		case 'B': c += 11; break;
-+		case 'C': c += 12; break;
-+		case 'D': c += 13; break;
-+		case 'E': c += 14; break;
-+		case 'F': c += 15; break;
-+		default:
-+			  if (i == 0) {
-+				  *n = **p;
-+				  ++*p;
-+				  return;
-+			  }
-+			  c >>= 4;
-+			  goto done;
-+		}
-+	}
-+done:
-+	*n = (c > UCHAR_MAX) ? '?' : c;
-+	return;
-+}
- 
--	for (p = (char *)str; *p; p++, n++) {
-+void
-+gaim_quotedp_decode(const char *str, char **ret_str, int *ret_len)
-+{
-+	const char *p, *end;
-+	unsigned char *n, *new;
-+	size_t len;
-+
-+	len = strlen (str);
-+	n = new = g_malloc(len + 1);
-+	p = str;
-+	end = &p[len];
-+	while (p < end) {
- 		if (*p == '=') {
--			sscanf(p + 1, "%2x\n", (int *)n);
--			p += 2;
--		}
--		else if (*p == '_')
-+			++p;
-+			hex(&p, end, n);
-+		} else if (*p == '_')
- 			*n = ' ';
- 		else
- 			*n = *p;
-+		++n;
- 	}
--
- 	*n = '\0';
- 
- 	if (ret_len)
-@@ -1962,7 +2009,7 @@
- 			   char **ret_path)
- {
- 	char scan_info[255];
--	char port_str[5];
-+	char port_str[6];
- 	int f;
- 	const char *turl;
- 	char host[256], path[256];
-@@ -1982,16 +2029,21 @@
- 	}
- 
- 	g_snprintf(scan_info, sizeof(scan_info),
--			   "%%[%s]:%%[%s]/%%[%s]", addr_ctrl, port_ctrl, page_ctrl);
-+			   "%%255[%s]:%%5[%s]/%%255[%s]", addr_ctrl, port_ctrl, page_ctrl);
-+	addr_ctrl[sizeof(addr_ctrl)-1] = '\0';
-+	port_ctrl[sizeof(port_ctrl)-1] = '\0';
-+	page_ctrl[sizeof(page_ctrl)-1] = '\0';
- 
- 	f = sscanf(url, scan_info, host, port_str, path);
- 
- 	if (f == 1)
- 	{
- 		g_snprintf(scan_info, sizeof(scan_info),
--				   "%%[%s]/%%[%s]",
-+				   "%%255[%s]/%%255[%s]",
- 				   addr_ctrl, page_ctrl);
- 		f = sscanf(url, scan_info, host, path);
-+		addr_ctrl[sizeof(addr_ctrl)-1] = '\0';
-+		page_ctrl[sizeof(page_ctrl)-1] = '\0';
- 		g_snprintf(port_str, sizeof(port_str), "80");
- 	}
- 
-@@ -2081,9 +2133,14 @@
- static size_t
- parse_content_len(const char *data, size_t data_len)
- {
--	size_t content_len = 0;
-+	int content_len = 0;
-+	char *tmp;
- 
--	sscanf(data, "Content-Length: %d", (int *)&content_len);
-+	tmp = g_malloc(data_len + 1);
-+	memcpy(tmp, data, data_len);
-+	tmp[data_len] = '\0';
-+	sscanf(tmp, "Content-Length: %d", &content_len);
-+	g_free(tmp);
- 
- 	return content_len;
- }
diff --git a/net-im/gaim/files/gaim-0.76cvs-signals-varargs.diff b/net-im/gaim/files/gaim-0.76cvs-signals-varargs.diff
deleted file mode 100644
index 7e6a947b290f..000000000000
--- a/net-im/gaim/files/gaim-0.76cvs-signals-varargs.diff
+++ /dev/null
@@ -1,71 +0,0 @@
-Index: src/signals.c
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/signals.c,v
-retrieving revision 1.13
-retrieving revision 1.14
-diff -u -u -r1.13 -r1.14
---- src/signals.c	10 Jan 2004 04:04:56 -0000	1.13
-+++ src/signals.c	13 Jan 2004 02:15:46 -0000	1.14
-@@ -415,6 +415,7 @@
- 	GaimSignalData *signal_data;
- 	GaimSignalHandlerData *handler_data;
- 	GList *l, *l_next;
-+	va_list tmp;
- 
- 	g_return_if_fail(instance != NULL);
- 	g_return_if_fail(signal   != NULL);
-@@ -440,16 +441,22 @@
- 
- 		handler_data = (GaimSignalHandlerData *)l->data;
- 
-+		/* This is necessary because a va_list may only be
-+		 * evaluated once */
-+		G_VA_COPY(tmp, args);
-+
- 		if (handler_data->use_vargs)
- 		{
--			((void (*)(va_list, void *))handler_data->cb)(args,
-+			((void (*)(va_list, void *))handler_data->cb)(tmp,
- 														  handler_data->data);
- 		}
- 		else
- 		{
--			signal_data->marshal(handler_data->cb, args,
-+			signal_data->marshal(handler_data->cb, tmp,
- 								 handler_data->data, NULL);
- 		}
-+
-+		va_end(tmp);
- 	}
- }
- 
-@@ -478,6 +485,7 @@
- 	GaimSignalHandlerData *handler_data;
- 	void *ret_val = NULL;
- 	GList *l, *l_next;
-+    va_list tmp;
- 
- 	g_return_val_if_fail(instance != NULL, NULL);
- 	g_return_val_if_fail(signal   != NULL, NULL);
-@@ -503,16 +511,19 @@
- 
- 		handler_data = (GaimSignalHandlerData *)l->data;
- 
-+		G_VA_COPY(tmp,args);
-+
- 		if (handler_data->use_vargs)
- 		{
- 			ret_val = ((void *(*)(va_list, void *))handler_data->cb)(
--				args, handler_data->data);
-+				tmp, handler_data->data);
- 		}
- 		else
- 		{
--			signal_data->marshal(handler_data->cb, args,
-+			signal_data->marshal(handler_data->cb, tmp,
- 								 handler_data->data, &ret_val);
- 		}
-+		va_end(tmp);
- 	}
- 
- 	return ret_val;
diff --git a/net-im/gaim/files/gaim-0.76cvs-yahoo-login-fix.diff b/net-im/gaim/files/gaim-0.76cvs-yahoo-login-fix.diff
deleted file mode 100644
index c87a99f5b70b..000000000000
--- a/net-im/gaim/files/gaim-0.76cvs-yahoo-login-fix.diff
+++ /dev/null
@@ -1,167 +0,0 @@
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
-retrieving revision 1.193
-retrieving revision 1.198
-diff -u -r1.193 -r1.198
---- gaim/gaim/src/protocols/yahoo/yahoo.c	2004/01/10 05:04:09	1.193
-+++ gaim/gaim/src/protocols/yahoo/yahoo.c	2004/01/21 15:42:22	1.198
-@@ -131,8 +131,15 @@
- 		while (pos + 1 < len) {
- 			if (data[pos] == 0xc0 && data[pos + 1] == 0x80)
- 				break;
-+			if (x >= sizeof(key)-1) {
-+				x++; pos++;
-+				continue;
-+			}
- 			key[x++] = data[pos++];
- 		}
-+		if (x >= sizeof(key)-1) {
-+			x = 0;
-+		}
- 		key[x] = 0;
- 		pos += 2;
- 		pair->key = strtol(key, NULL, 10);
-@@ -873,13 +880,17 @@
- static char *yahoo_decode(const char *text)
- {
- 	char *converted;
--	char *p, *n, *new;
--	
-+	char *n, *new;
-+	const char *end, *p;
-+	int i;
-+
- 	n = new = g_malloc(strlen (text) + 1);
-+	end = text + strlen(text);
- 
--	for (p = (char *)text; *p; p++, n++) {
-+	for (p = text; p < end; p++, n++) {
- 		if (*p == '\\') {
--			sscanf(p + 1, "%3o\n", (int *)n);
-+			sscanf(p + 1, "%3o\n", &i);
-+			*n = i;
- 			p += 3;
- 		}
- 		else
-@@ -887,7 +898,7 @@
- 	}
- 
- 	*n = '\0';
--	
-+
- 	converted = g_convert(new, n - new, OUT_CHARSET, "iso-8859-1", NULL, NULL, NULL);
- 	g_free(new);
- 
-@@ -1906,29 +1917,28 @@
- 	GaimConnection *gc = data;
- 	GaimAccount *account = gaim_connection_get_account(gc);
- 	struct yahoo_data *yd = gc->proto_data;
--	char buf[1024], buf2[256], *i = buf, *r = buf2;
--	int len, o = 0;
-+	char buf[1024], *i = buf;
-+	int len;
-+	GString *s;
- 
--	len = read(source, buf, sizeof(buf));
-+	len = read(source, buf, sizeof(buf)-1);
- 	if (len <= 0  || strncmp(buf, "HTTP/1.0 302", strlen("HTTP/1.0 302"))) {
- 		gaim_connection_error(gc, _("Unable to read"));
- 		return;
- 	}
--	
--	while ((i = strstr(i, "Set-Cookie: ")) && 0 < 2) {
--		i += strlen("Set-Cookie: "); 
--		for (;*i != ';'; r++, i++) {
--			*r = *i;
--		}
--		*r=';';
--		r++;
--		*r=' ';
--		r++;
--		o++;
--	}
--	/* Get rid of that "; " */
--	*(r-2) = '\0';
--	yd->auth = g_strdup(buf2);
-+
-+	s = g_string_sized_new(len);
-+	buf[sizeof(buf)-1] = '\0';
-+
-+	while ((i = strstr(i, "Set-Cookie: "))) {
-+		i += strlen("Set-Cookie: ");
-+		for (;*i != ';'; i++)
-+			g_string_append_c(s, *i);
-+
-+		g_string_append(s, "; ");
-+	}
-+
-+	yd->auth = g_string_free(s, FALSE);
- 	gaim_input_remove(gc->inpa);
- 	close(source);
- 	/* Now we have our cookies to login with.  I'll go get the milk. */
-@@ -1974,15 +1984,17 @@
- 	const char *c = buf;
- 	char *d;
- 	char name[64], value[64];
-+	int count = sizeof(name)-1;
- 	while ((c < (buf + len)) && (c = strstr(c, "<input "))) {
- 		c = strstr(c, "name=\"") + strlen("name=\"");
--		for (d = name; *c!='"'; c++, d++) 
-+		for (d = name; *c!='"' && count; c++, d++, count--) 
- 			*d = *c;
- 		*d = '\0';
-+		count = sizeof(value)-1;
- 		d = strstr(c, "value=\"") + strlen("value=\"");
- 		if (strchr(c, '>') < d)
- 			break;
--		for (c = d, d = value; *c!='"'; c++, d++)
-+		for (c = d, d = value; *c!='"' && count; c++, d++, count--)
- 			*d = *c;
- 		*d = '\0';
- 		g_hash_table_insert(hash, g_strdup(name), g_strdup(value));
-@@ -2705,15 +2717,12 @@
- 		return;
- 	/* It seems to work better without this */
- 
-+	/* if (gc->account->perm_deny != 4)
-+		return; */
-+
-+	if (!who || who[0] == '\0')
-+		return;
- 
--	/* 
--	 * if (gc->account->perm_deny != 4)
--	 *	return;
-- 	 *
--	 * if (!who || who[0] == '\0')
--	 *		return;
--	 */
--    
- 	pkt = yahoo_packet_new(YAHOO_SERVICE_IGNORECONTACT, YAHOO_STATUS_AVAILABLE, 0);
- 	yahoo_packet_hash(pkt, 1, gaim_connection_get_display_name(gc));
- 	yahoo_packet_hash(pkt, 7, who);
-@@ -3204,6 +3218,9 @@
- 	option = gaim_account_option_int_new(_("File transfer port"), "xfer_port", YAHOO_XFER_PORT);
- 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
- 
-+	option = gaim_account_option_string_new(_("Chat Room List Url"), "room_list", YAHOO_ROOMLIST_URL);
-+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
-+	
- 	my_protocol = plugin;
- 
- 	yahoo_init_colorht();
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.h,v
-retrieving revision 1.11
-retrieving revision 1.13
-diff -u -r1.11 -r1.13
---- gaim/gaim/src/protocols/yahoo/yahoo.h	2004/01/10 03:26:09	1.11
-+++ gaim/gaim/src/protocols/yahoo/yahoo.h	2004/01/15 22:20:29	1.13
-@@ -32,6 +34,7 @@
- #define YAHOO_PROFILE_URL "http://profiles.yahoo.com/"
- #define YAHOO_XFER_HOST "filetransfer.msg.yahoo.com"
- #define YAHOO_XFER_PORT 80
-+#define YAHOO_ROOMLIST_URL "http://insider.msg.yahoo.com/ycontent/"
- 
- #define WEBMESSENGER_URL "http://login.yahoo.com/config/login?.src=pg"
- 
diff --git a/net-im/gaim/files/gaim-0.76cvs-yahoo-misc-fixes-1.diff b/net-im/gaim/files/gaim-0.76cvs-yahoo-misc-fixes-1.diff
deleted file mode 100644
index dd1df27cd285..000000000000
--- a/net-im/gaim/files/gaim-0.76cvs-yahoo-misc-fixes-1.diff
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -u -r1.199 -r1.203
---- gaim/gaim/src/protocols/yahoo/yahoo.c	2004/01/25 22:15:21	1.199
-+++ gaim/gaim/src/protocols/yahoo/yahoo.c	2004/02/12 19:17:54	1.203
-@@ -1917,12 +1917,13 @@
- 	GaimConnection *gc = data;
- 	GaimAccount *account = gaim_connection_get_account(gc);
- 	struct yahoo_data *yd = gc->proto_data;
--	char buf[1024], *i = buf;
-+	char buf[2048], *i = buf;
- 	int len;
- 	GString *s;
- 
- 	len = read(source, buf, sizeof(buf)-1);
--	if (len <= 0  || strncmp(buf, "HTTP/1.0 302", strlen("HTTP/1.0 302"))) {
-+	if (len <= 0  || (strncmp(buf, "HTTP/1.0 302", strlen("HTTP/1.0 302")) &&
-+			  strncmp(buf, "HTTP/1.1 302", strlen("HTTP/1.1 302")))) {
- 		gaim_connection_error(gc, _("Unable to read"));
- 		return;
- 	}
-@@ -1932,7 +1933,7 @@
- 
- 	while ((i = strstr(i, "Set-Cookie: "))) {
- 		i += strlen("Set-Cookie: ");
--		for (;*i != ';'; i++)
-+		for (;*i != ';' && *i != '\0'; i++)
- 			g_string_append_c(s, *i);
- 
- 		g_string_append(s, "; ");
-@@ -2082,6 +2083,8 @@
- 
- 	gaim_connection_update_progress(gc, _("Connecting"), 1, 2);
- 
-+	gaim_connection_set_display_name(gc, gaim_account_get_username(account));
-+
- 	yd->fd = -1;
- 	yd->friends = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, yahoo_friend_free);
- 	yd->confs = NULL;
---- gaim/gaim/src/protocols/yahoo/yahoo_filexfer.c	2004/01/10 04:04:57	1.6
-+++ gaim/gaim/src/protocols/yahoo/yahoo_filexfer.c	2004/02/17 18:45:25	1.8
-@@ -195,13 +195,20 @@
- 	account = gaim_connection_get_account(gc);
- 
- 	if (gaim_xfer_get_type(xfer) == GAIM_XFER_SEND) {
--		if (gaim_proxy_connect(account, gaim_account_get_string(account, "xfer_host",  YAHOO_XFER_HOST),
--		                       gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
--		                       yahoo_sendfile_connected, xfer) == -1)
--		{
-+		if (gaim_xfer_get_size(xfer) >= 1048577) {
- 			gaim_notify_error(gc, NULL, _("File Transfer Aborted"),
--			                 _("Unable to establish file descriptor."));
--			gaim_xfer_cancel_remote(xfer);
-+			                  _("Gaim cannot send files over Yahoo! that are bigger than "
-+			                    "One Megabyte (1,048,576 bytes)."));
-+			gaim_xfer_cancel_local(xfer);
-+		} else {
-+			if (gaim_proxy_connect(account, gaim_account_get_string(account, "xfer_host",  YAHOO_XFER_HOST),
-+			                       gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
-+			                       yahoo_sendfile_connected, xfer) == -1)
-+			{
-+				gaim_notify_error(gc, NULL, _("File Transfer Aborted"),
-+				                 _("Unable to establish file descriptor."));
-+				gaim_xfer_cancel_remote(xfer);
-+			}
- 		}
- 	} else {
- 		xfer->fd = gaim_proxy_connect(account, xfer_data->host, xfer_data->port,
-@@ -247,7 +254,7 @@
- }
- 
- 
--size_t yahoo_xfer_read(char **buffer, GaimXfer *xfer)
-+ssize_t yahoo_xfer_read(char **buffer, GaimXfer *xfer)
- {
- 	gchar buf[4096];
- 	ssize_t len;
-@@ -308,7 +315,7 @@
- 	return len;
- }
- 
--size_t yahoo_xfer_write(const char *buffer, size_t size, GaimXfer *xfer)
-+ssize_t yahoo_xfer_write(const char *buffer, size_t size, GaimXfer *xfer)
- {
- 	ssize_t len;
- 	struct yahoo_xfer_data *xd = xfer->data;
diff --git a/net-im/gaim/files/gaim-0.77-newtrayicon.patch b/net-im/gaim/files/gaim-0.77-newtrayicon.patch
deleted file mode 100644
index f6772d9969f3..000000000000
--- a/net-im/gaim/files/gaim-0.77-newtrayicon.patch
+++ /dev/null
@@ -1,493 +0,0 @@
---- gaim-0.71/plugins/docklet/eggtrayicon.h.foo	2002-09-14 19:27:26.000000000 -0400
-+++ gaim-0.71/plugins/docklet/eggtrayicon.h	2003-10-17 11:55:33.000000000 -0400
-@@ -45,7 +45,10 @@
-   Atom selection_atom;
-   Atom manager_atom;
-   Atom system_tray_opcode_atom;
-+  Atom orientation_atom;
-   Window manager_window;
-+
-+  GtkOrientation orientation;
- };
- 
- struct _EggTrayIconClass
-@@ -55,10 +58,8 @@
- 
- GType        egg_tray_icon_get_type       (void);
- 
--#if EGG_TRAY_ENABLE_MULTIHEAD
- EggTrayIcon *egg_tray_icon_new_for_screen (GdkScreen   *screen,
- 					   const gchar *name);
--#endif
- 
- EggTrayIcon *egg_tray_icon_new            (const gchar *name);
- 
-@@ -69,7 +70,7 @@
- void         egg_tray_icon_cancel_message (EggTrayIcon *icon,
- 					   guint        id);
- 
--
-+GtkOrientation egg_tray_icon_get_orientation (EggTrayIcon *icon);
- 					    
- G_END_DECLS
- 
---- gaim-0.71/plugins/docklet/eggtrayicon.c.foo	2003-01-08 20:48:04.000000000 -0500
-+++ gaim-0.71/plugins/docklet/eggtrayicon.c	2003-10-17 11:54:16.000000000 -0400
-@@ -18,30 +18,64 @@
-  * Boston, MA 02111-1307, USA.
-  */
- 
-+#ifdef DV_CHANGE
-+#include <config.h>
-+#else
-+#include <libintl.h>
-+#define GETTEXT_PACKAGE "rhn-applet"
-+#endif
- #include <string.h>
--#include <gdk/gdkx.h>
-+#include <libintl.h>
-+
- #include "eggtrayicon.h"
- 
-+#include <gdk/gdkx.h>
-+#include <X11/Xatom.h>
-+
-+#ifndef EGG_COMPILATION
-+#ifndef _
-+#define _(x) dgettext (GETTEXT_PACKAGE, x)
-+#define N_(x) x
-+#endif
-+#else
-+#define _(x) x
-+#define N_(x) x
-+#endif
-+
- #define SYSTEM_TRAY_REQUEST_DOCK    0
- #define SYSTEM_TRAY_BEGIN_MESSAGE   1
- #define SYSTEM_TRAY_CANCEL_MESSAGE  2
-+
-+#define SYSTEM_TRAY_ORIENTATION_HORZ 0
-+#define SYSTEM_TRAY_ORIENTATION_VERT 1
-+
-+enum {
-+  PROP_0,
-+  PROP_ORIENTATION
-+};
-          
- static GtkPlugClass *parent_class = NULL;
- 
- static void egg_tray_icon_init (EggTrayIcon *icon);
- static void egg_tray_icon_class_init (EggTrayIconClass *klass);
- 
-+static void egg_tray_icon_get_property (GObject    *object,
-+					guint       prop_id,
-+					GValue     *value,
-+					GParamSpec *pspec);
-+
-+static void egg_tray_icon_realize   (GtkWidget *widget);
- static void egg_tray_icon_unrealize (GtkWidget *widget);
- 
--static void egg_tray_icon_update_manager_window (EggTrayIcon *icon);
-+static void egg_tray_icon_update_manager_window    (EggTrayIcon *icon,
-+						    gboolean     dock_if_realized);
-+static void egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon);
- 
- GType
- egg_tray_icon_get_type (void)
- {
-   static GType our_type = 0;
- 
--  our_type = g_type_from_name("EggTrayIcon");
--
-   if (our_type == 0)
-     {
-       static const GTypeInfo our_info =
-@@ -59,10 +93,6 @@
- 
-       our_type = g_type_register_static (GTK_TYPE_PLUG, "EggTrayIcon", &our_info, 0);
-     }
--  else if (parent_class == NULL) {
--    /* we're reheating the old class from a previous instance -  engage ugly hack =( */
--    egg_tray_icon_class_init((EggTrayIconClass *)g_type_class_peek(our_type));
--  }
- 
-   return our_type;
- }
-@@ -71,6 +101,7 @@
- egg_tray_icon_init (EggTrayIcon *icon)
- {
-   icon->stamp = 1;
-+  icon->orientation = GTK_ORIENTATION_HORIZONTAL;
-   
-   gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK);
- }
-@@ -78,11 +109,95 @@
- static void
- egg_tray_icon_class_init (EggTrayIconClass *klass)
- {
-+  GObjectClass *gobject_class = (GObjectClass *)klass;
-   GtkWidgetClass *widget_class = (GtkWidgetClass *)klass;
- 
-   parent_class = g_type_class_peek_parent (klass);
- 
-+  gobject_class->get_property = egg_tray_icon_get_property;
-+
-+  widget_class->realize   = egg_tray_icon_realize;
-   widget_class->unrealize = egg_tray_icon_unrealize;
-+
-+  g_object_class_install_property (gobject_class,
-+				   PROP_ORIENTATION,
-+				   g_param_spec_enum ("orientation",
-+						      _("Orientation"),
-+						      _("The orientation of the tray."),
-+						      GTK_TYPE_ORIENTATION,
-+						      GTK_ORIENTATION_HORIZONTAL,
-+						      G_PARAM_READABLE));
-+}
-+
-+static void
-+egg_tray_icon_get_property (GObject    *object,
-+			    guint       prop_id,
-+			    GValue     *value,
-+			    GParamSpec *pspec)
-+{
-+  EggTrayIcon *icon = EGG_TRAY_ICON (object);
-+
-+  switch (prop_id)
-+    {
-+    case PROP_ORIENTATION:
-+      g_value_set_enum (value, icon->orientation);
-+      break;
-+    default:
-+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-+      break;
-+    }
-+}
-+
-+static void
-+egg_tray_icon_get_orientation_property (EggTrayIcon *icon)
-+{
-+  Display *xdisplay;
-+  Atom type;
-+  int format;
-+  union {
-+	gulong *prop;
-+	guchar *prop_ch;
-+  } prop = { NULL };
-+  gulong nitems;
-+  gulong bytes_after;
-+  int error, result;
-+
-+  g_assert (icon->manager_window != None);
-+  
-+  xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
-+
-+  gdk_error_trap_push ();
-+  type = None;
-+  result = XGetWindowProperty (xdisplay,
-+			       icon->manager_window,
-+			       icon->orientation_atom,
-+			       0, G_MAXLONG, FALSE,
-+			       XA_CARDINAL,
-+			       &type, &format, &nitems,
-+			       &bytes_after, &(prop.prop_ch));
-+  error = gdk_error_trap_pop ();
-+
-+  if (error || result != Success)
-+    return;
-+
-+  if (type == XA_CARDINAL)
-+    {
-+      GtkOrientation orientation;
-+
-+      orientation = (prop.prop [0] == SYSTEM_TRAY_ORIENTATION_HORZ) ?
-+					GTK_ORIENTATION_HORIZONTAL :
-+					GTK_ORIENTATION_VERTICAL;
-+
-+      if (icon->orientation != orientation)
-+	{
-+	  icon->orientation = orientation;
-+
-+	  g_object_notify (G_OBJECT (icon), "orientation");
-+	}
-+    }
-+
-+  if (prop.prop)
-+    XFree (prop.prop);
- }
- 
- static GdkFilterReturn
-@@ -95,13 +210,18 @@
-       xev->xclient.message_type == icon->manager_atom &&
-       xev->xclient.data.l[1] == icon->selection_atom)
-     {
--      egg_tray_icon_update_manager_window (icon);
-+      egg_tray_icon_update_manager_window (icon, TRUE);
-     }
-   else if (xev->xany.window == icon->manager_window)
-     {
-+      if (xev->xany.type == PropertyNotify &&
-+	  xev->xproperty.atom == icon->orientation_atom)
-+	{
-+	  egg_tray_icon_get_orientation_property (icon);
-+	}
-       if (xev->xany.type == DestroyNotify)
- 	{
--	  egg_tray_icon_update_manager_window (icon);
-+	  egg_tray_icon_manager_window_destroyed (icon);
- 	}
-     }
-   
-@@ -118,21 +238,13 @@
-     {
-       GdkWindow *gdkwin;
- 
--#if HAVE_GTK_MULTIHEAD
-       gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (widget),
-                                               icon->manager_window);
--#else
--      gdkwin = gdk_window_lookup (icon->manager_window);
--#endif
- 
-       gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
-     }
- 
--#if HAVE_GTK_MULTIHEAD
-   root_window = gdk_screen_get_root_window (gtk_widget_get_screen (widget));
--#else
--  root_window = gdk_window_lookup (gdk_x11_get_default_root_xwindow ());
--#endif
- 
-   gdk_window_remove_filter (root_window, egg_tray_icon_manager_filter, icon);
- 
-@@ -161,11 +273,7 @@
-   ev.data.l[3] = data2;
-   ev.data.l[4] = data3;
- 
--#if HAVE_GTK_MULTIHEAD
-   display = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
--#else
--  display = gdk_display;
--#endif
-   
-   gdk_error_trap_push ();
-   XSendEvent (display,
-@@ -185,29 +293,15 @@
- }
- 
- static void
--egg_tray_icon_update_manager_window (EggTrayIcon *icon)
-+egg_tray_icon_update_manager_window (EggTrayIcon *icon,
-+				     gboolean     dock_if_realized)
- {
-   Display *xdisplay;
-   
--#if HAVE_GTK_MULTIHEAD
--  xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
--#else
--  xdisplay = gdk_display;
--#endif
--  
-   if (icon->manager_window != None)
--    {
--      GdkWindow *gdkwin;
-+    return;
- 
--#if HAVE_GTK_MULTIHEAD
--      gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
--					      icon->manager_window);
--#else
--      gdkwin = gdk_window_lookup (icon->manager_window);
--#endif
--      
--      gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
--    }
-+  xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
-   
-   XGrabServer (xdisplay);
-   
-@@ -216,7 +310,7 @@
- 
-   if (icon->manager_window != None)
-     XSelectInput (xdisplay,
--		  icon->manager_window, StructureNotifyMask);
-+		  icon->manager_window, StructureNotifyMask|PropertyChangeMask);
- 
-   XUngrabServer (xdisplay);
-   XFlush (xdisplay);
-@@ -225,91 +319,103 @@
-     {
-       GdkWindow *gdkwin;
- 
--#if HAVE_GTK_MULTIHEAD
-       gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
- 					      icon->manager_window);
--#else
--      gdkwin = gdk_window_lookup (icon->manager_window);
--#endif
-       
-       gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon);
- 
--      /* Send a request that we'd like to dock */
--      egg_tray_icon_send_dock_request (icon);
-+      if (dock_if_realized && GTK_WIDGET_REALIZED (icon))
-+	egg_tray_icon_send_dock_request (icon);
-+
-+      egg_tray_icon_get_orientation_property (icon);
-     }
- }
- 
--EggTrayIcon *
--egg_tray_icon_new_for_xscreen (Screen *xscreen, const char *name)
-+static void
-+egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon)
- {
--  EggTrayIcon *icon;
-+  GdkWindow *gdkwin;
-+  
-+  g_return_if_fail (icon->manager_window != None);
-+
-+  gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
-+					  icon->manager_window);
-+      
-+  gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
-+
-+  icon->manager_window = None;
-+
-+  egg_tray_icon_update_manager_window (icon, TRUE);
-+}
-+
-+static void
-+egg_tray_icon_realize (GtkWidget *widget)
-+{
-+  EggTrayIcon *icon = EGG_TRAY_ICON (widget);
-+  GdkScreen *screen;
-+  GdkDisplay *display;
-+  Display *xdisplay;
-   char buffer[256];
-   GdkWindow *root_window;
- 
--  g_return_val_if_fail (xscreen != NULL, NULL);
--  
--  icon = g_object_new (EGG_TYPE_TRAY_ICON, NULL);
--  gtk_window_set_title (GTK_WINDOW (icon), name);
-+  if (GTK_WIDGET_CLASS (parent_class)->realize)
-+    GTK_WIDGET_CLASS (parent_class)->realize (widget);
- 
--#if HAVE_GTK_MULTIHEAD
--  /* FIXME: this code does not compile, screen is undefined. Now try
--   * getting the GdkScreen from xscreen (:. Dunno how to solve this
--   * (there is probably some easy way I cant think of right now)
--   */
--  gtk_plug_construct_for_display (GTK_PLUG (icon),
--				  gdk_screen_get_display (screen), 0);
--#else
--  gtk_plug_construct (GTK_PLUG (icon), 0);
--#endif
--  
--  gtk_widget_realize (GTK_WIDGET (icon));
-+  screen = gtk_widget_get_screen (widget);
-+  display = gdk_screen_get_display (screen);
-+  xdisplay = gdk_x11_display_get_xdisplay (display);
- 
-   /* Now see if there's a manager window around */
-   g_snprintf (buffer, sizeof (buffer),
- 	      "_NET_SYSTEM_TRAY_S%d",
--	      XScreenNumberOfScreen (xscreen));
--  
--  icon->selection_atom = XInternAtom (DisplayOfScreen (xscreen),
--				      buffer, False);
-+	      gdk_screen_get_number (screen));
-+
-+  icon->selection_atom = XInternAtom (xdisplay, buffer, False);
-   
--  icon->manager_atom = XInternAtom (DisplayOfScreen (xscreen),
--				    "MANAGER", False);
-+  icon->manager_atom = XInternAtom (xdisplay, "MANAGER", False);
-   
--  icon->system_tray_opcode_atom = XInternAtom (DisplayOfScreen (xscreen),
--					       "_NET_SYSTEM_TRAY_OPCODE", False);
-+  icon->system_tray_opcode_atom = XInternAtom (xdisplay,
-+						   "_NET_SYSTEM_TRAY_OPCODE",
-+						   False);
- 
--  egg_tray_icon_update_manager_window (icon);
-+  icon->orientation_atom = XInternAtom (xdisplay,
-+					"_NET_SYSTEM_TRAY_ORIENTATION",
-+					False);
- 
--#if HAVE_GTK_MULTIHEAD
--  root_window = gdk_screen_get_root_window (gtk_widget_get_screen (screen));
--#else
--  root_window = gdk_window_lookup (gdk_x11_get_default_root_xwindow ());
--#endif
-+  egg_tray_icon_update_manager_window (icon, FALSE);
-+  egg_tray_icon_send_dock_request (icon);
-+
-+  root_window = gdk_screen_get_root_window (screen);
-   
-   /* Add a root window filter so that we get changes on MANAGER */
-   gdk_window_add_filter (root_window,
- 			 egg_tray_icon_manager_filter, icon);
--		      
--  return icon;
- }
- 
--#if HAVE_GTK_MULTIHEAD
- EggTrayIcon *
--egg_tray_icon_new_for_screen (GdkScreen *screen, const char *name)
-+egg_tray_icon_new_for_xscreen (Screen *xscreen, const char *name)
- {
--  EggTrayIcon *icon;
--  char buffer[256];
-+  GdkDisplay *display;
-+  GdkScreen *screen;
- 
-+  display = gdk_x11_lookup_xdisplay (DisplayOfScreen (xscreen));
-+  screen = gdk_display_get_screen (display, XScreenNumberOfScreen (xscreen));
-+
-+  return egg_tray_icon_new_for_screen (screen, name);
-+}
-+
-+EggTrayIcon *
-+egg_tray_icon_new_for_screen (GdkScreen *screen, const char *name)
-+{
-   g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
- 
--  return egg_tray_icon_new_for_xscreen (GDK_SCREEN_XSCREEN (screen), name);
-+  return g_object_new (EGG_TYPE_TRAY_ICON, "screen", screen, "title", name, NULL);
- }
--#endif
- 
- EggTrayIcon*
- egg_tray_icon_new (const gchar *name)
- {
--  return egg_tray_icon_new_for_xscreen (DefaultScreenOfDisplay (gdk_display), name);
-+  return g_object_new (EGG_TYPE_TRAY_ICON, "title", name, NULL);
- }
- 
- guint
-@@ -344,11 +450,7 @@
-       XClientMessageEvent ev;
-       Display *xdisplay;
- 
--#if HAVE_GTK_MULTIHEAD
-       xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
--#else
--      xdisplay = gdk_display;
--#endif
-       
-       ev.type = ClientMessage;
-       ev.window = (Window)gtk_plug_get_id (GTK_PLUG (icon));
-@@ -387,3 +489,11 @@
- 				      (Window)gtk_plug_get_id (GTK_PLUG (icon)),
- 				      id, 0, 0);
- }
-+
-+GtkOrientation
-+egg_tray_icon_get_orientation (EggTrayIcon *icon)
-+{
-+  g_return_val_if_fail (EGG_IS_TRAY_ICON (icon), GTK_ORIENTATION_HORIZONTAL);
-+
-+  return icon->orientation;
-+}
diff --git a/net-im/gaim/files/gaim-0.78-jabber_disconnect.patch b/net-im/gaim/files/gaim-0.78-jabber_disconnect.patch
deleted file mode 100644
index 6d6ccac35667..000000000000
--- a/net-im/gaim/files/gaim-0.78-jabber_disconnect.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-http://cvs.sourceforge.net/viewcvs.py/gaim/gaim/src/protocols/jabber/jabber.c?r1=1.260&r2=1.261&sortby=date&diff_format=u
-https://sourceforge.net/tracker/index.php?func=detail&aid=966125&group_id=235&atid=100235
-
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
-retrieving revision 1.260
-retrieving revision 1.261
-diff -u -r1.260 -r1.261
---- gaim/gaim/src/protocols/jabber/jabber.c	2004/05/31 07:23:49	1.260
-+++ gaim/gaim/src/protocols/jabber/jabber.c	2004/06/04 00:02:25	1.261
-@@ -740,6 +740,7 @@
- {
- 	JabberStream *js = gc->proto_data;
- 
-+	jabber_presence_send(gc, "unavailable", _("Logged out"));
- 	jabber_send_raw(js, "</stream:stream>", -1);
- 
- 	if(js->gsc) {
diff --git a/net-im/gaim/files/gaim-0.78-log_find_click.patch b/net-im/gaim/files/gaim-0.78-log_find_click.patch
deleted file mode 100644
index faa7f1b052be..000000000000
--- a/net-im/gaim/files/gaim-0.78-log_find_click.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: src/gtklog.c
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/gtklog.c,v
-retrieving revision 1.17
-diff -u -p -r1.17 gtklog.c
---- src/gtklog.c	22 May 2004 16:38:54 -0000	1.17
-+++ src/gtklog.c	5 Jun 2004 14:18:32 -0000
-@@ -331,6 +331,8 @@ void gaim_gtk_log_show(const char *scree
- 	button = gtk_button_new_from_stock(GTK_STOCK_FIND);
- 	g_signal_connect (GTK_BUTTON (button), "activate",
- 			  G_CALLBACK (search_cb), lv);
-+	g_signal_connect (GTK_BUTTON (button), "clicked",
-+			  G_CALLBACK (search_cb), lv);
- 	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
- 	gaim_set_accessible_label (lv->treeview, label);
- 
-@@ -440,6 +442,9 @@ void gaim_gtk_syslog_show()
- 	g_signal_connect (GTK_BUTTON (button), "activate",
- 			  G_CALLBACK (search_cb),
- 			  syslog_viewer);
-+	g_signal_connect (GTK_BUTTON (button), "clicked",
-+			  G_CALLBACK (search_cb),
-+			  syslog_viewer);
- 	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
- 
- 	gtk_widget_show_all(syslog_viewer->window);	
diff --git a/net-im/gaim/files/gaim-0.78-msn_disconnect_fix.patch b/net-im/gaim/files/gaim-0.78-msn_disconnect_fix.patch
deleted file mode 100644
index 1a89034d4cf9..000000000000
--- a/net-im/gaim/files/gaim-0.78-msn_disconnect_fix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
--------- Original Message --------
-Subject: Gaim 0.78 MSN switchboard disconnect fix
-Date: Sat, 5 Jun 2004 22:45:26 -0700
-From: Christian Hammond <chipx86@gnupdate.org>
-
-This should have gotten into gaim 0.78, but another patch accidentally
-reverted it. Basically, sometimes there are harmless errors on MSN
-"switchboards," which is where conversations take place. We should
-just display the error but keep on going, because unlike errors on
-Notification or Nexus servers, these are not fatal. These are usually
-things like "The user is offline" and such. However, we were treating
-them as fatal, which this patch prevents.
-
-Christian
-
-diff -u -d -p -r1.37 -r1.38
---- gaim/gaim/src/protocols/msn/servconn.c.orig	1 Jun 2004 06:42:20 -0000	1.37
-+++ gaim/gaim/src/protocols/msn/servconn.c	2 Jun 2004 04:50:31 -0000	1.38
-@@ -58,7 +58,19 @@
- 			break;
- 	}
- 
--	gaim_connection_error(gc, tmp);
-+	if (servconn->type != MSN_SERVER_SB)
-+		gaim_connection_error(gc, tmp);
-+	else
-+	{
-+		GaimAccount *account = gaim_connection_get_account(gc);
-+		char *primary = g_strdup_printf(_("MSN error for account %s"),
-+										gaim_account_get_username(account));
-+
-+		gaim_notify_error(gc, NULL, primary, tmp);
-+
-+		g_free(primary);
-+	}
-+
- 
- 	g_free(tmp);
- }
diff --git a/net-im/gaim/files/gaim-0.78-paste_html_img_crash.patch b/net-im/gaim/files/gaim-0.78-paste_html_img_crash.patch
deleted file mode 100644
index 65e8e06dfaad..000000000000
--- a/net-im/gaim/files/gaim-0.78-paste_html_img_crash.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
-retrieving revision 1.340
-retrieving revision 1.341
-diff -u -r1.340 -r1.341
---- gaim/gaim/src/gtkimhtml.c	2004/05/27 02:02:47	1.340
-+++ gaim/gaim/src/gtkimhtml.c	2004/06/06 01:20:25	1.341
-@@ -2197,7 +2197,8 @@
- 							break;
- 
- 						id = gtk_imhtml_get_html_opt(tag, "ID=");
--
-+						if (!id)
-+							break;
- 						gtk_imhtml_insert_image_at_iter(imhtml, atoi(id), iter);
- 						break;
- 					}
diff --git a/net-im/gaim/files/gaim-0.79cvs-gtkimhtml-font.diff b/net-im/gaim/files/gaim-0.79cvs-gtkimhtml-font.diff
deleted file mode 100644
index 8ef0c1d4ab22..000000000000
--- a/net-im/gaim/files/gaim-0.79cvs-gtkimhtml-font.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: src/gtkimhtml.c
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
-retrieving revision 1.343
-diff -u -p -r1.343 gtkimhtml.c
---- src/gtkimhtml.c	9 Jun 2004 04:34:25 -0000	1.343
-+++ src/gtkimhtml.c	15 Jun 2004 02:37:22 -0000
-@@ -2348,13 +2348,13 @@ void gtk_imhtml_insert_html_at_iter(GtkI
- 							if (font->underline != oldfont->underline)
- 							    gtk_imhtml_toggle_underline(imhtml);
- 
--							if (!oldfont->face || strcmp(font->face, oldfont->face) != 0)
-+							if (font->face && (!oldfont->face || strcmp(font->face, oldfont->face) != 0))
- 							    gtk_imhtml_toggle_fontface(imhtml, oldfont->face);
- 
--							if (!oldfont->fore || strcmp(font->fore, oldfont->fore) != 0)
-+							if (font->fore && (!oldfont->fore || strcmp(font->fore, oldfont->fore) != 0))
- 							    gtk_imhtml_toggle_forecolor(imhtml, oldfont->fore);
- 
--							if (!oldfont->back || strcmp(font->back, oldfont->back) != 0)
-+							if (font->back && (!oldfont->back || strcmp(font->back, oldfont->back) != 0))
- 						      gtk_imhtml_toggle_backcolor(imhtml, oldfont->back);
- 						}
- 
diff --git a/net-im/gaim/gaim-0.75-r10.ebuild b/net-im/gaim/gaim-0.75-r10.ebuild
deleted file mode 100644
index d10b031b70f3..000000000000
--- a/net-im/gaim/gaim-0.75-r10.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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.75-r10.ebuild,v 1.15 2004/06/24 22:51:12 agriffis Exp $
-
-inherit flag-o-matic eutils gcc
-use debug && inherit debug
-
-IUSE="nls perl spell nas cjk debug crypt gnome"
-
-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"
-
-DEPEND=">=x11-libs/gtk+-2.0
-	>=dev-libs/glib-2.0
-	nas? ( >=media-libs/nas-1.4.1-r1 )
-	sys-devel/gettext
-	media-libs/libao
-	>=media-libs/audiofile-0.2.0
-	perl? ( >=dev-lang/perl-5.6.1
-		>=sys-apps/sed-4.0.0 )
-	spell? ( >=app-text/gtkspell-2.0.2 )
-	|| ( dev-libs/nss net-www/mozilla )
-	gnome? ( >=gnome-base/libgnome-2.4.0 )"
-PDEPEND="crypt? ( net-im/gaim-encryption )"
-
-pkg_setup() {
-	ewarn
-	ewarn "If you experience problems with gaim, file them as bugs with"
-	ewarn "Gentoo's bugzilla, http://bugs.gentoo.org.  DO NOT report them"
-	ewarn "as bugs with gaim's sourceforge tracker, and by all means DO NOT"
-	ewarn "seek help in #gaim."
-	ewarn
-}
-
-src_unpack() {
-	unpack ${P}.tar.bz2 || die
-	cd ${S}
-	epatch ${FILESDIR}/gaim-0.75-static-prpls.patch
-	epatch ${FILESDIR}/gaim-0.76cvs-signals-varargs.diff
-	epatch ${FILESDIR}/gaim-0.76cvs-yahoo-login-fix.diff
-	epatch ${FILESDIR}/gaim-0.75-yahoo-security.diff
-	epatch ${FILESDIR}/gaim-0.76cvs-yahoo-misc-fixes-1.diff
-	use cjk && epatch ${FILESDIR}/gaim-0.74_cjk_gtkconv.patch
-	use gnome && epatch ${FILESDIR}/gaim-0.74-gnome-url-handler.patch
-}
-
-src_compile() {
-	einfo "Replacing -Os CFLAG with -O2"
-	replace-flags -Os -O2
-
-	# -msse2 doesn't play nice on gcc 3.2
-	[ "`gcc-version`" == "3.2" ] && filter-flags -msse2
-
-	local myconf
-	use perl || myconf="${myconf} --disable-perl"
-	use spell || myconf="${myconf} --disable-gtkspell"
-	use nls  || myconf="${myconf} --disable-nls"
-	use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
-
-	NSS_LIB=/usr/lib
-	NSS_INC=/usr/include
-	has_version dev-libs/nss && {
-		# Only need to specify this if no pkgconfig from mozilla
-		myconf="${myconf} --with-nspr-includes=${NSS_INC}/nspr"
-		myconf="${myconf} --with-nss-includes=${NSS_INC}/nss"
-		myconf="${myconf} --with-nspr-libs=${NSS_LIB}"
-		myconf="${myconf} --with-nss-libs=${NSS_LIB}"
-	}
-
-	econf ${myconf} || die "Configuration failed"
-	use perl && sed -i -e 's:^\(PERL_MM_PARAMS =.*PREFIX=\)\(.*\):\1'${D}'\2:' plugins/perl/Makefile
-
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
-}
-
-src_install() {
-	einstall || die "Install failed"
-	dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
-
-	# Copy header files for gaim plugin use
-	dodir /usr/include/gaim/src
-	cp config.h ${D}/usr/include/gaim/
-	cd ${S}/src
-	#tar cf - `find . -name \*.h` | (cd ${D}/usr/include/gaim/src ; tar xvf -)
-	tar cf - *.h | (cd ${D}/usr/include/gaim/src ; tar xvf -)
-	assert "Failed to install header files to /usr/include/gaim"
-}
-
-pkg_postinst() {
-	if use cjk; then
-		ewarn
-		ewarn "You have chosen (by selecting 'USE=cjk') to compile with"
-		ewarn "a patch for CJK support.  Please be aware that this patch"
-		ewarn "causes problems with skkinput.  kinput2 works fine.  Details"
-		ewarn "can be found at http://bugs.gentoo.org/show_bug.cgi?id=24657#c23"
-		ewarn
-	fi
-
-	ewarn
-	ewarn "If you experience problems with gaim, file them as bugs with"
-	ewarn "Gentoo's bugzilla, http://bugs.gentoo.org.  DO NOT report them"
-	ewarn "as bugs with gaim's sourceforge tracker, and by all means DO NOT"
-	ewarn "seek help in #gaim."
-	ewarn
-}
diff --git a/net-im/gaim/gaim-0.78-r3.ebuild b/net-im/gaim/gaim-0.78-r3.ebuild
deleted file mode 100644
index ae9834c04ef2..000000000000
--- a/net-im/gaim/gaim-0.78-r3.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# 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.78-r3.ebuild,v 1.2 2004/06/24 22:51:12 agriffis Exp $
-
-inherit flag-o-matic eutils gcc
-use debug && inherit debug
-
-IUSE="nls perl spell nas debug crypt cjk gnutls silc"
-
-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"
-
-DEPEND=">=x11-libs/gtk+-2.0
-	>=dev-libs/glib-2.0
-	nas? ( >=media-libs/nas-1.4.1-r1 )
-	sys-devel/gettext
-	media-libs/libao
-	>=media-libs/audiofile-0.2.0
-	perl? ( >=dev-lang/perl-5.8.2-r1
-			!<dev-perl/ExtUtils-MakeMaker-6.17 )
-	spell? ( >=app-text/gtkspell-2.0.2 )
-	dev-libs/nss
-	gnutls? ( net-libs/gnutls )
-	!mips? ( silc? ( >=net-im/silc-toolkit-0.9.12 ) )"
-PDEPEND="crypt? ( >=net-im/gaim-encryption-2.26 )"
-
-pkg_setup() {
-	ewarn
-	ewarn "If you are merging ${P} from an earlier version, you will need"
-	ewarn "to re-merge any plugins like gaim-encryption or gaim-snpp."
-	ewarn
-	ewarn "If you experience problems with gaim, file them as bugs with"
-	ewarn "Gentoo's bugzilla, http://bugs.gentoo.org.  DO NOT report them"
-	ewarn "as bugs with gaim's sourceforge tracker, and by all means DO NOT"
-	ewarn "seek help in #gaim."
-	ewarn
-	ewarn "Be sure to USE=\"debug\" and include a backtrace for any seg"
-	ewarn "faults, see http://gaim.sourceforge.net/gdb.php for details on"
-	ewarn "backtraces."
-	ewarn
-	ewarn "Please read the gaim FAQ at http://gaim.sourceforge.net/faq.php"
-	ewarn
-	for TICKER in 1 2 3 4 5; do
-		# Double beep here.
-		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-		echo -ne "\a" ; sleep 1
-	done
-	sleep 8
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use cjk && epatch ${FILESDIR}/gaim-0.76-xinput.patch
-	epatch ${FILESDIR}/gaim-0.77-newtrayicon.patch
-	epatch ${FILESDIR}/gaim-0.78-jabber_disconnect.patch
-	epatch ${FILESDIR}/gaim-0.78-log_find_click.patch
-	epatch ${FILESDIR}/gaim-0.78-msn_disconnect_fix.patch
-	epatch ${FILESDIR}/gaim-0.78-paste_html_img_crash.patch
-	epatch ${FILESDIR}/gaim-0.79cvs-gtkimhtml-font.diff
-}
-
-src_compile() {
-	einfo "Replacing -Os CFLAG with -O2"
-	replace-flags -Os -O2
-
-	# -msse2 doesn't play nice on gcc 3.2
-	[ "`gcc-version`" == "3.2" ] && filter-flags -msse2
-
-	local myconf
-	use perl || myconf="${myconf} --disable-perl"
-	use spell || myconf="${myconf} --disable-gtkspell"
-	use nls  || myconf="${myconf} --disable-nls"
-	use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
-
-	if use gnutls ; then
-		myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls"
-		myconf="${myconf} --with-gnutls-libs=/usr/lib"
-	else
-		myconf="${myconf} --enable-gnutls=no"
-	fi
-
-	if ! use mips ; then
-		if use silc ; then
-			myconf="${myconf} --with-silc-includes=/usr/include/silc-toolkit"
-			myconf="${myconf} --with-silc-libs=/usr/lib"
-		fi
-	fi
-
-	myconf="${myconf} --with-nspr-includes=/usr/include/nspr"
-	myconf="${myconf} --with-nss-includes=/usr/include/nss"
-	myconf="${myconf} --with-nspr-libs=/usr/lib"
-	myconf="${myconf} --with-nss-libs=/usr/lib"
-
-	econf ${myconf} || die "Configuration failed"
-
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
-}
-
-src_install() {
-	make install DESTDIR=${D} || die "Install failed"
-	dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
-
-	# Copy header files for gaim plugin use
-	dodir /usr/include/gaim/src
-	cp config.h ${D}/usr/include/gaim/
-	cd ${S}/src
-	tar cf - *.h | (cd ${D}/usr/include/gaim/src ; tar xvf -)
-	assert "Failed to install header files to /usr/include/gaim"
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If you are merging ${P} from an earlier version, you will need"
-	ewarn "to re-merge any plugins like gaim-encryption or gaim-snpp."
-	ewarn
-	ewarn "If you experience problems with gaim, file them as bugs with"
-	ewarn "Gentoo's bugzilla, http://bugs.gentoo.org.  DO NOT report them"
-	ewarn "as bugs with gaim's sourceforge tracker, and by all means DO NOT"
-	ewarn "seek help in #gaim."
-	ewarn
-	ewarn "Be sure to USE=\"debug\" and include a backtrace for any seg"
-	ewarn "faults, see http://gaim.sourceforge.net/gdb.php for details on"
-	ewarn "backtraces."
-	ewarn
-	ewarn "Please read the gaim FAQ at http://gaim.sourceforge.net/faq.php"
-	ewarn
-	for TICKER in 1 2 3 4 5; do
-		# Double beep here.
-		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-		echo -ne "\a" ; sleep 1
-	done
-	sleep 8
-}
diff --git a/net-im/gaim/gaim-0.79-r1.ebuild b/net-im/gaim/gaim-0.79-r1.ebuild
index 47fd3edfb9dc..e66e0cab4e45 100644
--- a/net-im/gaim/gaim-0.79-r1.ebuild
+++ b/net-im/gaim/gaim-0.79-r1.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-im/gaim/gaim-0.79-r1.ebuild,v 1.1 2004/06/28 18:45:32 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.79-r1.ebuild,v 1.2 2004/06/28 19:02:42 rizzo Exp $
 
 inherit flag-o-matic eutils gcc
 use debug && inherit debug
@@ -27,7 +27,7 @@ DEPEND=">=x11-libs/gtk+-2.0
 	dev-libs/nss
 	gnutls? ( net-libs/gnutls )
 	!mips? ( silc? ( >=net-im/silc-toolkit-0.9.12 ) )"
-PDEPEND="crypt? ( >=net-im/gaim-encryption-2.26 )"
+PDEPEND="crypt? ( >=net-im/gaim-encryption-2.27 )"
 
 pkg_setup() {
 	ewarn
diff --git a/net-im/gaim/gaim-0.79.ebuild b/net-im/gaim/gaim-0.79.ebuild
deleted file mode 100644
index 26fa61cc92d9..000000000000
--- a/net-im/gaim/gaim-0.79.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# 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.79.ebuild,v 1.1 2004/06/25 02:24:21 rizzo Exp $
-
-inherit flag-o-matic eutils gcc
-use debug && inherit debug
-
-IUSE="nls perl spell nas debug crypt cjk gnutls silc"
-
-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"
-
-DEPEND=">=x11-libs/gtk+-2.0
-	>=dev-libs/glib-2.0
-	nas? ( >=media-libs/nas-1.4.1-r1 )
-	sys-devel/gettext
-	media-libs/libao
-	>=media-libs/audiofile-0.2.0
-	perl? ( >=dev-lang/perl-5.8.2-r1
-			!<dev-perl/ExtUtils-MakeMaker-6.17 )
-	spell? ( >=app-text/gtkspell-2.0.2 )
-	dev-libs/nss
-	gnutls? ( net-libs/gnutls )
-	!mips? ( silc? ( >=net-im/silc-toolkit-0.9.12 ) )"
-PDEPEND="crypt? ( >=net-im/gaim-encryption-2.26 )"
-
-pkg_setup() {
-	ewarn
-	ewarn "If you are merging ${P} from an earlier version, you will need"
-	ewarn "to re-merge any plugins like gaim-encryption or gaim-snpp."
-	ewarn
-	ewarn "If you experience problems with gaim, file them as bugs with"
-	ewarn "Gentoo's bugzilla, http://bugs.gentoo.org.  DO NOT report them"
-	ewarn "as bugs with gaim's sourceforge tracker, and by all means DO NOT"
-	ewarn "seek help in #gaim."
-	ewarn
-	ewarn "Be sure to USE=\"debug\" and include a backtrace for any seg"
-	ewarn "faults, see http://gaim.sourceforge.net/gdb.php for details on"
-	ewarn "backtraces."
-	ewarn
-	ewarn "Please read the gaim FAQ at http://gaim.sourceforge.net/faq.php"
-	ewarn
-	for TICKER in 1 2 3 4 5; do
-		# Double beep here.
-		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-		echo -ne "\a" ; sleep 1
-	done
-	sleep 8
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use cjk && epatch ${FILESDIR}/gaim-0.76-xinput.patch
-}
-
-src_compile() {
-	einfo "Replacing -Os CFLAG with -O2"
-	replace-flags -Os -O2
-
-	# -msse2 doesn't play nice on gcc 3.2
-	[ "`gcc-version`" == "3.2" ] && filter-flags -msse2
-
-	local myconf
-	use perl || myconf="${myconf} --disable-perl"
-	use spell || myconf="${myconf} --disable-gtkspell"
-	use nls  || myconf="${myconf} --disable-nls"
-	use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
-
-	if use gnutls ; then
-		myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls"
-		myconf="${myconf} --with-gnutls-libs=/usr/lib"
-	else
-		myconf="${myconf} --enable-gnutls=no"
-	fi
-
-	if ! use mips ; then
-		if use silc ; then
-			myconf="${myconf} --with-silc-includes=/usr/include/silc-toolkit"
-			myconf="${myconf} --with-silc-libs=/usr/lib"
-		fi
-	fi
-
-	myconf="${myconf} --with-nspr-includes=/usr/include/nspr"
-	myconf="${myconf} --with-nss-includes=/usr/include/nss"
-	myconf="${myconf} --with-nspr-libs=/usr/lib"
-	myconf="${myconf} --with-nss-libs=/usr/lib"
-
-	econf ${myconf} || die "Configuration failed"
-
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
-}
-
-src_install() {
-	make install DESTDIR=${D} || die "Install failed"
-	dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
-}
-
-pkg_postinst() {
-	ewarn
-	ewarn "If you are merging ${P} from an earlier version, you will need"
-	ewarn "to re-merge any plugins like gaim-encryption or gaim-snpp."
-	ewarn
-	ewarn "If you experience problems with gaim, file them as bugs with"
-	ewarn "Gentoo's bugzilla, http://bugs.gentoo.org.  DO NOT report them"
-	ewarn "as bugs with gaim's sourceforge tracker, and by all means DO NOT"
-	ewarn "seek help in #gaim."
-	ewarn
-	ewarn "Be sure to USE=\"debug\" and include a backtrace for any seg"
-	ewarn "faults, see http://gaim.sourceforge.net/gdb.php for details on"
-	ewarn "backtraces."
-	ewarn
-	ewarn "Please read the gaim FAQ at http://gaim.sourceforge.net/faq.php"
-	ewarn
-	for TICKER in 1 2 3 4 5; do
-		# Double beep here.
-		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-		echo -ne "\a" ; sleep 1
-	done
-	sleep 8
-}