Revision bump, with three patches from upstream. Closes bug #152138.

Package-Manager: portage-2.1.2_rc2

7 files changed, 256 insertions, 8 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index fedc22e2d7db..c50155823058 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/xchat
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.218 2006/11/10 06:45:58 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.219 2006/11/19 01:27:17 swegener Exp $
+
+*xchat-2.6.8-r1 (19 Nov 2006)
+
+  19 Nov 2006; Sven Wegener <swegener@gentoo.org> +files/xc268-fix-ja.diff,
+  +files/xc268-fix-teprivmsg.diff, +files/xchat-2.6.8-fe-text.patch,
+  +xchat-2.6.8-r1.ebuild:
+  Revision bump, with three patches from upstream. Closes bug #152138.
 
   10 Nov 2006; Doug Goldstein <cardoe@gentoo.org> xchat-2.6.6.ebuild,
   xchat-2.6.8.ebuild:
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index 9dc1780528b7..e99afa406445 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -9,6 +9,14 @@ AUX xc245-fix-te-notify.diff 403 RMD160 df48a5b90b8c4b2f1a8899f4b981527221c809cb
 MD5 17073299c8c2c65062ad2e77cd03b841 files/xc245-fix-te-notify.diff 403
 RMD160 df48a5b90b8c4b2f1a8899f4b981527221c809cb files/xc245-fix-te-notify.diff 403
 SHA256 1c4d1f4ec8006f6d0f15a9157c7a02730856225278d3fa1308593b557774d3aa files/xc245-fix-te-notify.diff 403
+AUX xc268-fix-ja.diff 398 RMD160 4316b14b6547295c79fa43c8ad81ba9ddd8c0e9d SHA1 e0ff2c75e9ce292e4f2e583546e99b14f3617be5 SHA256 ae377dbfbf41545db397277820b81d819c7932e0a26a0943d8f6cf1e66523ef0
+MD5 fdec919cf659ce931c8e00a9582f3949 files/xc268-fix-ja.diff 398
+RMD160 4316b14b6547295c79fa43c8ad81ba9ddd8c0e9d files/xc268-fix-ja.diff 398
+SHA256 ae377dbfbf41545db397277820b81d819c7932e0a26a0943d8f6cf1e66523ef0 files/xc268-fix-ja.diff 398
+AUX xc268-fix-teprivmsg.diff 1830 RMD160 7f54aa7c2cfc0ab61a14b78f31af70aa77b80316 SHA1 22d10ce095fea900e463af6fe9189a6927c5a5f5 SHA256 c98842702130a54435d0a2a283fb63a15d65fefc9aaa515945607e1f7b1f7f5c
+MD5 f34990cec0fae17027a8e73de3fbb005 files/xc268-fix-teprivmsg.diff 1830
+RMD160 7f54aa7c2cfc0ab61a14b78f31af70aa77b80316 files/xc268-fix-teprivmsg.diff 1830
+SHA256 c98842702130a54435d0a2a283fb63a15d65fefc9aaa515945607e1f7b1f7f5c files/xc268-fix-teprivmsg.diff 1830
 AUX xchat-2.6.4-fix-cursor.patch 573 RMD160 c34576decb09cd2d830364f9596aabb987a59632 SHA1 a91ee61344786514d371d01375a4231e895d0d69 SHA256 11d8772c68e31d9abab9d7de5440ab8db81e2a2dc1e87f525fa0a0c5518e636b
 MD5 2e88d0e5c2d41b8e04e93d41b4dcfa00 files/xchat-2.6.4-fix-cursor.patch 573
 RMD160 c34576decb09cd2d830364f9596aabb987a59632 files/xchat-2.6.4-fix-cursor.patch 573
@@ -21,6 +29,10 @@ AUX xchat-2.6.6-suffix.patch 647 RMD160 e0c40ec9eec26d9509b27f29c7b850b7d128ab98
 MD5 4ecf29fb5fa64661ca72b43126974480 files/xchat-2.6.6-suffix.patch 647
 RMD160 e0c40ec9eec26d9509b27f29c7b850b7d128ab98 files/xchat-2.6.6-suffix.patch 647
 SHA256 0ff0f4efb59a2ca4df872fd4bf4550cd063b8d5df8f823d1a83e0b790f604419 files/xchat-2.6.6-suffix.patch 647
