fix bug #472578

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 229 insertions, 9 deletions

diff --git a/net-irc/hexchat/ChangeLog b/net-irc/hexchat/ChangeLog
index 4531a3e16e23..ae7ab6216afc 100644
--- a/net-irc/hexchat/ChangeLog
+++ b/net-irc/hexchat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/hexchat
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/ChangeLog,v 1.51 2013/05/29 13:33:54 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/ChangeLog,v 1.52 2013/06/07 14:18:24 hasufell Exp $
+
+*hexchat-2.9.5-r1 (07 Jun 2013)
+
+  07 Jun 2013; Julian Ospald <hasufell@gentoo.org> +hexchat-2.9.5-r1.ebuild,
+  +files/hexchat-2.9.5-fix_leftclick_opens_menu.patch:
+  fix bug #472578
 
   29 May 2013; Julian Ospald <hasufell@gentoo.org> hexchat-2.9.4-r2.ebuild,
   hexchat-2.9.5.ebuild:
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index 0fcfca6e40cd..85bb4990976a 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -6,6 +6,7 @@ AUX hexchat-2.9.3-cflags.patch 474 SHA256 ccf7236e3dbc9d6450901fcea49c8c5e8adc57
 AUX hexchat-2.9.3-nogtk.patch 348 SHA256 5426f06b93185befe04244290cefbdcff120d40db9812398a9b6ec99040753ad SHA512 cce7deb9809cd76d800c2629762148015b6bb8d5bb8195b9037dcc57069c9e0affccb64ff1e05d9281863d0a67df83790ad15c6ddee357af4ad41788bf3caa16 WHIRLPOOL 02f4ca5950cb3548efde42448a7f9e1aaaf5e70cf7e33bb9df4dfb285283c192b7de781ee2395b42f3f8d3fbd2e9afbbac9e62bc0b16795a378af9b41fdc3c8e
 AUX hexchat-2.9.4-build.patch 4530 SHA256 3483c66f4a5231efb140ff651184cefef305e643d7a42f8af5b85512e087c85a SHA512 ab61421b9bcd35e7abd0cd61f6a978afcf9b6c4251e8e6f95d44e75a21c4c035d6553abe5ee437259e292888209b65143a63cf95719f8555db4b990319486296 WHIRLPOOL d8cd9e11769d0c755603e1c63559f96216e0dcbeb6993ec342e15a41789cdd513b4a8a81aba6b334ede034670ffaa96d88290e87e529eeb18013b3f674b212c2
 AUX hexchat-2.9.5-cflags.patch 625 SHA256 c593fed46c78ecf21984d765483f26b2ff2b4bdd78574569f561dbe4c52f3a05 SHA512 4ac52cabe611d959aea9fc9041c222adf90ebbb9ecb85493d66e3f910f530215ca5eea9b59d035653c654baf89d3f9822ce0fd1cbebd67a48cbc4d34008d3afc WHIRLPOOL f10118436585741bd511d269108a46a5ede2090247af988df2948495080bc3d4c2aec33d0ef3c279208ef9de2b7982432b2b0d3797afb413945f6c2fcef1e5ac
