Version bump. Removed std=gnu99, added upstream.

Package-Manager: portage-2.1.4.4

3 files changed, 151 insertions, 2 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index c27de9e7c0e5..c4e7738a172e 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.123 2008/06/09 15:35:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.124 2008/07/10 17:04:26 bicatali Exp $
+
+*R-2.7.1 (10 Jul 2008)
+
+  10 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org> +R-2.7.1.ebuild:
+  Version bump. Removed std=gnu99, added upstream.
 
   10 May 2008; Markus Dittrich <markusle@gentoo.org> R-2.7.0.ebuild:
   Fixed improper binary path in Rscript (see bug #221061).
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 21d19902974c..9a16a469a024 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,11 +1,23 @@
+-----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-2.7.0.tar.gz 16396250 RMD160 c3c9cf0c0a1eb6191492f1be19e277e8223a42c9 SHA1 d0a3193e474696ad767845ef6b8ee1555a26b898 SHA256 15cba2e295dfabaa9a7b7490ec0db489691fbbc769274980eed7e5d48a0c149f
+DIST R-2.7.1.tar.gz 16413667 RMD160 ac98e39d46ebc7581dd53da7f69a1e7abad269a4 SHA1 cdf5f6f85463c7be007306add2f4ca7cf7babfb7 SHA256 f0449d23257f98d71ed7749a2ed30f69023a05259f392e4c5fd8fac9db485de7
 DIST R.bash_completion.bz2 4019 RMD160 796951fb32e9ea4074dcd5ba3da5955ec0193993 SHA1 05ddebef0df16f0bf35aecc8fcb702ad5d106e5e SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85
 EBUILD R-2.2.1-r1.ebuild 3273 RMD160 d0611bf5cb4561a1f663c78dc6e19ef445425db7 SHA1 efaec8f322ce1651bc34ce4f2168aeb9271309cb SHA256 bbb423385fe2336e6f809972f44b8d4ce86e3f54dbb14e8120294b664d8af123
 EBUILD R-2.6.1-r1.ebuild 3401 RMD160 83da6e2bc36766c9a7101473623a441ba32e808e SHA1 3f6bfcc0d0ee71431df82096a0164eb8fc62d862 SHA256 0d6da8fba7056cb620d68fa5b7d1c4cdd607345cedd7fad8ece669da08d1e6c7
 EBUILD R-2.6.2.ebuild 3307 RMD160 a85d1b2f18cb4743c5fbd4d058548caebbf942b9 SHA1 074ebe6ec27ee0c7cd55aa4c34ce75301d9934c5 SHA256 6a1776092f35312942b29a03e706cd5bc7bc1b7a32b74daa612b7945013b402d
 EBUILD R-2.7.0.ebuild 3446 RMD160 d15dc63c9e0805ddddbc91a85dc065b49406d9c3 SHA1 1f5da6cf10ddc60eab1ebb51d5210639a9595922 SHA256 1908afb3b14c255be41c7ebeb86d8d2252bf3dd063632a83b69f2596246cf82d
-MISC ChangeLog 18317 RMD160 59633deb32c044cf52e9fdba892aa6a23196e557 SHA1 b8047a06a91abbd80acb1c50459fa69a019b45f5 SHA256 d19ee0ddd20186d4ae1a4fb0c93f302b68e47504a5144fa320136928c8c186de
+EBUILD R-2.7.1.ebuild 3349 RMD160 c1cb142e6e2671b0d11f306428e2e62542376fd7 SHA1 efb9769e6517fb78db0e84cd5d99e65f45574822 SHA256 0ee2c2f86be51e7f1e4d88fc0ad4c8cf6fa3546df7f14074f9c85a58b153b205
+MISC ChangeLog 18470 RMD160 4c0edecf9fa897f0b9dfcc519f3fedd535515931 SHA1 788ece62ee24926416c3ff724e908a347880f7c2 SHA256 3775f5bcab87f6797d14de0602aced167341966f950aa0a06a5a5f73e29ad5fa
 MISC metadata.xml 1019 RMD160 7bafb2129d1666600d4324d7979f98d4afe896e8 SHA1 7f8e029d6edce5402c81eb9b6fb088e545dc91b4 SHA256 8dbe1befd1f6009b4c346f090c07edb79ca14b04ca5cd02dbd5ba0a4c0106ace
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkh2QYIACgkQ1ycZbhPLE2Bp5wCdEgeTM6iO9zAOZTziUrkhtsFy
+AWMAn2Qie1fb12OQ8rBGfOprHimQGwmR
+=Vt53
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-2.7.1.ebuild b/dev-lang/R/R-2.7.1.ebuild
new file mode 100644
index 000000000000..42d7189434d9
--- /dev/null
+++ b/dev-lang/R/R-2.7.1.ebuild
@@ -0,0 +1,132 @@
+# 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.7.1.ebuild,v 1.1 2008/07/10 17:04:26 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)/${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_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"
+
+	# 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
+
+	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"
+
+	dobashcompletion "${WORKDIR}"/R.bash_completion
+}
+
+pkg_config() {
+	if use java; then
+		einfo "Re-initializing java paths for ${P}"
+		R CMD javareconf
+	fi
+}