From: "Florian Schmaus" <flow@gentoo.org> To: gentoo-commits@lists.gentoo.org Subject: [gentoo-commits] repo/proj/guru:dev commit in: eclass/ Date: Fri, 4 Aug 2023 07:26:01 +0000 (UTC) [thread overview] Message-ID: <1691133955.4e1d7e84973a548a8040739984c4bd467d6f7838.flow@gentoo> (raw) commit: 4e1d7e84973a548a8040739984c4bd467d6f7838 Author: David Roman <davidroman96 <AT> gmail <DOT> com> AuthorDate: Thu Aug 3 07:32:41 2023 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> 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 <droman <AT> ifae.es> Closes: https://github.com/gentoo/guru/pull/102 Signed-off-by: Florian Schmaus <flow <AT> 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
WARNING: multiple messages have this Message-ID (diff)
From: "Florian Schmaus" <flow@gentoo.org> To: gentoo-commits@lists.gentoo.org Subject: [gentoo-commits] repo/proj/guru:master commit in: eclass/ Date: Fri, 4 Aug 2023 07:26:52 +0000 (UTC) [thread overview] Message-ID: <1691133955.4e1d7e84973a548a8040739984c4bd467d6f7838.flow@gentoo> (raw) Message-ID: <20230804072652.PAmjELQu0Lxhg5pWdsTT0PwU6tPFHe73yJlWLC-W7m4@z> (raw) commit: 4e1d7e84973a548a8040739984c4bd467d6f7838 Author: David Roman <davidroman96 <AT> gmail <DOT> com> AuthorDate: Thu Aug 3 07:32:41 2023 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> 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 <droman <AT> ifae.es> Closes: https://github.com/gentoo/guru/pull/102 Signed-off-by: Florian Schmaus <flow <AT> 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
next reply other threads:[~2023-08-04 7:26 UTC|newest] Thread overview: 178+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-08-04 7:26 Florian Schmaus [this message] 2023-08-04 7:26 ` [gentoo-commits] repo/proj/guru:master commit in: eclass/ Florian Schmaus -- strict thread matches above, loose matches on Subject: below -- 2024-10-18 14:25 [gentoo-commits] repo/proj/guru:dev " Anna Vyalkova 2024-07-14 17:47 Florian Schmaus 2024-07-14 7:27 Anna Vyalkova 2024-07-14 7:27 Anna Vyalkova 2024-07-14 7:27 Anna Vyalkova 2024-07-14 7:27 Anna Vyalkova 2024-07-14 7:27 Anna Vyalkova 2024-07-14 7:27 Anna Vyalkova 2024-07-14 7:27 Anna Vyalkova 2024-07-01 2:10 Anna Vyalkova 2024-04-27 9:50 Anna Vyalkova 2024-04-01 11:32 [gentoo-commits] repo/proj/guru:master " Julien Roy 2024-04-01 11:18 ` [gentoo-commits] repo/proj/guru:dev " Julien Roy 2024-03-31 17:57 [gentoo-commits] repo/proj/guru:master " Julien Roy 2024-03-31 17:49 ` [gentoo-commits] repo/proj/guru:dev " Julien Roy 2024-03-31 17:49 Julien Roy 2024-02-04 19:32 Anna Vyalkova 2024-02-04 19:32 Anna Vyalkova 2024-02-04 19:26 Anna Vyalkova 2024-02-04 19:26 Anna Vyalkova 2024-01-22 17:52 Anna Vyalkova 2024-01-22 10:54 Anna Vyalkova 2024-01-21 22:50 Anna Vyalkova 2024-01-20 7:12 Anna Vyalkova 2024-01-01 21:27 Anna Vyalkova 2023-10-05 13:10 David Roman 2023-10-04 20:53 Anna Figueiredo Gomes 2023-08-30 5:30 Viorel Munteanu 2023-08-07 5:59 Haelwenn Monnier 2023-08-06 12:22 Haelwenn Monnier 2023-08-04 7:26 Florian Schmaus 2023-07-17 14:24 [gentoo-commits] repo/proj/guru:master " Florian Schmaus 2023-07-17 14:24 ` [gentoo-commits] repo/proj/guru:dev " Florian Schmaus 2023-06-24 19:22 Haelwenn Monnier 2023-05-21 16:27 Anna Vyalkova 2023-05-21 16:27 Anna Vyalkova 2023-05-09 19:30 Anna Vyalkova 2023-05-09 15:43 Anna Vyalkova 2023-05-09 15:43 Anna Vyalkova 2023-05-09 15:43 Anna Vyalkova 2023-05-09 15:43 Anna Vyalkova 2023-05-08 16:45 Anna Vyalkova 2023-05-06 18:00 Anna Vyalkova 2023-05-06 17:52 Anna Vyalkova 2023-05-06 15:55 Anna Vyalkova 2023-04-12 18:44 Jonas Frei 2023-04-06 14:09 Anna Vyalkova 2023-04-06 14:09 Anna Vyalkova 2023-03-31 18:48 Anna Vyalkova 2023-03-31 18:48 Anna Vyalkova 2023-03-31 18:14 Jonas Frei 2023-02-27 3:42 Anna Vyalkova 2023-02-27 3:42 Anna Vyalkova 2023-01-15 15:14 Anna Figueiredo Gomes 2023-01-08 2:17 Anna Vyalkova 2022-12-08 17:02 Anna Figueiredo Gomes 2022-11-26 13:51 Anna Vyalkova 2022-11-26 13:51 Anna Vyalkova 2022-11-26 13:51 Anna Vyalkova 2022-11-26 13:51 Anna Vyalkova 2022-11-25 17:54 Anna Vyalkova 2022-11-25 11:37 Anna Vyalkova 2022-11-25 11:37 Anna Vyalkova 2022-11-25 11:37 Anna Vyalkova 2022-11-25 11:37 Anna Vyalkova 2022-11-25 11:37 Anna Vyalkova 2022-11-25 11:37 Anna Vyalkova 2022-11-25 11:37 Anna Vyalkova 2022-11-25 11:37 Anna Vyalkova 2022-11-25 2:44 Anna Figueiredo Gomes 2022-11-25 2:38 Anna Figueiredo Gomes 2022-11-16 15:09 Anna Vyalkova 2022-11-16 14:30 Anna Vyalkova 2022-11-16 14:30 Anna Vyalkova 2022-11-10 0:50 Anna Figueiredo Gomes 2022-11-09 9:25 Anna Vyalkova 2022-11-08 19:20 Anna Vyalkova 2022-11-08 17:55 Anna Vyalkova 2022-11-08 17:55 Anna Vyalkova 2022-11-05 14:41 Anna Vyalkova 2022-07-20 9:33 Anna Vyalkova 2022-07-19 6:33 Anna Vyalkova 2022-07-19 6:07 Anna Vyalkova 2022-07-19 6:07 Anna Vyalkova 2022-07-16 21:08 Anna Vyalkova 2022-07-16 13:44 Anna Vyalkova 2022-07-16 13:44 Anna Vyalkova 2022-07-16 13:44 Anna Vyalkova 2022-07-16 13:44 Anna Vyalkova 2022-07-16 13:44 Anna Vyalkova 2022-07-16 13:44 Anna Vyalkova 2022-07-13 2:31 Anna Vyalkova 2022-07-13 2:31 Anna Vyalkova 2022-07-13 2:31 Anna Vyalkova 2022-07-13 2:31 Anna Vyalkova 2022-07-13 2:31 Anna Vyalkova 2022-07-13 2:31 Anna Vyalkova 2022-07-13 2:31 Anna Vyalkova 2022-07-13 2:31 Anna Vyalkova 2022-07-13 2:31 Anna Vyalkova 2022-07-13 2:31 Anna Vyalkova 2022-07-13 2:31 Anna Vyalkova 2022-07-12 12:06 Robert Greener 2022-07-12 12:06 Robert Greener 2022-07-12 12:06 Robert Greener 2022-07-12 12:06 Robert Greener 2022-07-10 3:36 Anna Vyalkova 2022-07-05 20:09 Anna Vyalkova 2022-07-05 20:09 Anna Vyalkova 2022-07-05 20:09 Anna Vyalkova 2022-06-30 6:01 Anna Vyalkova 2022-06-30 6:01 Anna Vyalkova 2022-06-30 6:01 Anna Vyalkova 2022-06-29 11:52 Anna Vyalkova 2022-06-29 11:52 Anna Vyalkova 2022-06-26 2:36 Alessandro Barbieri 2022-06-25 19:42 Anna Vyalkova 2022-06-25 17:43 Anna Vyalkova 2022-06-25 17:43 Anna Vyalkova 2022-06-15 22:41 Alessandro Barbieri 2022-06-14 9:12 Alessandro Barbieri 2022-06-14 8:00 Alessandro Barbieri 2022-06-14 8:00 Alessandro Barbieri 2022-06-07 6:26 Anna Vyalkova 2022-06-02 1:23 Alessandro Barbieri 2022-06-02 1:23 Alessandro Barbieri 2022-05-31 13:14 Nicola Smaniotto 2022-05-28 21:19 Alessandro Barbieri 2022-05-11 11:29 Alessandro Barbieri 2022-05-08 1:58 Alessandro Barbieri 2022-05-07 7:25 Alessandro Barbieri 2022-05-07 2:11 Alessandro Barbieri 2022-05-07 2:11 Alessandro Barbieri 2022-05-07 2:11 Alessandro Barbieri 2022-05-07 0:48 Alessandro Barbieri 2022-05-07 0:48 Alessandro Barbieri 2022-05-06 16:34 Alessandro Barbieri 2022-05-05 7:32 Alessandro Barbieri 2022-05-05 7:32 Alessandro Barbieri 2022-05-05 7:32 Alessandro Barbieri 2022-04-24 16:46 Nicola Smaniotto 2022-04-19 18:31 Alessandro Barbieri 2022-04-16 16:20 Alessandro Barbieri 2022-04-15 20:34 Alessandro Barbieri 2022-04-15 20:34 Alessandro Barbieri 2022-04-14 9:26 Nicola Smaniotto 2022-04-11 9:41 Anna Vyalkova 2022-04-11 9:41 Anna Vyalkova 2022-04-11 9:41 Anna Vyalkova 2022-03-31 7:24 Anna Vyalkova 2022-02-17 21:11 Anna Vyalkova 2022-02-17 21:11 Anna Vyalkova 2021-10-05 21:24 Alessandro Barbieri 2021-09-29 13:14 Alessandro Barbieri 2021-09-29 13:08 Alessandro Barbieri 2021-09-08 10:46 Alessandro Barbieri 2021-07-25 18:15 Anna Vyalkova 2021-07-22 8:29 Anna Vyalkova 2021-07-22 8:29 Anna Vyalkova 2021-06-17 16:01 Alessandro Barbieri 2021-05-31 23:15 Alessandro Barbieri 2021-05-24 14:49 Alessandro Barbieri 2021-05-17 10:16 Alessandro Barbieri 2021-03-16 0:55 Alessandro Barbieri 2021-03-14 22:58 Alessandro Barbieri 2021-03-14 22:49 Alessandro Barbieri 2020-12-06 10:46 Andrew Ammerlaan 2020-05-06 23:36 Alessandro Barbieri 2020-05-06 23:36 Alessandro Barbieri 2020-05-01 11:45 Kurt Kanzenbach 2020-04-28 8:01 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan 2020-04-28 8:00 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan 2020-04-28 7:44 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan 2020-04-28 7:44 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan 2020-04-21 10:23 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan 2020-04-21 10:22 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan 2020-04-21 10:20 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan 2020-04-21 10:20 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan 2020-04-07 7:42 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan 2020-04-06 18:45 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan 2020-04-07 7:42 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan 2020-04-06 19:36 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan 2020-04-07 7:27 Andrew Ammerlaan 2020-04-07 7:16 Andrew Ammerlaan 2020-04-06 18:26 Andrew Ammerlaan
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1691133955.4e1d7e84973a548a8040739984c4bd467d6f7838.flow@gentoo \ --to=flow@gentoo.org \ --cc=gentoo-commits@lists.gentoo.org \ --cc=gentoo-dev@lists.gentoo.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox