Add halbattary patch b.k.o bug 187600

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 39 insertions, 4 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index c0b0f0a2cf11..1f588e5485c8 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.588 2009/05/07 11:43:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.589 2009/05/07 22:15:18 alexxy Exp $
+
+  07 May 2009; Alexey Shvetsov <alexxy@gentoo.org> kdelibs-4.2.3.ebuild,
+  +files/kdelibs-4.2.3-halbattery_backport_fix.patch:
+  Add halbattary patch b.k.o bug 187600
 
   07 May 2009; Tomas Chvatal <scarabeus@gentoo.org> kdelibs-4.2.3.ebuild,
   -files/sanbox-error.patch:
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 0a7f7300a660..ed821d2ba787 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 4.1.3-cmake-config.patch 2356 RMD160 14f14e29038735ef105893d53cf1b3771e54ee22 SHA1 e69d8449c52df48408401e62b2acba4a6d60bd7f SHA256 06f7513ebb6d9a0507191f81ddf93f7abd47a4c2a300be22756a16425f9f1904
 AUX 4.2.0-kcatalog.patch 1607 RMD160 a2428826cf1c80686fdb722b017ad4e5cec54089 SHA1 abe3912ace63838a267132b8d5cf95f316c7f7e3 SHA256 85af0df96f19f0d9faab1d6967f8d3736e3480b354ebfb11db5b44ef59041ae6
 AUX 4.2.0-kded.patch 2435 RMD160 66b98f6b532b2b45a4d7539b95088b473a3fe90d SHA1 89a3845b5ca33038cdbaa7a3a4bc2a12eb53bbc9 SHA256 4addbe384870d8ba2bdcb715b7b0fecc9b956201ba87e1c772e939b63e7cd538
@@ -26,6 +29,7 @@ AUX kdelibs-4.2.1-kcatalog.patch 1653 RMD160 068c80e3818051df6ebe14a333b840545e8
 AUX kdelibs-4.2.1-kdialog.patch 514 RMD160 59db100560e50c9a42bf4857eea900dbcd8b863f SHA1 c36ec0e8df80e82ae2446b1547fcd917cee71253 SHA256 decc2410a66a785a39bc67aba6cab038d98b6659dcb72241f34e3055cd83e1d5
 AUX kdelibs-4.2.1-qt4.5.patch 19805 RMD160 4a266bdbe3d9dcc088f7abbffc2b46714d57208a SHA1 9490015fb83982d0aeac3a1b7918fa4262957782 SHA256 2a3ffd511d25d8a4fc4a8e246e97245a78af7766a33c6baac382568da04dc791
 AUX kdelibs-4.2.2-kickoff-focus.patch 1475 RMD160 08d37ea62d5fedacb205cc61ad551d0d281009c4 SHA1 6dae007ef33f02699c36ab0418b73fb1f3644000 SHA256 4e29c20cebab3b52e495b57ab2296b52c74f86f4023631c214aadb4e6c4032e5
+AUX kdelibs-4.2.3-halbattery_backport_fix.patch 750 RMD160 12cafe49a443ba9a5ceac21e901140ad55f0af45 SHA1 974db6a4d431f4906038e8fdadd3f2d9b217322b SHA256 acfa2f6ea003c7c6e74d303b15549bc45a382418aa480e504952e28d670c2223
 DIST kde-3.5.9-seli-xinerama.tar.bz2 15150 RMD160 09f9dc74e52d1507a73d1140654021d2baedde3a SHA1 cb8eaba630ee7c8f93c634512d52a9d1603d5405 SHA256 769b0135b327b3274aa45d78ae882811073041fdbfd55267106b1a3f42115966
 DIST kdelibs-3.5-patchset-14.tar.bz2 23248 RMD160 223ad8aa6d3dab3a6e23a89e00eaf2e90bab399e SHA1 5d50fff6b6a26d8abffa4dda7360b42e0fc29eac SHA256 50d1517fbb3b70890b1858533a77fb0e6e1e72612e155ebe5350e8fea7405273
 DIST kdelibs-3.5-patchset-15.tar.bz2 6707 RMD160 55958374bfc4ba27caf573e13337677c35cbe2c0 SHA1 e0a35642adfcf223ce7490b21af1fa2c3d922b93 SHA256 4a25bc340ce2567ea017456b4aa2292b288779d59d0dd012bd50f5189fe739ec
