Version bump

(Portage version: 2.2.01.21688-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

5 files changed, 18 insertions, 92 deletions

diff --git a/sci-mathematics/rkward/ChangeLog b/sci-mathematics/rkward/ChangeLog
index 78df9a56c22b..6b144ee4dcdb 100644
--- a/sci-mathematics/rkward/ChangeLog
+++ b/sci-mathematics/rkward/ChangeLog
@@ -1,6 +1,13 @@
 # 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.32 2011/11/25 20:02:51 bicatali Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rkward/ChangeLog,v 1.33 2013/02/13 21:55:41 bicatali Exp $
+
+*rkward-0.6.0 (13 Feb 2013)
+
+  13 Feb 2013; Sébastien Fabbro <bicatali@gentoo.org> +rkward-0.6.0.ebuild,
+  -files/rkward-0.5.6-focus.patch, -rkward-0.5.5.ebuild,
+  -rkward-0.5.6-r1.ebuild, -rkward-0.5.6.ebuild:
+  Version bump
 
 *rkward-0.5.7 (25 Nov 2011)
 
@@ -150,4 +157,3 @@
   Initial import. Closing bug #65547. Thanks to masterdriverz,
   adsmith@math.duke.edu, and others in the bug report and the gentooscience
   overlay.
-
diff --git a/sci-mathematics/rkward/files/rkward-0.5.6-focus.patch b/sci-mathematics/rkward/files/rkward-0.5.6-focus.patch
deleted file mode 100644
index e36d25b19d8b..000000000000
--- a/sci-mathematics/rkward/files/rkward-0.5.6-focus.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
deleted file mode 100644
index c5a5d4f7b4fb..000000000000
--- a/sci-mathematics/rkward/rkward-0.5.6-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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.2 2011/09/03 21:13:17 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
-	|| (	<kde-base/kdelibs-4.6.50
-		( $(add_kdebase_dep katepart) ) )
-"
-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
-}
diff --git a/sci-mathematics/rkward/rkward-0.5.6.ebuild b/sci-mathematics/rkward/rkward-0.5.6.ebuild
deleted file mode 100644
index 35875b70b6ff..000000000000
--- a/sci-mathematics/rkward/rkward-0.5.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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.ebuild,v 1.2 2011/09/03 21:13:17 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
-	|| (	<kde-base/kdelibs-4.6.50
-		( $(add_kdebase_dep katepart) ) )
-"
-RDEPEND="${DEPEND}"
-
-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
-}
diff --git a/sci-mathematics/rkward/rkward-0.5.5.ebuild b/sci-mathematics/rkward/rkward-0.6.0.ebuild
index ff2c065bef4b..d49b6b2503aa 100644
--- a/sci-mathematics/rkward/rkward-0.5.5.ebuild
+++ b/sci-mathematics/rkward/rkward-0.6.0.ebuild
@@ -1,25 +1,26 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rkward/rkward-0.5.5.ebuild,v 1.2 2011/09/03 21:13:17 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rkward/rkward-0.6.0.ebuild,v 1.1 2013/02/13 21:55:41 bicatali Exp $
 
-EAPI=4
+EAPI=5
 
 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"
+DESCRIPTION="IDE 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"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
-	dev-lang/R
+	>=dev-lang/R-2.15.2-r2
 	|| (	<kde-base/kdelibs-4.6.50
 		( $(add_kdebase_dep katepart) ) )
 "
@@ -28,6 +29,6 @@ RDEPEND="${DEPEND}"
 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
+	rm "${ED}"/usr/$(get_libdir)/R/library/R.css || die
+	rm "${ED}"/usr/share/apps/katepart/syntax/r.xml || die
 }