Add another fix.

(Portage version: 2.0.54)

5 files changed, 130 insertions, 40 deletions

diff --git a/kde-base/ksysguard/ChangeLog b/kde-base/ksysguard/ChangeLog
index 570368ca1b72..75350648e051 100644
--- a/kde-base/ksysguard/ChangeLog
+++ b/kde-base/ksysguard/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ksysguard
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ChangeLog,v 1.47 2006/04/06 02:53:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ChangeLog,v 1.48 2006/04/21 18:42:34 carlo Exp $
+
+*ksysguard-3.5.2-r2 (21 Apr 2006)
+
+  21 Apr 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/ksysguard-3.5.2-fixes.diff, +ksysguard-3.5.2-r2.ebuild:
+  Add another fix.
 
   06 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   -ksysguard-3.5.0.ebuild, -ksysguard-3.5.1.ebuild, -ksysguard-3.5.2.ebuild:
diff --git a/kde-base/ksysguard/Manifest b/kde-base/ksysguard/Manifest
index 8d8be150dc59..f4767a0afa03 100644
--- a/kde-base/ksysguard/Manifest
+++ b/kde-base/ksysguard/Manifest
@@ -1,52 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c55be95f3670e1257a4fc2dc567e216b ChangeLog 6388
-RMD160 460ba9c1a42e7be95a785fbedd2bf27ceba68a7c ChangeLog 6388
-SHA256 cddbf3128a651f2097f7d665b3714ab21040b9e910e0a33aa7494e49eebdef90 ChangeLog 6388
+MD5 dfcd155a40260f1993e5ac21a39163d3 ChangeLog 6557
 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-ksysguard-3.4.1 212
-RMD160 507b5780112807385327a808ffffb5c897cbf1f4 files/digest-ksysguard-3.4.1 212
-SHA256 a64c99717e47d1f6143f531b9767e3e022d6c789e8d5a14aaf174814cb51a21d files/digest-ksysguard-3.4.1 212
 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-ksysguard-3.4.1-r1 212
-RMD160 507b5780112807385327a808ffffb5c897cbf1f4 files/digest-ksysguard-3.4.1-r1 212
-SHA256 a64c99717e47d1f6143f531b9767e3e022d6c789e8d5a14aaf174814cb51a21d files/digest-ksysguard-3.4.1-r1 212
 MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-ksysguard-3.4.2 287
-RMD160 db88376c4259165535f83f3529f0834fb2209612 files/digest-ksysguard-3.4.2 287
-SHA256 3f1b77c90587a110ffb3a1402c6f10a87ef93bfdbc1345bb2138188a52c9cb8b files/digest-ksysguard-3.4.2 287
 MD5 b334b621242eaf5a23035e870f09dea6 files/digest-ksysguard-3.4.3 68
-RMD160 fe4b253b0a7c2e30a2aa1d0d796dfcb11e30590a files/digest-ksysguard-3.4.3 68
-SHA256 2c163305cf238b4283a2263d089f3a5cdacfe053018c1fa5d8a5879593baf1a8 files/digest-ksysguard-3.4.3 68
 MD5 5efe75301bc0d47d1f2af0ce2feb2603 files/digest-ksysguard-3.5.2-r1 68
-RMD160 e75b5aeaf92e72ffb4e94df99d0f81490f287b93 files/digest-ksysguard-3.5.2-r1 68
-SHA256 19fc0b34e2f9464359bac8b07b2aec31b9b080ecc053164cc9bf8ee952e564a1 files/digest-ksysguard-3.5.2-r1 68
+MD5 5efe75301bc0d47d1f2af0ce2feb2603 files/digest-ksysguard-3.5.2-r2 68
 MD5 430a0cdfc39b2da16bcf5cd41b65b1d6 files/kdebase-3.4.1-configure.patch 1248
-RMD160 5542d96773b37094366695802bad0420a948dcea files/kdebase-3.4.1-configure.patch 1248
-SHA256 df2f86ecb787a28b4b7eb936d39eb20a1541f5383bb32b9c8a31c7ccf918264d files/kdebase-3.4.1-configure.patch 1248
 MD5 47c75c73f23c83e62d38658401b4c20b files/ksysguard-3.5.2-crash-fix.diff 1043
