Version bump wrt bug #136124

Package-Manager: portage-2.1.1_pre2-r2

6 files changed, 172 insertions, 5 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index 41e028df03e6..fe0e7e130b37 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.199 2006/06/10 03:06:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.200 2006/07/05 07:40:15 jokey Exp $
+
+*xchat-2.6.4 (05 Jul 2006)
+
+  05 Jul 2006; Markus Ullmann <jokey@gentoo.org>
+  +files/xchat-2.6.4-fix-cursor.patch, +files/xchat-2.6.4-fix-proxy.patch,
+  +xchat-2.6.4.ebuild:
+  Version bump wrt bug #136124
 
   10 Jun 2006; Michael Sterrett <mr_bones_@gentoo.org> xchat-2.4.3.ebuild,
   xchat-2.4.5.ebuild, xchat-2.4.5-r1.ebuild, xchat-2.6.1.ebuild,
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index aebf353b88dd..f6bfb2ecaa19 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.6.1-fe-text.patch 544 RMD160 d794a4501c686d2c3e9434fa415893e6a7ef3f0b SHA1 8ea0cbba1342f82da523b2f41272db3ea275a231 SHA256 2f1164ea978e96458b7d3b4c29939d29225f3f21322e95742264b4a0356d7aaa
 MD5 041a8391e34746696777938dc261066b files/2.6.1-fe-text.patch 544
 RMD160 d794a4501c686d2c3e9434fa415893e6a7ef3f0b files/2.6.1-fe-text.patch 544
@@ -18,6 +21,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 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
+SHA256 11d8772c68e31d9abab9d7de5440ab8db81e2a2dc1e87f525fa0a0c5518e636b files/xchat-2.6.4-fix-cursor.patch 573
+AUX xchat-2.6.4-fix-proxy.patch 450 RMD160 f75495b601e5620e1127e61c89db3bda2560bb80 SHA1 1da5f57f5502caafba1b9f397a6108c7b469c21a SHA256 6f1a03d7e2bb6b01071fff26589846f3ccffca7091bb0bb408e75d1346d80b40
+MD5 050bd58e8e6428c25c5c0bbff642a9fa files/xchat-2.6.4-fix-proxy.patch 450
+RMD160 f75495b601e5620e1127e61c89db3bda2560bb80 files/xchat-2.6.4-fix-proxy.patch 450
+SHA256 6f1a03d7e2bb6b01071fff26589846f3ccffca7091bb0bb408e75d1346d80b40 files/xchat-2.6.4-fix-proxy.patch 450
 AUX xchat-dccserver-0.5.patch 11776 RMD160 21c97e84b11417c730663a1a22b7df4e0fee99ce SHA1 1c24e67ae496cc7d47c569a28ff4ce09928f80fb SHA256 94b51262d90bc8e8a09829cf944e9370ea3d5c252f1472799651d45a96de1de2
 MD5 ee98eba7f1061680d8d0582a10d72cb7 files/xchat-dccserver-0.5.patch 11776
 RMD160 21c97e84b11417c730663a1a22b7df4e0fee99ce files/xchat-dccserver-0.5.patch 11776
@@ -27,7 +38,9 @@ DIST xchat-2.4.3.tar.bz2 1259520 RMD160 2222632f2c3db2eac260547e952047bcc450b731
 DIST xchat-2.4.5.tar.bz2 1324626 RMD160 19d1033d01af784f8b7af5103a7de8cf3a26f3fb SHA256 44cabb5c31047d5a036495bc7fac64a5b86c8003bd575ea869bcd377032db2db
 DIST xchat-2.6.1.tar.bz2 996111 RMD160 88138d4c92ee2712eff045957a76a1502af47e7f SHA256 4827a11db099d4968183d322e326ea5657ddec560c3f2ceef8d210d0a3b83584
 DIST xchat-2.6.2.tar.bz2 1046910 RMD160 d7c1d0a02c9575898f68bdbd6e90d5a2fb8cb2ff SHA256 a184d42a8130e5a4151e0190ba45dc3440c49270818fec02f35bca932da64f9c
+DIST xchat-2.6.4.tar.bz2 1083938 RMD160 998069aa49e7b26dd98d53173e9dc67f947f95a2 SHA1 84bb9e2b3f8eef03c199208c81520c20a172e825 SHA256 76e67fc03d3318d6159d1f22408c607bfa72e5e7687ddcb8969c95a01bcf4222
 DIST xchat-dccserver-0.4.patch 11767 RMD160 09da784890316141a04502ed6179a5cef60f6352 SHA256 1d64e4447587c111f995cb6b5fa9bdc37f0f142c4aabdb1db57135ee86e4df7e
+DIST xchat-dccserver-0.6.patch.bz2 49320 RMD160 24cc9bd414b1dd0e7e38ba9a49d12257aeb89e68 SHA1 e7b8b58cf7f647ff8778c7542cd46e9b22987385 SHA256 90a49a8d810380020c507c1a36f02e7d972cf92b5e4802dcd5cc518cba29078f
 EBUILD xchat-1.8.11-r1.ebuild 2264 RMD160 d385b9f013ced7af59498fe59ad15f8a205bd8c0 SHA1 f4bb51c3e637808e9b98afa0c2587075582790d2 SHA256 52ca3be93bf11db829bc99f1c01aa19b7c07fd0669c6df9d9be6a9e05949c712
 MD5 4634f562e01b219d3bcfb0ae6acb8397 xchat-1.8.11-r1.ebuild 2264
 RMD160 d385b9f013ced7af59498fe59ad15f8a205bd8c0 xchat-1.8.11-r1.ebuild 2264
@@ -52,10 +65,14 @@ EBUILD xchat-2.6.2.ebuild 2241 RMD160 e27213620825bfa4393c61a7a4870a7b3f3ad927 S
 MD5 2a84ee5a9b8dc8a0644aca6ac6b29783 xchat-2.6.2.ebuild 2241
 RMD160 e27213620825bfa4393c61a7a4870a7b3f3ad927 xchat-2.6.2.ebuild 2241
 SHA256 b8941e2244174ad04ff2a03d669750c094e5c86e2979c40ddbd679c20a52f825 xchat-2.6.2.ebuild 2241
-MISC ChangeLog 29502 RMD160 7412faabfb597335ce99d98529ddb9f2fee0f893 SHA1 f79e3b8dde6ded800e17f54344ff17ca820c3b96 SHA256 429549b52d78d56f2874ff4ae5ff1e3ebbb16f2b83eca10af9e04e0c2108cfe0
-MD5 3794880017fdd12d1c06dc1019cea4f3 ChangeLog 29502
-RMD160 7412faabfb597335ce99d98529ddb9f2fee0f893 ChangeLog 29502
-SHA256 429549b52d78d56f2874ff4ae5ff1e3ebbb16f2b83eca10af9e04e0c2108cfe0 ChangeLog 29502
+EBUILD xchat-2.6.4.ebuild 2521 RMD160 2477fd7032d68603391278b1169d7231bb8304cd SHA1 30cd03937f4d8e4a0db9190643d02faa3a03b4fc SHA256 16b25a4cf4a2ab6cc9aa373838dc0a4b784a1135da6beb43d739811e2f0a8f2f
+MD5 3c8fe36ef561d8f91c20ad982bd72272 xchat-2.6.4.ebuild 2521
+RMD160 2477fd7032d68603391278b1169d7231bb8304cd xchat-2.6.4.ebuild 2521
+SHA256 16b25a4cf4a2ab6cc9aa373838dc0a4b784a1135da6beb43d739811e2f0a8f2f xchat-2.6.4.ebuild 2521
+MISC ChangeLog 29705 RMD160 b1e43c08b7467245342d396fea910f419f2f266a SHA1 64736fc9b8467da830992859e50efb137a70194c SHA256 9a083d1245737b96f33ca02bf7923badcf75696cb18dd44f266bf710118041f7
+MD5 4f203e999f50fc6d409b444148bc2156 ChangeLog 29705
+RMD160 b1e43c08b7467245342d396fea910f419f2f266a ChangeLog 29705
+SHA256 9a083d1245737b96f33ca02bf7923badcf75696cb18dd44f266bf710118041f7 ChangeLog 29705
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
@@ -78,3 +95,13 @@ SHA256 ca6ed4ab95d8947df163955fe2e29db502ab7fa2db426f16ecc5be4f8c9f7cb4 files/di
 MD5 c2669b1abb742faafedf74897578ef04 files/digest-xchat-2.6.2 241
 RMD160 cbc41cdd50c66f79a49c118f11ec9e618baf995c files/digest-xchat-2.6.2 241
 SHA256 daeffc5af3ef3f5b1f332470201415b4664fbb00cf8320cb2d89656f3651cac5 files/digest-xchat-2.6.2 241
+MD5 a3797f17d2e53aeb3e5e08981e25e29b files/digest-xchat-2.6.4 506
+RMD160 1d04c65a59dfed9783edc4cceb7682114b00a3d0 files/digest-xchat-2.6.4 506
+SHA256 5f976a0febb7f3b07814c8ac167f3d2a31f909a2833d524b47570ecb9e183d5d files/digest-xchat-2.6.4 506
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFEq2zrz974XjDVpbkRAg6EAJ0SI8IiACdf3TK0g4bPaG0QuHVVGQCfYLuQ
+bG4Rr5OtU9Pm16Gjq9g+AM8=
+=w/td
+-----END PGP SIGNATURE-----
diff --git a/net-irc/xchat/files/digest-xchat-2.6.4 b/net-irc/xchat/files/digest-xchat-2.6.4
new file mode 100644
index 000000000000..0563907073f0
--- /dev/null
+++ b/net-irc/xchat/files/digest-xchat-2.6.4
@@ -0,0 +1,6 @@
+MD5 358f6cec635eab49fca99d324f76e065 xchat-2.6.4.tar.bz2 1083938
+RMD160 998069aa49e7b26dd98d53173e9dc67f947f95a2 xchat-2.6.4.tar.bz2 1083938
+SHA256 76e67fc03d3318d6159d1f22408c607bfa72e5e7687ddcb8969c95a01bcf4222 xchat-2.6.4.tar.bz2 1083938
+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/xchat-2.6.4-fix-cursor.patch b/net-irc/xchat/files/xchat-2.6.4-fix-cursor.patch
new file mode 100644
index 000000000000..342ab77869e5
--- /dev/null
+++ b/net-irc/xchat/files/xchat-2.6.4-fix-cursor.patch
@@ -0,0 +1,19 @@
+#
+# Fixes the invisible cursor color when using GTKSpell and a black
+# input box (when "Use the text box font & colors" is ON).
+#
+diff -u -r1.66 fe-gtk.c
+--- xchat-2.6.4/src/fe-gtk/fe-gtk.c	7 Jun 2006 06:16:51 -0000	1.66
++++ xchat-2.6.4p1/src/fe-gtk/fe-gtk.c	12 Jun 2006 03:13:24 -0000
+@@ -225,7 +225,11 @@
+ const char cursor_color_rc[] =
+ 	"style \"xc-ib-st\""
+ 	"{"
++#ifdef USE_GTKSPELL
++		"GtkTextView::cursor-color=\"#%02x%02x%02x\""
++#else
+ 		"GtkEntry::cursor-color=\"#%02x%02x%02x\""
++#endif
+ 	"}"
+ 	"widget \"*.xchat-inputbox\" style : application \"xc-ib-st\"";
+ 
diff --git a/net-irc/xchat/files/xchat-2.6.4-fix-proxy.patch b/net-irc/xchat/files/xchat-2.6.4-fix-proxy.patch
new file mode 100644
index 000000000000..566464c35003
--- /dev/null
+++ b/net-irc/xchat/files/xchat-2.6.4-fix-proxy.patch
@@ -0,0 +1,17 @@
+#
+# Fix proxy
+#
+diff -u -r1.71 server.c
+--- xchat-2.6.4/src/common/server.c	29 May 2006 06:53:25 -0000	1.71
++++ xchat-2.6.4p1/src/common/server.c	8 Jun 2006 15:22:07 -0000
+@@ -1534,7 +1534,10 @@
+ 	if (!serv->dont_use_proxy && (prefs.proxy_type == 5))
+ 		error = net_connect (ns_server, serv->proxy_sok4, serv->proxy_sok6, &psok);
+ 	else
++	{
+ 		error = net_connect (ns_server, serv->sok4, serv->sok6, &sok);
++		psok = sok;
++	}
+ 
+ 	if (error != 0)
+ 	{
diff --git a/net-irc/xchat/xchat-2.6.4.ebuild b/net-irc/xchat/xchat-2.6.4.ebuild
new file mode 100644
index 000000000000..58e8041f4d6a
--- /dev/null
+++ b/net-irc/xchat/xchat-2.6.4.ebuild
@@ -0,0 +1,91 @@
+# 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.4.ebuild,v 1.1 2006/07/05 07:40:15 jokey 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
+	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 tcltk 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 )
+	tcltk? ( dev-lang/tcl )
+	dbus? ( >=sys-apps/dbus-0.35 )
+	spell? ( app-text/gtkspell )
+	!<net-irc/xchat-gnome-0.9"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.7
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-fix-cursor.patch
+	epatch "${FILESDIR}"/${P}-fix-proxy.patch
+
+	use xchatdccserver && epatch "${DISTDIR}"/xchat-dccserver-0.6.patch.bz2
+
+	# 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 tcltk tcl) \
+		$(use_enable mmx) \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_enable dbus) \
+		$(use_enable spell) \
+		$(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"
+}