+AUX xchat-2.6.8-fe-text.patch 1096 RMD160 b89f3a4056bc9d9240587cf5bc859e4b425880fb SHA1 ee0ea99a4fedb7124d4ef4c918e57925f315ede4 SHA256 996b79e6d114bd17ea7b3496da477e1b42402cc2728e52b59ccddd983970f42a
+MD5 5fa73fa52d3baf39ed6ec49010058857 files/xchat-2.6.8-fe-text.patch 1096
+RMD160 b89f3a4056bc9d9240587cf5bc859e4b425880fb files/xchat-2.6.8-fe-text.patch 1096
+SHA256 996b79e6d114bd17ea7b3496da477e1b42402cc2728e52b59ccddd983970f42a files/xchat-2.6.8-fe-text.patch 1096
 DIST xchat-2.4.5.tar.bz2 1324626 RMD160 19d1033d01af784f8b7af5103a7de8cf3a26f3fb SHA1 e027a20caa47b4ffea00896ee68269a7ae885e2d SHA256 44cabb5c31047d5a036495bc7fac64a5b86c8003bd575ea869bcd377032db2db
 DIST xchat-2.6.6.tar.bz2 1098934 RMD160 27cef034342dc831e2ddb11f8bd5f6cb727e8f93 SHA1 ba674165ad9f8e48acd2c0437bea6b1acc2871b9 SHA256 c4b38d29e6a9872c8ffde27c8866d8c3b9f1fe6e227cef5fed39bc79f983d44c
 DIST xchat-2.6.8.tar.bz2 1184287 RMD160 add965c1092c11f565110f127f402c900bedcec0 SHA1 7be12710c7461c8108524b763af83de89ae900f4 SHA256 7e239a43c5e293da57a0ee8dc1e383d243ec44b00e682558db93be3d2752611f
@@ -34,14 +46,18 @@ EBUILD xchat-2.6.6.ebuild 2556 RMD160 d7f3629116551f23958d8681adc055835ff2ed01 S
 MD5 1fdb7ba5e92d9b7ec7ce1465ca09a501 xchat-2.6.6.ebuild 2556
 RMD160 d7f3629116551f23958d8681adc055835ff2ed01 xchat-2.6.6.ebuild 2556
 SHA256 9bcdf2a67b3a531b369fb3893e2d2be9ba4affbe9f03c024129ca830757c8187 xchat-2.6.6.ebuild 2556
+EBUILD xchat-2.6.8-r1.ebuild 2658 RMD160 d5828a4d696f989629bd3018cd33a079e4842d67 SHA1 d6a56f1b481620ba762860e1a20742b588bb2549 SHA256 2289ebbfbec07ac337415f589aea542820c27682a06e9528e3c0e91af8edca6c
+MD5 08faaac7b710f6004855babaab26cc4a xchat-2.6.8-r1.ebuild 2658
+RMD160 d5828a4d696f989629bd3018cd33a079e4842d67 xchat-2.6.8-r1.ebuild 2658
+SHA256 2289ebbfbec07ac337415f589aea542820c27682a06e9528e3c0e91af8edca6c xchat-2.6.8-r1.ebuild 2658
 EBUILD xchat-2.6.8.ebuild 2517 RMD160 a22456b158d74ccfc926230e1c0c39e922297416 SHA1 a737d5d3a9efff83d98e898be5bf604b51318360 SHA256 290539940dd8e3a665d9e02502fc6f642cedf0494b53fc59097e6e7c073ab6b3
 MD5 38a0255435c4dee30b10ef63d4791755 xchat-2.6.8.ebuild 2517
 RMD160 a22456b158d74ccfc926230e1c0c39e922297416 xchat-2.6.8.ebuild 2517
 SHA256 290539940dd8e3a665d9e02502fc6f642cedf0494b53fc59097e6e7c073ab6b3 xchat-2.6.8.ebuild 2517
