New version. As-needed patches have been applied upstream. This version can't be...

Package-Manager: portage-2.1.2.3

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index e4301c66c9dd5859b935af6a8b915b40ae141d0e..a597f64b793a13f7ae26607ad33095a7d4d2717d 100644 (file)
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,12 @@
 # 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.82 2007/01/13 15:45:51 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.83 2007/04/27 18:23:43 kugelfang Exp $
+
+*R-2.5.0 (27 Apr 2007)
+
+  27 Apr 2007; Danny van Dyk <kugelfang@gentoo.org> +R-2.5.0.ebuild:
+  New version. As-needed patches have been applied upstream. This version
+  can't be build in parallel anymore.
 
   13 Jan 2007; Markus Dittrich <markusle@gentoo.org> -R-2.1.1.ebuild,
   -R-2.2.0-r1.ebuild, R-2.2.1.ebuild, -R-2.3.0.ebuild, -R-2.3.1.ebuild,

diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index a4b30f57667e11831b7aeb93afa25bc829f70c2a..6997f98239f441df8ee6062a555287fde1a46de2 100644 (file)
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -20,6 +23,7 @@ RMD160 6e86e5a3d3abfe8a5e8fcf97e5b4cb9a7c28d027 files/R.desktop 425
 SHA256 ebddf927cf47cf584592c67f7b0a6cccc593c92ad07ec9d4d1d7b67da1ca7ec0 files/R.desktop 425
 DIST R-2.2.1.tar.gz 13665367 RMD160 b63b6c5ef1db27a879783460b0ecb6de0d4bba18 SHA1 537e0b89b8de55c1156474c76c19c1fcc210f756 SHA256 db442c769e5e8ecbdb33c771e41bdac4330b565652c5ca730f26f975df30c624
 DIST R-2.4.1.tar.gz 14570344 RMD160 2a03cc81b870d594a695e9eb1e77720379c60194 SHA1 5ab0a29a29c35dc2cb06c875539e62b57503c762 SHA256 4ff92cfd29064db59978ef11c95dd88a4040ed4984fdce29fcb5d5783fe9028b
+DIST R-2.5.0.tar.gz 15117375 RMD160 ae14775281b53a2ffc582977eec4c36c6bdc504f SHA1 a75bbb598d7f957aec3c4be79f182a906fb14541 SHA256 52504c7700f8f880891b34622f73a41dde66e0752a8552d2b8df5c85756a8eef
 EBUILD R-2.2.1.ebuild 3192 RMD160 3f16b9c059b7a6feae33a2d04622062342451f6a SHA1 77dd1efd735b5954f761cbf1f8bad01bb0cb14a1 SHA256 9aedebf110dc41c28b662e42b3d92a1a6ee315a4fbe5e823a55ecc0d06c6d830
 MD5 d796569818d34c6d48a815a45f6cbe99 R-2.2.1.ebuild 3192
 RMD160 3f16b9c059b7a6feae33a2d04622062342451f6a R-2.2.1.ebuild 3192
