Version bump (fixes bug #253117).

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.27-gentoo-r7 x86_64

3 files changed, 166 insertions, 3 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index ea9ac20cf76e..49a293146e9a 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.142 2008/11/09 13:20:56 nixnut Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.143 2009/01/02 21:15:40 markusle Exp $
+
+*R-2.8.1 (02 Jan 2009)
+
+  02 Jan 2009; Markus Dittrich <markusle@gentoo.org> +R-2.8.1.ebuild:
+  Version bump (fixes bug #253117).
 
   09 Nov 2008; nixnut <nixnut@gentoo.org> R-2.7.2.ebuild:
   Stable on ppc wrt bug 244621
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index f05e3134bc1f..e4c239586503 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -4,9 +4,11 @@ AUX R-javareconf.patch 1242 RMD160 667445da01c51438deef5d876929985858507d30 SHA1
 DIST R-2.7.1.tar.gz 16413667 RMD160 ac98e39d46ebc7581dd53da7f69a1e7abad269a4 SHA1 cdf5f6f85463c7be007306add2f4ca7cf7babfb7 SHA256 f0449d23257f98d71ed7749a2ed30f69023a05259f392e4c5fd8fac9db485de7
 DIST R-2.7.2.tar.gz 16466658 RMD160 948e379f07cbfeda13c46947791f755e1faabbf7 SHA1 0de9f00ae58e67840fc2daab8973d37d97d78535 SHA256 7184c1f85fafce518e6dbccb5a64ba47a62d8694c7019da0e1c1e83ff98c3ff4
 DIST R-2.8.0.tar.gz 16558443 RMD160 1e1fd7c76af150f20d403fb085cd7ac8d909eb55 SHA1 ad483b2cf205e25891b37c109f93f95fe012a314 SHA256 3f125987ed988ccc73234da4c0daee8c79eac81aff66e10d9caeb9616d77c19d
+DIST R-2.8.1.tar.gz 16585380 RMD160 1d12f8833a7b368d3cc06488172394ce4cb165ff SHA1 71e577dc061ff8720ce399471a75dea5b8fb1dab SHA256 ab488af73ce7a4f2057afcf0e725be96c9ae37f8721143004397b91928ecfa60
 DIST R.bash_completion.bz2 4019 RMD160 796951fb32e9ea4074dcd5ba3da5955ec0193993 SHA1 05ddebef0df16f0bf35aecc8fcb702ad5d106e5e SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85
 EBUILD R-2.7.1.ebuild 4190 RMD160 5b0637b88a216923a39de5637e46513dee258905 SHA1 47b0db9e8eb3f9cde8db89a7b478dd9e106a65f2 SHA256 3f229509c86efa3a511d7af812f4104dbba7ed727e38e72adbfe584cd273b79f
 EBUILD R-2.7.2.ebuild 4545 RMD160 5d59839a7ea69728d33846b1bae5b4880e9379c0 SHA1 80a0d85d8406f5535cda1d6dbb822a3c6a6ef589 SHA256 14d22c8d121207ce8efe41b81ef16dc3bffdfec862e0b1b16e9ead3465571453
 EBUILD R-2.8.0.ebuild 4105 RMD160 550c16f5c0e79f8215b1e7f6f0905a588343d1f4 SHA1 24371b6914fca52031a010a42f7a362d294c7618 SHA256 df0a3a7b82725bb6ffad098bb5e85108370339e5a511478186bc3429e7fc6e1c
-MISC ChangeLog 21166 RMD160 81518f3297f2a1dfc3460102cbb8cf544d7766dd SHA1 dec4a015b063ab5cb4504933efa6412969cd421a SHA256 8fc9951a2a3f799a05a8692e92e0c336483027fd5b529d8c012cff67da0975d8
+EBUILD R-2.8.1.ebuild 4020 RMD160 1c3eec682d8815c53af74af278ff892611a38f63 SHA1 d93bd5a188ecf83506c1c582fde2f7a1802645be SHA256 c7dcc67a756b6e6957ee0632eb655591cad2c49c25b362254068ba3ca5776533
+MISC ChangeLog 21299 RMD160 7163bde00b72c23f98dbbe2a3f5bbb65c1af600a SHA1 4d39e144e36cff4a0031233b736bc4304de9191d SHA256 376fab6837ab1f45a062d5123102f59e262732d9e8bebb64b18010185c703fa9
 MISC metadata.xml 1031 RMD160 375436b81f2969a32b673a47fdcd7a8ddadb6fa3 SHA1 fefc629218f970fc24f6b4e30c482112ea6e6129 SHA256 6f692bb80f78dfd8987ae3f70c12c40924ef5e0596267d928953f37f44223968
diff --git a/dev-lang/R/R-2.8.1.ebuild b/dev-lang/R/R-2.8.1.ebuild
new file mode 100644
index 000000000000..bb9e845bfaca
--- /dev/null
+++ b/dev-lang/R/R-2.8.1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.8.1.ebuild,v 1.1 2009/01/02 21:15:40 markusle Exp $
+
+EAPI=2
+inherit eutils fortran flag-o-matic bash-completion versionator
+
+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 cairo"
+
+# common depends
+CDEPEND="dev-lang/perl
+	dev-libs/libpcre
+	app-arch/bzip2
+	virtual/blas
+	virtual/ghostscript
+	cairo? ( x11-libs/cairo[X] x11-libs/pango[X] )
+	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
+		   app-text/tetex
+		   app-text/ptex ) )"
+
+RDEPEND="${CDEPEND}
+	app-arch/unzip
+	app-arch/zip
+	java? ( >=virtual/jre-1.5 )"
+
+R_HOME=/usr/$(get_libdir)/${PN}
+
+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
+}
+
+src_prepare() {
+
+	# 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"
+
+	# fix Rscript
+	sed -i \
+		-e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_HOME}\"':" \
+		src/unix/Makefile.in || die "sed unix Makefile 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
+}
+
+src_configure() {
+	econf \
+		--disable-rpath \
+		--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 cairo) \
+		$(use_with X x)
+}
+
+src_compile(){
+	emake || die "emake failed"
+	RMATH_V=0.0.0
+	emake -j1 -C src/nmath/standalone \
+		libRmath_la_LDFLAGS=-Wl,-soname,libRmath.so.${RMATH_V} \
+		|| die "emake math library failed"
+	if use doc; then
+		export VARTEXFONTS="${T}/fonts"
+		emake info pdf || die "emake docs failed"
+	fi
+}
+
+src_test() {
+	# we need to unset R_HOME otherwise some of the diff based
+	# tests fail due to warnings in the output
+	R_HOME="" emake -j1 check || die "Some of the tests 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"
+
+	local mv=$(get_major_version ${RMATH_V})
+	mv  "${D}"/usr/$(get_libdir)/libRmath.so \
+		"${D}"/usr/$(get_libdir)/libRmath.so.${RMATH_V}
+	dosym libRmath.so.${RMATH_V} /usr/$(get_libdir)/libRmath.so.${mv}
+	dosym libRmath.so.${mv} /usr/$(get_libdir)/libRmath.so
+
+	# env file
+	cat > 99R <<-EOF
+		LDPATH=${R_HOME}/lib
+		R_HOME=${R_HOME}
+	EOF
+	doenvd 99R || die "doenvd failed"
+
+	dobashcompletion "${WORKDIR}"/R.bash_completion
+}
+
+pkg_config() {
+	if use java; then
+		einfo "Re-initializing java paths for ${P}"
+		R CMD javareconf
+	fi
+}