commit: 8c2e866221a19364bb608688acd0794ecf86c204 Author: Mark Wright <gienah <AT> gentoo <DOT> org> AuthorDate: Fri Jan 10 08:42:28 2020 +0000 Commit: Mark Wright <gienah <AT> gentoo <DOT> org> CommitDate: Fri Jan 10 08:43:21 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c2e8662
sci-mathematics/rstudio: Bump to 1.2.5033, use acct rstudio-server Thanks to John Dough for reporting the version bump bug #702140. Thanks to toralf for reporting bug #693662. The egit_clean: command not found is fixed by inherit vcs-clean. The QA: other The ebuild is installing to one or more unexpected paths: /usr/extras is fixed with the sed under this comment: # install themes in /etc/rstudio/extra/sthemes instead of /usr/extra/themes The: One or more CMake variables were not used by the project: QT_QMAKE_EXECUTABLE RSTUDIO_INSTALL_FREEDESKTOP is fixed by only setting these variables if use !dedicated. Thanks to Alessandro Barbieri reporting bug #696944, the dependencies are unbundled in rstudio 1.2.5033.ebuild, and some needless dependencies are removed. Closes: https://bugs.gentoo.org/show_bug.cgi?id=702140 Closes: https://bugs.gentoo.org/show_bug.cgi?id=693662 Closes: https://bugs.gentoo.org/show_bug.cgi?id=696944 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Mark Wright <gienah <AT> gentoo.org> sci-mathematics/rstudio/Manifest | 1 + .../rstudio/files/rstudio-1.2.5033-pandoc.patch | 32 +++ .../rstudio/files/rstudio-1.2.5033-paths.patch | 118 +++++++++++ .../rstudio/files/rstudio-1.2.5033-prefs.patch | 83 ++++++++ sci-mathematics/rstudio/rstudio-1.2.5033.ebuild | 235 +++++++++++++++++++++ 5 files changed, 469 insertions(+) diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest index 2c0bab41204..48c017368ef 100644 --- a/sci-mathematics/rstudio/Manifest +++ b/sci-mathematics/rstudio/Manifest @@ -9,6 +9,7 @@ DIST rmarkdown-0.98.1000.tar.gz 1423820 BLAKE2B eac8c9cf438c9b44ddfe954602dd67a8 DIST rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz 197051 BLAKE2B 1f3f9fe71d7b50ab5108dfdbd3cc0b882bcc935ee58e8a9145b07a18bb86c39bc45e321a13add24df99492bc30548df716775c339bcbf4efc2bfe158299ae55a SHA512 208dc349f4aa7613ecf94939aba60d22d3a06972344b526c9b6c951015571f5922927bca08db571a7b8a268e42609a4f558f01278c9685f6da2ffc66a1f95ade DIST rstudio-1.1.463.tar.gz 20203779 BLAKE2B 97f879539cbb7051af362a8469795a47feb42d18ff46dbbdffe36e0685d1cd5704848b3bf5a5611d482a09567722e35288527302cd521b18e2a48b347c919e17 SHA512 987347563a9726363c28d866e1372eae8eb19a5cbd0e33c7ee0e0c8f90471c4b69de0f559c00410523841b6c090b584652e01496f5db33c015a4554d2f4e179b DIST rstudio-1.2.1335.tar.gz 20440199 BLAKE2B cdd54a7df5a234bcc6d440f4ba5b45e58ea469f8dac5a17d9088f9d65035495c86b5a308cde28a224648f96a74038299863291f3c516a1d567762ecc5bfb079c SHA512 90657effc55264bf3efa1a8a5d2bbe94a37727f0450202ade99b9fbb71ea75b6dd9fa798d17cd4d1a1a97a16f186de8004d1888b6ea43f36d5252508520d3cde +DIST rstudio-1.2.5033.tar.gz 20456976 BLAKE2B 3cbca6a5180690104dddf1456168bd38708d4152ed9b7a167035dd66e270aeb6405169d34461cbd899738be1872607e3f3b6f81ff0b3c9e6a9ed965a889b1393 SHA512 3569d4fed342275a9905c87e4f97be63b6391d2c37f75397e06201a7c31f80d94799214f51ff8e57d458ef18d5e54afe1ec8a7c56ac05ed8b8225ecca72d1daf DIST selenium-java-2.37.0.zip 24625928 BLAKE2B b369a805ae96f0d0913c4be42888d9c2a1e213ff982f9daefe73fadb705baa80ab0186ab50ed52609e83697cffaf8d617d06d75405cb8e1c3fe8e7c5b81dba25 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779 DIST selenium-server-standalone-2.37.0.jar 34730734 BLAKE2B 3899b1d4c5f9153c1f9f13bec66f7c1456ea2e0f34db7d8e54a1ce9063c33a05b3cf95216c2ae06bb40504f72f343a4b9ba6c8553fbbc340e7c18a5b612dde5c SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018 DIST shinyapps-0.98.1000.tar.gz 910095 BLAKE2B 4f9364692348bb52cbd12cc6ee447841cb0c805327f2518b2a9545920b602b954a98dea68ccb3daf32d2c3bab6464fb15402844d93277193315f1ae7b3ca5190 SHA512 3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.5033-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-1.2.5033-pandoc.patch new file mode 100644 index 00000000000..b4f611063e1 --- /dev/null +++ b/sci-mathematics/rstudio/files/rstudio-1.2.5033-pandoc.patch @@ -0,0 +1,32 @@ +--- rstudio-1.2.5033-orig/src/cpp/session/CMakeLists.txt 2019-12-04 17:22:17.000000000 +1100 ++++ rstudio-1.2.5033/src/cpp/session/CMakeLists.txt 2020-01-07 12:29:20.174304185 +1100 +@@ -25,9 +25,6 @@ + if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26") + message(FATAL_ERROR "Mathjax 2.6 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() + + # we often install embedded versions of these packages but don't do so currently + +@@ -490,19 +487,6 @@ + install(DIRECTORY "resources/connections" + DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) + +- # install pandoc +- if(WIN32) +- set(PANDOC_VERSION "2.7.2" CACHE INTERNAL "Pandoc version") +- else() +- set(PANDOC_VERSION "2.3.1" CACHE INTERNAL "Pandoc version") +- endif() +- +- set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}") +- 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} diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.5033-paths.patch b/sci-mathematics/rstudio/files/rstudio-1.2.5033-paths.patch new file mode 100644 index 00000000000..aa6a9b23fde --- /dev/null +++ b/sci-mathematics/rstudio/files/rstudio-1.2.5033-paths.patch @@ -0,0 +1,118 @@ +--- rstudio-1.2.5033-orig/CMakeGlobals.txt 2019-12-04 17:22:17.000000000 +1100 ++++ rstudio-1.2.5033/CMakeGlobals.txt 2020-01-07 12:20:19.115307754 +1100 +@@ -175,7 +175,7 @@ + else() + set(RSTUDIO_INSTALL_BIN bin) + endif() +- set(RSTUDIO_INSTALL_SUPPORTING .) ++ set(RSTUDIO_INSTALL_SUPPORTING ${DISTRO_SHARE}) + endif() + + # if the install prefix is /usr/local then tweak as appropriate +--- rstudio-1.2.5033-orig/src/cpp/server/CMakeLists.txt 2019-12-04 17:22:17.000000000 +1100 ++++ rstudio-1.2.5033/src/cpp/server/CMakeLists.txt 2020-01-07 12:17:32.736309024 +1100 +@@ -194,7 +194,7 @@ + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in + ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}) + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT} +- DESTINATION ${RSERVER_INITD_DEBIAN_DIR}) ++ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_DEBIAN_DIR}) + + # install configured redhat init.d script + set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat") +@@ -202,7 +202,7 @@ + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in + ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}) + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT} +- DESTINATION ${RSERVER_INITD_REDHAT_DIR}) ++ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_REDHAT_DIR}) + + # install configured suse init.d script + set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse") +@@ -210,13 +210,13 @@ + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in + ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}) + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT} +- DESTINATION ${RSERVER_INITD_SUSE_DIR}) ++ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_SUSE_DIR}) + + # install pam profile + set(RSERVER_PAM_DIR "extras/pam") + set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio") + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE} +- DESTINATION ${RSERVER_PAM_DIR}) ++ DESTINATION ${DISTRO_SHARE}/${RSERVER_PAM_DIR}) + + # install configured upstart profile + set(RSERVER_UPSTART_DIR "extras/upstart") +@@ -224,12 +224,12 @@ + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in + ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE} +- DESTINATION ${RSERVER_UPSTART_DIR}) ++ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) + set(RSERVER_UPSTART_PROFILE_REDHAT "${RSERVER_UPSTART_DIR}/rstudio-server.redhat.conf") + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}.in + ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT} +- DESTINATION ${RSERVER_UPSTART_DIR}) ++ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) + + # install configured systemd profile + set(RSERVER_SYSTEMD_DIR "extras/systemd") +--- rstudio-1.2.5033-orig/src/cpp/server/ServerOptions.cpp 2019-12-04 17:22:17.000000000 +1100 ++++ rstudio-1.2.5033/src/cpp/server/ServerOptions.cpp 2020-01-07 12:17:32.773309023 +1100 +@@ -389,8 +389,8 @@ + + // convert relative paths by completing from the system installation + // path (this allows us to be relocatable) +- resolvePath(resourcePath, &wwwLocalPath_); +- resolvePath(resourcePath, &wwwSymbolMapsPath_); ++ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_); ++ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_); + resolvePath(binaryPath, &authPamHelperPath_); + resolvePath(binaryPath, &rsessionPath_); + resolvePath(binaryPath, &rldpathPath_); +--- rstudio-1.2.5033-orig/src/cpp/session/SessionOptions.cpp 2019-12-04 17:22:17.000000000 +1100 ++++ rstudio-1.2.5033/src/cpp/session/SessionOptions.cpp 2020-01-07 12:17:32.774309023 +1100 +@@ -53,7 +53,7 @@ + namespace session { + + namespace { +-const char* const kDefaultPandocPath = "bin/pandoc"; ++const char* const kDefaultPandocPath = "bin"; + const char* const kDefaultPostbackPath = "bin/postback/rpostback"; + const char* const kDefaultRsclangPath = "bin/rsclang"; + +@@ -571,14 +571,14 @@ + } + + // convert relative paths by completing from the app resource path +- resolvePath(resourcePath_, &rResourcesPath_); +- resolvePath(resourcePath_, &agreementFilePath_); +- resolvePath(resourcePath_, &wwwLocalPath_); +- resolvePath(resourcePath_, &wwwSymbolMapsPath_); +- resolvePath(resourcePath_, &coreRSourcePath_); +- resolvePath(resourcePath_, &modulesRSourcePath_); +- resolvePath(resourcePath_, &sessionLibraryPath_); +- resolvePath(resourcePath_, &sessionPackageArchivesPath_); ++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &rResourcesPath_); ++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &agreementFilePath_); ++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwLocalPath_); ++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_); ++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &coreRSourcePath_); ++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &modulesRSourcePath_); ++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionLibraryPath_); ++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionPackageArchivesPath_); + resolvePostbackPath(resourcePath_, &rpostbackPath_); + #ifdef _WIN32 + resolvePath(resourcePath_, &consoleIoPath_); +@@ -611,7 +611,7 @@ + } + winptyPath_ = pty.complete(completion).absolutePath(); + #endif // _WIN32 +- resolvePath(resourcePath_, &hunspellDictionariesPath_); ++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &hunspellDictionariesPath_); + resolvePath(resourcePath_, &mathjaxPath_); + resolvePath(resourcePath_, &libclangHeadersPath_); + resolvePandocPath(resourcePath_, &pandocPath_); diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.5033-prefs.patch b/sci-mathematics/rstudio/files/rstudio-1.2.5033-prefs.patch new file mode 100644 index 00000000000..034eba37a8b --- /dev/null +++ b/sci-mathematics/rstudio/files/rstudio-1.2.5033-prefs.patch @@ -0,0 +1,83 @@ +--- rstudio-1.2.5033-orig/src/gwt/build.xml 2019-12-04 17:22:17.000000000 +1100 ++++ rstudio-1.2.5033/src/gwt/build.xml 2020-01-10 18:35:29.913030923 +1100 +@@ -28,17 +28,35 @@ + classname="com.google.javascript.jscomp.ant.CompileTask" + classpath="${tools.dir}/compiler/compiler.jar"/> + ++ <!-- Configure path to aopalliance --> ++ <property name="aopalliance.sdk" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/aopalliance-1/lib"/> ++ ++ <!-- Configure path to javax-inject --> ++ <property name="javax.inject" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/javax-inject/lib"/> ++ ++ <!-- Configure path to validation-api --> ++ <property name="validation.api" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/validation-api-1.0/lib"/> ++ <property name="validation.api.sources" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/validation-api-1.0/sources"/> ++ + <!-- Configure path to GWT SDK --> +- <property name="gwt.sdk" value="${lib.dir}/gwt/2.8.1"/> ++ <property name="gwt.sdk" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/gwt-2.8/lib"/> ++ ++ <!-- Configure path to Google Gin --> ++ <property name="gin.sdk" value="@GENTOO_PORTAGE_EPREFIX@/usr/share/gin-2.1/lib"/> + + <property name="gwt.extra.args" value=""/> + <property name="gwt.main.module" value="org.rstudio.studio.RStudio"/> + <property name="ace.bin" value="${src.dir}/org/rstudio/studio/client/workbench/views/source/editors/text/ace"/> ++ <property environment="env"/> + + <path id="project.class.path"> + <pathelement location="${build.dir}"/> ++ <fileset dir="${aopalliance.sdk}" includes="*.jar"/> ++ <fileset dir="${javax.inject}" includes="*.jar"/> ++ <fileset dir="${validation.api}" includes="*.jar"/> ++ <fileset dir="${validation.api.sources}" includes="*.zip"/> + <fileset dir="${gwt.sdk}" includes="*.jar"/> +- <fileset dir="${lib.dir}/gin/2.1.2" includes="*.jar"/> ++ <fileset dir="${gin.sdk}" includes="*.jar"/> + </path> + + <path id="test.class.path"> +@@ -112,8 +130,10 @@ + <pathelement location="${src.dir}"/> + <path refid="project.class.path"/> + </classpath> ++ <jvmarg value="-Duser.home=${env.T}"/> + <!-- add jvmarg -Xss16M or similar if you see a StackOverflowError --> + <jvmarg value="-Xmx1536M"/> ++ <jvmarg value="-Djava.util.prefs.userRoot=${env.T}"/> + <arg value="-war"/> + <arg value="${www.dir}"/> + <arg value="-localWorkers"/> +@@ -154,6 +174,7 @@ + <pathelement location="${src.dir}"/> + <path refid="project.class.path"/> + </classpath> ++ <jvmarg value="-Duser.home=${env.T}"/> + <jvmarg value="-Xmx2048M"/> + <arg value="-style"/> + <arg value="PRETTY"/> +@@ -176,6 +197,7 @@ + <pathelement location="src"/> + <path refid="project.class.path"/> + </classpath> ++ <jvmarg value="-Duser.home=${env.T}"/> + <jvmarg value="-Xmx2048M"/> + <arg value="-style"/> + <arg value="PRETTY"/> +@@ -202,6 +224,7 @@ + <pathelement location="src"/> + <path refid="project.class.path"/> + </classpath> ++ <jvmarg value="-Duser.home=${env.T}"/> + <jvmarg value="-Xmx2048M"/> + <arg value="-src"/> + <arg value = "src"/> +@@ -237,6 +260,7 @@ + <pathelement location="${test.dir}"/> + <pathelement location="${src.dir}"/> + </classpath> ++ <jvmarg value="-Duser.home=${env.T}"/> + <classpath refid="project.class.path"/> + <classpath refid="unittest.class.path"/> + <arg value="org.rstudio.studio.client.RStudioUnitTestSuite"/> diff --git a/sci-mathematics/rstudio/rstudio-1.2.5033.ebuild b/sci-mathematics/rstudio/rstudio-1.2.5033.ebuild new file mode 100644 index 00000000000..88b8f9d905b --- /dev/null +++ b/sci-mathematics/rstudio/rstudio-1.2.5033.ebuild @@ -0,0 +1,235 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit eutils cmake-utils pam xdg-utils java-pkg-2 java-ant-2 pax-utils prefix qmake-utils vcs-clean + +# TODO +# * use dict from tree, linguas +# * do src_test (use junit from tree?) + +# update from scripts in dependencies/common +# egrep '(GWT_SDK_VER=|GIN_VER=)' dependencies/common/install-gwt +GWT_VER=2.8.1 +GIN_VER=2.1.2 +# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc +# It should be PANDOC_VER=2.3.1 however >=app-text/pandoc-2.3.1 is not yet in portage +PANDOC_VER=1.19.2.1 +# grep -5 QT_CANDIDATES src/cpp/desktop/CMakeLists.txt +QT_VER=5.10 +QT_SLOT=5 + +DESCRIPTION="IDE for the R language" +HOMEPAGE=" + http://www.rstudio.org + https://github.com/rstudio/rstudio/"; +SRC_URI=" + https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip +" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="dedicated libressl server" + +RDEPEND=" + >=app-text/pandoc-${PANDOC_VER} + dev-java/aopalliance:1 + dev-java/gin:2.1 + dev-java/gwt:2.8 + dev-java/javax-inject + =dev-java/validation-api-1.0*:1.0[source] + dev-haskell/pandoc-citeproc + dev-lang/R + dev-libs/boost:= + >=dev-libs/mathjax-2.7.4 + sys-apps/util-linux + sys-devel/clang:* + sys-libs/zlib + >=virtual/jre-1.8:= + x11-libs/pango + !dedicated? ( + >=dev-qt/qtcore-${QT_VER}:${QT_SLOT} + >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT} + >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT} + >=dev-qt/qtgui-${QT_VER}:${QT_SLOT} + >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT} + >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} + >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} + >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} + >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)] + >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} + >=dev-qt/qtsql-${QT_VER}:${QT_SLOT} + >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} + >=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT} + >=dev-qt/qtwebengine-${QT_VER}:${QT_SLOT}[widgets] + >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} + >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} + >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} + server? ( sys-libs/pam ) + ) + dedicated? ( sys-libs/pam ) + dedicated? ( + sys-libs/pam + acct-user/rstudio-server + acct-group/rstudio-server + ) + server? ( + acct-user/rstudio-server + acct-group/rstudio-server + ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= )" +DEPEND="${RDEPEND} + app-arch/unzip + dev-java/ant-core + >=virtual/jdk-1.8:= + virtual/pkgconfig" +# test? ( dev-java/junit:4 ) + +PATCHES=( + "${FILESDIR}"/${PN}-1.2.5033-prefs.patch + "${FILESDIR}"/${PN}-1.2.5033-paths.patch + "${FILESDIR}"/${PN}-1.2.5033-pandoc.patch + "${FILESDIR}"/${PN}-1.2.1335-linker_flags.patch + "${FILESDIR}"/${PN}-1.2.1335-qtsingleapplication.patch + "${FILESDIR}"/${PN}-1.0.44-systemd.patch + "${FILESDIR}"/${PN}-1.2.1335-core.patch + "${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p1.patch + "${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p2.patch +) + +src_unpack() { + unpack ${P}.tar.gz + cd "${S}" || die + mkdir -p dependencies/common/dictionaries + unzip -qd dependencies/common/dictionaries \ + "${DISTDIR}"/core-dictionaries.zip || die +} + +src_prepare() { + cmake-utils_src_prepare + java-pkg-2_src_prepare + egit_clean + + # Enable CMake to install our .service file for systemd usage + mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die + cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die + + # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using + # this sed hack for now. ~RMH + sed -i \ + -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \ + src/cpp/server/ServerOptions.cpp \ + src/cpp/session/SessionOptions.cpp || die + + # use mathjax from system + ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die + + # make sure icons and mime stuff are with prefix + sed -i \ + -e "s:/usr:${EPREFIX}/usr:g" \ + CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die + + # install themes in /etc/rstudio/extra/sthemes instead of /usr/extra/themes + sed -i \ + -e "s@\(DESTINATION \"\)\(extras/themes\"\)@\1${EROOT}/etc/rstudio/\2@" \ + src/cpp/server/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@" \ + -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@" \ + -i src/cpp/session/SessionOptions.cpp \ + || die + + # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module. + # It provides a library that has its version number appended to the end, + # which is difficult to handle in cmake, as find_library does not support + # searching for wildcard library names. So I find the library name from the + # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. + rm -rf "${S}"/src/cpp/desktop/3rdparty || die + local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ + $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ + | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ + -e 's@LIBS \*= -l@@') + sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ + -i "${S}"/src/cpp/desktop/CMakeLists.txt \ + || die + + # The git commit for tag: git rev-list -n 1 v${PV} + sed -e 's@git ARGS rev-parse HEAD@echo ARGS 6871a99b32add885fe6fa3d50fe15f62346142e7@'\ + -i "${S}"/CMakeLists.txt \ + "${S}"/CMakeGlobals.txt \ + || die + + eprefixify src/gwt/build.xml +} + +src_configure() { + export RSTUDIO_VERSION_MAJOR=$(ver_cut 1) + export RSTUDIO_VERSION_MINOR=$(ver_cut 2) + export RSTUDIO_VERSION_PATCH=$(ver_cut 3) + + local mycmakeargs=( + -DDISTRO_SHARE=share/${PN} + -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") + -DRSTUDIO_VERIFY_R_VERSION=FALSE + ) + + if use !dedicated; then + mycmakeargs+=( + -DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")" + -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake + ) + fi + cmake-utils_src_configure +} + +src_compile() { + local JAVA_ANT_REWRITE_CLASSPATH="yes" + local EANT_BUILD_XML="src/gwt/build.xml" + local EANT_BUILD_TARGET="clean" + java-pkg-2_src_compile + + # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny + # P: /root/.oracle_jre_usage. + export ANT_OPTS="-Duser.home=${T}" + cmake-utils_src_compile +} + +src_install() { + export ANT_OPTS="-Duser.home=${T}" + cmake-utils_src_install + use dedicated || pax-mark m "${ED}/usr/bin/rstudio" + doconfd "${FILESDIR}"/rstudio-server.conf + dodir /etc/rstudio + insinto /etc/rstudio + doins "${FILESDIR}"/rsession.conf + dosym ../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 + fi +} + +pkg_preinst() { + java-pkg-2_pkg_preinst +} + +pkg_postinst() { + use dedicated || { xdg_desktop_database_update + xdg_mimeinfo_database_update + xdg_icon_cache_update ;} +} + +pkg_postrm() { + use dedicated || { xdg_desktop_database_update + xdg_mimeinfo_database_update + xdg_icon_cache_update ;} +}
