Fix double clicking an item or hitting enter after selecting an item (#493332 by Kai Wustermann), drop old.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 62 insertions, 22 deletions

diff --git a/gnome-extra/zenity/ChangeLog b/gnome-extra/zenity/ChangeLog
index db5a8c52e5ab..e896d14579d0 100644
--- a/gnome-extra/zenity/ChangeLog
+++ b/gnome-extra/zenity/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/zenity
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/ChangeLog,v 1.213 2013/12/08 19:02:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/ChangeLog,v 1.214 2013/12/24 12:41:09 pacho Exp $
+
+*zenity-3.8.0-r1 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/zenity-3.8.0-double-click.patch, +zenity-3.8.0-r1.ebuild,
+  -zenity-3.6.0.ebuild:
+  Fix double clicking an item or hitting enter after selecting an item (#493332
+  by Kai Wustermann), drop old.
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> zenity-3.8.0.ebuild:
   x86 stable, bug #478252
diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest
index dde0f947bf4e..3c0d6b51f041 100644
--- a/gnome-extra/zenity/Manifest
+++ b/gnome-extra/zenity/Manifest
@@ -2,18 +2,18 @@
 Hash: SHA256
 
 AUX zenity-2.32.1-libnotify-0.7.patch 746 SHA256 98bf6ca77f0fef14a5f0b8788595710b7eb88db121103a72c4a38bb912038431 SHA512 ccef1dfde468c98a1836cc5ae0584166c605ca6a99c5df794d92c590b38fec489cb7e35c9b8826c624686796a5e2a97ddc28760f5909c8f42c6834d3357185ad WHIRLPOOL fa74b1a555d6060e6b6ace10c472289373a0f7cf132bae608877711c2a6b6036976f1cf33a4b067979299bc875ad56513ea9a07e595dddb25cb438907955011d
+AUX zenity-3.8.0-double-click.patch 1008 SHA256 a020d4360f1ca64057b542776a94dcb3f4ce5760cd32b7a772a9530ad3c516e3 SHA512 f7f8ec8e4ad797a454f18610920f87c1ead639bd58f63b1c594862a583c72233cf769a3ef6226ad228f8e45b7e61e3f2de5ad4b70eef45f7fd2472a6d0153e86 WHIRLPOOL 3dd3bf0904b05467bc20ce9ba24a478b55803b5cd3cd486d701e25f2b577690c888504ef9d9ce93dc3c2b1a63808c79a7bb4b7b9a4c6cb978c6a2467e393e4a0
 DIST zenity-2.32.1.tar.bz2 3128666 SHA256 8838be041a07364b62a4281c971392e4a09bb01bb3237a836ec0457ec0ea18ac SHA512 5cab5be6e22da46b6fa78bddd3c40e2413df64f8267452a332efc093e0e865c621cd68897c11c1af9a33afceb8cf84e08b03e17d4d0b3abfed95cbafe199c94e WHIRLPOOL eb3db6f89f5eaa9b316a22d46a4af03991255c16d28b10f7fe56f553f913642b3fe30661d2714bbb3921c9f5e1adede56b6b225313fe26211bdf6030a6167858
-DIST zenity-3.6.0.tar.xz 3636432 SHA256 5de4ebbb6888ad4928fa9eebcd42dbe5bb282bee9dd7dd21475d9eaa854c74be SHA512 5a54c90d2fac322df2b336c252303839c4d34c6a5a0db035964becacb22115a58746b8f6601469cdb1d4071c219b51df61ac2539a6a29734d281757a62231d5e WHIRLPOOL e7b9e06efbed9290a66e4979b46757408f3e4573d6621825f9510ae7182317d322b9b630f1a0dbd9d24a8896eef1d99a4f5675bfffd678c5f7679ad01eed60ec
 DIST zenity-3.8.0.tar.xz 3651076 SHA256 94fbf0b71592f26dce0e2c49b82b4401139c8434084ad24c2c6a61ace1e6563f SHA512 3e7c72a19f3f48c9da1578abfbdd3cd5973dbea6ead9fdf035b34405be2da9ea1be6f8ace271948144a9a7b6e34cac1dfc3e554f19438431ffb1e82f08ddc02d WHIRLPOOL cc5a731cce52bb4f2783d41b7f9319efe306552a3ada48fa91b4ead15407f3ad079b618c8ff508ca4666922de4bcc81b5824d77497615e03ddd61412bbb2fa90
 EBUILD zenity-2.32.1.ebuild 1296 SHA256 d25166a27416913c1dca7e5544ffc2e328cd2303616738fb05616c2c51bf2e27 SHA512 acaa93899a5e92e943609976a78ea8a648d7d75614e9f99760bd9c022259d4c99b9b77a58ebdabada364e822a6924882daefadd4e786df2f9d9cf9ea20baa85e WHIRLPOOL 62ab0b84f6a3d57a473bb4d170b7b39da0443c4b20b1627336184983625c124f081cf9a2a770018d1c4f76da80825e2e90648e5c8626b0f10220457f37f28829
-EBUILD zenity-3.6.0.ebuild 1283 SHA256 b44fa2c853491415d71d1e73325bd67203c989371992a29817d0d536dfb77e20 SHA512 ea47d2d669a9f2df825a4791939afab0d73599b4834594c4f4bc20bc5274e8e93384573578888bff0f0fb8e679f87063d434846ff25171784bdcce1b04394d06 WHIRLPOOL 3877ab5519a88311b056f70f99d40ff3e1f3450755d0ef985c88b2a1480a0d5ddcf51d21209f2e8456a5494c673e3e1800d3c2ee940cdcb230ee1bbaa8a45944
+EBUILD zenity-3.8.0-r1.ebuild 1467 SHA256 2da7bc21b929d6662225a92a550f6e6b9f79c9d3aec9c880b65cd0cc58a0232f SHA512 bf0b361d1813b31fe62ebb6ed4857397b1cb335d396746484dd9d46c09fca12e201a0c161be78144a55182eeacff0085f20b0d5506281d0f69fc8a5b0fc5679e WHIRLPOOL 9ec0afe59ff0336177117b44d9e8490b13098c59f89a9c4fffc014bcbb09db42d97ebf7716f8e62bab6689ac078b479b52079130d29a31e4da8f4ac31bb8596e
 EBUILD zenity-3.8.0.ebuild 1250 SHA256 a22d3c64c2f53782c77d3c8a1f4785ee1d58d679b7439d6241e9314c0aa16cec SHA512 d2d8e711f6cc1b4927ca16ddb5f1f0db834b0da53212a4dadb0b38d8f526db77e864ad6d57aa6718fc12044ac36053c17d0a7cf559a90af6925a59a277c4038b WHIRLPOOL 80d76dc81809dbd781049f88e7d67e0339d8b4ed5f2a54a1bd6d474e1cc803a639cc167aafb88cef677d5a9fcd47dd4d12480d5a9ff2e4bb4eb8b72da4abd0b0
-MISC ChangeLog 25175 SHA256 7b86d63eb5f64408f73c3918a3cbbf228564c6e4ef2a59a6e137e55abfe9c044 SHA512 580758dd91793116ab750ecf09405cb6ca46820a541a6682819609865971839539c6fa9890b184bfd592811e8701fd01e1e3c2b285aa45f4cd31aba945fda6a4 WHIRLPOOL 19d0c7c3c772f44d5bf648c037379cf51a3a4c60c4c87a94360ac4594c2b975c9d88f89958b5df269aab6516c4151fbc22e51c873ed105c9c16b44f102f8d6ff
+MISC ChangeLog 25457 SHA256 de70965e94e3389149f241cd9b739c8e190e7e3ab7723c989044e5eccff372f1 SHA512 5a298da06f920e0a131760d8e3829729857bd85c4b8a033474e391812ac064c5d6904e508940d1eae88f37f21de64ccde7b4c63f68f7f1587d0142c9e96340ca WHIRLPOOL 266a5ed367a6ccc105f50e36c60820c568980bfe21177570b0cb01edda6141573c4c4555cfa4d50f6307b25200ad26662258392d970394a19d69ae1ed4d8452b
 MISC metadata.xml 302 SHA256 b52e3b6c6080efd1fedb03fe6136d89d74f1e58896ae8d6f075622bf6806e200 SHA512 d66d8a12c3ef2bc74a768e83d63f87c9da48e1773fbfbff60abbe5e01142daf1fd1fc500ad7ea51418e7574fa956e1c0eddebce5d59525bc725b8576f8da95c8 WHIRLPOOL 1721abff208b87e089940e5c87c0b0848adec4a5cb299e35777cd473370ee5f1cd6bdc3614e272fd084cc9b4922048f7a01d46a2ab64757e3b93ff9ea721e7a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKkwmQACgkQCaWpQKGI+9SCuQCeKh8gohSFmCI0zAxyhSyT451o
-2R0An3/YEWfS9MTbaLnVnSZ9bajFhMsY
-=YfoC
+iEYEAREIAAYFAlK5gOYACgkQCaWpQKGI+9SjLQCfbOup6bnvsdlrCs6NgQCijHdO
+fUMAoIW/3phSParh6GteJoQSgMVOHgwZ
+=6++e
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/zenity/files/zenity-3.8.0-double-click.patch b/gnome-extra/zenity/files/zenity-3.8.0-double-click.patch
new file mode 100644
index 000000000000..53491d03a3aa
--- /dev/null
+++ b/gnome-extra/zenity/files/zenity-3.8.0-double-click.patch
@@ -0,0 +1,26 @@
+From 7c234ed9b71d5f009abff509ef2bf576f61a0cbb Mon Sep 17 00:00:00 2001
+From: Arx Cruz <arxcruz@gnome.org>
+Date: Thu, 23 May 2013 19:27:58 +0000
+Subject: Bug 698683 - Double clicking an item or hitting enter after selecting an item
+
+returns it twice
+---
+diff --git a/src/tree.c b/src/tree.c
+index cf90239..031765e 100644
+--- a/src/tree.c
++++ b/src/tree.c
+@@ -710,12 +710,6 @@ zenity_tree_row_activated (GtkTreeView *tree_view, GtkTreePath *tree_path,
+                            GtkTreeViewColumn *tree_col, gpointer data)
+ {
+   ZenityData *zen_data = data;
+-  GtkTreeSelection *selection; 
+-  
+-  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree_view));
+-  gtk_tree_selection_selected_foreach (selection, 
+-                                       (GtkTreeSelectionForeachFunc) zenity_tree_dialog_get_selected, 
+-                                       GTK_TREE_VIEW (tree_view));
+  
+   zenity_tree_dialog_output ();
+   zen_data->exit_code = zenity_util_return_exit_code (ZENITY_OK);
+--
+cgit v0.9.2
diff --git a/gnome-extra/zenity/zenity-3.6.0.ebuild b/gnome-extra/zenity/zenity-3.8.0-r1.ebuild
index 2ef872049923..98cfb4be8427 100644
--- a/gnome-extra/zenity/zenity-3.6.0.ebuild
+++ b/gnome-extra/zenity/zenity-3.8.0-r1.ebuild
@@ -1,46 +1,52 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/zenity-3.6.0.ebuild,v 1.1 2012/12/24 00:35:19 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/zenity-3.8.0-r1.ebuild,v 1.1 2013/12/24 12:41:09 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="Tool to display dialogs from the commandline and shell scripts"
-HOMEPAGE="http://live.gnome.org/Zenity"
+HOMEPAGE="https://wiki.gnome.org/action/show/Projects/Zenity"
 
 LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="libnotify test +webkit"
 
