Bump to 1.9.1. Removed 1.9.0.

5 files changed, 27 insertions, 13 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 6afe47a01415..8651651c77be 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,12 @@
 # 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.29 2004/08/13 18:06:32 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.30 2004/08/22 20:07:49 kugelfang Exp $
+
+*R-1.9.1 (22 Aug 2004)
+
+  22 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> -R-1.9.0.ebuild,
+  +R-1.9.1.ebuild:
+  Version bump to 1.9.1 (current stable). Removed obsolete 1.9.0.
 
   06 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> R-1.9.0-r1.ebuild:
   Marked stable on amd64.
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 12f76411b741..48db8de5bafa 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,10 +1,10 @@
-MD5 5bdadbab1625d1630c0bc8f1dde07ebf R-1.9.0-r1.ebuild 3816
-MD5 29c324199d6223e6bd27e36482e2b3a7 R-1.9.0.ebuild 3520
+MD5 6fa9bd9eeb7f15578fc36bc12008aff6 R-1.9.1.ebuild 3912
+MD5 b24f1d21cc3112269cc984db280494ee ChangeLog 4907
 MD5 dc48d43d245f56b12be81a519fa15740 R-1.8.1.ebuild 3435
-MD5 68dba441ba810b209fe4a8c0884f4c4a ChangeLog 4728
+MD5 5bdadbab1625d1630c0bc8f1dde07ebf R-1.9.0-r1.ebuild 3816
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
+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 c85aa52863a8206a8f7a5f74e1439225 files/digest-R-1.9.0 57
+MD5 c85aa52863a8206a8f7a5f74e1439225 files/digest-R-1.9.0-r1 57
diff --git a/dev-lang/R/R-1.9.0.ebuild b/dev-lang/R/R-1.9.1.ebuild
index 51c85895b279..651a9c4c3333 100644
--- a/dev-lang/R/R-1.9.0.ebuild
+++ b/dev-lang/R/R-1.9.1.ebuild
@@ -1,8 +1,8 @@
 # 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.ebuild,v 1.11 2004/08/21 15:54:33 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-1.9.1.ebuild,v 1.1 2004/08/22 20:07:49 kugelfang Exp $
 
-IUSE="blas X tcltk gnome f2c"
+IUSE="blas X tcltk gnome zlib bzlib pcre f2c"
 
 DESCRIPTION="R is GNU S - A language and environment for statistical computing and graphics."
 
@@ -16,13 +16,16 @@ 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
+		zlib? ( >=sys-libs/zlib-1.1.3-r2 )
 		>=media-libs/jpeg-6b-r2
 		>=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 )
+		bzlib? ( app-arch/bzip2 )
 		gnome? ( >=gnome-base/gnome-libs-1.4.1.4
 			>=gnome-base/libglade-0.17
 			>=dev-libs/libxml-1.8.16
@@ -59,12 +62,17 @@ src_unpack() {
 
 src_compile() {
 	addwrite "/var/cache/fonts"
-	local myconf="--enable-R-profiling --enable-R-shlib --with-readline"
+	local myconf="--enable-static --enable-R-profiling --enable-R-shlib --with-readline"
+
+	use zlib || myconf="${myconf} --with-zlib"   #default disabled
+	use bzlib || myconf="${myconf} --with-bzlib"   #default disabled
+	use pcre || myconf="${myconf} --with-pcre"   #default disabled
 
 	# 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 blas || myconf="${myconf} --without-blas" #default enabled
+	use lapack && myconf="${myconf} --with-lapack" #default disabled
 
 	use X || myconf="${myconf} --without-x" #default enabled
 
@@ -84,7 +92,7 @@ src_compile() {
 		--mandir=/usr/share/man \
 		${myconf} || die "./configure failed"
 
-	make || die
+	emake || die
 
 }
 
diff --git a/dev-lang/R/files/digest-R-1.9.0 b/dev-lang/R/files/digest-R-1.9.0
deleted file mode 100644
index cb20649d63df..000000000000
--- a/dev-lang/R/files/digest-R-1.9.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 79ae9d20a7bed94d7c92504c8c130310 R-1.9.0.tgz 9505598
diff --git a/dev-lang/R/files/digest-R-1.9.1 b/dev-lang/R/files/digest-R-1.9.1
new file mode 100644
index 000000000000..b86d81c3a232
--- /dev/null
+++ b/dev-lang/R/files/digest-R-1.9.1
@@ -0,0 +1 @@
+MD5 c8201425506e5c077ef1936e19ea2f51 R-1.9.1.tgz 9591217