-RMD160 de0a61191c3d5d16e958e71a9cb4c2375991fd8f files/ksysguard-3.5.2-crash-fix.diff 1043
-SHA256 fe5896f9e5cd301646719e80a27649979d92c41831fa9f11c1c98b6ee89900f5 files/ksysguard-3.5.2-crash-fix.diff 1043
+MD5 2a51179765d5a570594de8a59ba40ce1 files/ksysguard-3.5.2-fixes.diff 2527
 MD5 4d73618fea5e571d8486e8d253f6915e ksysguard-3.4.1-r1.ebuild 582
-RMD160 3aa4122e900def0ae247bdf75fd51d531853f744 ksysguard-3.4.1-r1.ebuild 582
-SHA256 66eb3a41c8cb637b38cc8c9a5c686b4f4f1ea5bb6cec61a9003767431fc69ae5 ksysguard-3.4.1-r1.ebuild 582
 MD5 9fe1b72a5365ccbc9e7b788ddbc4f6b7 ksysguard-3.4.1.ebuild 446
-RMD160 384085686a08a40225ca282b1c92341e7c3e5e27 ksysguard-3.4.1.ebuild 446
-SHA256 1ac60212b1d2f9937aac017e53583e7daf6c757618056d0fac0a995e0f797ef3 ksysguard-3.4.1.ebuild 446
 MD5 ae2847a5d3a13f0813b8aefef185e54a ksysguard-3.4.2.ebuild 592
-RMD160 0e9cb3be749f4b4dc9cde7c46165c0c7bff2c74f ksysguard-3.4.2.ebuild 592
-SHA256 9bf3834b009f5a814683ddb0fee56f74597a91be6c60d3e8f46d7744849d59b9 ksysguard-3.4.2.ebuild 592
 MD5 c388907b22169601ee853aeca2f63763 ksysguard-3.4.3.ebuild 593
-RMD160 9b5ec44c12469c0536ea1a4e89880f65988fb20a ksysguard-3.4.3.ebuild 593
-SHA256 f1e29df04b6c53e47837096e462bf20d98b2693fd227a6959e947b5dd02f4328 ksysguard-3.4.3.ebuild 593
 MD5 a82cddf483331a5b97d0e811d52a171c ksysguard-3.5.2-r1.ebuild 701
