Pruning what should be obsolete ebuilds

20 files changed, 7 insertions, 725 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index fa8065a01657..f10865253e73 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.105 2003/12/12 15:49:47 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.106 2003/12/12 20:03:17 rizzo Exp $
+
+  12 Dec 2003; Don Seiler <rizzo@gentoo.org>; gaim-0.66-r3.ebuild,
+  gaim-0.70-r2.ebuild, gaim-0.71-r2.ebuild, gaim-0.73-r1.ebuild,
+  gaim-0.73.ebuild, gaim-0.74.ebuild:
+  Pruning what should be obsolete ebuilds
 
   12 Dec 2003; Don Seiler <rizzo@gentoo.org>; gaim-0.74-r1.ebuild:
   Setting optimization flags for bug 29394
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index a68b185b07e4..aa84871ac48c 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,35 +1,17 @@
 MD5 488a1c05ab1585ddf75b78a6766f289c gaim-0.74-r1.ebuild 3482
 MD5 bed467c3e7077888cf4fd615c5f47678 gaim-0.67.ebuild 2185
 MD5 3dc9c94c6beb41d2314814297ff004ea gaim-0.72-r2.ebuild 3331
-MD5 fab79b2ce10b79dec1849c7e899ee07f gaim-0.73.ebuild 2968
-MD5 294ca46bf6894543e47b699cc2f35033 gaim-0.73-r1.ebuild 2971
-MD5 7f89f602fb6fe4954a39c6909cbf3333 gaim-0.71-r2.ebuild 2658
 MD5 00da5062575561e913be722ee23a1982 gaim-0.72-r1.ebuild 2890
-MD5 9319539d29d9fb3908789ccf6026d7db gaim-0.66-r3.ebuild 1991
 MD5 9c060fe66488650173c0a493e8744b0a gaim-0.72.ebuild 2508
-MD5 1a9b1940485519f26cffa675c833ca7d gaim-0.70-r2.ebuild 2506
-MD5 2e550197c15ea558c920079e6ac57e7f gaim-0.74.ebuild 3299
-MD5 66e322f1b89b5bd1b943788c32e67a4e ChangeLog 17319
+MD5 7a68a2262daeeda8ee1e219f6b12159f ChangeLog 17532
 MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481
-MD5 0eed93c71111c6031e5f35e10c54e125 files/gaim-0.73_cjk_gtkconv.patch 1128
 MD5 5993641de8d56c2c433f252997c3c39c files/digest-gaim-0.67 135
 MD5 e6a8773cabdf14d7422e573723258437 files/digest-gaim-0.72 135
-MD5 51bfe20915c99dba9b26a92e463b956b files/digest-gaim-0.73 135
-MD5 24bfb2bbc9bef27fcc0f46639504b1c5 files/digest-gaim-0.74 135
 MD5 fd4cd0957e11c11fc6e0c72e10714e07 files/gaim-0.74-log_free.patch 1492
 MD5 1ade161b6a07868398812aa91ac7115d files/gaim_cjk_gtkconv.patch 1126
-MD5 eaec78ac2e19b5e10a20a2c86bf65a34 files/gaim-0.66-prefs.c.diff 598
-MD5 ac8c28584ee56def0cea65e38e235f0b files/digest-gaim-0.66-r3 126
-MD5 964ed187fa4d6e26816bf39aeb5cd8f1 files/digest-gaim-0.70-r2 135
-MD5 7b98aff453d6189397e4a822c69389f0 files/digest-gaim-0.71-r2 135
 MD5 58f03af2ad906ca7194b3a57c7648cf9 files/digest-gaim-0.72-r1 135
 MD5 58f03af2ad906ca7194b3a57c7648cf9 files/digest-gaim-0.72-r2 135
-MD5 7ad79542886f9c53682956d6ff2d4c75 files/digest-gaim-0.73-r1 135
 MD5 24bfb2bbc9bef27fcc0f46639504b1c5 files/digest-gaim-0.74-r1 135
 MD5 3eb868476154d28a1123ee91e41fef95 files/gaim-0.72-msn-fixes.patch 1671
 MD5 53302cc68bb7bef9803723e977010339 files/gaim-0.74_cjk_gtkconv.patch 1128
