R-2.0.0 testing, R-1.9.0-r1 stable, R-1.8.1 obsolete

6 files changed, 20 insertions, 158 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 20e0af66bdf3..dc3d35c56399 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/R
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.34 2004/10/08 00:43:03 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.35 2004/10/10 18:53:14 kugelfang Exp $
+
+  10 Oct 2004; Danny van Dyk <kugelfang@gentoo.org> -R-1.8.1.ebuild,
+  R-1.9.0-r1.ebuild, R-2.0.0.ebuild:
+  R-2.0.0 now in testing on x86,sparc,amd64,ppc and ppc64; using new
+  fortran.eclass. R-1.9.0-r1 stable on all arches. Removed obsolete R-1.8.1.
 
 *R-2.0.0 (07 Oct 2004)
 
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index ed2353e6e25d..4e2cc47dc3ec 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,12 +1,10 @@
-MD5 9e47afe3f42c81b0a7bda587ce5723cf R-2.0.0.ebuild 4169
-MD5 4dbd9fdab184daf276bc59261740567c R-1.9.0-r1.ebuild 4040
-MD5 dc48d43d245f56b12be81a519fa15740 R-1.8.1.ebuild 3435
 MD5 b9f349729d5ac1ae70aa19c65022026d R-1.9.1.ebuild 4149
-MD5 3ecc6431c64939c23e0a510c04c60399 ChangeLog 5570
+MD5 f29bc73071b6076b12caa2e8eec9c088 ChangeLog 5826
+MD5 c609a7f745b4d71785177d37d8c9f598 R-1.9.0-r1.ebuild 4041
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
+MD5 80a69d735b7c6f94110313624a905a7d R-2.0.0.ebuild 3547
+MD5 d9ea644eed6ee842c4944640c29a28f1 files/digest-R-1.9.1 57
 MD5 44015fe4137f1326769e89f2c2c2eda7 files/R-logo.png 4867
-MD5 c85aa52863a8206a8f7a5f74e1439225 files/digest-R-1.9.0-r1 57
 MD5 15ce6e575cf7a5844aa8deecb504e7be files/R.desktop 425
-MD5 96007c74643458d833a1fcd4e75d67f9 files/digest-R-1.8.1 57
-MD5 d9ea644eed6ee842c4944640c29a28f1 files/digest-R-1.9.1 57
+MD5 c85aa52863a8206a8f7a5f74e1439225 files/digest-R-1.9.0-r1 57
 MD5 d7a57350b1ace8a182630a25bdacfbc5 files/digest-R-2.0.0 61
