Pruning obsolete ebuilds and patch files

21 files changed, 10 insertions, 1023 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 9d912604dfa4..b0ec5a1466dc 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.135 2004/02/26 14:02:03 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.136 2004/02/26 23:04:30 rizzo Exp $
+
+  26 Feb 2004; Don Seiler <rizzo@gentoo.org>; gaim-0.72-r1.ebuild,
+  gaim-0.72-r2.ebuild, gaim-0.72.ebuild, gaim-0.74-r2.ebuild,
+  gaim-0.75-r5.ebuild, gaim-0.75-r6.ebuild, gaim-0.75-r7.ebuild,
+  files/gaim-0.72-msn-fixes.patch, files/gaim-0.74-log_free.patch,
+  files/gaim-0.74-scs-msg-yahoo.patch,
+  files/gaim-encryption-2.18-moz1.6.patch, files/gaim_cjk_gtkconv.patch,
+  files/gaim_gtkimcontext_patch.diff:
+  Pruning obsolete ebuilds and patch files
 
   26 Feb 2004; Gustavo Zacarias <gustavoz@gentoo.org> gaim-0.75-r8.ebuild:
   stable on hppa
diff --git a/net-im/gaim/files/digest-gaim-0.72 b/net-im/gaim/files/digest-gaim-0.72
deleted file mode 100644
index 4f8a236d8d61..000000000000
--- a/net-im/gaim/files/digest-gaim-0.72
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2eb9478126ffc76b9a5f3cbf7cd82062 gaim-0.72.tar.bz2 3165345
-MD5 c82fe0e745259ba479975f820610a3a9 gaim-encryption-2.16.tar.gz 316688
diff --git a/net-im/gaim/files/digest-gaim-0.72-r1 b/net-im/gaim/files/digest-gaim-0.72-r1
deleted file mode 100644
index bd08cc5b99b3..000000000000
--- a/net-im/gaim/files/digest-gaim-0.72-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2eb9478126ffc76b9a5f3cbf7cd82062 gaim-0.72.tar.bz2 3165345
-MD5 c7cea5b99b2e05f083db77032b0457d5 gaim-encryption-2.17.tar.gz 316928
diff --git a/net-im/gaim/files/digest-gaim-0.72-r2 b/net-im/gaim/files/digest-gaim-0.72-r2
deleted file mode 100644
index bd08cc5b99b3..000000000000
--- a/net-im/gaim/files/digest-gaim-0.72-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2eb9478126ffc76b9a5f3cbf7cd82062 gaim-0.72.tar.bz2 3165345
-MD5 c7cea5b99b2e05f083db77032b0457d5 gaim-encryption-2.17.tar.gz 316928
diff --git a/net-im/gaim/files/digest-gaim-0.74-r2 b/net-im/gaim/files/digest-gaim-0.74-r2
deleted file mode 100644
index 4ececc879fff..000000000000
--- a/net-im/gaim/files/digest-gaim-0.74-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 9af9287a96acea2b8a8937cfc9122412 gaim-0.74.tar.bz2 3285757
-MD5 89bd43aac89b2358f0445ee8844cf955 gaim-encryption-2.18.tar.gz 320321
diff --git a/net-im/gaim/files/digest-gaim-0.75-r5 b/net-im/gaim/files/digest-gaim-0.75-r5
deleted file mode 100644
index 63510235452c..000000000000
--- a/net-im/gaim/files/digest-gaim-0.75-r5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9935155985c25dfc9b59183de0da3c30 gaim-0.75.tar.bz2 3370977
diff --git a/net-im/gaim/files/digest-gaim-0.75-r6 b/net-im/gaim/files/digest-gaim-0.75-r6
deleted file mode 100644
index 63510235452c..000000000000
--- a/net-im/gaim/files/digest-gaim-0.75-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9935155985c25dfc9b59183de0da3c30 gaim-0.75.tar.bz2 3370977
diff --git a/net-im/gaim/files/digest-gaim-0.75-r7 b/net-im/gaim/files/digest-gaim-0.75-r7
deleted file mode 100644
index 63510235452c..000000000000
--- a/net-im/gaim/files/digest-gaim-0.75-r7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9935155985c25dfc9b59183de0da3c30 gaim-0.75.tar.bz2 3370977
diff --git a/net-im/gaim/files/gaim-0.72-msn-fixes.patch b/net-im/gaim/files/gaim-0.72-msn-fixes.patch
deleted file mode 100644
index 8d5642cd59ec..000000000000
--- a/net-im/gaim/files/gaim-0.72-msn-fixes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ruN gaim-0.72.orig/src/protocols/msn/msn.c gaim-0.72/src/protocols/msn/msn.c
---- gaim-0.72.orig/src/protocols/msn/msn.c	2003-10-24 00:46:01.000000000 -0500
-+++ gaim-0.72/src/protocols/msn/msn.c	2003-11-20 21:35:17.000000000 -0600
-@@ -854,6 +854,13 @@
- 	}
- 
- 	gaim_privacy_permit_add(gc->account, who, TRUE);
-+
-+    g_snprintf(buf, sizeof(buf), "AL %s", who);
-+
-+    if (!msn_servconn_send_command(session->notification_conn, "ADD", buf)) {
-+        gaim_connection_error(gc, _("Write error"));
-+        return;
-+    }
- }
- 
- static void
-diff -ruN gaim-0.72.orig/src/protocols/msn/notification.c gaim-0.72/src/protocols/msn/notification.c
---- gaim-0.72.orig/src/protocols/msn/notification.c	2003-10-30 16:27:36.000000000 -0600
-+++ gaim-0.72/src/protocols/msn/notification.c	2003-11-20 21:36:40.000000000 -0600
-@@ -345,7 +345,7 @@
- 	request_str = g_strdup_printf(
- 		"GET %s HTTP/1.1\r\n"
- 		"Authorization: Passport1.4 OrgVerb=GET,OrgURL=%s,sign-in=%s,pwd=%s,"
--		"lc=%s,id=%s,tw=%s,fs=%s,ct=%s,kpp=%s,kv=%s,ver=%s,tpf=%s\r\n"
-+		"lc=%s,id=%s,tw=%s,fs=%s,ru=%s,ct=%s,kpp=%s,kv=%s,ver=%s,tpf=%s\r\n"
- 		"User-Agent: MSMSGS\r\n"
- 		"Host: %s\r\n"
- 		"Connection: Keep-Alive\r\n"
-@@ -358,6 +358,7 @@
- 		(char *)g_hash_table_lookup(session->ssl_challenge_data, "id"),
- 		(char *)g_hash_table_lookup(session->ssl_challenge_data, "tw"),
- 		(char *)g_hash_table_lookup(session->ssl_challenge_data, "fs"),
-+		(char *)g_hash_table_lookup(session->ssl_challenge_data, "ru"),
- 		(char *)g_hash_table_lookup(session->ssl_challenge_data, "ct"),
- 		(char *)g_hash_table_lookup(session->ssl_challenge_data, "kpp"),
- 		(char *)g_hash_table_lookup(session->ssl_challenge_data, "kv"),
diff --git a/net-im/gaim/files/gaim-0.74-log_free.patch b/net-im/gaim/files/gaim-0.74-log_free.patch
deleted file mode 100644
index d8529f16efda..000000000000
--- a/net-im/gaim/files/gaim-0.74-log_free.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Index: plugins/history.c
-===================================================================
-RCS file: /cvsroot/gaim/gaim/plugins/history.c,v
-retrieving revision 1.29
-diff -u -r1.29 history.c
---- plugins/history.c	30 Nov 2003 04:33:15 -0000	1.29
-+++ plugins/history.c	1 Dec 2003 23:09:47 -0000
-@@ -44,8 +44,7 @@
- 	while (logs) {
- 		GaimLog *log = logs->data;
- 		GList *logs2;
--		g_free(log->name);
--		g_free(log);
-+	    gaim_log_free(log);
- 		logs2 = logs->next;
- 		g_list_free_1(logs);
- 		logs = logs2;
-Index: src/gtklog.c
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/gtklog.c,v
-retrieving revision 1.9
-diff -u -r1.9 gtklog.c
---- src/gtklog.c	1 Dec 2003 00:09:48 -0000	1.9
-+++ src/gtklog.c	1 Dec 2003 23:09:47 -0000
-@@ -119,8 +119,7 @@
- 	while (lv->logs) {
- 		GaimLog *log = lv->logs->data;
- 		GList *logs2;
--		g_free(log->name);
--		g_free(log);
-+		gaim_log_free(log);
- 		logs2 = lv->logs->next;
- 		g_list_free_1(lv->logs);
- 		lv->logs = logs2;
-Index: src/log.c
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/log.c,v
-retrieving revision 1.69
-diff -u -r1.69 log.c
---- src/log.c	1 Dec 2003 00:09:48 -0000	1.69
-+++ src/log.c	1 Dec 2003 23:09:47 -0000
-@@ -100,8 +100,7 @@
- 		GList *logs2 = logs->next;
- 		GaimLog *log = (GaimLog*)(logs->data);
- 		size += gaim_log_get_size(log);
--		g_free(log->name);
--		g_free(log);
-+		gaim_log_free(log);
- 		g_list_free_1(logs);
- 		logs = logs2;
- 	}
diff --git a/net-im/gaim/files/gaim-0.74-scs-msg-yahoo.patch b/net-im/gaim/files/gaim-0.74-scs-msg-yahoo.patch
deleted file mode 100644
index 3e810807e43e..000000000000
--- a/net-im/gaim/files/gaim-0.74-scs-msg-yahoo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/gaimrc.c.orig	2004-01-01 23:42:02.576417568 -0700
-+++ src/gaimrc.c	2004-01-01 23:43:24.243002360 -0700
-@@ -665,7 +665,7 @@
- 		/* Yahoo! */
- 		case GAIM_PROTO_YAHOO:
- 			if (*p->value[3] == '\0')
--				gaim_account_set_string(account, "server", "scs.yahoo.com");
-+				gaim_account_set_string(account, "server", "scs.msg.yahoo.com");
- 			else
- 				gaim_account_set_string(account, "server", p->value[3]);
- 
---- src/protocols/yahoo/yahoo.c.orig	2004-01-01 23:42:35.649389712 -0700
-+++ src/protocols/yahoo/yahoo.c	2004-01-01 23:43:03.828105896 -0700
-@@ -52,7 +52,7 @@
- 
- #define USEROPT_MAIL 0
- 
--#define YAHOO_PAGER_HOST "scs.yahoo.com"
-+#define YAHOO_PAGER_HOST "scs.msg.yahoo.com"
- #define YAHOO_PAGER_PORT 5050
- #define YAHOO_PROFILE_URL "http://profiles.yahoo.com/"
- 
diff --git a/net-im/gaim/files/gaim-encryption-2.18-moz1.6.patch b/net-im/gaim/files/gaim-encryption-2.18-moz1.6.patch
deleted file mode 100644
index 951be1f6a755..000000000000
--- a/net-im/gaim/files/gaim-encryption-2.18-moz1.6.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-Index: nss_oaep.c
-===================================================================
-RCS file: /cvsroot/gaim-encryption/encrypt/nss_oaep.c,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -u -r1.2 -r1.3
---- nss_oaep.c	29 Jun 2003 21:25:28 -0000	1.2
-+++ nss_oaep.c	1 Jan 2004 20:46:07 -0000	1.3
-@@ -20,7 +20,6 @@
-  */
- 
- #include "pk11func.h"
--#include "secrng.h"
- #include "keyhi.h"
- 
- /* for g_assert; PORT_Assert seems disabled... */
-Index: nss_pss.c
-===================================================================
-RCS file: /cvsroot/gaim-encryption/encrypt/nss_pss.c,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -r1.3 -r1.4
---- nss_pss.c	4 Jul 2003 23:30:29 -0000	1.3
-+++ nss_pss.c	1 Jan 2004 20:46:07 -0000	1.4
-@@ -20,7 +20,6 @@
-  */
- 
- #include "pk11func.h"
--#include "secrng.h"
- #include "keyhi.h"
- 
- /* for g_assert; PORT_Assert seems disabled... */
-Index: rsa_nss.c
-===================================================================
-RCS file: /cvsroot/gaim-encryption/encrypt/rsa_nss.c,v
-retrieving revision 1.24
-retrieving revision 1.25
-diff -u -r1.24 -r1.25
---- rsa_nss.c	20 Dec 2003 14:57:45 -0000	1.24
-+++ rsa_nss.c	1 Jan 2004 20:46:07 -0000	1.25
-@@ -29,7 +29,6 @@
- #include <nspr.h>
- #include <nss.h>
- #include <pk11func.h>
--#include <secrng.h>
- #include <keyhi.h>
- #include <nssb64.h>
- 
-@@ -440,8 +439,9 @@
-    const CK_MECHANISM_TYPE SymEncryptionType = CKM_DES3_CBC_PAD;
-    PK11SlotInfo *symSlot;
-    PK11SymKey *symKey;
-+   SECItem *pubKeyValue;
-    SECItem symKeyItem;  /* storage space for binary key import */
--   unsigned char symKeyData[32] = {0};
-+   unsigned char symKeyData[24] = {0};
-    SECItem *iv = 0, *wrappedKey = 0, label;
-    CK_ATTRIBUTE_TYPE attribs[3] = { CKA_SIGN, CKA_DECRYPT, CKA_SIGN_RECOVER };
-    const int NumAttribs = 3;
-@@ -454,6 +454,7 @@
-    /* NNNN is the Base64 encoding of the IV, and                      */
-    /* MMMM is the Base64 encoding of the encrypted private key        */
- 
-+
-    key->proto = rsa_nss_proto;
-    
-    split_key = g_strsplit(key_str, ",", 3);
-@@ -546,6 +547,8 @@
-       return 0;
-    }
- 
-+   pubKeyValue = SECITEM_DupItem(&key->store.rsa_nss.pub->u.rsa.modulus);
-+
-    symSlot = PK11_GetBestSlot(SymEncryptionType, NULL);
-    g_assert(symSlot != 0);
-    
-@@ -554,17 +557,30 @@
-    
-    symKey  = PK11_ImportSymKey(symSlot, PK11_GetKeyGen(SymEncryptionType),
-                                PK11_OriginUnwrap, CKA_WRAP, &symKeyItem, NULL);
--   
-+
-+   if (!symKey) {
-+      gaim_debug(GAIM_DEBUG_ERROR, "gaim-encryption",
-+                 "Error creating symmetric key: unable to load private key\n");
-+      g_strfreev(split_key);
-+
-+      SECKEY_DestroyPublicKey(key->store.rsa_nss.pub);
-+      SECITEM_FreeItem (pubKeyValue, PR_TRUE);
-+      g_free(key);
-+      return 0;
-+   }
-+
-    label.data = NULL; label.len = 0;
- 
-    key->store.rsa_nss.priv =
-       PK11_UnwrapPrivKey(symSlot, symKey, SymEncryptionType, iv,
--                         wrappedKey, &label, &(key->store.rsa_nss.pub->u.rsa.modulus),
-+                         wrappedKey, &label, pubKeyValue,
-                          PR_FALSE, PR_FALSE, CKK_RSA, attribs, NumAttribs, 0);
-    
-+   SECITEM_FreeItem (pubKeyValue, PR_TRUE);
-+
-    if (key->store.rsa_nss.priv == 0) {
-       gaim_debug(GAIM_DEBUG_ERROR, "gaim-encryption", 
--                 "Error decoding RSANSS Public key\n");
-+                 "Error decoding RSANSS Private key\n");
-       g_strfreev(split_key);
- 
-       SECKEY_DestroyPublicKey(key->store.rsa_nss.pub);
diff --git a/net-im/gaim/files/gaim_cjk_gtkconv.patch b/net-im/gaim/files/gaim_cjk_gtkconv.patch
deleted file mode 100644
index 9b94bcfacad3..000000000000
--- a/net-im/gaim/files/gaim_cjk_gtkconv.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -uNr gaim-0.72.orig/src/gtkconv.c gaim-0.72/src/gtkconv.c
---- gaim-0.72.orig/src/gtkconv.c	2003-09-07 01:22:47.000000000 +0900
-+++ gaim-0.72/src/gtkconv.c	2003-09-07 01:25:08.000000000 +0900
-@@ -1136,12 +1136,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_gtkimcontext_patch.diff b/net-im/gaim/files/gaim_gtkimcontext_patch.diff
deleted file mode 100644
index ec548e080c35..000000000000
--- a/net-im/gaim/files/gaim_gtkimcontext_patch.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- gtkconv.c	2003-07-18 09:57:39.000000000 +0900
-+++ gtkconv.c.new	2003-08-03 23:11:17.000000000 +0900
-@@ -1134,12 +1134,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_Escape) {
- 		if (gaim_prefs_get_bool("/gaim/gtk/conversations/escape_closes")) {
- 			g_signal_stop_emission_by_name(G_OBJECT(entry), "key_press_event");
diff --git a/net-im/gaim/gaim-0.72-r1.ebuild b/net-im/gaim/gaim-0.72-r1.ebuild
deleted file mode 100644
index 8f4f1d7715db..000000000000
--- a/net-im/gaim/gaim-0.72-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.72-r1.ebuild,v 1.9 2004/01/26 09:11:52 vapier Exp $
-
-inherit eutils
-
-IUSE="nls perl spell nas ssl cjk"
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-EV=2.17
-SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2
-	ssl? ( mirror://sourceforge/gaim-encryption/gaim-encryption-${EV}.tar.gz )"
-RESTRICT="nomirror"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc ~amd64"
-
-DEPEND="=sys-libs/db-1*
-	>=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 )
-	dev-libs/nss
-	spell? ( >=app-text/gtkspell-2.0.2 )"
-
-src_unpack() {
-	unpack ${A} || die
-	use cjk && epatch ${FILESDIR}/gaim_cjk_gtkconv.patch
-
-	use ssl && {
-		cd ${S}/plugins
-		unpack gaim-encryption-${EV}.tar.gz
-	}
-}
-
-src_compile() {
-
-	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"
-	myconf="${myconf} --with-nspr-includes=/usr/include/nspr"
-	myconf="${myconf} --with-nss-includes=/usr/include/nss"
-
-	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"
-
-	use ssl && {
-		local myencconf
-		cd ${S}/plugins/gaim-encryption-${EV}
-
-		myencconf="${myencconf} --with-nspr-includes=/usr/include/nspr"
-		myencconf="${myencconf} --with-nss-includes=/usr/include/nss"
-		econf ${myencconf} || die "Configuration failed for encryption"
-		emake || die "Make failed for encryption"
-	}
-}
-
-src_install() {
-	einstall || die "Install failed"
-	use ssl && {
-		cd ${S}/plugins/gaim-encryption-${EV}
-		einstall || die "Install failed for encryption"
-		cd ${S}
-	}
-	dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
-}
-
-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
-
-	if [ `use ssl` ]; then
-		ewarn
-		ewarn "You have chosen (by selecting 'USE=ssl') to install"
-		ewarn "the gaim-encryption plugin ( http://gaim-encryption.sf.net/ )"
-		ewarn "this plugin is NOT supported by the Gaim project, and if you"
-		ewarn "expierence problems related to it, contact the Gentoo project"
-		ewarn "via http://bugs.gentoo.org/ or the gaim-encryption project."
-	fi
-}
diff --git a/net-im/gaim/gaim-0.72-r2.ebuild b/net-im/gaim/gaim-0.72-r2.ebuild
deleted file mode 100644
index ac2c70638646..000000000000
--- a/net-im/gaim/gaim-0.72-r2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.72-r2.ebuild,v 1.7 2004/01/26 09:11:52 vapier Exp $
-
-inherit eutils
-
-IUSE="nls perl spell nas ssl cjk mozilla"
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-EV=2.17
-SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2
-	ssl? ( mirror://sourceforge/gaim-encryption/gaim-encryption-${EV}.tar.gz )"
-RESTRICT="nomirror"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~amd64"
-
-DEPEND="=sys-libs/db-1*
-	>=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 )
-	mozilla? ( net-www/mozilla )
-	!mozilla? ( dev-libs/nss )
-	spell? ( >=app-text/gtkspell-2.0.2 )"
-
-src_unpack() {
-	unpack ${A} || die
-	epatch ${FILESDIR}/gaim-0.72-msn-fixes.patch
-
-	use cjk && epatch ${FILESDIR}/gaim_cjk_gtkconv.patch
-
-	use ssl && {
-		cd ${S}/plugins
-		unpack gaim-encryption-${EV}.tar.gz
-	}
-}
-
-src_compile() {
-
-	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 mozilla` ]; then
-		NSS_LIB=/usr/lib/mozilla
-		NSS_INC=/usr/lib/mozilla/include
-	else
-		NSS_LIB=/usr/lib
-		NSS_INC=/usr/include
-	fi
-
-	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"
-
-	use ssl && {
-		local myencconf
-		cd ${S}/plugins/gaim-encryption-${EV}
-
-		myencconf="${myencconf} --with-nspr-includes=${NSS_INC}/nspr"
-		myencconf="${myencconf} --with-nss-includes=${NSS_INC}/nss"
-		myencconf="${myencconf} --with-nspr-libs=${NSS_LIB}"
-		myencconf="${myencconf} --with-nss-libs=${NSS_LIB}"
-		econf ${myencconf} || die "Configuration failed for encryption"
-		emake || die "Make failed for encryption"
-	}
-}
-
-src_install() {
-	einstall || die "Install failed"
-	use ssl && {
-		cd ${S}/plugins/gaim-encryption-${EV}
-		einstall || die "Install failed for encryption"
-		cd ${S}
-	}
-	dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
-}
-
-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
-
-	if [ `use ssl` ]; then
-		ewarn
-		ewarn "You have chosen (by selecting 'USE=ssl') to install"
-		ewarn "the gaim-encryption plugin ( http://gaim-encryption.sf.net/ )"
-		ewarn "this plugin is NOT supported by the Gaim project, and if you"
-		ewarn "expierence problems related to it, contact the Gentoo project"
-		ewarn "via http://bugs.gentoo.org/ or the gaim-encryption project."
-	fi
-}
diff --git a/net-im/gaim/gaim-0.72.ebuild b/net-im/gaim/gaim-0.72.ebuild
deleted file mode 100644
index 8ddb005c8377..000000000000
--- a/net-im/gaim/gaim-0.72.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.72.ebuild,v 1.4 2004/01/27 17:53:28 bazik Exp $
-
-IUSE="nls perl spell nas ssl"
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-EV=2.16
-SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2
-	ssl? ( mirror://sourceforge/gaim-encryption/gaim-encryption-${EV}.tar.gz )"
-RESTRICT="nomirror"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
-
-DEPEND="=sys-libs/db-1*
-	>=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 )
-	dev-libs/nss
-	spell? ( >=app-text/gtkspell-2.0.2 )"
-
-src_unpack() {
-	unpack ${A} || die
-	use ssl && {
-		cd ${S}/plugins
-		unpack gaim-encryption-${EV}.tar.gz
-	}
-}
-
-src_compile() {
-
-	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"
-	myconf="${myconf} --with-nspr-includes=/usr/include/nspr"
-	myconf="${myconf} --with-nss-includes=/usr/include/nss"
-
-	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"
-
-	use ssl && {
-		local myencconf
-		cd ${S}/plugins/gaim-encryption-${EV}
-
-		myencconf="${myencconf} --with-nspr-includes=/usr/include/nspr"
-		myencconf="${myencconf} --with-nss-includes=/usr/include/nss"
-		econf ${myencconf} || die "Configuration failed for encryption"
-		emake || die "Make failed for encryption"
-	}
-}
-
-src_install() {
-	einstall || die "Install failed"
-	use ssl && {
-		cd ${S}/plugins/gaim-encryption-${EV}
-		einstall || die "Install failed for encryption"
-		cd ${S}
-	}
-	dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
-}
-
-pkg_postinst() {
-	if [ `use ssl` ]; then
-		ewarn
-		ewarn "You have chosen (by selecting 'USE=ssl') to install"
-		ewarn "the gaim-encryption plugin ( http://gaim-encryption.sf.net/ )"
-		ewarn "this plugin is NOT supported by the Gaim project, and if you"
-		ewarn "expierence problems related to it, contact the Gentoo project"
-		ewarn "via http://bugs.gentoo.org/ or the gaim-encryption project."
-	fi
-}
diff --git a/net-im/gaim/gaim-0.74-r2.ebuild b/net-im/gaim/gaim-0.74-r2.ebuild
deleted file mode 100644
index 8325b492428d..000000000000
--- a/net-im/gaim/gaim-0.74-r2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.74-r2.ebuild,v 1.2 2004/01/26 09:11:52 vapier Exp $
-
-inherit eutils
-
-IUSE="nls perl spell nas ssl mozilla cjk debug"
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-EV=2.18
-SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2
-	ssl? ( mirror://sourceforge/gaim-encryption/gaim-encryption-${EV}.tar.gz )"
-RESTRICT="nomirror"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
-
-DEPEND="=sys-libs/db-1*
-	>=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 )
-	mozilla? ( net-www/mozilla )
-	!mozilla? ( dev-libs/nss )
-	spell? ( >=app-text/gtkspell-2.0.2 )"
-
-src_unpack() {
-	unpack ${P}.tar.bz2 || die
-	cd ${S}
-	epatch ${FILESDIR}/gaim-0.74-log_free.patch
-	epatch ${FILESDIR}/gaim-0.74-scs-msg-yahoo.patch
-	use cjk && epatch ${FILESDIR}/gaim-0.74_cjk_gtkconv.patch
-
-	use ssl && {
-		cd ${S}/plugins
-		unpack gaim-encryption-${EV}.tar.gz
-		cd ${S}/plugins/gaim-encryption-${EV}
-		epatch ${FILESDIR}/gaim-encryption-2.18-moz1.6.patch
-	}
-}
-
-src_compile() {
-
-	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 debug  && myconf="${myconf} --enable-debug"
-
-	NSS_LIB=/usr/lib
-	NSS_INC=/usr/include
-	use mozilla || {
-		# 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
-
-	einfo "Replacing -Os CFLAG with -O2"
-	replace-flags -Os -O2
-
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
-
-	use ssl && {
-		local myencconf
-		cd ${S}/plugins/gaim-encryption-${EV}
-
-		use mozilla || {
-			# Only need to specify this if no pkgconfig from mozilla
-			myencconf="${myencconf} --with-nspr-includes=${NSS_INC}/nspr"
-			myencconf="${myencconf} --with-nss-includes=${NSS_INC}/nss"
-			myencconf="${myencconf} --with-nspr-libs=${NSS_LIB}"
-			myencconf="${myencconf} --with-nss-libs=${NSS_LIB}"
-		}
-		econf ${myencconf} || die "Configuration failed for encryption"
-		emake || die "Make failed for encryption"
-	}
-}
-
-src_install() {
-	einstall || die "Install failed"
-	use ssl && {
-		cd ${S}/plugins/gaim-encryption-${EV}
-		einstall || die "Install failed for encryption"
-		cd ${S}
-	}
-	dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
-}
-
-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
-
-	if [ `use ssl` ]; then
-		ewarn
-		ewarn "You have chosen (by selecting 'USE=ssl') to install"
-		ewarn "the gaim-encryption plugin ( http://gaim-encryption.sf.net/ )"
-		ewarn "this plugin is NOT supported by the Gaim project, and if you"
-		ewarn "expierence problems related to it, contact the Gentoo project"
-		ewarn "via http://bugs.gentoo.org/ or the gaim-encryption project."
-		ewarn
-	fi
-
-	einfo
-	einfo "Yahoo! has changed their IM server.  Existing profiles should"
-	einfo "change the server for their Yahoo! IM accounts to scs.msg.yahoo.com"
-	einfo
-}
diff --git a/net-im/gaim/gaim-0.75-r5.ebuild b/net-im/gaim/gaim-0.75-r5.ebuild
deleted file mode 100644
index a8be616bb2d1..000000000000
--- a/net-im/gaim/gaim-0.75-r5.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.75-r5.ebuild,v 1.5 2004/01/26 09:11:52 vapier Exp $
-
-inherit flag-o-matic eutils
-
-IUSE="nls perl spell nas mozilla cjk debug ssl"
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2"
-RESTRICT="nomirror"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
-
-DEPEND="=sys-libs/db-1*
-	>=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 )
-	mozilla? ( net-www/mozilla )
-	!mozilla? ( dev-libs/nss )
-	spell? ( >=app-text/gtkspell-2.0.2 )"
-PDEPEND="ssl? ( net-im/gaim-encryption )"
-
-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
-	use cjk && epatch ${FILESDIR}/gaim-0.74_cjk_gtkconv.patch
-}
-
-src_compile() {
-	einfo "Replacing -Os CFLAG with -O2"
-	replace-flags -Os -O2
-	einfo "Filtering -fstack-protector"
-	filter-flags -fstack-protector
-
-	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 debug  && myconf="${myconf} --enable-debug"
-
-	NSS_LIB=/usr/lib
-	NSS_INC=/usr/include
-	use mozilla || {
-		# 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
-
-	if [ `use ssl` ]; then
-		einfo
-		einfo "The gaim-encryption package is now it's own package in portage"
-		einfo "To install it run:"
-		einfo
-		einfo "emerge gaim-encryption"
-		einfo
-		einfo "All of your existing gaim-encryption settings are still"
-		einfo "in place and will be recognized when gaim-encryption is"
-		einfo "installed.  You may need to re-enable gaim-encryption in"
-		einfo "your gaim preferences."
-		einfo
-	fi
-}
diff --git a/net-im/gaim/gaim-0.75-r6.ebuild b/net-im/gaim/gaim-0.75-r6.ebuild
deleted file mode 100644
index 245a59b95528..000000000000
--- a/net-im/gaim/gaim-0.75-r6.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.75-r6.ebuild,v 1.2 2004/01/26 09:11:52 vapier Exp $
-
-inherit flag-o-matic eutils
-
-IUSE="nls perl spell nas mozilla cjk debug ssl"
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2"
-RESTRICT="nomirror"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
-
-DEPEND="=sys-libs/db-1*
-	>=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 )
-	mozilla? ( net-www/mozilla )
-	!mozilla? ( dev-libs/nss )
-	spell? ( >=app-text/gtkspell-2.0.2 )"
-PDEPEND="ssl? ( net-im/gaim-encryption )"
-
-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
-	use cjk && epatch ${FILESDIR}/gaim-0.74_cjk_gtkconv.patch
-}
-
-src_compile() {
-	einfo "Replacing -Os CFLAG with -O2"
-	replace-flags -Os -O2
-	einfo "Filtering -fstack-protector"
-	filter-flags -fstack-protector
-
-	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 debug  && myconf="${myconf} --enable-debug"
-
-	NSS_LIB=/usr/lib
-	NSS_INC=/usr/include
-	use mozilla || {
-		# 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
-
-	if [ `use ssl` ]; then
-		einfo
-		einfo "The gaim-encryption package is now it's own package in portage"
-		einfo "To install it run:"
-		einfo
-		einfo "emerge gaim-encryption"
-		einfo
-		einfo "All of your existing gaim-encryption settings are still"
-		einfo "in place and will be recognized when gaim-encryption is"
-		einfo "installed.  You may need to re-enable gaim-encryption in"
-		einfo "your gaim preferences."
-		einfo
-	fi
-}
diff --git a/net-im/gaim/gaim-0.75-r7.ebuild b/net-im/gaim/gaim-0.75-r7.ebuild
deleted file mode 100644
index bdb093acac57..000000000000
--- a/net-im/gaim/gaim-0.75-r7.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.75-r7.ebuild,v 1.5 2004/01/28 19:59:42 plasmaroo Exp $
-
-inherit flag-o-matic eutils
-
-IUSE="nls perl spell nas mozilla cjk debug ssl"
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2"
-RESTRICT="nomirror"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc ~amd64 ppc ~alpha ~ia64"
-
-DEPEND="=sys-libs/db-1*
-	>=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 )
-	mozilla? ( net-www/mozilla )
-	!mozilla? ( dev-libs/nss )
-	spell? ( >=app-text/gtkspell-2.0.2 )"
-PDEPEND="ssl? ( net-im/gaim-encryption )"
-
-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
-	use cjk && epatch ${FILESDIR}/gaim-0.74_cjk_gtkconv.patch
-}
-
-src_compile() {
-	einfo "Replacing -Os CFLAG with -O2"
-	replace-flags -Os -O2
-
-	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 debug  && myconf="${myconf} --enable-debug"
-
-	NSS_LIB=/usr/lib
-	NSS_INC=/usr/include
-	use mozilla || {
-		# 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
-
-	if [ `use ssl` ]; then
-		einfo
-		einfo "The gaim-encryption package is now it's own package in portage"
-		einfo "To install it run:"
-		einfo
-		einfo "emerge gaim-encryption"
-		einfo
-		einfo "All of your existing gaim-encryption settings are still"
-		einfo "in place and will be recognized when gaim-encryption is"
-		einfo "installed.  You may need to re-enable gaim-encryption in"
-		einfo "your gaim preferences."
-		einfo
-	fi
-}