commit:     9b2645061cdbc30b2a6bfaab0937083c91655070
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  2 01:06:31 2016 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Fri Dec  2 01:07:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b264506

sci-mathematics/rstudio: Bump to 1.0.44, thanks to David Luna for reporting.

Gentoo-Bug: 599282

Package-Manager: portage-2.3.2

 sci-mathematics/rstudio/Manifest                   |   1 +
 .../files/rstudio-1.0.44-clang-pandoc.patch        |  71 ++++++
 .../rstudio/files/rstudio-1.0.44-paths.patch       | 130 +++++++++++
 .../rstudio/files/rstudio-1.0.44-systemd.patch     |  21 ++
 sci-mathematics/rstudio/rstudio-1.0.44.ebuild      | 248 +++++++++++++++++++++
 5 files changed, 471 insertions(+)

diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 8ff2707..26d0c77 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -28,6 +28,7 @@ DIST rstudio-0.99.893.tar.gz 17407634 SHA256 
90a657b1fa16cfc575ca884789bac47f178
 DIST rstudio-0.99.896.tar.gz 17409121 SHA256 
05fc7546ad1d21d7e6219538056ec2ee1b86d09b731a588198ce137d3fe25bae SHA512 
c62df2a1c54f8c6d14b1239dd746b88693c11c48ec56aa5ae89023e98901793b0e65df44526cbc8c71036c0f73a512767cae086ed3777540b1ceda05e3398e17
 WHIRLPOOL 
7f4d0ebc8db509f09ccc15da02a4a426de431312f2dc65126bda76e11de0e106671fc7a83e9ea8e66b88f81268d0db8b44014a70744b30641bb58bedda73427d
 DIST rstudio-0.99.902.tar.gz 17408815 SHA256 
703a3ebedbb4bb44d2cacffed2615b4f65156fcd4115029931eb5fd99950c689 SHA512 
23db68f05900666287901d75f02006f7edacafab057d82a312b4e5aac639ef4b5db702420632f2768e509411bbfc73c32a533aa0f1b33379c10df82e009b974e
 WHIRLPOOL 
e7ef3cf0d9a414257c4c0c68809c674721f9513917bd450c9946133ee69dd735374417483c7dc380ee4d387119558c961d4ea815aac5bcd3fa22ee863556e0a4
 DIST rstudio-0.99.903.tar.gz 17409865 SHA256 
8902fe7a6f7f6e0d6e8fae2472e479bb9cbe9cbb2e0747e5f01a093d31993a3c SHA512 
9ddcfdab187c907dfa3cbf386ee902b43ba35c242b44a4190c58d1e3bad590ca428209423739768b57f759c4bde61ef2b5958fb3cba366d7740753c3c5dbf739
 WHIRLPOOL 
82ca64883d02aacc0c1081779f769c3ea2bbac3c370f1e62fba18465547742114df18d431f30c3fe449c0ae2ac212cd7dd98a72bb2e5810eb1fc6cdbb3c82a69
+DIST rstudio-1.0.44.tar.gz 17774065 SHA256 
43ece6cfdd1a13ac0e17f2a50154a30a1a14ad6c1b3cf381cc6007988ce44a0f SHA512 
a8b975dc517125a257e5f61db5bb137e133b02d738d55553770aa65e388cd112ce646b53b77dc069d1ca95ccd95979f4a57ad60b99fc3b91543cf61e737e8169
 WHIRLPOOL 
4ad472aed130451e81d8d8e3251d3bbd701a8b8e2fbddf17dc357f39335e33c75505f9443c2c7208e60a19c2767b9328134433e5d4fd22504813020712c658ef
 DIST selenium-java-2.37.0.zip 24625928 SHA256 
0eebba65d8edb01c1f46e462907c58f5d6e1cb0ddf63660a9985c8432bdffbb7 SHA512 
68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779
 WHIRLPOOL 
eb6659aae26f3c78b6f998546b23d0636c9d00ed8a7f985db1463ac4bd483ccb3e643d84e2ca0f59e0636a8de79eb552ff1d68eb6f9c06907029f7552d8f7777
 DIST selenium-server-standalone-2.37.0.jar 34730734 SHA256 
97bc8c699037fb6e99ba7af570fb60dbb1b7ce30cde2448287a44ef65b13023e SHA512 
b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018
 WHIRLPOOL 
20640591534f31f24825a9ed139589b182e8b60d86541bf0be104d3cc0280983f6566bd0459f2253ac3875b48a2798b205bac8f815a119fff6db625ce9bbc29e
 DIST shinyapps-0.98.1000.tar.gz 910095 SHA256 
