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 3C6E3158092 for ; Thu, 2 Jun 2022 01:23:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 25206E0788; Thu, 2 Jun 2022 01:23:35 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F0FD2E0788 for ; Thu, 2 Jun 2022 01:23:34 +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 CA52A340E2B for ; Thu, 2 Jun 2022 01:23:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ECAA3471 for ; Thu, 2 Jun 2022 01:23:31 +0000 (UTC) From: "Alessandro Barbieri" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alessandro Barbieri" Message-ID: <1654133009.f16ca432c7b1c33c7a30fe63ffc162b7f7e6fd0d.Alessandro-Barbieri@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: Alessandro-Barbieri X-VCS-Committer-Name: Alessandro Barbieri X-VCS-Revision: f16ca432c7b1c33c7a30fe63ffc162b7f7e6fd0d X-VCS-Branch: dev Date: Thu, 2 Jun 2022 01:23:31 +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: 85acff97-9955-4650-8c48-89f9d9e77b5c X-Archives-Hash: 3d6299644c09abd933589fe9d0f6b164 commit: f16ca432c7b1c33c7a30fe63ffc162b7f7e6fd0d Author: Alessandro Barbieri gmail com> AuthorDate: Tue May 31 17:52:57 2022 +0000 Commit: Alessandro Barbieri gmail com> CommitDate: Thu Jun 2 01:23:29 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f16ca432 R-packages.eclass: use edo for all the commands Signed-off-by: Alessandro Barbieri gmail.com> eclass/R-packages.eclass | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/eclass/R-packages.eclass b/eclass/R-packages.eclass index 0be59a20c..4c4b16fd9 100644 --- a/eclass/R-packages.eclass +++ b/eclass/R-packages.eclass @@ -12,7 +12,7 @@ # Alessandro Barbieri # @SUPPORTED_EAPIS: 7 -inherit eutils optfeature toolchain-funcs +inherit edo eutils optfeature toolchain-funcs case ${EAPI} in 7) ;; @@ -37,9 +37,9 @@ BDEPEND="sys-apps/pkgcore" # will contain symlinks to everything in _movelink() { if [[ -e "${1}" ]]; then - local rp1="$(realpath ${1})" || die - mv "${rp1}" "${2}" || die - cp -rsf "${2}" "${rp1}" || die + local rp1="$(edo realpath ${1})" + edo mv "${rp1}" "${2}" + edo cp -rsf "${2}" "${rp1}" fi } @@ -49,7 +49,7 @@ _movelink() { R-packages_src_unpack() { unpack ${A} if [[ -d "${PN//_/.}" ]] && [[ ! -d "${P}" ]]; then - mv "${PN//_/.}" "${P}" || die + edo mv "${PN//_/.}" "${P}" fi } @@ -57,9 +57,9 @@ R-packages_src_unpack() { # @DESCRIPTION: # function to remove unwanted files from the sources R-packages_src_prepare() { - rm -f LICENSE || die + edo rm -f LICENSE default - mkdir -p "${T}/R" || die + edo mkdir -p "${T}/R" } # @FUNCTION: R-packages_src_configure @@ -89,7 +89,7 @@ R-packages_src_compile() { LDFLAGS=${LDFLAGS// /\\ } \ MAKEOPTS=${MAKEOPTS// /\\ } \ " \ - R CMD INSTALL . -d -l "${T}/R" "--byte-compile" || die + edo R CMD INSTALL . -d -l "${T}/R" "--byte-compile" } @@ -99,35 +99,35 @@ R-packages_src_compile() { # documentation and examples to docsdir, symlinked back to R site-library (to allow access from within R) # everything else to R site-library R-packages_src_install() { - pushd "${T}/R/${PN//_/.}" || die + edo pushd "${T}/R/${PN//_/.}" local DOCS_DIR="/usr/share/doc/${PF}" - mkdir -p "${ED}/${DOCS_DIR}" || die + edo mkdir -p "${ED}/${DOCS_DIR}" for i in NEWS.md README.md DESCRIPTION examples CITATION INDEX NEWS WORDLIST News.Rd ; do - _movelink "${i}" "${ED}${DOCS_DIR}/${i}" || die + edo _movelink "${i}" "${ED}${DOCS_DIR}/${i}" docompress -x "${DOCS_DIR}/${i}" done if [[ -e html ]]; then - _movelink html "${ED}${DOCS_DIR}/html" || die + edo _movelink html "${ED}${DOCS_DIR}/html" docompress -x "${DOCS_DIR}/html" fi if [[ -e doc ]]; then - pushd doc || die + edo pushd doc for i in * ; do - _movelink "${i}" "${ED}${DOCS_DIR}/${i}" || die + edo _movelink "${i}" "${ED}${DOCS_DIR}/${i}" docompress -x "${DOCS_DIR}/${i}" done - popd || die + edo popd fi if [[ -e doc/html ]]; then docompress -x "${DOCS_DIR}/html" fi docompress -x "${DOCS_DIR}" - rm -rf tests test || die + edo rm -rf tests test insinto "/usr/$(get_libdir)/R/site-library" doins -r "${T}/R/${PN//_/.}" @@ -139,7 +139,7 @@ R-packages_src_install() { R-packages_pkg_postinst() { if [[ -v SUGGESTED_PACKAGES ]]; then for p in ${SUGGESTED_PACKAGES} ; do - pexist=$(pquery -n1 "${p}" 2>/dev/null) || die + pexist=$(edo pquery -n1 "${p}" 2>/dev/null) if [[ -n "${pexist}" ]]; then optfeature "having the upstream suggested package" "${p}" fi