-RDEPEND=">=dev-libs/glib-2.8:2
+RDEPEND="
+	>=dev-libs/glib-2.8:2
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-3:3
 	x11-libs/libX11
 	x11-libs/pango
 	libnotify? ( >=x11-libs/libnotify-0.6.1:= )
-	webkit? ( >=net-libs/webkit-gtk-1.4.0:3 )"
-
+	webkit? ( >=net-libs/webkit-gtk-1.4.0:3 )
+"
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.14
 	virtual/pkgconfig
-	test? ( app-text/yelp-tools )"
+	test? ( app-text/yelp-tools )
+"
 # eautoreconf needs:
 #	>=gnome-base/gnome-common-2.12
 
+src_prepare() {
+	# Fix double clicking an item or hitting enter after selecting an item (from 'master')
+	epatch "${FILESDIR}/${PN}-3.8.0-double-click.patch"
+	gnome2_src_prepare
+}
+
 src_configure() {
 	DOCS="AUTHORS ChangeLog HACKING NEWS README THANKS TODO"
-	G2CONF="${G2CONF}
-		$(use_enable libnotify)
-		$(use_enable webkit webkitgtk)
-		PERL=$(type -P false)
-		ITSTOOL=$(type -P true)"
 
-	gnome2_src_configure
+	gnome2_src_configure \
+		$(use_enable libnotify) \
+		$(use_enable webkit webkitgtk) \
+		PERL=$(type -P false) \
+		ITSTOOL=$(type -P true)
 }
 
 src_install() {