New version

12 files changed, 22 insertions, 567 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index 3e5c76084209..91e00400e6ed 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/xchat
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.30 2002/11/21 01:03:07 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.31 2002/11/26 12:08:32 foser Exp $
+
+*xchat-1.9.6 (26 Nov 2002)
+
+  26 Nov 2002; foser <foser@gentoo.org> xchat-1.9.6.ebuild :
+  New version
 
 *xchat-1.9.5-r2 (20 Nov 2002)
 
diff --git a/net-irc/xchat/files/digest-xchat-1.8.9-r2 b/net-irc/xchat/files/digest-xchat-1.8.9-r2
deleted file mode 100644
index 2979470d8a7f..000000000000
--- a/net-irc/xchat/files/digest-xchat-1.8.9-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a7d3723053fbee23399647f88afd15fa xchat-1.8.9.tar.bz2 747762
diff --git a/net-irc/xchat/files/digest-xchat-1.8.9-r3 b/net-irc/xchat/files/digest-xchat-1.8.9-r3
deleted file mode 100644
index 2979470d8a7f..000000000000
--- a/net-irc/xchat/files/digest-xchat-1.8.9-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a7d3723053fbee23399647f88afd15fa xchat-1.8.9.tar.bz2 747762
diff --git a/net-irc/xchat/files/digest-xchat-1.9.5-r1 b/net-irc/xchat/files/digest-xchat-1.9.5-r1
deleted file mode 100644
index 73aa3bc57e3e..000000000000
--- a/net-irc/xchat/files/digest-xchat-1.9.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f737b02e09360b5fee58cff85fee0ce6 xchat-1.9.5.tar.bz2 797336
diff --git a/net-irc/xchat/files/digest-xchat-1.9.6 b/net-irc/xchat/files/digest-xchat-1.9.6
new file mode 100644
index 000000000000..e4a3ea4658ac
--- /dev/null
+++ b/net-irc/xchat/files/digest-xchat-1.9.6
@@ -0,0 +1 @@
+MD5 dc81d4440ac3dac3b30129f0b28c1433 xchat-1.9.6.tar.bz2 821649
diff --git a/net-irc/xchat/files/gentoo-xchat-1.9.3-bgtint.patch b/net-irc/xchat/files/gentoo-xchat-1.9.3-bgtint.patch
deleted file mode 100644
index 5724d181c64a..000000000000
--- a/net-irc/xchat/files/gentoo-xchat-1.9.3-bgtint.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -ur xchat-1.9.3/src/fe-gtk/setup.c xchat-1.9.3.new/src/fe-gtk/setup.c
---- xchat-1.9.3/src/fe-gtk/setup.c	2002-07-12 06:39:40.000000000 +0200
-+++ xchat-1.9.3.new/src/fe-gtk/setup.c	2002-10-21 19:33:57.000000000 +0200
-@@ -36,6 +36,7 @@
- #include <gtk/gtktreestore.h>
- #include <gtk/gtktreeselection.h>
- #include <gtk/gtkcellrenderertext.h>
-+#include <gtk/gtkhscale.h>
- 
- static int last_selected_page = 0;
- static struct xchatprefs setup_prefs;
-@@ -50,6 +51,7 @@
- 	ST_MENU,
- 	ST_RADIO,
- 	ST_NUMBER,
-+	ST_HSCALE,
- };
- 
- typedef struct
-@@ -75,6 +77,9 @@
- 	{ST_TOGGLE, N_("Colored nicks"), P_OFFINT(colorednicks),0,0,0},
- 	{ST_TOGGLE, N_("Strip mIRC color"), P_OFFINT(stripcolor),0,0,0},
- 	{ST_NUMBER,	N_("Scrollback lines:"), P_OFFINT(max_lines),0,0,100000},
-+	{ST_HSCALE, N_("Tint blue:"), P_OFFINT(tint_blue),0,0,0},
-+	{ST_HSCALE, N_("Tint red:"), P_OFFINT(tint_red),0,0,0},
-+	{ST_HSCALE, N_("Tint green:"), P_OFFINT(tint_green),0,0,0},
- 	{ST_END, 0, 0, 0, 0, 0}
- };
- 
-@@ -255,6 +260,34 @@
- 	gtk_box_pack_start (GTK_BOX (rbox), wid, 0, 0, 0);
- }
- 
-+
-+static void
-+setup_hscale_cb (GtkHScale *wid, const setting *set)
-+{
-+	setup_set_int (&setup_prefs, set, gtk_range_get_value(GTK_RANGE(wid)));
-+}
-+
-+static void
-+setup_create_hscale (GtkWidget *table, int row, const setting *set)
-+{
-+	GtkWidget *wid;
-+
-+	wid = gtk_hscale_new_with_range(0., 255., 1.);
-+	gtk_range_set_value (GTK_RANGE (wid), setup_get_int (&setup_prefs, set));
-+	g_signal_connect (G_OBJECT(wid), "value_changed",
-+							G_CALLBACK (setup_hscale_cb), (gpointer)set);
-+	if (set->tooltip)
-+		add_tip (wid, set->tooltip);
-+
-+	gtk_table_attach (GTK_TABLE (table), wid, 1, 5, row, row + 1,
-+						GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
-+
-+	wid = gtk_label_new (set->label);
-+	gtk_misc_set_alignment (GTK_MISC (wid), 1.0, 1.0);
-+	gtk_table_attach (GTK_TABLE (table), wid, 0, 1, row, row + 1,
-+						GTK_FILL, GTK_FILL, 0, 0);
-+}
-+
- #if 0
- static int
- setup_create_radio (GtkWidget *table, int row, setting *set)
-@@ -478,6 +511,9 @@
- 		case ST_NUMBER:
- 			setup_create_spin (tab, row, &set[i]);
- 			break;
-+		case ST_HSCALE:
-+			setup_create_hscale (tab, row, &set[i]);
-+			break;
- 		}
- 		i++;
- 		row++;
diff --git a/net-irc/xchat/files/gentoo-xchat-1.9.4-scrolled-tabs.patch b/net-irc/xchat/files/gentoo-xchat-1.9.4-scrolled-tabs.patch
deleted file mode 100644
index 2b94794356f5..000000000000
--- a/net-irc/xchat/files/gentoo-xchat-1.9.4-scrolled-tabs.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-diff -rNu xchat-1.9.4-orig/src/fe-gtk/maingui.c xchat-1.9.4-scrolled-tabs/src/fe-gtk/maingui.c
---- xchat-1.9.4-orig/src/fe-gtk/maingui.c	2002-10-23 12:52:56.000000000 +0100
-+++ xchat-1.9.4-scrolled-tabs/src/fe-gtk/maingui.c	2002-11-06 18:26:55.000000000 +0000
-@@ -40,6 +40,7 @@
- #include <gtk/gtkimage.h>
- #include <gtk/gtkmessagedialog.h>
- #include <gtk/gtkradiomenuitem.h>
-+#include <gtk/gtkobject.h>
- 
- #include "../common/xchat.h"
- #include "../common/fe.h"
-@@ -1620,25 +1621,82 @@
- 		mg_show_generic_tab (active_tab);
- }
- 
-+/*
-+ * GtkViewports request at least as much space as their children do.
-+ * If we don't intervene here, the GtkViewport will be granted its
-+ * request, even at the expense of resizing the top-level window.
-+ */
-+static void
-+mg_tab_viewport_size_request (GtkWidget *widget, GtkRequisition *requisition, gpointer user_data)
-+{
-+	requisition->width = 10; requisition->height = 1;
-+}
-+
-+static void
-+mg_tab_scroll_left_clicked (GtkWidget *widget, gpointer user_data)
-+{
-+	session_gui *gui = user_data;
-+	GtkAdjustment *adjustment;
-+	gint viewport_width;
-+	gfloat new_value;
-+
-+	adjustment = gtk_viewport_get_hadjustment (GTK_VIEWPORT (gui->tabs_box->parent));
-+	gdk_window_get_geometry (gui->tabs_box->parent->window, 0, 0, &viewport_width, 0, 0);
-+	new_value = tab_search_offset (gui->tabs_box, adjustment->value, 0);
-+
-+	if (new_value + viewport_width > adjustment->upper)
-+		new_value = adjustment->upper - viewport_width;
-+
-+	gtk_adjustment_set_value (adjustment, new_value);
-+}
-+
-+static void
-+mg_tab_scroll_right_clicked (GtkWidget *widget, gpointer user_data)
-+{
-+	session_gui *gui = user_data;
-+	GtkAdjustment *adjustment;
-+	gint viewport_width;
-+	gfloat new_value;
-+
-+	adjustment = gtk_viewport_get_hadjustment (GTK_VIEWPORT (gui->tabs_box->parent));
-+	gdk_window_get_geometry (gui->tabs_box->parent->window, 0, 0, &viewport_width, 0, 0);
-+	new_value = tab_search_offset (gui->tabs_box, adjustment->value, 1);
-+
-+	if (new_value == 0 || new_value + viewport_width > adjustment->upper)
-+		new_value = adjustment->upper - viewport_width;
-+
-+	gtk_adjustment_set_value (adjustment, new_value);
-+}
-+
- static void
- mg_create_tabs (session_gui *gui, GtkWidget *box)
- {
--/*	GtkWidget *sc;
--	GtkWidget *frame;
-+	GtkWidget *hbox;
-+	GtkWidget *viewport;
-+	GtkWidget *button;
- 
--	frame = gtk_frame_new (NULL);
--	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
--	gtk_box_pack_start (GTK_BOX (box), frame, 0, 0, 0);*/
-+	hbox = gtk_hbox_new (0, 0);
-+	gtk_widget_show (hbox);
-+	gtk_box_pack_start (GTK_BOX (box), hbox, 0, 0, 0);
- 
--	gui->tabs_box = tab_group_new (mg_switch_tab_cb);
-+	viewport = gtk_viewport_new (0, 0);
-+	gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE);
-+	gtk_signal_connect (GTK_OBJECT (viewport), "size_request", GTK_SIGNAL_FUNC (mg_tab_viewport_size_request), 0);
-+	gtk_widget_show (viewport);
-+	gtk_box_pack_start (GTK_BOX (hbox), viewport, 1, 1, 0);
- 
--/*	sc = gtk_scrolled_window_new (0, 0);
--	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sc),
--											  GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
--	gtk_scrolled_window_add_with_viewport (sc, gui->tabs_box);*/
-+	gui->tabs_box = tab_group_new (mg_switch_tab_cb);
-+	gtk_container_add (GTK_CONTAINER (viewport), gui->tabs_box);
- 
--	gtk_box_pack_start (GTK_BOX (box), gui->tabs_box, 0, 0, 0);
--/*	gtk_container_add (GTK_CONTAINER (frame), gui->tabs_box);*/
-+	button = gtk_button_new_with_label ("<");
-+	gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (mg_tab_scroll_left_clicked), gui);
-+	gtk_widget_show (button);
-+	gtk_box_pack_start (GTK_BOX (hbox), button, 0, 0, 0);
-+
-+	button = gtk_button_new_with_label (">");
-+	gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (mg_tab_scroll_right_clicked), gui);
-+	gtk_widget_show (button);
-+	gtk_box_pack_start (GTK_BOX (hbox), button, 0, 0, 0);
- }
- 
- static gboolean
-diff -rNu xchat-1.9.4-orig/src/fe-gtk/tabs.c xchat-1.9.4-scrolled-tabs/src/fe-gtk/tabs.c
---- xchat-1.9.4-orig/src/fe-gtk/tabs.c	2002-10-23 12:42:45.000000000 +0100
-+++ xchat-1.9.4-scrolled-tabs/src/fe-gtk/tabs.c	2002-11-06 18:20:29.000000000 +0000
-@@ -335,3 +335,41 @@
- 		tab_group_switch (group, 0, FALSE);
- 	}
- }
-+
-+gint
-+tab_search_offset (GtkWidget *group, gint start_offset, gboolean forward)
-+{
-+	GList *boxes;
-+	GList *tabs;
-+	GtkWidget *box;
-+	GtkWidget *button;
-+
-+	boxes = GTK_BOX (group)->children;
-+	if (!forward && boxes)
-+		boxes = g_list_last (boxes);
-+
-+	while (boxes)
-+	{
-+		box = ((GtkBoxChild *)boxes->data)->widget;
-+		boxes = (forward ? boxes->next : boxes->prev);
-+
-+		tabs = GTK_BOX (box)->children;
-+		if (!forward && tabs)
-+			tabs = g_list_last (tabs);
-+
-+		while (tabs)
-+		{
-+			button = ((GtkBoxChild *)tabs->data)->widget;
-+			tabs = (forward ? tabs->next : tabs->prev);
-+
-+			if (!GTK_IS_TOGGLE_BUTTON (button))
-+				continue;
-+
-+			if ((forward && button->allocation.x > start_offset) ||
-+			    (!forward && button->allocation.x < start_offset))
-+				return button->allocation.x;
-+		}
-+	}
-+
-+	return 0;
-+}
-diff -rNu xchat-1.9.4-orig/src/fe-gtk/tabs.h xchat-1.9.4-scrolled-tabs/src/fe-gtk/tabs.h
---- xchat-1.9.4-orig/src/fe-gtk/tabs.h	2002-05-04 07:44:48.000000000 +0100
-+++ xchat-1.9.4-scrolled-tabs/src/fe-gtk/tabs.h	2002-11-06 18:27:18.000000000 +0000
-@@ -5,3 +5,4 @@
- void tab_rename (GtkWidget *tab, char *new_name);
- void tab_remove (GtkWidget *tab);
- void tab_style (GtkWidget *tab, GtkStyle *style);
-+gint tab_search_offset (GtkWidget *group, gint start_offset, gboolean forward);
diff --git a/net-irc/xchat/files/xchat-1.9.3-tolowertab.patch b/net-irc/xchat/files/xchat-1.9.3-tolowertab.patch
deleted file mode 100644
index 3c64d403b370..000000000000
--- a/net-irc/xchat/files/xchat-1.9.3-tolowertab.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff -ru --exclude=po --exclude=Makefile.in xchat-1.9.3/src/common/util.c xchat-1.9.4/src/common/util.c
---- xchat-1.9.3/src/common/util.c	Wed Aug 21 19:47:38 2002
-+++ xchat-1.9.4/src/common/util.c	Sat Oct  5 02:18:36 2002
-@@ -266,7 +266,7 @@
- 
- 	if (len == 0)
- 		return (char *)s;
--	while (tolower(*s) != tolower(*wanted) || strncasecmp (s, wanted, len))
-+	while (rfc_tolower(*s) != rfc_tolower(*wanted) || strncasecmp (s, wanted, len))
- 		if (*s++ == '\0')
- 			return (char *)NULL;
- 	return (char *)s;
-@@ -574,7 +574,7 @@
- 	if (*m == '?' || *m == '*')
- 	  ch = *m++;
-       default:
--	if (tolower(*s) != tolower(ch))
-+	if (rfc_tolower(*s) != rfc_tolower(ch))
- 	  return 0;
-       case '?':
- 	if (!*s++)
-@@ -604,8 +604,8 @@
- break_while:
-   if (!ch)
-     return 1;			/* mask ends with '*', we got it */
--  ch = tolower(ch);
--  while (tolower(*s++) != ch)
-+  ch = rfc_tolower(ch);
-+  while (rfc_tolower(*s++) != ch)
-     if (!*s)
-       return 0;
-   bs = s;			/* Next try start from here */
-@@ -621,7 +621,7 @@
- 	if (*m == '?' || *m == '*')
- 	  ch = *m++;
-       default:
--	if (tolower(*s) != tolower(ch))
-+	if (rfc_tolower(*s) != rfc_tolower(ch))
- 	{
- 	  m = bm;
- 	  s = bs;
-@@ -676,7 +676,7 @@
- {
- 	while (*str)
- 	{
--		*str = tolower (*str);
-+		*str = rfc_tolower (*str);
- 		str++;
- 	}
- }
-@@ -1122,7 +1122,7 @@
- 	register unsigned char *str2 = (unsigned char *) s2;
- 	register int res;
- 
--	while ((res = tolower (*str1) - tolower (*str2)) == 0)
-+	while ((res = rfc_tolower (*str1) - rfc_tolower (*str2)) == 0)
- 	{
- 		if (*str1 == '\0')
- 			return 0;
-@@ -1139,7 +1139,7 @@
- 	register unsigned char *s2 = (unsigned char *) str2;
- 	register int res;
- 
--	while ((res = tolower (*s1) - tolower (*s2)) == 0)
-+	while ((res = rfc_tolower (*s1) - rfc_tolower (*s2)) == 0)
- 	{
- 		s1++;
- 		s2++;
-@@ -1150,7 +1150,7 @@
- 	return (res);
- }
- 
--const unsigned char tolowertab[] =
-+const unsigned char rfc_tolowertab[] =
- 	{ 0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa,
- 	0xb, 0xc, 0xd, 0xe, 0xf, 0x10, 0x11, 0x12, 0x13, 0x14,
- 	0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d,
-diff -ru --exclude=po --exclude=Makefile.in xchat-1.9.3/src/common/util.h xchat-1.9.4/src/common/util.h
---- xchat-1.9.3/src/common/util.h	Wed Aug 21 19:47:44 2002
-+++ xchat-1.9.4/src/common/util.h	Sat Oct  5 02:17:39 2002
-@@ -11,10 +11,9 @@
-  *        --+ Dagmar d'Surreal
-  */
- 
--#undef tolower
--#define tolower(c) (tolowertab[(unsigned char)(c)])
-+#define rfc_tolower(c) (rfc_tolowertab[(unsigned char)(c)])
- 
--extern const unsigned char tolowertab[];
-+extern const unsigned char rfc_tolowertab[];
- 
- int my_poptParseArgvString(const char * s, int * argcPtr, char *** argvPtr);
- char *expand_homedir (char *file);
-diff -ru --exclude=po --exclude=Makefile.in xchat-1.9.3/src/fe-gtk/fkeys.c xchat-1.9.4/src/fe-gtk/fkeys.c
---- xchat-1.9.3/src/fe-gtk/fkeys.c	Wed Jun 26 01:01:42 2002
-+++ xchat-1.9.4/src/fe-gtk/fkeys.c	Sat Oct  5 02:19:13 2002
-@@ -1808,7 +1808,7 @@
- 				if (match_char == 0xff)
- 				{
- 					match_char = current_nick[match_pos];
--				} else if (tolower (current_nick[match_pos]) != tolower (match_char))
-+				} else if (rfc_tolower (current_nick[match_pos]) != rfc_tolower (match_char))
- 				{
- 					match_text = malloc (match_pos + 1);
- 					memcpy (match_text, current_nick, match_pos);
diff --git a/net-irc/xchat/xchat-1.8.9-r2.ebuild b/net-irc/xchat/xchat-1.8.9-r2.ebuild
deleted file mode 100644
index 4ffe64be9ede..000000000000
--- a/net-irc/xchat/xchat-1.8.9-r2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.8.9-r2.ebuild,v 1.8 2002/10/05 05:39:22 drobbins Exp $
-
-IUSE="ssl nls mmx gnome ipv6 python kde gtk perl"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="X-Chat is a graphical IRC client for UNIX operating systems."
-SRC_URI="http://www.xchat.org/files/source/1.8/${P}.tar.bz2"
-HOMEPAGE="http://www.xchat.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc sparc64"
-
-RDEPEND="=x11-libs/gtk+-1.2*
-	python? ( >=dev-lang/python-2.2-r7 )
-	perl?   ( >=sys-devel/perl-5.6.1 )
-	gnome?  ( >=gnome-base/gnome-panel-1.4.1 
-			  <gnome-base/gnome-panel-1.5.0
-				>=media-libs/gdk-pixbuf-0.11.0-r1 )
-	ssl?    ( >=dev-libs/openssl-0.9.6a )"
-
-DEPEND="${RDEPEND}
-	nls?    ( >=sys-devel/gettext-0.10.38 )"
-
-src_unpack() {
-
-	unpack ${A}
-	
-	cd ${S}
-	cp configure configure.orig
-
-	use python && ( \
-		local mylibs=`/usr/bin/python-config`
-		sed -e 's:PY_LIBS=".*":PY_LIBS="'"$mylibs"'":' \
-			configure.orig > configure
-	)
-}
-
-src_compile() {
-
-	local myopts myflags
-
-	use gnome \
-		&& myopts="${myopts} --enable-gnome --enable-panel" \
-		|| myopts="${myopts} --enable-gtkfe --disable-gnome --disable-zvt --disable-gdk-pixbuf"
-	
-	use gnome \
-		&& CFLAGS="${CFLAGS} -I/usr/include/orbit-1.0" \
-		|| myopts="${myopts} --disable-gnome"
-
-	use gtk \
-		|| myopts="${myopts} --disable-gtkfe"
-	
-	use ssl \
-		&& myopts="${myopts} --enable-openssl"
-
-	use perl \
-		|| myopts="${myopts} --disable-perl"
-
-	use nls \
-		&& myopts="${myopts} --enable-hebrew --enable-japanese-conv" \
-		|| myopts="${myopts} --disable-nls"
-
-	use mmx	\
-		&& myopts="${myopts} --enable-mmx"	\
-		|| myopts="${myopts} --disable-mmx"
-	
-	use ipv6 \
-		&& myopts="${myopts} --enable-ipv6"
-	
-	use python \
-		&& myflags="`python-config`" \
-	 	&& myopts="${myopts} --enable-python"
-	
-	./configure \
-		--prefix=/usr \
-		--host=${CHOST} \
-		${myopts} || die
-	
-	emake || die
-}
-
-src_install() {
-	
-	use kde && ( \
-		make \
-			prefix=${D}/usr \
-			utildir=${D}${KDEDIR}/share/applnk/Internet \
-			install || die
-	) || ( \
-		make \
-			prefix=${D}/usr \
-			install || die
-	)
-
-	use gnome && ( \
-		insinto /usr/share/gnome/apps/Internet
-		doins xchat.desktop
-	)
-
-	dodoc AUTHORS COPYING ChangeLog README
-}
diff --git a/net-irc/xchat/xchat-1.8.9-r3.ebuild b/net-irc/xchat/xchat-1.8.9-r3.ebuild
deleted file mode 100644
index ff1f36fa21f3..000000000000
--- a/net-irc/xchat/xchat-1.8.9-r3.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.8.9-r3.ebuild,v 1.9 2002/10/05 18:15:44 gerk Exp $
-
-IUSE="ssl nls mmx gnome ipv6 python kde gtk perl"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="X-Chat is a graphical IRC client for UNIX operating systems."
-SRC_URI="http://www.xchat.org/files/source/1.8/${P}.tar.bz2"
-HOMEPAGE="http://www.xchat.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc sparc64"
-
-RDEPEND="=x11-libs/gtk+-1.2*
-	python? ( >=dev-lang/python-2.2-r7 )
-	perl?   ( >=sys-devel/perl-5.6.1 )
-	gnome?  ( <gnome-base/gnome-panel-1.5.0
-				>=media-libs/gdk-pixbuf-0.11.0-r1 )
-	ssl?    ( >=dev-libs/openssl-0.9.6a )"
-
-DEPEND="${RDEPEND}
-	nls?    ( >=sys-devel/gettext-0.10.38 )"
-
-src_unpack() {
-
-	unpack ${A}
-	
-	cd ${S}
-	patch -p1 < ${FILESDIR}/${P}-euirc.diff
-	cp configure configure.orig
-
-	use python && ( \
-		local mylibs=`/usr/bin/python-config`
-		sed -e 's:PY_LIBS=".*":PY_LIBS="'"$mylibs"'":' \
-			configure.orig > configure
-	)
-}
-
-src_compile() {
-
-	local myopts myflags
-
-	if [ ! `use perl` ] ; then
-		use gnome \
-			&& myopts="${myopts} --enable-gnome --enable-panel" \
-			|| myopts="${myopts} --enable-gtkfe --disable-gnome --disable-zvt --disable-gdk-pixbuf"
-		
-		use gnome \
-			&& CFLAGS="${CFLAGS} -I/usr/include/orbit-1.0" \
-			|| myopts="${myopts} --disable-gnome"
-	else
-		myopts="${myopts} --disable-gnome"
-	fi
-
-	use gtk \
-		|| myopts="${myopts} --disable-gtkfe"
-	
-	use ssl \
-		&& myopts="${myopts} --enable-openssl"
-
-	use perl \
-		|| myopts="${myopts} --disable-perl"
-
-	use nls \
-		&& myopts="${myopts} --enable-hebrew --enable-japanese-conv" \
-		|| myopts="${myopts} --disable-nls"
-
-	if use x86
-	then
-		use mmx	\
-			&& myopts="${myopts} --enable-mmx"	\
-			|| myopts="${myopts} --disable-mmx"
-	fi
-	
-	use ipv6 \
-		&& myopts="${myopts} --enable-ipv6"
-	
-	use python \
-		&& myflags="`python-config`" \
-	 	&& myopts="${myopts} --enable-python"
-	
-
-	./configure \
-		--prefix=/usr \
-		--host=${CHOST} \
-		${myopts} || die
-	
-	emake || die
-}
-
-src_install() {
-	
-	use kde && ( \
-		make \
-			prefix=${D}/usr \
-			utildir=${D}${KDEDIR}/share/applnk/Internet \
-			install || die
-	) || ( \
-		make \
-			prefix=${D}/usr \
-			install || die
-	)
-
-	use gnome && ( \
-		insinto /usr/share/gnome/apps/Internet
-		doins xchat.desktop
-	)
-
-	dodoc AUTHORS COPYING ChangeLog README
-}
diff --git a/net-irc/xchat/xchat-1.9.5-r2.ebuild b/net-irc/xchat/xchat-1.9.5-r2.ebuild
index 48fb0aeb2a77..a72579834318 100644
--- a/net-irc/xchat/xchat-1.9.5-r2.ebuild
+++ b/net-irc/xchat/xchat-1.9.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.9.5-r2.ebuild,v 1.1 2002/11/21 01:03:07 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.9.5-r2.ebuild,v 1.2 2002/11/26 12:08:32 foser Exp $
 
 inherit eutils
 
@@ -34,6 +34,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-private-logging.patch
+	epatch ${FILESDIR}/${P}-fastdialogswitch.patch
 }
 
 src_compile() {
diff --git a/net-irc/xchat/xchat-1.9.5-r1.ebuild b/net-irc/xchat/xchat-1.9.6.ebuild
index 28aa36d3fbf2..a540ab554d42 100644
--- a/net-irc/xchat/xchat-1.9.5-r1.ebuild
+++ b/net-irc/xchat/xchat-1.9.6.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.9.5-r1.ebuild,v 1.1 2002/11/19 22:26:52 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-1.9.6.ebuild,v 1.1 2002/11/26 12:08:32 foser Exp $
 
-IUSE="perl gnome ssl gtk python mmx ipv6 nls kde" 
+inherit eutils
 
+IUSE="perl gnome ssl gtk python mmx ipv6 nls kde" 
 S=${WORKDIR}/${P}
 DESCRIPTION="X-Chat is a graphical IRC client for UNIX operating systems."
 SRC_URI="http://www.xchat.org/files/source/1.9/${P}.tar.bz2"
@@ -45,28 +46,32 @@ src_compile() {
 	fi
 
 	use gtk \
+		&& myopts="${myopts} --enable-gtkfe" \
 		|| myopts="${myopts} --disable-gtkfe"
 	
 	use ssl \
-		&& myopts="${myopts} --enable-openssl"
+		&& myopts="${myopts} --enable-openssl" \
+		|| mypots="${myopts} --disable-openssl"
 
 	use perl \
+		&& myopts="${myopts} --enable-perl" \
 		|| myopts="${myopts} --disable-perl"
 
 	use python \
+		&& myopts="${myopts} --enable-python" \
                 || myopts="${myopts} --disable-python"
 
 	use nls \
-		&& myopts="${myopts} --enable-hebrew --enable-japanese-conv" \
-		|| myopts="${myopts} --disable-nls"
+		&& myopts="${myopts} --enable-hebrew --enable-japanese-conv --enable-nls" \
+		|| myopts="${myopts} --disable-hebrew --enable-japanese-conv --disable-nls"
 
 	use mmx	\
 		&& myopts="${myopts} --enable-mmx"	\
 		|| myopts="${myopts} --disable-mmx"
 	
 	use ipv6 \
-		&& myopts="${myopts} --enable-ipv6"
-
+		&& myopts="${myopts} --enable-ipv6" \
+		|| myopts="${myopts} --disable-ipv6"
 
 	[ -n "${DISABLE_XFT}" ] && myopts="${myopts} --disable-xft"
 	
@@ -74,7 +79,7 @@ src_compile() {
 		--program-suffix=-2 \
 		${myopts} || die "Configure failed"
 	
-	MAKEOPTS="-j1" emake || die "Compile failed"
+	emake || die "Compile failed"
 }
 
 src_install() {