Revision bump, apply patch to fix battery monitor widget wrt bug 472382, credit to Andreas Sturmlechner <andreas.sturmlechner@gmail.com>

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x42618354

4 files changed, 53 insertions, 19 deletions

diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog
index 2749e614ee98..d2ea43d24d85 100644
--- a/kde-base/plasma-workspace/ChangeLog
+++ b/kde-base/plasma-workspace/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/plasma-workspace
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.219 2013/06/05 10:32:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.220 2013/06/06 00:52:49 creffett Exp $
+
+*plasma-workspace-4.10.4-r1 (06 Jun 2013)
+
+  06 Jun 2013; Chris Reffett <creffett@gentoo.org>
+  +files/plasma-workspace-4.10.4-keep-batterymonitor-in-sync-with-systray.patch,
+  +plasma-workspace-4.10.4-r1.ebuild, -plasma-workspace-4.10.4.ebuild:
+  Revision bump, apply patch to fix battery monitor widget wrt bug 472382,
+  credit to Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
 
   05 Jun 2013; Agostino Sarubbo <ago@gentoo.org> plasma-workspace-4.10.3.ebuild:
   Stable for x86, wrt to bug #471392
diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index 7683fbeb816d..24ebced042ea 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -2,28 +2,21 @@
 Hash: SHA256
 
 AUX plasma-workspace-4.10.1-noplasmalock.patch 303 SHA256 d58576621b9e09a76504fc22fbc9cd6f65e49bda718c1922ba235606a60e9226 SHA512 32f582aa3a6888f5d8df47d7aa504f0749ed0f27b328aa8ba42cec4eee539a05a4d6929d98000ba1d4f58513d9faf6c7ed2d7b74d806fca32daf8f3bd67ade0d WHIRLPOOL 63cf6a1cce607cd01ef1f69acfa52c034a1394910317074140406aef2d383b0429119457567f14c9a7797fce77e3fb1db670b6d30fbddfc1b22c0bcbe0bec02e
+AUX plasma-workspace-4.10.4-keep-batterymonitor-in-sync-with-systray.patch 1261 SHA256 ad0045c00b8a455b2a457176d5c053fda4985ac30d2c87850774183f64cba6f5 SHA512 cd37b914af6a819899cd2b04a97480d4878893b0b43f7f772302f494b89e11477241a34682534646657b0f5587bcd6e3841a49cc504a8a377782c2edbdbfad9d WHIRLPOOL be0f68e76663cf488c212ddc448bc8837d61cc446f7f8c9ce300ced0f23f9487f33af152c85131aef3c987e5ea622a5a0a6365c15f3e97e603a683b01dd131b1
 DIST kde-workspace-4.10.2.tar.xz 13564908 SHA256 36e429113b62b196ee2f259f0d16c19746c2705ebe225dec920aee49797b6867 SHA512 aa4b5b89026587282b34382e5d48e2ca51dd65b580f606d1f03dface3163c99d00d7ec6bbd234d886b00585534c294d1b8a5bfe368570a1fccae0e861c7c4dff WHIRLPOOL 78a9447f910a9e602e45867e0934970115307a94e363a6a20a64eb5bf0c5f3ee118107cedece6656b7ffc0fa3e5d708dc9644a98a895f507d4f03259614ac741
 DIST kde-workspace-4.10.3.tar.xz 13569364 SHA256 d870db2f39dcec6d4c11ccaef53d24978c1249a9426814414a90456d9cfce49d SHA512 d7e29ec5401e9aeb38e57257ada8060d0f684b2c057df809f519d8e89d94b39b9ef88435104caa8a056ec6337c54799909109d73d81104e27bc671e6099310ea WHIRLPOOL 476398ba07427979c253507dac6ca5b4ea29c4136b1fdd5613d5e017f8eab5930a614bb50efedd5f2ecea9e12e3527311ea9eb3aab0919e987b447d696f6096a
 DIST kde-workspace-4.10.4.tar.xz 13426036 SHA256 55b9c79829fbbe781653951eb0b94dcfbb21fa46102c0c15db40521c143f22d1 SHA512 ff5ca4d9675b9a8577b30f5725222b66e464496e438d64f0c528bb782c3d62cc5382e414c0c8884948733061cd6c181b74cf5e3c04ae137a9bb9f86fda8ee934 WHIRLPOOL 919297e61928dd7b555d42fb7a0890485755106d85ac18015b262109eb6ce34b00b82c16b224a6218abe53fec01e9f66f7c6fe9189507ea4231f0e6e905265d1
 EBUILD plasma-workspace-4.10.2.ebuild 3208 SHA256 c985defba8115a4a2bf46f086940cb34aaf0d93e224c17886980994118a117fb SHA512 57ea11202974365f1e148a25acdcceea24b3ce377180b6597191d2bc8b8bce6a718224786554a2ad676db3cd2f9a4f8bfc66598c3d2801197e883a72b4f3d6a8 WHIRLPOOL 51aa690b834a9b16d3d4e52b2d63083a5fea9fe04a24abcc387ca4e306f7298ca8859ceb948b426275738395d0b77eaf3b01849add9949bbab91b04537770da9
 EBUILD plasma-workspace-4.10.3.ebuild 3254 SHA256 a11abe968c588cc80fa3911e98faf13bd19fd8e7f62322bf6572ed8d5745a2c7 SHA512 540d1b23eb24d766b386f7d5e1d863f36b68d8341f36802942e215edaa4a7c8fef0a28eed1db2b6b6c1d4889f3f04fda52e336b91da4fcf31a84766d992baa14 WHIRLPOOL d80ccb5f3abb91b439715c29559332e3d4fe1df9f760417fdd526dfcb32982ac6e15058455992ef29a3d9a984fdf7fb81d9e857397e1987281fa562365cc18a5
