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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E088713835A for ; Thu, 17 Jun 2021 16:01:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 124D4E085E; Thu, 17 Jun 2021 16:01:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E0446E085E for ; Thu, 17 Jun 2021 16:01:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D72C7335D50 for ; Thu, 17 Jun 2021 16:01:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 575707B1 for ; Thu, 17 Jun 2021 16:01:53 +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: <1623945711.dd9177aecb84a314b4f9b8c11f7988f5f90d8869.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: dd9177aecb84a314b4f9b8c11f7988f5f90d8869 X-VCS-Branch: dev Date: Thu, 17 Jun 2021 16:01:53 +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: 60c00535-7397-4892-83de-4787cd623389 X-Archives-Hash: fe4344c7170f7314812db6c010487f3e commit: dd9177aecb84a314b4f9b8c11f7988f5f90d8869 Author: Alessandro Barbieri gmail com> AuthorDate: Thu Jun 17 15:56:01 2021 +0000 Commit: Alessandro Barbieri gmail com> CommitDate: Thu Jun 17 16:01:51 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dd9177ae R-packages.eclass: quoting, more || die, docompress -x html Signed-off-by: Alessandro Barbieri gmail.com> eclass/R-packages.eclass | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/eclass/R-packages.eclass b/eclass/R-packages.eclass index 4afcde26f..5e1d6bccc 100644 --- a/eclass/R-packages.eclass +++ b/eclass/R-packages.eclass @@ -23,7 +23,7 @@ dodocrm() { R-packages_src_unpack() { unpack ${A} if [[ -d "${PN//_/.}" ]] && [[ ! -d "${P}" ]]; then - mv ${PN//_/.} "${P}" + mv "${PN//_/.}" "${P}" || die fi } @@ -34,26 +34,31 @@ R-packages_src_prepare() { R-packages_src_compile() { - MAKEFLAGS="CFLAGS=${CFLAGS// /\\ } CXXFLAGS=${CXXFLAGS// /\\ } FFLAGS=${FFLAGS// /\\ } FCFLAGS=${FCFLAGS// /\\ } LDFLAGS=${LDFLAGS// /\\ }" R CMD INSTALL . -l "${WORKDIR}" "--byte-compile" + MAKEFLAGS="CFLAGS=${CFLAGS// /\\ } CXXFLAGS=${CXXFLAGS// /\\ } FFLAGS=${FFLAGS// /\\ } FCFLAGS=${FCFLAGS// /\\ } LDFLAGS=${LDFLAGS// /\\ }" R CMD INSTALL . -l "${WORKDIR}" "--byte-compile" || die } R-packages_src_install() { - cd "${WORKDIR}"/${PN//_/.} || die + cd "${WORKDIR}/${PN//_/.}" || die dodocrm examples || die -# dodocrm DESCRIPTION || die #keep this + #dodocrm DESCRIPTION || die #keep this dodocrm NEWS.md || die dodocrm README.md || die dodocrm html || die - docinto "${DOCSDIR}/html" + if [ -e doc ]; then - ls doc/*.html &>/dev/null && dodoc -r doc/*.html - rm -rf doc/*.html || die + if [ -e doc/html ]; then + docinto "${DOCSDIR}/html" + dodoc -r doc/*.html + rm -r doc/*.html || die + docompress -x "${DOCSDIR}/html" + fi + docinto "${DOCSDIR}" dodoc -r doc/. - rm -rf doc + rm -r doc || die fi - insinto /usr/$(get_libdir)/R/site-library - doins -r "${WORKDIR}"/${PN//_/.} + insinto "/usr/$(get_libdir)/R/site-library" + doins -r "${WORKDIR}/${PN//_/.}" }