summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2013-02-14 17:10:46 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2013-02-14 17:10:46 +0000
commit09983707058171bb8e90f69418d233b0c25289d0 (patch)
treeda0ee9c073a2e1e30db38d29d5676051bceff277 /sci-mathematics
parentsci-libs/ipp: Version Bump (diff)
downloadgentoo-2-09983707058171bb8e90f69418d233b0c25289d0.tar.gz
gentoo-2-09983707058171bb8e90f69418d233b0c25289d0.tar.bz2
gentoo-2-09983707058171bb8e90f69418d233b0c25289d0.zip
Fixed for wrong R_HOME variable (bug #457502) and removing a file which wasn't there (bug #457500). Simplified depedencies
(Portage version: 2.2.01.21688-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)
Diffstat (limited to 'sci-mathematics')
-rw-r--r--sci-mathematics/rkward/ChangeLog9
-rw-r--r--sci-mathematics/rkward/rkward-0.6.0-r1.ebuild (renamed from sci-mathematics/rkward/rkward-0.6.0.ebuild)18
2 files changed, 19 insertions, 8 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/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
}