-EBUILD plasma-workspace-4.10.4.ebuild 3264 SHA256 fa6e900797f7bb1fab2f689fdb8cc9299f051f2e34a26fa5fc30aa67b3fd301e SHA512 f4fb764e88ac43cba26379699f463d1f01f71abc47852cfa57673ba2d57d52b096cb18328758f2b0187b89833a2e2b0912dd41c6522d8f1c2e21d9386a6d5405 WHIRLPOOL 16577e2da9a54567a7c827050602a21f35114514e2f7925dadad3dfe0c18b145dfa1f3ea67a875e4f6fb843f49304865a1e5d11bf19d2591254735a23925ba4a
-MISC ChangeLog 33953 SHA256 aafffa10740534f2203ef632e6bde3d4f9340bb5a834c736c50bdc8f90aaaa30 SHA512 e4d698b6497620cd4ba937a5bea9c77b3bab065d23ff6fe802b0c3405ec9b5de0b978ccdeabc19b7e99d7a798a14b5d5e3880d8cbeb65a7d4c5f732f3193efd1 WHIRLPOOL 2c71888c9c7a9b897757795e95615626b4ea9e738c16bf58bbbca2f59181af950d2730c1f950ae02d3b787da47f51cd807e308780205597b85b1247eb719e491
+EBUILD plasma-workspace-4.10.4-r1.ebuild 3348 SHA256 9fd0e0af08de5d60d8427c2d175d9848da1fc81c26020f0dd0b4fcb6637c29c9 SHA512 853c55047500bb074de4804862450aaca68d5b79dbb6f6077c0204a91e15447bf5574b88e6b94f7d47400656eeaf28b9ddf85f5a60cb969bf2f5f7be68c9b574 WHIRLPOOL c0c8e6388fbd602098fe40e6062bbbc8fcebb201527cbd591034a7ca7fe1db918f90f9cc2810f83f496e129d670a09094b3dd099ef19d54f38ef8bccbd6f3c8b
+MISC ChangeLog 34346 SHA256 6b915df1bf57706428c88402c91da672ec353154b1a7a4b57f5d60c0c8260aee SHA512 7364884d1b4e73ebf6d1d0a87f23d10fc8956c72522ffc5c5fc50dc7e31b14df6337e2d20958e0170493f79fb22d6123db83fb11f5a307015eab4945682c070d WHIRLPOOL 79dfc35cfa9030383d017b9973284ace3b34a047725175552e4737a373eb2b4eab002a518113bda7937cec80e46234ab4d135c583f13a83dff582be83760b47f
 MISC metadata.xml 339 SHA256 4b99eaba6035dde9931777ae669a2d42f0c263a5dfc680dfb8cfd20ce71bb6eb SHA512 eca04b479a6d32f0d54624deae8f748d83131f04d02c45de7db446b472c7990306934c73a80368f0177256bf3406d02bec234a0063049cb68edbe23a7af6d2ed WHIRLPOOL 04a8412d26ccb4ba3a7c578cd03d159cfd009848fa8d27d82526ff0ce56951038d4be155344901c58a9ac7976d5d358f4f851ba449af2d509e9f587ea7ac0533
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRrxRwAAoJELp701BxlEWfocUQALdhJckC41A1CJj0IeX3cWCo
-tccgexI4XBm80VUiyRASHMHaEzSGVdYMcfVk5hM14GBvG8WPlvvraUq7tUcMMJPJ
-FDnvLzSTXYdYkUaYzlFEIsCCASfKAyhcLhDlHoH2tIv6I1h6nqfkjvc+/PQ0Ek7u
-XAY0Vj3DI5MSWXxZk66q9FPdhAbXSLTNLwnceGM7Xm74brVjK7mHZXa+0IYwJ2U1
-TcuOJuM7BmP8dEM20IQVoE5457vS2xWTf4s+lge+LKtQs5PPVGozeJV6cxbZqhZt
-IRJK04QXsuOZV3C4WR6wtIPvXzlzN2wF7OffJxd1ruNroEEp1KA2zTU2zzCCBR9d
-5FL0sobbx3qtlzA/E+CLWiCsQTrWbG6+kkExtewxVBZlwv4o8SdL3cC/11Vx1IBW
-OMZxkxPRL9P301QV13TcBiMDeOowNX7iAxZNhKOFEtHV3YSEuIe+r5GsT4rsVdwp
-X3/Sw5SB2yDRC8R5GbOlPZfdgy9Gi7vV+2Pe8CbW/tA7yAQ/Kj4mBCamoA87wWiz
-H3rr6cNFzxaGZyiK5Pg609PXztVXBKkiqPStgNDI6QGBL3OkV/XMTEg2N2I+20o3
-sMgG89KaRirLz4dB/sVfDNcm9FG8wOnOXnv1oPeqoa4JKpzLZj5Q5P0hyhh9Mwbt
-z45RMUkYKL0L0ccRBUyH
-=s8Cq
+iKYEAREIAGYFAlGv3WxfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
+Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1Qu1gCfS+zCzmj2zt0SHersMed3i+Jx
++BAAn1CC7f9kZw9awaQOk89UM/O2Ogrx
+=o0pi
 -----END PGP SIGNATURE-----
diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.10.4-keep-batterymonitor-in-sync-with-systray.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.10.4-keep-batterymonitor-in-sync-with-systray.patch
new file mode 100644
index 000000000000..500fe1781bb6
--- /dev/null
+++ b/kde-base/plasma-workspace/files/plasma-workspace-4.10.4-keep-batterymonitor-in-sync-with-systray.patch
@@ -0,0 +1,30 @@
+commit 72b9956766b26164628ccc979952fd1ae5bc5e41
+Author: Kai Uwe Broulik <kde@privat.broulik.de>
+Date:   Tue Jun 4 17:47:17 2013 +0200
+
+    Also set minimum size when it *is* constrained
+    
+    BUG: 309447
+    FIXED-IN: 4.11.0
+
+* 2013-06-04: Backport to 4.10.4
+
+diff --git a/plasma/generic/applets/batterymonitor/contents/ui/CompactRepresentation.qml b/plasma/generic/applets/batterymonitor/contents/ui/CompactRepresentation.qml
+index f8691a1..e9dc772 100644
+--- a/plasma/generic/applets/batterymonitor/contents/ui/batterymonitor.qml	2013-05-28 20:38:22.000000000 +0200
++++ b/plasma/generic/applets/batterymonitor/contents/ui/batterymonitor.qml	2013-06-04 21:15:26.234102844 +0200
+@@ -70,8 +70,12 @@
+ 
+             Component.onCompleted: {
+                 if (!isConstrained()) {
+-                    minimumWidth = 32;
+-                    minimumHeight = 32;
++                    minimumWidth = theme.iconSizes.dialog;
++                    minimumHeight = minimumHeight * view.count;
++                } else {
++                    // NOTE: Keep in sync with systray
++                    minimumHeight = 24;
++                    minimumWidth = 24;
+                 }
+                 plasmoid.addEventListener('ConfigChanged', configChanged);
+             }
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.10.4.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.10.4-r1.ebuild
index 73e4ac61292c..51323139bd69 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.10.4.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.10.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.10.4.ebuild,v 1.1 2013/06/04 18:22:13 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.10.4-r1.ebuild,v 1.1 2013/06/06 00:52:49 creffett Exp $
 
 EAPI=5
 
@@ -85,7 +85,10 @@ KMEXTRACTONLY="
 
 KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
 
-PATCHES=( "${FILESDIR}/${PN}-4.10.1-noplasmalock.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-4.10.1-noplasmalock.patch"
+	"${FILESDIR}/${PN}-4.10.4-keep-batterymonitor-in-sync-with-systray.patch"
+	)
 
 pkg_setup() {
 	if use python ; then