From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1432685-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 77D54158094 for <garchives@archives.gentoo.org>; Thu, 1 Sep 2022 09:19:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E029E09DB; Thu, 1 Sep 2022 09:19:49 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0E841E09DB for <gentoo-commits@lists.gentoo.org>; Thu, 1 Sep 2022 09:19:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 17C90340F04 for <gentoo-commits@lists.gentoo.org>; Thu, 1 Sep 2022 09:19:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7654F58B for <gentoo-commits@lists.gentoo.org>; Thu, 1 Sep 2022 09:19:46 +0000 (UTC) From: "David Seifert" <soap@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" <soap@gentoo.org> Message-ID: <1662023974.7e99df1dab52b8b73ee252e80f5effaa630414c7.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/R/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/R/Manifest dev-lang/R/R-4.2.0.ebuild X-VCS-Directories: dev-lang/R/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 7e99df1dab52b8b73ee252e80f5effaa630414c7 X-VCS-Branch: master Date: Thu, 1 Sep 2022 09:19:46 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 40dad0d2-088d-46bb-9d83-7e9ec5d1df3b X-Archives-Hash: 55bf7dbc072068753cc6dd0f34a8dac5 commit: 7e99df1dab52b8b73ee252e80f5effaa630414c7 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Thu Sep 1 09:19:34 2022 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Thu Sep 1 09:19:34 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e99df1d dev-lang/R: drop 4.2.0 Signed-off-by: David Seifert <soap <AT> gentoo.org> dev-lang/R/Manifest | 1 - dev-lang/R/R-4.2.0.ebuild | 256 ---------------------------------------------- 2 files changed, 257 deletions(-) diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest index 22bcd1fa7d38..8895d614d77a 100644 --- a/dev-lang/R/Manifest +++ b/dev-lang/R/Manifest @@ -1,3 +1,2 @@ -DIST R-4.2.0.tar.gz 37585694 BLAKE2B 5ba4d3b9397e92b72af729d88ff562655e0dd7c547bd371638aa76d4f1701f4f8a7911d500cf4f10d87b62457f8f8ce7a946d893477ceb7268b06bd59bc10f3d SHA512 99e71dad00b63e44bfcb8dc9539ff1951809112882d9ee7e06a4e99bce2e6ceac24e8348fd598c21e6d5ab0e0629a85170cde208bfa8145af91c398ac4ef7bcd DIST R-4.2.1.tar.gz 37601544 BLAKE2B b898262a05c92e125c36a661a89be34b1698177832002f7aa21ccfcf0b30a06481e2154eea9e77a94b1ad8ca35c7bc4aead2be99b862dca7450acee1bec6a99f SHA512 c1baf46d22304c425dde79301183f80f99f2752300137b0b6f902c3e55e2419d5e9185c97de6e3c840a38f6345a6c334aa24161656d4a7f6fa01570390f1122f DIST R-78d6830e28ea90a046da79a9b4f70c39594bb6d6.bash_completion 13596 BLAKE2B 53338e4a1c4f68beb69247216e553dbcac47f660fbf032bfebf7a660e32d2cff5b11ed35411c52de7e1fd6e00bbf5b5ea19369a325fa0a38bd93d63dc3288cbd SHA512 9ccd19bb1b0c18a2f13035ccd6809447429e197e298fb4d1df808ef345d723b42f75a1b91c349f6dbb46e4a82e59ef33e11300c495d79b63d670d0c0f2b16a06 diff --git a/dev-lang/R/R-4.2.0.ebuild b/dev-lang/R/R-4.2.0.ebuild deleted file mode 100644 index cf1c175b7af2..000000000000 --- a/dev-lang/R/R-4.2.0.ebuild +++ /dev/null @@ -1,256 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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 test tiff tk X" - -REQUIRED_USE=" - png? ( || ( cairo X ) ) - jpeg? ( || ( cairo X ) ) - tiff? ( || ( cairo X ) )" -RESTRICT=" - minimal? ( test ) - !test? ( test )" - -# 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 - 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 - sys-libs/zlib[minizip] - || ( - sys-apps/coreutils - app-misc/realpath - ) - cairo? ( - x11-libs/cairo:=[X=] - x11-libs/pango:= - ) - icu? ( dev-libs/icu:= ) - jpeg? ( media-libs/libjpeg-turbo:= ) - lapack? ( virtual/lapack ) - perl? ( dev-lang/perl ) - png? ( media-libs/libpng:= ) - readline? ( sys-libs/readline:= ) - tiff? ( media-libs/tiff:= ) - tk? ( dev-lang/tk:= ) - X? ( - x11-libs/libXmu - x11-libs/libXt - x11-misc/xdg-utils - )" -RDEPEND="${DEPEND} - java? ( >=virtual/jre-1.8:* )" - -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 - tc-check-openmp - FORTRAN_NEED_OPENMP=1 - fi - - fortran-2_pkg_setup - - # 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='\"${EPREFIX}/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" - - # 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)" - - 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 (macOS) - 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 ${EPREFIX}/usr/$(get_libdir)/libRmath.dylib:" \ - -i src/nmath/standalone/Makefile.in || die - else - append-ldflags -Wl,-rpath="${EPREFIX}/usr/$(get_libdir)/R/lib" - fi - fi - - AT_M4DIR=m4 eautoreconf -} - -src_configure() { - filter-ldflags -Wl,-Bdirect -Bdirect - - econf \ - --enable-byte-compiled-packages \ - --enable-R-shlib \ - --disable-R-framework \ - --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) \ - $(use_enable openmp) \ - $(use_enable profile R-profiling) \ - $(use_enable profile memory-profiling) \ - $(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 "${ESYSROOT}"/usr/$(get_libdir)/tkConfig.sh) \ - $(use_with tk tcl-config "${ESYSROOT}"/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 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 - - newenvd - 99R <<-_EOF_ - LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/lib - R_HOME=${EPREFIX}/usr/$(get_libdir)/${PN} - _EOF_ - - 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 || die - for mod in $(find . -name "*.dylib") ; do - mod=${mod#./} - install_name_tool -id "${EPREFIX}/usr/$(get_libdir)/R/${mod}" \ - "${mod}" - done - popd >/dev/null || die - 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. - local 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. - local INTERACTIVE_DATA=( - BioC_mirrors.csv - CRAN_mirrors.csv - KEYWORDS.db - NEWS.rds - ) - - local f NOCOMPRESS_DOCS=( "${INTERACTIVE_DOCS[@]}" "${INTERACTIVE_DATA[@]}" ) - - 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() { - if use java; then - einfo "Re-initializing java paths for ${P}" - R CMD javareconf - fi -}