Revert a faulty upstream commit in UI that broke keybindings, bug 374959

(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)

3 files changed, 99 insertions, 2 deletions

diff --git a/kde-base/kcalc/ChangeLog b/kde-base/kcalc/ChangeLog
index 49d0a54a221c..5cc63141aa20 100644
--- a/kde-base/kcalc/ChangeLog
+++ b/kde-base/kcalc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kcalc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/ChangeLog,v 1.180 2011/07/09 15:14:04 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/ChangeLog,v 1.181 2011/07/12 17:51:21 tampakrap Exp $
+
+  12 Jul 2011; Theo Chatzimichos <tampakrap@gentoo.org> kcalc-4.6.5.ebuild,
+  +files/kcalc-4.6.5-fix-kbd-ui.patch:
+  Revert a faulty upstream commit in UI that broke keybindings, bug 374959
 
 *kcalc-4.6.5 (09 Jul 2011)
 
diff --git a/kde-base/kcalc/files/kcalc-4.6.5-fix-kbd-ui.patch b/kde-base/kcalc/files/kcalc-4.6.5-fix-kbd-ui.patch
new file mode 100644
index 000000000000..05c42a3204f9
--- /dev/null
+++ b/kde-base/kcalc/files/kcalc-4.6.5-fix-kbd-ui.patch
@@ -0,0 +1,92 @@
+--- kdeutils/kcalc/kcalc.ui	2011/07/06 18:27:29	1240129
++++ kdeutils/kcalc/kcalc.ui	2011/07/06 18:27:58	1240130
+@@ -616,7 +616,7 @@
+              <string>7</string>
+             </property>
+             <property name="shortcut">
+-             <string notr="true">7</string>
++             <string>7</string>
+             </property>
+            </widget>
+           </item>
+@@ -632,7 +632,7 @@
+              <string>8</string>
+             </property>
+             <property name="shortcut">
+-             <string notr="true">8</string>
++             <string>8</string>
+             </property>
+            </widget>
+           </item>
+@@ -648,7 +648,7 @@
+              <string>9</string>
+             </property>
+             <property name="shortcut">
+-             <string notr="true">9</string>
++             <string>9</string>
+             </property>
+            </widget>
+           </item>
+@@ -680,7 +680,7 @@
+              <string>4</string>
+             </property>
+             <property name="shortcut">
+-             <string notr="true">4</string>
++             <string>4</string>
+             </property>
+            </widget>
+           </item>
+@@ -696,7 +696,7 @@
+              <string>5</string>
+             </property>
+             <property name="shortcut">
+-             <string notr="true">5</string>
++             <string>5</string>
+             </property>
+            </widget>
+           </item>
+@@ -712,7 +712,7 @@
+              <string>6</string>
+             </property>
+             <property name="shortcut">
+-             <string notr="true">6</string>
++             <string>6</string>
+             </property>
+            </widget>
+           </item>
+@@ -728,7 +728,7 @@
+              <string>1</string>
+             </property>
+             <property name="shortcut">
+-             <string notr="true">1</string>
++             <string>1</string>
+             </property>
+            </widget>
+           </item>
+@@ -744,7 +744,7 @@
+              <string>2</string>
+             </property>
+             <property name="shortcut">
+-             <string notr="true">2</string>
++             <string>2</string>
+             </property>
+            </widget>
+           </item>
+@@ -760,7 +760,7 @@
+              <string>3</string>
+             </property>
+             <property name="shortcut">
+-             <string notr="true">3</string>
++             <string>3</string>
+             </property>
+            </widget>
+           </item>
+@@ -786,7 +786,7 @@
+              <string>0</string>
+             </property>
+             <property name="shortcut">
+-             <string notr="true">0</string>
++             <string>0</string>
+             </property>
+            </widget>
+           </item>
\ No newline at end of file
diff --git a/kde-base/kcalc/kcalc-4.6.5.ebuild b/kde-base/kcalc/kcalc-4.6.5.ebuild
index aecd1f4022ff..867e0ae8581d 100644
--- a/kde-base/kcalc/kcalc-4.6.5.ebuild
+++ b/kde-base/kcalc/kcalc-4.6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/kcalc-4.6.5.ebuild,v 1.1 2011/07/09 15:14:04 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/kcalc-4.6.5.ebuild,v 1.2 2011/07/12 17:51:21 tampakrap Exp $
 
 EAPI=4
 
@@ -20,6 +20,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.3.2-solaris-knumber_priv.patch
+	"${FILESDIR}"/${P}-fix-kbd-ui.patch
 )
 
 src_test() {