Fixed perl 5 path, thanks to Guenther Brunthaler, closing bug #278258

(Portage version: 2.2_rc36/cvs/Linux x86_64)

6 files changed, 12 insertions, 175 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 6f6d257731e2..021e140bc39e 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/R
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.155 2009/07/16 06:14:11 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.156 2009/08/07 17:18:52 bicatali Exp $
+
+  07 Aug 2009; Sébastien Fabbro <bicatali@gentoo.org> R-2.7.2.ebuild,
+  R-2.8.1.ebuild, -R-2.9.0.ebuild, -files/R-2.9.0-without-x.patch,
+  R-2.9.1.ebuild:
+  Fixed perl 5 path, thanks to Guenther Brunthaler, closing bug #278258
 
   16 Jul 2009; Sébastien Fabbro <bicatali@gentoo.org> R-2.9.1.ebuild:
   Added symlinking for docs, thanks to Martin von Gagern, closing bug
diff --git a/dev-lang/R/R-2.7.2.ebuild b/dev-lang/R/R-2.7.2.ebuild
index 2536b8e2ab7e..77f0be26bfc6 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-2009 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.11 2009/05/30 08:30:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.7.2.ebuild,v 1.12 2009/08/07 17:18:52 bicatali Exp $
 
 EAPI=2
 inherit fortran flag-o-matic bash-completion versionator
@@ -56,6 +56,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-javareconf.patch
 	epatch "${FILESDIR}"/${PN}-2.7.1-test-fix.patch
+	export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
 }
 
 src_test() {
diff --git a/dev-lang/R/R-2.8.1.ebuild b/dev-lang/R/R-2.8.1.ebuild
index 9e1b1c661996..bd2c05ae0a4a 100644
--- a/dev-lang/R/R-2.8.1.ebuild
+++ b/dev-lang/R/R-2.8.1.ebuild
@@ -1,6 +1,6 @@
 # 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.10 2009/05/30 08:30:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.8.1.ebuild,v 1.11 2009/08/07 17:18:52 bicatali Exp $
 
 EAPI=2
 inherit eutils fortran flag-o-matic bash-completion versionator
@@ -74,6 +74,7 @@ src_prepare() {
 		export R_BROWSER="$(type -p xdg-open)"
 		export R_PDFVIEWER="$(type -p xdg-open)"
 	fi
+	export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
 }
 
 src_configure() {
diff --git a/dev-lang/R/R-2.9.0.ebuild b/dev-lang/R/R-2.9.0.ebuild
deleted file mode 100644
index d21ccd67828b..000000000000
--- a/dev-lang/R/R-2.9.0.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# 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.9.0.ebuild,v 1.3 2009/07/07 19:47:58 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 threads 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-1.20[X] <x11-libs/pango-1.20 ) )
-	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/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 empty loop for option -without-x (bug #268362)
-	epatch "${FILESDIR}"/${PN}-2.9.0-without-x.patch
-
-	# 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_enable threads) \
-		$(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() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if use doc; then
-		emake DESTDIR="${D}" \
-			install-info install-pdf || die "emake install docs failed"
-	fi
-
-	# standalone math lib install (-j1 basically harmless)
-	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
-}
diff --git a/dev-lang/R/R-2.9.1.ebuild b/dev-lang/R/R-2.9.1.ebuild
index 3eaa960eb823..585db11d034a 100644
--- a/dev-lang/R/R-2.9.1.ebuild
+++ b/dev-lang/R/R-2.9.1.ebuild
@@ -1,6 +1,6 @@
 # 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.9.1.ebuild,v 1.2 2009/07/16 06:14:11 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.9.1.ebuild,v 1.3 2009/08/07 17:18:52 bicatali Exp $
 
 EAPI=2
 inherit eutils flag-o-matic bash-completion versionator
@@ -72,6 +72,7 @@ src_prepare() {
 		export R_BROWSER="$(type -p xdg-open)"
 		export R_PDFVIEWER="$(type -p xdg-open)"
 	fi
+	export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
 }
 
 src_configure() {
diff --git a/dev-lang/R/files/R-2.9.0-without-x.patch b/dev-lang/R/files/R-2.9.0-without-x.patch
deleted file mode 100644
index 1d92ad0b7c31..000000000000
--- a/dev-lang/R/files/R-2.9.0-without-x.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- R-2.9.0/src/modules/Makefile.in.orig	2009-03-20 02:05:31.000000000 +0300
-+++ R-2.9.0/src/modules/Makefile.in	2009-05-03 00:25:38.000000000 +0400
-@@ -24,7 +24,7 @@
- 	@cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
- 
- R: Makefile make.internet make.lapack make.vfonts
--	@for d in "$(R_MODULES)"; do \
-+	@for d in $(R_MODULES); do \
- 	  (cd $${d} && $(MAKE) $@) || exit 1; \
- 	done
-