From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 BD731158041 for ; Sun, 31 Mar 2024 17:57:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B2FA5E2A4B; Sun, 31 Mar 2024 17:57:52 +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 87DC2E2A48 for ; Sun, 31 Mar 2024 17:57:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8ABFB3430AD for ; Sun, 31 Mar 2024 17:57:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D46671581 for ; Sun, 31 Mar 2024 17:57:49 +0000 (UTC) From: "Julien Roy" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Julien Roy" Message-ID: <1711906139.8ea094892a543b86385d94d205acfb5d37db0c93.julien@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: eclass/ X-VCS-Repository: repo/proj/guru X-VCS-Files: eclass/R-packages.eclass X-VCS-Directories: eclass/ X-VCS-Committer: julien X-VCS-Committer-Name: Julien Roy X-VCS-Revision: 8ea094892a543b86385d94d205acfb5d37db0c93 X-VCS-Branch: master Date: Sun, 31 Mar 2024 17:57:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d8c965b6-51df-4175-99bb-df5da1ab4c1d X-Archives-Hash: 89d198d17c418627e962a64fbc16e360 commit: 8ea094892a543b86385d94d205acfb5d37db0c93 Author: Julien Roy jroy ca> AuthorDate: Sun Mar 31 17:28:59 2024 +0000 Commit: Julien Roy jroy ca> CommitDate: Sun Mar 31 17:28:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8ea09489 R-packages.eclass: drop not inherited eclass Signed-off-by: Julien Roy jroy.ca> eclass/R-packages.eclass | 184 ----------------------------------------------- 1 file changed, 184 deletions(-) diff --git a/eclass/R-packages.eclass b/eclass/R-packages.eclass deleted file mode 100644 index a701c96178..0000000000 --- a/eclass/R-packages.eclass +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# @ECLASS: R-packages.eclass -# @AUTHOR: -# Alessandro Barbieri -# André Erdmann -# Benda Xu -# Denis Dupeyron -# Robert Greener -# @BLURB: eclass to build R packages -# @MAINTAINER: -# Alessandro Barbieri -# @SUPPORTED_EAPIS: 7 8 - -case ${EAPI} in - 7|8) ;; - *) die "${ECLASS}: EAPI ${EAPI} unsupported." -esac - -if [ ! ${_R_PACKAGES_ECLASS} ]; then - -inherit edo optfeature toolchain-funcs - -# @ECLASS_VARIABLE: SUGGESTED_PACKAGES -# @DEPRECATED: none -# @DEFAULT_UNSET -# @DESCRIPTION: -# String variable containing the list of upstream suggested packages. Consider -# using optfeature directly instead for more concise descriptions. - -# @ECLASS_VARIABLE: CRAN_SNAPSHOT_DATE -# @DEFAULT_UNSET -# @DESCRIPTION: -# The date the ebuild was updated in YYYY-MM-DD format used to fetch distfiles -# from Microsoft CRAN mirror. This will be required in the future. - -# @ECLASS_VARIABLE: CRAN_PN -# @DESCRIPTION: -# Package name to use for fetching distfiles from CRAN. -: ${CRAN_PN:=${PN//_/.}} - -# @ECLASS_VARIABLE: CRAN_PV -# @DESCRIPTION: -# Package version to use for fetching distfiles from CRAN. -: ${CRAN_PV:=${PV}} - -if [[ ${CRAN_SNAPSHOT_DATE} ]]; then - SRC_URI="https://cran.microsoft.com/snapshot/${CRAN_SNAPSHOT_DATE}" -else - SRC_URI="mirror://cran" -fi -SRC_URI+="/src/contrib/${CRAN_PN}_${CRAN_PV}.tar.gz" - -HOMEPAGE="https://cran.r-project.org/package=${CRAN_PN}" - -SLOT="0" - -DEPEND="dev-lang/R" -RDEPEND="${DEPEND}" - -# @FUNCTION: R-packages_src_unpack -# @DEPRECATED: none -# @DESCRIPTION: -# Unpack R packages into the right folder. Consider setting ${S} to appropriate -# value instead. -R-packages_src_unpack() { - default_src_unpack - - if [[ -d "${CRAN_PN}" ]] && [[ ! -d "${P}" ]]; then - mv "${CRAN_PN}" "${P}" || die - fi -} - -# @FUNCTION: R-packages_src_prepare -# @DEPRECATED: none -# @DESCRIPTION: -# Remove unwanted files from the sources. -R-packages_src_prepare() { - default_src_prepare - eqawarn "This ebuild uses R-packages_src_prepare which is no-op." - eqawarn "You can safely remove it." -} - -# @FUNCTION: R-packages_src_configure -# @DESCRIPTION: -# Set up temporary directories. -R-packages_src_configure() { - mkdir "${T}"/R || die -} - -# @FUNCTION: R-packages_src_compile -# @DESCRIPTION: -# Pass build-related environment variables to R and then build/install the -# package. -R-packages_src_compile() { - local -a mymakeflags=( - "${MAKEFLAGS}" - AR="$(tc-getAR)" - CC="$(tc-getCC)" - CPP="$(tc-getCPP)" - CXX="$(tc-getCXX)" - FC="$(tc-getFC)" - LD="$(tc-getLD)" - NM="$(tc-getNM)" - RANLIB="$(tc-getRANLIB)" - CFLAGS="${CFLAGS}" - CPPFLAGS="${CPPFLAGS}" - CXXFLAGS="${CXXFLAGS}" - FFLAGS="${FFLAGS}" - FCFLAGS="${FCFLAGS}" - LDFLAGS="${LDFLAGS}" - MAKEOPTS="${MAKEOPTS}" - ) - - MAKEFLAGS="${mymakeflags[@]// /\\ }" \ - edo R CMD INSTALL . -d -l "${T}"/R --byte-compile -} - -# @FUNCTION: R-packages_src_install -# @DESCRIPTION: -# Move files into right folders. -# -# Documentation and examples is moved to docdir, symlinked back to R -# site-library (to allow access from within R). -# -# Everything else is moved to the R site-library. -R-packages_src_install() { - cd "${T}"/R/${CRAN_PN} || die - - local DOCDIR="/usr/share/doc/${PF}" - local EDOCDIR="${ED}${DOCDIR}" - mkdir -p "${EDOCDIR}" || die - - # _maybe_movelink - # If target exists, installs everything under target into R's - # site-library for the package and creates a link with the name - # to it. - _maybe_movelink() { - local target=${1} - local link_name=${2} - if [[ ! -e "${target}" ]]; then - return - fi - - local rdir=/usr/$(get_libdir)/R/site-library/${CRAN_PN} - local rp_source="${rdir}/${target}" - insinto ${rdir} - doins -r ${target} - ln -s "${rp_source}" "${link_name}" || die - } - - for i in {NEWS,README}.md DESCRIPTION CITATION INDEX NEWS WORDLIST News.Rd; do - _maybe_movelink "${i}" "${EDOCDIR}/${i}" - done - - _maybe_movelink html "${EDOCDIR}"/html - - _maybe_movelink examples "${EDOCDIR}"/examples - - _maybe_movelink doc "${EDOCDIR}"/doc - - rm -f LICENSE || die - rm -rf tests test || die - - insinto /usr/$(get_libdir)/R/site-library - doins -r "${T}"/R/${CRAN_PN} -} - -# @FUNCTION: R-packages_pkg_postinst -# @DEPRECATED: optfeature -# @DESCRIPTION: -# Prompt to install the upstream suggested packages (if they exist). Consider -# calling "optfeature" directly instead for concise descriptions. -R-packages_pkg_postinst() { - for p in ${SUGGESTED_PACKAGES}; do - optfeature "having the upstream suggested package" "${p}" - done -} - -_R_PACKAGES_ECLASS=1 -fi - -EXPORT_FUNCTIONS src_unpack src_configure src_compile src_install pkg_postinst From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 16F63158041 for ; Sun, 31 Mar 2024 17:49:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DD92CE2AAE; Sun, 31 Mar 2024 17:49:31 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 B8B9DE2AAE for ; Sun, 31 Mar 2024 17:49:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E235E343009 for ; Sun, 31 Mar 2024 17:49:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0609E1581 for ; Sun, 31 Mar 2024 17:49:29 +0000 (UTC) From: "Julien Roy" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Julien Roy" Message-ID: <1711906139.8ea094892a543b86385d94d205acfb5d37db0c93.julien@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: eclass/ X-VCS-Repository: repo/proj/guru X-VCS-Files: eclass/R-packages.eclass X-VCS-Directories: eclass/ X-VCS-Committer: julien X-VCS-Committer-Name: Julien Roy X-VCS-Revision: 8ea094892a543b86385d94d205acfb5d37db0c93 X-VCS-Branch: dev Date: Sun, 31 Mar 2024 17:49:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5db1afba-0787-43f0-bf3e-6288dfdb6eff X-Archives-Hash: 9fecec2d3ea8c95656d5644d57d6d323 Message-ID: <20240331174929.i_iju79KUglGrkyaU2AkyPZSDXl-W0yWSKqvNrFNkS0@z> commit: 8ea094892a543b86385d94d205acfb5d37db0c93 Author: Julien Roy jroy ca> AuthorDate: Sun Mar 31 17:28:59 2024 +0000 Commit: Julien Roy jroy ca> CommitDate: Sun Mar 31 17:28:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8ea09489 R-packages.eclass: drop not inherited eclass Signed-off-by: Julien Roy jroy.ca> eclass/R-packages.eclass | 184 ----------------------------------------------- 1 file changed, 184 deletions(-) diff --git a/eclass/R-packages.eclass b/eclass/R-packages.eclass deleted file mode 100644 index a701c96178..0000000000 --- a/eclass/R-packages.eclass +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# @ECLASS: R-packages.eclass -# @AUTHOR: -# Alessandro Barbieri -# André Erdmann -# Benda Xu -# Denis Dupeyron -# Robert Greener -# @BLURB: eclass to build R packages -# @MAINTAINER: -# Alessandro Barbieri -# @SUPPORTED_EAPIS: 7 8 - -case ${EAPI} in - 7|8) ;; - *) die "${ECLASS}: EAPI ${EAPI} unsupported." -esac - -if [ ! ${_R_PACKAGES_ECLASS} ]; then - -inherit edo optfeature toolchain-funcs - -# @ECLASS_VARIABLE: SUGGESTED_PACKAGES -# @DEPRECATED: none -# @DEFAULT_UNSET -# @DESCRIPTION: -# String variable containing the list of upstream suggested packages. Consider -# using optfeature directly instead for more concise descriptions. - -# @ECLASS_VARIABLE: CRAN_SNAPSHOT_DATE -# @DEFAULT_UNSET -# @DESCRIPTION: -# The date the ebuild was updated in YYYY-MM-DD format used to fetch distfiles -# from Microsoft CRAN mirror. This will be required in the future. - -# @ECLASS_VARIABLE: CRAN_PN -# @DESCRIPTION: -# Package name to use for fetching distfiles from CRAN. -: ${CRAN_PN:=${PN//_/.}} - -# @ECLASS_VARIABLE: CRAN_PV -# @DESCRIPTION: -# Package version to use for fetching distfiles from CRAN. -: ${CRAN_PV:=${PV}} - -if [[ ${CRAN_SNAPSHOT_DATE} ]]; then - SRC_URI="https://cran.microsoft.com/snapshot/${CRAN_SNAPSHOT_DATE}" -else - SRC_URI="mirror://cran" -fi -SRC_URI+="/src/contrib/${CRAN_PN}_${CRAN_PV}.tar.gz" - -HOMEPAGE="https://cran.r-project.org/package=${CRAN_PN}" - -SLOT="0" - -DEPEND="dev-lang/R" -RDEPEND="${DEPEND}" - -# @FUNCTION: R-packages_src_unpack -# @DEPRECATED: none -# @DESCRIPTION: -# Unpack R packages into the right folder. Consider setting ${S} to appropriate -# value instead. -R-packages_src_unpack() { - default_src_unpack - - if [[ -d "${CRAN_PN}" ]] && [[ ! -d "${P}" ]]; then - mv "${CRAN_PN}" "${P}" || die - fi -} - -# @FUNCTION: R-packages_src_prepare -# @DEPRECATED: none -# @DESCRIPTION: -# Remove unwanted files from the sources. -R-packages_src_prepare() { - default_src_prepare - eqawarn "This ebuild uses R-packages_src_prepare which is no-op." - eqawarn "You can safely remove it." -} - -# @FUNCTION: R-packages_src_configure -# @DESCRIPTION: -# Set up temporary directories. -R-packages_src_configure() { - mkdir "${T}"/R || die -} - -# @FUNCTION: R-packages_src_compile -# @DESCRIPTION: -# Pass build-related environment variables to R and then build/install the -# package. -R-packages_src_compile() { - local -a mymakeflags=( - "${MAKEFLAGS}" - AR="$(tc-getAR)" - CC="$(tc-getCC)" - CPP="$(tc-getCPP)" - CXX="$(tc-getCXX)" - FC="$(tc-getFC)" - LD="$(tc-getLD)" - NM="$(tc-getNM)" - RANLIB="$(tc-getRANLIB)" - CFLAGS="${CFLAGS}" - CPPFLAGS="${CPPFLAGS}" - CXXFLAGS="${CXXFLAGS}" - FFLAGS="${FFLAGS}" - FCFLAGS="${FCFLAGS}" - LDFLAGS="${LDFLAGS}" - MAKEOPTS="${MAKEOPTS}" - ) - - MAKEFLAGS="${mymakeflags[@]// /\\ }" \ - edo R CMD INSTALL . -d -l "${T}"/R --byte-compile -} - -# @FUNCTION: R-packages_src_install -# @DESCRIPTION: -# Move files into right folders. -# -# Documentation and examples is moved to docdir, symlinked back to R -# site-library (to allow access from within R). -# -# Everything else is moved to the R site-library. -R-packages_src_install() { - cd "${T}"/R/${CRAN_PN} || die - - local DOCDIR="/usr/share/doc/${PF}" - local EDOCDIR="${ED}${DOCDIR}" - mkdir -p "${EDOCDIR}" || die - - # _maybe_movelink - # If target exists, installs everything under target into R's - # site-library for the package and creates a link with the name - # to it. - _maybe_movelink() { - local target=${1} - local link_name=${2} - if [[ ! -e "${target}" ]]; then - return - fi - - local rdir=/usr/$(get_libdir)/R/site-library/${CRAN_PN} - local rp_source="${rdir}/${target}" - insinto ${rdir} - doins -r ${target} - ln -s "${rp_source}" "${link_name}" || die - } - - for i in {NEWS,README}.md DESCRIPTION CITATION INDEX NEWS WORDLIST News.Rd; do - _maybe_movelink "${i}" "${EDOCDIR}/${i}" - done - - _maybe_movelink html "${EDOCDIR}"/html - - _maybe_movelink examples "${EDOCDIR}"/examples - - _maybe_movelink doc "${EDOCDIR}"/doc - - rm -f LICENSE || die - rm -rf tests test || die - - insinto /usr/$(get_libdir)/R/site-library - doins -r "${T}"/R/${CRAN_PN} -} - -# @FUNCTION: R-packages_pkg_postinst -# @DEPRECATED: optfeature -# @DESCRIPTION: -# Prompt to install the upstream suggested packages (if they exist). Consider -# calling "optfeature" directly instead for concise descriptions. -R-packages_pkg_postinst() { - for p in ${SUGGESTED_PACKAGES}; do - optfeature "having the upstream suggested package" "${p}" - done -} - -_R_PACKAGES_ECLASS=1 -fi - -EXPORT_FUNCTIONS src_unpack src_configure src_compile src_install pkg_postinst