Added upstream patch to work around kdelibs focus stealing, bug 375829

Package-Manager: portage-2.1.10.10/cvs/Linux x86_64

4 files changed, 68 insertions, 6 deletions

diff --git a/sci-mathematics/rkward/ChangeLog b/sci-mathematics/rkward/ChangeLog
index b5ce8e6c0c3a..59efbf5bef53 100644
--- a/sci-mathematics/rkward/ChangeLog
+++ b/sci-mathematics/rkward/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/rkward
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rkward/ChangeLog,v 1.29 2011/07/26 15:55:40 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rkward/ChangeLog,v 1.30 2011/08/11 20:51:09 dilfridge Exp $
+
+*rkward-0.5.6-r1 (11 Aug 2011)
+
+  11 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +rkward-0.5.6-r1.ebuild, +files/rkward-0.5.6-focus.patch:
+  Added upstream patch to work around kdelibs focus stealing, bug 375829
 
 *rkward-0.5.6 (26 Jul 2011)
 
diff --git a/sci-mathematics/rkward/Manifest b/sci-mathematics/rkward/Manifest
index 8e65dbb5a555..ebddfab22554 100644
--- a/sci-mathematics/rkward/Manifest
+++ b/sci-mathematics/rkward/Manifest
@@ -1,18 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
+AUX rkward-0.5.6-focus.patch 722 RMD160 a0df6599d5520767d71499dc41750b73af53f441 SHA1 5ae58166a2736bd3b1a1abe87dbfbb9f50622b91 SHA256 34a34ab34f2567b389e96b41a77a2c1b13efb7a2e86bbadbc2dc2d1dd209bb84
 DIST rkward-0.5.4.tar.gz 1185270 RMD160 b7eb1621451f138d0e539e6e159160881b7b0a90 SHA1 6129132ac09a506c21a7f6fab7e249d509a30a0a SHA256 d324b7992c997d75d393b1bf4be79ee9f28ae46582ed2c7bfef839064c08162b
 DIST rkward-0.5.5.tar.gz 1221637 RMD160 23cac75e8803ddbc382d97a7fd169611891f603d SHA1 77baa1b0e8e9c44c621dee2ccde97471c10714d6 SHA256 7e9e5368a71ed45ea8fa8057151fa5b0632bdf0e16953a4b36cacfea4c71dee7
 DIST rkward-0.5.6.tar.gz 1259150 RMD160 d82670ca453138c37a6acda42c83636674f8021b SHA1 726867ae59673ae287f2ab86321e1f0961b81971 SHA256 4613284b7f7209847bf925e4885f28d880226cf5797a0044e8f6b8f503eb1c8e
 EBUILD rkward-0.5.4.ebuild 659 RMD160 3b1658532114f6e9da13404f923eb3e24caf2686 SHA1 77170c31eef0781647c8356e378310c181a05f13 SHA256 9869290ae83ead30dbe2eadb1c1ca875dfd6c8e925c7a7fac2392064f2a19ed9
 EBUILD rkward-0.5.5.ebuild 757 RMD160 5830bc8065b10ec0eb50c85066d47b9e7dc79281 SHA1 fd6f0b5784eee8d4053647b051ff678e36e711ae SHA256 9d5ac10f0b5c293f61e91843fa20f7d83de2b12b58ae795f5477b419d5c5d451
+EBUILD rkward-0.5.6-r1.ebuild 811 RMD160 59db2ab29c5782346223ce3535b1810aa9e5e597 SHA1 448ced91926956de35d1daac7910bc399b75e5e1 SHA256 842479dbed973220100804d49f058d697744eee4b51d4bdf4d4aa7a63ed00bec
 EBUILD rkward-0.5.6.ebuild 756 RMD160 f13f9eb2eb36a7fdf0b23ce8e26d9c405896935d SHA1 77a3676af2be312dc41b017acc6c6a5d5e3e1cfb SHA256 d20d5072341cf5b8fa822d06ea624f4d9a0a01601de18959929870db63f87807