-MISC ChangeLog 32270 RMD160 63ae3b9b04741c89d623870c388efd8fdb961397 SHA1 e3c81655f4326710fd382f39fd092e00dfb247a3 SHA256 1f07cddc60038d7ea43102bc9d971f790a73530a69f49dcb4889ace229eba7f1
-MD5 8cff6fdae2c7287422e01abe0ad242b3 ChangeLog 32270
-RMD160 63ae3b9b04741c89d623870c388efd8fdb961397 ChangeLog 32270
-SHA256 1f07cddc60038d7ea43102bc9d971f790a73530a69f49dcb4889ace229eba7f1 ChangeLog 32270
+MISC ChangeLog 32546 RMD160 c4b60f104093ba8efb3d955a8cccd812040733a9 SHA1 945bcda59416c7bb1ba29e4f13bc4323955e82f8 SHA256 f3d78b8f775f433066de1fbe3c50171a862f645d5013c7ab6b7000adc6bb5279
+MD5 1278f15d7d2f783addcf4da5d3852f61 ChangeLog 32546
+RMD160 c4b60f104093ba8efb3d955a8cccd812040733a9 ChangeLog 32546
+SHA256 f3d78b8f775f433066de1fbe3c50171a862f645d5013c7ab6b7000adc6bb5279 ChangeLog 32546
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
@@ -55,10 +71,13 @@ SHA256 cac69c943207ddbb7d0ac2a4ac89d72a1a684910bb1b80b6921880c022beb815 files/di
 MD5 4c0561946c0c7bfba57ee07bf3068a80 files/digest-xchat-2.6.8 506
 RMD160 24ff22044247590ac3a256815b6fd38395d6130f files/digest-xchat-2.6.8 506
 SHA256 fd605851afe1faabe72cb2f857d218dc60d0f3b81025691ea5674706ec856c13 files/digest-xchat-2.6.8 506
+MD5 4c0561946c0c7bfba57ee07bf3068a80 files/digest-xchat-2.6.8-r1 506
+RMD160 24ff22044247590ac3a256815b6fd38395d6130f files/digest-xchat-2.6.8-r1 506
+SHA256 fd605851afe1faabe72cb2f857d218dc60d0f3b81025691ea5674706ec856c13 files/digest-xchat-2.6.8-r1 506
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFVCAOoeSe8B0zEfwRAtD/AJwNxhb9o8Yum2W48kUDFCYZBZUyggCfTSVX
-gi79md4X9pSvNe0y6oSEJuU=
-=Rr0p
+iD8DBQFFX7KRI1lqEGTUzyQRAuI7AJ9VRuPeGP+G8o6EeFrxAwvFM7jUaQCdER5x
+1g9Bx6y7Dlns0hvW3eY6kHI=
+=sU3E
 -----END PGP SIGNATURE-----
diff --git a/net-irc/xchat/files/digest-xchat-2.6.8-r1 b/net-irc/xchat/files/digest-xchat-2.6.8-r1
new file mode 100644
index 000000000000..58171d619aec
--- /dev/null
+++ b/net-irc/xchat/files/digest-xchat-2.6.8-r1
@@ -0,0 +1,6 @@
+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/xc268-fix-ja.diff b/net-irc/xchat/files/xc268-fix-ja.diff
new file mode 100644
index 000000000000..a3bd7830fe1a
--- /dev/null
+++ b/net-irc/xchat/files/xc268-fix-ja.diff
@@ -0,0 +1,14 @@
+#
+# 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
new file mode 100644
index 000000000000..9ce19687d5db
--- /dev/null
+++ b/net-irc/xchat/files/xc268-fix-teprivmsg.diff
@@ -0,0 +1,67 @@
+#
+# [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/xchat-2.6.8-fe-text.patch b/net-irc/xchat/files/xchat-2.6.8-fe-text.patch
new file mode 100644
index 000000000000..645ec96a4c6c
--- /dev/null
+++ b/net-irc/xchat/files/xchat-2.6.8-fe-text.patch
@@ -0,0 +1,42 @@
+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.6.8-r1.ebuild b/net-irc/xchat/xchat-2.6.8-r1.ebuild
new file mode 100644
index 000000000000..16aa52dac0ad
--- /dev/null
+++ b/net-irc/xchat/xchat-2.6.8-r1.ebuild
@@ -0,0 +1,93 @@
+# 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"
+}