summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Shapovalov <george@gentoo.org>2002-08-10 06:18:26 +0000
committerGeorge Shapovalov <george@gentoo.org>2002-08-10 06:18:26 +0000
commitc3c7d5a01c25187c5717aa8520d8884b1370a77d (patch)
tree44a9b505b39fbb9c57399122d3ea81a471d44ce6 /dev-lang/R
parentMAKEOPTS="" to kill parallel makes. (diff)
downloadhistorical-c3c7d5a01c25187c5717aa8520d8884b1370a77d.tar.gz
historical-c3c7d5a01c25187c5717aa8520d8884b1370a77d.tar.bz2
historical-c3c7d5a01c25187c5717aa8520d8884b1370a77d.zip
fixed wrappers
Diffstat (limited to 'dev-lang/R')
-rw-r--r--dev-lang/R/ChangeLog12
-rw-r--r--dev-lang/R/R-1.5.1.ebuild14
2 files changed, 21 insertions, 5 deletions
diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index a189155905c6..925535a74da4 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,10 +1,18 @@
# ChangeLog for dev-lang/R
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.3 2002/07/18 00:51:10 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.4 2002/08/10 06:18:26 george Exp $
*R-1.5.1-ebuild (11 July 2002)
- 11 July 2002; George Shapovalov <george@gentoo.org>
+ 09 Aug 2002; George Shapovalov <george@gentoo.org> R-1.5.1.ebuild :
+
+ fixed the wrappers:
+ R installs two identical wrappers (R that invoke R.bin) under /usr/bin and
+ /usr/lib/R/bin/. Only one of these was modified to have correct R_HOME_DIR
+ Changed ebuild to modify R under /usr/lib/R/bin and symlink it into /usr/bin
+
+ 11 July 2002; George Shapovalov <george@gentoo.org> R-1.5.1.ebuild, files/digest-R-1.5.1 :
+
upped version
new version submitted by Tristan Henderson <T.Henderson@cs.ucl.ac.uk>
diff --git a/dev-lang/R/R-1.5.1.ebuild b/dev-lang/R/R-1.5.1.ebuild
index 77fddd85949b..00d4fb5794fe 100644
--- a/dev-lang/R/R-1.5.1.ebuild
+++ b/dev-lang/R/R-1.5.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-1.5.1.ebuild,v 1.1 2002/07/18 00:51:10 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-1.5.1.ebuild,v 1.2 2002/08/10 06:18:26 george Exp $
S=${WORKDIR}/${P}
@@ -75,9 +75,17 @@ src_install () {
#fix the R wrapper script to have the correct R_HOME_DIR
#sed regexp borrowed from included debian rules
- cp ${D}/usr/bin/R ${S}/bin/R.orig
+ cp ${D}/usr/lib/R/bin/R ${S}/bin/R.orig
sed -e '/^R_HOME_DIR=.*/s::R_HOME_DIR=/usr/lib/R:' \
- ${S}/bin/R.orig > ${D}/usr/bin/R
+ ${S}/bin/R.orig > ${D}/usr/lib/R/bin/R
+
+ #R installs two identical wrappers under /usr/bin and /usr/lib/R/bin/
+ #the 2nd one is corrected by above sed, for the 1st
+ #I'll just symlink it into /usr/bin
+ cd ${D}/usr/bin/
+ rm R
+ dosym ../lib/R/bin/R /usr/bin/R
+ cd ${S}
dodoc AUTHORS BUGS COPYING* ChangeLog FAQ INSTALL *NEWS README \
RESOURCES THANKS VERSION Y2K