summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny van Dyk <kugelfang@gentoo.org>2006-05-10 21:48:37 +0000
committerDanny van Dyk <kugelfang@gentoo.org>2006-05-10 21:48:37 +0000
commita836ae98d33518096d341876bea1bae56c8970fe (patch)
treefe3a04c3ba6706ed7e5d4ef79c0a7b5bb3625dbe /dev-lang/R
parentFix broken build when linked with --as-needed (#131416). (diff)
downloadgentoo-2-a836ae98d33518096d341876bea1bae56c8970fe.tar.gz
gentoo-2-a836ae98d33518096d341876bea1bae56c8970fe.tar.bz2
gentoo-2-a836ae98d33518096d341876bea1bae56c8970fe.zip
Added version 2.3.0: Fixes bug #127818. Added filter for -Bdirect LDFLAG: Fixes bug #122465.
(Portage version: 2.1_pre10-r5)
Diffstat (limited to 'dev-lang/R')
-rw-r--r--dev-lang/R/ChangeLog9
-rw-r--r--dev-lang/R/R-2.1.1.ebuild4
-rw-r--r--dev-lang/R/R-2.2.0-r1.ebuild4
-rw-r--r--dev-lang/R/R-2.2.1.ebuild4
-rw-r--r--dev-lang/R/R-2.3.0.ebuild110
-rw-r--r--dev-lang/R/files/digest-R-2.3.03
6 files changed, 130 insertions, 4 deletions
diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 2d63d64876a6..7349cfce7a21 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-lang/R
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.68 2006/04/01 14:34:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.69 2006/05/10 21:48:37 kugelfang Exp $
+
+*R-2.3.0 (10 May 2006)
+
+ 10 May 2006; Danny van Dyk <kugelfang@gentoo.org> R-2.1.1.ebuild,
+ R-2.2.0-r1.ebuild, R-2.2.1.ebuild, +R-2.3.0.ebuild:
+ Added version 2.3.0: Fixes bug #127818. Added filter for -Bdirect LDFLAG:
+ Fixes bug #122465.
01 Apr 2006; Aron Griffis <agriffis@gentoo.org> R-2.2.1.ebuild:
Mark 2.2.1 ~ia64
diff --git a/dev-lang/R/R-2.1.1.ebuild b/dev-lang/R/R-2.1.1.ebuild
index c67ad2bc4aa9..8db87b267227 100644
--- a/dev-lang/R/R-2.1.1.ebuild
+++ b/dev-lang/R/R-2.1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 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.7 2006/04/10 22:33:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.1.1.ebuild,v 1.8 2006/05/10 21:48:37 kugelfang Exp $
inherit fortran toolchain-funcs
@@ -43,6 +43,8 @@ pkg_setup() {
fi
rm -f test.{c,o}
fortran_pkg_setup
+
+ filter-ldflags -Wl,-Bdirect -Bdirect
}
src_compile() {
diff --git a/dev-lang/R/R-2.2.0-r1.ebuild b/dev-lang/R/R-2.2.0-r1.ebuild
index a7fd19799ad9..8676384d3cb0 100644
--- a/dev-lang/R/R-2.2.0-r1.ebuild
+++ b/dev-lang/R/R-2.2.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 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-r1.ebuild,v 1.2 2006/04/10 22:33:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.2.0-r1.ebuild,v 1.3 2006/05/10 21:48:37 kugelfang Exp $
inherit fortran toolchain-funcs
@@ -44,6 +44,8 @@ pkg_setup() {
fi
rm -f test.{c,o}
fortran_pkg_setup
+
+ filter-ldflags -Wl,-Bdirect -Bdirect
}
src_compile() {
diff --git a/dev-lang/R/R-2.2.1.ebuild b/dev-lang/R/R-2.2.1.ebuild
index e00cd2053ea4..d2b4948711d7 100644
--- a/dev-lang/R/R-2.2.1.ebuild
+++ b/dev-lang/R/R-2.2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.2.1.ebuild,v 1.5 2006/04/10 22:33:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.2.1.ebuild,v 1.6 2006/05/10 21:48:37 kugelfang Exp $
inherit fortran toolchain-funcs
@@ -44,6 +44,8 @@ pkg_setup() {
fi
rm -f test.{c,o}
fortran_pkg_setup
+
+ filter-ldflags -Wl,-Bdirect -Bdirect
}
src_compile() {
diff --git a/dev-lang/R/R-2.3.0.ebuild b/dev-lang/R/R-2.3.0.ebuild
new file mode 100644
index 000000000000..ae2269f0472d
--- /dev/null
+++ b/dev-lang/R/R-2.3.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.3.0.ebuild,v 1.1 2006/05/10 21:48:37 kugelfang Exp $
+
+inherit fortran toolchain-funcs
+
+DESCRIPTION="R is GNU S - A language and environment for statistical computing and graphics."
+HOMEPAGE="http://www.r-project.org/"
+SRC_URI="mirror://cran/src/base/R-2/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="blas jpeg nls png readline tcltk X lapack"
+
+RDEPEND=">=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 )
+ tcltk? ( dev-lang/tk )
+ X? ( || ( ( x11-libs/libX11 )
+ virtual/x11 ) )"
+DEPEND="${RDEPEND}
+ X? ( || ( ( x11-proto/xproto
+ x11-libs/libXt
+ x11-libs/libX11 )
+ virtual/x11 ) )"
+
+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 or gfortran."
+ FORTRAN="gfortran g77 ifc"
+ else
+ FORTRAN="gfortran g77 f2c"
+ fi
+ rm -f test.{c,o}
+ fortran_pkg_setup
+
+ filter-ldflags -Wl,-Bdirect -Bdirect
+}
+
+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."
+
+ # 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
+ 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/digest-R-2.3.0 b/dev-lang/R/files/digest-R-2.3.0
new file mode 100644
index 000000000000..9791297dc1b5
--- /dev/null
+++ b/dev-lang/R/files/digest-R-2.3.0
@@ -0,0 +1,3 @@
+MD5 11cc1e9df640ab52e608cf9e695f7354 R-2.3.0.tar.gz 14251956
+RMD160 87422ce47ae36e33d4ace3a7f0b68c46c2d9128d R-2.3.0.tar.gz 14251956
+SHA256 ed19c04691028bf095056f9bde2957cb8beb95bdccda8c562046a7bb85e40a03 R-2.3.0.tar.gz 14251956