Version bump

Package-Manager: portage-2.2.01.21688-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

6 files changed, 31 insertions, 109 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/Manifest b/sci-mathematics/rkward/Manifest
index 01b355094831..97a879dec24a 100644
--- a/sci-mathematics/rkward/Manifest
+++ b/sci-mathematics/rkward/Manifest
@@ -1,22 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-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
-DIST rkward-0.5.7.tar.gz 1337243 RMD160 f0bb91ef75f1079164af096a75ea02d3fac53117 SHA1 9fc0fdde2d8fa102afebc74668afc92239c83fcb SHA256 623e3dc89faf31502e1738c76f6e1138054ca8fb99701862cf872040691cbbf4
-EBUILD rkward-0.5.4.ebuild 729 RMD160 3bedd0f6702f79e2f2769fbed9d40f28c7ecdc62 SHA1 bec1181b4c25e4f4938c78b28d4114d9c74ac98a SHA256 f63baf13b1b82fd52b9ff04fb7045221a402a216562be15a1048635f3d98a70a
-EBUILD rkward-0.5.5.ebuild 827 RMD160 982f260f6e8b719de4ad4607211835328ede1576 SHA1 c1340a82fc4540255b4f0853c3baa03a0c49c8e5 SHA256 737a5f10ad9b77d5869f2a6e8af3a59783add225ade052a989051fbd4f85c0e6
-EBUILD rkward-0.5.6-r1.ebuild 881 RMD160 9289269a5711ec9176f7d78c8af38f0b6304048b SHA1 d6713a53458d64251878031d4c0971797eb28ab2 SHA256 08562add71198622b35725a2aba7a7d27803cf0fb11ea4808fd5f0ff32db19bd
-EBUILD rkward-0.5.6.ebuild 827 RMD160 4f34d69d006991b14dd3704545f9742045426195 SHA1 a88e47409de972124a41682a3f0379ba895e9807 SHA256 84d14d055d8db3281ef4989c5a63515e99df74284d43991f3dd42054961ddc70
-EBUILD rkward-0.5.7.ebuild 826 RMD160 5fec4bb3a53ed9740408c3de5f2bda391d7bade9 SHA1 e18ef06ec67d09f5e05a41bd51948a5af37d4b1a SHA256 7b6ab71662637c5ef0118d39fc5b37d37e264f64d87135d62fcf76156785850f
-MISC ChangeLog 5155 RMD160 21d54e90599f8326f301a6ae6c9a99f44a287f89 SHA1 39d4b3fc137d9090026f5c08bc455db4ef70198c SHA256 d11ac87e72c7c3b3a04350e07412c7736ec7705ef404ae4f95e10a96c56b246b
-MISC metadata.xml 403 RMD160 f10e8b77a455809d2e221f136bdbfec565d0c8e8 SHA1 7a5b826b7938ae37b6c3545ea97bec239aae16b5 SHA256 840a30b774c00d0e7b34fd56a9f8eab3a1698b598f42aa13f1cc401400624120
+DIST rkward-0.5.4.tar.gz 1185270 SHA256 d324b7992c997d75d393b1bf4be79ee9f28ae46582ed2c7bfef839064c08162b
+DIST rkward-0.5.7.tar.gz 1337243 SHA256 623e3dc89faf31502e1738c76f6e1138054ca8fb99701862cf872040691cbbf4
+DIST rkward-0.6.0.tar.gz 1448454 SHA256 a162abe464a30470553b8cc3bb6f4e757f43982f2ff65a549e33fc4e1a9b3879 SHA512 b611861ffc9016c6fc9c58c8f4c733d63e357698f7c7c8f5b053fbaec483bf31a557e61d9a1e3b8aeda7b48ed23e19bd426ae6a01b843977d121eefd2ff5712f WHIRLPOOL b164395eee1ff28040bec061fc799addbe09bd0183db244c058f7aca0d2cdc6223f94e2026714f63c9269b9327d6b3d544d16704afcfbccefaee6d356ccb84d1
+EBUILD rkward-0.5.4.ebuild 729 SHA256 f63baf13b1b82fd52b9ff04fb7045221a402a216562be15a1048635f3d98a70a SHA512 01c012036ea961f53df818b94dc8670a045ef41d1bffc183b879909d69fa324e175ac31ee4b70037bbcbd39a0021eca50a1d999121f1027a7b64cce8ef994de9 WHIRLPOOL ee5f8414d31c81cc0b6e2452f7209b18796c03542bf66ade4a6e3acf2f6da106aa2338beed37b5ca7a3f0a91afd47fc52c90cc67f735db16f50726352420ed52
+EBUILD rkward-0.5.7.ebuild 826 SHA256 7b6ab71662637c5ef0118d39fc5b37d37e264f64d87135d62fcf76156785850f SHA512 689b79ae9c190275a0b584df7b7b0a6e9c2d491cf056c9881dee1adbaf6ac3a17783a6777b295f58aec8065343984d6b0a6ccc660b2d231e8b2ab697fcc0d925 WHIRLPOOL a529022c82d52d96d6bbc39569b5e7ed24d1b6b2add266e4457bb3668ffd41113de750a129a00b348bc7e8fd23c8c57cf718508d8b449494106d1be45bfb1d9c
+EBUILD rkward-0.6.0.ebuild 864 SHA256 51ae11eb1b4b5254fa7ed8c7db6dede2c491c6b81e72535f40b916b874d88682 SHA512 3343c9f309d672e761935a408adf9716924c15ab4699a812d148864c1a67671ffb28bfe8ff8ecb9f13f0e6c7a0766b7f0cafa47a52f1e6302e4c79347c73728d WHIRLPOOL 8fa891a336cbe11ca8f55528fedd850b637debcd27bf973b51527bde3f4bd4784f457211a252f1c18e788e44c0d47aa07e01aadce9542ed6f1a9285c7f57d182
+MISC ChangeLog 5382 SHA256 cb79efc881d0a1548dc3d328d779702496dddb9ccca8c26a3483e658b58ba9d6 SHA512 59bc8189f7b9d8edea701db154acc714f3a6b8b1bea7c360516469c0b003a9df410500ab06bbf92c207f63af1486e99f365e0919035af48468a38b74033b6dd2 WHIRLPOOL 1f6c0545032839dbeb82a01acf93a4ceafb250784a62a07b01d7574355b647c599794b0945ddddf1f5ffe0aea75acb9f298b46a2dbfa8ad12e793a5bf0825826
+MISC metadata.xml 403 SHA256 840a30b774c00d0e7b34fd56a9f8eab3a1698b598f42aa13f1cc401400624120 SHA512 3dafebafa496c9f9f20690c4aaaf56bcc0aa1bbe9ec5a8baafcbc7520c8a68611fdab9c1a9ebafdd4222e9c1a0986800feeb93c80ade1b2f4e6fefbf75ce2d91 WHIRLPOOL a7bcb9fe0e9221ef74cd77d4dff3ffdca1c5ea474333755c9ca2bdf4d37d7589aee9c4d77c3445a66ae054b395996c093e0dcee728d7f7c793c9cfb1b860c33f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk7P9I4ACgkQ1ycZbhPLE2BgswCeImJN+V4AyCAN+nloFpfrV1pS
-0sIAnA5qtIgtyQW9daOtv/eskDHD+S+M
-=/6ZN
+iEYEAREIAAYFAlEcDMoACgkQ1ycZbhPLE2DF6QCeORkFrU/H5gfc8E8zxxeryI3f
+YJcAn0h/nUk947RW0onZMRw7mkE+jBN6
+=x/x8
 -----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
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
 }