-MISC ChangeLog 4620 RMD160 fc2174c0278346fcd3b9e830a769d8a81fb45af2 SHA1 0f5bfdd9754fba181e41239581ae3572d81551c3 SHA256 f4f13312e8c5046d083e3b30cc985d587a2fd3e12bd6f29d632d1f22b6aeb560
+MISC ChangeLog 4844 RMD160 77e044271bbacbfcb9e65efac9c367dbeab44010 SHA1 2cbd9bd8af56455091f61c4940587649f5845044 SHA256 f11bcef25bcf2d6084e801cf6e7a1eeb256ad0541213e0022bdf06909cf4be7a
 MISC metadata.xml 403 RMD160 f10e8b77a455809d2e221f136bdbfec565d0c8e8 SHA1 7a5b826b7938ae37b6c3545ea97bec239aae16b5 SHA256 840a30b774c00d0e7b34fd56a9f8eab3a1698b598f42aa13f1cc401400624120
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4u44YACgkQ1ycZbhPLE2AB2ACgkG2nu/RNVF3aIJSTpfrC6Ig2
-eKoAoJ2rh5NA+bLK6PW53z6OIIr4DpBf
-=RSIU
+iQIcBAEBCgAGBQJOREDNAAoJENwGBM22xffeQH4P/R/ZCRC+znWOykLdiy0GQuIq
+SdfjoljV/rpTEWEaNYcKoMiZGzjjzNS1HzvZc4H9R+Od/Xsq+U2p42f7JO6+oSbA
+Ks1BH4wb1P7AXF3efVbzQRkARrLT3GxoD95CsuYm5ibP6T/0LmtxPLyx1V8rJGpb
+q/V/tEL+gwhHU87sn/qTCsQfeCC+IErJa1dqokthifk95Ta+F2H9V48OuipVwptC
+QHl5rnzZ/xzhsiQGAJ92VEoxnOk2sij/ez2OzwO76CJpEBTyUW2CorIUg5GFRaeK
+EGWdmEaJ04XVLp+EFWaRSJNXgfN3f8de8XygapgHbvsjlEx9gY//aEe3hxfS8i3/
+TZdmxJddQGq09CMUpL9DLZfFNnHmjp+jPP+anj9K2N07zHzRJPBCTK142Dgsetmf
+sKS1tqwH+rds3bn7NGo+j5M6b8ziJI+VGmquPFcsmdsckcvh39DUlFmW/6pvl7IF
+i4DFTosv6WZ2DQQiu44aNYZ6wsOLy77mtS/v5Lx28KeOvhGyMWqK5uUvO9cK+9jm
+T2kHdiJx9DFobSPVTGY2MnmkqZVMYOrnLYbY894hox37txE8QYvqwYxveKdYs51o
+w4DXXNCEsuZQXXOKDSYKofgwnGgome2nz+ZEzbt/kKUDAFWIt4mIncTsVXfANG4G
+3+ovoSrVq+ya6+eWdzr3
+=dNKT
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/rkward/files/rkward-0.5.6-focus.patch b/sci-mathematics/rkward/files/rkward-0.5.6-focus.patch
new file mode 100644
index 000000000000..e36d25b19d8b
--- /dev/null
+++ b/sci-mathematics/rkward/files/rkward-0.5.6-focus.patch
@@ -0,0 +1,13 @@
+--- trunk/rkward/rkward/windows/rkhtmlwindow.cpp	2011/06/01 07:54:54	3658
++++ trunk/rkward/rkward/windows/rkhtmlwindow.cpp	2011/06/01 11:02:00	3659
+@@ -62,6 +62,10 @@
+ 	khtmlpart = new KHTMLPart (this, 0, KHTMLPart::BrowserViewGUI);
+ 	setPart (khtmlpart);
+ 	fixupPartGUI ();
++// WORKAROUND for annoying kdelibs bug in KDE 4.6: https://sourceforge.net/tracker/?func=detail&atid=459007&aid=3310106&group_id=50231
++	QAction *action = khtmlpart->action ("findAheadText");
++	if (action) action->setShortcutContext (Qt::WidgetWithChildrenShortcut);
++// WORKAROUND end
+ 	initializeActivationSignals ();
+ 	RKXMLGUISyncer::self()->registerChangeListener (khtmlpart, this, SLOT (fixupPartGUI()));
+ 	khtmlpart->setSelectable (true);
diff --git a/sci-mathematics/rkward/rkward-0.5.6-r1.ebuild b/sci-mathematics/rkward/rkward-0.5.6-r1.ebuild
new file mode 100644
index 000000000000..eda388953826
--- /dev/null
+++ b/sci-mathematics/rkward/rkward-0.5.6-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rkward/rkward-0.5.6-r1.ebuild,v 1.1 2011/08/11 20:51:09 dilfridge Exp $
+
+EAPI=4
+
+KDE_DOC_DIRS="doc"
+KDE_HANDBOOK="optional"
+KDE_LINGUAS="ca cs da de el es fr it lt pl tr zh_CN"
+inherit kde4-base
+
+DESCRIPTION="An IDE/GUI for the R-project"
+HOMEPAGE="http://rkward.sourceforge.net/"
+SRC_URI="mirror://sourceforge/rkward/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="dev-lang/R"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.5.6-focus.patch" )
+
+src_install() {
+	kde4-base_src_install
+	# avoid file collisions
+	rm -f "${ED}"/usr/$(get_libdir)/R/library/R.css
+	rm -f "${ED}"/usr/share/apps/katepart/syntax/r.xml
+}