@@ -43,6 +47,13 @@ EBUILD kdelibs-3.5.9-r4.ebuild 6370 RMD160 75c38e396b898acf3f90dc1533b500b7698c8
 EBUILD kdelibs-3.5.9.ebuild 6042 RMD160 5402e42899c0e55787f8b7f5650143dcbc4410d7 SHA1 721388ab5fa4ee455bdadb189afa021bd336fc16 SHA256 f7acb5abb483ebeeaee7a8636073b85d4ea0b7e9badcd8f8073d5ac8dcd2167b
 EBUILD kdelibs-4.2.2-r1.ebuild 7139 RMD160 0d527fa084afa40671631e1f33b10d7951b5697a SHA1 4107b28613c3c1f0837a5f9599ed9a367c6e6fe2 SHA256 804b45e952bf1aebd79a0ffac89cc96fd558da731d7d74fcfcd6161154950a3b
 EBUILD kdelibs-4.2.2.ebuild 7136 RMD160 0422951dd81f8a0c2ace4d942915688f5b17182f SHA1 cc3eaaa9163e3ed4d17f99bea721ebd6f6ff17b9 SHA256 981bf12799595b264c2c703436d13c18c8e9226686252253e7127b4df32e2372
-EBUILD kdelibs-4.2.3.ebuild 5946 RMD160 8f0a4cba7bb3e90db1b11226e1ed3ede49f19b52 SHA1 c161aebedd9e70d725a98d4aefefe67de4aac4ef SHA256 25e29b6691f44a25ed75dd5a0bec640ff33fbf54438397c492769d77e0527638
-MISC ChangeLog 97148 RMD160 22395e1ac1879fe9e03ec931c3fc2fa251d55688 SHA1 405ab837e985ecaaf7fb5ed25a652a9348cc2e4e SHA256 ab0319fa1190799a5df12819a397c38cc7f557676c816172e0fc9b1335a27827
+EBUILD kdelibs-4.2.3.ebuild 5993 RMD160 d58d07310e6b2c2b6ea9e21d26cdc4d393d353b7 SHA1 27eeafb1c810e861bc2d4db22a2c3d8d295bd1ce SHA256 709ed77fe529d92d952c7c3a418299ead740371d4e851c68813318eb3fdb0104
+MISC ChangeLog 97313 RMD160 a3bafc7a73be63f7b09e1290e0cef689319fea1c SHA1 613083f41795f0d5ff63f88ff6edae87550a915f SHA256 770152fcc8b48ab378c8b005ac94043aecb9b3a87244db94a0990a4366e8e283
 MISC metadata.xml 441 RMD160 e57f70d613371f6611dd4b9836dcc2d782b37dff SHA1 a9ccd73256be801916ce41b1e40269bc094587eb SHA256 e9b96a886144e7453b3cf5f6361e14b2f35a448f24a10c00074ce00c5a179caf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoDXYcACgkQ5BmOA85PVLiw7QCfXPNaSsfDfP4BXklq0+kTgNi4
+zWsAn2fNGpSPcmOZAhJm8Af2ju2dkN7r
+=C1CK
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/files/kdelibs-4.2.3-halbattery_backport_fix.patch b/kde-base/kdelibs/files/kdelibs-4.2.3-halbattery_backport_fix.patch
new file mode 100644
index 000000000000..d9d0e2519cf0
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.2.3-halbattery_backport_fix.patch
@@ -0,0 +1,19 @@
+--- trunk/KDE/kdelibs/solid/solid/backends/hal/halbattery.cpp	2009/03/31 03:29:32	947130
++++ trunk/KDE/kdelibs/solid/solid/backends/hal/halbattery.cpp	2009/03/31 03:58:04	947131
+@@ -112,12 +112,14 @@
+     {
+         emit chargePercentChanged(chargePercent(), m_device->udi());
+     }
+-    else if (changes.contains("battery.rechargeable.is_charging")
++
++    if (changes.contains("battery.rechargeable.is_charging")
+            || changes.contains("battery.rechargeable.is_discharging"))
+     {
+         emit chargeStateChanged(chargeState(), m_device->udi());
+     }
+-    else if ( changes.contains( "battery.present" ) )
++
++    if ( changes.contains( "battery.present" ) )
+     {
+         emit plugStateChanged(isPlugged(), m_device->udi());
+     }
diff --git a/kde-base/kdelibs/kdelibs-4.2.3.ebuild b/kde-base/kdelibs/kdelibs-4.2.3.ebuild
index 59db2808db54..e43e69c7a6a3 100644
--- a/kde-base/kdelibs/kdelibs-4.2.3.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.3.ebuild,v 1.3 2009/05/07 11:43:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.3.ebuild,v 1.4 2009/05/07 22:15:18 alexxy Exp $
 
 EAPI="2"
 
@@ -117,6 +117,7 @@ PATCHES=(
 	"${FILESDIR}/dist/20_use_dejavu_as_default_font.patch"
 	"${FILESDIR}/dist/23_solid_no_double_build.patch"
 	"${FILESDIR}/${PN}-${SLOT}-fixx11h.h.patch"
+	"${FILESDIR}/${P}-halbattery_backport_fix.patch"
 )
 
 src_prepare() {