diff options
Diffstat (limited to 'dev-lang/R')
-rw-r--r-- | dev-lang/R/Manifest | 7 | ||||
-rw-r--r-- | dev-lang/R/R-4.1.0-r2.ebuild | 235 | ||||
-rw-r--r-- | dev-lang/R/R-4.1.2-r1.ebuild | 2 | ||||
-rw-r--r-- | dev-lang/R/R-4.2.0.ebuild (renamed from dev-lang/R/R-4.1.2.ebuild) | 12 |
4 files changed, 14 insertions, 242 deletions
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest index 05f70eceb02f..dbd64333f21e 100644 --- a/dev-lang/R/Manifest +++ b/dev-lang/R/Manifest @@ -3,11 +3,10 @@ AUX R-3.4.1-rmath-shared.patch 899 BLAKE2B 0aba9c1c5417531647bed3829d53909e6f398 AUX R-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch 469 BLAKE2B ee716b068316bbac0c07fe44bef739a491af5f4e90ba268cf7db428350763d498ab0b1bc9efa02ac885d0ac64aa5d076deaac094725766e340cbcd9d7e839b22 SHA512 cb7bc73fd0f1aa4159b25bc76318074662afddafdef8acc8caf20afb98da6c065c3bd0895c4a7a7f18a174d21d59c0f054a46aa513db1b5b622a110e7c54e171 AUX R-3.6.2-no-gzip-doc.patch 443 BLAKE2B 1154e9f67f08e1d8b286152bd093789a0b94b3a2422bdb54d1d1d03729bd892811e68121309c41ef4323ed31efcea82f3e265b37445e9870bbd88c5413311345 SHA512 99678dbf809761a2991cd5cbe6ff5ba8d1c3e9388f69d94b30726caae4eee29ae50ee74aa24e3851d41559f804381ec18a2cd818b97b5417bf7ae660c93ad2a6 DIST R-4.0.5.tar.gz 32466444 BLAKE2B 5dbbd289f4fd6347b4109eecaf65b50b5793a83edddd2cb391c20473607f136d91a8e9f4ab9e453f6927d2ca9145762920424e3a1dcea89309afde56efd5d32c SHA512 6ff5b0f9cb6b17f66cde1f5585d1b33659dbae8919d34c2e593f68a0bff4d0425aa9704d99284d103702a9cd42f613311f3a87af6b939b1af65dcec80bf2ca8c -DIST R-4.1.0.tar.gz 33714683 BLAKE2B 22ba966b5a29f153f3ce6cbc467e815c397e7c6aade0db62c7d2ae044056d9227da4dcb8fbf33e661548f4f434c328415e297c6b07b3932ef3f47358c2543f42 SHA512 41519bf06a1ebc2bb582e9a7c35d0e82e213312dec8147861a7f9b28ee750cd40dfbf02737602d05698641fcea6182b0da8131e83edacc358e98eca0a393b729 DIST R-4.1.2.tar.gz 34009074 BLAKE2B 7ca14b28fc40548180dde979d57f93f41fb3966697d58f686cf63e24e4cbf2de8166240952e708fc94f97846cd57bbd559b4edb688500e1db2a6704de16f508c SHA512 657c7950a88f632f1bbb08dbd0b3fb485732a25d8bbcb8a7939a40b23c7a235fdb9b46c296acaa9f72eabebe96e270ecbdcd7970fc9d3a299e6687bea45f2d3f +DIST R-4.2.0.tar.gz 37585694 BLAKE2B 5ba4d3b9397e92b72af729d88ff562655e0dd7c547bd371638aa76d4f1701f4f8a7911d500cf4f10d87b62457f8f8ce7a946d893477ceb7268b06bd59bc10f3d SHA512 99e71dad00b63e44bfcb8dc9539ff1951809112882d9ee7e06a4e99bce2e6ceac24e8348fd598c21e6d5ab0e0629a85170cde208bfa8145af91c398ac4ef7bcd DIST R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion 13596 BLAKE2B 53338e4a1c4f68beb69247216e553dbcac47f660fbf032bfebf7a660e32d2cff5b11ed35411c52de7e1fd6e00bbf5b5ea19369a325fa0a38bd93d63dc3288cbd SHA512 9ccd19bb1b0c18a2f13035ccd6809447429e197e298fb4d1df808ef345d723b42f75a1b91c349f6dbb46e4a82e59ef33e11300c495d79b63d670d0c0f2b16a06 EBUILD R-4.0.5-r1.ebuild 7313 BLAKE2B fd84cc2304d72deaf1f723bffed2906cbd810b913d4c636a37c12f4dab6ffa866ee769636bb700e2447a8a771dbed5cad9df3f289d510d9593f08f9c167f0a3f SHA512 50a086dade0562b6494623eb56f7fb2b98982a8d1b3d9f5ec27c35399ccf2de13c3c5a0ac51dc7d46abaac74d9838869aeeb274a7ac5120bfdc87c3a05354747 -EBUILD R-4.1.0-r2.ebuild 7080 BLAKE2B 312412a327e25891d3b4236f648d4958b0d7ffcada36add367baeced3f325af645cb21c5126190643bfd92eba34d169c14a68e2cdfdc3b9c98de7e7254171e3b SHA512 978cf3808415dbcea5fcbf81a3e9877e236317bb89a821b2f812f0673631fee2e4be63a66c9b26ced3f85ef429ddca4482624e7e8d87b9c9172e87707d7325c8 -EBUILD R-4.1.2-r1.ebuild 7075 BLAKE2B 1eedcee7891e2aa3d28a34ea43e0020879ceecade6c8423cf2d4f2d0f057b427b70d661ee4411d7390639cb97177a2cf430e0653b682f70f9929b0f20e3929e5 SHA512 45f5570fe9ed2bcdd0898f673026cd1aba6d169d8109f47b01e91095ba849a2080c1260a40e5747e023f7fb2822fcadc69ed490cc2dc13ca2b9a3e8662e9fa66 -EBUILD R-4.1.2.ebuild 7038 BLAKE2B 3e7ac8d5428f980703482a3ce4078aebbc9b983b7a80cb14f724f105473446ad5f235de6460ab2cf7b1c8d6699ddba755b63cad7edc21580aa070714c40e2af3 SHA512 fa144fa713a765892b8c9365aefe34b157f55f7e81aba0930188f9309363c1b6cca373d1e7335909310c4edb9781f2f572a4c552533d1187364ed41fb50d49a1 +EBUILD R-4.1.2-r1.ebuild 7072 BLAKE2B 062319e8872e8698da83116b72f8cb011de82dafab6d70926e6e9b96b4c646efd61d257b62586ba3ac565e14cb8a47f341190ebe10477f414c1ef27f3dcb7554 SHA512 867b5c48ee0f3c3e36d47f6f6848494c1e7f26c3653735b250a7a0a85304db55ce6e80773caf1bc4bf7a0831ec3184aeffe13422ad7303c3d5ffb2d78cb99c80 +EBUILD R-4.2.0.ebuild 7328 BLAKE2B 6ccac972a0ab3008cce81b4966a7bef2bc75f6686d95d8f2cd30e31f0f74d88dcb2ce845a7ee70389083431e0269075eba07c5866406179a41b221d1d7edcff9 SHA512 8066da86f121d9f2b09c7830303488957745d6fe7046f535507a06c199cfb730e7686bf22541031a01add94cbe1700854b2a6c380655643761f75c0150c0b275 MISC metadata.xml 1261 BLAKE2B 468178b60e894bd8dff85ecbf74d10dce61bdb21fc8b61f43d7778dbc345234fc6b5e28c7608534d558c95fa6583b5acd2e55cef7096c4cff88e84776e93e03a SHA512 0d42cb1e3b951e3b1cbf09e6e48d47cf7635c8b16708b5b1edb6c5d1b422cad2f16ce5c6f7c603efb365eb9d5b794d2d2653b408147aa9e921cd57feb3840013 diff --git a/dev-lang/R/R-4.1.0-r2.ebuild b/dev-lang/R/R-4.1.0-r2.ebuild deleted file mode 100644 index ebf4b5c27c2e..000000000000 --- a/dev-lang/R/R-4.1.0-r2.ebuild +++ /dev/null @@ -1,235 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 autotools flag-o-matic fortran-2 toolchain-funcs - -# latest git commit for R bash completion: https://github.com/deepayan/rcompletion -BCPV=78d6830e28ea90a046da79a9b4f70c39594bb6d6 - -DESCRIPTION="Language and environment for statistical computing and graphics" -HOMEPAGE="https://www.r-project.org/" -SRC_URI=" - mirror://cran/src/base/R-4/${P}.tar.gz - https://raw.githubusercontent.com/deepayan/rcompletion/${BCPV}/bash_completion/R -> ${PN}-${BCPV}.bash_completion" - -LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="cairo doc icu java jpeg lapack lto minimal nls openmp perl png prefix profile readline static-libs test tiff tk X" - -REQUIRED_USE="png? ( || ( cairo X ) ) - jpeg? ( || ( cairo X ) ) - tiff? ( || ( cairo X ) ) -" - -# At least one package installation in the test suite requires TeX, -# and will fail without it (bug #718056). -BDEPEND="virtual/pkgconfig - doc? ( - virtual/latex-base - dev-texlive/texlive-fontsrecommended - ) - test? ( virtual/latex-base )" -DEPEND=" - app-arch/bzip2:0= - app-arch/xz-utils:0= - app-text/ghostscript-gpl - dev-libs/libpcre2:= - net-libs/libtirpc - net-misc/curl - virtual/blas:0 - || ( sys-apps/coreutils 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-libs/libXt x11-misc/xdg-utils )" - -RDEPEND="${DEPEND} - sys-libs/zlib:0[minizip] - java? ( >=virtual/jre-1.8:* )" - -RESTRICT="minimal? ( test ) - !test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-3.4.1-parallel.patch - "${FILESDIR}"/${PN}-3.4.1-rmath-shared.patch - "${FILESDIR}"/${PN}-3.6.2-no-LDFLAGS-in-libR-pkg-config.patch - "${FILESDIR}"/${PN}-3.6.2-no-gzip-doc.patch -) - -pkg_pretend() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]] && use openmp; then - FORTRAN_NEED_OPENMP=1 - fi - fortran-2_pkg_setup - filter-ldflags -Wl,-Bdirect -Bdirect - # avoid using existing R installation - unset R_HOME -} - -src_prepare() { - default - - # fix packages.html for doc (gentoo bug #205103) - sed -e "s:../../../library:../../../../$(get_libdir)/R/library:g" \ - -i src/library/tools/R/Rd.R || die - - # fix Rscript path when installed (gentoo bug #221061) - sed -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${EROOT}/usr/$(get_libdir)/${PN}\"':" \ - -i src/unix/Makefile.in || die "sed unix Makefile failed" - - # fix HTML links to manual (gentoo bug #273957) - sed -e 's:\.\./manual/:manual/:g' \ - -i $(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 -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/" \ - -i configure.ac || die - # sort of "undo" 2.14.1-rmath-shared.patch - sed -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT}/usr/$(get_libdir)/libRmath.dylib:" \ - -i src/nmath/standalone/Makefile.in || die - else - append-ldflags -Wl,-rpath="${EROOT}/usr/$(get_libdir)/R/lib" - fi - fi - AT_M4DIR=m4 - eautoreconf -} - -src_configure() { - # --with-system-tre \ - # tre is patched from upstream - econf \ - --enable-byte-compiled-packages \ - --enable-R-shlib \ - --disable-R-framework \ - --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ - rdocdir="${EPREFIX}/usr/share/doc/${PF}" \ - $(use_enable java) \ - $(use_enable lto lto R) \ - $(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/$(get_libdir)/tkConfig.sh) \ - $(use_with tk tcl-config "${EPREFIX}"/usr/$(get_libdir)/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=${EROOT}/usr/$(get_libdir)/${PN}/lib - R_HOME=${EROOT}/usr/$(get_libdir)/${PN} - EOF - doenvd 99R - newbashcomp "${DISTDIR}"/${PN}-${BCPV}.bash_completion ${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/$(get_libdir)/R > /dev/null - for mod in $(find . -name "*.dylib") ; do - mod=${mod#./} - install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/R/${mod}" \ - "${mod}" - done - popd > /dev/null - fi - - # Users are encouraged to access some of the the R documentation - # interactively, through functions like "contributors()" that - # tries to open the "AUTHORS" file. Other files can be accessed - # by name with RShowDoc(), and the documentation for e.g. license() - # and RShowDoc() suggests a few of these names. Here we try to - # collect as many names as possible that a user might actually - # try to view through R, because if we don't decompress them, - # then R doesn't know what to do with 'em. Bug #556706. - INTERACTIVE_DOCS=( - AUTHORS - COPYING - FAQ - NEWS - THANKS - ) - - # Other data sources that are shipped as "documentation," but which - # need to be accessible via their original unmolested filenames. - INTERACTIVE_DATA=( - BioC_mirrors.csv - CRAN_mirrors.csv - KEYWORDS.db - NEWS.rds - ) - - NOCOMPRESS_DOCS=( "${INTERACTIVE_DOCS[@]}" "${INTERACTIVE_DATA[@]}" ) - - for f in "${NOCOMPRESS_DOCS[@]}"; do - docompress -x "/usr/share/doc/${PF}/${f}" - done -} - -pkg_postinst() { - if use java; then - einfo "Re-initializing java paths for ${P}" - R CMD javareconf - fi -} diff --git a/dev-lang/R/R-4.1.2-r1.ebuild b/dev-lang/R/R-4.1.2-r1.ebuild index a4c36d76f9e3..dfe847ee6a93 100644 --- a/dev-lang/R/R-4.1.2-r1.ebuild +++ b/dev-lang/R/R-4.1.2-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI=" LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm64 ~hppa ~ia64 sparc x86 ~amd64-linux ~x86-linux" IUSE="cairo doc icu java jpeg lapack lto minimal nls openmp perl png prefix profile readline test tiff tk X" REQUIRED_USE=" diff --git a/dev-lang/R/R-4.1.2.ebuild b/dev-lang/R/R-4.2.0.ebuild index a29cab314d2a..28e62a99b24d 100644 --- a/dev-lang/R/R-4.1.2.ebuild +++ b/dev-lang/R/R-4.2.0.ebuild @@ -41,6 +41,7 @@ DEPEND=" app-arch/xz-utils app-text/ghostscript-gpl dev-libs/libpcre2:= + >=dev-libs/tre-0.8.0_p20210321[approx] net-libs/libtirpc net-misc/curl virtual/blas @@ -107,6 +108,11 @@ src_prepare() { sed -e 's:\.\./manual/:manual/:g' \ -i $(grep -Flr ../manual/ doc) || die "sed for HTML links failed" + # Disable this test until it passes again, + # https://bugs.r-project.org/show_bug.cgi?id=18338 + sed -e 's/ reg-packages.R / /' \ + -i tests/Makefile.common || die + use lapack && \ export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)" @@ -142,8 +148,6 @@ src_prepare() { src_configure() { filter-ldflags -Wl,-Bdirect -Bdirect - # --with-system-tre \ - # tre is patched from upstream econf \ --enable-byte-compiled-packages \ --enable-R-shlib \ @@ -151,6 +155,7 @@ src_configure() { --disable-R-static-lib \ --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ rdocdir="${EPREFIX}/usr/share/doc/${PF}" \ + --with-system-tre \ $(use_enable java) \ $(use_enable lto lto R) \ $(use_enable nls) \ @@ -238,6 +243,9 @@ src_install() { for f in "${NOCOMPRESS_DOCS[@]}"; do docompress -x "/usr/share/doc/${PF}/${f}" done + + # Finally, an extra copy of this started showing up at some point... + rm "${ED}/usr/$(get_libdir)/R/COPYING" || die } pkg_postinst() { |