patched xchat for use with euirc networks

4 files changed, 256 insertions, 1 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index 70a2a6bc57f4..efc3197cad40 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,7 +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.11 2002/07/09 15:32:23 stroke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.12 2002/07/22 00:11:06 spider Exp $
 
+
+*xchat-1.8.9-r3 (21 Jul 2002)
+  21 Jul 2002; Spider <spider@gentoo.org> xchat-1.8.9-r3.ebuild :
+  Applied patch for euirc networks bug #4776
+  
 *xchat-1.9.2.ebuild (09 Jul 2002)
   09 Jul 2002; Gabriele Giorgetti <stroke@gentoo.org> xchat-1.9.2.ebuild:
   new unstable version, still masked. Added KEYWORDS, missing ssl support,
diff --git a/net-irc/xchat/files/digest-xchat-1.8.9-r3 b/net-irc/xchat/files/digest-xchat-1.8.9-r3
new file mode 100644
index 000000000000..2979470d8a7f
--- /dev/null
+++ b/net-irc/xchat/files/digest-xchat-1.8.9-r3
@@ -0,0 +1 @@
+MD5 a7d3723053fbee23399647f88afd15fa xchat-1.8.9.tar.bz2 747762
diff --git a/net-irc/xchat/files/xchat-1.8.9-euirc.diff b/net-irc/xchat/files/xchat-1.8.9-euirc.diff
new file mode 100644
index 000000000000..be7d20d3c694
--- /dev/null
+++ b/net-irc/xchat/files/xchat-1.8.9-euirc.diff
@@ -0,0 +1,147 @@
+diff -ur xchat-1.8.9/configure xchat-1.8.9-euirc/configure
+--- xchat-1.8.9/configure	Sat Apr 27 06:57:11 2002
++++ xchat-1.8.9-euirc/configure	Mon May 27 15:58:44 2002
+@@ -754,7 +754,7 @@
+ 
+ PACKAGE=xchat
+ 
+-VERSION=1.8.9
++VERSION=1.8.9-euIRC-0.1
+ 
+ if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
+   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
+diff -ur xchat-1.8.9/src/common/userlist.c xchat-1.8.9-euirc/src/common/userlist.c
+--- xchat-1.8.9/src/common/userlist.c	Tue Dec 25 04:58:10 2001
++++ xchat-1.8.9-euirc/src/common/userlist.c	Mon May 27 15:56:08 2002
+@@ -208,7 +208,12 @@
+ 	switch (prefix)
+ 	{
+ 	case '*':
++		user->founder = level;
++		sess->ops += offset;
++		break;
++	case '!':
+ 		user->admin = level;
++		sess->ops += offset;
+ 		break;
+ 	case '@':
+ 		user->op = level;
+diff -ur xchat-1.8.9/src/common/userlist.h xchat-1.8.9-euirc/src/common/userlist.h
+--- xchat-1.8.9/src/common/userlist.h	Wed Aug 15 11:28:01 2001
++++ xchat-1.8.9-euirc/src/common/userlist.h	Mon May 27 15:56:08 2002
+@@ -11,6 +11,7 @@
+ 	unsigned int access;	/* axs bit field */
+ 	char prefix; /* @ + % */
+ 	unsigned int admin:1;
++	unsigned int founder:1;
+ 	unsigned int op:1;
+ 	unsigned int hop:1;
+ 	unsigned int voice:1;
+diff -ur xchat-1.8.9/src/fe-gtk/Makefile.in xchat-1.8.9-euirc/src/fe-gtk/Makefile.in
+--- xchat-1.8.9/src/fe-gtk/Makefile.in	Mon May 20 05:44:31 2002
++++ xchat-1.8.9-euirc/src/fe-gtk/Makefile.in	Mon May 27 15:54:08 2002
+@@ -450,7 +450,7 @@
+ 	../common/../../config.h ../common/history.h gtkutil.h \
+ 	../pixmaps/globe.xpm ../pixmaps/server.xpm ../pixmaps/admin.xpm \
+ 	../pixmaps/op.xpm ../pixmaps/hop.xpm ../pixmaps/voice.xpm \
+-	../pixmaps/xchat_mini.xpm ../pixmaps/xchat.xpm
++	../pixmaps/xchat_mini.xpm ../pixmaps/xchat.xpm ../pixmaps/founder.xpm
+ plugingui.o: plugingui.c fe-gtk.h ../../config.h ../common/xchat.h \
+ 	../common/../../config.h ../common/history.h ../common/plugin.h \
+ 	../common/text.h ../common/util.h gtkutil.h
+diff -ur xchat-1.8.9/src/fe-gtk/pixmaps.c xchat-1.8.9-euirc/src/fe-gtk/pixmaps.c
+--- xchat-1.8.9/src/fe-gtk/pixmaps.c	Thu Aug  9 14:57:52 2001
++++ xchat-1.8.9-euirc/src/fe-gtk/pixmaps.c	Mon May 27 15:56:08 2002
+@@ -34,6 +34,7 @@
+ #include "../pixmaps/globe.xpm"
+ #include "../pixmaps/server.xpm"
+ #include "../pixmaps/admin.xpm"
++#include "../pixmaps/founder.xpm"
+ #include "../pixmaps/op.xpm"
+ #include "../pixmaps/hop.xpm"
+ #include "../pixmaps/voice.xpm"
+@@ -46,6 +47,7 @@
+ GdkPixmap *pix_globe;
+ GdkPixmap *pix_server;
+ GdkPixmap *pix_admin;
++GdkPixmap *pix_founder;
+ GdkPixmap *pix_op;
+ GdkPixmap *pix_hop;
+ GdkPixmap *pix_voice;
+@@ -55,6 +57,7 @@
+ GdkBitmap *mask_globe;
+ GdkBitmap *mask_server;
+ GdkBitmap *mask_admin;
++GdkBitmap *mask_founder;
+ GdkBitmap *mask_op;
+ GdkBitmap *mask_hop;
+ GdkBitmap *mask_voice;
+@@ -124,6 +127,7 @@
+ 	pixmap_load_from_data (&pix_globe,		&mask_globe,		globe_xpm);
+ 	pixmap_load_from_data (&pix_server,		&mask_server,		server_xpm);
+ 	pixmap_load_from_data (&pix_admin,		&mask_admin,		admin_xpm);
++	pixmap_load_from_data (&pix_founder,		&mask_founder,		founder_xpm);
+ 	pixmap_load_from_data (&pix_op,			&mask_op,			op_xpm);
+ 	pixmap_load_from_data (&pix_hop,			&mask_hop,			hop_xpm);	
+ 	pixmap_load_from_data (&pix_voice,		&mask_voice,		voice_xpm);
+diff -ur xchat-1.8.9/src/fe-gtk/pixmaps.h xchat-1.8.9-euirc/src/fe-gtk/pixmaps.h
+--- xchat-1.8.9/src/fe-gtk/pixmaps.h	Tue May 29 17:51:17 2001
++++ xchat-1.8.9-euirc/src/fe-gtk/pixmaps.h	Mon May 27 15:56:08 2002
+@@ -1,5 +1,6 @@
+ extern GdkPixmap *pix_globe;
+ extern GdkPixmap *pix_admin;
++extern GdkPixmap *pix_founder;
+ extern GdkPixmap *pix_op;
+ extern GdkPixmap *pix_hop;
+ extern GdkPixmap *pix_voice;
+@@ -9,6 +10,7 @@
+ 
+ extern GdkBitmap *mask_globe;
+ extern GdkBitmap *mask_admin;
++extern GdkBitmap *mask_founder;
+ extern GdkBitmap *mask_op;
+ extern GdkBitmap *mask_hop;
+ extern GdkBitmap *mask_voice;
+diff -ur xchat-1.8.9/src/fe-gtk/userlistgui.c xchat-1.8.9-euirc/src/fe-gtk/userlistgui.c
+--- xchat-1.8.9/src/fe-gtk/userlistgui.c	Sun Aug  5 15:30:24 2001
++++ xchat-1.8.9-euirc/src/fe-gtk/userlistgui.c	Mon May 27 15:56:08 2002
+@@ -41,6 +41,9 @@
+ 	switch (prefix)
+ 	{
+ 	case '*':
++		*mask = mask_founder;
++		return pix_founder;
++	case '!':
+ 		*mask = mask_admin;
+ 		return pix_admin;
+ 	case '@':
+diff -ur xchat-1.8.9/src/pixmaps/admin.xpm xchat-1.8.9-euirc/src/pixmaps/admin.xpm
+--- xchat-1.8.9/src/pixmaps/admin.xpm	Sat May 26 05:17:10 2001
++++ xchat-1.8.9-euirc/src/pixmaps/admin.xpm	Mon May 27 15:56:08 2002
+@@ -3,7 +3,7 @@
+ "7 7 4 1",
+ " 	c None",
+ "+	c #000000",
+-"@	c #FF4422",
++"@	c #800080",
+ "#	c #FFFFFF",
+ "  +++  ",
+ " +@@@+ ",
+diff -ur xchat-1.8.9/src/pixmaps/founder.xpm xchat-1.8.9-euirc/src/pixmaps/founder.xpm
+--- xchat-1.8.9/src/pixmaps/founder.xpm	Mon May 27 15:59:12 2002
++++ xchat-1.8.9-euirc/src/pixmaps/founder.xpm	Mon May 27 15:56:08 2002
+@@ -0,0 +1,14 @@
++/* XPM */
++static char * founder_xpm[] = {
++"7 7 4 1",
++" 	c None",
++"+	c #000000",
++"@	c #FF4422",
++"#	c #FFFFFF",
++"  +++  ",
++" +@@@+ ",
++"+@#@@@#",
++"+@@@@@#",
++"+@@@@@#",
++" +@@@# ",
++"  ###  "};
diff --git a/net-irc/xchat/xchat-1.8.9-r3.ebuild b/net-irc/xchat/xchat-1.8.9-r3.ebuild
new file mode 100644
index 000000000000..582631bf2276
--- /dev/null
+++ b/net-irc/xchat/xchat-1.8.9-r3.ebuild
@@ -0,0 +1,102 @@
+# Copyrigth 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.8.9-r3.ebuild,v 1.1 2002/07/22 00:11:06 spider Exp $
+
+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"
+
+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
+
+	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
+}