-MD5 0b625a0ccaa6c9ec3b7cde1b806fa87d files/gaim-0.71-icq-crash-hack.patch 1584
 MD5 97fa7a76f6bc96c363844ccc57b2bec4 files/gaim_gtkimcontext_patch.diff 1106
-MD5 8a38e88937de7dd9b0bd1cd18afd8164 files/gaim-encryption-2.10-keys.patch 476
-MD5 9854f11fcca9236626b451eb183e6b00 files/gaim-0.71-ipv6.patch 1499
-MD5 8207ea359084982a599aa71679eac261 files/gaim-0.71-jabber-strip.patch 844
diff --git a/net-im/gaim/files/digest-gaim-0.66-r3 b/net-im/gaim/files/digest-gaim-0.66-r3
deleted file mode 100644
index 23880debebfc..000000000000
--- a/net-im/gaim/files/digest-gaim-0.66-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 80c52fc8c969a65ea7bbd6444142fe5f gaim-0.66.tar.bz2 2744562
-MD5 03d3bdfe9eb1a73c44b0aa097513b10a encrypt-2.02.tar.gz 75136
diff --git a/net-im/gaim/files/digest-gaim-0.70-r2 b/net-im/gaim/files/digest-gaim-0.70-r2
deleted file mode 100644
index 971c5dabe72c..000000000000
--- a/net-im/gaim/files/digest-gaim-0.70-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 13ea95aa040ac5a58c3384709e495329 gaim-0.70.tar.bz2 3178790
-MD5 fe928761b0bd11afea3137ec202dc6ef gaim-encryption-2.14.tar.gz 315964
diff --git a/net-im/gaim/files/digest-gaim-0.71-r2 b/net-im/gaim/files/digest-gaim-0.71-r2
deleted file mode 100644
index 084a1f578eaa..000000000000
--- a/net-im/gaim/files/digest-gaim-0.71-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 89d1aeabdfcb16df479031b08ad5fb99 gaim-0.71.tar.bz2 3109536
-MD5 6a8f3e2b0d86cdd6e82af415949acff1 gaim-encryption-2.15.tar.gz 316444
diff --git a/net-im/gaim/files/digest-gaim-0.73 b/net-im/gaim/files/digest-gaim-0.73
deleted file mode 100644
index dcf26064b0bf..000000000000
--- a/net-im/gaim/files/digest-gaim-0.73
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b8c9a2c37d13e72badf28f1fa478f4bb gaim-0.73.tar.bz2 3242306
-MD5 c7cea5b99b2e05f083db77032b0457d5 gaim-encryption-2.17.tar.gz 316928
diff --git a/net-im/gaim/files/digest-gaim-0.73-r1 b/net-im/gaim/files/digest-gaim-0.73-r1
deleted file mode 100644
index 7ba85af8078a..000000000000
--- a/net-im/gaim/files/digest-gaim-0.73-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b8c9a2c37d13e72badf28f1fa478f4bb gaim-0.73.tar.bz2 3242306
-MD5 89bd43aac89b2358f0445ee8844cf955 gaim-encryption-2.18.tar.gz 320321
diff --git a/net-im/gaim/files/digest-gaim-0.74 b/net-im/gaim/files/digest-gaim-0.74
deleted file mode 100644
index 4ececc879fff..000000000000
--- a/net-im/gaim/files/digest-gaim-0.74
+++ /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/gaim-0.66-prefs.c.diff b/net-im/gaim/files/gaim-0.66-prefs.c.diff
deleted file mode 100644
index 4e02a02ffef0..000000000000
--- a/net-im/gaim/files/gaim-0.66-prefs.c.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-===================================================================
-RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
-retrieving revision 1.410
-retrieving revision 1.411
-diff -u -r1.410 -r1.411
---- gaim/gaim/src/prefs.c	2003/07/18 14:34:08	1.410
-+++ gaim/gaim/src/prefs.c	2003/07/24 05:32:53	1.411
-@@ -441,7 +441,9 @@
- 			return;
- 		}
- 
--		if(strcmp(pref->value.string, value)) {
-+		if((value && !pref->value.string) ||
-+				(!value && pref->value.string) ||
-+				strcmp(pref->value.string, value)) {
- 			g_free(pref->value.string);
- 			pref->value.string = g_strdup(value);
- 			do_callbacks(name, pref);
diff --git a/net-im/gaim/files/gaim-0.71-icq-crash-hack.patch b/net-im/gaim/files/gaim-0.71-icq-crash-hack.patch
deleted file mode 100644
index 98f09f877d8f..000000000000
--- a/net-im/gaim/files/gaim-0.71-icq-crash-hack.patch
+++ /dev/null
@@ -1,36 +0,0 @@
- --- src/protocols/oscar/oscar.c	22 Oct 2003 03:32:21 -0000	1.485
- +++ src/protocols/oscar/oscar.c	24 Oct 2003 22:05:31 -0000
- @@ -4820,17 +4820,24 @@
-  						}
-  					} else {
-  						GaimGroup *g;
- -						buddy = gaim_buddy_new(gc->account, curitem->name, alias_utf8);
- -
- -						if (!(g = gaim_find_group(gname_utf8 ? gname_utf8 : _("Orphans")))) {
- -							g = gaim_group_new(gname_utf8 ? gname_utf8 : _("Orphans"));
- -							gaim_blist_add_group(g, NULL);
- +						/* cheesy hack to avoid startup crashes when adding buddies */
- +						if ( isdigit(curitem->name[0]) && !isdigit(curitem->name[strlen(curitem->name) - 1]))
- +						{
- +							/* duplicated contact from new ICQ protocol, with a funky trailing char */
-  						}
- +						else {
- +							buddy = gaim_buddy_new(gc->account, curitem->name, alias_utf8);
- +
- +							if (!(g = gaim_find_group(gname_utf8 ? gname_utf8 : _("Orphans")))) {
- +								g = gaim_group_new(gname_utf8 ? gname_utf8 : _("Orphans"));
- +								gaim_blist_add_group(g, NULL);
- +							}
-  
- -						gaim_debug(GAIM_DEBUG_INFO, "oscar",
- -								   "ssi: adding buddy %s to group %s to local list\n", curitem->name, gname_utf8 ? gname_utf8 : _("Orphans"));
- -						gaim_blist_add_buddy(buddy, NULL, g, NULL);
- -						export = TRUE;
- +							gaim_debug(GAIM_DEBUG_INFO, "oscar",
- +								   	"ssi: adding buddy %s to group %s to local list\n", curitem->name, gname_utf8 ? gname_utf8 : _("Orphans"));
- +							gaim_blist_add_buddy(buddy, NULL, g, NULL);
- +							export = TRUE;
- +						}
-  					}
-  					g_free(gname_utf8);
-  					g_free(alias_utf8);
diff --git a/net-im/gaim/files/gaim-0.71-ipv6.patch b/net-im/gaim/files/gaim-0.71-ipv6.patch
deleted file mode 100644
index 5b2fe42e0ab7..000000000000
--- a/net-im/gaim/files/gaim-0.71-ipv6.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ur gaim-0.70/AUTHORS gaim-0.70.new/AUTHORS
---- gaim-0.70/AUTHORS	2003-09-23 21:33:40.000000000 -0700
-+++ gaim-0.70.new/AUTHORS	2003-10-17 09:37:57.000000000 -0700
-@@ -34,6 +34,7 @@
- Etan 'deryni' Reisner
- Ethan 'Paco-Paco' Blanton
- Robert 'Robot101' McQueen
-+Ryan 'red0x' Du Bois
- 
- Just Because:
- ------------
-Only in gaim-0.70: gaim.spec
-diff -ur gaim-0.70/src/protocols/oscar/ft.c gaim-0.70.new/src/protocols/oscar/ft.c
---- gaim-0.70/src/protocols/oscar/ft.c	2003-06-19 21:16:22.000000000 -0700
-+++ gaim-0.70.new/src/protocols/oscar/ft.c	2003-10-17 12:47:30.000000000 -0700
-@@ -258,7 +258,14 @@
- 	if ((acceptfd = accept(cur->fd, &addr, &addrlen)) == -1)
- 		return 0; /* not an error */
- 
--	if (addr.sa_family != AF_INET) { /* just in case IPv6 really is happening */
-+	/* red0x: ipv6 is handled transparently in glibc, just support ipv6 and ipv4 will follow... */
-+	/* leaving AF_INET only down here is what was breaking file transfers for me
-+	   as I have ipv6 support in kernel.  Anyone with ipv6 support in kernel
-+	   has most incoming ipv4 connections wrapped into ipv6 for the transparent
-+	   ipv6/ipv4 interroperability stuff in glibc.  If we deny ipv6 connections
-+	   then no one with that patch can send and receive files.  All I did was allow
-+	   ipv6 incoming, and unwrap the ipv4 inside it automagically */
-+	if (addr.sa_family != AF_INET && addr.sa_family != AF_INET6) { /* just in case IPv6 really is happening */
- 		close(acceptfd);
- 		aim_conn_close(cur);
- 		return -1;
diff --git a/net-im/gaim/files/gaim-0.71-jabber-strip.patch b/net-im/gaim/files/gaim-0.71-jabber-strip.patch
deleted file mode 100644
index 808ebb0024cb..000000000000
--- a/net-im/gaim/files/gaim-0.71-jabber-strip.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ruN gaim-0.71/src/protocols/jabber/message.c gaim-0.71-r1/src/protocols/jabber/message.c
---- gaim-0.71/src/protocols/jabber/message.c	2003-10-09 16:01:01.000000000 -0500
-+++ gaim-0.71-r1/src/protocols/jabber/message.c	2003-10-16 14:46:14.000000000 -0500
-@@ -228,13 +228,8 @@
- 		} else if(!strcmp(child->name, "body")) {
- 			if(!jm->body)
- 				jm->body = xmlnode_get_data(child);
--		} else if(!strcmp(child->name, "html") && child->child) {
--			/* check to see if the <html> actually contains anything,
--			 * otherwise we'll ignore it */
--			char *txt = xmlnode_get_data(child);
--			if(!jm->xhtml && txt)
-+		} else if(!strcmp(child->name, "html")) {
- 				jm->xhtml = xmlnode_to_str(child);
--			g_free(txt);
- 		} else if(!strcmp(child->name, "error")) {
- 			const char *code = xmlnode_get_attrib(child, "code");
- 			char *code_txt = NULL;
diff --git a/net-im/gaim/files/gaim-0.73_cjk_gtkconv.patch b/net-im/gaim/files/gaim-0.73_cjk_gtkconv.patch
deleted file mode 100644
index d09930da7fff..000000000000
--- a/net-im/gaim/files/gaim-0.73_cjk_gtkconv.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ruN gaim-0.73.orig/src/gtkconv.c gaim-0.73/src/gtkconv.c
---- gaim-0.73.orig/src/gtkconv.c	2003-11-21 12:12:55.000000000 -0600
-+++ gaim-0.73/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-encryption-2.10-keys.patch b/net-im/gaim/files/gaim-encryption-2.10-keys.patch
deleted file mode 100644
index e5bfe0e559a9..000000000000
--- a/net-im/gaim/files/gaim-encryption-2.10-keys.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- keys.orig	2003-09-04 12:47:12.000000000 -0500
-+++ keys.c	2003-09-04 12:47:20.000000000 -0500
-@@ -60,8 +60,8 @@
- 
- 
- crypt_key * GE_find_key_by_name(key_ring *ring, char *name) {
--   gaim_debug(GAIM_DEBUG_MISC, "gaim-encryption", "find key by name: %s\n", name);
-    key_ring *i = GE_find_key_node_by_name(ring, name);
-+   gaim_debug(GAIM_DEBUG_MISC, "gaim-encryption", "find key by name: %s\n", name);
-    return (i == NULL) ? NULL : ((key_ring_data *)i->data)->key;
- }
- 
diff --git a/net-im/gaim/gaim-0.66-r3.ebuild b/net-im/gaim/gaim-0.66-r3.ebuild
deleted file mode 100644
index e989a10e8671..000000000000
--- a/net-im/gaim/gaim-0.66-r3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.66-r3.ebuild,v 1.6 2003/11/04 07:36:21 kumba Exp $
-
-IUSE="nls perl spell nas ssl cjk"
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-EV=2.02
-SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2
-	ssl? ( mirror://sourceforge/gaim-encryption/encrypt-${EV}.tar.gz )"
-RESTRICT="nomirror"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~alpha sparc ~mips"
-
-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 )
-	ssl? ( dev-libs/nss )
-	spell? ( >=app-text/gtkspell-2.0.2 )"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd ${P}
-	epatch ${FILESDIR}/gaim-0.66-prefs.c.diff
-	use ssl && {
-		cd ${S}/plugins
-		unpack encrypt-${EV}.tar.gz
-		cd encrypt
-		epatch patchfile.0.66
-	}
-	use cjk && {
-		cd ${S}/src
-		epatch ${FILESDIR}/gaim_gtkimcontext_patch.diff
-	}
-}
-
-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"
-
-	econf ${myconf} || die "Configuration failed"
-	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
-}
-
-src_install() {
-	einstall || die "Install failed"
-	dodoc ABOUT-NLS AUTHORS HACKING INSTALL NEWS README TODO ChangeLog
-}
-
-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."
-		ewarn
-	fi
-}
diff --git a/net-im/gaim/gaim-0.70-r2.ebuild b/net-im/gaim/gaim-0.70-r2.ebuild
deleted file mode 100644
index 013a1a6e10bb..000000000000
--- a/net-im/gaim/gaim-0.70-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.70-r2.ebuild,v 1.3 2003/10/28 13:19:21 mholzer Exp $
-
-IUSE="nls perl spell nas ssl"
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-EV=2.14
-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.71-r2.ebuild b/net-im/gaim/gaim-0.71-r2.ebuild
deleted file mode 100644
index 462236d02647..000000000000
--- a/net-im/gaim/gaim-0.71-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.71-r2.ebuild,v 1.3 2003/11/01 08:08:08 lostlogic Exp $
-
-IUSE="nls perl spell nas ssl"
-
-DESCRIPTION="GTK Instant Messenger client"
-HOMEPAGE="http://gaim.sourceforge.net/"
-EV=2.15
-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
-	cd ${S}
-	epatch ${FILESDIR}/gaim-0.71-jabber-strip.patch
-	epatch ${FILESDIR}/gaim-0.71-ipv6.patch
-	epatch ${FILESDIR}/gaim-0.71-icq-crash-hack.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 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.73-r1.ebuild b/net-im/gaim/gaim-0.73-r1.ebuild
deleted file mode 100644
index 25d802df5055..000000000000
--- a/net-im/gaim/gaim-0.73-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.73-r1.ebuild,v 1.1 2003/11/23 03:30:42 rizzo Exp $
-
-IUSE="nls perl spell nas ssl mozilla cjk"
-
-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"
-
-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
-	use cjk && epatch ${FILESDIR}/gaim-0.73_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 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
-}
diff --git a/net-im/gaim/gaim-0.73.ebuild b/net-im/gaim/gaim-0.73.ebuild
deleted file mode 100644
index cff0ac44d99e..000000000000
--- a/net-im/gaim/gaim-0.73.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.73.ebuild,v 1.1 2003/11/22 16:19:34 rizzo Exp $
-
-IUSE="nls perl spell nas ssl mozilla 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 )
-	mozilla? ( net-www/mozilla )
-	!mozilla? ( dev-libs/nss )
-	spell? ( >=app-text/gtkspell-2.0.2 )"
-
-src_unpack() {
-	unpack ${A} || die
-	use cjk && epatch ${FILESDIR}/gaim-0.73_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 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
-}
diff --git a/net-im/gaim/gaim-0.74.ebuild b/net-im/gaim/gaim-0.74.ebuild
deleted file mode 100644
index 84035e120740..000000000000
--- a/net-im/gaim/gaim-0.74.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2003 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.ebuild,v 1.3 2003/11/28 14:57:33 rizzo Exp $
-
-IUSE="nls perl spell nas ssl mozilla cjk"
-
-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 ${A} || die
-	use cjk && epatch ${FILESDIR}/gaim-0.74_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."
-		ewarn
-	fi
-}