Fixes bug #148384.

Package-Manager: portage-2.1.1

5 files changed, 85 insertions, 5 deletions

diff --git a/kde-base/kwalletmanager/ChangeLog b/kde-base/kwalletmanager/ChangeLog
index 129c459dad08..37358d668052 100644
--- a/kde-base/kwalletmanager/ChangeLog
+++ b/kde-base/kwalletmanager/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kwalletmanager
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletmanager/ChangeLog,v 1.50 2006/09/17 22:53:00 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletmanager/ChangeLog,v 1.51 2006/09/26 22:54:39 deathwing00 Exp $
+
+*kwalletmanager-3.5.4-r2 (26 Sep 2006)
+
+  26 Sep 2006; Ioannis Aslanidis <deathwing00@gentoo.org>
+  +files/kwalletmanager-3.5.4-systray-fix.patch,
+  +kwalletmanager-3.5.4-r2.ebuild:
+  Fixes bug #148384. Now it shows correctly in systray. Thanks to Paolo
+  Pedroni for reporting it.
 
   17 Sep 2006; Carsten Lohrke <carlo@gentoo.org>
   -kwalletmanager-3.4.3.ebuild:
diff --git a/kde-base/kwalletmanager/Manifest b/kde-base/kwalletmanager/Manifest
index 42620702e3d1..f90ef28dfc19 100644
--- a/kde-base/kwalletmanager/Manifest
+++ b/kde-base/kwalletmanager/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX kwalletmanager-3.5.4-systray-fix.patch 821 RMD160 71d07745d7f421b9495eb40ba999f879ab9c5075 SHA1 c8c5f7eaaaeb46c1f0807d5f13ee4727182f13d2 SHA256 0787c4a1d7cea5e937551c46b7328df3aa9d70309b6d73e1edf4ba2b1837578e
+MD5 27291e87d5e08009405320c10b14761f files/kwalletmanager-3.5.4-systray-fix.patch 821
+RMD160 71d07745d7f421b9495eb40ba999f879ab9c5075 files/kwalletmanager-3.5.4-systray-fix.patch 821
+SHA256 0787c4a1d7cea5e937551c46b7328df3aa9d70309b6d73e1edf4ba2b1837578e files/kwalletmanager-3.5.4-systray-fix.patch 821
 DIST kdeutils-3.5-patchset-01.tar.bz2 2746 RMD160 e452bd68da2a58df5a796c325915745631d64a0e SHA1 a4b2e7718dcc3c42da1ccf122f6b1b944102a0b8 SHA256 271b4a355c17cbe010aa49799c78773773e14065a15afdd3654b0a5e7eba6892
 DIST kdeutils-3.5.2.tar.bz2 2976691 RMD160 f561b714f401056ce771dfa5d04b5436e9865627 SHA1 b0612bdeadc2af4a05ff5bc223206a38bd2d2e44 SHA256 985b2b5a5fa0aff37161b3aaa5ef7b1e6e938f6b9445fd39b8c554a4570376f6
 DIST kdeutils-3.5.3.tar.bz2 2979916 RMD160 3724e3ad753572353ade57d6fc4a7e0d76aeddfa SHA1 d75dbb1d231776bb91f3c6604888ac209f75411e SHA256 713664e79e30ae7b2096ca4bb58aa554f10e759eb55ad1bc9ef917bea7057e2b
@@ -14,14 +21,18 @@ EBUILD kwalletmanager-3.5.4-r1.ebuild 522 RMD160 b1837e9593da9510ce48fb8fa6bc988
 MD5 1b393da1875078ff01a8cecee6328a86 kwalletmanager-3.5.4-r1.ebuild 522
 RMD160 b1837e9593da9510ce48fb8fa6bc988451eda8c5 kwalletmanager-3.5.4-r1.ebuild 522
 SHA256 5c99ec91553fe6ce9a54815b950444928ee395e612dcd0b81dc8508df7dba29b kwalletmanager-3.5.4-r1.ebuild 522
