Pruning old versions

13 files changed, 9 insertions, 1441 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 90041e900d1e..f9ca1dcbb08c 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,14 @@
 # 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.262 2004/10/21 15:24:08 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.263 2004/10/21 15:52:44 rizzo Exp $
+
+  21 Oct 2004; Don Seiler <rizzo@gentoo.org>
+  -files/gaim-0.81-security2.diff,
+  -files/gaim-0.83cvs-gtkcellrendererprogress.diff,
+  -files/gaim-1.0.1cvs-jabber-roomlist.diff, -files/syslog_fd_leak.diff,
+  -gaim-0.81-r5.ebuild, -gaim-0.82.1.ebuild, -gaim-1.0.0.ebuild,
+  -gaim-1.0.1.ebuild:
+  Pruning old versions
 
   21 Oct 2004; Bryan Østergaard,,, <kloeri@gentoo.org> gaim-1.0.2.ebuild:
   Stable on alpha, bug 68271.
diff --git a/net-im/gaim/files/digest-gaim-0.81-r5 b/net-im/gaim/files/digest-gaim-0.81-r5
deleted file mode 100644
index 0f0ac7561307..000000000000
--- a/net-im/gaim/files/digest-gaim-0.81-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ee3460363f51ad24db1c5697d1da3c1b gaim-0.81.tar.bz2 4588215
diff --git a/net-im/gaim/files/digest-gaim-0.82.1 b/net-im/gaim/files/digest-gaim-0.82.1
deleted file mode 100644
index 7c78fa36511d..000000000000
--- a/net-im/gaim/files/digest-gaim-0.82.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 94484a0328dbe8073c8a97c572ce959b gaim-0.82.1.tar.bz2 4604261
diff --git a/net-im/gaim/files/digest-gaim-1.0.0 b/net-im/gaim/files/digest-gaim-1.0.0
deleted file mode 100644
index 4b315d692da0..000000000000
--- a/net-im/gaim/files/digest-gaim-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6121484e676e716ab8f3f6416a6f44a9 gaim-1.0.0.tar.bz2 4775279
diff --git a/net-im/gaim/files/digest-gaim-1.0.1 b/net-im/gaim/files/digest-gaim-1.0.1
deleted file mode 100644
index 0302d70ca256..000000000000
--- a/net-im/gaim/files/digest-gaim-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bdf4c814c1d53a4bbac0988732ee7077 gaim-1.0.1.tar.bz2 4804883
diff --git a/net-im/gaim/files/gaim-0.81-security2.diff b/net-im/gaim/files/gaim-0.81-security2.diff
deleted file mode 100644
index c61141c8d354..000000000000
--- a/net-im/gaim/files/gaim-0.81-security2.diff
+++ /dev/null
@@ -1,331 +0,0 @@
-diff -ruN gaim-0.81/src/gtkprefs.c gaim-0.81-patched/src/gtkprefs.c
---- gaim-0.81/src/gtkprefs.c	2004-07-27 20:07:02.000000000 -0400
-+++ gaim-0.81-patched/src/gtkprefs.c	2004-08-23 22:23:20.464472424 -0400
-@@ -523,7 +523,7 @@
- 
- void theme_install_theme(char *path, char *extn) {
- #ifndef _WIN32
--	gchar *command;
-+	gchar *command, *escaped;
- #endif
- 	gchar *destdir;
- 	gchar *tail;
-@@ -544,7 +544,9 @@
- 	 * other platforms, if need be */
- 	if (!g_ascii_strcasecmp(tail, ".gz") || !g_ascii_strcasecmp(tail, ".tgz")) {
- #ifndef _WIN32
--		command = g_strdup_printf("tar > /dev/null xzf \"%s\" -C %s", path, destdir);
-+		escaped = g_shell_quote(path);
-+		command = g_strdup_printf("tar > /dev/null xzf %s -C %s", escaped, destdir);
-+		g_free(escaped);
- #else
- 		if(!wgaim_gz_untar(path, destdir)) {
- 			g_free(destdir);
-diff -ruN gaim-0.81/src/protocols/msn/object.c gaim-0.81-patched/src/protocols/msn/object.c
---- gaim-0.81/src/protocols/msn/object.c	2004-06-05 23:42:54.000000000 -0400
-+++ gaim-0.81-patched/src/protocols/msn/object.c	2004-08-23 22:23:20.465472272 -0400
-@@ -35,11 +35,18 @@
- 	if ((tag = strstr(str, id "=\"")) != NULL) \
- 	{ \
- 		char buf[16]; \
-+		size_t offset; \
- 		tag += strlen(id "=\""); \
- 		c = strchr(tag, '"'); \
--		strncpy(buf, tag, c - tag); \
--		buf[c - tag] = '\0'; \
--		obj->field = atoi(buf); \
-+		if (c != NULL) \
-+		{ \
-+			memset(buf, 0, sizeof(buf)); \
-+			offset = c - tag; \
-+			if (offset >= sizeof(buf)) \
-+				offset = sizeof(buf) - 1; \
-+			strncpy(buf, tag, offset); \
-+			obj->field = atoi(buf); \
-+		} \
- 	}
- 
- static GList *local_objs;
-diff -ruN gaim-0.81/src/protocols/msn/slp.c gaim-0.81-patched/src/protocols/msn/slp.c
---- gaim-0.81/src/protocols/msn/slp.c	2004-06-14 22:37:25.000000000 -0400
-+++ gaim-0.81-patched/src/protocols/msn/slp.c	2004-08-23 22:23:20.465472272 -0400
-@@ -645,8 +645,11 @@
- 			if ((c = strchr(status, '\r')) || (c = strchr(status, '\n')) ||
- 				(c = strchr(status, '\0')))
- 			{
--				strncpy(temp, status, c - status);
--				temp[c - status] = '\0';
-+				size_t offset = c - status;
-+				if (offset >= sizeof(temp))
-+					offset = sizeof(temp) - 1;
-+				strncpy(temp, status, offset);
-+				temp[offset] = '\0';	
- 			}
- 
- 			gaim_debug_error("msn", "Received non-OK result: %s\n", temp);
-diff -ruN gaim-0.81/src/protocols/novell/nmevent.c gaim-0.81-patched/src/protocols/novell/nmevent.c
---- gaim-0.81/src/protocols/novell/nmevent.c	2004-06-12 11:13:29.000000000 -0400
-+++ gaim-0.81-patched/src/protocols/novell/nmevent.c	2004-08-23 22:32:49.957896264 -0400
-@@ -27,6 +27,8 @@
- #include "nmuserrecord.h"
- #include "nmrtf.h"
- 
-+#define MAX_UINT32 0xFFFFFFFF
-+
- struct _NMEvent
- {
- 
-@@ -147,6 +149,8 @@
- 
- 	/* Read the conference guid */
- 	rc = nm_read_uint32(conn, &size);
-+	if (size == MAX_UINT32)	return NMERR_PROTOCOL;
-+
- 	if (rc == NM_OK) {
- 		guid = g_new0(char, size + 1);
- 		rc = nm_read_all(conn, guid, size);
-@@ -160,8 +164,9 @@
- 	/* Read the message text */
- 	if (rc == NM_OK) {
- 		rc = nm_read_uint32(conn, &size);
--		if (rc == NM_OK) {
-+		if (size == MAX_UINT32)	return NMERR_PROTOCOL;
- 
-+		if (rc == NM_OK) {
- 			msg = g_new0(char, size + 1);
- 			rc = nm_read_all(conn, msg, size);
- 
-@@ -265,6 +270,8 @@
- 
- 	/* Read the conference guid */
- 	rc = nm_read_uint32(conn, &size);
-+	if (size == MAX_UINT32)	return NMERR_PROTOCOL;
-+
- 	if (rc == NM_OK) {
- 		guid = g_new0(char, size + 1);
- 		rc = nm_read_all(conn, guid, size);
-@@ -273,6 +280,8 @@
- 	/* Read the the message */
- 	if (rc == NM_OK) {
- 		rc = nm_read_uint32(conn, &size);
-+		if (size == MAX_UINT32)	return NMERR_PROTOCOL;
-+
- 		if (rc == NM_OK) {
- 			msg = g_new0(char, size + 1);
- 			rc = nm_read_all(conn, msg, size);
-@@ -340,6 +349,8 @@
- 
- 	/* Read the conference guid */
- 	rc = nm_read_uint32(conn, &size);
-+	if (size == MAX_UINT32)	return NMERR_PROTOCOL;
-+
- 	if (rc == NM_OK) {
- 		guid = g_new0(char, size + 1);
- 		rc = nm_read_all(conn, guid, size);
-@@ -390,6 +401,8 @@
- 
- 	/* Read the conference guid */
- 	rc = nm_read_uint32(conn, &size);
-+	if (size == MAX_UINT32)	return NMERR_PROTOCOL;
-+
- 	if (rc == NM_OK) {
- 		guid = g_new0(char, size + 1);
- 		rc = nm_read_all(conn, guid, size);
-@@ -427,6 +440,8 @@
- 
- 	/* Read the conference guid */
- 	rc = nm_read_uint32(conn, &size);
-+	if (size == MAX_UINT32)	return NMERR_PROTOCOL;
-+
- 	if (rc == NM_OK) {
- 		guid = g_new0(char, size + 1);
- 		rc = nm_read_all(conn, guid, size);
-@@ -475,6 +490,8 @@
- 
- 	/* Read the conference guid */
- 	rc = nm_read_uint32(conn, &size);
-+	if (size == MAX_UINT32)	return NMERR_PROTOCOL;
-+
- 	if (rc == NM_OK) {
- 		guid = g_new0(char, size + 1);
- 		rc = nm_read_all(conn, guid, size);
-@@ -513,6 +530,8 @@
- 
- 	/* Read the conference guid */
- 	rc = nm_read_uint32(conn, &size);
-+	if (size == MAX_UINT32)	return NMERR_PROTOCOL;
-+
- 	if (rc == NM_OK) {
- 		guid = g_new0(char, size + 1);
- 		rc = nm_read_all(conn, guid, size);
-@@ -570,6 +589,8 @@
- 
- 	/* Read the conference guid */
- 	rc = nm_read_uint32(conn, &size);
-+	if (size == MAX_UINT32)	return NMERR_PROTOCOL;
-+
- 	if (rc == NM_OK) {
- 		guid = g_new0(char, size + 1);
- 		rc = nm_read_all(conn, guid, size);
-@@ -611,11 +632,11 @@
- 
- 		/* Read the status text */
- 		rc = nm_read_uint32(conn, &size);
-+		if (size == MAX_UINT32)	return NMERR_PROTOCOL;
-+
- 		if (rc == NM_OK) {
--			if (size > 0) {
--				text = g_new0(char, size + 1);
--				rc = nm_read_all(conn, text, size);
--			}
-+			text = g_new0(char, size + 1);
-+			rc = nm_read_all(conn, text, size);
- 		}
- 	}
- 
-@@ -649,6 +670,8 @@
- 
- 	/* Read the conference guid */
- 	rc = nm_read_uint32(conn, &size);
-+	if (size == MAX_UINT32)	return NMERR_PROTOCOL;
-+
- 	if (rc == NM_OK) {
- 		guid = g_new0(char, size + 1);
- 		rc = nm_read_all(conn, guid, size);
-diff -ruN gaim-0.81/src/protocols/novell/nmrtf.c gaim-0.81-patched/src/protocols/novell/nmrtf.c
---- gaim-0.81/src/protocols/novell/nmrtf.c	2004-06-12 11:13:29.000000000 -0400
-+++ gaim-0.81-patched/src/protocols/novell/nmrtf.c	2004-08-23 22:31:54.135382576 -0400
-@@ -506,9 +506,9 @@
-     gboolean param_set = FALSE;
-     gboolean is_neg = FALSE;
-     int param = 0;
--    char *pch;
-     char keyword[30];
-     char parameter[20];
-+	int i;
- 
-     keyword[0] = '\0';
-     parameter[0] = '\0';
-@@ -523,11 +523,11 @@
-     }
- 
- 	/* parse keyword */
--    for (pch = keyword; isalpha(ch); rtf_get_char(ctx, &ch)) {
--        *pch = (char) ch;
--		pch++;
-+	for (i = 0; isalpha(ch) && (i < sizeof(keyword) - 1); rtf_get_char(ctx, &ch)) {
-+		keyword[i] = (char) ch;
-+		i++;
- 	}
--    *pch = '\0';
-+	keyword[i] = '\0';
- 
- 	/* check for '-' indicated a negative parameter value  */
-     if (ch == '-') {
-@@ -540,11 +540,11 @@
-     if (isdigit(ch)) {
- 
-         param_set = TRUE;
--        for (pch = parameter; isdigit(ch); rtf_get_char(ctx, &ch)) {
--            *pch = (char) ch;
--			pch++;
-+		for (i = 0; isdigit(ch) && (i < sizeof(parameter) - 1); rtf_get_char(ctx, &ch)) {
-+			parameter[i] = (char) ch;
-+			i++;
- 		}
--        *pch = '\0';
-+		parameter[i] = '\0';
- 
-         ctx->param = param = atoi(parameter);
-         if (is_neg)
-diff -ruN gaim-0.81/src/protocols/zephyr/zephyr.c gaim-0.81-patched/src/protocols/zephyr/zephyr.c
---- gaim-0.81/src/protocols/zephyr/zephyr.c	2004-07-27 20:51:27.000000000 -0400
-+++ gaim-0.81-patched/src/protocols/zephyr/zephyr.c	2004-08-23 22:30:38.018954032 -0400
-@@ -67,8 +67,8 @@
-         GSList *subscrips;
-         int last_id;
-         unsigned short port;
--        char ourhost[MAXHOSTNAMELEN];
--        char ourhostcanon[MAXHOSTNAMELEN];
-+        char ourhost[HOST_NAME_MAX + 1];
-+        char ourhostcanon[HOST_NAME_MAX + 1];
- };
- 
- /* struct I need for zephyr_to_html */
-@@ -860,19 +860,21 @@
- 	/* XXX This code may not be Win32 clean */
- 	struct hostent *hent;
- 	
--	if (gethostname(zephyr->ourhost, sizeof(zephyr->ourhost)-1) == -1) {
-+	if (gethostname(zephyr->ourhost, sizeof(zephyr->ourhost)) == -1) {
- 		gaim_debug(GAIM_DEBUG_ERROR, "zephyr", "unable to retrieve hostname, %%host%% and %%canon%% will be wrong in subscriptions and have been set to unknown\n");
--		g_stpcpy(zephyr->ourhost,"unknown");
--		g_stpcpy(zephyr->ourhostcanon,"unknown");
-+		g_strlcpy(zephyr->ourhost, "unknown", sizeof(zephyr->ourhost));
-+		g_strlcpy(zephyr->ourhostcanon, "unknown", sizeof(zephyr->ourhostcanon));
- 		return;
- 	}
- 	
- 	if (!(hent = gethostbyname(zephyr->ourhost))) {
- 		gaim_debug(GAIM_DEBUG_ERROR,"zephyr", "unable to resolve hostname, %%canon%% will be wrong in subscriptions.and has been set to the value of %%host%%, %s\n",zephyr->ourhost);
--		g_stpcpy(zephyr->ourhostcanon,zephyr->ourhost);
-+		g_strlcpy(zephyr->ourhostcanon, zephyr->ourhost, sizeof(zephyr->ourhostcanon));
- 		return;
- 	}
--	g_stpcpy(zephyr->ourhostcanon,hent->h_name);
-+
-+	g_strlcpy(zephyr->ourhostcanon, hent->h_name, sizeof(zephyr->ourhostcanon));
-+
- 	return;
- }
- 
-diff -ruN gaim-0.81/src/util.c gaim-0.81-patched/src/util.c
---- gaim-0.81/src/util.c	2004-08-05 10:17:03.000000000 -0400
-+++ gaim-0.81-patched/src/util.c	2004-08-23 22:25:06.069418032 -0400
-@@ -2627,8 +2627,8 @@
- 	 * if we make sure that there is indeed a \n in our header.
- 	 */
- 	if (p && g_strstr_len(p, data_len - (p - data), "\n")) {
--		sscanf(p, "Content-Length: %d", (int *)&content_len);
--		gaim_debug_misc("parse_content_len", "parsed %d\n", content_len);
-+		sscanf(p, "Content-Length: %u", (int *)&content_len);
-+		gaim_debug_misc("parse_content_len", "parsed %u\n", content_len);
- 	}
- 
- 	return content_len;
-@@ -2752,7 +2752,14 @@
- 
- 					/* In with the new. */
- 					gfud->data_len = content_len;
--					gfud->webdata = g_malloc(gfud->data_len);
-+					gfud->webdata = g_try_malloc(gfud->data_len);
-+					if (gfud->webdata == NULL) {
-+						gaim_debug_error("gaim_url_fetch", "Failed to allocate %u bytes: %s\n", gfud->data_len, strerror(errno));
-+						gaim_input_remove(gfud->inpa);
-+						close(sock);
-+						gfud->callback(gfud->user_data, NULL, 0);
-+						destroy_fetch_url_data(gfud);
-+					}
- 				}
- 				else
- 					gfud->newline = TRUE;
-@@ -2839,11 +2846,18 @@
- 	static char buf[BUF_LEN];
- 	guint i, j = 0;
- 	char *bum;
-+		char hex[3];
- 
- 	g_return_val_if_fail(str != NULL, NULL);
- 
-+	/*
-+	 * XXX - This check could be removed and buf could be made
-+	 * dynamically allocated, but this is easier.
-+	 */
-+	if (strlen(str) >= BUF_LEN)
-+		return NULL;
-+
- 	for (i = 0; i < strlen(str); i++) {
--		char hex[3];
- 
- 		if (str[i] != '%')
- 			buf[j++] = str[i];
diff --git a/net-im/gaim/files/gaim-0.83cvs-gtkcellrendererprogress.diff b/net-im/gaim/files/gaim-0.83cvs-gtkcellrendererprogress.diff
deleted file mode 100644
index 2e0fad107181..000000000000
--- a/net-im/gaim/files/gaim-0.83cvs-gtkcellrendererprogress.diff
+++ /dev/null
@@ -1,319 +0,0 @@
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/gtkcellrendererprogress.c,v
-retrieving revision 1.6
-retrieving revision 1.7
-diff -u -r1.6 -r1.7
---- gaim/gaim/src/gtkcellrendererprogress.c	2004/01/10 04:04:56	1.6
-+++ gaim/gaim/src/gtkcellrendererprogress.c	2004/08/28 12:58:57	1.7
-@@ -25,24 +25,24 @@
- 
- #include "gtkcellrendererprogress.h"
- 
--static void gtk_cell_renderer_progress_get_property  (GObject                    *object,
-+static void gaim_gtk_cell_renderer_progress_get_property  (GObject                    *object,
- 						      guint                       param_id,
- 						      GValue                     *value,
- 						      GParamSpec                 *pspec);
--static void gtk_cell_renderer_progress_set_property  (GObject                    *object,
-+static void gaim_gtk_cell_renderer_progress_set_property  (GObject                    *object,
- 						      guint                       param_id,
- 						      const GValue               *value,
- 						      GParamSpec                 *pspec);
--static void gtk_cell_renderer_progress_init       (GtkCellRendererProgress      *cellprogress);
--static void gtk_cell_renderer_progress_class_init (GtkCellRendererProgressClass *class);
--static void gtk_cell_renderer_progress_get_size   (GtkCellRenderer            *cell,
-+static void gaim_gtk_cell_renderer_progress_init       (GaimGtkCellRendererProgress      *cellprogress);
-+static void gaim_gtk_cell_renderer_progress_class_init (GaimGtkCellRendererProgressClass *class);
-+static void gaim_gtk_cell_renderer_progress_get_size   (GtkCellRenderer            *cell,
- 						   GtkWidget                  *widget,
- 						   GdkRectangle               *cell_area,
- 						   gint                       *x_offset,
- 						   gint                       *y_offset,
- 						   gint                       *width,
- 						   gint                       *height);
--static void gtk_cell_renderer_progress_render     (GtkCellRenderer            *cell,
-+static void gaim_gtk_cell_renderer_progress_render     (GtkCellRenderer            *cell,
- 						   GdkWindow                  *window,
- 						   GtkWidget                  *widget,
- 						   GdkRectangle               *background_area,
-@@ -50,7 +50,7 @@
- 						   GdkRectangle               *expose_area,
- 						   guint                       flags);
- #if 0
--static gboolean gtk_cell_renderer_progress_activate  (GtkCellRenderer            *cell,
-+static gboolean gaim_gtk_cell_renderer_progress_activate  (GtkCellRenderer            *cell,
- 						      GdkEvent                   *event,
- 						      GtkWidget                  *widget,
- 						      const gchar                *path,
-@@ -58,7 +58,7 @@
- 						      GdkRectangle               *cell_area,
- 						      guint                       flags);
- #endif
--static void  gtk_cell_renderer_progress_finalize (GObject *gobject);
-+static void  gaim_gtk_cell_renderer_progress_finalize (GObject *gobject);
- 
- enum {
- 	LAST_SIGNAL
-@@ -66,7 +66,6 @@
- 
- enum {
- 	PROP_0,
--
- 	PROP_PERCENTAGE,
- 	PROP_TEXT,
- 	PROP_SHOW_TEXT
-@@ -75,7 +74,7 @@
- static gpointer parent_class;
- /* static guint progress_cell_renderer_signals [LAST_SIGNAL]; */
- 
--GType  gtk_cell_renderer_progress_get_type (void)
-+GType  gaim_gtk_cell_renderer_progress_get_type (void)
- {
- 	static GType cell_progress_type = 0;
- 	
-@@ -83,46 +82,46 @@
- 		{
- 			static const GTypeInfo cell_progress_info =
- 				{
--					sizeof (GtkCellRendererProgressClass),
-+					sizeof (GaimGtkCellRendererProgressClass),
- 					NULL,           /* base_init */
- 					NULL,           /* base_finalize */
--					(GClassInitFunc) gtk_cell_renderer_progress_class_init,
-+					(GClassInitFunc) gaim_gtk_cell_renderer_progress_class_init,
- 					NULL,           /* class_finalize */
- 					NULL,           /* class_data */
--					sizeof (GtkCellRendererProgress),
-+					sizeof (GaimGtkCellRendererProgress),
- 					0,              /* n_preallocs */
--					(GInstanceInitFunc) gtk_cell_renderer_progress_init,
-+					(GInstanceInitFunc) gaim_gtk_cell_renderer_progress_init,
- 				};
- 			
- 			cell_progress_type =
--				g_type_register_static (GTK_TYPE_CELL_RENDERER, "GtkCellRendererProgress",
--							&cell_progress_info, 0);
-+				g_type_register_static (GTK_TYPE_CELL_RENDERER,
-+										"GaimGtkCellRendererProgress",
-+										&cell_progress_info, 0);
- 		}
- 	
- 	return cell_progress_type;
- }
- 
--
--static void gtk_cell_renderer_progress_init (GtkCellRendererProgress *cellprogress)
-+static void gaim_gtk_cell_renderer_progress_init (GaimGtkCellRendererProgress *cellprogress)
- {
- 	GTK_CELL_RENDERER(cellprogress)->mode = GTK_CELL_RENDERER_MODE_INERT;
- 	GTK_CELL_RENDERER(cellprogress)->xpad = 2;
- 	GTK_CELL_RENDERER(cellprogress)->ypad = 2;
- }
- 
--static void gtk_cell_renderer_progress_class_init (GtkCellRendererProgressClass *class)
-+static void gaim_gtk_cell_renderer_progress_class_init (GaimGtkCellRendererProgressClass *class)
- {
- 	GObjectClass *object_class = G_OBJECT_CLASS(class);
- 	GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS(class);
- 	
- 	parent_class = g_type_class_peek_parent (class);
--	object_class->finalize = gtk_cell_renderer_progress_finalize;
-+	object_class->finalize = gaim_gtk_cell_renderer_progress_finalize;
- 
--	object_class->get_property = gtk_cell_renderer_progress_get_property;
--	object_class->set_property = gtk_cell_renderer_progress_set_property;
-+	object_class->get_property = gaim_gtk_cell_renderer_progress_get_property;
-+	object_class->set_property = gaim_gtk_cell_renderer_progress_set_property;
- 	
--	cell_class->get_size = gtk_cell_renderer_progress_get_size;
--	cell_class->render   = gtk_cell_renderer_progress_render;
-+	cell_class->get_size = gaim_gtk_cell_renderer_progress_get_size;
-+	cell_class->render   = gaim_gtk_cell_renderer_progress_render;
- 	
- 	g_object_class_install_property (object_class,
- 					 PROP_PERCENTAGE,
-@@ -131,7 +130,6 @@
- 							      "The fractional progress to display",
- 							      0, 1, 0,
- 							      G_PARAM_READWRITE));
--							      
- 	g_object_class_install_property (object_class,
- 					 PROP_TEXT,
- 					 g_param_spec_string ("text",
-@@ -148,23 +146,21 @@
- 							    G_PARAM_READABLE | G_PARAM_WRITABLE));
- }
- 
--
--
--static void gtk_cell_renderer_progress_finalize (GObject *object)
-+static void gaim_gtk_cell_renderer_progress_finalize (GObject *object)
- {
- /*
--	GtkCellRendererProgress *cellprogress = GTK_CELL_RENDERER_PROGRESS(object);
-+	GaimGtkCellRendererProgress *cellprogress = GAIM_GTK_CELL_RENDERER_PROGRESS(object);
- */
- 
- 	(* G_OBJECT_CLASS (parent_class)->finalize) (object);
- }
- 
--static void gtk_cell_renderer_progress_get_property (GObject    *object,
-+static void gaim_gtk_cell_renderer_progress_get_property (GObject    *object,
- 						     guint      param_id,
- 						     GValue     *value,
- 						     GParamSpec *psec)
- {
--	GtkCellRendererProgress *cellprogress = GTK_CELL_RENDERER_PROGRESS(object);
-+	GaimGtkCellRendererProgress *cellprogress = GAIM_GTK_CELL_RENDERER_PROGRESS(object);
- 
- 	switch (param_id)
- 		{
-@@ -183,12 +179,12 @@
- 		}
- }
- 
--static void gtk_cell_renderer_progress_set_property (GObject      *object,
-+static void gaim_gtk_cell_renderer_progress_set_property (GObject      *object,
- 						     guint        param_id,
- 						     const GValue *value,
- 						     GParamSpec   *pspec)
- {
--	GtkCellRendererProgress *cellprogress = GTK_CELL_RENDERER_PROGRESS (object);
-+	GaimGtkCellRendererProgress *cellprogress = GAIM_GTK_CELL_RENDERER_PROGRESS (object);
- 
- 	switch (param_id)
- 		{
-@@ -210,12 +206,12 @@
- 		}
- }
- 
--GtkCellRenderer *gtk_cell_renderer_progress_new(void)
-+GtkCellRenderer *gaim_gtk_cell_renderer_progress_new(void)
- {
--	return g_object_new(GTK_TYPE_CELL_RENDERER_PROGRESS, NULL);
-+	return g_object_new(GAIM_TYPE_GTK_CELL_RENDERER_PROGRESS, NULL);
- }
- 
--static void gtk_cell_renderer_progress_get_size (GtkCellRenderer *cell,
-+static void gaim_gtk_cell_renderer_progress_get_size (GtkCellRenderer *cell,
- 						 GtkWidget       *widget,
- 						 GdkRectangle    *cell_area,
- 						 gint            *x_offset,
-@@ -251,7 +247,7 @@
- }
- 
- 
--static void gtk_cell_renderer_progress_render (GtkCellRenderer *cell,
-+static void gaim_gtk_cell_renderer_progress_render (GtkCellRenderer *cell,
- 					       GdkWindow       *window,
- 					       GtkWidget       *widget,
- 					       GdkRectangle    *background_area,
-@@ -259,7 +255,7 @@
- 					       GdkRectangle    *expose_area,
- 					       guint            flags)
- {
--	GtkCellRendererProgress *cellprogress = (GtkCellRendererProgress *) cell;
-+	GaimGtkCellRendererProgress *cellprogress = (GaimGtkCellRendererProgress *) cell;
- 	
- 	gint width, height;
- 	GtkStateType state;
-@@ -271,12 +267,10 @@
- 		state = GTK_STATE_ACTIVE;
- 	else
- 		state = GTK_STATE_NORMAL;
--	
--	
--	
-+
- 	width -= cell->xpad*2;
- 	height -= cell->ypad*2;
--	
-+
- 	gtk_paint_box (widget->style,
- 		       window,
- 		       GTK_STATE_NORMAL, GTK_SHADOW_IN, 
-
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/gtkcellrendererprogress.h,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -r1.3 -r1.4
---- gaim/gaim/src/gtkcellrendererprogress.h	2004/08/08 05:37:58	1.3
-+++ gaim/gaim/src/gtkcellrendererprogress.h	2004/08/28 12:58:57	1.4
-@@ -1,4 +1,4 @@
--/* gtkcellrendererprogress.h
-+/* gtkxcellrendererprogress.h
-  * Gaim is the legal property of its developers, whose names are too numerous
-  * to list here.  Please refer to the COPYRIGHT file distributed with this
-  * source distribution.
-@@ -28,30 +28,30 @@
- #endif /* __cplusplus */
- 
- 
--#define GTK_TYPE_CELL_RENDERER_PROGRESS         (gtk_cell_renderer_progress_get_type())
--#define GTK_CELL_RENDERER_PROGRESS(obj)         (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_CELL_RENDERER_PROGRESS, GtkCellRendererProgress))
--#define GTK_CELL_RENDERER_PROGRESS_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_PROGRESS, GtkCellRendererProgressClass))
--#define GTK_IS_CELL_PROGRESS_PROGRESS(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_PROGRESS))
--#define GTK_IS_CELL_PROGRESS_PROGRESS_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_PROGRESS))
--#define GTK_CELL_RENDERER_PROGRESS_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_PROGRESS, GtkCellRendererProgressClass))
--
--typedef struct _GtkCellRendererProgress GtkCellRendererProgress;
--typedef struct _GtkCellRendererProgressClass GtkCellRendererProgressClass;
--
--	struct _GtkCellRendererProgress {
--		GtkCellRenderer parent;
--
--		gdouble progress;
--		gchar *text;
--		gboolean text_set;
--	};
--
--	struct _GtkCellRendererProgressClass {
--		GtkCellRendererClass parent_class;
--	};
-+#define GAIM_TYPE_GTK_CELL_RENDERER_PROGRESS         (gaim_gtk_cell_renderer_progress_get_type())
-+#define GAIM_GTK_CELL_RENDERER_PROGRESS(obj)         (G_TYPE_CHECK_INSTANCE_CAST((obj), GAIM_TYPE_GTK_CELL_RENDERER_PROGRESS, GaimGtkCellRendererProgress))
-+#define GAIM_GTK_CELL_RENDERER_PROGRESS_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GAIM_TYPE_GTK_CELL_RENDERER_PROGRESS, GaimGtkCellRendererProgressClass))
-+#define GAIM_IS_GTK_CELL_PROGRESS_PROGRESS(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAIM_TYPE_GTK_CELL_RENDERER_PROGRESS))
-+#define GAIM_IS_GTK_CELL_PROGRESS_PROGRESS_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GAIM_TYPE_GTK_CELL_RENDERER_PROGRESS))
-+#define GAIM_GTK_CELL_RENDERER_PROGRESS_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), GAIM_TYPE_GTK_CELL_RENDERER_PROGRESS, GaimGtkCellRendererProgressClass))
-+
-+typedef struct _GaimGtkCellRendererProgress GaimGtkCellRendererProgress;
-+typedef struct _GaimGtkCellRendererProgressClass GaimGtkCellRendererProgressClass;
-+
-+struct _GaimGtkCellRendererProgress {
-+	GtkCellRenderer parent;
-+
-+	gdouble progress;
-+	gchar *text;
-+	gboolean text_set;
-+};
-+
-+struct _GaimGtkCellRendererProgressClass {
-+	GtkCellRendererClass parent_class;
-+};
- 
--	GType            gtk_cell_renderer_progress_get_type     (void);
--	GtkCellRenderer  *gtk_cell_renderer_progress_new          (void);
-+GType            gaim_gtk_cell_renderer_progress_get_type     (void);
-+GtkCellRenderer  *gaim_gtk_cell_renderer_progress_new          (void);
- 
- 
- #ifdef __cplusplus
-
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/gtkft.c,v
-retrieving revision 1.55
-retrieving revision 1.56
-diff -u -r1.55 -r1.56
---- gaim/gaim/src/gtkft.c	2004/08/20 05:11:30	1.55
-+++ gaim/gaim/src/gtkft.c	2004/08/28 12:58:57	1.56
-@@ -499,7 +499,7 @@
- 	gtk_tree_view_append_column(GTK_TREE_VIEW(tree), column);
- 
- 	/* Progress bar column */
--	renderer = gtk_cell_renderer_progress_new();
-+	renderer = gaim_gtk_cell_renderer_progress_new();
- 	column = gtk_tree_view_column_new_with_attributes(_("Progress"), renderer,
- 				"percentage", COLUMN_PROGRESS, NULL);
- 	gtk_tree_view_column_set_resizable(GTK_TREE_VIEW_COLUMN(column), TRUE);
diff --git a/net-im/gaim/files/gaim-1.0.1cvs-jabber-roomlist.diff b/net-im/gaim/files/gaim-1.0.1cvs-jabber-roomlist.diff
deleted file mode 100644
index 127405fd1f49..000000000000
--- a/net-im/gaim/files/gaim-1.0.1cvs-jabber-roomlist.diff
+++ /dev/null
@@ -1,82 +0,0 @@
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/chat.c,v
-retrieving revision 1.40
-retrieving revision 1.40.2.1
-diff -u -r1.40 -r1.40.2.1
---- gaim/gaim/src/protocols/jabber/chat.c	2004/08/31 01:45:08	1.40
-+++ gaim/gaim/src/protocols/jabber/chat.c	2004/09/19 04:16:00	1.40.2.1
-@@ -690,17 +690,43 @@
- 	js->roomlist = NULL;
- }
- 
-+static void roomlist_cancel_cb(JabberStream *js, const char *server) {
-+	if(js->roomlist) {
-+		gaim_roomlist_set_in_progress(js->roomlist, FALSE);
-+		gaim_roomlist_unref(js->roomlist);
-+		js->roomlist = NULL;
-+	}
-+}
-+
- static void roomlist_ok_cb(JabberStream *js, const char *server)
- {
- 	JabberIq *iq;
--	GList *fields = NULL;
--	GaimRoomlistField *f;
-+
-+	if(!js->roomlist)
-+		return;
- 
- 	if(!server || !*server) {
- 		gaim_notify_error(js->gc, _("Invalid Server"), _("Invalid Server"), NULL);
- 		return;
- 	}
- 
-+	gaim_roomlist_set_in_progress(js->roomlist, TRUE);
-+
-+	iq = jabber_iq_new_query(js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#items");
-+
-+	xmlnode_set_attrib(iq->node, "to", server);
-+
-+	jabber_iq_set_callback(iq, roomlist_disco_result_cb, NULL);
-+
-+	jabber_iq_send(iq);
-+}
-+
-+GaimRoomlist *jabber_roomlist_get_list(GaimConnection *gc)
-+{
-+	JabberStream *js = gc->proto_data;
-+	GList *fields = NULL;
-+	GaimRoomlistField *f;
-+
- 	if(js->roomlist)
- 		gaim_roomlist_unref(js->roomlist);
- 
-@@ -717,26 +743,13 @@
- 
- 	gaim_roomlist_set_fields(js->roomlist, fields);
- 
--	gaim_roomlist_set_in_progress(js->roomlist, TRUE);
--
--	iq = jabber_iq_new_query(js, JABBER_IQ_GET, "http://jabber.org/protocol/disco#items");
--
--	xmlnode_set_attrib(iq->node, "to", server);
--
--	jabber_iq_set_callback(iq, roomlist_disco_result_cb, NULL);
--
--	jabber_iq_send(iq);
--}
--
--GaimRoomlist *jabber_roomlist_get_list(GaimConnection *gc)
--{
--	JabberStream *js = gc->proto_data;
- 
- 	gaim_request_input(gc, _("Enter a Conference Server"), _("Enter a Conference Server"),
- 			_("Select a conference server to query"),
- 			js->chat_servers ? js->chat_servers->data : "conference.jabber.org",
- 			FALSE, FALSE, NULL,
--			_("Find Rooms"), G_CALLBACK(roomlist_ok_cb), _("Cancel"), NULL, js);
-+			_("Find Rooms"), GAIM_CALLBACK(roomlist_ok_cb),
-+			_("Cancel"), GAIM_CALLBACK(roomlist_cancel_cb), js);
- 
- 	return js->roomlist;
- }
diff --git a/net-im/gaim/files/syslog_fd_leak.diff b/net-im/gaim/files/syslog_fd_leak.diff
deleted file mode 100644
index 780ee0ba5840..000000000000
--- a/net-im/gaim/files/syslog_fd_leak.diff
+++ /dev/null
@@ -1,263 +0,0 @@
-diff -urd gaim-0.81/src/log.c gaim-0.81-new/src/log.c
---- gaim-0.81/src/log.c	2004-08-05 10:34:02.000000000 -0700
-+++ gaim-0.81-new/src/log.c	2004-08-15 19:43:02.000000000 -0700
-@@ -332,6 +332,60 @@
- 	FILE *file;
- };
- 
-+static void log_writer_common(GaimLog *log, GaimMessageFlags type,
-+							  const char *prpl, time_t time,
-+							  const char *ext)
-+{
-+	char date[64];
-+	struct generic_logger_data *data = log->logger_data;
-+
-+	if(!data) {
-+		/* This log is new */
-+		char *ud = gaim_user_dir();
-+		char *acct_name = g_strdup(gaim_normalize(log->account,
-+												  gaim_account_get_username(log->account)));
-+		char *target;
-+		char *dir;
-+		char *filename, *path;
-+
-+		printf("%s\n", acct_name);
-+
-+		if (log->type == GAIM_LOG_CHAT) {
-+			target = g_strdup_printf("%s.chat", gaim_normalize(log->account,
-+															   log->name));
-+		} else if(log->type == GAIM_LOG_SYSTEM) {
-+			target = g_strdup(".system");
-+		} else {
-+			target = g_strdup(gaim_normalize(log->account, log->name));
-+		}
-+
-+		strftime(date, sizeof(date), "%Y-%m-%d.%H%M%S", localtime(&log->time));
-+
-+		dir = g_build_filename(ud, "logs",
-+				       prpl, acct_name, target, NULL);
-+		gaim_build_dir (dir, S_IRUSR | S_IWUSR | S_IXUSR);
-+		g_free(target);
-+		g_free(acct_name);
-+
-+		filename = g_strdup_printf("%s%s", date, ext ? ext : "");
-+
-+		path = g_build_filename(dir, filename, NULL);
-+		g_free(dir);
-+		g_free(filename);
-+
-+		log->logger_data = data = g_new0(struct generic_logger_data, 1);
-+
-+		data->file = fopen(path, "a");
-+		if (!data->file) {
-+			gaim_debug(GAIM_DEBUG_ERROR, "log",
-+					"Could not create log file %s\n", filename);
-+			g_free(path);
-+			return;
-+		}
-+		g_free(path);
-+	}	
-+}
-+
- static GList *log_lister_common(GaimLogType type, const char *name, GaimAccount *account, const char *ext, GaimLogLogger *logger)
- {
- 	GDir *dir;
-@@ -505,47 +559,23 @@
- static void html_logger_write(GaimLog *log, GaimMessageFlags type,
- 		const char *from, time_t time, const char *message)
- {
--	char date[64];
- 	char *msg_fixed;
--	struct generic_logger_data *data = log->logger_data;
-+	char date[64];
- 	GaimPlugin *plugin = gaim_find_prpl(gaim_account_get_protocol_id(log->account));
- 	const char *prpl_name = plugin->info->name;
-+	struct generic_logger_data *data = log->logger_data;
- 
- 	if(!data) {
--		/* This log is new */
--		char *ud = gaim_user_dir();
--		char *guy = g_strdup(gaim_normalize(log->account, gaim_account_get_username(log->account)));
--		char *chat;
--		const char *prpl = GAIM_PLUGIN_PROTOCOL_INFO(plugin)->list_icon(log->account, NULL);
--		char *dir;
--		char *filename;
--
--		if (log->type == GAIM_LOG_CHAT) {
--			chat = g_strdup_printf("%s.chat", guy);
--			g_free(guy);
--			guy = chat;
--		}
--
--		strftime(date, sizeof(date), "%Y-%m-%d.%H%M%S.html", localtime(&log->time));
--
--		dir = g_build_filename(ud, "logs",
--				       prpl, guy, gaim_normalize(log->account, log->name), NULL);
--		gaim_build_dir (dir, S_IRUSR | S_IWUSR | S_IXUSR);
--		g_free(guy);
--
--		filename = g_build_filename(dir, date, NULL);
--		g_free(dir);
-+		const char *prpl =
-+			GAIM_PLUGIN_PROTOCOL_INFO(plugin)->list_icon(log->account, NULL);
-+		log_writer_common(log, type, prpl, time, ".html");
- 
--		log->logger_data = data = g_new0(struct generic_logger_data, 1);
-+		data = log->logger_data;
- 
--		data->file = fopen(filename, "a");
--		if (!data->file) {
--			gaim_debug(GAIM_DEBUG_ERROR, "log",
--					"Could not create log file %s\n", filename);
--			g_free(filename);
-+		/* if we can't write to the file, give up before we hurt ourselves */
-+		if(!data->file)
- 			return;
--		}
--		g_free(filename);
-+
- 		strftime(date, sizeof(date), "%Y-%m-%d %H:%M:%S", localtime(&log->time));
- 		fprintf(data->file, "<html><head><title>");
- 		fprintf(data->file, "Conversation with %s at %s on %s (%s)",
-@@ -554,11 +584,8 @@
- 		fprintf(data->file,
- 			"<h3>Conversation with %s at %s on %s (%s)</h3>\n",
- 			log->name, date, gaim_account_get_username(log->account), prpl);
--	}
- 
--	/* if we can't write to the file, give up before we hurt ourselves */
--	if(!data->file)
--		return;
-+	}
- 
- 	gaim_markup_html_to_xhtml(message, &msg_fixed, NULL);
- 
-@@ -642,35 +669,6 @@
- 
- static void html_logger_create(GaimLog *log)
- {
--	if(log->type == GAIM_LOG_SYSTEM){
--		char date[64];
--		const char *prpl = GAIM_PLUGIN_PROTOCOL_INFO
--			(gaim_find_prpl(gaim_account_get_protocol_id(log->account)))->list_icon(log->account, NULL);
--		char *ud = gaim_user_dir();
--		char *dir = g_build_filename(ud, "logs", prpl, log->name, ".system", NULL);
--		char *filename;
--		struct generic_logger_data *data;
--
--		gaim_build_dir (dir, S_IRUSR | S_IWUSR | S_IXUSR);
--		strftime(date, sizeof(date), "%Y-%m-%d.%H%M%S.html", localtime(&log->time));
--		filename = g_build_filename(dir, date, NULL);
--		g_free(dir);
--
--		log->logger_data = data = g_new0(struct generic_logger_data, 1);
--
--		data->file = fopen(filename, "a");
--		if (!data->file) {
--			gaim_debug(GAIM_DEBUG_ERROR, "log",
--					"Could not create log file %s\n", filename);
--			g_free(filename);
--			return;
--		}
--		fprintf(data->file, "<html><head><title>");
--		fprintf(data->file, "System Log for %s (%s)",
--				gaim_account_get_username(log->account), prpl);
--		fprintf(data->file, "</title></head><body>");
--		g_free(filename);
--	}
- }
- 
- static GaimLogLogger html_logger = {
-@@ -697,49 +695,25 @@
- 			     const char *from, time_t time, const char *message)
- {
- 	char date[64];
--	char *stripped = NULL;
-+	GaimPlugin *plugin = gaim_find_prpl(gaim_account_get_protocol_id(log->account));
- 	struct generic_logger_data *data = log->logger_data;
--	if (!data) {
-+	char *stripped = NULL;
-+
-+	if(!data) {
- 		/* This log is new.  We could use the loggers 'new' function, but
- 		 * creating a new file there would result in empty files in the case
- 		 * that you open a convo with someone, but don't say anything.
--		 *
--		 * The log is also not a system log. Because if it is, data would
--		 * be created in txt_logger_create
- 		 */
--		char *ud = gaim_user_dir();
--		char *guy = g_strdup(gaim_normalize(log->account, gaim_account_get_username(log->account)));
--		char *chat;
--		const char *prpl = GAIM_PLUGIN_PROTOCOL_INFO
--			(gaim_find_prpl(gaim_account_get_protocol_id(log->account)))->list_icon(log->account, NULL);
--		char *dir;
--		char *filename;
--
--		if (log->type == GAIM_LOG_CHAT) {
--			chat = g_strdup_printf("%s.chat", guy);
--			g_free(guy);
--			guy = chat;
--		}
--
--		strftime(date, sizeof(date), "%Y-%m-%d.%H%M%S.txt", localtime(&log->time));
--
--		dir = g_build_filename(ud, "logs",
--				       prpl, guy, gaim_normalize(log->account, log->name), NULL);
--		gaim_build_dir (dir, S_IRUSR | S_IWUSR | S_IXUSR);
--		g_free(guy);
--
--		filename = g_build_filename(dir, date, NULL);
--		g_free(dir);
-+		const char *prpl =
-+			GAIM_PLUGIN_PROTOCOL_INFO(plugin)->list_icon(log->account, NULL);
-+		log_writer_common(log, type, prpl, time, ".txt");
- 
--		log->logger_data = data = g_new0(struct generic_logger_data, 1);
-+		data = log->logger_data;
- 
--		data->file = fopen(filename, "a");
--		if (!data->file) {
--			gaim_debug(GAIM_DEBUG_ERROR, "log", "Could not create log file %s\n", filename);
--			g_free(filename);
-+		/* if we can't write to the file, give up before we hurt ourselves */
-+		if(!data->file)
- 			return;
--		}
--		g_free(filename);
-+
- 		strftime(date, sizeof(date), "%Y-%m-%d %H:%M:%S", localtime(&log->time));
- 		fprintf(data->file, "Conversation with %s at %s on %s (%s)\n",
- 			log->name, date, gaim_account_get_username(log->account), prpl);
-@@ -831,31 +805,6 @@
- 
- static void txt_logger_create(GaimLog *log)
- {
--	if(log->type == GAIM_LOG_SYSTEM){
--		char date[64];
--		const char *prpl = GAIM_PLUGIN_PROTOCOL_INFO
--			(gaim_find_prpl(gaim_account_get_protocol_id(log->account)))->list_icon(log->account, NULL);
--		char *ud = gaim_user_dir();
--		char *dir = g_build_filename(ud, "logs", prpl, log->name, ".system", NULL);
--		char *filename;
--		struct generic_logger_data *data;
--
--		gaim_build_dir (dir, S_IRUSR | S_IWUSR | S_IXUSR);
--		strftime(date, sizeof(date), "%Y-%m-%d.%H%M%S.txt", localtime(&log->time));
--		filename = g_build_filename(dir, date, NULL);
--		g_free(dir);
--
--		log->logger_data = data = g_new0(struct generic_logger_data, 1);
--
--		data->file = fopen(filename, "a");
--		if (!data->file) {
--			gaim_debug(GAIM_DEBUG_ERROR, "log",
--					"Could not create log file %s\n", filename);
--			g_free(filename);
--			return;
--		}
--		g_free(filename);
--	}
- }
- 
- static GaimLogLogger txt_logger = {
diff --git a/net-im/gaim/gaim-0.81-r5.ebuild b/net-im/gaim/gaim-0.81-r5.ebuild
deleted file mode 100644
index 7019a4d5c772..000000000000
--- a/net-im/gaim/gaim-0.81-r5.ebuild
+++ /dev/null
@@ -1,114 +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.81-r5.ebuild,v 1.13 2004/09/13 15:08:03 rizzo Exp $
-
-inherit flag-o-matic eutils gcc debug
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-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
-	nas? ( >=media-libs/nas-1.4.1-r1 )
-	dev-util/pkgconfig
-	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 )
-	silc? ( >=net-im/silc-toolkit-0.9.12-r2 )
-	evo? ( mail-client/evolution )"
-
-PDEPEND="crypt? ( >=x11-plugins/gaim-encryption-2.29 )"
-
-print_gaim_warning() {
-	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
-	einfo
-	einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS."
-	einfo
-	ebeep 5
-	epause 3
-}
-
-pkg_setup() {
-	print_gaim_warning
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use cjk && epatch ${FILESDIR}/gaim-0.76-xinput.patch
-	epatch ${FILESDIR}/syslog_fd_leak.diff
-
-	# All security patches wrapped into one
-	epatch ${FILESDIR}/gaim-0.81-security2.diff
-}
-
-src_compile() {
-	# Stabilize things, for your own good
-	strip-flags
-	replace-flags -O? -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"
-	use evo || myconf="${myconf} --disable-gevolution"
-
-	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 silc ; then
-		myconf="${myconf} --with-silc-includes=/usr/include/silc-toolkit"
-		myconf="${myconf} --with-silc-libs=/usr/lib"
-	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() {
-	print_gaim_warning
-}
diff --git a/net-im/gaim/gaim-0.82.1.ebuild b/net-im/gaim/gaim-0.82.1.ebuild
deleted file mode 100644
index f1fca5fb84d3..000000000000
--- a/net-im/gaim/gaim-0.82.1.ebuild
+++ /dev/null
@@ -1,113 +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.82.1.ebuild,v 1.10 2004/09/16 21:07:59 rizzo Exp $
-
-inherit flag-o-matic eutils gcc debug
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc ~mips ~alpha hppa amd64 ~ia64"
-IUSE="nls perl spell nas crypt cjk gnutls silc evo debug"
-
-DEPEND=">=x11-libs/gtk+-2.0
-	>=dev-libs/glib-2.0
-	nas? ( >=media-libs/nas-1.4.1-r1 )
-	dev-util/pkgconfig
-	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 )
-	silc? ( >=net-im/silc-toolkit-0.9.12-r2 )
-	evo? ( mail-client/evolution )"
-
-PDEPEND="crypt? ( >=x11-plugins/gaim-encryption-2.30 )"
-
-print_gaim_warning() {
-	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
-	einfo
-	einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS."
-	einfo
-	ebeep 5
-	epause 3
-}
-
-pkg_setup() {
-	print_gaim_warning
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use cjk && epatch ${FILESDIR}/gaim-0.76-xinput.patch
-	cd ${S}/src
-	epatch ${FILESDIR}/gaim-0.83cvs-gtkcellrendererprogress.diff
-}
-
-src_compile() {
-	# Stabilize things, for your own good
-	strip-flags
-	replace-flags -O? -O2
-
-	# -msse2 doesn't play nice on gcc 3.2
-	[ "`gcc-version`" == "3.2" ] && filter-flags -msse2
-
-	local myconf
-	use debug && myconf="${myconf} --enable-debug"
-	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"
-	use evo || myconf="${myconf} --disable-gevolution"
-
-	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 silc ; then
-		myconf="${myconf} --with-silc-includes=/usr/include/silc-toolkit"
-		myconf="${myconf} --with-silc-libs=/usr/lib"
-	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() {
-	print_gaim_warning
-}
diff --git a/net-im/gaim/gaim-1.0.0.ebuild b/net-im/gaim/gaim-1.0.0.ebuild
deleted file mode 100644
index 608af6fe67b3..000000000000
--- a/net-im/gaim/gaim-1.0.0.ebuild
+++ /dev/null
@@ -1,108 +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-1.0.0.ebuild,v 1.14 2004/10/20 18:33:39 vapier Exp $
-
-inherit flag-o-matic eutils gcc debug
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ~mips ppc sparc x86"
-IUSE="nls perl spell nas crypt cjk gnutls silc evo debug"
-
-DEPEND=">=x11-libs/gtk+-2.0
-	>=dev-libs/glib-2.0
-	nas? ( >=media-libs/nas-1.4.1-r1 )
-	dev-util/pkgconfig
-	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 )
-	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
-	evo? ( mail-client/evolution )
-	!<x11-plugins/gaim-rhythmbox-${PV}"
-
-PDEPEND="crypt? ( >=x11-plugins/gaim-encryption-2.31 )"
-
-print_gaim_warning() {
-	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
-	einfo
-	einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS."
-	einfo
-	ebeep 5
-	epause 3
-}
-
-pkg_setup() {
-	print_gaim_warning
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use cjk && epatch ${FILESDIR}/gaim-0.76-xinput.patch
-	epatch ${FILESDIR}/gaim-1.0.1cvs-jabber-roomlist.diff
-}
-
-src_compile() {
-	# Stabilize things, for your own good
-	strip-flags
-	replace-flags -O? -O2
-
-	# -msse2 doesn't play nice on gcc 3.2
-	[ "`gcc-version`" == "3.2" ] && filter-flags -msse2
-
-	local myconf
-	use debug && myconf="${myconf} --enable-debug"
-	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"
-	use evo || myconf="${myconf} --disable-gevolution"
-
-	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
-
-	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() {
-	print_gaim_warning
-}
diff --git a/net-im/gaim/gaim-1.0.1.ebuild b/net-im/gaim/gaim-1.0.1.ebuild
deleted file mode 100644
index 1b8bd7d80be9..000000000000
--- a/net-im/gaim/gaim-1.0.1.ebuild
+++ /dev/null
@@ -1,106 +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-1.0.1.ebuild,v 1.3 2004/10/20 18:33:39 vapier Exp $
-
-inherit flag-o-matic eutils gcc debug
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
-IUSE="nls perl spell nas crypt cjk gnutls silc eds debug"
-
-DEPEND=">=x11-libs/gtk+-2.0
-	>=dev-libs/glib-2.0
-	nas? ( >=media-libs/nas-1.4.1-r1 )
-	dev-util/pkgconfig
-	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 )
-	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
-	eds? ( gnome-extra/evolution-data-server )"
-
-PDEPEND="crypt? ( >=x11-plugins/gaim-encryption-2.31 )"
-
-print_gaim_warning() {
-	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
-	einfo
-	einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS."
-	einfo
-	ebeep 5
-	epause 3
-}
-
-pkg_setup() {
-	print_gaim_warning
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use cjk && epatch ${FILESDIR}/gaim-0.76-xinput.patch
-}
-
-src_compile() {
-	# Stabilize things, for your own good
-	strip-flags
-	replace-flags -O? -O2
-
-	# -msse2 doesn't play nice on gcc 3.2
-	[ "`gcc-version`" == "3.2" ] && filter-flags -msse2
-
-	local myconf
-	use debug && myconf="${myconf} --enable-debug"
-	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"
-	use eds || myconf="${myconf} --disable-gevolution"
-
-	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
-
-	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/nss"
-
-	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() {
-	print_gaim_warning
-}