Cleanup.

(Portage version: 2.1.2.1)

19 files changed, 10 insertions, 989 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index cf62c5454350..677132649e8b 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-irc/xchat
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.231 2007/03/05 18:50:08 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.232 2007/03/05 22:16:30 swegener Exp $
+
+  05 Mar 2007; Sven Wegener <swegener@gentoo.org>
+  -files/xc268-fix-teprivmsg.diff, -files/xchat-2.6.4-fix-cursor.patch,
+  -files/xchat-2.6.8-fe-text.patch,
+  -files/44_fix_alignment_endianess.dpatch, -files/xc268-sec-url.diff,
+  -files/xchat-2.6.4-fix-proxy.patch, -files/xc245-fix-te-notify.diff,
+  -files/xc268-fix-ja.diff, -xchat-2.4.5-r1.ebuild, -xchat-2.6.8.ebuild,
+  -xchat-2.6.8-r1.ebuild, -xchat-2.6.8-r2.ebuild, -xchat-2.6.8-r3.ebuild:
+  Cleanup.
 
   05 Mar 2007; Peter Weller <welp@gentoo.org> xchat-2.8.0.ebuild:
   Keyworded on x86-fbsd
diff --git a/net-irc/xchat/files/44_fix_alignment_endianess.dpatch b/net-irc/xchat/files/44_fix_alignment_endianess.dpatch
deleted file mode 100644
index 4e2b3779f617..000000000000
--- a/net-irc/xchat/files/44_fix_alignment_endianess.dpatch
+++ /dev/null
@@ -1,319 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 44_fix_alignment_endianess.dpatch by evo
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixed alignment and Endianess issues, doesn't affect x86.
-
-@DPATCH@
-diff -Naur xchat-2.4.5uno/src/common/outbound.c xchat-2.4.5/src/common/outbound.c
---- xchat-2.4.5uno/src/common/outbound.c	2005-10-01 12:32:53.000000000 +0200
-+++ xchat-2.4.5/src/common/outbound.c	2005-09-30 21:52:42.000000000 +0200
-@@ -1498,7 +1498,7 @@
- 					k = 0;
- 				} else
- 				{
--					if (isdigit (buf[i]) && k < (sizeof (numb) - 1))
-+					if (isdigit ((unsigned char) buf[i]) && k < (sizeof (numb) - 1))
- 					{
- 						numb[k] = buf[i];
- 						k++;
-@@ -1899,7 +1899,7 @@
- 	p = name;
- 	while (*p)
- 	{
--		hl->buf[len] = toupper (*p);
-+		hl->buf[len] = toupper ((unsigned char) *p);
- 		len++;
- 		p++;
- 	}
-@@ -2136,7 +2136,7 @@
- 
- 		user = find_name (sess, nick);
- 
--		if (isdigit (reason[0]) && reason[1] == 0)
-+		if (isdigit ((unsigned char) reason[0]) && reason[1] == 0)
- 		{
- 			ban (sess, tbuf, nick, reason, (user && user->op));
- 			reason[0] = 0;
-@@ -3287,9 +3287,9 @@
- 	{
- 		if (src[0] == '%' || src[0] == '&')
- 		{
--			if (isdigit (src[1]))
-+			if (isdigit ((unsigned char) src[1]))
- 			{
--				if (isdigit (src[2]) && isdigit (src[3]))
-+				if (isdigit ((unsigned char) src[2]) && isdigit ((unsigned char) src[3]))
- 				{
- 					buf[0] = src[1];
- 					buf[1] = src[2];
-@@ -3442,8 +3442,8 @@
- 				occur++;
- 				if (	do_ascii &&
- 						j + 3 < len &&
--						(isdigit (cmd[j + 1]) && isdigit (cmd[j + 2]) &&
--						isdigit (cmd[j + 3])))
-+						(isdigit ((unsigned char) cmd[j + 1]) && isdigit ((unsigned char) cmd[j + 2]) &&
-+						isdigit ((unsigned char) cmd[j + 3])))
- 				{
- 					tbuf[0] = cmd[j + 1];
- 					tbuf[1] = cmd[j + 2];
-diff -Naur xchat-2.4.5uno/src/common/proto-irc.c xchat-2.4.5/src/common/proto-irc.c
---- xchat-2.4.5uno/src/common/proto-irc.c	2005-10-01 12:32:53.000000000 +0200
-+++ xchat-2.4.5/src/common/proto-irc.c	2005-09-30 22:31:11.000000000 +0200
-@@ -761,8 +761,12 @@
- 
- 	if (len == 4)
- 	{
-+		guint32 t;
-+  	 
-+		t = WORDL((guint8)type[0], (guint8)type[1], (guint8)type[2],
-+ (guint8)type[3]);
- 		/* this should compile to a bunch of: CMP.L, JE ... nice & fast */
--		switch (*((guint32 *)type))
-+		switch (t)
- 		{
- 		case WORDL('J','O','I','N'):
- 			{
-@@ -838,8 +842,12 @@
- 
- 	else if (len >= 5)
- 	{
-+		guint32 t;
-+  	 
-+		t = WORDL((guint8)type[0], (guint8)type[1], (guint8)type[2],
-+ (guint8)type[3]);
- 		/* this should compile to a bunch of: CMP.L, JE ... nice & fast */
--		switch (*((guint32 *)type))
-+		switch (t)
- 		{
- 		case WORDL('I','N','V','I'):
- 			if (ignore_check (word[1], IG_INVI))
-@@ -1022,7 +1030,7 @@
- 	}
- 
- 	/* see if the second word is a numeric */
--	if (isdigit (word[2][0]))
-+	if (isdigit ((unsigned char) word[2][0]))
- 	{
- 		text = word_eol[4];
- 		if (*text == ':')
-diff -Naur xchat-2.4.5uno/src/common/url.c xchat-2.4.5/src/common/url.c
---- xchat-2.4.5uno/src/common/url.c	2005-10-01 12:32:53.000000000 +0200
-+++ xchat-2.4.5/src/common/url.c	2005-10-01 12:26:33.000000000 +0200
-@@ -124,65 +124,60 @@
- int
- url_check_word (char *word, int len)
- {
--	char *at, *dot;
-+#define D(x) (x), ((sizeof (x)) - 1)
-+	static const struct {
-+		const char *s;
-+		int len;
-+	}
-+	prefix[] = {
-+		{ D("irc.") },
-+		{ D("ftp.") },
-+		{ D("www.") },
-+		{ D("irc://") },
-+		{ D("ftp://") },
-+		{ D("http://") },
-+		{ D("https://") },
-+		{ D("file://") },
-+		{ D("rtsp://") },
-+		{ D("gopher://") },
-+	},
-+	suffix[] = {
-+		{ D(".org") },
-+		{ D(".net") },
-+		{ D(".com") },
-+		{ D(".edu") },
-+		{ D(".html") },
-+		{ D(".info") },
-+		{ D(".name") },
-+	};
-+#undef D
-+	const char *at, *dot;
- 	int i, dots;
--	char temp[4];
--	guint32 pre;
- 
--	if ((word[0] == '@' || word[0] == '+' || word[0] == '^' || word[0] == '%' || word[0] == '*' ) && word[1] == '#')
-+	if (len > 1 && word[1] == '#' && strchr("@+^%*#", word[0]))
- 		return WORD_CHANNEL;
- 
- 	if ((word[0] == '#' || word[0] == '&') && word[1] != '#' && word[1] != 0)
- 		return WORD_CHANNEL;
- 
--	if (len > 4 && word[4] != '.')
-+	for (i = 0; i < G_N_ELEMENTS(prefix); i++)
- 	{
--		temp[0] = tolower (word[0]);
--		temp[1] = tolower (word[1]);
--		temp[2] = tolower (word[2]);
--		temp[3] = tolower (word[3]);
--
--		pre = *((guint32 *)temp);
--
--		if (CMPL (pre, 'i','r','c','.'))
--			return WORD_URL;
--		if (CMPL (pre, 'f','t','p','.'))
--			return WORD_URL;
--		if (CMPL (pre, 'w','w','w','.'))
--			return WORD_URL;
-+		int l;
- 
--		if (len > 7 && word[4] == '/' && word[5] == '/')
-+		l = prefix[i].len;
-+		if (len > l)
- 		{
--			if (CMPL (pre, 'i','r','c',':'))	/* irc:// */
--				return WORD_URL;
--			if (CMPL (pre, 'f','t','p',':'))	/* ftp:// */
--				return WORD_URL;
--		}
-+			int j;
- 
--		/* check for ABCD://... */
--		if (len > 8 && word[4] == ':' && word[5] == '/' && word[6] == '/')
--		{
--			if (CMPL (pre, 'h','t','t','p'))		/* http:// */
--				return WORD_URL;
--			if (CMPL (pre, 'f','i','l','e'))		/* file:// */
--				return WORD_URL;
--			if (CMPL (pre, 'r','t','s','p'))		/* rtsp:// */
--				return WORD_URL;
--		}
--
--		/* check for https:// */
--		if (len > 9 && word[5] == ':' && word[6] == '/' && word[7] == '/')
--		{
--			if (CMPL (pre, 'h','t','t','p') && (word[4] == 's' || word[4] == 'S'))
--				return WORD_URL;
--		}
--
--		/* check for gopher:// */
--		if (len > 10 && word[6] == ':' && word[7] == '/' && word[8] == '/')
--		{
--			if (CMPL (pre, 'g','o','p','h'))
--				if (CMPW (word + 4, 'e','r') || CMPW (word + 4, 'E','R'))
--					return WORD_URL;
-+			/* This is pretty much strncasecmp(). */
-+			for (j = 0; j < l; j++)
-+			{
-+				unsigned char c = word[j];
-+				if (tolower(c) != prefix[i].s[j])
-+					break;
-+			}
-+			if (j == l)
-+				return WORD_URL;		
- 		}
- 	}
- 
-@@ -205,7 +200,7 @@
- 	{
- 		if (word[i] == '.' && i > 1)
- 			dots++;	/* allow 127.0.0.1:80 */
--		else if (!isdigit (word[i]) && word[i] != ':')
-+		else if (!isdigit ((unsigned char) word[i]) && word[i] != ':')
- 		{
- 			dots = 0;
- 			break;
-@@ -216,35 +211,29 @@
- 
- 	if (len > 5)
- 	{
--		/* create a lowercase version of the last 4 letters */
--		temp[0] = tolower (word[len - 4]);
--		temp[1] = tolower (word[len - 3]);
--		temp[2] = tolower (word[len - 2]);
--		temp[3] = tolower (word[len - 1]);
-+		for (i = 0; i < G_N_ELEMENTS(suffix); i++)
-+		{
-+			int l;
- 
--		pre = *((guint32 *)temp);
-+			l = suffix[i].len;
-+			if (len > l)
-+			{
-+				const unsigned char *p = &word[len - l];
-+				int j;
- 
--		if (word[len - 5] == '.')
--		{
--			if (CMPL (pre, 'h','t','m','l'))
--				return WORD_HOST;
--			if (CMPL (pre, 'i','n','f','o'))
--				return WORD_HOST;
--			if (CMPL (pre, 'n','a','m','e'))
--				return WORD_HOST;
-+				/* This is pretty much strncasecmp(). */
-+				for (j = 0; j < l; j++)
-+				{
-+					if (tolower(p[j]) != suffix[i].s[j])
-+						break;
-+				}
-+				if (j == l)			
-+					return WORD_HOST;
-+			}
- 		}
- 
--		if (CMPL (pre, '.','o','r','g'))
--			return WORD_HOST;
--		if (CMPL (pre, '.','n','e','t'))
--			return WORD_HOST;
--		if (CMPL (pre, '.','c','o','m'))
--			return WORD_HOST;
--		if (CMPL (pre, '.','e','d','u'))
--			return WORD_HOST;
--
- 		if (word[len - 3] == '.' &&
--			 isalpha (word[len - 2]) && isalpha (word[len - 1]))
-+			 isalpha ((unsigned char) word[len - 2]) && isalpha ((unsigned char) word[len - 1]))
- 			return WORD_HOST;
- 	}
- 
-diff -Naur xchat-2.4.5uno/src/common/util.c xchat-2.4.5/src/common/util.c
---- xchat-2.4.5uno/src/common/util.c	2005-10-01 12:32:53.000000000 +0200
-+++ xchat-2.4.5/src/common/util.c	2005-10-01 11:49:08.000000000 +0200
-@@ -435,8 +435,8 @@
- 
- 	while (len > 0)
- 	{
--		if ((col && isdigit (*text) && nc < 2) ||
--			 (col && *text == ',' && isdigit (*(text+1)) && nc < 3))
-+		if ((col && isdigit ((unsigned char) *text) && nc < 2) ||
-+			 (col && *text == ',' && isdigit ((unsigned char) *(text+1)) && nc < 3))
- 		{
- 			nc++;
- 			if (*text == ',')
-@@ -1084,7 +1084,7 @@
- 	char *p;
- 	domain_t *dom;
- 
--	if (!hostname || !*hostname || isdigit (hostname[strlen (hostname) - 1]))
-+	if (!hostname || !*hostname || isdigit ((unsigned char) hostname[strlen (hostname) - 1]))
- 		return _("Unknown");
- 	if ((p = strrchr (hostname, '.')))
- 		p++;
-@@ -1156,7 +1156,7 @@
- 		if (*src != quote) *buf++ = '\\';
- 	    }
- 	    *buf++ = *src;
--	} else if (isspace(*src)) {
-+	} else if (isspace((unsigned char) *src)) {
- 	    if (*argv[argc]) {
- 		buf++, argc++;
- 		if (argc == argvAlloced) {
-diff -Naur xchat-2.4.5uno/src/fe-gtk/maingui.c xchat-2.4.5/src/fe-gtk/maingui.c
---- xchat-2.4.5uno/src/fe-gtk/maingui.c	2005-10-01 12:32:53.000000000 +0200
-+++ xchat-2.4.5/src/fe-gtk/maingui.c	2005-10-01 11:53:56.000000000 +0200
-@@ -1608,7 +1608,7 @@
- 		return;
- 
- 	sess = current_sess;
--	mode = tolower (flag[0]);
-+	mode = tolower ((unsigned char) flag[0]);
- 
- 	switch (mode)
- 	{
diff --git a/net-irc/xchat/files/digest-xchat-2.4.5-r1 b/net-irc/xchat/files/digest-xchat-2.4.5-r1
deleted file mode 100644
index 2d93a2149779..000000000000
--- a/net-irc/xchat/files/digest-xchat-2.4.5-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 9107a92693e6c62ff2008030e698b92b xchat-2.4.5.tar.bz2 1324626
-RMD160 19d1033d01af784f8b7af5103a7de8cf3a26f3fb xchat-2.4.5.tar.bz2 1324626
-SHA256 44cabb5c31047d5a036495bc7fac64a5b86c8003bd575ea869bcd377032db2db xchat-2.4.5.tar.bz2 1324626
-MD5 263cdf7aadd29cbc49c928408a00dde7 xchat-dccserver-0.5.patch.bz2 3814
-RMD160 6f6957e78b7236bcacd076d598a81fcbcec27502 xchat-dccserver-0.5.patch.bz2 3814
-SHA256 40b3dd9e15c4378ae2fc3c450beaec65ce5302561369f90fa8cead62a0015329 xchat-dccserver-0.5.patch.bz2 3814
diff --git a/net-irc/xchat/files/digest-xchat-2.6.8 b/net-irc/xchat/files/digest-xchat-2.6.8
deleted file mode 100644
index 58171d619aec..000000000000
--- a/net-irc/xchat/files/digest-xchat-2.6.8
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 940fd8560a4e4e5d905e53207c6cbb87 xchat-2.6.8.tar.bz2 1184287
-RMD160 add965c1092c11f565110f127f402c900bedcec0 xchat-2.6.8.tar.bz2 1184287
-SHA256 7e239a43c5e293da57a0ee8dc1e383d243ec44b00e682558db93be3d2752611f xchat-2.6.8.tar.bz2 1184287
-MD5 c0220456a4df8ee54ae02e7704a6e024 xchat-dccserver-0.6.patch.bz2 49320
-RMD160 24cc9bd414b1dd0e7e38ba9a49d12257aeb89e68 xchat-dccserver-0.6.patch.bz2 49320
-SHA256 90a49a8d810380020c507c1a36f02e7d972cf92b5e4802dcd5cc518cba29078f xchat-dccserver-0.6.patch.bz2 49320
diff --git a/net-irc/xchat/files/digest-xchat-2.6.8-r1 b/net-irc/xchat/files/digest-xchat-2.6.8-r1
deleted file mode 100644
index 58171d619aec..000000000000
--- a/net-irc/xchat/files/digest-xchat-2.6.8-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 940fd8560a4e4e5d905e53207c6cbb87 xchat-2.6.8.tar.bz2 1184287
-RMD160 add965c1092c11f565110f127f402c900bedcec0 xchat-2.6.8.tar.bz2 1184287
-SHA256 7e239a43c5e293da57a0ee8dc1e383d243ec44b00e682558db93be3d2752611f xchat-2.6.8.tar.bz2 1184287
-MD5 c0220456a4df8ee54ae02e7704a6e024 xchat-dccserver-0.6.patch.bz2 49320
-RMD160 24cc9bd414b1dd0e7e38ba9a49d12257aeb89e68 xchat-dccserver-0.6.patch.bz2 49320
-SHA256 90a49a8d810380020c507c1a36f02e7d972cf92b5e4802dcd5cc518cba29078f xchat-dccserver-0.6.patch.bz2 49320
diff --git a/net-irc/xchat/files/digest-xchat-2.6.8-r2 b/net-irc/xchat/files/digest-xchat-2.6.8-r2
deleted file mode 100644
index 58171d619aec..000000000000
--- a/net-irc/xchat/files/digest-xchat-2.6.8-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 940fd8560a4e4e5d905e53207c6cbb87 xchat-2.6.8.tar.bz2 1184287
-RMD160 add965c1092c11f565110f127f402c900bedcec0 xchat-2.6.8.tar.bz2 1184287
-SHA256 7e239a43c5e293da57a0ee8dc1e383d243ec44b00e682558db93be3d2752611f xchat-2.6.8.tar.bz2 1184287
-MD5 c0220456a4df8ee54ae02e7704a6e024 xchat-dccserver-0.6.patch.bz2 49320
-RMD160 24cc9bd414b1dd0e7e38ba9a49d12257aeb89e68 xchat-dccserver-0.6.patch.bz2 49320
-SHA256 90a49a8d810380020c507c1a36f02e7d972cf92b5e4802dcd5cc518cba29078f xchat-dccserver-0.6.patch.bz2 49320
diff --git a/net-irc/xchat/files/digest-xchat-2.6.8-r3 b/net-irc/xchat/files/digest-xchat-2.6.8-r3
deleted file mode 100644
index 58171d619aec..000000000000
--- a/net-irc/xchat/files/digest-xchat-2.6.8-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 940fd8560a4e4e5d905e53207c6cbb87 xchat-2.6.8.tar.bz2 1184287
-RMD160 add965c1092c11f565110f127f402c900bedcec0 xchat-2.6.8.tar.bz2 1184287
-SHA256 7e239a43c5e293da57a0ee8dc1e383d243ec44b00e682558db93be3d2752611f xchat-2.6.8.tar.bz2 1184287
-MD5 c0220456a4df8ee54ae02e7704a6e024 xchat-dccserver-0.6.patch.bz2 49320
-RMD160 24cc9bd414b1dd0e7e38ba9a49d12257aeb89e68 xchat-dccserver-0.6.patch.bz2 49320
-SHA256 90a49a8d810380020c507c1a36f02e7d972cf92b5e4802dcd5cc518cba29078f xchat-dccserver-0.6.patch.bz2 49320
diff --git a/net-irc/xchat/files/xc245-fix-te-notify.diff b/net-irc/xchat/files/xc245-fix-te-notify.diff
deleted file mode 100644
index a718ecba81cb..000000000000
--- a/net-irc/xchat/files/xc245-fix-te-notify.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Clicking on "Notify Offline" in Settings > Advanced > Text Events
-# causes a crash. This patch fixes it.
-#
---- xchat-2.4.5/src/common/text.c	29 Jul 2005 05:36:33 -0000	1.66
-+++ xchat-2.4.5p1/src/common/text.c	11 Sep 2005 09:58:24 -0000
-@@ -726,6 +726,7 @@
- 
- static char * const pevt_generic_nick_help[] = {
- 	N_("Nickname"),
-+	N_("Server Name")
- };
- 
- static char * const pevt_chanmodes_help[] = {
diff --git a/net-irc/xchat/files/xc268-fix-ja.diff b/net-irc/xchat/files/xc268-fix-ja.diff
deleted file mode 100644
index a3bd7830fe1a..000000000000
--- a/net-irc/xchat/files/xc268-fix-ja.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Japanese translation error in 2.6.8 causes xchat NOT to run!
-#
---- xchat-2.6.8/po/ja.po	8 Aug 2006 14:39:41 -0000	1.16
-+++ xchat-2.6.8p1/po/ja.po	15 Nov 2006 00:59:59 -0000
-@@ -1082,7 +1176,7 @@
- 
- #: src/common/textevents.h:318
- msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
--msgstr "%C28-%C29$1/Wallops%C28-%O$t$"
-+msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
- 
- #: src/common/textevents.h:321
- #, fuzzy
diff --git a/net-irc/xchat/files/xc268-fix-teprivmsg.diff b/net-irc/xchat/files/xc268-fix-teprivmsg.diff
deleted file mode 100644
index 9ce19687d5db..000000000000
--- a/net-irc/xchat/files/xc268-fix-teprivmsg.diff
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# [xchat 2.6.8 PATCH] Fixes a possible crash when clicking
-# on "Private Message" in the 'Advanced > Text Events' window.
-#
---- xchat-2.6.8/src/common/text.c	1 Oct 2006 10:31:05 -0000	1.83
-+++ xchat-2.6.8p1/src/common/text.c	4 Nov 2006 07:32:54 -0000
-@@ -641,6 +641,7 @@
- static char * const pevt_privmsg_help[] = {
- 	N_("Nickname"),
- 	N_("The message"),
-+	N_("Identified text")
- };
- 
- static char * const pevt_changenick_help[] = {
-@@ -705,12 +706,6 @@
- 	N_("The message"),
- };
- 
--static char * const pevt_dprivmsg_help[] = {
--	N_("Nickname"),
--	N_("The message"),
--	N_("Identified text"),
--};
--
- static char * const pevt_uchangenick_help[] = {
- 	N_("Old nickname"),
- 	N_("New nickname"),
---- xchat-2.6.8/src/common/textevents.h	1 Oct 2006 10:31:09 -0000	1.34
-+++ xchat-2.6.8p1/src/common/textevents.h	4 Nov 2006 07:32:56 -0000
-@@ -302,7 +302,7 @@
- {"Private Message", pevt_privmsg_help, 131, 
- "%C28*%C29$3$1%C28*$t%O$2"},
- 
--{"Private Message to Dialog", pevt_dprivmsg_help, 131, 
-+{"Private Message to Dialog", pevt_privmsg_help, 131, 
- "%C18%H<%H$3$1%H>%H%O$t$2"},
- 
- {"Process Already Running", pevt_generic_none_help, 0, 
-@@ -314,7 +314,7 @@
- {"Raw Modes", pevt_rawmodes_help, 2, 
- N_("%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]")},
- 
--{"Receive Wallops", pevt_dprivmsg_help, 2, 
-+{"Receive Wallops", pevt_privmsg_help, 2, 
- N_("%C28-%C29$1/Wallops%C28-%O$t$2")},
- 
- {"Resolving User", pevt_resolvinguser_help, 2, 
---- xchat-2.6.8/src/common/textevents.in	1 Oct 2006 10:31:09 -0000	1.33
-+++ xchat-2.6.8p1/src/common/textevents.in	4 Nov 2006 07:32:56 -0000
-@@ -600,7 +600,7 @@
- 
- Private Message to Dialog
- XP_TE_DPRIVMSG
--pevt_dprivmsg_help
-+pevt_privmsg_help
- %C18%H<%H$3$1%H>%H%O$t$2
- n3
- 
-@@ -624,7 +624,7 @@
- 
- Receive Wallops
- XP_TE_WALLOPS
--pevt_dprivmsg_help
-+pevt_privmsg_help
- %C28-%C29$1/Wallops%C28-%O$t$2
- 2
- 
diff --git a/net-irc/xchat/files/xc268-sec-url.diff b/net-irc/xchat/files/xc268-sec-url.diff
deleted file mode 100644
index 8e9489167550..000000000000
--- a/net-irc/xchat/files/xc268-sec-url.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- xchat-2.6.8/src/common/util.c	2006-10-14 15:47:44.000000000 +1000
-+++ xchat-2.6.8s1/src/common/util.c	2006-12-17 13:22:01.000000000 +1100
-@@ -1178,7 +1178,8 @@
- 		if (*src != quote) *buf++ = '\\';
- 	    }
- 	    *buf++ = *src;
--	} else if (isspace((unsigned char) *src)) {
-+	/*} else if (isspace((unsigned char) *src)) {*/
-+	} else if (*src == ' ') {
- 	    if (*argv[argc]) {
- 		buf++, argc++;
- 		if (argc == argvAlloced) {
diff --git a/net-irc/xchat/files/xchat-2.6.4-fix-cursor.patch b/net-irc/xchat/files/xchat-2.6.4-fix-cursor.patch
deleted file mode 100644
index 342ab77869e5..000000000000
--- a/net-irc/xchat/files/xchat-2.6.4-fix-cursor.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Fixes the invisible cursor color when using GTKSpell and a black
-# input box (when "Use the text box font & colors" is ON).
-#
-diff -u -r1.66 fe-gtk.c
---- xchat-2.6.4/src/fe-gtk/fe-gtk.c	7 Jun 2006 06:16:51 -0000	1.66
-+++ xchat-2.6.4p1/src/fe-gtk/fe-gtk.c	12 Jun 2006 03:13:24 -0000
-@@ -225,7 +225,11 @@
- const char cursor_color_rc[] =
- 	"style \"xc-ib-st\""
- 	"{"
-+#ifdef USE_GTKSPELL
-+		"GtkTextView::cursor-color=\"#%02x%02x%02x\""
-+#else
- 		"GtkEntry::cursor-color=\"#%02x%02x%02x\""
-+#endif
- 	"}"
- 	"widget \"*.xchat-inputbox\" style : application \"xc-ib-st\"";
- 
diff --git a/net-irc/xchat/files/xchat-2.6.4-fix-proxy.patch b/net-irc/xchat/files/xchat-2.6.4-fix-proxy.patch
deleted file mode 100644
index 566464c35003..000000000000
--- a/net-irc/xchat/files/xchat-2.6.4-fix-proxy.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Fix proxy
-#
-diff -u -r1.71 server.c
---- xchat-2.6.4/src/common/server.c	29 May 2006 06:53:25 -0000	1.71
-+++ xchat-2.6.4p1/src/common/server.c	8 Jun 2006 15:22:07 -0000
-@@ -1534,7 +1534,10 @@
- 	if (!serv->dont_use_proxy && (prefs.proxy_type == 5))
- 		error = net_connect (ns_server, serv->proxy_sok4, serv->proxy_sok6, &psok);
- 	else
-+	{
- 		error = net_connect (ns_server, serv->sok4, serv->sok6, &sok);
-+		psok = sok;
-+	}
- 
- 	if (error != 0)
- 	{
diff --git a/net-irc/xchat/files/xchat-2.6.8-fe-text.patch b/net-irc/xchat/files/xchat-2.6.8-fe-text.patch
deleted file mode 100644
index 645ec96a4c6c..000000000000
--- a/net-irc/xchat/files/xchat-2.6.8-fe-text.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-http://bugs.gentoo.org/152138
-http://sourceforge.net/tracker/index.php?func=detail&aid=1578730&group_id=239&atid=100239
-
-Index: src/fe-text/fe-text.c
-===================================================================
-RCS file: /cvsroot/xchat/xchat2/src/fe-text/fe-text.c,v
-retrieving revision 1.31
-retrieving revision 1.32
-diff --unified -B -b -r1.31 -r1.32
---- src/fe-text/fe-text.c	16 Jul 2006 04:35:04 -0000	1.31
-+++ src/fe-text/fe-text.c	25 Oct 2006 04:18:07 -0000	1.32
-@@ -584,7 +584,7 @@
- {
- }
- void
--fe_set_tab_color (struct session *sess, int col, int flash)
-+fe_set_tab_color (struct session *sess, int col)
- {
- }
- void
-@@ -759,7 +759,7 @@
- {
- }
- void
--fe_lastlog (session * sess, session * lastlog_sess, char *sstr)
-+fe_lastlog (session * sess, session * lastlog_sess, char *sstr, gboolean regexp)
- {
- }
- void
-@@ -845,3 +845,12 @@
- fe_server_event (server *serv, int type, int arg)
- {
- }
-+void
-+fe_flash_window (struct session *sess)
-+{
-+}
-+void fe_get_file (const char *title, char *initial,
-+				 void (*callback) (void *userdata, char *file), void *userdata,
-+				 int flags)
-+{
-+}
diff --git a/net-irc/xchat/xchat-2.4.5-r1.ebuild b/net-irc/xchat/xchat-2.4.5-r1.ebuild
deleted file mode 100644
index 10b4224d5bcf..000000000000
--- a/net-irc/xchat/xchat-2.4.5-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.4.5-r1.ebuild,v 1.11 2006/10/13 14:34:29 swegener Exp $
-
-inherit flag-o-matic eutils versionator
-
-DESCRIPTION="Graphical IRC client"
-SRC_URI="http://www.xchat.org/files/source/$(get_version_component_range 1-2)/${P}.tar.bz2
-	mirror://sourceforge/${PN}/${P}.tar.bz2
-	xchatdccserver? ( mirror://gentoo/${PN}-dccserver-0.5.patch.bz2 )"
-HOMEPAGE="http://www.xchat.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha ~amd64 ~hppa ia64 mips ppc ~ppc64 sparc ~x86"
-IUSE="perl tcl python ssl mmx ipv6 nls xchattext xchatnogtk xchatdccserver"
-
-RDEPEND=">=dev-libs/glib-2.0.3
-	!xchatnogtk? ( >=x11-libs/gtk+-2.0.3 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( >=dev-lang/perl-5.6.1 )
-	python? ( >=dev-lang/python-2.2 )
-	tcl? ( dev-lang/tcl )
-	!<net-irc/xchat-gnome-0.9"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.7
-	>=sys-apps/sed-4
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/xc245-fix-te-notify.diff
-	epatch "${FILESDIR}"/44_fix_alignment_endianess.dpatch
-
-	use xchatdccserver && epatch "${DISTDIR}"/xchat-dccserver-0.5.patch.bz2
-
-	# use libdir/xchat/plugins as the plugin directory
-	if [ $(get_libdir) != "lib" ] ; then
-		sed -i -e 's:${prefix}/lib/xchat:${libdir}/xchat:' \
-			"${S}"/configure{,.in} || die
-	fi
-}
-
-src_compile() {
-	# Added for to fix a sparc seg fault issue by Jason Wever <weeve@gentoo.org>
-	if [ ${ARCH} = "sparc" ] ; then
-		replace-flags "-O[3-9]" "-O2"
-	fi
-
-	# xchat's configure script uses sys.path to find library path
-	# instead of python-config (#25943)
-	unset PYTHONPATH
-
-	econf \
-		$(use_enable ssl openssl) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable tcl) \
-		$(use_enable mmx) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_enable xchattext textfe) \
-		$(use_enable !xchatnogtk gtkfe) \
-		--program-suffix=-2 \
-		|| die "Configure failed"
-
-	emake || die "Compile failed"
-}
-
-src_install() {
-	# some magic to create a menu entry for xchat 2
-	sed -i \
-		-e "s:^Exec=xchat$:Exec=xchat-2:" \
-		-e "s:Name=XChat IRC:Name=XChat 2 IRC:" \
-		xchat.desktop
-
-	make DESTDIR="${D}" install || die "Install failed"
-
-	# install plugin development header
-	insinto /usr/include/xchat
-	doins src/common/xchat-plugin.h || die "doins failed"
-
-	dodoc ChangeLog README* || die "dodoc failed"
-}
diff --git a/net-irc/xchat/xchat-2.6.8-r1.ebuild b/net-irc/xchat/xchat-2.6.8-r1.ebuild
deleted file mode 100644
index 16aa52dac0ad..000000000000
--- a/net-irc/xchat/xchat-2.6.8-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.6.8-r1.ebuild,v 1.1 2006/11/19 01:27:17 swegener Exp $
-
-inherit eutils versionator gnome2
-
-DESCRIPTION="Graphical IRC client"
-SRC_URI="http://www.xchat.org/files/source/$(get_version_component_range 1-2)/${P}.tar.bz2
-	mirror://sourceforge/${PN}/${P}.tar.bz2
-	xchatdccserver? ( mirror://gentoo/${PN}-dccserver-0.6.patch.bz2 )"
-HOMEPAGE="http://www.xchat.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="perl dbus tcl python ssl mmx ipv6 nls spell xchattext xchatnogtk xchatdccserver"
-
-RDEPEND=">=dev-libs/glib-2.6.0
-	!xchatnogtk? ( >=x11-libs/gtk+-2.6.0 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( >=dev-lang/perl-5.6.1 )
-	python? ( >=dev-lang/python-2.2 )
-	tcl? ( dev-lang/tcl )
-	dbus? ( || ( >=dev-libs/dbus-glib-0.71
-			( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 ) ) )
-	spell? ( app-text/enchant )
-	!<net-irc/xchat-gnome-0.9"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.7
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	use xchatdccserver && epatch "${DISTDIR}"/xchat-dccserver-0.6.patch.bz2
-
-	epatch "${FILESDIR}"/xchat-2.6.8-fe-text.patch
-	epatch "${FILESDIR}"/xc268-fix-teprivmsg.diff
-	epatch "${FILESDIR}"/xc268-fix-ja.diff
-
-	# use libdir/xchat/plugins as the plugin directory
-	if [ $(get_libdir) != "lib" ] ; then
-		sed -i -e 's:${prefix}/lib/xchat:${libdir}/xchat:' \
-			"${S}"/configure{,.in} || die
-	fi
-}
-
-src_compile() {
-	# Added for to fix a sparc seg fault issue by Jason Wever <weeve@gentoo.org>
-	if [ ${ARCH} = "sparc" ] ; then
-		replace-flags "-O[3-9]" "-O2"
-	fi
-
-	# xchat's configure script uses sys.path to find library path
-	# instead of python-config (#25943)
-	unset PYTHONPATH
-
-	econf \
-		--enable-shm \
-		$(use_enable ssl openssl) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable tcl) \
-		$(use_enable mmx) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_enable dbus) \
-		$(use_enable spell spell static) \
-		$(use_enable xchattext textfe) \
-		$(use_enable !xchatnogtk gtkfe) \
-		--program-suffix=-2 \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	# some magic to create a menu entry for xchat 2
-	sed -i \
-		-e "s:^Exec=xchat$:Exec=xchat-2:" \
-		-e "s:Name=XChat IRC:Name=XChat 2 IRC:" \
-		xchat.desktop
-
-	USE_DESTDIR=1 gnome2_src_install || die "make install failed"
-
-	# install plugin development header
-	insinto /usr/include/xchat
-	doins src/common/xchat-plugin.h || die "doins failed"
-
-	dodoc ChangeLog README* || die "dodoc failed"
-}
diff --git a/net-irc/xchat/xchat-2.6.8-r2.ebuild b/net-irc/xchat/xchat-2.6.8-r2.ebuild
deleted file mode 100644
index 003b37ec5f6f..000000000000
--- a/net-irc/xchat/xchat-2.6.8-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.6.8-r2.ebuild,v 1.1 2006/12/18 19:31:46 swegener Exp $
-
-inherit eutils versionator gnome2
-
-DESCRIPTION="Graphical IRC client"
-SRC_URI="http://www.xchat.org/files/source/$(get_version_component_range 1-2)/${P}.tar.bz2
-	mirror://sourceforge/${PN}/${P}.tar.bz2
-	xchatdccserver? ( mirror://gentoo/${PN}-dccserver-0.6.patch.bz2 )"
-HOMEPAGE="http://www.xchat.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="perl dbus tcl python ssl mmx ipv6 nls spell xchattext xchatnogtk xchatdccserver"
-
-RDEPEND=">=dev-libs/glib-2.6.0
-	!xchatnogtk? ( >=x11-libs/gtk+-2.6.0 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( >=dev-lang/perl-5.6.1 )
-	python? ( >=dev-lang/python-2.2 )
-	tcl? ( dev-lang/tcl )
-	dbus? ( || ( >=dev-libs/dbus-glib-0.71
-			( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 ) ) )
-	spell? ( app-text/enchant )
-	!<net-irc/xchat-gnome-0.9"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.7
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	use xchatdccserver && epatch "${DISTDIR}"/xchat-dccserver-0.6.patch.bz2
-
-	epatch "${FILESDIR}"/xchat-2.6.8-fe-text.patch
-	epatch "${FILESDIR}"/xc268-fix-teprivmsg.diff
-	epatch "${FILESDIR}"/xc268-fix-ja.diff
-	epatch "${FILESDIR}"/xc268-sec-url.diff
-
-	# use libdir/xchat/plugins as the plugin directory
-	if [ $(get_libdir) != "lib" ] ; then
-		sed -i -e 's:${prefix}/lib/xchat:${libdir}/xchat:' \
-			"${S}"/configure{,.in} || die
-	fi
-}
-
-src_compile() {
-	# Added for to fix a sparc seg fault issue by Jason Wever <weeve@gentoo.org>
-	if [ ${ARCH} = "sparc" ] ; then
-		replace-flags "-O[3-9]" "-O2"
-	fi
-
-	# xchat's configure script uses sys.path to find library path
-	# instead of python-config (#25943)
-	unset PYTHONPATH
-
-	econf \
-		--enable-shm \
-		$(use_enable ssl openssl) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable tcl) \
-		$(use_enable mmx) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_enable dbus) \
-		$(use_enable spell spell static) \
-		$(use_enable xchattext textfe) \
-		$(use_enable !xchatnogtk gtkfe) \
-		--program-suffix=-2 \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	# some magic to create a menu entry for xchat 2
-	sed -i \
-		-e "s:^Exec=xchat$:Exec=xchat-2:" \
-		-e "s:Name=XChat IRC:Name=XChat 2 IRC:" \
-		xchat.desktop
-
-	USE_DESTDIR=1 gnome2_src_install || die "make install failed"
-
-	# install plugin development header
-	insinto /usr/include/xchat
-	doins src/common/xchat-plugin.h || die "doins failed"
-
-	dodoc ChangeLog README* || die "dodoc failed"
-}
diff --git a/net-irc/xchat/xchat-2.6.8-r3.ebuild b/net-irc/xchat/xchat-2.6.8-r3.ebuild
deleted file mode 100644
index af6f88e91109..000000000000
--- a/net-irc/xchat/xchat-2.6.8-r3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.6.8-r3.ebuild,v 1.1 2006/12/25 15:02:55 hanno Exp $
-
-inherit eutils versionator gnome2
-
-DESCRIPTION="Graphical IRC client"
-SRC_URI="http://www.xchat.org/files/source/$(get_version_component_range 1-2)/${P}.tar.bz2
-	mirror://sourceforge/${PN}/${P}.tar.bz2
-	xchatdccserver? ( mirror://gentoo/${PN}-dccserver-0.6.patch.bz2 )"
-HOMEPAGE="http://www.xchat.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="perl dbus tcl python ssl mmx ipv6 nls spell xchattext xchatnogtk xchatdccserver"
-
-RDEPEND=">=dev-libs/glib-2.6.0
-	!xchatnogtk? ( >=x11-libs/gtk+-2.6.0 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( >=dev-lang/perl-5.6.1 )
-	python? ( >=dev-lang/python-2.2 )
-	tcl? ( dev-lang/tcl )
-	dbus? ( || ( >=dev-libs/dbus-glib-0.71
-			( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 ) ) )
-	spell? ( app-text/enchant )
-	!<net-irc/xchat-gnome-0.9"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.7
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	use xchatdccserver && epatch "${DISTDIR}"/xchat-dccserver-0.6.patch.bz2
-
-	epatch "${FILESDIR}"/xchat-2.6.8-fe-text.patch
-	epatch "${FILESDIR}"/xc268-fix-teprivmsg.diff
-	epatch "${FILESDIR}"/xc268-fix-ja.diff
-	epatch "${FILESDIR}"/xc268-sec-url.diff
-
-	# use libdir/xchat/plugins as the plugin directory
-	if [ $(get_libdir) != "lib" ] ; then
-		sed -i -e 's:${prefix}/lib/xchat:${libdir}/xchat:' \
-			"${S}"/configure{,.in} || die
-	fi
-}
-
-src_compile() {
-	# Added for to fix a sparc seg fault issue by Jason Wever <weeve@gentoo.org>
-	if [ ${ARCH} = "sparc" ] ; then
-		replace-flags "-O[3-9]" "-O2"
-	fi
-
-	# xchat's configure script uses sys.path to find library path
-	# instead of python-config (#25943)
-	unset PYTHONPATH
-
-	econf \
-		--enable-shm \
-		$(use_enable ssl openssl) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable tcl) \
-		$(use_enable mmx) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_enable dbus) \
-		$(use_enable spell spell static) \
-		$(use_enable xchattext textfe) \
-		$(use_enable !xchatnogtk gtkfe) \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	USE_DESTDIR=1 gnome2_src_install || die "make install failed"
-
-	# install plugin development header
-	insinto /usr/include/xchat
-	doins src/common/xchat-plugin.h || die "doins failed"
-
-	dodoc ChangeLog README* || die "dodoc failed"
-}
-
-pkg_postinst() {
-	elog "XChat binary has been renamed from xchat-2 to xchat."
-}
diff --git a/net-irc/xchat/xchat-2.6.8.ebuild b/net-irc/xchat/xchat-2.6.8.ebuild
deleted file mode 100644
index f1d1d81d8eed..000000000000
--- a/net-irc/xchat/xchat-2.6.8.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.6.8.ebuild,v 1.2 2006/11/10 06:45:58 cardoe Exp $
-
-inherit eutils versionator gnome2
-
-DESCRIPTION="Graphical IRC client"
-SRC_URI="http://www.xchat.org/files/source/$(get_version_component_range 1-2)/${P}.tar.bz2
-	mirror://sourceforge/${PN}/${P}.tar.bz2
-	xchatdccserver? ( mirror://gentoo/${PN}-dccserver-0.6.patch.bz2 )"
-HOMEPAGE="http://www.xchat.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="perl dbus tcl python ssl mmx ipv6 nls spell xchattext xchatnogtk xchatdccserver"
-
-RDEPEND=">=dev-libs/glib-2.6.0
-	!xchatnogtk? ( >=x11-libs/gtk+-2.6.0 )
-	ssl? ( >=dev-libs/openssl-0.9.6d )
-	perl? ( >=dev-lang/perl-5.6.1 )
-	python? ( >=dev-lang/python-2.2 )
-	tcl? ( dev-lang/tcl )
-	dbus? ( || ( >=dev-libs/dbus-glib-0.71
-			( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.35 ) ) )
-	spell? ( app-text/enchant )
-	!<net-irc/xchat-gnome-0.9"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.7
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	use xchatdccserver && epatch "${DISTDIR}"/xchat-dccserver-0.6.patch.bz2
-
-	# use libdir/xchat/plugins as the plugin directory
-	if [ $(get_libdir) != "lib" ] ; then
-		sed -i -e 's:${prefix}/lib/xchat:${libdir}/xchat:' \
-			"${S}"/configure{,.in} || die
-	fi
-}
-
-src_compile() {
-	# Added for to fix a sparc seg fault issue by Jason Wever <weeve@gentoo.org>
-	if [ ${ARCH} = "sparc" ] ; then
-		replace-flags "-O[3-9]" "-O2"
-	fi
-
-	# xchat's configure script uses sys.path to find library path
-	# instead of python-config (#25943)
-	unset PYTHONPATH
-
-	econf \
-		--enable-shm \
-		$(use_enable ssl openssl) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable tcl) \
-		$(use_enable mmx) \
-		$(use_enable ipv6) \
-		$(use_enable nls) \
-		$(use_enable dbus) \
-		$(use_enable spell spell static) \
-		$(use_enable xchattext textfe) \
-		$(use_enable !xchatnogtk gtkfe) \
-		--program-suffix=-2 \
-		|| die "econf failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	# some magic to create a menu entry for xchat 2
-	sed -i \
-		-e "s:^Exec=xchat$:Exec=xchat-2:" \
-		-e "s:Name=XChat IRC:Name=XChat 2 IRC:" \
-		xchat.desktop
-
-	USE_DESTDIR=1 gnome2_src_install || die "make install failed"
-
-	# install plugin development header
-	insinto /usr/include/xchat
-	doins src/common/xchat-plugin.h || die "doins failed"
-
-	dodoc ChangeLog README* || die "dodoc failed"
-}