Removed old versions. Added R_HOME environment variable

Package-Manager: portage-2.1.4.1

5 files changed, 23 insertions, 257 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 973decfe876f..347e3a0a1c70 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/R
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.106 2008/01/17 11:47:36 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.107 2008/02/11 01:18:16 bicatali Exp $
+
+  11 Feb 2008; Sébastien Fabbro <bicatali@gentoo.org> -R-2.6.0-r1.ebuild,
+  -R-2.6.0-r2.ebuild, R-2.6.1-r1.ebuild:
+  Removed old versions. Added R_HOME environment variable
 
 *R-2.6.1-r1 (17 Jan 2008)
 
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index fd9f787e1c4c..ea7e88589126 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,11 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST R-2.2.1.tar.gz 13665367 RMD160 b63b6c5ef1db27a879783460b0ecb6de0d4bba18 SHA1 537e0b89b8de55c1156474c76c19c1fcc210f756 SHA256 db442c769e5e8ecbdb33c771e41bdac4330b565652c5ca730f26f975df30c624
-DIST R-2.6.0.tar.gz 15447985 RMD160 54b3d183dfb15af7f861e7b62904998865ad194c SHA1 ff51578fc630e65ce0e2bb92b0e1f8324c94925d SHA256 8a916e653affa83584119dc08a8b12e30e430dee19a398513515003c43d791da
 DIST R-2.6.1.tar.gz 15519691 RMD160 0e50237916e03c9b88ab558c39a9a587aabf4991 SHA1 6f2c8694f1935fda382796d225e45bd6f8f7755b SHA256 8fe505cbd9562cc84422475bc5c0b8e1b88b14d0c9e11d0de4f9e83ae8ce2563
 DIST R.bash_completion.bz2 4019 RMD160 796951fb32e9ea4074dcd5ba3da5955ec0193993 SHA1 05ddebef0df16f0bf35aecc8fcb702ad5d106e5e SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85
 EBUILD R-2.2.1-r1.ebuild 3272 RMD160 246152a6ef62d78e380b568e0b7a3ce28b863f60 SHA1 cf00a26ea83b4af9b1c8aee0524fa52962069db5 SHA256 3885859470254b88503b186ed08274d346916e0e54cf4820f6cf31b5c1d9ea29
-EBUILD R-2.6.0-r1.ebuild 3823 RMD160 0aae38878b9008cf77667bba15d5e7793c856c35 SHA1 f68a5bff8840c7153d55baec753dfcf4f37e6e09 SHA256 6a4d40926c206534de7ba84bf79f4d38d27bbf99460b50c68b34a4cc38e7d044
-EBUILD R-2.6.0-r2.ebuild 2967 RMD160 d1d5356e01e2ec992d00a083c879f1f78a4f767b SHA1 0f6601a1301848d62100b30bb2a5f316e1b61da1 SHA256 9ba769893caf4c2256feae4ecbfb40d39590e3fa96d2be94e34818d916013bf3
-EBUILD R-2.6.1-r1.ebuild 3618 RMD160 5e3eb2cfa29f7fa00a4ea51cf2bfde22d9c1552c SHA1 d542b500287db81cbb400ad671334bf51dc3a977 SHA256 f5416fd6d20245d5462f4eb97cf07e25b4f1e55b7fc345910671dd8dc522a818
+EBUILD R-2.6.1-r1.ebuild 3643 RMD160 bd460c9dde4326d00b3d1c215a51fb0478a56deb SHA1 5f8a8f6f5440f9912e8dd33c1564756771160140 SHA256 def219d9561fda8d84d6f2c4c973934c218edc5be1f93850ebbab6536bef1173
 EBUILD R-2.6.1.ebuild 2926 RMD160 72f0104124b62801686ffff516950aab35ea4eec SHA1 34c44e76e9edc8dc32d59be1566024ab29d8bb91 SHA256 c82233dd5d9ad3718ba1c6c1d8174d7831bc62ffe284d8ed88e571f23bb05e1e
