Added some extra seds to get rid of temp paths, closes bug 115140. Pruned old versions.

(Portage version: 2.0.53)

6 files changed, 20 insertions, 106 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 2eddd3302cbe..e27f34a4db5c 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/R
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.63 2005/11/23 10:08:44 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.64 2005/12/12 19:56:13 cryos Exp $
+
+*R-2.2.0-r1 (12 Dec 2005)
+
+  12 Dec 2005; Marcus D. Hanwell <cryos@gentoo.org> -R-2.1.0-r1.ebuild,
+  -R-2.2.0.ebuild, +R-2.2.0-r1.ebuild:
+  Added some extra seds to get rid of temp paths, closes bug 115140. Pruned
+  old versions.
 
   23 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> files/digest-R-2.2.0,
   Manifest:
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index f23ded188009..be1ca608d846 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,21 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 bcd363f1c49133be27b5cc5a94a753dc ChangeLog 9710
-MD5 74da2d8c85c2916f8260a0dc650c9111 R-2.1.0-r1.ebuild 2657
 MD5 f4c46f25907c3aa68c31a150acaf151b R-2.1.1.ebuild 2644
-MD5 71d06aca7b637e9527e02f3b9a3965b5 R-2.2.0.ebuild 2632
+MD5 f1de15802bfc4236c6c626dca46f7817 R-2.2.0-r1.ebuild 2986
 MD5 8f28d07ba48615d7a496f31db3e9bf4d files/R-2.2.0-ifc-configure.patch 524
 MD5 44015fe4137f1326769e89f2c2c2eda7 files/R-logo.png 4867
 MD5 15ce6e575cf7a5844aa8deecb504e7be files/R.desktop 425
-MD5 35b08f0bf56b91051f76faa75d70eb9f files/digest-R-2.1.0-r1 61
 MD5 1be6338417fd08a609cb02164398a26b files/digest-R-2.1.1 61
-MD5 1bf0aa0599dbf556341336a582094569 files/digest-R-2.2.0 61
+MD5 1bf0aa0599dbf556341336a582094569 files/digest-R-2.2.0-r1 61
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDhD/intT9W3vfTuoRAuysAKCu1tIw62CFc1Fmv/qXDHwL92EeTgCfT/i5
-BarPSgAvgMVPFQ0o/bIn/78=
-=yALv
------END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-2.1.0-r1.ebuild b/dev-lang/R/R-2.1.0-r1.ebuild
deleted file mode 100644
index cc1c24d29f36..000000000000
--- a/dev-lang/R/R-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.1.0-r1.ebuild,v 1.10 2005/11/22 15:11:55 kugelfang Exp $
-
-inherit fortran toolchain-funcs
-
-IUSE="blas jpeg nls png readline tcltk X"
-DESCRIPTION="R is GNU S - A language and environment for statistical computing and graphics."
-SRC_URI="mirror://cran/src/base/R-2/${P}.tar.gz"
-#There are daily release patches, don't know how to utilize these
-#"ftp://ftp.stat.math.ethz.ch/Software/${PN}/${PN}-release.diff.gz"
-HOMEPAGE="http://www.r-project.org/"
-DEPEND="virtual/libc
-		>=dev-lang/perl-5.6.1-r3
-		readline? ( >=sys-libs/readline-4.1-r3 )
-		jpeg? ( >=media-libs/jpeg-6b-r2 )
-		png? ( >=media-libs/libpng-1.2.1 )
-		blas? ( virtual/blas )
-		X? ( virtual/x11 )
-		tcltk? ( dev-lang/tk )"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-
-pkg_setup() {
-	# Test for a 64 bit architecture - f2c won't work on 64 bit archs with R.
-	# Thanks to vapier for providing the test.
-	cd ${T}
-	echo 'int main(){}' > test.c
-	$(tc-getCC) -c test.c -o test.o
-	if file test.o | grep -qs 64-bit ; then
-		einfo "64 bit architecture detected, using g77."
-		FORTRAN="g77"
-	else
-		FORTRAN="g77 f2c"
-	fi
-	fortran_pkg_setup
-}
-
-src_compile() {
-	local myconf="--enable-R-profiling --enable-R-shlib --enable-linux-lfs"
-
-	if use tcltk; then
-		#configure needs to find the files tclConfig.sh and tkConfig.sh
-		myconf="${myconf} --with-tcltk --with-tcl-config=/usr/lib/tclConfig.sh --with-tk-config=/usr/lib/tkConfig.sh"
-	else
-		myconf="${myconf} --without-tcltk"
-	fi
-
-	econf \
-		$(use_enable nls) \
-		$(use_with blas) \
-		$(use_with jpeg jpeglib) \
-		$(use_with png libpng) \
-		$(use_with readline) \
-		$(use_with X x) \
-		${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		rhome=${D}/usr/$(get_libdir)/R \
-		install || die "Installation Failed"
-
-	#fix the R wrapper script to have the correct R_HOME_DIR
-	#sed regexp borrowed from included debian rules
-	sed \
-		-e "/^R_HOME_DIR=.*/s::R_HOME_DIR=/usr/$(get_libdir)/R:" \
-		-i ${D}/usr/$(get_libdir)/R/bin/R \
-		|| die "sed failed"
-
-	#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 ../$(get_libdir)/R/bin/R /usr/bin/R
-	dodir /etc/env.d
-	echo > ${D}/etc/env.d/99R "LDPATH=/usr/$(get_libdir)/R/lib"
-	cd ${S}
-
-	dodoc AUTHORS BUGS COPYING* ChangeLog FAQ *NEWS README \
-		RESOURCES THANKS VERSION Y2K
-}
diff --git a/dev-lang/R/R-2.2.0.ebuild b/dev-lang/R/R-2.2.0-r1.ebuild
index 6826ea798571..0d8b5bd7ccfb 100644
--- a/dev-lang/R/R-2.2.0.ebuild
+++ b/dev-lang/R/R-2.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.2.0.ebuild,v 1.1 2005/11/22 15:11:55 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.2.0-r1.ebuild,v 1.1 2005/12/12 19:56:13 cryos Exp $
 
 inherit fortran toolchain-funcs
 
@@ -74,7 +74,15 @@ src_install() {
 	sed \
 		-e "/^R_HOME_DIR=.*/s::R_HOME_DIR=/usr/$(get_libdir)/R:" \
 		-i ${D}/usr/$(get_libdir)/R/bin/R \
-		|| die "sed failed"
+		|| die "sed failed."
+
+	# The same kinds of seds are needed for these variables too, see bug 115140
+	sed \
+		-e "/^R_SHARE_DIR=.*/s::R_SHARE_DIR=/usr/$(get_libdir)/R/share:" \
+		-e "/^R_INCLUDE_DIR=.*/s::R_INCLUDE_DIR=/usr/$(get_libdir)/R/include:" \
+		-e "/^R_DOC_DIR=.*/s::R_DOC_DIR=/usr/$(get_libdir)/R/doc:" \
+		-i ${D}/usr/$(get_libdir)/R/bin/R \
+		|| die "sed failed."
 
 	# R installs two identical wrappers under /usr/bin and /usr/lib/R/bin/
 	# the 2nd one is corrected by above sed, the first is replaced by a symlink
diff --git a/dev-lang/R/files/digest-R-2.1.0-r1 b/dev-lang/R/files/digest-R-2.1.0-r1
deleted file mode 100644
index 615fed6e31c2..000000000000
--- a/dev-lang/R/files/digest-R-2.1.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 270f7a7382e8cb10a353148598f91096 R-2.1.0.tar.gz 12173182
diff --git a/dev-lang/R/files/digest-R-2.2.0 b/dev-lang/R/files/digest-R-2.2.0-r1
index cb5a88d763e5..cb5a88d763e5 100644
--- a/dev-lang/R/files/digest-R-2.2.0
+++ b/dev-lang/R/files/digest-R-2.2.0-r1