add stable patches from xchat

6 files changed, 124 insertions, 3 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index d92710ce7817..0329ffead3c9 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/xchat
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.52 2003/05/16 16:06:49 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.53 2003/05/26 09:26:06 liquidx Exp $
+
+*xchat-2.0.2-r2 (26 May 2003)
+
+  26 May 2003; Alastair Tse <liquidx@gentoo.org> xchat-2.0.2-r2.ebuild,
+  files/xc202-fixdetach.diff, files/xc202-fixurlg.diff:
+  add post-release stable patches from xchat.org (#21459)
 
 *xchat-2.0.2-r1 (16 May 2003)
 
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index 8eb72533147f..b032a8ffd965 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -1,11 +1,11 @@
-MD5 bebc6aa21f58f995d141dac0509b28a9 ChangeLog 7613
+MD5 3cf976f563f05aa1a99ab484be470c63 ChangeLog 7833
 MD5 d6896c2421454aab5a0cefef7bed9946 xchat-1.8.10-r1.ebuild 2307
 MD5 5e5d21a6b4e47c04f504c69b4272b029 xchat-1.8.11.ebuild 2285
 MD5 e533d379622f911ced2832e22263f31b xchat-2.0.1.ebuild 1982
 MD5 d4b23b8ff3dd54a2ca5560884c64bf7f xchat-2.0.0.ebuild 1909
 MD5 e23102dd159394d07147429bcc35c3e6 xchat-2.0.2.ebuild 1982
 MD5 ed63b6200f3e7fe3087333cf3a8d1df4 xchat-2.0.2-r1.ebuild 2085
-MD5 326a0f2682ce0f8e049bdf990a85c84f xchat-2.0.2-r2.ebuild 2208
+MD5 37eaba9a63ecac8c87248336b021aab0 xchat-2.0.2-r2.ebuild 2198
 MD5 011b499714e85d4177185aabaeb1db15 files/00_all_tabs-leftright-and-gtk-icons.patch 13367
 MD5 fb93538acf146307088f7e6707ae3150 files/digest-xchat-2.0.2 64
 MD5 7c2450584076659603dc908ffc53b537 files/digest-xchat-1.8.10-r1 65
diff --git a/net-irc/xchat/files/digest-xchat-2.0.2-r2 b/net-irc/xchat/files/digest-xchat-2.0.2-r2
new file mode 100644
index 000000000000..8051bdcbb34b
--- /dev/null
+++ b/net-irc/xchat/files/digest-xchat-2.0.2-r2
@@ -0,0 +1 @@
+MD5 909a2855c891d7649e73bf9dfd628e1d xchat-2.0.2.tar.bz2 749398
diff --git a/net-irc/xchat/files/xc202-fixdetach.diff b/net-irc/xchat/files/xc202-fixdetach.diff
new file mode 100644
index 000000000000..2833b072751c
--- /dev/null
+++ b/net-irc/xchat/files/xc202-fixdetach.diff
@@ -0,0 +1,11 @@
+--- xchat-2.0.2/src/fe-gtk/tabs.c	2003-04-13 18:26:02.000000000 +1000
++++ xchat-2.0.2p1/src/fe-gtk/tabs.c	2003-04-25 02:00:24.000000000 +1000
+@@ -404,8 +406,6 @@
+ {
+ 	int i, max;
+ 
+-	while (g_main_pending ())
+-		g_main_iteration (TRUE);
+ 
+ 	tab_group_resize (group);
+ 
diff --git a/net-irc/xchat/files/xc202-fixurlg.diff b/net-irc/xchat/files/xc202-fixurlg.diff
new file mode 100644
index 000000000000..b0a24d423de0
--- /dev/null
+++ b/net-irc/xchat/files/xc202-fixurlg.diff
@@ -0,0 +1,23 @@
+--- xchat-2.0.2/src/fe-gtk/urlgrab.c	2003-04-19 01:44:01.000000000 +1000
++++ xchat-2.0.2p1/src/fe-gtk/urlgrab.c	2003-04-22 14:43:09.000000000 +1000
+@@ -169,6 +169,13 @@
+ 	}
+ }
+ 
++static int
++populate_cb (char *urltext, gpointer userdata)
++{
++	fe_url_add (urltext);
++	return TRUE;
++}
++
+ void
+ url_opengui ()
+ {
+@@ -202,5 +209,5 @@
+ 
+ 	gtk_widget_show (urlgrabberwindow);
+ 
+-	tree_foreach (url_tree, (tree_traverse_func *)fe_url_add, NULL);
++	tree_foreach (url_tree, (tree_traverse_func *)populate_cb, NULL);
+ }
diff --git a/net-irc/xchat/xchat-2.0.2-r2.ebuild b/net-irc/xchat/xchat-2.0.2-r2.ebuild
new file mode 100644
index 000000000000..b0dcb83c5ea9
--- /dev/null
+++ b/net-irc/xchat/xchat-2.0.2-r2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2003 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.2-r2.ebuild,v 1.1 2003/05/26 09:26:06 liquidx Exp $
+
+IUSE="perl tcltk python ssl gtk mmx ipv6" 
+
+S=${WORKDIR}/${P}
+
+DESCRIPTION="X-Chat is a graphical IRC client for UNIX operating systems."
+SRC_URI="http://www.xchat.org/files/source/2.0/${P}.tar.bz2"
+HOMEPAGE="http://www.xchat.org/"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+
+RDEPEND=">=dev-libs/glib-2.0.3
+	>=x11-libs/gtk+-2.0.3
+	perl?   ( >=dev-lang/perl-5.6.1 )
+	ssl?	( >=dev-libs/openssl-0.9.6d ) 
+	python? ( dev-lang/python )
+	tcltk? ( dev-lang/tcl )"               
+
+DEPEND="${RDEPEND}
+	nls? ( >=sys-devel/gettext-0.10.38 )"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/xc202-fixdetach.diff
+	epatch ${FILESDIR}/xc202-fixurlg.diff
+}
+
+src_compile() {
+	local myopts
+
+	use gtk \
+		&& myopts="${myopts} --enable-gtkfe" \
+		|| myopts="${myopts} --disable-gtkfe"
+	use ssl \
+		&& myopts="${myopts} --enable-openssl" \
+		|| myopts="${myopts} --disable-openssl"
+	use perl \
+		&& myopts="${myopts} --enable-perl" \
+		|| myopts="${myopts} --disable-perl"
+	use python \
+		&& myopts="${myopts} --enable-python" \
+                || myopts="${myopts} --disable-python"
+	use tcltk \
+		&& myopts="${myopts} --enable-tcl" \
+                || myopts="${myopts} --disable-tcl"
+	use mmx	\
+		&& myopts="${myopts} --enable-mmx" \
+		|| myopts="${myopts} --disable-mmx"
+	use ipv6 \
+		&& myopts="${myopts} --enable-ipv6" \
+		|| myopts="${myopts} --disable-ipv6"
+
+	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"
+
+	# install plugin development header
+	insinto /usr/include/xchat	
+	doins src/common/xchat-plugin.h
+
+	! has_version "<xchat-2" \
+		&& dosym /usr/bin/xchat-2 /usr/bin/xchat
+
+	dodoc AUTHORS COPYING ChangeLog README*
+}