Revision bump, pull in a patch from upstream.

Package-Manager: portage-2.1.2_rc3-r6

5 files changed, 138 insertions, 9 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index c50155823058..20d519ab506c 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,12 @@
 # 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.219 2006/11/19 01:27:17 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.220 2006/12/18 19:31:46 swegener Exp $
+
+*xchat-2.6.8-r2 (18 Dec 2006)
+
+  18 Dec 2006; Sven Wegener <swegener@gentoo.org> +files/xc268-sec-url.diff,
+  +xchat-2.6.8-r2.ebuild:
+  Revision bump, pull in a patch from upstream.
 
 *xchat-2.6.8-r1 (19 Nov 2006)
 
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index e99afa406445..1ac62495c95e 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -17,6 +17,10 @@ AUX xc268-fix-teprivmsg.diff 1830 RMD160 7f54aa7c2cfc0ab61a14b78f31af70aa77b8031
 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 xc268-sec-url.diff 427 RMD160 edfc945cdf0d969c8eb3aba5ef84048455b5a303 SHA1 de37e2980cd2fae15940c18a1d594d7ba1fde078 SHA256 4bc665937af91d3279d748c9750b8be1e2ece95f296e522fbc49ecb6d9450a28
+MD5 10bc7c47147f320f5d3ec835c82a97e8 files/xc268-sec-url.diff 427
+RMD160 edfc945cdf0d969c8eb3aba5ef84048455b5a303 files/xc268-sec-url.diff 427
+SHA256 4bc665937af91d3279d748c9750b8be1e2ece95f296e522fbc49ecb6d9450a28 files/xc268-sec-url.diff 427
 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
@@ -50,14 +54,18 @@ EBUILD xchat-2.6.8-r1.ebuild 2658 RMD160 d5828a4d696f989629bd3018cd33a079e4842d6
 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-r2.ebuild 2699 RMD160 dc7e9643466db997b39613a0e0bdadc4a4934029 SHA1 054e07578cd4e699284f2f29c9f6b33e550657d4 SHA256 77ac446129011967f4111b4a3bfc8f6d55d859c66e35b8540b952280ca23339e
+MD5 23254c4c470338299ffc05adafff851c xchat-2.6.8-r2.ebuild 2699
+RMD160 dc7e9643466db997b39613a0e0bdadc4a4934029 xchat-2.6.8-r2.ebuild 2699
+SHA256 77ac446129011967f4111b4a3bfc8f6d55d859c66e35b8540b952280ca23339e xchat-2.6.8-r2.ebuild 2699
 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 32546 RMD160 c4b60f104093ba8efb3d955a8cccd812040733a9 SHA1 945bcda59416c7bb1ba29e4f13bc4323955e82f8 SHA256 f3d78b8f775f433066de1fbe3c50171a862f645d5013c7ab6b7000adc6bb5279
-MD5 1278f15d7d2f783addcf4da5d3852f61 ChangeLog 32546
-RMD160 c4b60f104093ba8efb3d955a8cccd812040733a9 ChangeLog 32546
-SHA256 f3d78b8f775f433066de1fbe3c50171a862f645d5013c7ab6b7000adc6bb5279 ChangeLog 32546
+MISC ChangeLog 32729 RMD160 88c2a00d025dbf8193511ae00361518efecb23f2 SHA1 41fd0f02ef6da84e4d8ef4cf6f6f2069ef468c9e SHA256 c2f2d107fde4088f20c6b3e314254e12490a3b944ee28bb88d3e794e0881e9b3
+MD5 fdcaa95dd757cfb5c6ab3127a063e1b8 ChangeLog 32729
+RMD160 88c2a00d025dbf8193511ae00361518efecb23f2 ChangeLog 32729
+SHA256 c2f2d107fde4088f20c6b3e314254e12490a3b944ee28bb88d3e794e0881e9b3 ChangeLog 32729
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
@@ -74,10 +82,13 @@ SHA256 fd605851afe1faabe72cb2f857d218dc60d0f3b81025691ea5674706ec856c13 files/di
 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
+MD5 4c0561946c0c7bfba57ee07bf3068a80 files/digest-xchat-2.6.8-r2 506
+RMD160 24ff22044247590ac3a256815b6fd38395d6130f files/digest-xchat-2.6.8-r2 506
+SHA256 fd605851afe1faabe72cb2f857d218dc60d0f3b81025691ea5674706ec856c13 files/digest-xchat-2.6.8-r2 506
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFX7KRI1lqEGTUzyQRAuI7AJ9VRuPeGP+G8o6EeFrxAwvFM7jUaQCdER5x
-1g9Bx6y7Dlns0hvW3eY6kHI=
-=sU3E
+iD8DBQFFhuyvI1lqEGTUzyQRAvLgAKC3sl0ZbNGCphAQmDes6Ec9O7inqgCgvXb8
+SQC1EMwRsy2hOfM2N8cq6AQ=
+=z1zI
 -----END PGP SIGNATURE-----
diff --git a/net-irc/xchat/files/digest-xchat-2.6.8-r2 b/net-irc/xchat/files/digest-xchat-2.6.8-r2
new file mode 100644
index 000000000000..58171d619aec
--- /dev/null
+++ b/net-irc/xchat/files/digest-xchat-2.6.8-r2
@@ -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-sec-url.diff b/net-irc/xchat/files/xc268-sec-url.diff
new file mode 100644
index 000000000000..8e9489167550
--- /dev/null
+++ b/net-irc/xchat/files/xc268-sec-url.diff
@@ -0,0 +1,12 @@
+--- xchat-2.6.8/src/common/util.c	2006-10-14 15:47:44.000000000 +1000
++++ xchat-2.6.8s1/src/common/util.c	2006-12-17 13:22:01.000000000 +1100
+@@ -1178,7 +1178,8 @@
+ 		if (*src != quote) *buf++ = '\\';
+ 	    }
+ 	    *buf++ = *src;
+-	} else if (isspace((unsigned char) *src)) {
++	/*} else if (isspace((unsigned char) *src)) {*/
++	} else if (*src == ' ') {
+ 	    if (*argv[argc]) {
+ 		buf++, argc++;
+ 		if (argc == argvAlloced) {
diff --git a/net-irc/xchat/xchat-2.6.8-r2.ebuild b/net-irc/xchat/xchat-2.6.8-r2.ebuild
new file mode 100644
index 000000000000..003b37ec5f6f
--- /dev/null
+++ b/net-irc/xchat/xchat-2.6.8-r2.ebuild
@@ -0,0 +1,94 @@
+# 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-r2.ebuild,v 1.1 2006/12/18 19:31:46 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
+	epatch "${FILESDIR}"/xc268-sec-url.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"
+}