calchan 15/04/21 21:17:14 Modified: ChangeLog Added: R-3.2.0.ebuild Log: Version bump, bug #547050. (Portage version: 2.2.18/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.244 dev-lang/R/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/ChangeLog?rev=1.244&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/ChangeLog?rev=1.244&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/ChangeLog?r1=1.243&r2=1.244 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v retrieving revision 1.243 retrieving revision 1.244 diff -u -r1.243 -r1.244 --- ChangeLog 7 Apr 2015 14:09:38 -0000 1.243 +++ ChangeLog 21 Apr 2015 21:17:14 -0000 1.244 @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/R # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.243 2015/04/07 14:09:38 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.244 2015/04/21 21:17:14 calchan Exp $ + +*R-3.2.0 (21 Apr 2015) + + 21 Apr 2015; Denis Dupeyron <calc...@gentoo.org> +R-3.2.0.ebuild: + Version bump, bug #547050. 07 Apr 2015; Justin Lecher <j...@gentoo.org> R-3.0.1.ebuild: Fix Slot operators 1.1 dev-lang/R/R-3.2.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/R-3.2.0.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/R-3.2.0.ebuild?rev=1.1&content-type=text/plain Index: R-3.2.0.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-3.2.0.ebuild,v 1.1 2015/04/21 21:17:14 calchan Exp $ EAPI=5 inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs BCP=${PN}-20130129.bash_completion DESCRIPTION="Language and environment for statistical computing and graphics" HOMEPAGE="http://www.r-project.org/"; SRC_URI=" mirror://cran/src/base/R-3/${P}.tar.gz http://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2"; LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos" IUSE="cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X" REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )" CDEPEND=" app-arch/bzip2:0= app-arch/xz-utils:0= app-text/ghostscript-gpl >=dev-libs/libpcre-8.35:3= virtual/blas:0 || ( >=sys-apps/coreutils-8.15 sys-freebsd/freebsd-bin app-misc/realpath ) cairo? ( x11-libs/cairo:0=[X] x11-libs/pango:0= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack:0 ) perl? ( dev-lang/perl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/readline:0= ) tiff? ( media-libs/tiff:0= ) tk? ( dev-lang/tk:0= ) X? ( x11-libs/libXmu:0= x11-misc/xdg-utils )" DEPEND="${CDEPEND} virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-fontsrecommended )" RDEPEND="${CDEPEND} ( || ( <sys-libs/zlib-1.2.5.1-r1:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] ) ) java? ( >=virtual/jre-1.5 )" RESTRICT="minimal? ( test )" R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}" pkg_setup() { if use openmp; then if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then ewarn "OpenMP is not available in your current selected gcc" die "need openmp capable gcc" fi FORTRAN_NEED_OPENMP=1 fi fortran-2_pkg_setup filter-ldflags -Wl,-Bdirect -Bdirect # avoid using existing R installation unset R_HOME # Temporary fix for bug #419761 if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then append-flags -fno-ipa-cp-clone fi } src_prepare() { epatch \ "${FILESDIR}"/${PN}-2.11.1-parallel.patch \ "${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \ "${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch # fix packages.html for doc (gentoo bug #205103) sed -i \ -e "s:../../../library:../../../../$(get_libdir)/R/library:g" \ src/library/tools/R/Rd.R || die # fix Rscript path when installed (gentoo 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 (gentoo bug #273957) sed -i \ -e 's:\.\./manual/:manual/:g' \ $(grep -Flr ../manual/ doc) || die "sed for HTML links failed" use lapack && \ export LAPACK_LIBS="$($(tc-getPKG_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}" # don't search /usr/local sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die # Fix for Darwin (OS X) if use prefix; then if [[ ${CHOST} == *-darwin* ]] ; then sed -i \ -e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \ -e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \ -e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \ -e "/SHLIB_EXT/s/\.so/.dylib/" \ configure.ac || die # sort of "undo" 2.14.1-rmath-shared.patch sed -i \ -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \ src/nmath/standalone/Makefile.in || die else append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib" fi fi AT_M4DIR=m4 eaclocal eautoconf } src_configure() { # --with-system-tre \ # tre is patched from upstream econf \ --enable-byte-compiled-packages \ --enable-R-shlib \ --disable-R-framework \ --with-system-zlib \ --with-system-bzlib \ --with-system-pcre \ --with-system-xz \ --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ --docdir="${EPREFIX}/usr/share/doc/${PF}" \ rdocdir="${EPREFIX}/usr/share/doc/${PF}" \ $(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 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 tiff libtiff) \ $(use_with tk tcltk) \ $(use_with tk tk-config "${EPREFIX}"/usr/lib/tkConfig.sh) \ $(use_with tk tcl-config "${EPREFIX}"/usr/lib/tclConfig.sh) \ $(use_with X x) } src_compile() { export VARTEXFONTS="${T}/fonts" emake AR="$(tc-getAR)" emake -C src/nmath/standalone \ shared $(use static-libs && echo static) AR="$(tc-getAR)" use doc && emake info pdf } src_install() { default emake -j1 -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 cat > 99R <<-EOF LDPATH=${R_DIR}/lib R_HOME=${R_DIR} EOF doenvd 99R newbashcomp "${WORKDIR}"/${BCP} ${PN} # The buildsystem has a different understanding of install_names than # we require. Since it builds modules like shared objects (wrong), many # objects (all modules) get an incorrect install_name. Fixing the build # system here is not really trivial. if [[ ${CHOST} == *-darwin* ]] ; then local mod pushd "${ED}"/usr/lib/R > /dev/null for mod in $(find . -name "*.dylib") ; do mod=${mod#./} install_name_tool -id "${EPREFIX}/usr/lib/R/${mod}" \ "${mod}" done popd > /dev/null fi docompress -x /usr/share/doc/${PF}/NEWS.rds } pkg_postinst() { if use java; then einfo "Re-initializing java paths for ${P}" R CMD javareconf fi }