-MISC ChangeLog 16480 RMD160 01561a4f7734a0c6bd35bc4cbb7194e604ec8ea9 SHA1 7bee1baeadd735bbb834a180955544a33cba1990 SHA256 b255f8e881729839c12ac116d94666dc9019e6e0ee0922bcaccbe9cde92726b8
+MISC ChangeLog 16655 RMD160 212d51bbd3469d9f01f4a11e609541690d8d6739 SHA1 22d5664a68a2ddfff47c135410d5e712fec1b780 SHA256 e0ee65125f2ad5ac5e0d9a149b7da17a1c2d38b42f223721ccb13959a9d077e6
 MISC metadata.xml 1019 RMD160 7bafb2129d1666600d4324d7979f98d4afe896e8 SHA1 7f8e029d6edce5402c81eb9b6fb088e545dc91b4 SHA256 8dbe1befd1f6009b4c346f090c07edb79ca14b04ca5cd02dbd5ba0a4c0106ace
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHr6Jn1ycZbhPLE2ARAsH9AJ9YjZUXQoCoL/uq/zcnWOB7AMofMgCfdQNq
+sYndC7IcQ9lJNyqFf8rDrm4=
+=VG1v
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-2.6.0-r1.ebuild b/dev-lang/R/R-2.6.0-r1.ebuild
deleted file mode 100644
index 1b337da5ea7b..000000000000
--- a/dev-lang/R/R-2.6.0-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.6.0-r1.ebuild,v 1.5 2007/11/21 18:50:05 lavajoe Exp $
-
-inherit fortran toolchain-funcs flag-o-matic
-
-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="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="blas jpeg nls png readline tk X lapack gd"
-
-RDEPEND=">=dev-lang/perl-5.6.1-r3
-	>=dev-libs/libpcre-7.3
-	app-arch/bzip2
-	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 )
-	gd? ( >=media-libs/gd-2 )
-	tk? ( dev-lang/tk
-		dev-lang/tcl )
-	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto
-		x11-libs/libXt
-		x11-libs/libX11 )"
-
-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
-
-	# this is needed to properly compile additional R packages
-	# (see bug #152379)
-	append-flags -std=gnu99
-}
-
-src_unpack() {
-	unpack ${A}
-	sed -e "s:\$(rhome):/usr/$(get_libdir)/R:g" \
-		-i "${S}"/src/unix/Makefile.in ||
-		die "Failed to fix Rscript makefile"
-
-	# This is needed for FreeBSD; please do not remove
-	elibtoolize
-}
-
-src_compile() {
-	local myconf="--enable-R-profiling --enable-R-shlib --enable-linux-lfs"
-
-	if use tk; 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 \
-		--with-system-zlib \
-		--with-system-bzlib \
-		--with-system-pcre \
-		$(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"
-	# R-2.5.0 started to have issues with parallel make
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make \
-		prefix="${D}"/usr \
-		mandir="${D}"/usr/share/man \
-		infodir="${D}"/usr/share/info \
-		libdir="${D}"/usr/$(get_libdir) \
-		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."
-
-	# fix paths in libR.pc pkgconfig file
-	sed -e "s:${D}::" -i "${D}"/usr/$(get_libdir)/pkgconfig/libR.pc \
-		|| die "Failed to fix libR.pc file"
-
-	# 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 ChangeLog *NEWS README VERSION
-}
diff --git a/dev-lang/R/R-2.6.0-r2.ebuild b/dev-lang/R/R-2.6.0-r2.ebuild
deleted file mode 100644
index 947d25c2ea74..000000000000
--- a/dev-lang/R/R-2.6.0-r2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.6.0-r2.ebuild,v 1.1 2007/11/22 00:20:37 bicatali Exp $
-
-inherit fortran flag-o-matic
-
-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="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-IUSE="blas doc java jpeg lapack minimal nls png readline tk X"
-
-# common depends
-CDEPEND="dev-lang/perl
-	>=dev-libs/libpcre-7.3
-	app-arch/bzip2
-	virtual/ghostscript
-	readline? ( sys-libs/readline )
-	jpeg? ( media-libs/jpeg )
-	png? ( media-libs/libpng )
-	blas? ( virtual/blas )
-	lapack? ( virtual/lapack )
-	tk? ( dev-lang/tk )
-	X? ( x11-libs/libXmu x11-misc/xdg-utils )"
-
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig
-	doc? ( virtual/latex-base
-	  || ( dev-texlive/texlive-fontsrecommended virtual/tetex ) )"
-
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.5 )"
-
-pkg_setup() {
-	FORTRAN="gfortran ifc g77"
-	fortran_pkg_setup
-	export FFLAGS="${FFLAGS:--O2}"
-	[[ ${FORTRANC} = gfortran || ${FORTRANC} = if* ]] && \
-		export FCFLAGS="${FCFLAGS:-${FFLAGS}}"
-
-	filter-ldflags -Wl,-Bdirect -Bdirect
-
-	# this is needed to properly compile additional R packages
-	# (see bug #152379)
-	append-flags -std=gnu99
-}
-
-src_compile() {
-
-	use blas && \
-		export BLAS_LIBS="$(pkg-config --libs blas)"
-
-	use lapack && \
-		export LAPACK_LIBS="$(pkg-config --libs lapack)"
-
-	if use X; then
-		export R_BROWSER="$(type -p xdg-open)"
-		export R_PDFVIEWER="$(type -p xdg-open)"
-	fi
-
-	econf \
-		--enable-R-profiling \
-		--enable-memory-profiling \
-		--enable-R-shlib \
-		--enable-linux-lfs \
-		--with-system-zlib \
-		--with-system-bzlib \
-		--with-system-pcre \
-		rdocdir=/usr/share/doc/${PF} \
-		$(use_enable nls) \
-		$(use_with blas) \
-		$(use_with lapack) \
-		$(use_with tk tcltk) \
-		$(use_with jpeg jpeglib) \
-		$(use_with !minimal recommended-packages) \
-		$(use_with png libpng) \
-		$(use_with readline) \
-		$(use_with X x) \
-		|| die "econf failed"
-	emake || die "emake failed"
-
-	if use doc; then
-		export VARTEXFONTS="${T}/fonts"
-		emake info pdf || die "emake docs failed"
-	fi
-}
-
-src_install() {
-	# -j1 because creates various dirs sequentially (hit should be small)
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-
-	if use doc; then
-		emake DESTDIR="${D}" \
-			install-info install-pdf || die "emake install docs failed"
-	fi
-
-	# env files
-	echo "LDPATH=\"/usr/$(get_libdir)/R/lib\"" > 99R
-	doenvd 99R || die "doenvd failed"
-
-	# dealing with licenses
-	rm -f "${D}"usr/share/doc/${PF}/{COPYING,COPYING.LIB}
-	dosym "${PORTDIR}"/licenses/GPL-2 /usr/share/doc/${PF}/COPYING
-	dosym "${PORTDIR}"/licenses/LGPL-2.1 /usr/share/doc/${PF}/COPYING.LIB
-}
-
-pkg_config() {
-	if use java; then
-		einfo "Re-initializing java paths for ${P}"
-		R CMD javareconf
-	fi
-}
diff --git a/dev-lang/R/R-2.6.1-r1.ebuild b/dev-lang/R/R-2.6.1-r1.ebuild
index 42394cefa799..94fa6be5ce19 100644
--- a/dev-lang/R/R-2.6.1-r1.ebuild
+++ b/dev-lang/R/R-2.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.6.1-r1.ebuild,v 1.1 2008/01/17 11:47:36 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.6.1-r1.ebuild,v 1.2 2008/02/11 01:18:16 bicatali Exp $
 
 inherit fortran flag-o-matic bash-completion
 
@@ -113,8 +113,11 @@ src_install() {
 		DESTDIR="${D}" install \
 		|| die "emake install math library failed"
 
-	# env files
-	echo "LDPATH=\"${R_HOME}/lib\"" > 99R
+	# env file
+	cat > 99R <<-EOF
+		LDPATH=${R_HOME}/lib
+		R_HOME=${R_HOME}
+	EOF
 	doenvd 99R || die "doenvd failed"
 
 	# avoid copying licenses but link then because of html docs