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 6D816138334 for ; Thu, 22 Aug 2019 11:01:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73522E095A; Thu, 22 Aug 2019 11:01:56 +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 58DD4E095A for ; Thu, 22 Aug 2019 11: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 2242834A107 for ; Thu, 22 Aug 2019 11:01:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4AA52782 for ; Thu, 22 Aug 2019 11:01:53 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1566471706.1f7330384a57b41c8ed4825d5a98a71530a79d36.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-mathematics/rstudio/rstudio-1.2.1335.ebuild X-VCS-Directories: sci-mathematics/rstudio/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 1f7330384a57b41c8ed4825d5a98a71530a79d36 X-VCS-Branch: master Date: Thu, 22 Aug 2019 11: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: e01c3277-123e-4e02-b4de-acbb988f252f X-Archives-Hash: 7f8162d9a5a85e8f043641b106263260 commit: 1f7330384a57b41c8ed4825d5a98a71530a79d36 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Aug 22 10:56:40 2019 +0000 Commit: Thomas Deutschmann gentoo 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 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