From: "Thomas Deutschmann" <whissi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
Date: Thu, 22 Aug 2019 11:01:53 +0000 (UTC) [thread overview]
Message-ID: <1566471706.1f7330384a57b41c8ed4825d5a98a71530a79d36.whissi@gentoo> (raw)
commit: 1f7330384a57b41c8ed4825d5a98a71530a79d36
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 22 10:56:40 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Aug 22 11:01:46 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f733038
sci-mathematics/rstudio: fix missing slashes
Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
sci-mathematics/rstudio/rstudio-1.2.1335.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
index 4ff5da66509..81591d93861 100644
--- a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
@@ -162,12 +162,12 @@ src_prepare() {
CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
- sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
+ sed -e "s@/etc/rstudio/rserver.conf@${EROOT}/etc/conf.d/rstudio-server.conf@" \
-i src/cpp/server/ServerOptions.cpp \
|| die
# Set the rsession.conf file location for Gentoo prefix
- sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
+ sed -e "s@/etc/rstudio/rsession.conf@${EROOT}/etc/rstudio/rsession.conf@" \
-i src/cpp/session/SessionOptions.cpp \
|| die
@@ -223,7 +223,7 @@ src_install() {
dodir /etc/rstudio
insinto /etc/rstudio
doins "${FILESDIR}"/rsession.conf
- dosym "${ROOT}etc/conf.d/rstudio-server.conf" "${ROOT}etc/rstudio/rserver.conf"
+ dosym "${ED}/etc/conf.d/rstudio-server.conf" "/etc/rstudio/rserver.conf"
if use dedicated || use server; then
dopamd src/cpp/server/extras/pam/rstudio
newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
next reply other threads:[~2019-08-22 11:01 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-22 11:01 Thomas Deutschmann [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-05-02 20:11 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/ Mikle Kolyada
2020-09-25 5:07 Mark Wright
2020-05-23 12:43 Mark Wright
2020-02-12 18:06 David Seifert
2019-12-07 21:55 David Seifert
2019-12-07 20:58 David Seifert
2019-10-20 11:41 David Seifert
2019-10-12 19:04 Mikle Kolyada
2019-08-22 23:15 Mark Wright
2019-08-22 11:07 Thomas Deutschmann
2019-06-12 19:14 David Seifert
2019-06-12 19:14 David Seifert
2018-07-03 2:39 Mark Wright
2018-02-22 10:51 Andreas Sturmlechner
2017-12-25 10:43 David Seifert
2017-12-03 15:58 Patrice Clement
2017-11-25 17:42 David Seifert
2017-11-19 12:52 David Seifert
2017-07-24 4:14 Mark Wright
2017-04-26 8:44 Mark Wright
2017-01-03 12:38 Mark Wright
2016-07-20 3:00 Mark Wright
2016-06-21 19:37 Michał Górny
2016-05-15 10:53 Mark Wright
2016-04-19 9:22 Mark Wright
2016-04-08 10:18 Mark Wright
2016-01-29 6:27 Mark Wright
2016-01-29 4:59 Mark Wright
2016-01-22 21:03 Justin Lecher
2015-10-14 10:22 Mark Wright
2015-09-09 2:27 Mark Wright
2015-09-05 4:27 Mark Wright
2015-09-04 11:33 Mark Wright
2015-09-04 3:20 Mark Wright
2015-08-27 2:54 Mark Wright
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=1566471706.1f7330384a57b41c8ed4825d5a98a71530a79d36.whissi@gentoo \
--to=whissi@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: link
Be 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