Fix grab (again), this time, remove the map-event completely, bug#201951

Package-Manager: portage-2.1.4_rc10

5 files changed, 26 insertions, 19 deletions

diff --git a/app-crypt/pinentry/ChangeLog b/app-crypt/pinentry/ChangeLog
index 6031d76c7269..955b22aae1e9 100644
--- a/app-crypt/pinentry/ChangeLog
+++ b/app-crypt/pinentry/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/pinentry
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.74 2007/12/21 07:27:15 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/ChangeLog,v 1.75 2007/12/22 05:17:11 alonbl Exp $
+
+*pinentry-0.7.4-r1 (22 Dec 2007)
+
+  22 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org>
+  files/pinentry-0.7.4-grab.patch, -pinentry-0.7.4.ebuild,
+  +pinentry-0.7.4-r1.ebuild:
+  Fix grab (again), this time, remove the map-event completely, bug#201951
 
   21 Dec 2007; Alon Bar-Lev <alonbl@gentoo.org> pinentry-0.7.4.ebuild:
   Readd flag-o-matic
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 05aaabf9e981..5c8f0259bfff 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -10,10 +10,10 @@ AUX pinentry-0.7.2-grab.patch 658 RMD160 6ea97caf552316ba3dad87fc976f3fd2407237e
 MD5 76ef8c43a556ca4ced2ce7b2c12d16a2 files/pinentry-0.7.2-grab.patch 658
 RMD160 6ea97caf552316ba3dad87fc976f3fd2407237e2 files/pinentry-0.7.2-grab.patch 658
 SHA256 061d9c0f7d9c1c6902eacebb4ffc520260259d8f9de5abca254c606ed6276259 files/pinentry-0.7.2-grab.patch 658
-AUX pinentry-0.7.4-grab.patch 788 RMD160 852f0433718a9ddd2999d69db47ce276ffcf884f SHA1 2e6cb432b3fe48d36c55d27672a6ceb5721769f9 SHA256 177ad0bf85f8b8ce6f4d9b92b75161430f91943248051204b9fba7cca2456660
-MD5 dd520ffeb2e3d3aa693aadc31d381e1a files/pinentry-0.7.4-grab.patch 788
-RMD160 852f0433718a9ddd2999d69db47ce276ffcf884f files/pinentry-0.7.4-grab.patch 788
-SHA256 177ad0bf85f8b8ce6f4d9b92b75161430f91943248051204b9fba7cca2456660 files/pinentry-0.7.4-grab.patch 788
+AUX pinentry-0.7.4-grab.patch 717 RMD160 3dd998c7a2d06c8923345356489f58258121d3df SHA1 884f34b3aa1d79383495ee7ec653fbbbeaac8125 SHA256 747e3faccbc5b4f41999b2d65ebfe82e671708d2c6d952e737a9014320dd8319
+MD5 3ba40fa33b22688b62cc973caf94ffb2 files/pinentry-0.7.4-grab.patch 717
+RMD160 3dd998c7a2d06c8923345356489f58258121d3df files/pinentry-0.7.4-grab.patch 717
+SHA256 747e3faccbc5b4f41999b2d65ebfe82e671708d2c6d952e737a9014320dd8319 files/pinentry-0.7.4-grab.patch 717
 DIST pinentry-0.7.2.tar.gz 398775 RMD160 db667256801545ef065d9d47cafe5e67137fa6ce SHA1 aa113b08e315d22b6f70a634f459fdfbaa4dcaba SHA256 fbdb15ef6b05c5435745d1dde90cf4c82dd512c983d7a178cd25bdbe882dd668
 DIST pinentry-0.7.3.tar.gz 417000 RMD160 b7bb850e55337cefb7ec0d4eea91924c6903cce2 SHA1 557b886bc7a7030fd185fbc085703ef1ed304db8 SHA256 df1d2c47d501031b4c995cee3e464e62578b8959559121a207a8046e2cd9a5bf
 DIST pinentry-0.7.4.tar.gz 416651 RMD160 32b375586da2e2fc92c672484557af280481eeff SHA1 6cd28bda641a6c89d0bb4120e646f967605c532a SHA256 31ecfe618f67fda24a6514d21749344d8e8f9f4cd66b19f361622e73515aa04f
