Version bump and get rid of virtual/tetex

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.25-gentoo-r7 x86_64

5 files changed, 179 insertions, 11 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index f5b73aca6018..3d06f452c63e 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,12 @@
 # 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.135 2008/10/07 09:42:00 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.136 2008/10/27 10:32:14 bicatali Exp $
+
+*R-2.8.0 (27 Oct 2008)
+
+  27 Oct 2008; Sébastien Fabbro <bicatali@gentoo.org> R-2.7.1.ebuild,
+  R-2.7.2.ebuild, +R-2.8.0.ebuild:
+  Version bump and get rid of virtual/tetex
 
   07 Oct 2008; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml,
   -R-2.2.1-r1.ebuild, -R-2.6.1-r1.ebuild, R-2.7.2.ebuild:
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 8f98423d06d8..06df1631a58c 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -5,15 +5,17 @@ AUX R-2.7.1-test-fix.patch 4049 RMD160 ea331226db3feda862009724a74cb98b08a6be91
 AUX R-javareconf.patch 1242 RMD160 667445da01c51438deef5d876929985858507d30 SHA1 0af91b826b969afb54462569cc210b8d16b0d482 SHA256 1667dc70b39197e1b77fbaab74a5fce078067f43da248d650a84d4cf494b15bd
 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.bash_completion.bz2 4019 RMD160 796951fb32e9ea4074dcd5ba3da5955ec0193993 SHA1 05ddebef0df16f0bf35aecc8fcb702ad5d106e5e SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85
-EBUILD R-2.7.1.ebuild 4167 RMD160 e225262dab9b4fd8708b0ab074ab22dcd153f888 SHA1 5721cb826e0789190376a73e1b3651ad39d58adf SHA256 a2759b055e840c9e1a4f10f462abf30d29c859bc4de419cbc6c58fd802cbe547
-EBUILD R-2.7.2.ebuild 4529 RMD160 2aed59eee26a83f58cbbe070021d4a90df6ddf32 SHA1 eaea22342b22309144b8255b87967e5cac20cf60 SHA256 6aa8c9056cad972c61fd031c12b523024aaabd0d57ca9b9bc91ed0d8c3b52c16
-MISC ChangeLog 20248 RMD160 11085344eabd2664c86ee8fbb43aae6cef995061 SHA1 0192ef7e1e142cec1e0bcf25e1729caacba9ec0f SHA256 b463531d39968c20fc0fc7e8428a9a18687d149d5bbd6df4c397c10eeb7d5c66
+EBUILD R-2.7.1.ebuild 4190 RMD160 5b0637b88a216923a39de5637e46513dee258905 SHA1 47b0db9e8eb3f9cde8db89a7b478dd9e106a65f2 SHA256 3f229509c86efa3a511d7af812f4104dbba7ed727e38e72adbfe584cd273b79f
+EBUILD R-2.7.2.ebuild 4554 RMD160 40dd4840ca90b5525c03ce031327d4b405311198 SHA1 c6328d54831893cce5f44c770af761a0422ee036 SHA256 64d17f75d902e8509b10e208a50c93527b82537a3a2ce6baba981d66a0442ded
+EBUILD R-2.8.0.ebuild 4020 RMD160 769b57263b19074428e34adebfe5f657ca231053 SHA1 cb7da73c769889414c0c580d63a4fbf645da2384 SHA256 b95ec372d45b2bfd1f3eed18ba637d2f2ee5c5fc45120e1d3223d238a4648317
+MISC ChangeLog 20423 RMD160 715fa61585dcc982fe5e5a26caacd8a210827e92 SHA1 26b4e6b675613b100b440f3746afa077e9b82c70 SHA256 4a445d9c620849a8a7d85ed78712515809c7bed2c61477ac235f74990a252712
 MISC metadata.xml 1031 RMD160 375436b81f2969a32b673a47fdcd7a8ddadb6fa3 SHA1 fefc629218f970fc24f6b4e30c482112ea6e6129 SHA256 6f692bb80f78dfd8987ae3f70c12c40924ef5e0596267d928953f37f44223968
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjrLvIACgkQ1ycZbhPLE2BpdACgnvJ4Aaa3c+68phFiQ+wl7sCt
-zBgAn3zmZ/qar8S4lmhcVEAUtTsoPMjr
-=O5IK
+iEYEARECAAYFAkkFmLsACgkQ1ycZbhPLE2DYZgCghmsinwnv04dDYlmRVzJdtpFw
+agEAnRbngXSfyepPteQ1Yx6k9DOM9y5K
+=/rFN
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-2.7.1.ebuild b/dev-lang/R/R-2.7.1.ebuild
index ee760e4212ff..81e3898aab13 100644
--- a/dev-lang/R/R-2.7.1.ebuild
+++ b/dev-lang/R/R-2.7.1.ebuild
@@ -1,6 +1,6 @@
 # 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.10 2008/09/06 21:39:55 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.7.1.ebuild,v 1.11 2008/10/27 10:32:14 bicatali Exp $
 
 inherit fortran flag-o-matic bash-completion
 
@@ -32,7 +32,9 @@ CDEPEND="dev-lang/perl
 DEPEND="${CDEPEND}
 	dev-util/pkgconfig
 	doc? ( virtual/latex-base
-	  || ( dev-texlive/texlive-fontsrecommended virtual/tetex ) )"
+	  || ( dev-texlive/texlive-fontsrecommended
+		   app-text/tetex
+		   app-text/ptex ) )"
 
 RDEPEND="${CDEPEND}
 	app-arch/unzip
diff --git a/dev-lang/R/R-2.7.2.ebuild b/dev-lang/R/R-2.7.2.ebuild
index 310f5d881004..8ef4a0a79119 100644
--- a/dev-lang/R/R-2.7.2.ebuild
+++ b/dev-lang/R/R-2.7.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.2 2008/10/07 09:42:00 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.7.2.ebuild,v 1.3 2008/10/27 10:32:14 bicatali Exp $
 
 inherit fortran flag-o-matic bash-completion versionator
 
@@ -32,7 +32,9 @@ CDEPEND="dev-lang/perl
 DEPEND="${CDEPEND}
 	dev-util/pkgconfig
 	doc? ( virtual/latex-base
-	  || ( dev-texlive/texlive-fontsrecommended virtual/tetex ) )"
+	  || ( dev-texlive/texlive-fontsrecommended
+		   app-text/tetex
+		   app-text/ptex ) )"
 
 RDEPEND="${CDEPEND}
 	app-arch/unzip
diff --git a/dev-lang/R/R-2.8.0.ebuild b/dev-lang/R/R-2.8.0.ebuild
new file mode 100644
index 000000000000..00093b0c7fd7
--- /dev/null
+++ b/dev-lang/R/R-2.8.0.ebuild
@@ -0,0 +1,156 @@
+# 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.8.0.ebuild,v 1.1 2008/10/27 10:32:14 bicatali 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
+}