fixes

8 files changed, 23 insertions, 467 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index 212edf30345f..8c564829c44c 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,8 +1,12 @@
 # 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.39 2003/01/26 10:30:08 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.40 2003/01/27 15:58:45 foser Exp $
 
 *xchat-2.0.0pre1 (26 Jan 2003)
+
+  27 Jan 2003; foser <foser@gentoo.org> xchat-2.0.0_pre1.ebuild :
+  cleanups, added tcltk USE
+
   26 Jan 2003; Thomas Raschbacher <lordvan@gentoo.org> xchat-2.0.0_pre1.ebuild:
   new version
 
diff --git a/net-irc/xchat/files/digest-xchat-1.9.5-r2 b/net-irc/xchat/files/digest-xchat-1.9.5-r2
deleted file mode 100644
index 73aa3bc57e3e..000000000000
--- a/net-irc/xchat/files/digest-xchat-1.9.5-r2
+++ /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
deleted file mode 100644
index e4a3ea4658ac..000000000000
--- a/net-irc/xchat/files/digest-xchat-1.9.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dc81d4440ac3dac3b30129f0b28c1433 xchat-1.9.6.tar.bz2 821649
diff --git a/net-irc/xchat/files/xchat-1.9.5-fastdialogswitch.patch b/net-irc/xchat/files/xchat-1.9.5-fastdialogswitch.patch
deleted file mode 100644
index e42f4dfc4b00..000000000000
--- a/net-irc/xchat/files/xchat-1.9.5-fastdialogswitch.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-diff -ru --exclude=po --exclude=intl --exclude=Makefile.in xchat-1.9.5/src/fe-gtk/maingui.c xchat-1.9.6/src/fe-gtk/maingui.c
---- xchat-1.9.5/src/fe-gtk/maingui.c	2002-11-17 17:58:04.000000000 +1100
-+++ xchat-1.9.6/src/fe-gtk/maingui.c	2002-11-17 22:17:55.000000000 +1100
-@@ -345,32 +345,6 @@
- 	userlist_show (sess);
- 	userlist_set_value (sess->gui->user_tree, sess->res->old_ul_value);
- 
--	switch (sess->type)
--	{
--	case SESS_DIALOG:
--		/* show the dialog buttons */
--		gtk_widget_show (gui->dialogbutton_box);
--		/* hide the chan-mode buttons */
--		gtk_widget_hide (gui->topicbutton_box);
--		/* hide the userlist */
--		gtk_widget_hide (gui->user_box);
--		break;
--	case SESS_SERVER:
--		gtk_widget_show (gui->topicbutton_box);
--		/* hide the dialog buttons */
--		gtk_widget_hide (gui->dialogbutton_box);
--		/* hide the userlist */
--		gtk_widget_hide (gui->user_box);
--		break;
--	default:
--		/* hide the dialog buttons */
--		gtk_widget_hide (gui->dialogbutton_box);
--		gtk_widget_show (gui->topicbutton_box);
--		/* show the userlist */
--		if (!prefs.hideuserlist)
--			gtk_widget_show (gui->user_box);
--	}
--
- 	ul_tag = 0;
- 	return 0;
- }
-@@ -382,9 +356,10 @@
- {
- 	session_gui *gui = sess->gui;
- 	restore_gui *res = sess->res;
--	int i;
-+	int i, vis, render = TRUE;
-+
-+	vis = GTK_WIDGET_VISIBLE (gui->user_box);
- 
--#if 0
- 	switch (sess->type)
- 	{
- 	case SESS_DIALOG:
-@@ -410,12 +385,18 @@
- 		if (!prefs.hideuserlist)
- 			gtk_widget_show (gui->user_box);
- 	}
--#endif
- 
- 	/* move to THE irc tab */
- 	if (gui->is_tab)
- 		gtk_notebook_set_current_page (GTK_NOTEBOOK (gui->note_book), 0);
--	gtk_xtext_buffer_show (GTK_XTEXT (gui->xtext), res->buffer);
-+
-+	/* userlist CHANGED? Let the pending exposure draw the xtext */
-+	if (vis && !GTK_WIDGET_VISIBLE (gui->user_box))
-+		render = FALSE;
-+	if (!vis && GTK_WIDGET_VISIBLE (gui->user_box))
-+		render = FALSE;
-+
-+	gtk_xtext_buffer_show (GTK_XTEXT (gui->xtext), res->buffer, render);
- 	GTK_XTEXT (gui->xtext)->color_paste = sess->color_paste;
- 
- 	if (gui->is_tab)
-@@ -1802,7 +1783,7 @@
- 	if (sess->res->buffer == NULL)
- 	{
- 		sess->res->buffer = gtk_xtext_buffer_new (GTK_XTEXT (sess->gui->xtext));
--		gtk_xtext_buffer_show (GTK_XTEXT (sess->gui->xtext), sess->res->buffer);
-+		gtk_xtext_buffer_show (GTK_XTEXT (sess->gui->xtext), sess->res->buffer, TRUE);
- 		sess->res->user_model = userlist_create_model ();
- 	}
- 
-diff -ru --exclude=po --exclude=intl --exclude=Makefile.in xchat-1.9.5/src/fe-gtk/xtext.c xchat-1.9.6/src/fe-gtk/xtext.c
---- xchat-1.9.5/src/fe-gtk/xtext.c	2002-11-17 15:06:11.000000000 +1100
-+++ xchat-1.9.6/src/fe-gtk/xtext.c	2002-11-18 14:40:43.000000000 +1100
-@@ -1011,13 +1011,23 @@
- {
- 	GtkXText *xtext = GTK_XTEXT (widget);
- 	int height_only = FALSE;
-+	int do_trans = TRUE;
- 
--	if (allocation->width == widget->allocation.width)
-+	if (allocation->width == xtext->buffer->window_width)
- 		height_only = TRUE;
- 
-+	if (allocation->x == widget->allocation.x &&
-+		 allocation->y == widget->allocation.y && xtext->avoid_trans)
-+		do_trans = FALSE;
-+
-+	xtext->avoid_trans = FALSE;
-+
- 	widget->allocation = *allocation;
- 	if (GTK_WIDGET_REALIZED (widget))
- 	{
-+		xtext->buffer->window_width = allocation->width;
-+		xtext->buffer->window_height = allocation->height;
-+
- 		gdk_window_move_resize (widget->window, allocation->x, allocation->y,
- 										allocation->width, allocation->height);
- 		if (!height_only)
-@@ -1028,7 +1038,7 @@
- 			gtk_xtext_adjustment_set (xtext->buffer, FALSE);
- 		}
- #ifdef USE_XLIB
--		if (xtext->transparent && xtext->shaded)
-+		if (do_trans && xtext->transparent && xtext->shaded)
- 		{
- 			gtk_xtext_free_trans (xtext);
- 			gtk_xtext_load_trans (xtext);
-@@ -3502,13 +3512,8 @@
- 	unsigned char *str;
- 	int indent, taken, len;
- 	int win_width;
--	GtkXText *xtext = buf->xtext;
- 
--	if (!GTK_WIDGET_REALIZED (xtext))
--	  return 1;
--
--	gdk_drawable_get_size (GTK_WIDGET (xtext)->window, &win_width, NULL);
--	win_width -= MARGIN;
-+	win_width = buf->window_width - MARGIN;
- 
- 	if (ent->str_width + ent->indent < win_width)
- 		return 1;
-@@ -3519,7 +3524,7 @@
- 
- 	do
- 	{
--		len = find_next_wrap (xtext, ent, str, win_width, indent);
-+		len = find_next_wrap (buf->xtext, ent, str, win_width, indent);
- 		indent = buf->indent;
- 		taken++;
- 		str += len;
-@@ -4169,7 +4174,7 @@
- }
- 
- void
--gtk_xtext_buffer_show (GtkXText *xtext, xtext_buffer *buf)
-+gtk_xtext_buffer_show (GtkXText *xtext, xtext_buffer *buf, int render)
- {
- 	int w, h;
- 
-@@ -4185,14 +4190,6 @@
- 
- 	gdk_drawable_get_size (GTK_WIDGET (xtext)->window, &w, &h);
- 
--	if (xtext->buffer)
--	{
--		/* record the win size, so we can calc_lines() if the
--		 * window size changes while this buffer isn't active */
--		xtext->buffer->window_width = w;
--		xtext->buffer->window_height = h;
--	}
--
- 	/* now change to the new buffer */
- 	xtext->buffer = buf;
- 	xtext->adj->value = buf->old_value;
-@@ -4206,21 +4203,30 @@
- 		xtext->adj->value = xtext->adj->upper - xtext->adj->page_size;
- 	}
- 
--	/* did the window change size since this buffer was last shown? */
--	if (buf->window_width != w)
-+	if (render)
- 	{
--		gtk_xtext_calc_lines (buf, FALSE);
--		if (buf->scrollbar_down)
--			gtk_adjustment_set_value (xtext->adj, xtext->adj->upper -
--											  xtext->adj->page_size);
--	} else if (buf->window_height != h)
-+		/* did the window change size since this buffer was last shown? */
-+		if (buf->window_width != w)
-+		{
-+			buf->window_width = w;
-+			gtk_xtext_calc_lines (buf, FALSE);
-+			if (buf->scrollbar_down)
-+				gtk_adjustment_set_value (xtext->adj, xtext->adj->upper -
-+												  xtext->adj->page_size);
-+		} else if (buf->window_height != h)
-+		{
-+			buf->window_height = h;
-+			buf->pagetop_ent = NULL;
-+			gtk_xtext_adjustment_set (buf, FALSE);
-+		}
-+
-+		gtk_xtext_render_page (xtext);
-+		gtk_adjustment_changed (xtext->adj);
-+	} else
- 	{
--		buf->pagetop_ent = NULL;
--		gtk_xtext_adjustment_set (buf, FALSE);
-+		/* avoid redoing the transparency */
-+		xtext->avoid_trans = TRUE;
- 	}
--
--	gtk_xtext_render_page (xtext);
--	gtk_adjustment_changed (xtext->adj);
- }
- 
- xtext_buffer *
-diff -ru --exclude=po --exclude=intl --exclude=Makefile.in xchat-1.9.5/src/fe-gtk/xtext.h xchat-1.9.6/src/fe-gtk/xtext.h
---- xchat-1.9.5/src/fe-gtk/xtext.h	2002-11-12 18:30:38.000000000 +1100
-+++ xchat-1.9.6/src/fe-gtk/xtext.h	2002-11-18 14:35:06.000000000 +1100
-@@ -176,6 +176,7 @@
- 	unsigned int in_hilight:1;
- 	unsigned int un_hilight:1;
- 	unsigned int recycle:1;
-+	unsigned int avoid_trans:1;
- };
- 
- struct _GtkXTextClass
-@@ -216,6 +217,6 @@
- 
- xtext_buffer *gtk_xtext_buffer_new (GtkXText *xtext);
- void gtk_xtext_buffer_free (xtext_buffer *buf);
--void gtk_xtext_buffer_show (GtkXText *xtext, xtext_buffer *buf);
-+void gtk_xtext_buffer_show (GtkXText *xtext, xtext_buffer *buf, int render);
- 
- #endif
diff --git a/net-irc/xchat/files/xchat-1.9.5-private-logging.patch b/net-irc/xchat/files/xchat-1.9.5-private-logging.patch
deleted file mode 100644
index 894031942890..000000000000
--- a/net-irc/xchat/files/xchat-1.9.5-private-logging.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- xchat-1.9.5/src/common/xchat.c	2002-11-17 01:04:04.000000000 -0500
-+++ xchat-1.9.5.modified/src/common/xchat.c	2002-11-19 01:04:53.000000000 -0500
-@@ -330,9 +330,13 @@
- 		serv->server_session = sess;
- 		serv->front_session = sess;
- 		break;
-+	case SESS_DIALOG:
-+		sess = new_session (serv, name, type);
-+		if (prefs.logging)
-+			log_open (sess);
-+		break;
- 	default:
- /*	case SESS_CHANNEL:
--	case SESS_DIALOG:
- 	case SESS_NOTICES:
- 	case SESS_SNOTICES:*/
- 		sess = new_session (serv, name, type);
diff --git a/net-irc/xchat/xchat-1.9.5-r2.ebuild b/net-irc/xchat/xchat-1.9.5-r2.ebuild
deleted file mode 100644
index f80fcbd8d94e..000000000000
--- a/net-irc/xchat/xchat-1.9.5-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# 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.4 2002/12/09 04:33:13 manson Exp $
-
-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"
-HOMEPAGE="http://www.xchat.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="x86 ~ppc ~sparc "
-
-RDEPEND=">=dev-libs/glib-2.0.4
-	>=x11-libs/gtk+-2.0.5
-	perl?   ( >=sys-devel/perl-5.6.1 )
-	gnome? ( >=x11-libs/libzvt-2.0.1
-		 >=gnome-base/libgnome-2.0.1
-		 >=gnome-base/gnome-applets-2.0.0
-		 >=gnome-base/gnome-panel-2.0.1 )
-	ssl?	( >=dev-libs/openssl-0.9.6d )" 
-               
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.10.38 )"
-
-# From the xchat 1.9.3 README_FIRST file:
-# (one of the) REMAINING PROBLEMS:
-# * can't compile with gnome, panel and zvt support *
-# stroke 
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-private-logging.patch
-	epatch ${FILESDIR}/${P}-fastdialogswitch.patch
-}
-
-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"
-		
-		use gnome \
-			&& CFLAGS="${CFLAGS} -I/usr/include/orbit-2.0" \
-			|| myopts="${myopts} --disable-gnome"
-	fi
-
-	use gtk \
-		|| myopts="${myopts} --disable-gtkfe"
-	
-	use ssl \
-		&& myopts="${myopts} --enable-openssl"
-
-	use perl \
-		|| myopts="${myopts} --disable-perl"
-
-	use python \
-                || myopts="${myopts} --disable-python"
-
-	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"
-
-
-	[ -n "${DISABLE_XFT}" ] && myopts="${myopts} --disable-xft"
-	
-	econf \
-		--program-suffix=-2 \
-		${myopts} || die "Configure failed"
-	
-	MAKEOPTS="-j1" emake || die "Compile failed"
-}
-
-src_install() {
-	# some magic to create a menu entry for xchat 2	
-	mv xchat.desktop xchat.desktop.old
-	sed -e "s:Exec=xchat:Exec=xchat-2:" -e "s:Name=XChat IRC:Name=XChat 2 IRC:" xchat.desktop.old > xchat.desktop
-
-	einstall install || die "Install failed"
-
-	dodoc AUTHORS COPYING ChangeLog README
-}
-
-pkg_postinst() {
-	einfo "If you want X-Chat to correctly display Hebrew (bidi) do "
-	einfo "'export DISABLE_XFT=1' and re-emerge xchat"
-}
diff --git a/net-irc/xchat/xchat-1.9.6.ebuild b/net-irc/xchat/xchat-1.9.6.ebuild
deleted file mode 100644
index 2ce3ea9e2ca0..000000000000
--- a/net-irc/xchat/xchat-1.9.6.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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.6.ebuild,v 1.4 2002/12/09 04:33:13 manson Exp $
-
-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"
-HOMEPAGE="http://www.xchat.org/"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="x86 ~ppc ~sparc "
-
-RDEPEND=">=dev-libs/glib-2.0.4
-	>=x11-libs/gtk+-2.0.5
-	perl?   ( >=sys-devel/perl-5.6.1 )
-	gnome? ( >=x11-libs/libzvt-2.0.1
-		 >=gnome-base/libgnome-2.0.1
-		 >=gnome-base/gnome-applets-2.0.0
-		 >=gnome-base/gnome-panel-2.0.1 )
-	ssl?	( >=dev-libs/openssl-0.9.6d )" 
-               
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.10.38 )"
-
-# From the xchat 1.9.3 README_FIRST file:
-# (one of the) REMAINING PROBLEMS:
-# * can't compile with gnome, panel and zvt support *
-# stroke 
-
-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"
-		
-		use gnome \
-			&& CFLAGS="${CFLAGS} -I/usr/include/orbit-2.0" \
-			|| myopts="${myopts} --disable-gnome"
-	fi
-
-	use gtk \
-		|| myopts="${myopts} --disable-gtkfe"
-	
-	use ssl \
-		&& myopts="${myopts} --enable-openssl"
-
-	use perl \
-		|| myopts="${myopts} --disable-perl"
-
-	use python \
-                || myopts="${myopts} --disable-python"
-
-	use nls \
-		&& myopts="${myopts} --enable-nls --enable-hebrew" \
-		|| myopts="${myopts} --disable-nls --disable-hebrew"
-	# --enable-japanese-conv  is broken in xchat-1.9.6
-
-	use mmx	\
-		&& myopts="${myopts} --enable-mmx"	\
-		|| myopts="${myopts} --disable-mmx"
-	
-	use ipv6 \
-		&& myopts="${myopts} --enable-ipv6"
-
-
-	[ -n "${DISABLE_XFT}" ] && myopts="${myopts} --disable-xft"
-	
-	econf \
-		--program-suffix=-2 \
-		${myopts} || die "Configure failed"
-	
-	MAKEOPTS="-j1" emake || die "Compile failed"
-}
-
-src_install() {
-	# some magic to create a menu entry for xchat 2	
-	mv xchat.desktop xchat.desktop.old
-	sed -e "s:Exec=xchat:Exec=xchat-2:" -e "s:Name=XChat IRC:Name=XChat 2 IRC:" xchat.desktop.old > xchat.desktop
-
-	einstall install || die "Install failed"
-
-	dodoc AUTHORS COPYING ChangeLog README
-}
-
-pkg_postinst() {
-	einfo "If you want X-Chat to correctly display Hebrew (bidi) do "
-	einfo "'export DISABLE_XFT=1' and re-emerge xchat"
-}
diff --git a/net-irc/xchat/xchat-2.0.0_pre1.ebuild b/net-irc/xchat/xchat-2.0.0_pre1.ebuild
index 4b823eee9457..32e3bd05b024 100644
--- a/net-irc/xchat/xchat-2.0.0_pre1.ebuild
+++ b/net-irc/xchat/xchat-2.0.0_pre1.ebuild
@@ -1,13 +1,16 @@
 # 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-2.0.0_pre1.ebuild,v 1.1 2003/01/26 10:30:08 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.0.0_pre1.ebuild,v 1.2 2003/01/27 15:58:45 foser Exp $
 
 inherit eutils
 