+EBUILD kwalletmanager-3.5.4-r2.ebuild 613 RMD160 0a03b6328455d335c535a9089c3b1297718fe4d6 SHA1 d32429ab2e00dac0b65567bce01e4f0e424066a7 SHA256 a93dc90049b5c0248efa7901d3c7ceee8f27f60d95b87b4aaf4551bb56b2c541
+MD5 c7996cf4aa0ced91302391ad3688baf5 kwalletmanager-3.5.4-r2.ebuild 613
+RMD160 0a03b6328455d335c535a9089c3b1297718fe4d6 kwalletmanager-3.5.4-r2.ebuild 613
+SHA256 a93dc90049b5c0248efa7901d3c7ceee8f27f60d95b87b4aaf4551bb56b2c541 kwalletmanager-3.5.4-r2.ebuild 613
 EBUILD kwalletmanager-3.5.4.ebuild 451 RMD160 343fcdcd7bb3fb41ef54ee90b5e43626a2f87149 SHA1 08d2886eb63d2ee94a250337489d2594f3782515 SHA256 a987fa8c99e407c7c0903480f9c5931c8b1dd60f0335a69a8330c9ab878b3954
 MD5 399e19277769a65a32d9c6d194b6ba01 kwalletmanager-3.5.4.ebuild 451
 RMD160 343fcdcd7bb3fb41ef54ee90b5e43626a2f87149 kwalletmanager-3.5.4.ebuild 451
 SHA256 a987fa8c99e407c7c0903480f9c5931c8b1dd60f0335a69a8330c9ab878b3954 kwalletmanager-3.5.4.ebuild 451
-MISC ChangeLog 6710 RMD160 a1659349c63a89de2bee8d4dc661ece9379528f5 SHA1 a80f97db60fc95c5fb3175caa33f6b568a8456fb SHA256 c78eb0c5c71ac1068ed2e6d149cad1422ab7e74dfdff11889a3dbef3bc385f5d
-MD5 86c4d54f1d080fea94517c3c333a03eb ChangeLog 6710
-RMD160 a1659349c63a89de2bee8d4dc661ece9379528f5 ChangeLog 6710
-SHA256 c78eb0c5c71ac1068ed2e6d149cad1422ab7e74dfdff11889a3dbef3bc385f5d ChangeLog 6710
+MISC ChangeLog 6999 RMD160 3e08086e1ade52e3ae3f1f6e5acdc1721f4ec0f1 SHA1 5e93029e6af0128eedbecc7fec0bc736cbbdccda SHA256 b989a9261dd1886b5b191afec1c76ab5b31ec342b23571a485e4be2b202c1eed
+MD5 0fce071b971effd2f605ee4639a87791 ChangeLog 6999
+RMD160 3e08086e1ade52e3ae3f1f6e5acdc1721f4ec0f1 ChangeLog 6999
+SHA256 b989a9261dd1886b5b191afec1c76ab5b31ec342b23571a485e4be2b202c1eed ChangeLog 6999
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -38,3 +49,13 @@ SHA256 404a8906f8ad90c4ea190044dc1538002e5bf54eef5c30348ce60bc379b6f49a files/di
 MD5 677c1bee0617c4eb4f556b4693cba86f files/digest-kwalletmanager-3.5.4-r1 521
 RMD160 0f765ead337414006e71203e29dfc17dfdc9a66f files/digest-kwalletmanager-3.5.4-r1 521
 SHA256 ac29f7dcc9cf159afc41a51b962b16b29bc61d5f9b8aa5437b4ded138c373ceb files/digest-kwalletmanager-3.5.4-r1 521
