summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Dittrich <markusle@gentoo.org>2008-05-10 15:01:59 +0000
committerMarkus Dittrich <markusle@gentoo.org>2008-05-10 15:01:59 +0000
commit9800a892136de0fe6d436a9de36eec98e57163fc (patch)
tree2e1e58c3844496c02225cd9214c52939fd16e554 /dev-lang
parentunused version (diff)
downloadhistorical-9800a892136de0fe6d436a9de36eec98e57163fc.tar.gz
historical-9800a892136de0fe6d436a9de36eec98e57163fc.tar.bz2
historical-9800a892136de0fe6d436a9de36eec98e57163fc.zip
ixed improper binary path in Rscript (see bug #221061).
Package-Manager: portage-2.1.5_rc7
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/R/ChangeLog5
-rw-r--r--dev-lang/R/Manifest4
-rw-r--r--dev-lang/R/R-2.7.0.ebuild6
3 files changed, 11 insertions, 4 deletions
diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 9e9f7174808b..9a86105a74ac 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/R
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.120 2008/04/23 17:36:08 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.121 2008/05/10 15:01:59 markusle Exp $
+
+ 10 May 2008; Markus Dittrich <markusle@gentoo.org> R-2.7.0.ebuild:
+ Fixed improper binary path in Rscript (see bug #221061).
23 Apr 2008; Markus Dittrich <markusle@gentoo.org> +R-2.7.0.ebuild:
Version bump.
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index bea46d54afa5..548694b163a0 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -6,6 +6,6 @@ DIST R.bash_completion.bz2 4019 RMD160 796951fb32e9ea4074dcd5ba3da5955ec0193993
EBUILD R-2.2.1-r1.ebuild 3273 RMD160 d0611bf5cb4561a1f663c78dc6e19ef445425db7 SHA1 efaec8f322ce1651bc34ce4f2168aeb9271309cb SHA256 bbb423385fe2336e6f809972f44b8d4ce86e3f54dbb14e8120294b664d8af123
EBUILD R-2.6.1-r1.ebuild 3401 RMD160 83da6e2bc36766c9a7101473623a441ba32e808e SHA1 3f6bfcc0d0ee71431df82096a0164eb8fc62d862 SHA256 0d6da8fba7056cb620d68fa5b7d1c4cdd607345cedd7fad8ece669da08d1e6c7
EBUILD R-2.6.2.ebuild 3307 RMD160 a85d1b2f18cb4743c5fbd4d058548caebbf942b9 SHA1 074ebe6ec27ee0c7cd55aa4c34ce75301d9934c5 SHA256 6a1776092f35312942b29a03e706cd5bc7bc1b7a32b74daa612b7945013b402d
-EBUILD R-2.7.0.ebuild 3307 RMD160 0798cc295f90333b53054b626efcc9ece4398a0b SHA1 70ee1ff54cb33ceb2a0a61aaa1b790659f8b2dfc SHA256 f9c44c3cf102e5656dc56a57f41a815cbe25a2869ef9cab91f8c32a71aa42b49
-MISC ChangeLog 18169 RMD160 bcebd602344415ad009af2f30a8a144b77a81f4d SHA1 4f7529cca212f229d15a5364e11c65e4da907411 SHA256 9777be66ca81c0c7512a3f657eb3456effd786e24430156ec6fe4f196b19c1df
+EBUILD R-2.7.0.ebuild 3446 RMD160 d15dc63c9e0805ddddbc91a85dc065b49406d9c3 SHA1 1f5da6cf10ddc60eab1ebb51d5210639a9595922 SHA256 1908afb3b14c255be41c7ebeb86d8d2252bf3dd063632a83b69f2596246cf82d
+MISC ChangeLog 18298 RMD160 1cb609648d2c62d25dd188bd82ea3d5b4ec7ef9f SHA1 05eaa699269504177ad2c290baeefba867208a98 SHA256 651f931c111178976533cfbaff9f69fc3db3df92dbc50d85931fa7ec79c47bab
MISC metadata.xml 1019 RMD160 7bafb2129d1666600d4324d7979f98d4afe896e8 SHA1 7f8e029d6edce5402c81eb9b6fb088e545dc91b4 SHA256 8dbe1befd1f6009b4c346f090c07edb79ca14b04ca5cd02dbd5ba0a4c0106ace
diff --git a/dev-lang/R/R-2.7.0.ebuild b/dev-lang/R/R-2.7.0.ebuild
index e7d01037c534..93c357c76c6f 100644
--- a/dev-lang/R/R-2.7.0.ebuild
+++ b/dev-lang/R/R-2.7.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.7.0.ebuild,v 1.1 2008/04/23 17:36:08 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.7.0.ebuild,v 1.2 2008/05/10 15:01:59 markusle Exp $
inherit fortran flag-o-matic bash-completion
@@ -62,6 +62,10 @@ src_compile() {
src/library/tools/R/packageshtml.R \
|| die "sed failed"
+ # fix Rscript patch
+ sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"/usr/lib/${PN}/\"':" \
+ -i src/unix/Makefile.in || die "sed failed"
+
use lapack && \
export LAPACK_LIBS="$(pkg-config --libs lapack)"