-IUSE="perl gnome ssl gtk python mmx ipv6 nls kde" 
-S=${WORKDIR}/xchat-2.0.0pre1
+IUSE="perl tcltk python gnome ssl gtk mmx ipv6 nls" 
+
+P=${PN}-${PV/_/}
+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/xchat-2.0.0pre1.tar.bz2"
+SRC_URI="http://www.xchat.org/files/source/1.9/${P}.tar.bz2"
 HOMEPAGE="http://www.xchat.org/"
 
 LICENSE="GPL-2"
@@ -19,24 +22,18 @@ RDEPEND=">=dev-libs/glib-2.0.3
 	perl?   ( >=sys-devel/perl-5.6.1 )
 	gnome? ( >=gnome-base/libgnome-2.0 )
 	ssl?	( >=dev-libs/openssl-0.9.6d ) 
-	python? ( dev-lang/python )"               
+	python? ( dev-lang/python )
+	tcltk? ( dev-lang/tcl )"               
 
 DEPEND="${RDEPEND}
 	nls? ( >=sys-devel/gettext-0.10.38 )"
 
 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"
-		
-	#	use gnome \
-	#		&& CFLAGS="${CFLAGS} -I/usr/include/orbit-2.0" \
-	#		|| myopts="${myopts} --disable-gnome"
-	fi
+	local myopts
 
