Added bash-completion, also install standalone math library, added zip/unzip run dependencies to build R packages, and really fixed docs directory, bug #205103.

(Portage version: 2.1.4)

3 files changed, 149 insertions, 1 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 234aa2cab32d..973decfe876f 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,13 @@
 # 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.105 2008/01/16 16:26:19 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.106 2008/01/17 11:47:36 bicatali Exp $
+
+*R-2.6.1-r1 (17 Jan 2008)
+
+  17 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org> +R-2.6.1-r1.ebuild:
+  Added bash-completion, also install standalone math library, added zip/unzip
+  run dependencies to build R packages, and really fixed docs directory, bug
+  #205103.
 
   16 Jan 2008; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml,
   R-2.6.1.ebuild:
diff --git a/dev-lang/R/R-2.6.1-r1.ebuild b/dev-lang/R/R-2.6.1-r1.ebuild
new file mode 100644
index 000000000000..42394cefa799
--- /dev/null
+++ b/dev-lang/R/R-2.6.1-r1.ebuild
@@ -0,0 +1,135 @@
+# 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 $
+
+inherit fortran flag-o-matic bash-completion
+
+DESCRIPTION="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
+	bash-completion? ( mirror://gentoo/R.bash_completion.bz2 )"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="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/blas
+	virtual/ghostscript
+	readline? ( sys-libs/readline )
+	jpeg? ( media-libs/jpeg )
+	png? ( media-libs/libpng )
+	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}
+	app-arch/unzip
+	app-arch/zip
+	java? ( >=virtual/jre-1.5 )"
+
+R_HOME=/usr/$(get_libdir)/R
+
+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() {
+	# fix packages.html for doc (bug #205103)
+	# check in later versions if fixed
+	sed -i \
+		-e "s:../../library:../../../../$(get_libdir)/R/library:g" \
+		src/library/tools/R/packageshtml.R \
+		|| die "sed failed"
+
+	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 \
+		--with-blas="$(pkg-config --libs blas)" \
+		--docdir=/usr/share/doc/${PF} \
+		rdocdir=/usr/share/doc/${PF} \
+		$(use_enable nls) \
+		$(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
+
+	emake -j1 -C src/nmath/standalone || die "emake math library failed"
+}
+
+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
+
+	emake -j1 \
+		-C src/nmath/standalone \
+		DESTDIR="${D}" install \
+		|| die "emake install math library failed"
+
+	# env files
+	echo "LDPATH=\"${R_HOME}/lib\"" > 99R
+	doenvd 99R || die "doenvd failed"
+
+	# avoid copying licenses but link then because of html docs
+	rm -f "${D}"usr/share/doc/${PF}/{COPYING,COPYING.LIB} \
+		"${D}"${R_HOME}/COPYING
+	dosym "${PORTDIR}"/licenses/GPL-2 /usr/share/doc/${PF}/COPYING
+	dosym "${PORTDIR}"/licenses/LGPL-2.1 /usr/share/doc/${PF}/COPYING.LIB
+	dosym "${PORTDIR}"/licenses/GPL-2 ${R_HOME}/COPYING
+
+	dobashcompletion "${WORKDIR}"/R.bash_completion
+}
+
+pkg_config() {
+	if use java; then
+		einfo "Re-initializing java paths for ${P}"
+		R CMD javareconf
+	fi
+}
diff --git a/dev-lang/R/files/digest-R-2.6.1-r1 b/dev-lang/R/files/digest-R-2.6.1-r1
new file mode 100644
index 000000000000..7a5334ebfc3f
--- /dev/null
+++ b/dev-lang/R/files/digest-R-2.6.1-r1
@@ -0,0 +1,6 @@
+MD5 19c35a69e1afa73f5f70f91ff9939233 R-2.6.1.tar.gz 15519691
+RMD160 0e50237916e03c9b88ab558c39a9a587aabf4991 R-2.6.1.tar.gz 15519691
+SHA256 8fe505cbd9562cc84422475bc5c0b8e1b88b14d0c9e11d0de4f9e83ae8ce2563 R-2.6.1.tar.gz 15519691
+MD5 fdaa27dc7be97315ba9bcb32546940c9 R.bash_completion.bz2 4019
+RMD160 796951fb32e9ea4074dcd5ba3da5955ec0193993 R.bash_completion.bz2 4019
+SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85 R.bash_completion.bz2 4019