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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0238215800A for ; Fri, 4 Aug 2023 07:26:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4346D2BC016; Fri, 4 Aug 2023 07:26:04 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 24A782BC016 for ; Fri, 4 Aug 2023 07:26:04 +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 F2AC8335D0D for ; Fri, 4 Aug 2023 07:26:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 47CF1EC2 for ; Fri, 4 Aug 2023 07:26:01 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1691133955.4e1d7e84973a548a8040739984c4bd467d6f7838.flow@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: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 4e1d7e84973a548a8040739984c4bd467d6f7838 X-VCS-Branch: dev Date: Fri, 4 Aug 2023 07:26:01 +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: 6fd2253a-0aa0-4f3a-bdd8-c1482597b326 X-Archives-Hash: 43e321670cac6a1f6578c7111195ed63 commit: 4e1d7e84973a548a8040739984c4bd467d6f7838 Author: David Roman gmail com> AuthorDate: Thu Aug 3 07:32:41 2023 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Fri Aug 4 07:25:55 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4e1d7e84 R-packages.eclass: fix package installation Instead of creating a symlink R/site-library -> /usr/share/doc do it otherwise, linking /usr/share/doc -> R/site-library. This way if nodoc is enabled symlinks won't be broken. Signed-off-by: David Roman ifae.es> Closes: https://github.com/gentoo/guru/pull/102 Signed-off-by: Florian Schmaus gentoo.org> eclass/R-packages.eclass | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/eclass/R-packages.eclass b/eclass/R-packages.eclass index ed63cff46f..6dac19a161 100644 --- a/eclass/R-packages.eclass +++ b/eclass/R-packages.eclass @@ -68,9 +68,11 @@ _movelink() { local source=${1} local dest=${2} if [[ -e "${source}" ]]; then - local rp_source="$(realpath ${source} || die)" - mv "${rp_source}" "${dest}" || die - cp -rsf "${dest}" "${rp_source}" || die + local rdir=/usr/$(get_libdir)/R/site-library/${CRAN_PN} + local rp_source="${rdir}/${source}" + insinto ${rdir} + doins -r ${source} + ln -s "${rp_source}" "${dest}" || die fi } @@ -162,11 +164,7 @@ R-packages_src_install() { fi if [[ -e doc ]]; then - pushd doc || die - for i in *; do - _movelink "${i}" "${EDOCDIR}/${i}" - done - popd || die + _movelink doc "${EDOCDIR}"/doc fi rm -f LICENSE || die 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 CC50515801C for ; Fri, 4 Aug 2023 07:26:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B3832BC026; Fri, 4 Aug 2023 07:26:56 +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 F2EA22BC026 for ; Fri, 4 Aug 2023 07:26:55 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 117F0335D42 for ; Fri, 4 Aug 2023 07:26:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1A20BEF9 for ; Fri, 4 Aug 2023 07:26:52 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1691133955.4e1d7e84973a548a8040739984c4bd467d6f7838.flow@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: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 4e1d7e84973a548a8040739984c4bd467d6f7838 X-VCS-Branch: master Date: Fri, 4 Aug 2023 07:26:52 +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: 61454aee-a5e9-433e-a3d3-5920fe0b5747 X-Archives-Hash: 0ef89005cf8f4f8809ee1f01e3a488e3 Message-ID: <20230804072652.PAmjELQu0Lxhg5pWdsTT0PwU6tPFHe73yJlWLC-W7m4@z> commit: 4e1d7e84973a548a8040739984c4bd467d6f7838 Author: David Roman gmail com> AuthorDate: Thu Aug 3 07:32:41 2023 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Fri Aug 4 07:25:55 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4e1d7e84 R-packages.eclass: fix package installation Instead of creating a symlink R/site-library -> /usr/share/doc do it otherwise, linking /usr/share/doc -> R/site-library. This way if nodoc is enabled symlinks won't be broken. Signed-off-by: David Roman ifae.es> Closes: https://github.com/gentoo/guru/pull/102 Signed-off-by: Florian Schmaus gentoo.org> eclass/R-packages.eclass | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/eclass/R-packages.eclass b/eclass/R-packages.eclass index ed63cff46f..6dac19a161 100644 --- a/eclass/R-packages.eclass +++ b/eclass/R-packages.eclass @@ -68,9 +68,11 @@ _movelink() { local source=${1} local dest=${2} if [[ -e "${source}" ]]; then - local rp_source="$(realpath ${source} || die)" - mv "${rp_source}" "${dest}" || die - cp -rsf "${dest}" "${rp_source}" || die + local rdir=/usr/$(get_libdir)/R/site-library/${CRAN_PN} + local rp_source="${rdir}/${source}" + insinto ${rdir} + doins -r ${source} + ln -s "${rp_source}" "${dest}" || die fi } @@ -162,11 +164,7 @@ R-packages_src_install() { fi if [[ -e doc ]]; then - pushd doc || die - for i in *; do - _movelink "${i}" "${EDOCDIR}/${i}" - done - popd || die + _movelink doc "${EDOCDIR}"/doc fi rm -f LICENSE || die