Get rid of obsolete USE flags, tidy up deps a little. Thanks to MATSUU Takuto <matsuu@gentoo.org> in bug 67834 for the patch.

Package-Manager: portage-2.0.51.20-r5

4 files changed, 86 insertions, 5 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 026b22058c1d..0ff19a106a13 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.41 2005/04/21 21:02:31 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.42 2005/04/29 18:54:00 cryos Exp $
+
+*R-2.1.0-r1 (29 Apr 2005)
+
+  29 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> +R-2.1.0-r1.ebuild:
+  Get rid of obsolete USE flags, tidy up deps a little. Thanks to MATSUU
+  Takuto <matsuu@gentoo.org> in bug 67834 for the patch.
 
   21 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> R-2.1.0.ebuild:
   Update deps to reflect new USE flags.
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 0f5811ea9245..145d1ff3e71d 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -4,10 +4,12 @@ Hash: SHA1
 MD5 547d68e582b6d918643566e9d01c20ff R-2.0.0.ebuild 3620
 MD5 ad67b46cbe76484c3613ba1fa7ea25f7 R-1.9.0-r1.ebuild 4041
 MD5 95f3fc7166f6aeda393efae7dbf8ce4e R-2.1.0.ebuild 2936
+MD5 9035add7bad44fc1b646a14e5efa1143 R-2.1.0-r1.ebuild 2272
 MD5 cdc5ec5820f09a88ca2216e8cdf1810f R-2.0.1.ebuild 3575
 MD5 523149c1c83edd0d4fa284120f5bfd69 R-1.9.1.ebuild 4153
-MD5 d1ba35946f757f00880e5d07392aa67e ChangeLog 6676
+MD5 1cd21e1d05d35174f9781289875d0673 ChangeLog 6906
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
+MD5 35b08f0bf56b91051f76faa75d70eb9f files/digest-R-2.1.0-r1 61
 MD5 44015fe4137f1326769e89f2c2c2eda7 files/R-logo.png 4867
 MD5 c85aa52863a8206a8f7a5f74e1439225 files/digest-R-1.9.0-r1 57
 MD5 15ce6e575cf7a5844aa8deecb504e7be files/R.desktop 425
@@ -18,7 +20,7 @@ MD5 35b08f0bf56b91051f76faa75d70eb9f files/digest-R-2.1.0 61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCaBUSntT9W3vfTuoRAv9jAJoCoP/yeLar6R5ew1GEzOIhzkFOuQCeNlQO
-52BMIpXTfV5mvlhcbKI+P9s=
-=NVRg
+iD8DBQFCcoL4ntT9W3vfTuoRAk/hAJwN2tInraZYws9k039g59fIq4ek9ACfUKiF
+9x3L/ToY4IogILLNR8RG2CI=
+=wmaO
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-2.1.0-r1.ebuild b/dev-lang/R/R-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..f39106e2728b
--- /dev/null
+++ b/dev-lang/R/R-2.1.0-r1.ebuild
@@ -0,0 +1,72 @@
+# 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.1 2005/04/29 18:54:00 cryos Exp $
+
+inherit 64-bit fortran
+
+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"
+#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
+		readline? (>=sys-libs/readline-4.1-r3)
+		jpeg? ( >=media-libs/jpeg-6b-r2 )
+		png? ( >=media-libs/libpng-1.2.1 )
+		blas? ( virtual/blas )
+		X? ( virtual/x11 )
+		tcltk? ( dev-lang/tk )"
+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 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, 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
+}
diff --git a/dev-lang/R/files/digest-R-2.1.0-r1 b/dev-lang/R/files/digest-R-2.1.0-r1
new file mode 100644
index 000000000000..615fed6e31c2
--- /dev/null
+++ b/dev-lang/R/files/digest-R-2.1.0-r1
@@ -0,0 +1 @@
+MD5 270f7a7382e8cb10a353148598f91096 R-2.1.0.tar.gz 12173182