* [gentoo-commits] gentoo-x86 commit in dev-lang/R: R-2.14.1.ebuild ChangeLog R-2.13.0.ebuild R-2.14.0.ebuild R-2.13.1-r1.ebuild
@ 2012-01-02 19:47 Sebastien Fabbro (bicatali)
0 siblings, 0 replies; only message in thread
From: Sebastien Fabbro (bicatali) @ 2012-01-02 19:47 UTC (permalink / raw
To: gentoo-commits
bicatali 12/01/02 19:47:54
Modified: ChangeLog
Added: R-2.14.1.ebuild
Removed: R-2.13.0.ebuild R-2.14.0.ebuild R-2.13.1-r1.ebuild
Log:
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.
(Portage version: 2.1.10.41/cvs/Linux x86_64)
Revision Changes Path
1.192 dev-lang/R/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/ChangeLog?rev=1.192&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/ChangeLog?rev=1.192&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/ChangeLog?r1=1.191&r2=1.192
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- ChangeLog 21 Nov 2011 16:22:52 -0000 1.191
+++ ChangeLog 2 Jan 2012 19:47:54 -0000 1.192
@@ -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 <bicatali@gentoo.org>
+ 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)
1.1 dev-lang/R/R-2.14.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/R-2.14.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/R-2.14.1.ebuild?rev=1.1&content-type=text/plain
Index: R-2.14.1.ebuild
===================================================================
# 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.1.ebuild,v 1.1 2012/01/02 19:47:54 bicatali Exp $
EAPI=4
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
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 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 ) )"
CDEPEND="app-arch/bzip2
app-text/ghostscript-gpl
dev-libs/libpcre
virtual/blas
cairo? ( x11-libs/cairo[X] x11-libs/pango )
icu? ( dev-libs/icu )
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}
( || ( <sys-libs/zlib-1.2.5.1-r1 >=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() {
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)
sed -i \
-e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
src/library/tools/R/Rd.R || die
# 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 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}"
AT_M4DIR=m4 eaclocal
eautoconf
}
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 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 X x)
}
src_compile(){
export VARTEXFONTS="${T}/fonts"
emake
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
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
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-01-02 19:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-02 19:47 [gentoo-commits] gentoo-x86 commit in dev-lang/R: R-2.14.1.ebuild ChangeLog R-2.13.0.ebuild R-2.14.0.ebuild R-2.13.1-r1.ebuild Sebastien Fabbro (bicatali)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox