Added version 2.3.0: Fixes bug #127818. Added filter for -Bdirect LDFLAG: Fixes bug #122465.

Package-Manager: portage-2.1_pre10-r5

7 files changed, 167 insertions, 22 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 2d63d64876a6..7349cfce7a21 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/R
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.68 2006/04/01 14:34:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.69 2006/05/10 21:48:37 kugelfang Exp $
+
+*R-2.3.0 (10 May 2006)
+
+  10 May 2006; Danny van Dyk <kugelfang@gentoo.org> R-2.1.1.ebuild,
+  R-2.2.0-r1.ebuild, R-2.2.1.ebuild, +R-2.3.0.ebuild:
+  Added version 2.3.0: Fixes bug #127818. Added filter for -Bdirect LDFLAG:
+  Fixes bug #122465.
 
   01 Apr 2006; Aron Griffis <agriffis@gentoo.org> R-2.2.1.ebuild:
   Mark 2.2.1 ~ia64
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 735e3ec21aa6..76da36d55400 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,27 +1,46 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7d9a5a35fbe66749091f686abb59853d ChangeLog 10402
-RMD160 87031baf8cbc1d886394b470a9bd156c57632e5b ChangeLog 10402
-SHA256 bce56ce3cfb664135087bb3a49d63062ce508669d72e063682ab5d031eef9b0b ChangeLog 10402
-MD5 5b97f356bea28c99b9bb5f2d7aa9ecdb R-2.1.1.ebuild 2785
-RMD160 50935617bd15536c7cbc6e22644737414516e426 R-2.1.1.ebuild 2785
-SHA256 f9e4300c9fb5dc2accb3da31f6deca2e7e86b33d90320e4d6867c0b9ff30814c R-2.1.1.ebuild 2785
-MD5 0d0161262665839e44dd3381243a087f R-2.2.0-r1.ebuild 3103
-RMD160 667ed98839a8440dbe9d182e8b4d32f2075d1c55 R-2.2.0-r1.ebuild 3103
-SHA256 59333cd0820cbfb557691ef34458b5535acc09d2f659247564a88c0746442b99 R-2.2.0-r1.ebuild 3103
-MD5 01381e43169026a55b4beea59d26954a R-2.2.1.ebuild 3137
-RMD160 080a1c83b82b3712827c68a0713b8e24ab4ed383 R-2.2.1.ebuild 3137
-SHA256 699ede8e0ca54fda2cb48ee3883ec69db2d8b6e93b69a2fd64d4b5c3a7238aff R-2.2.1.ebuild 3137
+AUX R-2.2.0-ifc-configure.patch 524 RMD160 0e56229f6e68c2a6c23d3f8104ae924f7b5307b5 SHA1 9bd2b339f539fe399fa5f12ad76c0b4a5299bbfd SHA256 6a255a8f92b9e38619210b78ed26288db6d7177ff1eb47f12ab9528f2ce461e8 size 524
 MD5 8f28d07ba48615d7a496f31db3e9bf4d files/R-2.2.0-ifc-configure.patch 524
 RMD160 0e56229f6e68c2a6c23d3f8104ae924f7b5307b5 files/R-2.2.0-ifc-configure.patch 524
 SHA256 6a255a8f92b9e38619210b78ed26288db6d7177ff1eb47f12ab9528f2ce461e8 files/R-2.2.0-ifc-configure.patch 524
+AUX R-logo.png 4867 RMD160 f33e75036a19b78b5bc96124484a750881a9e703 SHA1 6454501d5082e0d6c05f5eaa30922c60ee619d07 SHA256 c022525d4d9303423a2b8b392c21dfe0f9f77f1d5a9b0c135aafb1a832a8595a size 4867
 MD5 44015fe4137f1326769e89f2c2c2eda7 files/R-logo.png 4867
 RMD160 f33e75036a19b78b5bc96124484a750881a9e703 files/R-logo.png 4867
 SHA256 c022525d4d9303423a2b8b392c21dfe0f9f77f1d5a9b0c135aafb1a832a8595a files/R-logo.png 4867
+AUX R.desktop 425 RMD160 6e86e5a3d3abfe8a5e8fcf97e5b4cb9a7c28d027 SHA1 5be90e42450e17a769e7cf76314c389137c741f3 SHA256 ebddf927cf47cf584592c67f7b0a6cccc593c92ad07ec9d4d1d7b67da1ca7ec0 size 425
 MD5 15ce6e575cf7a5844aa8deecb504e7be files/R.desktop 425
 RMD160 6e86e5a3d3abfe8a5e8fcf97e5b4cb9a7c28d027 files/R.desktop 425
 SHA256 ebddf927cf47cf584592c67f7b0a6cccc593c92ad07ec9d4d1d7b67da1ca7ec0 files/R.desktop 425
