From: Sebastien Fabbro Date: Mon, 2 Jan 2012 19:47:54 +0000 (+0000) Subject: Version bump. Fixed automagic dependencies on icu and tiff. Added required dependency... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b8fb08a7a1eb47b67ab029dd5dabe5ba6629cd41;p=gentoo.git Version bump. Fixed automagic dependencies on icu and tiff. Added required dependency on pango when cairo is set. Fixed as-needed on standalone math library. Added required use flags for graphics capabilities (bug #373649). Removed glibc hacks, applied on glibc package. Commented patches for another attempt to submit them upstream. Removed older unstable versions, fixing bugs #353545, bug #357077, bug #382687, bug #384493, bug #384723. Package-Manager: portage-2.1.10.41/cvs/Linux x86_64 --- diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog index b9377126b3bd..7b3e8b9ac0ee 100644 --- a/dev-lang/R/ChangeLog +++ b/dev-lang/R/ChangeLog @@ -1,6 +1,20 @@ # 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.191 2011/11/21 16:22:52 jlec Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.192 2012/01/02 19:47:54 bicatali Exp $ + +*R-2.14.1 (02 Jan 2012) + + 02 Jan 2012; Sébastien Fabbro + files/R-2.11.1-parallel.patch, files/R-2.12.1-ldflags.patch, + -R-2.13.0.ebuild, -R-2.13.1-r1.ebuild, files/R-2.13.1-zlib_header_fix.patch, + -R-2.14.0.ebuild, +R-2.14.1.ebuild, +files/R-2.14.1-rmath-shared.patch, + +files/R-2.14.1-tiff.patch: + Version bump. Fixed automagic dependencies on icu and tiff. Added required + dependency on pango when cairo is set. Fixed as-needed on standalone math + library. Added required use flags for graphics capabilities (bug #373649). + Removed glibc hacks, applied on glibc package. Commented patches for another + attempt to submit them upstream. Removed older unstable versions, fixing bugs + #353545, bug #357077, bug #382687, bug #384493, bug #384723. *R-2.14.0 (21 Nov 2011) diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest index d28ea1d536ab..c31b3052d80a 100644 --- a/dev-lang/R/Manifest +++ b/dev-lang/R/Manifest @@ -1,24 +1,22 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA1 -AUX R-2.11.1-parallel.patch 488 RMD160 d693776b4650bc151f977f7c75234e582ad379c1 SHA1 02ea92a7ef3c2b87a9b1f3c929cb8eb828cd06db SHA256 d17c52fcda732908954aa4bbf690085402a4027ef905bc456e5101602e2bcf4f -AUX R-2.12.1-ldflags.patch 526 RMD160 d54e94d5c1d621821d5b0ff5d8ea789a153259eb SHA1 5cfbec92afaa164aa28fc28def531b26b2e8e428 SHA256 1af5dcdba86a915b7f6dc67d81afb71959adeca1a305890c3b7e0666b7537546 -AUX R-2.13.1-zlib_header_fix.patch 383 RMD160 a90c76bd42a86d972ba59e38b98e60222aa5e807 SHA1 1a10ce2ff0d357b9b2eb7c6512a0a12a954aec4c SHA256 e9ebeebcffbef51219537dd18a57d2764099a01999336c5a9e76030d17d1c72e +AUX R-2.11.1-parallel.patch 633 RMD160 e2ba77a67870123faac6c62e454492d4ee70ad92 SHA1 6fec3a4dce03a64daf4f59ca1bbfe828adc83ae2 SHA256 4ad6f007ffb390584de0c8a5935e98f98106f32394aac45c30c3fdfe77c00c70 +AUX R-2.12.1-ldflags.patch 639 RMD160 ce9052b344ca706608495c54e5d338b627060b83 SHA1 cada00c963e75458c9d145b07a3378a20e221f82 SHA256 dee11fd510d31add8166230a7af61b7e700f2f4f122cbe0a07310d0017874933 +AUX R-2.13.1-zlib_header_fix.patch 464 RMD160 908fd31070ac6e3311ad4105763a7b89f5d1d446 SHA1 a261faef7bd39de543952d0d9676319bf310a0b5 SHA256 161f0fff63db5cb2cb4894321759997e75463d784d5a7ba5105f74fe2ed73c40 +AUX R-2.14.1-rmath-shared.patch 986 RMD160 ec0adb2b8c8d8932eedebda776cf204e3c7ea01e SHA1 a837510d2f154cf33ba1f70272a0bb10266c9b3f SHA256 c05463dbf9ec5bba34cc987df4f6878154a738e57aaeaac46cc4f728c0c837a7 +AUX R-2.14.1-tiff.patch 1705 RMD160 fd9db4b15d519ab89289aaf65e23b50311ca2717 SHA1 3f4465840c7916fe9cd086ee65e6e04a58d9c4db SHA256 f6d97941723c851aa41535aa913c5d8e00d09e9845f9289bbb6b1922c68b62e9 DIST R-2.10.1.tar.gz 19705604 RMD160 7acf060192f205da4731d0ea3c2cc318b65b7e91 SHA1 f5b1969fde3642c233f5198e44a7bf17a7b85ab6 SHA256 5ca1780d9f47f2f4a9b52ba44fed9ee6e7d3547f18ed2c05192b0dbc56038e9d -DIST R-2.13.0.tar.gz 21832899 RMD160 5fc0bbdbdc0f6520e0da68ef7a17a4f3780bf9cb SHA1 878510e8a5fa1ccd1e0c4af5866f5416f3c27469 SHA256 559213ff05a205b9d2ad7ac7abebf477fb87c1bb3f0b03febbff5aa6bd8ab811 -DIST R-2.13.1.tar.gz 22063747 RMD160 3d83b907f6c81980a7e65bdf942936d6ce02a850 SHA1 8b9d48c7a654186064f369652ea34a085eff239b SHA256 ded5f39bc5130ff58a53d361435e0fee818ebec6c2aacc976ab625a3adf9bc51 -DIST R-2.14.0.tar.gz 22675106 RMD160 f2f2805c8660d58050be1d11abf376843dbb40ea SHA1 0f46bf75a7c150350b1142c29a98e7994d2b4bef SHA256 036204f56f8128e633a5d2fe56ebe0ba5a5e8501abe2056736d12a99bf69b910 +DIST R-2.14.1.tar.gz 23697861 RMD160 9dcd1d135701e3c682585346e7c48ac2c62012fd SHA1 5803a213480a749e36bccc155aecb13070ade096 SHA256 d8a18914005975f40ed8fb37e3532422f769fb454651a9ed75f73c2bee9c0c4c DIST R.bash_completion.bz2 4019 RMD160 796951fb32e9ea4074dcd5ba3da5955ec0193993 SHA1 05ddebef0df16f0bf35aecc8fcb702ad5d106e5e SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85 EBUILD R-2.10.1.ebuild 4514 RMD160 7f170bfc025de21298d01f6b44ac3714605146fd SHA1 2a4d80e1e2ab22e2b3bfa2e910770185b81ee584 SHA256 86e6ab59bf58155d0dc313ecc3a07281b471074b3a178058c96fa8e4e3e3dea8 -EBUILD R-2.13.0.ebuild 4626 RMD160 2ef50a8dbc79e5a9d08a022680ce46baa3b72d73 SHA1 db9b97944db6b9ecac54d6ed981afd09b8df21a8 SHA256 6f8a2bfb4727b61a25ca88ea2015a7df64f174d43621ca73c991a45b701f85b5 -EBUILD R-2.13.1-r1.ebuild 5212 RMD160 008478c437ba1ba9114395f74f956eab6ac27e9c SHA1 c9e4e60135ca20de1bf74629bd9e36c5ed7e5a36 SHA256 a12df8ea7069b04dd449cd22eaa612d2943029c4897c084039827b675c54d9a1 -EBUILD R-2.14.0.ebuild 5208 RMD160 bd8c96266667590b821191384cb020ebd34230a6 SHA1 cadcbf97d5b1c3321b8438fe6892fa6d892d664c SHA256 46f8c40e1a085168254d0a87a93f4575198844c08a03fe012e217f27d0ff6ddd -MISC ChangeLog 28069 RMD160 927123887d133656bd27be7394de3e8ff629ee47 SHA1 b5ff47422f38b34742f0d78f874035ffd59bb62f SHA256 6f105f47bb4320aadad130ace496d9e9ca7866ac5b97810a9fdcebf9bc4173b3 +EBUILD R-2.14.1.ebuild 4253 RMD160 78621dd9a10f5f80cc1dd2a0ab568e5295d444d3 SHA1 34b0431c3d66584ddc9c4f56ca5761adb0013078 SHA256 8b3d99016ce33b195f248728137ec884dca5774436aa4f84f05556bab96856a8 +MISC ChangeLog 28852 RMD160 8b1134dc36139e92c1bdbaa95ab07e7d8554e50b SHA1 7ebc990e32d7179d6001e64bcf4862df07de7b3b SHA256 e76ffca1e8f883611dd4b6c95db18f907ac63925687cebf583bccd81aa15fd45 MISC metadata.xml 1033 RMD160 d200586401de4f212758a5632040059b86cebe79 SHA1 7e6e9da0f5fe1f39a440ecdb298775685f14bb31 SHA256 c0e2a21f7e4e5eeadfd2502b7d035633b81a8f0228e4986758fb0f45990ec016 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEAREKAAYFAk7KeuMACgkQgAnW8HDreRYRbQCgptWgYOE7qSzZ6SCxJq2uUAcr -nxoAoMLAWTEajmBCP4Dw1GBq917tSOcd -=tlg2 +iEYEARECAAYFAk8CCfUACgkQ1ycZbhPLE2CtPACfYmNQ1mO2ZpT3AAGHVMq5orJe +GrkAnRWjNQuBC5aG+I8opEKXUOsXuYR4 +=UQ0n -----END PGP SIGNATURE----- diff --git a/dev-lang/R/R-2.13.0.ebuild b/dev-lang/R/R-2.13.0.ebuild deleted file mode 100644 index 5a5833333c14..000000000000 --- a/dev-lang/R/R-2.13.0.ebuild +++ /dev/null @@ -1,173 +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.0.ebuild,v 1.3 2011/11/21 16:22:52 jlec Exp $ - -EAPI=4 - -inherit bash-completion-r1 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 LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" - -IUSE="bash-completion 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 - virtual/blas - virtual/fortran - cairo? ( - x11-libs/cairo[X] - >=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 - )" - -RDEPEND="${CDEPEND} - app-arch/unzip - app-arch/xz-utils - app-arch/zip - 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-12.3? - # 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 - - # fix Rscript - sed \ - -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \ - -i src/unix/Makefile.in || die "sed unix Makefile failed" - - # fix HTML links to manual (bug #273957) - sed \ - -e 's:\.\./manual/:manual/:g' \ - -i $(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-R-shlib \ - --with-system-zlib \ - --with-system-bzlib \ - --with-system-pcre \ - --enable-byte-compiled-packages \ - --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 || die "emake failed" - RMATH_V=0.0.0 - emake -C src/nmath/standalone \ - libRmath_la_LDFLAGS=-Wl,-soname,libRmath.so.${RMATH_V} \ - || die "emake math library failed" - if use doc; then - emake info pdf || die "emake docs failed" - fi -} - -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" - dosym /usr/share/doc/${PF}/manual /usr/share/doc/${PF}/html/manual - fi - - # standalone math lib install (-j1 basically harmless) - emake \ - -C src/nmath/standalone \ - DESTDIR="${D}" install \ - || die "emake install math library failed" - - 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 || die "doenvd failed" - use bash-completion && dobashcomp "${WORKDIR}"/R.bash_completion -} - -pkg_postinst() { - if use java; then - einfo "Re-initializing java paths for ${P}" - R CMD javareconf - fi - bash-completion-r1_pkg_postinst -} diff --git a/dev-lang/R/R-2.13.1-r1.ebuild b/dev-lang/R/R-2.13.1-r1.ebuild deleted file mode 100644 index f861b046663d..000000000000 --- a/dev-lang/R/R-2.13.1-r1.ebuild +++ /dev/null @@ -1,185 +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-r1.ebuild,v 1.3 2011/11/21 16:22:52 jlec Exp $ - -EAPI=4 - -inherit bash-completion-r1 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="bash-completion 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 =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 \ - -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \ - -i src/unix/Makefile.in || die "sed unix Makefile failed" - - # fix HTML links to manual (bug #273957) - sed \ - -e 's:\.\./manual/:manual/:g' \ - -i $(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 - use bash-completion && dobashcomp "${WORKDIR}"/R.bash_completion -} - -pkg_postinst() { - if use java; then - einfo "Re-initializing java paths for ${P}" - R CMD javareconf - fi - bash-completion-r1_pkg_postinst -} diff --git a/dev-lang/R/R-2.14.0.ebuild b/dev-lang/R/R-2.14.1.ebuild similarity index 56% rename from dev-lang/R/R-2.14.0.ebuild rename to dev-lang/R/R-2.14.1.ebuild index 30f7289d0d95..b2803fa4a82d 100644 --- a/dev-lang/R/R-2.14.0.ebuild +++ b/dev-lang/R/R-2.14.1.ebuild @@ -1,30 +1,28 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.14.0.ebuild,v 1.1 2011/11/21 16:22:52 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.14.1.ebuild,v 1.1 2012/01/02 19:47:54 bicatali Exp $ EAPI=4 -inherit bash-completion-r1 eutils flag-o-matic fortran-2 versionator +inherit bash-completion-r1 autotools 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 +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="bash-completion cairo doc java jpeg lapack minimal nls openmp perl png profile readline static-libs tk X" +IUSE="bash-completion cairo doc icu java jpeg lapack minimal nls openmp perl png profile readline static-libs tiff tk X" +REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )" -# common depends -CDEPEND=" - app-arch/bzip2 +CDEPEND="app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre - || ( >=net-libs/libtirpc-0.2.2-r1 =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 + epatch \ + "${FILESDIR}"/${PN}-2.11.1-parallel.patch \ + "${FILESDIR}"/${PN}-2.12.1-ldflags.patch \ + "${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \ + "${FILESDIR}"/${PN}-2.14.1-tiff.patch \ + "${FILESDIR}"/${PN}-2.14.1-rmath-shared.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/Rd.R \ - || die "sed failed" + -e "s:../../../library:../../../../$(get_libdir)/R/library:g" \ + src/library/tools/R/Rd.R || die - # fix Rscript + # fix Rscript path when installed (bug #221061) 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" + sed -i \ + -e 's:\.\./manual/:manual/:g' \ + $(grep -Flr ../manual/ doc) || die "sed for HTML links failed" use lapack && \ export LAPACK_LIBS="$(pkg-config --libs lapack)" @@ -106,6 +90,8 @@ src_prepare() { fi use perl && \ export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}" + AT_M4DIR=m4 eaclocal + eautoconf } src_configure() { @@ -119,52 +105,40 @@ src_configure() { --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 openmp) \ $(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 cairo) \ + $(use_with icu ICU) \ $(use_with jpeg jpeglib) \ + $(use_with lapack) \ $(use_with !minimal recommended-packages) \ $(use_with png libpng) \ $(use_with readline) \ - $(use_with cairo) \ + $(use_with tiff libtiff) \ + $(use_with tk tcltk) \ $(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) + emake -C src/nmath/standalone shared $(use static-libs && echo static) use doc && emake info pdf } src_install() { default + emake -C src/nmath/standalone DESTDIR="${D}" install + 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} diff --git a/dev-lang/R/files/R-2.11.1-parallel.patch b/dev-lang/R/files/R-2.11.1-parallel.patch index 92b187ee1946..2be95349095a 100644 --- a/dev-lang/R/files/R-2.11.1-parallel.patch +++ b/dev-lang/R/files/R-2.11.1-parallel.patch @@ -1,3 +1,8 @@ +Fix ocasional failure with parallel install (bug #322965) +Patch by Sebastien Fabbro + +https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14505 + --- src/include/Makefile.in.orig 2010-06-15 18:18:54.000000000 +0000 +++ src/include/Makefile.in 2010-06-15 18:19:48.000000000 +0000 @@ -81,7 +81,7 @@ diff --git a/dev-lang/R/files/R-2.12.1-ldflags.patch b/dev-lang/R/files/R-2.12.1-ldflags.patch index 6296d0330c7a..2876ac3a4164 100644 --- a/dev-lang/R/files/R-2.12.1-ldflags.patch +++ b/dev-lang/R/files/R-2.12.1-ldflags.patch @@ -1,3 +1,7 @@ +Respect ldflags on rscript +Patch by Sebastien Fabbro +https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14506 + --- src/unix/Makefile.in.orig 2010-12-22 16:58:19.000000000 +0000 +++ src/unix/Makefile.in 2010-12-22 16:54:16.000000000 +0000 @@ -66,7 +66,7 @@ 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 index 0e1482e65b34..42e3b8a811c5 100644 --- 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 @@ -1,3 +1,7 @@ +Update for zlib header changes + +https://bugs.gentoo.org/show_bug.cgi?id=383431 + --- 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 @@ diff --git a/dev-lang/R/files/R-2.14.1-rmath-shared.patch b/dev-lang/R/files/R-2.14.1-rmath-shared.patch new file mode 100644 index 000000000000..c16f20e756de --- /dev/null +++ b/dev-lang/R/files/R-2.14.1-rmath-shared.patch @@ -0,0 +1,24 @@ +Link with libm to fix unresolved symbols when linked with as-needed +and add a soname to the standalone math library +Patch by Sebastien Fabbro +--- src/nmath/standalone/Makefile.in.orig 2010-03-17 14:43:22.000000000 +0000 ++++ src/nmath/standalone/Makefile.in 2012-01-02 17:40:13.000000000 +0000 +@@ -64,7 +64,8 @@ + Rexeclibdir_LTLIBRARIES = $(libRmath_la) + libRmath_la_SOURCES = $(SOURCES) + libRmath_la_OBJECTS = $(OBJECTS:.o=.lo) +-libRmath_la_LDFLAGS = ++libRmath_la_LDFLAGS = -Wl,-soname=libRmath.so ++libRmath_la_LIBADD = $(LIBM) + + CLEANFILES = Makedeps *.d *.o *.lo test $(SOURCES) + DISTCLEANFILES = Makefile $(Rexeclibdir_LIBRARIES) $(Rexeclibdir_LTLIBRARIES) +@@ -116,7 +117,7 @@ + $(RANLIB) $@ + + $(libRmath_la): $(libRmath_la_OBJECTS) +- $(DYLIB_LINK) -o $@ $(libRmath_la_LDFLAGS) $(libRmath_la_OBJECTS) ++ $(DYLIB_LINK) $(libRmath_la_LDFLAGS) $(libRmath_la_OBJECTS) $(libRmath_la_LIBADD) -o $@ + + test: $(srcdir)/test.c + $(CC) -o $@ $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(srcdir)/test.c \ diff --git a/dev-lang/R/files/R-2.14.1-tiff.patch b/dev-lang/R/files/R-2.14.1-tiff.patch new file mode 100644 index 000000000000..dafd935f2042 --- /dev/null +++ b/dev-lang/R/files/R-2.14.1-tiff.patch @@ -0,0 +1,47 @@ +Add a --with-tiff to avoid broken implicit dependencies +Patch by Sebastien Fabbro + +--- configure.ac.orig 2012-01-02 17:01:24.000000000 +0000 ++++ configure.ac 2012-01-02 17:04:21.000000000 +0000 +@@ -396,6 +396,10 @@ + [AS_HELP_STRING([--with-jpeglib],[use jpeglib library (if available) @<:@yes@:>@])], + [R_ARG_USE(jpeglib)], + [use_jpeglib=yes]) ++AC_ARG_WITH([tiff], ++[AS_HELP_STRING([--with-libtiff],[use libtiff library (if available) @<:@yes@:>@])], ++[R_ARG_USE(libtiff)], ++[use_libtiff=yes]) + AC_ARG_WITH([system-zlib], + [AS_HELP_STRING([--with-system-zlib],[use system zlib library (if available) @<:@no@:>@])], + [R_ARG_USE_SYSTEM(zlib)], +--- m4/R.m4.orig 2012-01-02 17:05:22.000000000 +0000 ++++ m4/R.m4 2012-01-02 17:08:08.000000000 +0000 +@@ -2005,16 +2005,18 @@ + [Define if you have the PNG headers and libraries.]) + fi + fi +-AC_CHECK_HEADERS(tiffio.h) +-# may need to resolve jpeg routines +-AC_CHECK_LIB(tiff, TIFFOpen, [have_tiff=yes], [have_tiff=no], [${BITMAP_LIBS}]) +-if test "x${ac_cv_header_tiffio_h}" = xyes ; then +- if test "x${have_tiff}" = xyes; then +- AC_DEFINE(HAVE_TIFF, 1, [Define this if libtiff is available.]) +- BITMAP_LIBS="-ltiff ${BITMAP_LIBS}" +- else +- have_tiff=no +- fi ++if test "${use_libtiff}" = yes; then ++ AC_CHECK_HEADERS(tiffio.h) ++ # may need to resolve jpeg routines ++ AC_CHECK_LIB(tiff, TIFFOpen, [have_tiff=yes], [have_tiff=no], [${BITMAP_LIBS}]) ++ if test "x${ac_cv_header_tiffio_h}" = xyes ; then ++ if test "x${have_tiff}" = xyes; then ++ AC_DEFINE(HAVE_TIFF, 1, [Define this if libtiff is available.]) ++ BITMAP_LIBS="-ltiff ${BITMAP_LIBS}" ++ else ++ have_tiff=no ++ fi ++ fi + fi + AC_SUBST(BITMAP_LIBS) + ])# R_BITMAPS