* [gentoo-commits] gentoo-x86 commit in dev-lang/R: ChangeLog R-2.13.1.ebuild
@ 2011-07-20 19:56 Sebastien Fabbro (bicatali)
0 siblings, 0 replies; 2+ messages in thread
From: Sebastien Fabbro (bicatali) @ 2011-07-20 19:56 UTC (permalink / raw
To: gentoo-commits
bicatali 11/07/20 19:56:35
Modified: ChangeLog
Added: R-2.13.1.ebuild
Log:
Version bump. Added fix for glibc-2.14 (bug #373051). Fixed missing libs during linking libRmath (bug #359249). More EAPI4 simplifications.
(Portage version: 2.1.10.6/cvs/Linux x86_64)
Revision Changes Path
1.186 dev-lang/R/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/ChangeLog?rev=1.186&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/ChangeLog?rev=1.186&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/ChangeLog?r1=1.185&r2=1.186
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- ChangeLog 23 Jun 2011 13:03:38 -0000 1.185
+++ ChangeLog 20 Jul 2011 19:56:35 -0000 1.186
@@ -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.185 2011/06/23 13:03:38 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.186 2011/07/20 19:56:35 bicatali Exp $
+
+*R-2.13.1 (20 Jul 2011)
+
+ 20 Jul 2011; Sébastien Fabbro <bicatali@gentoo.org> +R-2.13.1.ebuild:
+ Version bump. Added fix for glibc-2.14 (bug #373051). Fixed missing libs
+ during linking libRmath (bug #359249). More EAPI4 simplifications.
*R-2.13.0 (23 Jun 2011)
1.1 dev-lang/R/R-2.13.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/R-2.13.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/R-2.13.1.ebuild?rev=1.1&content-type=text/plain
Index: R-2.13.1.ebuild
===================================================================
# 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.1 2011/07/20 19:56:35 bicatali 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 <sys-libs/glibc-2.14 )
virtual/blas
cairo? ( x11-libs/cairo[X]
|| ( >=x11-libs/pango-1.20[X] <x11-libs/pango-1.20 ) )
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}
app-arch/unzip
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
# 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
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-lang/R: ChangeLog R-2.13.1.ebuild
@ 2011-08-04 11:38 Naohiro Aota (naota)
0 siblings, 0 replies; 2+ messages in thread
From: Naohiro Aota (naota) @ 2011-08-04 11:38 UTC (permalink / raw
To: gentoo-commits
naota 11/08/04 11:38:27
Modified: ChangeLog R-2.13.1.ebuild
Log:
Fix dependency for FreeBSD. We have rpc related functions in freebsd-lib.
(Portage version: 2.2.0_alpha43/cvs/FreeBSD i386)
Revision Changes Path
1.187 dev-lang/R/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/ChangeLog?rev=1.187&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/ChangeLog?rev=1.187&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/ChangeLog?r1=1.186&r2=1.187
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- ChangeLog 20 Jul 2011 19:56:35 -0000 1.186
+++ ChangeLog 4 Aug 2011 11:38:27 -0000 1.187
@@ -1,6 +1,9 @@
# 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.186 2011/07/20 19:56:35 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.187 2011/08/04 11:38:27 naota Exp $
+
+ 04 Aug 2011; Naohiro Aota <naota@gentoo.org> R-2.13.1.ebuild:
+ Fix dependency for FreeBSD. We have rpc related functions in freebsd-lib.
*R-2.13.1 (20 Jul 2011)
1.2 dev-lang/R/R-2.13.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/R-2.13.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/R-2.13.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/R/R-2.13.1.ebuild?r1=1.1&r2=1.2
Index: R-2.13.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.13.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- R-2.13.1.ebuild 20 Jul 2011 19:56:35 -0000 1.1
+++ R-2.13.1.ebuild 4 Aug 2011 11:38:27 -0000 1.2
@@ -1,6 +1,6 @@
# 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.1 2011/07/20 19:56:35 bicatali Exp $
+# $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
@@ -21,7 +21,7 @@
CDEPEND="app-arch/bzip2
app-text/ghostscript-gpl
dev-libs/libpcre
- || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 )
+ || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 sys-freebsd/freebsd-lib )
virtual/blas
cairo? ( x11-libs/cairo[X]
|| ( >=x11-libs/pango-1.20[X] <x11-libs/pango-1.20 ) )
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-08-04 11:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-20 19:56 [gentoo-commits] gentoo-x86 commit in dev-lang/R: ChangeLog R-2.13.1.ebuild Sebastien Fabbro (bicatali)
-- strict thread matches above, loose matches on Subject: below --
2011-08-04 11:38 Naohiro Aota (naota)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox