Include patch to make xchat-remote invoke the correct binary, should fix bug #143688.

Package-Manager: portage-2.1.2_pre2-r9

4 files changed, 36 insertions, 14 deletions

diff --git a/net-irc/xchat/ChangeLog b/net-irc/xchat/ChangeLog
index bf51559fe386..c194fc745398 100644
--- a/net-irc/xchat/ChangeLog
+++ b/net-irc/xchat/ChangeLog
@@ -1,6 +1,11 @@
 # 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.211 2006/09/26 20:03:31 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/ChangeLog,v 1.212 2006/10/13 14:24:37 swegener Exp $
+
+  13 Oct 2006; Sven Wegener <swegener@gentoo.org>
+  +files/xchat-2.6.6-suffix.patch, xchat-2.6.6.ebuild:
+  Include patch to make xchat-remote invoke the correct binary, should fix bug
+  #143688.
 
   26 Sep 2006; Gustavo Zacarias <gustavoz@gentoo.org> xchat-2.6.6.ebuild:
   Stable on hppa wrt #134652
diff --git a/net-irc/xchat/Manifest b/net-irc/xchat/Manifest
index 16f7555fd098..68717095e63c 100644
--- a/net-irc/xchat/Manifest
+++ b/net-irc/xchat/Manifest
@@ -29,6 +29,10 @@ AUX xchat-2.6.4-fix-proxy.patch 450 RMD160 f75495b601e5620e1127e61c89db3bda2560b
 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-2.6.6-suffix.patch 647 RMD160 e0c40ec9eec26d9509b27f29c7b850b7d128ab98 SHA1 73be1b06841031f6033d059ccc4eca3d959735b0 SHA256 0ff0f4efb59a2ca4df872fd4bf4550cd063b8d5df8f823d1a83e0b790f604419
+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
 DIST xchat-1.8.11.tar.bz2 850453 RMD160 5055190942e28933e33b9f520a6811b86241daae SHA256 b3d457e014649e4b25ba5241e6dde600ffe2c8c6c4d462b8d4392b9f38b5abed
 DIST xchat-2.4.3.tar.bz2 1259520 RMD160 2222632f2c3db2eac260547e952047bcc450b731 SHA1 9cc9ed984d271feffca8ee0cee53404c05a10843 SHA256 3dc8560dd35e1052546cf1fec69b4d1a01fd0caaaa0e71cde9d06712dd393398
 DIST xchat-2.4.5.tar.bz2 1324626 RMD160 19d1033d01af784f8b7af5103a7de8cf3a26f3fb SHA1 e027a20caa47b4ffea00896ee68269a7ae885e2d SHA256 44cabb5c31047d5a036495bc7fac64a5b86c8003bd575ea869bcd377032db2db
@@ -67,14 +71,14 @@ EBUILD xchat-2.6.4.ebuild 2513 RMD160 ab340c98eaa20c6a25d05d860cfa1ebc3821ba62 S
 MD5 94f39dbf8ff51279c7a3055a6a1db28f xchat-2.6.4.ebuild 2513
 RMD160 ab340c98eaa20c6a25d05d860cfa1ebc3821ba62 xchat-2.6.4.ebuild 2513
 SHA256 0efbe35f030d562e08fe319019f95bdc37e841d67c3692fbe5fc9de3c17cbd7c xchat-2.6.4.ebuild 2513
-EBUILD xchat-2.6.6.ebuild 2432 RMD160 9bfd68e6944add3c0b8c5a54b53f35eecd4b9bfb SHA1 68ee86d18770af61b8cf6c2b2570b0c8bf881c76 SHA256 3882b94695316be2750f0fa472d8e2db323556d79bfa3d121627863f011d7d27
-MD5 c45750b939792986f4ed919df256e9fe xchat-2.6.6.ebuild 2432
-RMD160 9bfd68e6944add3c0b8c5a54b53f35eecd4b9bfb xchat-2.6.6.ebuild 2432
-SHA256 3882b94695316be2750f0fa472d8e2db323556d79bfa3d121627863f011d7d27 xchat-2.6.6.ebuild 2432
-MISC ChangeLog 31035 RMD160 baaf6b4aadcaa5317de983ef042296ecc9db1de3 SHA1 55a145ef156078a6f8395ba811f1c62d87ffe400 SHA256 bd63e14e42cebcba9375bb6172ce499d2ed2a947fbe05f55770c59e3cc372819
-MD5 c74dc05a0ce95d4ce2877b7984ef0eca ChangeLog 31035
-RMD160 baaf6b4aadcaa5317de983ef042296ecc9db1de3 ChangeLog 31035
-SHA256 bd63e14e42cebcba9375bb6172ce499d2ed2a947fbe05f55770c59e3cc372819 ChangeLog 31035
+EBUILD xchat-2.6.6.ebuild 2479 RMD160 9c21e1323fbd3cf1114d00a8a5031440c04ced2c SHA1 abb25db0cfc14daed8ac954eaad122cbb38fbc88 SHA256 10b726b862b7d56f34827af25063d2d9592ac55968e2ecc203b0bc402c8d73e0
+MD5 8d957250c6bf88e6bee84c952ab8ca01 xchat-2.6.6.ebuild 2479
+RMD160 9c21e1323fbd3cf1114d00a8a5031440c04ced2c xchat-2.6.6.ebuild 2479
+SHA256 10b726b862b7d56f34827af25063d2d9592ac55968e2ecc203b0bc402c8d73e0 xchat-2.6.6.ebuild 2479
+MISC ChangeLog 31231 RMD160 8de1540b44f234dcef99917ff8082021a815a58a SHA1 417f81526af900c6994e26c36c39815b06da06a0 SHA256 429d59b2f9e7e42e3fff6f7cc83f2941840894df1c5b2573423bbcbbcc85431c
+MD5 f77c77a96efd7eb2562d181a89401dd4 ChangeLog 31231
+RMD160 8de1540b44f234dcef99917ff8082021a815a58a ChangeLog 31231
+SHA256 429d59b2f9e7e42e3fff6f7cc83f2941840894df1c5b2573423bbcbbcc85431c ChangeLog 31231
 MISC metadata.xml 160 RMD160 279429d1df694561fc2b163cb81c09387b9d940c SHA1 97da1b72eecc5585c65717da08eaccc9bc1cf7cd SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
@@ -104,9 +108,9 @@ MD5 bf4d4c8da339dfef2c7d6e839f246d57 files/digest-xchat-2.6.6 506
 RMD160 3feacc9cc904f012def98eb0f4be0aa9e6a6b093 files/digest-xchat-2.6.6 506
 SHA256 cac69c943207ddbb7d0ac2a4ac89d72a1a684910bb1b80b6921880c022beb815 files/digest-xchat-2.6.6 506
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFGYehKRy60XGEcJIRAkv5AJsF8ZM6SxcnWH42+eWvLi67Se6VSQCfTyyN
-j8/f52hv31U/F3XeD7W6ovg=
-=1SLD
+iD8DBQFFL6GuI1lqEGTUzyQRAkFtAJsGwCDZLPuyEQ/wpOUlezUs0qIsEACgkdip
+5jwGQIrJNY2NsNVmwZSUBvk=
+=70zT
 -----END PGP SIGNATURE-----
diff --git a/net-irc/xchat/files/xchat-2.6.6-suffix.patch b/net-irc/xchat/files/xchat-2.6.6-suffix.patch
new file mode 100644
index 000000000000..bf5ac2fafcc0
--- /dev/null
+++ b/net-irc/xchat/files/xchat-2.6.6-suffix.patch
@@ -0,0 +1,12 @@
+diff -Nur xchat-2.6.6.orig/plugins/dbus/xchat-remote.c xchat-2.6.6/plugins/dbus/xchat-remote.c
+--- xchat-2.6.6.orig/plugins/dbus/xchat-remote.c	2006-07-15 08:27:21.000000000 +0000
++++ xchat-2.6.6/plugins/dbus/xchat-remote.c	2006-10-13 14:16:57.801263851 +0000
+@@ -110,7 +110,7 @@
+         if (fork() == 0)
+         {
+           gchar *url = g_strdup_printf ("--url=%s", opt_open_url);
+-          execl (PREFIX"/bin/"PACKAGE_TARNAME, PACKAGE_TARNAME, "-a", url, NULL);
++          execl (PREFIX"/bin/"PACKAGE_TARNAME"-2", PACKAGE_TARNAME"-2", "-a", url, NULL);
+         }
+       } else
+         write_error (_("Failed to complete command"), error);
diff --git a/net-irc/xchat/xchat-2.6.6.ebuild b/net-irc/xchat/xchat-2.6.6.ebuild
index 24fd52fa8d1c..1ffb54de3daa 100644
--- a/net-irc/xchat/xchat-2.6.6.ebuild
+++ b/net-irc/xchat/xchat-2.6.6.ebuild
@@ -1,6 +1,6 @@
 # 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.6.ebuild,v 1.7 2006/09/26 20:03:31 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat/xchat-2.6.6.ebuild,v 1.8 2006/10/13 14:24:37 swegener Exp $
 
 inherit eutils versionator gnome2
 
@@ -34,6 +34,7 @@ src_unpack() {
 	cd "${S}"
 
 	use xchatdccserver && epatch "${DISTDIR}"/xchat-dccserver-0.6.patch.bz2
+	epatch "${FILESDIR}"/xchat-2.6.6-suffix.patch
 
 	# use libdir/xchat/plugins as the plugin directory
 	if [ $(get_libdir) != "lib" ] ; then