b95c512ae0a0fb4335878d9cfcf9073e2cb3ccfed73543abe27ea8878ed36d57 SHA512 
3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c
 WHIRLPOOL 
ecc2bce78387cb42e9989163d8fca29220e66f085acde3323417058aebb624dafa8c0e1873c7d79e67324cbd5aad250ef9fcdbbc8f659d64482233b95d898a15

diff --git a/sci-mathematics/rstudio/files/rstudio-1.0.44-clang-pandoc.patch 
b/sci-mathematics/rstudio/files/rstudio-1.0.44-clang-pandoc.patch
new file mode 100644
index 00000000..ed0fc8e
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.0.44-clang-pandoc.patch
@@ -0,0 +1,71 @@
+--- rstudio-1.0.44-orig/src/cpp/session/CMakeLists.txt 2016-10-19 
08:32:41.000000000 +1100
++++ rstudio-1.0.44/src/cpp/session/CMakeLists.txt      2016-12-01 
23:44:30.130725331 +1100
+@@ -25,24 +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()
+-
+-# verify libclang is installed
+-if(WIN32)
+-   set(LIBCLANG_VERSION "3.4")
+-else()
+-   set(LIBCLANG_VERSION "3.5")
+-endif()
+-set(LIBCLANG_DIR 
"${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/${LIBCLANG_VERSION}")
+-if(NOT EXISTS "${LIBCLANG_DIR}")
+-  message(FATAL_ERROR "libclang ${LIBCLANG_VERSION} not found  (re-run 
install-dependencies script to install)")
+-endif()
+-set(LIBCLANG_HEADERS_DIR 
"${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers")
+-if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}")
+-  message(FATAL_ERROR "libclang builtin-headers not found  (re-run 
install-dependencies script to install)")
+-endif()
+ 
+ 
+ # include files
+@@ -420,18 +402,6 @@
+    install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26"
+            DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
+ 
+-   # install pandoc
+-   if(RSTUDIO_PACKAGE_BUILD_SLES)
+-      # when producing a SUSE Linux Enterpise build, we want to install the 
+-      # static Pandoc binaries (see dependencies/common/install-pandoc)
+-      set(PANDOC_EXTENSION_DIR "/static")
+-   endif()
+-   set(PANDOC_BIN 
"${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/1.17.2${PANDOC_EXTENSION_DIR}")
+-   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 PDF.js
+    install(DIRECTORY "resources/pdfjs"
+            DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
+@@ -452,24 +422,6 @@
+    install(DIRECTORY "resources/pagedtable"
+            DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
+ 
+-   # install libclang
+-   if(WIN32)
+-      file(GLOB LIBCLANG_32_FILES "${LIBCLANG_DIR}/x86/libclang.*")
+-      install(PROGRAMS ${LIBCLANG_32_FILES}
+-              DESTINATION  ${RSTUDIO_INSTALL_BIN}/rsclang/x86)
+-      file(GLOB LIBCLANG_64_FILES "${LIBCLANG_DIR}/x86_64/libclang.*")
+-      install(PROGRAMS ${LIBCLANG_64_FILES}
+-              DESTINATION  ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64)
+-   else()
+-      file(GLOB_RECURSE LIBCLANG_FILES "${LIBCLANG_DIR}/libclang.*")
+-      install(PROGRAMS ${LIBCLANG_FILES}
+-              DESTINATION  ${RSTUDIO_INSTALL_BIN}/rsclang)
+-   endif()
+-
+-   # install libclang builtin-headers
+-   install(DIRECTORY 
"${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers"
+-           DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang")
+-
+    # install 64 bit binaries if we are on win64
+    if(WIN32)
+       if(NOT ("$ENV{PROGRAMW6432}" STREQUAL ""))

diff --git a/sci-mathematics/rstudio/files/rstudio-1.0.44-paths.patch 
b/sci-mathematics/rstudio/files/rstudio-1.0.44-paths.patch
new file mode 100644
index 00000000..b2a1a33
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.0.44-paths.patch
@@ -0,0 +1,130 @@
+--- rstudio-1.0.44-orig/CMakeGlobals.txt       2016-10-19 08:32:41.000000000 
+1100
++++ rstudio-1.0.44/CMakeGlobals.txt    2016-12-01 23:33:04.149326324 +1100
+@@ -123,7 +123,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.0.44-orig/src/cpp/server/CMakeLists.txt  2016-10-19 
08:32:41.000000000 +1100
++++ rstudio-1.0.44/src/cpp/server/CMakeLists.txt       2016-12-01 
23:35:51.634862018 +1100
+@@ -155,7 +155,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")
+@@ -163,7 +163,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")
+@@ -171,13 +171,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 apparmor profile
+    set(RSERVER_APPARMOR_DIR "extras/apparmor")
+@@ -185,9 +185,9 @@
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_PROFILE}.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE})
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE}
+-           DESTINATION ${RSERVER_APPARMOR_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR})
+    install(PROGRAMS 
${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_DIR}/apparmor-profile-load
+-           DESTINATION ${RSERVER_APPARMOR_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR})
+ 
+    # install configured upstart profile
+    set(RSERVER_UPSTART_DIR "extras/upstart")
+@@ -195,12 +195,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.0.44-orig/src/cpp/server/ServerOptions.cpp       2016-10-19 
08:32:41.000000000 +1100
++++ rstudio-1.0.44/src/cpp/server/ServerOptions.cpp    2016-12-01 
23:33:04.151326331 +1100
+@@ -386,8 +386,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.0.44-orig/src/cpp/session/SessionOptions.cpp     2016-10-19 
08:32:41.000000000 +1100
++++ rstudio-1.0.44/src/cpp/session/SessionOptions.cpp  2016-12-01 
23:33:04.151326331 +1100
+@@ -49,7 +49,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";
+ 
+@@ -481,14 +481,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_);
+@@ -498,7 +498,7 @@
+    resolvePath(resourcePath_, &sumatraPath_);
+    resolvePath(resourcePath_, &winutilsPath_);
+ #endif
+-   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.0.44-systemd.patch 
b/sci-mathematics/rstudio/files/rstudio-1.0.44-systemd.patch
new file mode 100644
index 00000000..7eafd43
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.0.44-systemd.patch
@@ -0,0 +1,21 @@
+--- rstudio-1.0.44-orig/src/cpp/server/CMakeLists.txt  2016-10-19 
08:32:41.000000000 +1100
++++ rstudio-1.0.44/src/cpp/server/CMakeLists.txt       2016-12-02 
11:11:45.259050839 +1100
+@@ -203,17 +203,12 @@
+            DESTINATION ${RSERVER_UPSTART_DIR})
+ 
+     # install configured systemd profile
+-   set(RSERVER_SYSTEMD_DIR "extras/systemd")
++   set(RSERVER_SYSTEMD_DIR "lib/systemd/system")
+    set(RSERVER_SYSTEMD_PROFILE 
"${RSERVER_SYSTEMD_DIR}/rstudio-server.service")
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_SYSTEMD_PROFILE}.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_SYSTEMD_PROFILE})
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_SYSTEMD_PROFILE}
+            DESTINATION ${RSERVER_SYSTEMD_DIR})
+-   set(RSERVER_SYSTEMD_PROFILE_REDHAT 
"${RSERVER_SYSTEMD_DIR}/rstudio-server.redhat.service")
+-   
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_SYSTEMD_PROFILE_REDHAT}.in
+-                  
${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_SYSTEMD_PROFILE_REDHAT})
+-   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_SYSTEMD_PROFILE_REDHAT}
+-           DESTINATION ${RSERVER_SYSTEMD_DIR})
+ 
+ elseif(APPLE)
+ 