diff --git a/dev-lang/R/R-1.8.1.ebuild b/dev-lang/R/R-1.8.1.ebuild
deleted file mode 100644
index c375c1f2ba3c..000000000000
--- a/dev-lang/R/R-1.8.1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-1.8.1.ebuild,v 1.13 2004/08/21 15:54:33 foser Exp $
-
-IUSE="X atlas f77 gnome tcltk"
-
-DESCRIPTION="R is GNU S - A language and environment for statistical computing and graphics."
-
-SRC_URI="http://cran.r-project.org/src/base/${P}.tgz"
-
-	#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
-		>=sys-libs/zlib-1.1.3-r2
-		>=media-libs/jpeg-6b-r2
-		>=media-libs/libpng-1.2.1
-		x86? ( atlas? ( dev-libs/atlas ) )
-		sparc? ( atlas? ( dev-libs/atlas ) )
-		~amd64? ( atlas? ( dev-libs/atlas ) )
-		X? ( virtual/x11 )
-		tcltk? ( dev-lang/tk )
-		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 amd64"
-
-pkg_setup() {
-	if ! which g77 &>/dev/null && ! which f2c &>/dev/null; then
-		eerror "g77 and f2c not found. Maybe the f77 USE flag was not set when"
-		eerror "you emerged gcc - you could also install f2c"
-		die "need g77 or f2c ."
-	fi
-}
-
-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-R-profiling --enable-R-shlib --with-readline"
-
-	#Eventually, we will want to take into account that a user may have
-	#an alternate or additional blas libraries,
-	#i.e. USE variable blas and and virtual/blas
-	use atlas || myconf="${myconf} --without-blas" #default enabled
-
-	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
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		${myconf} || die "./configure failed"
-
-	make || die
-
-}
-
-src_install () {
-
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		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
-
-	#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 ../lib/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/R-1.9.0-r1.ebuild b/dev-lang/R/R-1.9.0-r1.ebuild
index da400614df3e..1f3314e61bee 100644
--- a/dev-lang/R/R-1.9.0-r1.ebuild
+++ b/dev-lang/R/R-1.9.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-1.9.0-r1.ebuild,v 1.12 2004/09/30 19:02:29 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-1.9.0-r1.ebuild,v 1.13 2004/10/10 18:53:14 kugelfang Exp $
 
 inherit 64-bit
 
@@ -39,7 +39,7 @@ DEPEND="virtual/libc
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~x86 sparc ~ppc amd64"
+KEYWORDS="x86 sparc ppc amd64"
 
 pkg_setup() {
 	if [ -z "$(which g77 2>/dev/null)" ]; then
diff --git a/dev-lang/R/R-2.0.0.ebuild b/dev-lang/R/R-2.0.0.ebuild
index b150ea827028..eb6fbb001936 100644
--- a/dev-lang/R/R-2.0.0.ebuild
+++ b/dev-lang/R/R-2.0.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 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.1 2004/10/08 00:43:03 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.0.0.ebuild,v 1.2 2004/10/10 18:53:14 kugelfang Exp $
 
-inherit 64-bit
+inherit 64-bit fortran
 
-IUSE="blas lapack X tcltk gnome zlib bzlib pcre f2c"
+IUSE="blas lapack X tcltk gnome zlib bzlib pcre"
 
 DESCRIPTION="R is GNU S - A language and environment for statistical computing and graphics."
 
@@ -23,7 +23,6 @@ DEPEND="virtual/libc
 		>=media-libs/libpng-1.2.1
 		blas? ( virtual/blas )
 		lapack? ( virtual/lapack )
-		f2c? ( dev-lang/f2c >=dev-libs/libf2c-20021004-r1 )
 		X? ( virtual/x11 )
 		tcltk? ( dev-lang/tk )
 		pcre? ( dev-libs/libpcre )
@@ -40,26 +39,9 @@ DEPEND="virtual/libc
 
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="-*"
-#KEYWORDS="~x86 ~sparc ~ppc ~ppc64 ~amd64"
-
-pkg_setup() {
-	if [ -z "$(which g77 2>/dev/null)" ]; then
-		einfo "Couldn't find g77 Fortran Compiler."
-		if 64-bit && use f2c; then
-			eerror "You can't use f2c for dev-lang/R on 64-bit arches."
-			eerror "Please remerge gcc with USE=\"g77\""
-			die "dev-lang/R is incompatible with f2c on 64-bit arches."
-		fi
-		if ! use f2c; then
-			eerror "Trying to emerge this packet w/o fortran compiler."
-			eerror "Try again with USE=\"f2c\" emerge dev-lang/R."
-			die "No fortran compiler, no f2c."
-		else
-			einfo "Using f2c to translate fortran sources."
-		fi
-	fi
-}
+KEYWORDS="~x86 ~sparc ~ppc ~ppc64 ~amd64"
+
+64-bit || FORTRAN="f77 f2c" # No f2c on 64-bit systems :-/
 
 src_unpack() {
 	unpack ${A}
@@ -78,7 +60,6 @@ src_compile() {
 
 	# Using the blas USE flag now instead atlas, as atlas now
 	# has been broken into blas-atlas and lapack-atlas.
-	# Danny van Dyk <kugelfang@gentoo.org> 2004/07/11
 	use blas || myconf="${myconf} --without-blas" #default enabled
 	use lapack && myconf="${myconf} --with-lapack" #default disabled
 
@@ -93,7 +74,7 @@ src_compile() {
 
 	use gnome && myconf="${myconf} --with-gnome" #default disabled
 
-	./configure \
+	econf \
 		--host=${CHOST} \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
@@ -101,7 +82,6 @@ src_compile() {
 		${myconf} || die "./configure failed"
 
 	emake || die
-
 }
 
 src_install () {
diff --git a/dev-lang/R/files/digest-R-1.8.1 b/dev-lang/R/files/digest-R-1.8.1
deleted file mode 100644
index 389f3172b8dd..000000000000
--- a/dev-lang/R/files/digest-R-1.8.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cd81fdeaf22f93dfc28979e8132722ec R-1.8.1.tgz 9407628