Version bump, and general clean up of ebuild.

(Portage version: 2.0.51.19)

4 files changed, 113 insertions, 17 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 176cc5551cb0..1002c520ce03 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,12 @@
 # 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.39 2005/02/21 21:46:56 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.40 2005/04/20 23:44:10 cryos Exp $
+
+*R-2.1.0 (20 Apr 2005)
+
+  20 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> +R-2.1.0.ebuild:
+  Version bump, ebuild cleanups and some additional USE flags. Thanks to
+  matsuu for some of the suggestions in bug 67834.
 
 *R-2.0.1 (21 Feb 2005)
 
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 2733399531aa..02ed2a6cedab 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,22 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 cdc5ec5820f09a88ca2216e8cdf1810f R-2.0.1.ebuild 3575
-MD5 a7d67acf593c61a105c5557978f71b74 ChangeLog 6353
+MD5 547d68e582b6d918643566e9d01c20ff R-2.0.0.ebuild 3620
 MD5 ad67b46cbe76484c3613ba1fa7ea25f7 R-1.9.0-r1.ebuild 4041
+MD5 3720e4da4e17966489abba5ee5587c9c R-2.1.0.ebuild 2909
+MD5 cdc5ec5820f09a88ca2216e8cdf1810f R-2.0.1.ebuild 3575
 MD5 523149c1c83edd0d4fa284120f5bfd69 R-1.9.1.ebuild 4153
-MD5 547d68e582b6d918643566e9d01c20ff R-2.0.0.ebuild 3620
+MD5 a7d67acf593c61a105c5557978f71b74 ChangeLog 6353
 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 15ce6e575cf7a5844aa8deecb504e7be files/R.desktop 425
+MD5 d9ea644eed6ee842c4944640c29a28f1 files/digest-R-1.9.1 57
 MD5 d7a57350b1ace8a182630a25bdacfbc5 files/digest-R-2.0.0 61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCGlb75mJXAu5GbtIRAowJAJ90dV9tf3STYGytJ2eMdrDOkq1oPwCeKR2w
-sM3WthCI3j6a64CUgfxeRiQ=
-=AO/E
------END PGP SIGNATURE-----
+MD5 eec0037e7f2073028a10b5028ee8b0bc files/digest-R-2.0.1 61
+MD5 35b08f0bf56b91051f76faa75d70eb9f files/digest-R-2.1.0 61
diff --git a/dev-lang/R/R-2.1.0.ebuild b/dev-lang/R/R-2.1.0.ebuild
new file mode 100644
index 000000000000..e60de68c1785
--- /dev/null
+++ b/dev-lang/R/R-2.1.0.ebuild
@@ -0,0 +1,97 @@
+# 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.ebuild,v 1.1 2005/04/20 23:44:10 cryos Exp $
+
+inherit 64-bit fortran
+
+IUSE="blas bzlib gnome jpeg nls pcre 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"
+#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_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 bzlib) \
+		$(use_with gnome) \
+		$(use_with jpeg jpeglib) \
+		$(use_with pcre) \
+		$(use_with png libpng) \
+		$(use_with readline) \
+		$(use_with X x) \
+		$(use_with zlib) \
+		${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
+	cd ${S}
+
+	dodoc AUTHORS BUGS COPYING* ChangeLog FAQ *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.1.0 b/dev-lang/R/files/digest-R-2.1.0
new file mode 100644
index 000000000000..615fed6e31c2
--- /dev/null
+++ b/dev-lang/R/files/digest-R-2.1.0
@@ -0,0 +1 @@
+MD5 270f7a7382e8cb10a353148598f91096 R-2.1.0.tar.gz 12173182