Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
Date: Thu, 22 Aug 2019 11:01:57
Message-Id: 1566471706.1f7330384a57b41c8ed4825d5a98a71530a79d36.whissi@gentoo
1 commit: 1f7330384a57b41c8ed4825d5a98a71530a79d36
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 22 10:56:40 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 22 11:01:46 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f733038
7
8 sci-mathematics/rstudio: fix missing slashes
9
10 Package-Manager: Portage-2.3.72, Repoman-2.3.17
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 sci-mathematics/rstudio/rstudio-1.2.1335.ebuild | 6 +++---
14 1 file changed, 3 insertions(+), 3 deletions(-)
15
16 diff --git a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
17 index 4ff5da66509..81591d93861 100644
18 --- a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
19 +++ b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
20 @@ -162,12 +162,12 @@ src_prepare() {
21 CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
22
23 # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
24 - sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
25 + sed -e "s@/etc/rstudio/rserver.conf@${EROOT}/etc/conf.d/rstudio-server.conf@" \
26 -i src/cpp/server/ServerOptions.cpp \
27 || die
28
29 # Set the rsession.conf file location for Gentoo prefix
30 - sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
31 + sed -e "s@/etc/rstudio/rsession.conf@${EROOT}/etc/rstudio/rsession.conf@" \
32 -i src/cpp/session/SessionOptions.cpp \
33 || die
34
35 @@ -223,7 +223,7 @@ src_install() {
36 dodir /etc/rstudio
37 insinto /etc/rstudio
38 doins "${FILESDIR}"/rsession.conf
39 - dosym "${ROOT}etc/conf.d/rstudio-server.conf" "${ROOT}etc/rstudio/rserver.conf"
40 + dosym "${ED}/etc/conf.d/rstudio-server.conf" "/etc/rstudio/rserver.conf"
41 if use dedicated || use server; then
42 dopamd src/cpp/server/extras/pam/rstudio
43 newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server