Version bump (fixes bug #209648).

Package-Manager: portage-2.1.4.2

3 files changed, 147 insertions, 12 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 347e3a0a1c70..2a8aaa02468c 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,11 @@
 # 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.107 2008/02/11 01:18:16 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.108 2008/02/14 14:00:54 markusle Exp $
+
+*R-2.6.2 (13 Feb 2008)
+
+  13 Feb 2008; Markus Dittrich <markusle@gentoo.org> +R-2.6.2.ebuild:
+  Version bump (fixes bug #209648).
 
   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:
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index ea7e88589126..93ab2fdfc210 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST R-2.2.1.tar.gz 13665367 RMD160 b63b6c5ef1db27a879783460b0ecb6de0d4bba18 SHA1 537e0b89b8de55c1156474c76c19c1fcc210f756 SHA256 db442c769e5e8ecbdb33c771e41bdac4330b565652c5ca730f26f975df30c624
 DIST R-2.6.1.tar.gz 15519691 RMD160 0e50237916e03c9b88ab558c39a9a587aabf4991 SHA1 6f2c8694f1935fda382796d225e45bd6f8f7755b SHA256 8fe505cbd9562cc84422475bc5c0b8e1b88b14d0c9e11d0de4f9e83ae8ce2563
+DIST R-2.6.2.tar.gz 15569391 RMD160 7956c284aad3c2d4fc85d566b45e2ba308dffefb SHA1 3d06b12cbf1dab25ddd759522157e6cc6a8eae19 SHA256 7364415bb2b382110a0b94c4c894b1c7b032561dad8b1456cc27382ad496fe03
 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.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 16655 RMD160 212d51bbd3469d9f01f4a11e609541690d8d6739 SHA1 22d5664a68a2ddfff47c135410d5e712fec1b780 SHA256 e0ee65125f2ad5ac5e0d9a149b7da17a1c2d38b42f223721ccb13959a9d077e6
+EBUILD R-2.6.2.ebuild 3640 RMD160 e69ee299345fe7e060d5794e5fc9ed75aba357ca SHA1 36b748d86e3d58ba6e5f0c4d6a3ec8bbe4d85f30 SHA256 2bbdada9d8a414de927606d8b88d08182907cbce18fcaaa77f77607739a68132
+MISC ChangeLog 16786 RMD160 ad24f399368a0d29bade365e43acd8f27237b61c SHA1 e85625ebfe9df52b221d51f7c01780012052e875 SHA256 5bc123ca5ccf36afbde05890cf4336169f52d31d7c83ea39055be6ff4b52f948
 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.2.ebuild b/dev-lang/R/R-2.6.2.ebuild
new file mode 100644
index 000000000000..c388663695a0
--- /dev/null
+++ b/dev-lang/R/R-2.6.2.ebuild
@@ -0,0 +1,138 @@
+# 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.2.ebuild,v 1.1 2008/02/14 14:00:54 markusle 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 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
+	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
+}