+MD5 677c1bee0617c4eb4f556b4693cba86f files/digest-kwalletmanager-3.5.4-r2 521
+RMD160 0f765ead337414006e71203e29dfc17dfdc9a66f files/digest-kwalletmanager-3.5.4-r2 521
+SHA256 ac29f7dcc9cf159afc41a51b962b16b29bc61d5f9b8aa5437b4ded138c373ceb files/digest-kwalletmanager-3.5.4-r2 521
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFGa+1QVeVlgLp4x8RAlwtAJ9ApByHDioJ9kYfcloi9XwVx6n2hgCfSW7Z
+Gww5l99KgnjAdO+7txmY818=
+=5FhU
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kwalletmanager/files/digest-kwalletmanager-3.5.4-r2 b/kde-base/kwalletmanager/files/digest-kwalletmanager-3.5.4-r2
new file mode 100644
index 000000000000..57a4f3199467
--- /dev/null
+++ b/kde-base/kwalletmanager/files/digest-kwalletmanager-3.5.4-r2
@@ -0,0 +1,6 @@
+MD5 548aa1b3b2d0260d2617a575e5b023a3 kdeutils-3.5-patchset-01.tar.bz2 2746
+RMD160 e452bd68da2a58df5a796c325915745631d64a0e kdeutils-3.5-patchset-01.tar.bz2 2746
+SHA256 271b4a355c17cbe010aa49799c78773773e14065a15afdd3654b0a5e7eba6892 kdeutils-3.5-patchset-01.tar.bz2 2746
+MD5 e24cd91576db3d2414fb30cab47e44e5 kdeutils-3.5.4.tar.bz2 2981597
+RMD160 56264e29a9a9b7074352d7a7cc582536e2959498 kdeutils-3.5.4.tar.bz2 2981597
+SHA256 8e6e18155bd8e7e35f75403dfe0b0187d38e1309ee07e3eebc7f914da56577da kdeutils-3.5.4.tar.bz2 2981597
diff --git a/kde-base/kwalletmanager/files/kwalletmanager-3.5.4-systray-fix.patch b/kde-base/kwalletmanager/files/kwalletmanager-3.5.4-systray-fix.patch
new file mode 100644
index 000000000000..b8f6f0185103
--- /dev/null
+++ b/kde-base/kwalletmanager/files/kwalletmanager-3.5.4-systray-fix.patch
@@ -0,0 +1,24 @@
+diff -U 4 -H -b -w -B -E -d -i -r kwalletmanager-3.5.4-orig/kwallet/kwalletmanager.cpp kwalletmanager-3.5.4/kwallet/kwalletmanager.cpp
+--- kwalletmanager-3.5.4-orig/kwallet/kwalletmanager.cpp	2006-09-27 00:38:20.000000000 +0200
++++ kwalletmanager-3.5.4/kwallet/kwalletmanager.cpp	2006-09-27 00:39:40.000000000 +0200
+@@ -42,8 +42,9 @@
+ #include <qaccel.h>
+ #include <qguardedptr.h>
+ #include <qptrstack.h>
+ #include <qregexp.h>
++#include <qtimer.h>
+ #include <qtooltip.h>
+ 
+ KWalletManager::KWalletManager(QWidget *parent, const char *name, WFlags f)
+ : KMainWindow(parent, name, f), DCOPObject("KWalletManager") {
+@@ -74,9 +75,9 @@
+ 		}
+ 		if (!isOpen && kapp->isRestored()) {
+ 			delete _tray;
+ 			_tray = 0L;
+-			kapp->exit();
++			QTimer::singleShot( 0, kapp, SLOT( quit()));
+ 			return;
+ 		}
+ 	} else {
+ 		_tray = 0L;
diff --git a/kde-base/kwalletmanager/kwalletmanager-3.5.4-r2.ebuild b/kde-base/kwalletmanager/kwalletmanager-3.5.4-r2.ebuild
new file mode 100644
index 000000000000..354892297876
--- /dev/null
+++ b/kde-base/kwalletmanager/kwalletmanager-3.5.4-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletmanager/kwalletmanager-3.5.4-r2.ebuild,v 1.1 2006/09/26 22:54:39 deathwing00 Exp $
+
+KMNAME=kdeutils
+KMMODULE=kwallet
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdeutils-3.5-patchset-01.tar.bz2"
+
+DESCRIPTION="KDE Wallet Management Tool"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+src_unpack() {
+	kde-meta_src_unpack
+	epatch "${FILESDIR}/${P}-systray-fix.patch"
+}