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 233F3158093 for ; Tue, 14 Jun 2022 18:35:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44CB1E08BB; Tue, 14 Jun 2022 18:35:32 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2E9C9E08BB for ; Tue, 14 Jun 2022 18:35:31 +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 06062341315 for ; Tue, 14 Jun 2022 18:35:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 22A3B50A for ; Tue, 14 Jun 2022 18:35:28 +0000 (UTC) From: "Haelwenn Monnier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Haelwenn Monnier" Message-ID: <1655193625.0a8c734ce06415d1ace17665675de9c2fa0e33a9.lanodan@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: lanodan X-VCS-Committer-Name: Haelwenn Monnier X-VCS-Revision: 0a8c734ce06415d1ace17665675de9c2fa0e33a9 X-VCS-Branch: master Date: Tue, 14 Jun 2022 18:35:28 +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: 4a28af6f-fb84-4805-8ed9-c91a8b872a9e X-Archives-Hash: a561310cf8005b0c7869238bce142dfc commit: 0a8c734ce06415d1ace17665675de9c2fa0e33a9 Author: Alessandro Barbieri gmail com> AuthorDate: Tue Jun 14 01:14:48 2022 +0000 Commit: Haelwenn Monnier hacktivis me> CommitDate: Tue Jun 14 08:00:25 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0a8c734c R-packages.eclass: remove unneeded edo Signed-off-by: Alessandro Barbieri gmail.com> eclass/R-packages.eclass | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/eclass/R-packages.eclass b/eclass/R-packages.eclass index 4c4b16fd9..1aa612403 100644 --- a/eclass/R-packages.eclass +++ b/eclass/R-packages.eclass @@ -37,9 +37,9 @@ BDEPEND="sys-apps/pkgcore" # will contain symlinks to everything in _movelink() { if [[ -e "${1}" ]]; then - local rp1="$(edo realpath ${1})" - edo mv "${rp1}" "${2}" - edo cp -rsf "${2}" "${rp1}" + local rp1="$(realpath ${1} || die)" + mv "${rp1}" "${2}" || die + cp -rsf "${2}" "${rp1}" || die fi } @@ -49,7 +49,7 @@ _movelink() { R-packages_src_unpack() { unpack ${A} if [[ -d "${PN//_/.}" ]] && [[ ! -d "${P}" ]]; then - edo mv "${PN//_/.}" "${P}" + mv "${PN//_/.}" "${P}" || die fi } @@ -57,9 +57,9 @@ R-packages_src_unpack() { # @DESCRIPTION: # function to remove unwanted files from the sources R-packages_src_prepare() { - edo rm -f LICENSE + rm -f LICENSE || die default - edo mkdir -p "${T}/R" + mkdir -p "${T}/R" || die } # @FUNCTION: R-packages_src_configure @@ -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() { - edo pushd "${T}/R/${PN//_/.}" + pushd "${T}/R/${PN//_/.}" || die local DOCS_DIR="/usr/share/doc/${PF}" - edo mkdir -p "${ED}/${DOCS_DIR}" + mkdir -p "${ED}/${DOCS_DIR}" || die for i in NEWS.md README.md DESCRIPTION examples CITATION INDEX NEWS WORDLIST News.Rd ; do - edo _movelink "${i}" "${ED}${DOCS_DIR}/${i}" + _movelink "${i}" "${ED}${DOCS_DIR}/${i}" || die docompress -x "${DOCS_DIR}/${i}" done if [[ -e html ]]; then - edo _movelink html "${ED}${DOCS_DIR}/html" + _movelink html "${ED}${DOCS_DIR}/html" || die docompress -x "${DOCS_DIR}/html" fi if [[ -e doc ]]; then - edo pushd doc + pushd doc || die for i in * ; do - edo _movelink "${i}" "${ED}${DOCS_DIR}/${i}" + _movelink "${i}" "${ED}${DOCS_DIR}/${i}" || die docompress -x "${DOCS_DIR}/${i}" done - edo popd + popd || die fi if [[ -e doc/html ]]; then docompress -x "${DOCS_DIR}/html" fi docompress -x "${DOCS_DIR}" - edo rm -rf tests test + rm -rf tests test || die 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=$(edo pquery -n1 "${p}" 2>/dev/null) + pexist="$(pquery -n1 ${p} 2>/dev/null || die)" if [[ -n "${pexist}" ]]; then optfeature "having the upstream suggested package" "${p}" fi