-RMD160 4750f0ae3c1548f2a64839078191d08be25aef50 ksysguard-3.5.2-r1.ebuild 701
-SHA256 0443ff8c4bc20cf6d778e8d3e58659491f0e6645af8f3b28d6d247f0926591f6 ksysguard-3.5.2-r1.ebuild 701
+MD5 8926a6562323facc51cb1130e677dfef ksysguard-3.5.2-r2.ebuild 800
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
-SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFENIJnAiZjviIA2XgRAu+EAJ0WQp9APCrHsYHftLE7Ax5xKDyDswCgypUn
-pUr75/UT1GaModGxYjlhl7A=
-=QsV+
------END PGP SIGNATURE-----
diff --git a/kde-base/ksysguard/files/digest-ksysguard-3.5.2-r2 b/kde-base/ksysguard/files/digest-ksysguard-3.5.2-r2
new file mode 100644
index 000000000000..9c5d5e23a110
--- /dev/null
+++ b/kde-base/ksysguard/files/digest-ksysguard-3.5.2-r2
@@ -0,0 +1 @@
+MD5 c5685e1be34e033286aa1f37002a0552 kdebase-3.5.2.tar.bz2 23590820
diff --git a/kde-base/ksysguard/files/ksysguard-3.5.2-fixes.diff b/kde-base/ksysguard/files/ksysguard-3.5.2-fixes.diff
new file mode 100644
index 000000000000..7e14b219a191
--- /dev/null
+++ b/kde-base/ksysguard/files/ksysguard-3.5.2-fixes.diff
@@ -0,0 +1,95 @@
+--- kdebase/ksysguard/gui/SensorDisplayLib/DancingBars.cc	2005/09/29 13:24:25	465343
++++ kdebase/ksysguard/gui/SensorDisplayLib/DancingBars.cc	2006/04/10 09:13:08	528138
+@@ -45,7 +45,8 @@
+   : KSGRD::SensorDisplay( parent, name, title, noFrame_, isApplet )
+ {
+   mBars = 0;
+-  mFlags = 0;
++  mFlags = QBitArray(100);
++  mFlags.fill( false );
+ 
+   if ( noFrame() )
+     mPlotter = new BarGraph( this );
+@@ -245,16 +246,16 @@
+ 	
+   if ( id < 100 ) {
+     mSampleBuffer[ id ] = answer.toDouble();
+-    if ( mFlags & ( 1 << id ) ) {
++    if ( mFlags.testBit( id ) == true ) {
+       kdDebug(1215) << "ERROR: DancingBars lost sample (" << mFlags
+                     << ", " << mBars << ")" << endl;
+       sensorError( id, true );
+     }
+-    mFlags |= 1 << id;
++    mFlags.setBit( id, true );
+ 
+-    if ( mFlags == (uint)( ( 1 << mBars ) - 1 ) ) {
++    if ( mFlags.testBit( ( 1 << mBars ) - 1 ) == true ) {
+       mPlotter->updateSamples( mSampleBuffer );
+-      mFlags = 0;
++      mFlags.fill( false );
+     }
+   } else if ( id >= 100 ) {
+     KSGRD::SensorIntegerInfo info( answer );
+--- kdebase/ksysguard/gui/SensorDisplayLib/DancingBars.h	2005/09/29 13:24:25	465343
++++ kdebase/ksysguard/gui/SensorDisplayLib/DancingBars.h	2006/04/10 09:13:08	528138
+@@ -25,6 +25,7 @@
+ #define KSG_DANCINGBARS_H
+ 
+ #include <SensorDisplay.h>
++#include <qbitarray.h>
+ 
+ class KIntNumInput;
+ 
+@@ -83,7 +84,7 @@
+       been received.
+      */
+     QMemArray<double> mSampleBuffer;
+-    ulong mFlags;
++    QBitArray mFlags;
+ };
+ 
+ #endif
+--- kdebase/ksysguard/gui/ksgrd/SensorShellAgent.cc	2005/09/29 13:24:25	465343
++++ kdebase/ksysguard/gui/ksgrd/SensorShellAgent.cc	2006/03/27 09:04:59	523046
+@@ -41,7 +41,7 @@
+   if ( mDaemon ) {
+     mDaemon->writeStdin( "quit\n", strlen( "quit\n" ) );
+     delete (KShellProcess*)mDaemon;
+-		mDaemon = 0;
++    mDaemon = 0;
+   }
+ }
+ 	
+@@ -50,9 +50,9 @@
+ {
+   mDaemon = new KShellProcess;
+ 
+-	setHostName( host );
+-	mShell = shell;
+-	mCommand = command;
++  setHostName( host );
++  mShell = shell;
++  mCommand = command;
+ 
+   connect( mDaemon, SIGNAL( processExited( KProcess* ) ),
+            SLOT( daemonExited( KProcess* ) ) );
+@@ -84,7 +84,7 @@
+ {
+   shell = mShell;
+   command = mCommand;
+-	port = -1;
++  port = -1;
+ }
+ 
+ void SensorShellAgent::msgSent( KProcess* )
+@@ -122,7 +122,8 @@
+   sensorManager()->hostLost( this );
+   sensorManager()->disengage( this );
+ 
+-  process->deleteLater();
++  if ( mDaemon )
++    mDaemon->deleteLater();
+ }
+ 
+ bool SensorShellAgent::writeMsg( const char *msg, int len )
diff --git a/kde-base/ksysguard/ksysguard-3.5.2-r2.ebuild b/kde-base/ksysguard/ksysguard-3.5.2-r2.ebuild
new file mode 100644
index 000000000000..9a40a213fdfe
--- /dev/null
+++ b/kde-base/ksysguard/ksysguard-3.5.2-r2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ksysguard-3.5.2-r2.ebuild,v 1.1 2006/04/21 18:42:34 carlo Exp $
+
+KMNAME=kdebase
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="KSysguard is a network enabled task manager and system monitor application, with the additional functionality of top."
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="lm_sensors zeroconf"
+DEPEND="lm_sensors? ( sys-apps/lm_sensors )
+	zeroconf? ( net-misc/mDNSResponder )"
+
+src_compile() {
+	local myconf="$(use_with lm_sensors sensors)
+	              $(use_enable zeroconf dnssd)"
+
+	kde-meta_src_compile
+}
+
+PATCHES="${FILESDIR}/ksysguard-3.5.2-fixes.diff"