Version bump.

(Portage version: 2.1.4_rc3)

3 files changed, 125 insertions, 1 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 6152470db6aa..532527ecabc0 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/R
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.103 2007/11/22 00:20:37 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.104 2007/11/26 23:02:37 markusle Exp $
+
+*R-2.6.1 (26 Nov 2007)
+
+  26 Nov 2007; Markus Dittrich <markusle@gentoo.org> +R-2.6.1.ebuild:
+  Version bump.
 
 *R-2.6.0-r2 (21 Nov 2007)
 
diff --git a/dev-lang/R/R-2.6.1.ebuild b/dev-lang/R/R-2.6.1.ebuild
new file mode 100644
index 000000000000..fb30df828176
--- /dev/null
+++ b/dev-lang/R/R-2.6.1.ebuild
@@ -0,0 +1,116 @@
+# 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.1.ebuild,v 1.1 2007/11/26 23:02:37 markusle 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/files/digest-R-2.6.1 b/dev-lang/R/files/digest-R-2.6.1
new file mode 100644
index 000000000000..03d7f40405ab
--- /dev/null
+++ b/dev-lang/R/files/digest-R-2.6.1
@@ -0,0 +1,3 @@
+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