+AUX hexchat-2.9.5-fix_leftclick_opens_menu.patch 1430 SHA256 37179c473bc3deb174001e06cf1a292b0d82bc5e0e6ae82abb4c6d5879a8817b SHA512 1b941675017921fc8adf3f90d85edb528a7e231867a5ec9d5d99eb1c390bc58a1b1c44b39b9a6c204e94d9971598a9fa84ee0eeeb015d74de4f1ac83673c3715 WHIRLPOOL 19dcd10ac1e4d63b0a98a8518c4888289c6840ce088c244ec430fc51c040ce8a489093d4bea2e8dcf8008dfd22cb7e866094acd2794ffd85414d9a0f4aae8dce
 AUX hexchat-2.9.5-gettextize.patch 604 SHA256 b2ec1dafd439c8661aacebee78b4ea52d13955affbf536ee9f149510a299e48c SHA512 ca31a000ff96a1a30758d3d26ef8df88886b53453231e6b187f6eeaf88fc8bdb43eae349169872af8d8b2efcd72472760c1a1d2c4fa8651140c2b30b95d5bd40 WHIRLPOOL 47d838826a005f6d588ac78991be3791873f07aced5aad70820dc0e36122d80e378ae127e8475b8d382e69add922fe31116bc13601bc400c20d22816c405f20c
 AUX hexchat-2.9.5-gobject.patch 906 SHA256 53a810d814893455f81cb0777fce5f0f6f2e47b944677a5ffd5deb4dff676cca SHA512 1b34cb76373fbd9874a0666c37edae60e6b9a39b6cdff4e71b31f62ebaa1afb410b3d0246be38c2984352c4d020c5c7a3b699019cb8363e6e9b685c62372cadd WHIRLPOOL 44d8564c27e3b09bb85535e76ecc1aa9d801bcf05f913cd1db8359d7b0903b4d8862667aac6394c7f54086bd4229bd4b36d762a08317b7a20e195a50367352ca
 DIST hexchat-2.9.3.tar.xz 1740220 SHA256 39e33462dbd44281819af805e1adda5e7c81c69a0b8bcc01ba61098dcbdf3d8c SHA512 62f5b09bd164da37b7722475b2442bdda5c9ecf33f98119a680aaa2be25867714ab5f9a57a2586af4c57dfd5af7dd2a0df9e3ee1e29fcfe3a30c515260a368f9 WHIRLPOOL 1c74d4ac3141ee1b2d8fdfa495c84f5224463b2fea88d18e88821be528bb6795507b40759e2da1a0ea6895ee3f3d135286e7d3d1b8fd0260a7a5f8c69b77be77
@@ -14,17 +15,18 @@ DIST hexchat-2.9.5.tar.xz 1309112 SHA256 11dfd0fbfb88d8dbb38f631fab8a7dffbb179f7
 EBUILD hexchat-2.9.3.ebuild 2667 SHA256 c2e98dc5ba6d68e0cb9f5f1f9e68d52c6be4c40a1f9c7c31c07aefa5ae30c0c6 SHA512 a938567651b72f07b210bd069f571fd7dc0e94aeef8e5e3f388526bae8cea6039d6a59727041a9a145591d74f848ad3fa1e3d5a3447d01ac7d9d73a051cc37ad WHIRLPOOL a6062c39d3d25a6eaf6780cb9493eeca91db7dd0abbd1833783ceff9bbf872fb617489195f9aace990a29c53a239e93d6e3d58a5233b8d659a380888034c3a82
 EBUILD hexchat-2.9.4-r2.ebuild 3729 SHA256 37c49ad4eaba2b9d432d959098b5f83eaa01e46f47f8a054f0617e694fffd03f SHA512 66d99a96a089f620238bd34d81f87c0d509a251f1c922510ffc7e9503762515851a7f08a5aa9a265a3164519b45d53d551b171a65f4c4e06f96b339bbdd8e438 WHIRLPOOL 2e3de3ab46b0cda59c3692f57a7f88b81b1ec9a5a16229bd7398609cd4960aa8559cd3743fe01f2e879f0c52ef2749dd5ef0e469b15245ea290b760fb518942c
 EBUILD hexchat-2.9.4.ebuild 2954 SHA256 914ec267c80d7cc34c1534143ace5f718123d74591e4dcd6240218713ea86f18 SHA512 d494f42192bb45052737e33ca64c28101e503e71e5531065555ae7eb697576c28eaf4e9d57ce3e1ce538c4397ff4659d9d8f280a0826a5751da82f77c45f9558 WHIRLPOOL 82d602004bc47b2b723749edd1ab80f210a5e657afd2dbdce199b096de5edb66184328ec8e92ae74ddee54c66b64a576b31a6d5f469c1c1b938d71ab41821ae6
+EBUILD hexchat-2.9.5-r1.ebuild 3899 SHA256 8d1f7321f11cc749c94a6b462fa06077b52f2b10bcee77f46cd912e7148890c4 SHA512 9f655ed99f99b8a7e8049e5b8fb3d1fb49d268156e84a93a177ec449e2fa0078f89f48ec9714553a2f50c97e1140d3b0c8356cb2d2041dbbfce389c2b2176b5d WHIRLPOOL 9f1d744082ae763f67d5cb24dfe28455197c720d004328e5a26a8e857b577c402070e3b7379bb64fc46b03ea8119d2424a2393c0135b656ae12ccc1b9e7292e5
 EBUILD hexchat-2.9.5.ebuild 3827 SHA256 79fd4d7119f1a0e6b2736df2f84eb8eb8d216f221e58dcd2919a5865f31ed7d9 SHA512 e2b1b885b350f1a2bde79ec3f196a2acf93d59658ba68cff0d3df3d18b86f063515b756a99e8bfc09efece4d82a7e3952b89d0c9149f36bb85b3fb96670e4445 WHIRLPOOL a4eb4167b9e01ea8b880d5d4e06582c01e443d3322202905746edbdd621252758d13d84ed970d3527bf586c185d0f0fd196e67ed2d3b87c8138577e01a5bae46
-MISC ChangeLog 6982 SHA256 fc0b653be3059071e3c3a9ee7dca7641d8034dc28fc2cbc400ac27ce231f798a SHA512 d508f901a535e2ef12830faa35dc6c1a942ffda5206aff8fab9179d7b1a67c3800cbf55f8b0ca26c2b6b00f40ad58f6c8d473f91aceb66c35aaf727b4ea0183f WHIRLPOOL 460caee4e4346ae9eb877546d55e047b607c7e2127947945613bb20c00b33b2b954891d29ea81c9691338a0635c1a3aecf975dc4a645303a480ce18520fa3124
+MISC ChangeLog 7166 SHA256 4c8fec8c16243471406828178f10c335a348b42950f556c9993697bf192716ff SHA512 687db0b98e478c9254843ee19748cbc27dd4c20f69a1d7bf477fa06af2bf9fe8af1f4e43be7eb447418998fad89a77a4e8da3fd4bb32a0d59eaaf465a069d6a1 WHIRLPOOL b4e77e60adf6ac7f388e85cd2ce0a5f2a694dbf4db4067de685f554bd5fc3467872cc7015fbd75d18e322106137eabbc1fb8bce4e6e50e059594926015ac1a61
 MISC metadata.xml 1147 SHA256 d547362b8dc43f2f643e7e6a325cbc9cfb09a9845deb46b09ca76017dab9b5bc SHA512 badeb2307ffd19a713b323230ce2eaa82cb7d2b3ec82c0ce58cb4ab864ff6ad7519b0fb229739fb90e50190821cb6cf4915978a8ffa225cea2847b33ff21a6d1 WHIRLPOOL b5e5f57e39bbead602fa547a7f0e9e32679a5b9db10ce81a1a28adf59f8ca2f463ae123876300f501e44e9dc6c4f11d9c19eb7f137c1da3503a4a2d6bcf5e035
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRpgPBAAoJEFpvPKfnPDWzRE8IAKegfAwgOnDUhH0DgxP3Wa+r
-e5eqsTEbDK11NFnF/g4q+jZUKcMF3N/WgzjZNSI7QNjnUDs/4s4RdZZEyYun9LYO
-xCNGIVflvhjkOb+hdMvTxgyjx2NUdQQNHatZNjtJiwB6ge4kRw45CSrTn0Je+n5F
-ToQR6aGlFtJ3uM3lzVoLGBk89rbVQfOYK5YJccuWlePO9qUxA09UWQiqDSaevRd4
-8ZK7eqBEBXAHlFSrOPKHofwoi4whRHmC1nsaZCEZo0Kc661MWU7skJm9Ebdn+tAM
-4aaw53H+cNHjN7j+rAyJ33fjF2eCWXNL2g77P6qNagVG/e4pKRMM0JdS5MgTlTU=
-=L+e5
+iQEcBAEBCAAGBQJRseu0AAoJEFpvPKfnPDWziHAIAJaBNYnq+Qw5d3bHgNB6XK3o
+QhkrQBrZffKUD/Fz7L010aDNLGQl5hqkT+S3Blx0+s6YPPxJjfJY56O7QuC7T+Qe
+WDRPbCr6vhJvnKstMbcUNiCkb5aNpShAfHwHoPQBJWmvlQJPdksPhWJ5CHEmFwHf
+6NzAl4WG9TQZ4dEAB9lHAN9C8lZGcf4mHaamE3W1dt5mnuOfwHlfwlIwOa9CDvo9
+EouC1Pa9T2xwnQL/RC9GNOtTqpVS+lSL9QlhO7ZOLikMmXhEWB3vLJkNb/1HQVya
+ml0vdKQ0R5RMjWwECCOZOVV1zNdGiYV77s4YLveeU1RjfQPKw1csZ75dGs7HQkU=
+=6lrB
 -----END PGP SIGNATURE-----
