gienah 14/12/06 12:32:01
Added: rstudio-server.conf rsession.conf
rstudio-server.initd rstudio-0.98.1091-pandoc.patch
Removed: rstudio-rserver.initd
Log:
Bump rstudio to 0.98.1091. Fix Bug 519290 sci-mathematics/rstudio-0.98.490 -
rstudio-server start: /usr/bin/rstudio-server: 1: eval:
/etc/init.d/rstudio-server: not found, thanks to Franz Fellner for reporting,
Adam Tygart and Franz Fellner for suggesting the fix, Silvio for testing. Fix
Bug 522196 - sci-mathematics/rstudio lack of server part and two more conf
files, thanks to Silvio for reporting and providing the conf files. Fix Bug
523296 - sci-mathematics/rstudio-0.98-1028 with dev-libs/boost-1.56.0 -
.../work/rstudio-0.98.1028/src/cpp/core/Assert.cpp:40:10: error:
boost::core::log has not been declared. paxmark m rstudio for Gentoo Hardened.
Add missing dependencies app-text/pandoc and dev-haskell/pandoc-citeproc to
rstudio-0.98.1028.ebuild. Remove obsolete rstudio-0.97.318.ebuild, as the this
failed to build in my tests.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
618E971F)
Revision Changes Path
1.1 sci-mathematics/rstudio/files/rstudio-server.conf
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/files/rstudio-server.conf?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/files/rstudio-server.conf?rev=1.1&content-type=text/plain
Index: rstudio-server.conf
===================================================================
###########rstudio-server.conf#############
# www-port entry corresponding to the port you want RStudio to listen on
#www-port=80
# By default RStudio binds to address 0.0.0.0 (accepting connections
# from any remote IP). You can modify this behavior using the
# www-address entry.
#www-address=127.0.0.1
# You can add elements to the default LD_LIBRARY_PATH for R
# sessions (as determined by the R ldpaths script) by adding
# an rsession-ld-library-path entry to the server config file.
# This might be useful for ensuring that packages can
# locate external library dependencies that aren't installed
# in the system standard library paths
#rsession-ld-library-path=/opt/local/lib:/opt/local/someapp/lib
#By default RStudio Server runs against the version of R which
# is found on the system PATH (using which R). You can override
# which version of R is used via the rsession-which-r setting
# in the server config file. For example, if you have two
# versions of R installed on the server and want to make sure
# the one at /usr/local/bin/R is used by RStudio then you would use:
rsession-which-r=/usr/bin/R
########ADDITIONALAL#########
# To limit the users who can login to RStudio to the members
# of a specific group, you use the auth-required-user-group
# setting
auth-required-user-group=rstudio_users
1.1 sci-mathematics/rstudio/files/rsession.conf
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/files/rsession.conf?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/files/rsession.conf?rev=1.1&content-type=text/plain
Index: rsession.conf
===================================================================
######rsession.conf############
# Session Timeouts
# By default if a user hasn't issued a command for 2 hours
# RStudio will suspend that user's R session to disk so
# they are no longer consuming server resources (the next
# time the user attempts to access the server their session
# will be restored). You can change the timeout (including
# disabling it by specifying a value of 0) using the
# session-timeout-minutes setting
#session-timeout-minutes=30
# By default RStudio sets the R_LIBS_USER environment
# variable to ~/R/library. This ensures that packages
# installed by end users do not have R version numbers
# encoded in the path (which is the default behavior).
# This in turn enables administrators to upgrade the version
# of R on the server without reseting users installed packages
# (which would occur if the installed packages were in an
# R-version derived directory).
# If you wish to override this behavior you can do so using
# the r-libs-user settings
#r-libs-user=~/R/packages
# You can set the default CRAN repository for the server
# using the r-cran-repos setting
#r-cran-repos=http://cran.case.edu/
1.1 sci-mathematics/rstudio/files/rstudio-server.initd
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/files/rstudio-server.initd?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/files/rstudio-server.initd?rev=1.1&content-type=text/plain
Index: rstudio-server.initd
===================================================================
#!/sbin/runscript
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
start() {
ebegin "Starting RStudio Server"
start-stop-daemon --start --quiet --exec /usr/bin/rserver
eend $?
}
stop() {
ebegin "Stopping RStudio Server"
start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --name
/usr/bin/rserver
eend $?
}
1.1
sci-mathematics/rstudio/files/rstudio-0.98.1091-pandoc.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/files/rstudio-0.98.1091-pandoc.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/files/rstudio-0.98.1091-pandoc.patch?rev=1.1&content-type=text/plain
Index: rstudio-0.98.1091-pandoc.patch
===================================================================
--- rstudio-0.98.1091-orig/src/cpp/session/CMakeLists.txt 2014-11-06
23:15:47.000000000 +1100
+++ rstudio-0.98.1091/src/cpp/session/CMakeLists.txt 2014-11-26
17:12:42.699712510 +1100
@@ -25,9 +25,6 @@
if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-23")
message(FATAL_ERROR "Mathjax 2.3 not found (re-run install-dependencies
script to install)")
endif()
-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc")
- message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to
install)")
-endif()
if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown")
message(FATAL_ERROR "rmarkdown package not found (re-run
install-dependencies script to install)")
endif()
@@ -343,13 +340,6 @@
install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-23"
DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
- # install pandoc
- set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/1.12.4.2")
- file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*")
- install(FILES ${PANDOC_FILES}
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
- DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc)
-
# install rmarkdown package
file(GLOB RMARKDOWN_PACKAGE
"${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz")
install(FILES ${RMARKDOWN_PACKAGE}