diff --git a/sci-mathematics/rstudio/rstudio-1.0.44.ebuild 
b/sci-mathematics/rstudio/rstudio-1.0.44.ebuild
new file mode 100644
index 00000000..884e05d
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-1.0.44.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime 
java-pkg-2 pax-utils
+
+# TODO
+# * package gin and gwt
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+# update from scripts in dependencies/common
+# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' 
dependencies/common/install-gwt
+GWT_VER=2.7.0
+GIN_VER=1.5
+SELENIUM_VER=2.37.0
+CHROMEDRIVER_VER=2.7
+# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc
+PANDOC_VER=1.13.1
+# ls dependencies/common/*.tar.gz
+PACKRAT_VER=0.98.1000
+RMARKDOWN_VER=0.98.1000
+SHINYAPPS_VER=0.98.1000
+RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
+
+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-buildtools/gin-${GIN_VER}.zip
+       https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
+       
https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
+       
https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
+       https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
+       https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
+       https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
+       
https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
+       
https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
+       
https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dedicated server"
+
+QT_VER=5.4
+QT_SLOT=5
+RDEPEND="
+       app-text/pandoc
+       dev-haskell/pandoc-citeproc
+       >=dev-lang/R-2.11.1
+       >=dev-libs/boost-1.50:=
+       >=dev-libs/mathjax-2.7.0
+       dev-libs/openssl:0
+       sys-apps/util-linux
+       >=sys-devel/clang-3.5.0
+       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[qt5]
+               >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
+               >=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
+               >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
+               >=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT}
+               >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
+               >=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
+               >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
+               server? ( virtual/pam )
+       )
+       dedicated? ( virtual/pam )"
+DEPEND="${RDEPEND}
+       app-arch/unzip
+       dev-java/ant-core
+       >=virtual/jdk-1.8:=
+       virtual/pkgconfig"
+#      test? ( dev-java/junit:4 )
+
+PATCHES=(
+               "${FILESDIR}/${PN}-0.99.879-prefs.patch"
+               "${FILESDIR}/${PN}-1.0.44-paths.patch"
+               "${FILESDIR}/${PN}-1.0.44-clang-pandoc.patch"
+               "${FILESDIR}/${PN}-0.98.490-linker_flags.patch"
+               "${FILESDIR}/${PN}-0.98.1091-boost-1.57.patch"
+               "${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch"
+               "${FILESDIR}/${PN}-1.0.44-systemd.patch"
+)
+
+src_unpack() {
+       unpack ${P}.tar.gz gwt-${GWT_VER}.zip
+       cd "${S}" || die
+       mkdir -p src/gwt/lib/{gin,gwt} \
+               dependencies/common/dictionaries \
+               src/gwt/lib/selenium/${SELENIUM_VER} \
+               src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
+       mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
+       unzip -qd src/gwt/lib/gin/${GIN_VER} \
+               "${DISTDIR}"/gin-${GIN_VER}.zip || die
+       unzip -qd dependencies/common/dictionaries \
+               "${DISTDIR}"/core-dictionaries.zip || die
+       unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
+               "${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
+       cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
+               src/gwt/lib/selenium/${SELENIUM_VER}/ || die
+       cp "${DISTDIR}"/chromedriver-linux \
+               src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die
+       cd dependencies/common || die
+       unpack packrat-${PACKRAT_VER}.tar.gz
+       unpack rmarkdown-${RMARKDOWN_VER}.tar.gz
+       unpack shinyapps-${SHINYAPPS_VER}.tar.gz
+       unpack rsconnect_${RSCONNECT_VER}.tar.gz
+       cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
+               . || die
+       cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
+               . || die
+       cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
+               . || die
+       cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \
+               . || die
+}
+
+src_prepare() {
+       default
+       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
+
+       # 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' \
+                                  
"${EROOT}"/usr/lib64/qt5/mkspecs/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 v0.99.903
+       sed -e 's@git ARGS rev-parse HEAD@echo ARGS 
0eb2d8ea28ebc1ac6ac327e023becb6133b679c4@'\
+               -i "${S}"/CMakeLists.txt \
+               "${S}"/CMakeGlobals.txt \
+               || die
+}
+
+src_configure() {
+       export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1)
+       export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2)
+       export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3)
+
+       local mycmakeargs=(
+               -DDISTRO_SHARE=share/${PN}
+               -DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
+               -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server 
"Development" "Desktop")")
+               -DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
+               -DRSTUDIO_VERIFY_R_VERSION=FALSE
+               )
+
+       cmake-utils_src_configure
+}
+
+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
+       pax-mark m "${ED}usr/bin/rstudio"
+       doconfd "${FILESDIR}"/rstudio-server.conf
+       dodir /etc/rstudio
+       insinto /etc/rstudio
+       doins "${FILESDIR}"/rsession.conf
+       dosym /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
+       fi
+}
+
+pkg_preinst() {
+       use dedicated || gnome2_icon_savelist
+       java-pkg-2_pkg_preinst
+}
+
+pkg_postinst() {
+       use dedicated || { fdo-mime_desktop_database_update
+               fdo-mime_mime_database_update
+               gnome2_icon_cache_update ;}
+
+       if use dedicated || use server; then
+               enewgroup rstudio-server
+               enewuser rstudio-server -1 -1 -1 rstudio-server
+       fi
+}
+
+pkg_postrm() {
+       use dedicated || { fdo-mime_desktop_database_update
+               fdo-mime_mime_database_update
+               gnome2_icon_cache_update ;}
+}

Reply via email to