@@ -28,10 +32,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
-MISC ChangeLog 12734 RMD160 5c84194b9f948f35d1c7d9a4d6b204ccb91444fa SHA1 09e60cae96ead4a3b7a5936ab995aa48eca0641c SHA256 5fc7592f39c06c239a4c26ed0f37687cb6bc99fc35be5fe6b0b9edb5d5286054
-MD5 36c023fcdea4b0d65c264dbb26d0d443 ChangeLog 12734
-RMD160 5c84194b9f948f35d1c7d9a4d6b204ccb91444fa ChangeLog 12734
-SHA256 5fc7592f39c06c239a4c26ed0f37687cb6bc99fc35be5fe6b0b9edb5d5286054 ChangeLog 12734
+EBUILD R-2.5.0.ebuild 3291 RMD160 a9425b8f054daede399056ba7e751bcdcd8798d1 SHA1 24110b3770e1ae40c7a44bf9ec3c9ab5bd3083bf SHA256 8a49dad4937e0e9c13d2e9211b0ef9fc0eca304eea3ae7eb82ff898816dfa270
+MD5 5848c933422f1804e87a3c7ac67ad3dd R-2.5.0.ebuild 3291
+RMD160 a9425b8f054daede399056ba7e751bcdcd8798d1 R-2.5.0.ebuild 3291
+SHA256 8a49dad4937e0e9c13d2e9211b0ef9fc0eca304eea3ae7eb82ff898816dfa270 R-2.5.0.ebuild 3291
+MISC ChangeLog 12941 RMD160 edb03ed19511aa17eb8a6aa1e31b08ec853574b4 SHA1 34890575b910fe94c47001a45f98b6d2c28aa841 SHA256 e2ca0722ec475320d095945257398996012740460a5b9d917f7e9dd2b150754c
+MD5 1b19560020be14b58b8b059555006a2c ChangeLog 12941
+RMD160 edb03ed19511aa17eb8a6aa1e31b08ec853574b4 ChangeLog 12941
+SHA256 e2ca0722ec475320d095945257398996012740460a5b9d917f7e9dd2b150754c ChangeLog 12941
 MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
@@ -42,3 +50,13 @@ SHA256 dfc1aa1b94f944657bef2b7dbe68879a14582212746d132f3784819f29b07fa2 files/di
 MD5 2fbf21a251d9868a4dbcb3a17d7c6178 files/digest-R-2.4.1 229
 RMD160 cec6faf41cd8cb3d57a8408e71d95a26403c19e9 files/digest-R-2.4.1 229
 SHA256 9e65e0cee9f8ff3946f8e51c30aacacd0783bffdb0efc99d46c63c493520c543 files/digest-R-2.4.1 229
+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)
+
+iD8DBQFGMj/D5mJXAu5GbtIRAqfXAJ92P2pAxSvGi1o9umeysy1NPlbKlgCdFhHo
+xvIgzUhjgS9Dc/UeEriVvZA=
+=NhNr
+-----END PGP SIGNATURE-----

diff --git a/dev-lang/R/R-2.5.0.ebuild b/dev-lang/R/R-2.5.0.ebuild
new file mode 100644 (file)
index 0000000..ca3f087
--- /dev/null
+++ b/dev-lang/R/R-2.5.0.ebuild
@@ -0,0 +1,113 @@
+# 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.1 2007/04/27 18:23:43 kugelfang Exp $
+
+inherit fortran toolchain-funcs flag-o-matic
+
+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 tk 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 )
+       tk? ( dev-lang/tk
+               dev-lang/tcl )
+       X? ( || ( ( x11-libs/libX11 )
+               virtual/x11 ) )"
+DEPEND="${RDEPEND}
+       X? ( || ( ( x11-proto/xproto
+               x11-libs/libXt
+               x11-libs/libX11 )
+               virtual/x11 ) )"
+
+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
+
+       # this is needed to properly compile additional R packages
+       # (see bug #152379)
+       append-flags -std=gnu99
+}
+
+src_compile() {
+       local myconf="--enable-R-profiling --enable-R-shlib --enable-linux-lfs"
+
+       if use tk; 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"
+       # R-2.5.0 started to have issues with parallel make
+       emake -j1 || 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 ChangeLog *NEWS README VERSION
+}

diff --git a/dev-lang/R/files/digest-R-2.5.0 b/dev-lang/R/files/digest-R-2.5.0
new file mode 100644 (file)
index 0000000..7dd3572
--- /dev/null
+++ b/dev-lang/R/files/digest-R-2.5.0
@@ -0,0 +1,3 @@
+MD5 b9088663fc539c059acfaf19d6d90a69 R-2.5.0.tar.gz 15117375
+RMD160 ae14775281b53a2ffc582977eec4c36c6bdc504f R-2.5.0.tar.gz 15117375
+SHA256 52504c7700f8f880891b34622f73a41dde66e0752a8552d2b8df5c85756a8eef R-2.5.0.tar.gz 15117375