From 1d7a5c134fb38cfeefbc23aab3a077e43c2216d6 Mon Sep 17 00:00:00 2001 From: Steve Arnold Date: Sun, 25 Sep 2011 06:23:59 +0000 Subject: Updated for zlib header changes (closes bug #383431). (Portage version: 2.1.10.19/cvs/Linux x86_64) --- dev-lang/R/ChangeLog | 8 +- dev-lang/R/R-2.13.1-r1.ebuild | 180 ++++++++++++++++++++++++ dev-lang/R/R-2.13.1.ebuild | 178 ----------------------- dev-lang/R/files/R-2.13.1-zlib_header_fix.patch | 13 ++ 4 files changed, 200 insertions(+), 179 deletions(-) create mode 100644 dev-lang/R/R-2.13.1-r1.ebuild delete mode 100644 dev-lang/R/R-2.13.1.ebuild create mode 100644 dev-lang/R/files/R-2.13.1-zlib_header_fix.patch (limited to 'dev-lang') diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog index 1d7202e6c571..0634c4100e51 100644 --- a/dev-lang/R/ChangeLog +++ b/dev-lang/R/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-lang/R # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.187 2011/08/04 11:38:27 naota Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.188 2011/09/25 06:23:59 nerdboy Exp $ + +*R-2.13.1-r1 (25 Sep 2011) + + 25 Sep 2011; Steve Arnold -R-2.13.1.ebuild, + +R-2.13.1-r1.ebuild, +files/R-2.13.1-zlib_header_fix.patch: + Updated for zlib header changes (closes bug #383431). 04 Aug 2011; Naohiro Aota R-2.13.1.ebuild: Fix dependency for FreeBSD. We have rpc related functions in freebsd-lib. diff --git a/dev-lang/R/R-2.13.1-r1.ebuild b/dev-lang/R/R-2.13.1-r1.ebuild new file mode 100644 index 000000000000..7d240c95146e --- /dev/null +++ b/dev-lang/R/R-2.13.1-r1.ebuild @@ -0,0 +1,180 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.13.1-r1.ebuild,v 1.1 2011/09/25 06:23:59 nerdboy Exp $ + +EAPI=4 + +inherit bash-completion eutils flag-o-matic fortran-2 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 GPL-3 ) LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" + +IUSE="cairo doc java jpeg lapack minimal nls openmp perl png profile readline static-libs tk X" + +# common depends +CDEPEND="app-arch/bzip2 + app-text/ghostscript-gpl + dev-libs/libpcre + || ( >=net-libs/libtirpc-0.2.2-r1 =x11-libs/pango-1.20[X] ) + jpeg? ( virtual/jpeg ) + lapack? ( virtual/lapack ) + perl? ( dev-lang/perl ) + png? ( media-libs/libpng ) + readline? ( sys-libs/readline ) + 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} + ( || ( =sys-libs/zlib-1.2.5.1-r2[minizip] ) ) + app-arch/xz-utils + java? ( >=virtual/jre-1.5 )" + +RESTRICT="minimal? ( test )" + +R_DIR="${EPREFIX}"/usr/$(get_libdir)/${PN} + +pkg_setup() { + if use openmp; then + FORTRAN_NEED_OPENMP=1 + tc-has-openmp || die "Please enable openmp support in your compiler" + fi + fortran-2_pkg_setup + filter-ldflags -Wl,-Bdirect -Bdirect + # avoid using existing R installation + unset R_HOME +} + +src_prepare() { + # fix ocasional failure with parallel install (bug #322965) + # upstream in R-2.13? + # https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14505 + epatch "${FILESDIR}"/${PN}-2.11.1-parallel.patch + # respect ldflags on rscript + # upstream does not want it, no reasons given + # https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14506 + epatch "${FILESDIR}"/${PN}-2.12.1-ldflags.patch + # update for zlib header changes (see bug #383431) + epatch "${FILESDIR}"/${P}-zlib_header_fix.patch + + # glibc 2.14 removed rpc + if has_version '>=net-libs/libtirpc-0.2.2-r1'; then + append-cppflags $($(tc-getPKG_CONFIG) libtirpc --cflags) + export LIBS+=" $($(tc-getPKG_CONFIG) libtirpc --libs)" + # patching configure.ac would cause way too much work + # ugly hack on configure and let upstream do the job + sed -i -e "s/'' nsl;/'' tirpc;/" configure || die + fi + + # 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/Rd.R \ + || die "sed failed" + + # fix Rscript + sed -i \ + -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \ + src/unix/Makefile.in || die "sed unix Makefile failed" + + # fix HTML links to manual (bug #273957) + sed -i -e 's:\.\./manual/:manual/:g' $(grep -Flr ../manual/ doc) \ + || die "sed for HTML links to manual 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 + use perl && \ + export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}" +} + +src_configure() { + econf \ + --enable-byte-compiled-packages \ + --enable-R-shlib \ + --with-system-zlib \ + --with-system-bzlib \ + --with-system-pcre \ + --with-system-xz \ + --with-blas="$(pkg-config --libs blas)" \ + --docdir="${EPREFIX}"/usr/share/doc/${PF} \ + rdocdir="${EPREFIX}"/usr/share/doc/${PF} \ + $(use_enable openmp) \ + $(use_enable nls) \ + $(use_enable profile R-profiling) \ + $(use_enable profile memory-profiling) \ + $(use_enable static-libs static) \ + $(use_enable static-libs R-static-lib) \ + $(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(){ + export VARTEXFONTS="${T}/fonts" + emake + RMATH_V=0.0.0 + emake -C src/nmath/standalone \ + libRmath_la_LDFLAGS="-Wl,-soname,libRmath.so.${RMATH_V}" \ + libRmath_la_LIBADD="\$(LIBM)" \ + shared $(use static-libs && echo static) + use doc && emake info pdf +} + +src_install() { + default + if use doc; then + emake DESTDIR="${D}" install-info install-pdf + dosym ../manual /usr/share/doc/${PF}/html/manual + fi + + # standalone math lib install (-j1 basically harmless) + emake \ + -C src/nmath/standalone \ + DESTDIR="${D}" install + + local mv=$(get_major_version ${RMATH_V}) + mv "${ED}"/usr/$(get_libdir)/libRmath.so \ + "${ED}"/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_DIR}/lib + R_HOME=${R_DIR} + EOF + doenvd 99R + dobashcompletion "${WORKDIR}"/R.bash_completion +} + +pkg_postinst() { + if use java; then + einfo "Re-initializing java paths for ${P}" + R CMD javareconf + fi +} diff --git a/dev-lang/R/R-2.13.1.ebuild b/dev-lang/R/R-2.13.1.ebuild deleted file mode 100644 index dc5d148ef330..000000000000 --- a/dev-lang/R/R-2.13.1.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.13.1.ebuild,v 1.2 2011/08/04 11:38:27 naota Exp $ - -EAPI=4 - -inherit bash-completion eutils flag-o-matic fortran-2 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 GPL-3 ) LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" - -IUSE="cairo doc java jpeg lapack minimal nls openmp perl png profile readline static-libs tk X" - -# common depends -CDEPEND="app-arch/bzip2 - app-text/ghostscript-gpl - dev-libs/libpcre - || ( >=net-libs/libtirpc-0.2.2-r1 =x11-libs/pango-1.20[X] =net-libs/libtirpc-0.2.2-r1'; then - append-cppflags $($(tc-getPKG_CONFIG) libtirpc --cflags) - export LIBS+=" $($(tc-getPKG_CONFIG) libtirpc --libs)" - # patching configure.ac would cause way too much work - # ugly hack on configure and let upstream do the job - sed -i -e "s/'' nsl;/'' tirpc;/" configure || die - fi - - # 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/Rd.R \ - || die "sed failed" - - # fix Rscript - sed -i \ - -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \ - src/unix/Makefile.in || die "sed unix Makefile failed" - - # fix HTML links to manual (bug #273957) - sed -i -e 's:\.\./manual/:manual/:g' $(grep -Flr ../manual/ doc) \ - || die "sed for HTML links to manual 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 - use perl && \ - export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}" -} - -src_configure() { - econf \ - --enable-byte-compiled-packages \ - --enable-R-shlib \ - --with-system-zlib \ - --with-system-bzlib \ - --with-system-pcre \ - --with-system-xz \ - --with-blas="$(pkg-config --libs blas)" \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - rdocdir="${EPREFIX}"/usr/share/doc/${PF} \ - $(use_enable openmp) \ - $(use_enable nls) \ - $(use_enable profile R-profiling) \ - $(use_enable profile memory-profiling) \ - $(use_enable static-libs static) \ - $(use_enable static-libs R-static-lib) \ - $(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(){ - export VARTEXFONTS="${T}/fonts" - emake - RMATH_V=0.0.0 - emake -C src/nmath/standalone \ - libRmath_la_LDFLAGS="-Wl,-soname,libRmath.so.${RMATH_V}" \ - libRmath_la_LIBADD="\$(LIBM)" \ - shared $(use static-libs && echo static) - use doc && emake info pdf -} - -src_install() { - default - if use doc; then - emake DESTDIR="${D}" install-info install-pdf - dosym ../manual /usr/share/doc/${PF}/html/manual - fi - - # standalone math lib install (-j1 basically harmless) - emake \ - -C src/nmath/standalone \ - DESTDIR="${D}" install - - local mv=$(get_major_version ${RMATH_V}) - mv "${ED}"/usr/$(get_libdir)/libRmath.so \ - "${ED}"/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_DIR}/lib - R_HOME=${R_DIR} - EOF - doenvd 99R - dobashcompletion "${WORKDIR}"/R.bash_completion -} - -pkg_postinst() { - if use java; then - einfo "Re-initializing java paths for ${P}" - R CMD javareconf - fi -} diff --git a/dev-lang/R/files/R-2.13.1-zlib_header_fix.patch b/dev-lang/R/files/R-2.13.1-zlib_header_fix.patch new file mode 100644 index 000000000000..0e1482e65b34 --- /dev/null +++ b/dev-lang/R/files/R-2.13.1-zlib_header_fix.patch @@ -0,0 +1,13 @@ +--- src/main/unzip.h.orig 2011-09-24 19:35:53.000000000 -0700 ++++ src/main/unzip.h 2011-09-24 19:37:06.000000000 -0700 +@@ -58,6 +58,10 @@ + #define ZLIB_FILEFUNC_SEEK_END (2) + #define ZLIB_FILEFUNC_SEEK_SET (0) + ++#ifndef OF ++#define OF(x) x ++#endif ++ + #define ZLIB_FILEFUNC_MODE_READ (1) + #define ZLIB_FILEFUNC_MODE_WRITE (2) + #define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3) -- cgit v1.2.3-65-gdbad