Fixed for wrong R_HOME variable (bug #457502) and removing a file which wasn't there (bug #457500). Simplified depedencies

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

3 files changed, 24 insertions, 13 deletions

diff --git a/sci-mathematics/rkward/ChangeLog b/sci-mathematics/rkward/ChangeLog
index 6b144ee4dcdb..06a23bdef4cc 100644
--- a/sci-mathematics/rkward/ChangeLog
+++ b/sci-mathematics/rkward/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/rkward
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rkward/ChangeLog,v 1.34 2013/02/14 17:10:46 bicatali Exp $
+
+*rkward-0.6.0-r1 (14 Feb 2013)
+
+  14 Feb 2013; Sébastien Fabbro <bicatali@gentoo.org> +rkward-0.6.0-r1.ebuild,
+  -rkward-0.6.0.ebuild:
+  Fixed for wrong R_HOME variable (bug #457502) and removing a file which wasn't
+  there (bug #457500). Simplified depedencies
 
 *rkward-0.6.0 (13 Feb 2013)
 
diff --git a/sci-mathematics/rkward/Manifest b/sci-mathematics/rkward/Manifest
index 97a879dec24a..d2e1020c8fdf 100644
--- a/sci-mathematics/rkward/Manifest
+++ b/sci-mathematics/rkward/Manifest
@@ -6,13 +6,13 @@ DIST rkward-0.5.7.tar.gz 1337243 SHA256 623e3dc89faf31502e1738c76f6e1138054ca8fb
 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
+EBUILD rkward-0.6.0-r1.ebuild 888 SHA256 6fc15fed8a9224d263c0ddba444dceef7692556bdee9b82c49e2c8955b33c5cc SHA512 5eea1a16b95212a8fa82693742718f8c831c78c33e857e8b8da06a6e65866b326f6888b6973965f15bcb995f92a637e951bff3bbc71ac3a31aefd8a7241a5113 WHIRLPOOL b691d3192f1403139ec44b5491f965928ac8c3018f77d50323aa023a1b00cb27a8b6f451fd3c423185b318b293363002b2b475e0d40b3c97ce19a5a13e6848e1
+MISC ChangeLog 5646 SHA256 4876339092bdfc0d42179357f5c551b2b8048ac3d733f8aa896075ba682bde6a SHA512 7adf0c4599cecd5841eec702509a510071d60855e7dd5e651cba71bd975a206e84c88d2af99f245f9486ffce387b2b62f5862944bd569c189a78282a5c4703f7 WHIRLPOOL fa1340581191abc8fca0a0f248e0f3d9aedbbce60adae4710e4e6867381ac1367b2bb2728e120b3c4d31c2465710b5f49fe3bc7d73f6b26cb66a0985513ce54b
 MISC metadata.xml 403 SHA256 840a30b774c00d0e7b34fd56a9f8eab3a1698b598f42aa13f1cc401400624120 SHA512 3dafebafa496c9f9f20690c4aaaf56bcc0aa1bbe9ec5a8baafcbc7520c8a68611fdab9c1a9ebafdd4222e9c1a0986800feeb93c80ade1b2f4e6fefbf75ce2d91 WHIRLPOOL a7bcb9fe0e9221ef74cd77d4dff3ffdca1c5ea474333755c9ca2bdf4d37d7589aee9c4d77c3445a66ae054b395996c093e0dcee728d7f7c793c9cfb1b860c33f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEcDMoACgkQ1ycZbhPLE2DF6QCeORkFrU/H5gfc8E8zxxeryI3f
-YJcAn0h/nUk947RW0onZMRw7mkE+jBN6
-=x/x8
+iEYEAREIAAYFAlEdGpoACgkQ1ycZbhPLE2CUbQCfVS7azAETRYlNxjgD6PIyJGSh
+iHgAniwgLaynYCcYpH52Ora1MevyfZRE
+=3iep
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/rkward/rkward-0.6.0.ebuild b/sci-mathematics/rkward/rkward-0.6.0-r1.ebuild
index d49b6b2503aa..d47029147238 100644
--- a/sci-mathematics/rkward/rkward-0.6.0.ebuild
+++ b/sci-mathematics/rkward/rkward-0.6.0-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/sci-mathematics/rkward/rkward-0.6.0.ebuild,v 1.1 2013/02/13 21:55:41 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rkward/rkward-0.6.0-r1.ebuild,v 1.1 2013/02/14 17:10:46 bicatali Exp $
 
 EAPI=5
 
@@ -20,15 +20,19 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
-	>=dev-lang/R-2.15.2-r2
-	|| (	<kde-base/kdelibs-4.6.50
-		( $(add_kdebase_dep katepart) ) )
-"
+	dev-lang/R
+	$(add_kdebase_dep katepart)"
 RDEPEND="${DEPEND}"
 
+src_configure() {
+	# to have it compatible with R which had a bad R_HOME
+	unset R_HOME
+	kde4-base_src_configure
+}
+
+
 src_install() {
 	kde4-base_src_install
-	# avoid file collisions
-	rm "${ED}"/usr/$(get_libdir)/R/library/R.css || die
+	# avoid file collision with kate
 	rm "${ED}"/usr/share/apps/katepart/syntax/r.xml || die
 }