From: Markus Dittrich <markusle@gentoo.org>
Date: Mon, 30 Apr 2007 13:43:21 +0000 (+0000)
Subject: Fixed improper path in Rscript (closes bug #176546).
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5154ce3b41a448ffa2f50cb077808dee13544075;p=gentoo.git

Fixed improper path in Rscript (closes bug #176546).
Package-Manager: portage-2.1.2.5
---

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index a33f0c5881bd..3f70536ecdf8 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/R
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.84 2007/04/27 22:42:16 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.85 2007/04/30 13:43:21 markusle Exp $
+
+  30 Apr 2007; Markus Dittrich <markusle@gentoo.org> R-2.5.0.ebuild:
+  Fixed improper path in Rscript (closes bug #176546).
 
   27 Apr 2007; Danny van Dyk <kugelfang@gentoo.org> R-2.5.0.ebuild:
   Forgot to copy ebuild after final testing. Sandbox violations is fixed now.
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 0c4df8457d20..00cbc2cdb123 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX R-2.2.0-ifc-configure.patch 524 RMD160 0e56229f6e68c2a6c23d3f8104ae924f7b5307b5 SHA1 9bd2b339f539fe399fa5f12ad76c0b4a5299bbfd SHA256 6a255a8f92b9e38619210b78ed26288db6d7177ff1eb47f12ab9528f2ce461e8
 MD5 8f28d07ba48615d7a496f31db3e9bf4d files/R-2.2.0-ifc-configure.patch 524
 RMD160 0e56229f6e68c2a6c23d3f8104ae924f7b5307b5 files/R-2.2.0-ifc-configure.patch 524
@@ -32,14 +29,14 @@ EBUILD R-2.4.1.ebuild 3358 RMD160 9663a207960cddd4f2874f17d1bcb39e87d08b2c SHA1
 MD5 7f3e26f3b5a218f2487e2f5f67d97bab R-2.4.1.ebuild 3358
 RMD160 9663a207960cddd4f2874f17d1bcb39e87d08b2c R-2.4.1.ebuild 3358
 SHA256 c9383cada85829e1bc6d677c77fefa19c6326f04136089dadc42a1cc1f3e2842 R-2.4.1.ebuild 3358
-EBUILD R-2.5.0.ebuild 3325 RMD160 baeff07aacd53187f23870dc1a39bb15d6c2ff0b SHA1 d29c6b97cb32ae8f99639168f2929cec312bbf27 SHA256 195a27f751e74b8b0c9f0a61617e8c85f530ca9f61c9f85f9393091243480d1f
-MD5 e682ed29e9d3fff550c322ca7db930b2 R-2.5.0.ebuild 3325
-RMD160 baeff07aacd53187f23870dc1a39bb15d6c2ff0b R-2.5.0.ebuild 3325
-SHA256 195a27f751e74b8b0c9f0a61617e8c85f530ca9f61c9f85f9393091243480d1f R-2.5.0.ebuild 3325
-MISC ChangeLog 13088 RMD160 a1485dd95f83978d459131fbccf323e4e2e8d876 SHA1 af14f91586cd0aee4d9171b03ce5d8baa5882534 SHA256 be2774bd74345a51649b296fda491e52bc1ec4aa19aaa997a1e46abf67eb2125
-MD5 49f847eef732dac74e5ab5e8974c20b3 ChangeLog 13088
-RMD160 a1485dd95f83978d459131fbccf323e4e2e8d876 ChangeLog 13088
-SHA256 be2774bd74345a51649b296fda491e52bc1ec4aa19aaa997a1e46abf67eb2125 ChangeLog 13088
+EBUILD R-2.5.0.ebuild 3478 RMD160 0e32c188e724859a8e75998be5c43bcf7855e175 SHA1 14b31e28efaa1ce3f7716391fd0043dde2d14d0f SHA256 bb16b6a3299741de8300c7bf37eabaecb2d41bb29d5e30a4702938147e1ff833
+MD5 ac249c62398759e923830e38b2c727f6 R-2.5.0.ebuild 3478
+RMD160 0e32c188e724859a8e75998be5c43bcf7855e175 R-2.5.0.ebuild 3478
+SHA256 bb16b6a3299741de8300c7bf37eabaecb2d41bb29d5e30a4702938147e1ff833 R-2.5.0.ebuild 3478
+MISC ChangeLog 13212 RMD160 a7107c3be65874bd24976f8eda1f9ee53298a4f5 SHA1 cc904d83e19057cf4beeb346ddfeff2c418fa67b SHA256 038641da3b4a65019331d2be2fec88264feac9ca4d14562461811fa4fa095dfc
+MD5 0736856ff0fcf8452f69d4cc307bc15d ChangeLog 13212
+RMD160 a7107c3be65874bd24976f8eda1f9ee53298a4f5 ChangeLog 13212
+SHA256 038641da3b4a65019331d2be2fec88264feac9ca4d14562461811fa4fa095dfc ChangeLog 13212
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
@@ -53,10 +50,3 @@ SHA256 9e65e0cee9f8ff3946f8e51c30aacacd0783bffdb0efc99d46c63c493520c543 files/di
 MD5 24318b465d01a70e960c1724ec2c3ef7 files/digest-R-2.5.0 229
 RMD160 8f12aee4221a9244f201b30b51f2ccf42ee009d2 files/digest-R-2.5.0 229
 SHA256 7f2bea9875f750ae98c1551484704ab88395098d177580cb385da7dfd5910d31 files/digest-R-2.5.0 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGMnxU5mJXAu5GbtIRApztAJ40A9HOmgdTJcksA+4iwthT4m3CwQCbBX9E
-BZ8IXWH6keU8GHe7or681mw=
-=/nn8
------END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-2.5.0.ebuild b/dev-lang/R/R-2.5.0.ebuild
index 78fb5b09b93e..d26575b2bc36 100644
--- a/dev-lang/R/R-2.5.0.ebuild
+++ b/dev-lang/R/R-2.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.5.0.ebuild,v 1.2 2007/04/27 22:42:16 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.5.0.ebuild,v 1.3 2007/04/30 13:43:21 markusle Exp $
 
 inherit fortran toolchain-funcs flag-o-matic
 
@@ -51,6 +51,14 @@ pkg_setup() {
 	append-flags -std=gnu99
 }
 
+src_unpack() {
+	unpack ${A}
+	sed -e "s:\$(rhome):/usr/$(get_libdir)/R:g" \
+		-i "${S}"/src/unix/Makefile.in ||
+		die "Failed to fix Rscript makefile"
+}
+
+
 src_compile() {
 	local myconf="--enable-R-profiling --enable-R-shlib --enable-linux-lfs"