+	use gnome \
+		&& myopts="${myopts} --enable-gnome" \
+		|| myopts="${myopts} --disable-gnome"
 	use gtk \
 		&& myopts="${myopts} --enable-gtkfe" \
 		|| myopts="${myopts} --disable-gtkfe"
@@ -49,19 +46,19 @@ src_compile() {
 	use python \
 		&& myopts="${myopts} --enable-python" \
                 || myopts="${myopts} --disable-python"
+	use tcltk \
+		&& myopts="${myopts} --enable-tcl" \
+                || myopts="${myopts} --disable-tcl"
 	use nls \
 		&& myopts="${myopts} --enable-nls" \
 		|| myopts="${myopts} --disable-nls"
 	use mmx	\
-		&& myopts="${myopts} --enable-mmx"	\
+		&& myopts="${myopts} --enable-mmx" \
 		|| myopts="${myopts} --disable-mmx"
 	use ipv6 \
 		&& myopts="${myopts} --enable-ipv6" \
 		|| myopts="${myopts} --disable-ipv6"
 
-# pango renderer standard now
-#	[ -n "${DISABLE_XFT}" ] && myopts="${myopts} --disable-xft"
-	
 	econf \
 		--program-suffix=-2 \
 		${myopts} || die "Configure failed"
@@ -76,10 +73,5 @@ src_install() {
 
 	einstall install || die "Install failed"
 
-	dodoc AUTHORS COPYING ChangeLog README
+	dodoc AUTHORS COPYING ChangeLog README*
 }
-
-#pkg_postinst() {
-#	einfo "If you want X-Chat to correctly display Hebrew (bidi) do "
-#	einfo "'export DISABLE_XFT=1' and re-emerge xchat"
-#}