diff --git a/net-irc/hexchat/files/hexchat-2.9.5-fix_leftclick_opens_menu.patch b/net-irc/hexchat/files/hexchat-2.9.5-fix_leftclick_opens_menu.patch
new file mode 100644
index 000000000000..fa941d272ccf
--- /dev/null
+++ b/net-irc/hexchat/files/hexchat-2.9.5-fix_leftclick_opens_menu.patch
@@ -0,0 +1,68 @@
+From a5eb7784c654abc42bfdba0fcf21602b5842b256 Mon Sep 17 00:00:00 2001
+From: RichardHitt <rbh00@netcom.com>
+Date: Mon, 15 Apr 2013 12:05:53 -0700
+Subject: [PATCH] Fix broken logic in mg_word_clicked().  fixes #522
+
+---
+ src/fe-gtk/maingui.c | 33 +++++++++++++++++++--------------
+ 1 file changed, 19 insertions(+), 14 deletions(-)
+
+diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c
+index e847990..fb225f4 100644
+--- a/src/fe-gtk/maingui.c
++++ b/src/fe-gtk/maingui.c
+@@ -2263,25 +2263,28 @@
+ 	int word_type, start, end;
+ 	char *tmp;
+ 
+-	if (word == NULL)
++	if (word)
+ 	{
+-		if (even->button == 1)		/* left button */
+-			mg_focus (sess);
+-		return;
++		word_type = mg_word_check (xtext, word);
++		url_last (&start, &end);
+ 	}
+ 
+-	word_type = mg_word_check (xtext, word);
+-	url_last (&start, &end);
+-
+-	if (even->button == 1 && (even->state & 13) == prefs.hex_gui_url_mod)
++	if (even->button == 1)			/* left button */
+ 	{
+-		switch (word_type)
++		if (word == NULL)
+ 		{
+-		case WORD_URL:
+-		case WORD_HOST:
+-			word[end] = 0;
+-			word += start;
+-			fe_open_url (word);
++			mg_focus (sess);
++			return;
++		}
++
++		if ((even->state & 13) == prefs.hex_gui_url_mod)
++		{
++			switch (word_type)
++			{
++			case WORD_URL:
++			case WORD_HOST:
++				fe_open_url (word);
++			}
+ 		}
+ 		return;
+ 	}
+@@ -2294,6 +2297,8 @@
+ 			userlist_select (sess, word);
+ 		return;
+ 	}
++	if (word == NULL)
++		return;
+ 
+ 	switch (word_type)
+ 	{
+-- 
+1.8.1.6
+
diff --git a/net-irc/hexchat/hexchat-2.9.5-r1.ebuild b/net-irc/hexchat/hexchat-2.9.5-r1.ebuild
new file mode 100644
index 000000000000..fd86db8b5366
--- /dev/null
+++ b/net-irc/hexchat/hexchat-2.9.5-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/hexchat/hexchat-2.9.5-r1.ebuild,v 1.1 2013/06/07 14:18:24 hasufell Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+inherit autotools eutils gnome2-utils mono multilib python-single-r1
+
+DESCRIPTION="Graphical IRC client based on XChat"
+SRC_URI="mirror://github/${PN}/${PN}/${P}.tar.xz"
+HOMEPAGE="http://www.hexchat.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+IUSE="dbus fastscroll +gtk ipv6 libnotify libproxy nls ntlm perl +plugins plugin-checksum plugin-doat plugin-fishlim plugin-sysinfo python spell ssl theme-manager"
+REQUIRED_USE="plugin-checksum? ( plugins )
+	plugin-doat? ( plugins )
+	plugin-fishlim? ( plugins )
+	plugin-sysinfo? ( plugins )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="dev-libs/glib:2
+	dbus? ( >=dev-libs/dbus-glib-0.98 )
+	fastscroll? ( x11-libs/libXft )
+	gtk? ( x11-libs/gtk+:2 )
+	libproxy? ( net-libs/libproxy )
+	libnotify? ( x11-libs/libnotify )
+	nls? ( virtual/libintl )
+	ntlm? ( net-libs/libntlm )
+	perl? ( >=dev-lang/perl-5.8.0 )
+	plugin-sysinfo? ( sys-apps/pciutils )
+	python? ( ${PYTHON_DEPS} )
+	spell? (
+		app-text/enchant
+		dev-libs/libxml2
+	)
+	ssl? ( >=dev-libs/openssl-0.9.8u )
+	theme-manager? ( dev-lang/mono )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	theme-manager? ( dev-util/monodevelop )"
+
+DOCS=""
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-2.9.1-input-box.patch \
+		"${FILESDIR}"/${PN}-2.9.5-cflags.patch \
+		"${FILESDIR}"/${PN}-2.9.5-gettextize.patch \
+		"${FILESDIR}"/${PN}-2.9.5-gobject.patch \
+		"${FILESDIR}"/${PN}-2.9.5-fix_leftclick_opens_menu.patch
+
+	cp $(type -p gettextize) "${T}"/ || die
+	sed -i -e 's:read dummy < /dev/tty::' "${T}/gettextize" || die
+	einfo "Running gettextize -f --no-changelog..."
+	"${T}"/gettextize -f --no-changelog > /dev/null || die "gettexize failed"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable libproxy socks) \
+		$(use_enable ipv6) \
+		$(use_enable fastscroll xft) \
+		$(use_enable ssl openssl) \
+		$(use_enable gtk gtkfe) \
+		$(use_enable !gtk textfe) \
+		$(usex python "--enable-python=${EPYTHON}" "--disable-python") \
+		$(use_enable perl) \
+		$(use_enable plugins plugin) \
+		$(use_enable plugin-checksum checksum) \
+		$(use_enable plugin-doat doat) \
+		$(use_enable plugin-fishlim fishlim) \
+		$(use_enable plugin-sysinfo sysinfo) \
+		$(use_enable dbus) \
+		$(use_enable libnotify) \
+		--enable-shm \
+		$(use_enable spell spell static) \
+		$(use_enable ntlm) \
+		$(use_enable libproxy)
+}
+
+src_compile() {
+	default
+	if use theme-manager ; then
+		export XDG_CACHE_HOME="${T}/.cache"
+		cd src/htm || die
+		mdtool --verbose build htm-mono.csproj || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" UPDATE_ICON_CACHE=true install
+	dodoc share/doc/{readme,hacking}.md
+	use plugin-fishlim && dodoc share/doc/fishlim.md
+	if use theme-manager ; then
+		dobin src/htm/thememan.exe
+		make_wrapper thememan "mono /usr/bin/thememan.exe"
+	fi
+	prune_libtool_files --all
+}
+
+pkg_preinst() {
+	if use gtk ; then
+		gnome2_icon_savelist
+		gnome2_gconf_savelist
+	fi
+}
+
+pkg_postinst() {
+	if use !gtk ; then
+		einfo
+		elog "You have disabled the gtk USE flag. This means you don't have"
+		elog "the GTK-GUI for HexChat but only a text interface called \"hexchat-text\"."
+	else
+		gnome2_icon_cache_update
+		gnome2_gconf_install
+	fi
+
+	if use theme-manager ; then
+		einfo
+		elog "Themes are available at:"
+		elog "  http://hexchat.org/themes.html"
+	fi
+
+	ewarn
+	ewarn "If you're upgrading from hexchat <=2.9.3 remember to rename"
+	ewarn "the xchat.conf file found in ~/.config/hexchat/ to hexchat.conf"
+	ewarn
+}
+
+pkg_postrm() {
+	if use gtk ; then
+		gnome2_icon_cache_update
+	fi
+}