From: Denis Dupeyron Date: Tue, 21 Apr 2015 21:17:15 +0000 (+0000) Subject: Version bump, bug #547050. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=f53d1265cf0358a7f9ddd6cb304fa2b97afbbf04;p=gentoo.git Version bump, bug #547050. Package-Manager: portage-2.2.18/cvs/Linux x86_64 --- diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog index a296479518e4..537e33f20b7a 100644 --- a/dev-lang/R/ChangeLog +++ b/dev-lang/R/ChangeLog @@ -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 +R-3.2.0.ebuild: + Version bump, bug #547050. 07 Apr 2015; Justin Lecher R-3.0.1.ebuild: Fix Slot operators diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest index 8781efdb4377..085b392850ba 100644 --- a/dev-lang/R/Manifest +++ b/dev-lang/R/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - AUX R-2.11.1-parallel.patch 685 SHA256 5e57374318a3f549fa64c939a45964b941fac1f9b021cdc94ff1d40ff23032c5 SHA512 30491365eee00389f6f09c2093b5b5a568f4567c110cc0cb3332a53d6a7fcd87fe8f46f9f8521cf21bf1f0cfa24f4282a6e22396902f454c43f26542ac22c2a9 WHIRLPOOL 266115362f92a57d7a22d7b8810d12641e44c61b8396a8fd1a7fde2f5655a4990950366fc801d1d621e045a5a0b44d34c982cddb11396e82c019bec386a65f2a AUX R-2.12.1-ldflags.patch 639 SHA256 dee11fd510d31add8166230a7af61b7e700f2f4f122cbe0a07310d0017874933 SHA512 49b73cff79c1521e214f036390f32eed8c7d4afd39082eabb7e6c59e5d7136f399ff7227117e418d4445647d25259dce8eb208a1ebe5990bf4ad87cefa250338 WHIRLPOOL 98ec264ac6d68e64dcbce32f4688aa458ba6d300202b6f31cd7580de68c693f0fb6aecba40cd0f6736a0ef9ff346d04cd96af06716a25c4a84a72551085837ed AUX R-2.13.1-zlib_header_fix.patch 591 SHA256 e185a2c324796c11cca171da63663a59e45b558e13f01af8c9527bd09ea1028b SHA512 1ada5a3ccb0ff902f7df35d6a42f4e99fee6a1f7b36ece000b9e2fed2b731abf5c3687d22239cd324ff6677bf8edff3415aca57c31beef33c73b98073206136a WHIRLPOOL 989418f4fdd120ca0b163b61e7e0bf56e7b52477b38b310ef281c4637c979b5b483d8b955a0167c719ca96e276798ea647d647080164b13e69d3789410d5d813 @@ -12,29 +9,12 @@ DIST R-3.0.3.tar.gz 28075821 SHA256 b97cfd9540f294ab786e846153f3dd8605610d7e2761 DIST R-3.1.0.tar.gz 28469975 SHA256 8a680390f84c58c01dcdefd682eaa0e90389f09e6d2f2e090c71af40065f5fe2 SHA512 bb21fc90c7d37a5328031ed784e7dcbd20259d1837c33db3b51c14a116939a53496683d5de142a1223e89fc12406294efc67bed3595131615e9607d5ffab5ce2 WHIRLPOOL b376180d700d18780eb344b737a3a1bfc8b40f67967032e0f34abf940d76c3ffd7694be9f2f10be985571e8f94d92a6970a3d1cba503280e3fcf6df7a5e4298e DIST R-3.1.1.tar.gz 28606569 SHA256 ce5c4d5e34414ce8f1ec2d5642861435fa1ddc4cd89bd336172bbe25a62c7a19 SHA512 a75d8b82645bd9486873669b802924448d591013076e3d7dc958502dc6f0dac7d7fb78f3921d34a1eac1383f141b6e800f4293f7fac09651e0176cf84c431af9 WHIRLPOOL ec05c70193a229cbaf15f3432853070c6666c3963a4e2719a6d8ff188bfc2cada0d1f2fe90a9dd6b43f46913138afed0be387ba73b7f9c4d87abc362cc8a5393 DIST R-3.1.2.tar.gz 28655941 SHA256 bcd150afcae0e02f6efb5f35a6ab72432be82e849ec52ce0bb89d8c342a8fa7a SHA512 fee20cd94d14bd46cc36fb265ed4d64f44eaa3929dd13c62d29a5883fde607aba63e28a4b0f265ede63f78788996deaee36acf6a70cc0bc90a705c9782be01a1 WHIRLPOOL f02d543c0fd7e89e63aba844b7c0f651a9a6bb5dbfcd58bdb64b49d08335c3270383eb62291b9f2f20ef6ec9f39eef5cf77ae1af3109296f8b1898227cca99d1 +DIST R-3.2.0.tar.gz 29124927 SHA256 f5ae953f18ba6f3d55b46556bbbf73441350f9fd22625402b723a2b81ff64f35 SHA512 c6041c854251d51dd936d3a3632c2958a0437c58488f93e5ba810e957fb7f2276e3fe4f615fb4705f2fc5a66aa50a828b54b5e4e7b4358c7fd465c71531b9828 WHIRLPOOL e21a65b9197a202691dbe903b441caf7d8b92efdffb86dcccdbf09d080177cfd472a54d381df1cca749937434ffb9c08ac74198457e320353207cd00837e1086 EBUILD R-3.0.1.ebuild 6221 SHA256 c9c575adfdd95aaf2724168e46843275a7c8ef6af3902e34fff106a4d96256a0 SHA512 838f0882b2a64aac1a901909944029efbb8e8e90a94747db4cb62032a3e5567f677a05a0e8e13b81b3fdb02ff4aa2b499553b5368bc374b64e910c124dd8c203 WHIRLPOOL a6040d52e8be0a86746be022e34615e970c5fc6235fca8a1eaa20f406e059e1770f12dd6fb55346c8e362a4cffb1cec7d7ad23f6568f9709f1c24a847de39899 EBUILD R-3.0.3.ebuild 6185 SHA256 c966118221b99f8f35c9d6e30dce5e6ee1f60c22387ae20a209c7ccd930a7f70 SHA512 d4177b848d6a6a12b8c4952a7b2dc32f8533bdffd70e60169ad5a84a2654e8a30440d49b83210fae0a44161c38de7191cbaed16d0b9cbbcf407c8bc876b6edb8 WHIRLPOOL 0d1464242fac9f68c2fd51c82042479cbdac36d84cb89bc62c557e543743fa0b1e72e9e18219050c1a7d40dc75e0081bf4d3f6c6f43f1cfb567d1b0dd8b9e483 EBUILD R-3.1.0.ebuild 6245 SHA256 70715ced23d108bc76283268a0ad5a5ff3d26638ba4a2812053078e6c83b49d8 SHA512 11bfb21a9c766e1de3dc6cfdf5492f55e336dfa2fe1b947f491e5042d992b31c49037418dd9c294db8e417aff555a2e4108185e5cd52df2cbed2ba2481bb68ff WHIRLPOOL 6a7919073efff5bcbea3157d61d325d16fb7faa291dc59eedeca8e2dfb8fe7c26374333a394655695c647da73ca8bf78d7d59e6a883625c03d2e9d0154336d65 EBUILD R-3.1.1.ebuild 6192 SHA256 b67e7a833ba05d1bdb13aef789311fd4e543c545adcde6663a0641f6fb78afda SHA512 5b20c1a3fb94b9146a6f743249d3a175fa0a93afbf56b2a83fd8e0fea42b61640f930f67abf2ad2ce97e02c6220dc2f0ad2ff4f901872b4e4e3c44d45fc23e61 WHIRLPOOL ee111bc06f9f7bba8552238378c00e96652a8a554f620fb69a1de18533bd827dabd7d85c1bee86392ea59d919f015c4466c5e6ebd63e89f667e5d094fee88927 EBUILD R-3.1.2.ebuild 6193 SHA256 28fe94990662642a3df1c0f4f83906c9c86ba4eef63af91e8519db0333296185 SHA512 65912ae19b5d3e69c4feb6ffb3c3ac8938db14d0cec8591da57fadb27d8f52696e7be4da585131c4d4907649c43241806ec1207ff4c5b1cf4e0364bdf52bc43b WHIRLPOOL cac8ee2b994731f249a43ee76542619f8242510601da562e94b9535d86304c4bf34b785e0ca6ec84d3e5c174fd3967af125ae4e62fe1debf019916693b361c36 -MISC ChangeLog 36872 SHA256 92699cfeae3705c709845eb909b5aec905fac62c07103547ae558507e1424608 SHA512 e42a44606cf4868f74691a5dc329c144161df522db816817faa1a48d5b1bd9315ed4f573cc7e7b5130005660b662ea19715736e08d4b1bd9d719eae2ccb482ee WHIRLPOOL 843d2ed322dc9d0404137061ada210e5a1a7aeff5b15e503786cb5e75d2198870b798c759822b5ab6510b14f66f57f7d874b2914405b21d9d875e590c5380bb5 +EBUILD R-3.2.0.ebuild 6193 SHA256 ea38c7730bb02e7425136dde6d201a8140d9b5d416d1191a10cb36bbd4707360 SHA512 2e33d81b4b297fc7735a09c207558a93711964075035103f97e6a1e5817ea22a3d4805ddd26273eeeb8752e3e11d62115606e4cf5c67bf9bb4320aabb4f7605b WHIRLPOOL f5c99e658b24414466bfdd3cc72fe4d3a147c46773a896766aa1b5bec36ffaa6f21e98dcd580283952d935dce25135c9a2eee3048dc0217914a4771fba7a7d70 +MISC ChangeLog 36997 SHA256 b61f6bfbfe17cbf86470a82334eae584ffbb361f68ce17efabe9a595e6b5ff63 SHA512 b8a7e75dbe9cd18526b2744ef3893b04a8c3ffa03e7819800bd1c5bfc5ac90f62a99e8c1d2ea0f9a0eb84207ce0908b17968d112d34c1c5fec72537a2a890aaf WHIRLPOOL b3972b48d4025dc89319479c56d09833349d1422f6e2d0dcbbb3f44e42b4dc25ab20342ccdb36534890525e528dc5cc5cd653933c1bd3ba0cc4169d74311fa69 MISC metadata.xml 1136 SHA256 7d7c013a77ad6ffc785202e05711d4127a77f64fe09ef919deffa80cc74f992a SHA512 761c3afcbfc76c6026cc6a6f89dae2502f495008851dcb070ee04990653ed6785f089d31a0ea3ada11ccf3d027d372256d04a0baf9ee5d2528e63a9ea4dee313 WHIRLPOOL b7bd0d3843543ff07d15e2d18ae56358477667cec9e78be266f2d983304537afd6c1bac0842e403ce62729248debe2fddfe345c66e022bf2716a47d7819fe041 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0 - -iQJ8BAEBCgBmBQJVI+UjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC -OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirmHEP/0SKTQ2h+6XiQ9v8XOynoxFP -aiZc5zXJzGDV/wxBLEZA5uokhp2zNxiOhoA7f7ffqzY6b/m3c9Sp1AXkdA4sc+0z -RUlKDtexHWShppqsrvRVbYC81sbA067KSnzyhQmvE67icljj+oi1WLLL4XR7ZFSZ -6xLj7dqmlI9llKu6dTcbFId9L4znZMRt4s4mVwxXv0utYh0TNCs1uAF5mYaleVv2 -W1Mk/zZQTUbhniySl+rT6Z1KdXzFHmjWXZrQbUyYI8j5bSPWvDym8UhpH1iweOBF -xM+rcYL4kqBqJr1c5JVonBst4eOM1EZ4Z9G8ZE4l0TdJyK5Z7sBtIqZ+ninm8jrO -BtzZ6oT2B2H0kRTMUl1eNvDYD4YnG2j/7gk+PDOktKjYN6ZQrVbkPRCr5F3TXNeZ -3dMq2cgVfDpXGqlDQmHgTni9Rgkw+73/m1ZKISvLTLKpyrsffabY6XcfYxRKZGJw -pPn8UBJ2ISNdv5MLL57/CXnvgvQd2ngK36G64OXueF0GFMklCpV2vuY/B6QA/+Ff -LBMwgHwO9jv54Un+IXxtR2CHgOdtxOg3w/U2b7RDa/r/ThVnbldQI9nw6mUN2WWL -b8a1jrSqh9WInKFNjzlXKGtekzvE0uY1B+KoTlj29rprWrTPfPviQCSKVetADYHC -FRltBbKPJqlss6nB60i2 -=wNbE ------END PGP SIGNATURE----- diff --git a/dev-lang/R/R-3.2.0.ebuild b/dev-lang/R/R-3.2.0.ebuild new file mode 100644 index 000000000000..020069de3986 --- /dev/null +++ b/dev-lang/R/R-3.2.0.ebuild @@ -0,0 +1,206 @@ +# 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-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 +}