diff options
| -rw-r--r-- | dev-lang/R/ChangeLog | 15 | ||||
| -rw-r--r-- | dev-lang/R/Manifest | 11 | ||||
| -rw-r--r-- | dev-lang/R/R-2.1.0-r1.ebuild | 5 | ||||
| -rw-r--r-- | dev-lang/R/R-2.1.1.ebuild | 4 | ||||
| -rw-r--r-- | dev-lang/R/R-2.2.0.ebuild | 92 | ||||
| -rw-r--r-- | dev-lang/R/files/R-2.2.0-ifc-configure.patch | 23 | ||||
| -rw-r--r-- | dev-lang/R/files/digest-R-2.2.0 | 1 |
7 files changed, 142 insertions, 9 deletions
diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog index daf7c93482a8..058bfe70c6d8 100644 --- a/dev-lang/R/ChangeLog +++ b/dev-lang/R/ChangeLog @@ -1,6 +1,15 @@ # 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.61 2005/09/03 19:24:43 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.62 2005/11/22 15:11:55 kugelfang Exp $ + +*R-2.2.0 (22 Nov 2005) + + 22 Nov 2005; Danny van Dyk <kugelfang@gentoo.org> + +files/R-2.2.0-ifc-configure.patch, R-2.1.0-r1.ebuild, R-2.1.1.ebuild, + +R-2.2.0.ebuild: + Added version 2.2.0 with support for compilation with Intel(R) Fortran + Compiler. Removed obsolete version 2.0.1. Fixed stale file Bug by running + 64bit test in ${T} now. 03 Sep 2005; Markus Rothe <corsair@gentoo.org> R-2.1.1.ebuild: Stable on ppc64 @@ -15,6 +24,10 @@ R-2.1.1.ebuild: Removed old version. Stable on amd64 and x86. + 13 Aug 2005; Danny van Dyk <kugelfang@gentoo.org> R-2.0.1.ebuild, + R-2.1.0-r1.ebuild, R-2.1.1.ebuild: + Changed SRC_URI to new 'cran' thirdparty mirror. + *R-2.1.1 (01 Jul 2005) 01 Jul 2005; Danny van Dyk <kugelfang@gentoo.org> R-2.0.1.ebuild, diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest index 47bcdb6329ff..108d77e6a084 100644 --- a/dev-lang/R/Manifest +++ b/dev-lang/R/Manifest @@ -1,8 +1,11 @@ -MD5 a3a1c8a3904d0fff5302f70020643371 ChangeLog 9085 -MD5 fc5ae27d8f8ad03adc952dc27fe62c8b R-2.1.0-r1.ebuild 2659 -MD5 37b3a648e27472743621326bce756212 R-2.1.1.ebuild 2654 -MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156 +MD5 1623f2e1678aa1d9ddd6dae48c2d651a ChangeLog 9586 +MD5 f41910a17b191bd5de552a16eb7609d6 R-2.1.0-r1.ebuild 2656 +MD5 bb20e973263cce183ca064393c951b18 R-2.1.1.ebuild 2642 +MD5 036cc367b7b3750e2098a4998b73945c R-2.2.0.ebuild 2630 +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 ae95e5a8d18cc062b6d52d9b5f9d6b0c files/digest-R-2.2.0 60 +MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156 diff --git a/dev-lang/R/R-2.1.0-r1.ebuild b/dev-lang/R/R-2.1.0-r1.ebuild index 7ec036a14b27..cc1c24d29f36 100644 --- a/dev-lang/R/R-2.1.0-r1.ebuild +++ b/dev-lang/R/R-2.1.0-r1.ebuild @@ -1,12 +1,12 @@ # 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.9 2005/07/01 11:53:30 kugelfang Exp $ +# $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="http://cran.r-project.org/src/base/R-2/${P}.tar.gz" +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/" @@ -25,6 +25,7 @@ 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 diff --git a/dev-lang/R/R-2.1.1.ebuild b/dev-lang/R/R-2.1.1.ebuild index 06fa4c34f914..ade9ce8771e0 100644 --- a/dev-lang/R/R-2.1.1.ebuild +++ b/dev-lang/R/R-2.1.1.ebuild @@ -1,12 +1,12 @@ # 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.1.ebuild,v 1.5 2005/09/03 19:24:43 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.1.1.ebuild,v 1.6 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="http://cran.r-project.org/src/base/R-2/${P}.tar.gz" +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/" diff --git a/dev-lang/R/R-2.2.0.ebuild b/dev-lang/R/R-2.2.0.ebuild new file mode 100644 index 000000000000..6826ea798571 --- /dev/null +++ b/dev-lang/R/R-2.2.0.ebuild @@ -0,0 +1,92 @@ +# 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 $ + +inherit fortran toolchain-funcs + +IUSE="blas jpeg nls png readline tcltk X lapack" +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" +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 ) + lapack? ( virtual/lapack ) + X? ( virtual/x11 ) + tcltk? ( dev-lang/tk )" +SLOT="0" +LICENSE="GPL-2 LGPL-2.1" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" +AT_M4DIR="${S}/m4" + +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 ifc" + else + FORTRAN="g77 f2c" + fi + rm -f test.{c,o} + 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 lapack) \ + $(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, the first is replaced by a symlink + cd ${D}/usr/bin/ + rm R + dosym ../$(get_libdir)/R/bin/R /usr/bin/R + dodir /etc/env.d + echo -n \ + "LDPATH=\"/usr/$(get_libdir)/R/lib\"" \ + > ${D}/etc/env.d/99R + cd ${S} + + dodoc AUTHORS BUGS COPYING* ChangeLog FAQ *NEWS README \ + RESOURCES THANKS VERSION Y2K +} diff --git a/dev-lang/R/files/R-2.2.0-ifc-configure.patch b/dev-lang/R/files/R-2.2.0-ifc-configure.patch new file mode 100644 index 000000000000..14401b9599b9 --- /dev/null +++ b/dev-lang/R/files/R-2.2.0-ifc-configure.patch @@ -0,0 +1,23 @@ +--- configure.ac.orig 2005-11-22 15:48:56.000000000 +0100 ++++ configure.ac 2005-11-22 15:49:50.000000000 +0100 +@@ -942,7 +942,7 @@ + rm -f Imakefile Makefile + fi + +-## Step 2. GNU compilers. ++## Step 2. GNU and Intel compilers. + if test "${GCC}" = yes; then + cpicflags="-fPIC" + shlib_ldflags="-shared" +@@ -954,6 +954,11 @@ + cxxpicflags="-fPIC" + shlib_cxxldflags="-shared" + fi ++case "${F77}" in ++ ifc|ifort) ++ fpicflags="-fPIC" ++ ;; ++esac + + ## Step 3. Individual platform overrides. + case "${host_os}" in diff --git a/dev-lang/R/files/digest-R-2.2.0 b/dev-lang/R/files/digest-R-2.2.0 new file mode 100644 index 000000000000..aa6eb7819a8f --- /dev/null +++ b/dev-lang/R/files/digest-R-2.2.0 @@ -0,0 +1 @@ +MD5 280b77845baa89f0a02132ffda2e4126 R-2.2.0.tar.gz 4911208 |