diff options
| -rw-r--r-- | dev-lang/R/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-lang/R/Manifest | 24 | ||||
| -rw-r--r-- | dev-lang/R/R-2.0.0.ebuild | 36 | ||||
| -rw-r--r-- | dev-lang/R/R-2.0.1.ebuild | 114 | ||||
| -rw-r--r-- | dev-lang/R/files/digest-R-2.0.1 | 1 |
5 files changed, 148 insertions, 36 deletions
diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog index 09257acdd2ae..176cc5551cb0 100644 --- a/dev-lang/R/ChangeLog +++ b/dev-lang/R/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-lang/R # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.38 2005/02/17 21:59:57 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.39 2005/02/21 21:46:56 kugelfang Exp $ + +*R-2.0.1 (21 Feb 2005) + + 21 Feb 2005; Danny van Dyk <kugelfang@gentoo.org> R-2.0.0.ebuild, + +R-2.0.1.ebuild: + Fixed a sandbox violation in R-2.0.0 (BUG #79004) and marked stabled on + amd64. Added R-2.0.1 (BUG #72313). 17 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> R-1.9.1.ebuild: ~alpha keyword. diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest index 5158205d7cdb..bc760ea47ed1 100644 --- a/dev-lang/R/Manifest +++ b/dev-lang/R/Manifest @@ -1,20 +1,12 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156 -MD5 e37e19026834fcd296db04009a5ac88b ChangeLog 6127 -MD5 523149c1c83edd0d4fa284120f5bfd69 R-1.9.1.ebuild 4153 +MD5 b8f92c313df91cdfd1a30d6c95cdd344 R-2.0.1.ebuild 3575 +MD5 89a0b6c926d520c425aa8fc10c4a36d0 ChangeLog 6350 MD5 ad67b46cbe76484c3613ba1fa7ea25f7 R-1.9.0-r1.ebuild 4041 -MD5 a9502124532f22226594afc5e2e81f15 R-2.0.0.ebuild 3546 -MD5 15ce6e575cf7a5844aa8deecb504e7be files/R.desktop 425 +MD5 523149c1c83edd0d4fa284120f5bfd69 R-1.9.1.ebuild 4153 +MD5 a1f0c2b17b03ae644b9afd5c447e78fc R-2.0.0.ebuild 3620 +MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156 +MD5 d9ea644eed6ee842c4944640c29a28f1 files/digest-R-1.9.1 57 MD5 44015fe4137f1326769e89f2c2c2eda7 files/R-logo.png 4867 +MD5 15ce6e575cf7a5844aa8deecb504e7be files/R.desktop 425 +MD5 eec0037e7f2073028a10b5028ee8b0bc files/digest-R-2.0.1 61 MD5 c85aa52863a8206a8f7a5f74e1439225 files/digest-R-1.9.0-r1 57 MD5 d7a57350b1ace8a182630a25bdacfbc5 files/digest-R-2.0.0 61 -MD5 d9ea644eed6ee842c4944640c29a28f1 files/digest-R-1.9.1 57 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.0 (GNU/Linux) - -iD8DBQFCFRQHugEuf3OQ0akRAlU+AKCWrwVDUhDHU8+VLIgKQFioNnfU/gCcCsyO -1MPJtRgGIe1flH/U30blHuI= -=sQG8 ------END PGP SIGNATURE----- diff --git a/dev-lang/R/R-2.0.0.ebuild b/dev-lang/R/R-2.0.0.ebuild index fc0c7e5c5158..446c26204f9b 100644 --- a/dev-lang/R/R-2.0.0.ebuild +++ b/dev-lang/R/R-2.0.0.ebuild @@ -1,20 +1,16 @@ # 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.0.0.ebuild,v 1.4 2005/02/02 13:46:17 kugelfang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.0.0.ebuild,v 1.5 2005/02/21 21:46:56 kugelfang Exp $ inherit 64-bit fortran IUSE="blas lapack X tcltk gnome zlib bzlib pcre" 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" - - #There are daily release patches, don't know how to utilize these - #"ftp://ftp.stat.math.ethz.ch/Software/${PN}/${PN}-release.diff.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 >=sys-libs/readline-4.1-r3 @@ -36,27 +32,27 @@ DEPEND="virtual/libc >=dev-libs/glib-1.2.10 >=media-sound/esound-0.2.23 >=media-libs/audiofile-0.2.1 )" - SLOT="0" LICENSE="GPL-2 LGPL-2.1" -KEYWORDS="~x86 ~sparc ~ppc ppc64 ~amd64" - +KEYWORDS="~x86 ~sparc ~ppc ppc64 amd64" 64-bit || FORTRAN="g77 f2c" # No f2c on 64-bit systems :-/ src_unpack() { unpack ${A} cd ${S} - sed -e 's/^#define NeedFunctionPrototypes 0/#define NeedFunctionPrototypes 1/' \ - -i src/modules/X11/dataentry.c || die "sed failed" + sed \ + -e 's/^#define NeedFunctionPrototypes 0/#define NeedFunctionPrototypes 1/' \ + -i src/modules/X11/dataentry.c \ + || die "sed failed" } src_compile() { addwrite "/var/cache/fonts" local myconf="--enable-static --enable-R-profiling --enable-R-shlib --with-readline" - use zlib || myconf="${myconf} --with-zlib" #default disabled - use bzlib || myconf="${myconf} --with-bzlib" #default disabled - use pcre || myconf="${myconf} --with-pcre" #default disabled + use zlib || myconf="${myconf} --with-zlib" #default disabled + use bzlib || myconf="${myconf} --with-bzlib" #default disabled + use pcre || myconf="${myconf} --with-pcre" #default disabled # Using the blas USE flag now instead atlas, as atlas now # has been broken into blas-atlas and lapack-atlas. @@ -85,18 +81,20 @@ src_compile() { } src_install () { - + # rhome=${D} fixes sandbox violation. 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 - 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/lib/R/bin/R + sed \ + -e "s:^R_HOME_DIR=.*:R_HOME_DIR=/usr/$(get_libdir)/R:" \ + -i ${D}/usr/$(get_libdir)/R/bin/R \ + || die "sed failed (R_HOME_DIR)!" #R installs two identical wrappers under /usr/bin and /usr/lib/R/bin/ #the 2nd one is corrected by above sed, for the 1st diff --git a/dev-lang/R/R-2.0.1.ebuild b/dev-lang/R/R-2.0.1.ebuild new file mode 100644 index 000000000000..6bcf2632b91d --- /dev/null +++ b/dev-lang/R/R-2.0.1.ebuild @@ -0,0 +1,114 @@ +# 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.0.1.ebuild,v 1.1 2005/02/21 21:46:56 kugelfang Exp $ + +inherit 64-bit fortran + +IUSE="blas X tcltk gnome zlib bzlib pcre" +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" +#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 + >=sys-libs/readline-4.1-r3 + zlib? ( >=sys-libs/zlib-1.1.3-r2 ) + >=media-libs/jpeg-6b-r2 + >=media-libs/libpng-1.2.1 + blas? ( virtual/blas ) + X? ( virtual/x11 ) + tcltk? ( dev-lang/tk ) + pcre? ( dev-libs/libpcre ) + bzlib? ( app-arch/bzip2 ) + gnome? ( >=gnome-base/gnome-libs-1.4.1.4 + >=gnome-base/libglade-0.17 + >=dev-libs/libxml-1.8.16 + =gnome-base/orbit-0* + >=media-libs/imlib-1.9.10 + >=x11-libs/gtk+-1.2.10 + >=dev-libs/glib-1.2.10 + >=media-sound/esound-0.2.23 + >=media-libs/audiofile-0.2.1 )" +SLOT="0" +LICENSE="GPL-2 LGPL-2.1" +KEYWORDS="~x86 ~sparc ~ppc ppc64 ~amd64" +64-bit || FORTRAN="g77" # No f2c on 64-bit archs anymore. + +src_unpack() { + unpack ${A} + cd ${S} + #sed -e 's/^#define NeedFunctionPrototypes 0/#define NeedFunctionPrototypes 1/' \ + #-i src/modules/X11/dataentry.c || die "sed failed" +} + +src_compile() { + #addwrite "/var/cache/fonts" + local myconf="--enable-static --enable-R-profiling --enable-R-shlib --with-readline" + + use zlib || myconf="${myconf} --with-zlib" #default disabled + use bzlib || myconf="${myconf} --with-bzlib" #default disabled + use pcre || myconf="${myconf} --with-pcre" #default disabled + + # Using the blas USE flag now instead atlas, as atlas now + # has been broken into blas-atlas and lapack-atlas. + use blas || myconf="${myconf} --without-blas" #default enabled + # --with-lapack is deprecated now by upstream + # use lapack && myconf="${myconf} --with-lapack" #default disabled + + use X || myconf="${myconf} --without-x" #default enabled + + 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 + + use gnome && myconf="${myconf} --with-gnome" #default disabled + + econf \ + --host=${CHOST} \ + --prefix=/usr \ + --infodir=/usr/share/info \ + --mandir=/usr/share/man \ + ${myconf} || die "./configure failed" + + emake || die +} + +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/lib/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 + cd ${S} + + dodoc AUTHORS BUGS COPYING* ChangeLog FAQ INSTALL *NEWS README \ + RESOURCES THANKS VERSION Y2K + + #Add rudimentary menu entry if gnome + if use gnome; then + insinto /usr/share/gnome/apps/Applications + doins ${FILESDIR}/R.desktop + insinto /usr/share/pixmaps + doins ${FILESDIR}/R-logo.png + fi + +} diff --git a/dev-lang/R/files/digest-R-2.0.1 b/dev-lang/R/files/digest-R-2.0.1 new file mode 100644 index 000000000000..b989fb587b7a --- /dev/null +++ b/dev-lang/R/files/digest-R-2.0.1 @@ -0,0 +1 @@ +MD5 fb47b1fdef4323031e24d541a2f36b2b R-2.0.1.tar.gz 10645703 |