+DIST R-2.1.1.tar.gz 12644376 size 12644376
+DIST R-2.2.0.tar.gz 13307492 size 13307492
+DIST R-2.2.1.tar.gz 13665367 size 13665367
+DIST R-2.3.0.tar.gz 14251956 RMD160 87422ce47ae36e33d4ace3a7f0b68c46c2d9128d SHA256 ed19c04691028bf095056f9bde2957cb8beb95bdccda8c562046a7bb85e40a03 size 14251956
+EBUILD R-2.1.1.ebuild 2827 RMD160 14a29f239b3a2602b86d9b9aa13191bd50c27e50 SHA1 da55e861e42cc489d8ab54d931df2e0d5c56a9a5 SHA256 e85bd5afaca4a06f57ca8d956085e3acb4a69826975e55beaa6a54a1a19152f6 size 2827
+MD5 2814a94a37b056d8f3e9665fc7d72ba3 R-2.1.1.ebuild 2827
+RMD160 14a29f239b3a2602b86d9b9aa13191bd50c27e50 R-2.1.1.ebuild 2827
+SHA256 e85bd5afaca4a06f57ca8d956085e3acb4a69826975e55beaa6a54a1a19152f6 R-2.1.1.ebuild 2827
+EBUILD R-2.2.0-r1.ebuild 3145 RMD160 7110c82d93db9e72d99f190008a64d8626b333fd SHA1 6a9d08b41e5c893c9b43232e91f4fb89bab8eb0d SHA256 e51cc2987887840581d296ee6f4659295d8bb837d93c827808be3a65acf7659e size 3145
+MD5 e8347b9cbfe1aee4e5ada2b002358ee6 R-2.2.0-r1.ebuild 3145
+RMD160 7110c82d93db9e72d99f190008a64d8626b333fd R-2.2.0-r1.ebuild 3145
+SHA256 e51cc2987887840581d296ee6f4659295d8bb837d93c827808be3a65acf7659e R-2.2.0-r1.ebuild 3145
+EBUILD R-2.2.1.ebuild 3179 RMD160 995f60bbbf89f3006d391d76ac192571324d2b1e SHA1 bf342e90039be845451104dd29b7163a54a7e3cd SHA256 7756b677c69037bdee3b29286bd0a0079d270f5b97adc5e1957ac9bd21679d6d size 3179
+MD5 954ba9e61863b5d4d2a64517e2cb943c R-2.2.1.ebuild 3179
+RMD160 995f60bbbf89f3006d391d76ac192571324d2b1e R-2.2.1.ebuild 3179
+SHA256 7756b677c69037bdee3b29286bd0a0079d270f5b97adc5e1957ac9bd21679d6d R-2.2.1.ebuild 3179
+EBUILD R-2.3.0.ebuild 3179 RMD160 1849745a66b35982bdebe052d3c50e2bc96eb1b9 SHA1 def3cc543983cc233347ffc2d00ad72fcb908b02 SHA256 0470bffefe07d5f6913db7c16d329a7745b5f555a68b75edffb1c4452859585f size 3179
+MD5 c1deef5cec9aab0bd801f64002d6ce29 R-2.3.0.ebuild 3179
+RMD160 1849745a66b35982bdebe052d3c50e2bc96eb1b9 R-2.3.0.ebuild 3179
+SHA256 0470bffefe07d5f6913db7c16d329a7745b5f555a68b75edffb1c4452859585f R-2.3.0.ebuild 3179
+MISC ChangeLog 10647 RMD160 8571ccbf1edbba7e09a2a6f10508e97350720030 SHA1 0b67bfc468234e12bdff1477a14eefe62be6811f SHA256 2f459add3079f1ee494e601ef1a933491612e71cee64aab5c01bdb427771b244 size 10647
+MD5 031d32b15949b80698b120f8479d752f ChangeLog 10647
+RMD160 8571ccbf1edbba7e09a2a6f10508e97350720030 ChangeLog 10647
+SHA256 2f459add3079f1ee494e601ef1a933491612e71cee64aab5c01bdb427771b244 ChangeLog 10647
+MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 size 156
+MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
+RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
+SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 metadata.xml 156
 MD5 1be6338417fd08a609cb02164398a26b files/digest-R-2.1.1 61
 RMD160 2dbcb35bceb8e64ce48a8887766bee1fadb37256 files/digest-R-2.1.1 61
 SHA256 7c36db19b0c7bc7248bfccd63f2b6ea155ed76ed522dc909e0b1a6ae3a1ff610 files/digest-R-2.1.1 61
@@ -31,13 +50,13 @@ SHA256 3fb9d80244068a935f0f9f10b023d261455b37cf58b75b2bccad4dcd30dbbe1e files/di
 MD5 cddf1048b239d92f43e97e9c222abaee files/digest-R-2.2.1 61
 RMD160 9ecf241aeab6336ca071b05fdf746f52c631cf68 files/digest-R-2.2.1 61
 SHA256 472926bc74829db53461ad8b38b00cfb10cc5ab66fd8bb5bc132f32dcbe96182 files/digest-R-2.2.1 61
-MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
-SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 metadata.xml 156
+MD5 ef2c243a8c82197abcc8983b4c2b9777 files/digest-R-2.3.0 229
+RMD160 418035dca314fa44e64b5c1ef4d5b925d6e9df4f files/digest-R-2.3.0 229
+SHA256 b775d5c75d98b3979750c88e0fa1bbcdd61037e86ae3cfedcd1b474dc6822087 files/digest-R-2.3.0 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEOt1H2+ySkm8kpY0RAp5eAJ0TsEuMxd/MdKl6ybprpbYBlKDI2wCdGGqa
-aAXeDFs/Ms7DvsxaMsyNAOY=
-=zpAV
+iD8DBQFEYmBH5mJXAu5GbtIRAj5GAJ9RWUEYXoOovt7EvruiO3c/WhxFlACfbchL
+w32Z2iGp6UD+brDhBwtiqJI=
+=Gsws
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-2.1.1.ebuild b/dev-lang/R/R-2.1.1.ebuild
index c67ad2bc4aa9..8db87b267227 100644
--- a/dev-lang/R/R-2.1.1.ebuild
+++ b/dev-lang/R/R-2.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.1.1.ebuild,v 1.7 2006/04/10 22:33:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.1.1.ebuild,v 1.8 2006/05/10 21:48:37 kugelfang Exp $
 
 inherit fortran toolchain-funcs
 
@@ -43,6 +43,8 @@ pkg_setup() {
 	fi
 	rm -f test.{c,o}
 	fortran_pkg_setup
+
+	filter-ldflags -Wl,-Bdirect -Bdirect
 }
 
 src_compile() {
diff --git a/dev-lang/R/R-2.2.0-r1.ebuild b/dev-lang/R/R-2.2.0-r1.ebuild
index a7fd19799ad9..8676384d3cb0 100644
--- a/dev-lang/R/R-2.2.0-r1.ebuild
+++ b/dev-lang/R/R-2.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.2.0-r1.ebuild,v 1.2 2006/04/10 22:33:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.2.0-r1.ebuild,v 1.3 2006/05/10 21:48:37 kugelfang Exp $
 
 inherit fortran toolchain-funcs
 
@@ -44,6 +44,8 @@ pkg_setup() {
 	fi
 	rm -f test.{c,o}
 	fortran_pkg_setup
+
+	filter-ldflags -Wl,-Bdirect -Bdirect
 }
 
 src_compile() {
diff --git a/dev-lang/R/R-2.2.1.ebuild b/dev-lang/R/R-2.2.1.ebuild
index e00cd2053ea4..d2b4948711d7 100644
--- a/dev-lang/R/R-2.2.1.ebuild
+++ b/dev-lang/R/R-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.2.1.ebuild,v 1.5 2006/04/10 22:33:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.2.1.ebuild,v 1.6 2006/05/10 21:48:37 kugelfang Exp $
 
 inherit fortran toolchain-funcs
 
@@ -44,6 +44,8 @@ pkg_setup() {
 	fi
 	rm -f test.{c,o}
 	fortran_pkg_setup
+
+	filter-ldflags -Wl,-Bdirect -Bdirect
 }
 
 src_compile() {
diff --git a/dev-lang/R/R-2.3.0.ebuild b/dev-lang/R/R-2.3.0.ebuild
new file mode 100644
index 000000000000..ae2269f0472d
--- /dev/null
+++ b/dev-lang/R/R-2.3.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.3.0.ebuild,v 1.1 2006/05/10 21:48:37 kugelfang Exp $
+
+inherit fortran toolchain-funcs
+
+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 tcltk 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 )
+	tcltk? ( dev-lang/tk )
+	X? ( || ( ( x11-libs/libX11 )
+		virtual/x11 ) )"
+DEPEND="${RDEPEND}
+	X? ( || ( ( x11-proto/xproto
+		x11-libs/libXt
+		x11-libs/libX11 )
+		virtual/x11 ) )"
+
+AT_M4DIR="${S}/m4"
+
+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
+}
+
+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 lapack) \
+		$(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."
+
+	# 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 AUTHORS BUGS COPYING* ChangeLog FAQ *NEWS README \
+		RESOURCES THANKS VERSION Y2K
+}
diff --git a/dev-lang/R/files/digest-R-2.3.0 b/dev-lang/R/files/digest-R-2.3.0
new file mode 100644
index 000000000000..9791297dc1b5
--- /dev/null
+++ b/dev-lang/R/files/digest-R-2.3.0
@@ -0,0 +1,3 @@
+MD5 11cc1e9df640ab52e608cf9e695f7354 R-2.3.0.tar.gz 14251956
+RMD160 87422ce47ae36e33d4ace3a7f0b68c46c2d9128d R-2.3.0.tar.gz 14251956
+SHA256 ed19c04691028bf095056f9bde2957cb8beb95bdccda8c562046a7bb85e40a03 R-2.3.0.tar.gz 14251956