@@ -25,14 +25,14 @@ EBUILD pinentry-0.7.3.ebuild 2291 RMD160 6af730e17672a3ae1c453def96c7f4f5a55b60f
 MD5 5f368d7c3b559b370cd3b07f82781cb0 pinentry-0.7.3.ebuild 2291
 RMD160 6af730e17672a3ae1c453def96c7f4f5a55b60f7 pinentry-0.7.3.ebuild 2291
 SHA256 807e7a325a1e8a7ab413945928db7619f48fcfa71255af845dddbbaf572f9e35 pinentry-0.7.3.ebuild 2291
-EBUILD pinentry-0.7.4.ebuild 2132 RMD160 c06260c218cd94ff52bef1a03c17bec09d589142 SHA1 7a51b45bcbdb7e0f0a1ee9e307a2adbd465e2769 SHA256 e788598e6400cd034640f233bd084a94c7b4e9e06e9cf423f7aae8e554be644c
-MD5 04bffc2b08c58b8e19353e514eb8d853 pinentry-0.7.4.ebuild 2132
-RMD160 c06260c218cd94ff52bef1a03c17bec09d589142 pinentry-0.7.4.ebuild 2132
-SHA256 e788598e6400cd034640f233bd084a94c7b4e9e06e9cf423f7aae8e554be644c pinentry-0.7.4.ebuild 2132
-MISC ChangeLog 9666 RMD160 c005f85da2cf71e5baf0cc80f972a486e61c2fe9 SHA1 6ed157d0e971e532a494f5cd545842195998a8e9 SHA256 97e69348439737d8640916156028cb210702b0a719dc081af842131d5ab50744
-MD5 f4cf1e9c56d159b34135f5ed543d706b ChangeLog 9666
-RMD160 c005f85da2cf71e5baf0cc80f972a486e61c2fe9 ChangeLog 9666
-SHA256 97e69348439737d8640916156028cb210702b0a719dc081af842131d5ab50744 ChangeLog 9666
+EBUILD pinentry-0.7.4-r1.ebuild 2135 RMD160 21a3ebfa162d9135bb7718fabdf57bbb36fdea22 SHA1 a9512fb568ccd2b26c99542b5e816905550c6405 SHA256 9d61e5cecdf25512ad6632d5e3936226b4ebaf7827d87c482ac926629dd7faab
+MD5 8ed69a6a8e3cea4a0c2ece642bfe22ae pinentry-0.7.4-r1.ebuild 2135
+RMD160 21a3ebfa162d9135bb7718fabdf57bbb36fdea22 pinentry-0.7.4-r1.ebuild 2135
+SHA256 9d61e5cecdf25512ad6632d5e3936226b4ebaf7827d87c482ac926629dd7faab pinentry-0.7.4-r1.ebuild 2135
+MISC ChangeLog 9912 RMD160 aafe23eba5395be21d3bba18e550962fcecf851e SHA1 64eac7ed8b514169dd7618dcb1e5e4de2bcffdfe SHA256 4415c5121d134d7725b0d5a2ae261bb588ca14373dda5808af85742e1fa85621
+MD5 8113f1a7fbbff6bb3fd88f09b5df53ce ChangeLog 9912
+RMD160 aafe23eba5395be21d3bba18e550962fcecf851e ChangeLog 9912
+SHA256 4415c5121d134d7725b0d5a2ae261bb588ca14373dda5808af85742e1fa85621 ChangeLog 9912
 MISC metadata.xml 275 RMD160 7aca4724ede81b0eaad9b4536f00a6a805727cef SHA1 b1a92ff0d6bfacd26122ac4dbd4725ef2b023f81 SHA256 1e9c7343efc06a4d4143421f4bf3740c30f71ed6ce5011231505e7e911f31548
 MD5 f5775272cd7e22ae38566107c416c1e4 metadata.xml 275
 RMD160 7aca4724ede81b0eaad9b4536f00a6a805727cef metadata.xml 275
@@ -43,6 +43,6 @@ SHA256 1c9c61d95b78cea1c7b5911f093d02947f015e0420a87eb24f0ea9e0a4b18c32 files/di
 MD5 0c954babc18fcb5cb81d8e3cdeb1144c files/digest-pinentry-0.7.3 244
 RMD160 e460dd34cfd5e7fbc25bea4aeba8ba94411f9658 files/digest-pinentry-0.7.3 244
 SHA256 384e70d31a9eaa1f4d45af85de105bdcb84f92400b62f72bf2a602f4e7912e4b files/digest-pinentry-0.7.3 244
-MD5 26d114860ffd9b09ea21fef8120ffdb2 files/digest-pinentry-0.7.4 244
-RMD160 e127c11141c3e06efb7bc018b1492901e07ad888 files/digest-pinentry-0.7.4 244
-SHA256 65654480028b4c87ddfb30ba433c1bd8e3e90b05515c9c4eb9a025328758ad33 files/digest-pinentry-0.7.4 244
+MD5 26d114860ffd9b09ea21fef8120ffdb2 files/digest-pinentry-0.7.4-r1 244
+RMD160 e127c11141c3e06efb7bc018b1492901e07ad888 files/digest-pinentry-0.7.4-r1 244
+SHA256 65654480028b4c87ddfb30ba433c1bd8e3e90b05515c9c4eb9a025328758ad33 files/digest-pinentry-0.7.4-r1 244
diff --git a/app-crypt/pinentry/files/digest-pinentry-0.7.4 b/app-crypt/pinentry/files/digest-pinentry-0.7.4-r1
index 0a7c2f5bbefa..0a7c2f5bbefa 100644
--- a/app-crypt/pinentry/files/digest-pinentry-0.7.4
+++ b/app-crypt/pinentry/files/digest-pinentry-0.7.4-r1
diff --git a/app-crypt/pinentry/files/pinentry-0.7.4-grab.patch b/app-crypt/pinentry/files/pinentry-0.7.4-grab.patch
index c96875d0afc9..118745b33807 100644
--- a/app-crypt/pinentry/files/pinentry-0.7.4-grab.patch
+++ b/app-crypt/pinentry/files/pinentry-0.7.4-grab.patch
@@ -6,11 +6,11 @@ diff -urNp pinentry-0.7.4/gtk+-2/pinentry-gtk-2.c pinentry-0.7.4.new/gtk+-2/pine
      {
        g_signal_connect (G_OBJECT (win),
 -			pinentry->grab ? "map-event" : "focus-in-event",
-+			pinentry->grab ? "expose-event" : "focus-in-event",
++			"focus-in-event",
  			G_CALLBACK (grab_keyboard), NULL);
        g_signal_connect (G_OBJECT (win),
 -			pinentry->grab ? "unmap-event" : "focus-out-event",
-+			pinentry->grab ? "no-expose-event" : "focus-out-event",
++			"focus-out-event",
  			G_CALLBACK (ungrab_keyboard), NULL);
      }
    gtk_window_add_accel_group (GTK_WINDOW (win), acc);
diff --git a/app-crypt/pinentry/pinentry-0.7.4.ebuild b/app-crypt/pinentry/pinentry-0.7.4-r1.ebuild
index 5d58f1334abb..efb15574619d 100644
--- a/app-crypt/pinentry/pinentry-0.7.4.ebuild
+++ b/app-crypt/pinentry/pinentry-0.7.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.4.ebuild,v 1.3 2007/12/21 07:27:15 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.7.4-r1.ebuild,v 1.1 2007/12/22 05:17:11 alonbl Exp $
 
 inherit qt3 multilib eutils flag-o-matic