sci-mathematics/rstudio: Bump to rstudio-0.99.473

Fixes Bug 550724 - sci-mathematics/rstudio: version bump to 0.99.473, thanks to
Anthony Staines and Pavel Kozlov for reporting.

Package-Manager: portage-2.2.20.1

4 files changed, 411 insertions, 0 deletions

diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 69be18ad6153..8010bbd2e045 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -4,10 +4,12 @@ DIST gin-1.5.zip 1055663 SHA256 f561f4eb5d5fe1cff95c881e6aed53a86e9f0de8a5286329
 DIST gwt-2.5.0.rc1.zip 104156555 SHA256 83a6dec583d1b7f3bf3fd2e321d89c1d95881eed1f81c7ea4056201fc105258b SHA512 c0c4f502b4ca191537eada53eb0458c0d33282661423f6d2648e6107ed8e38465b189377fcd0d9babcbf2c688e16080d33cbd7165ed20dafda7fedc39a74e163 WHIRLPOOL b37f12d1937b6479b97e274a59a1856dcf0c5cc3b767b6a19f65d7807e1f32cc2483358f1414c4c9e427d890eb1e0617fe8af84c6f0dca4a9ded64ae5ffde129
 DIST gwt-2.5.1.zip 111070580 SHA256 c457df45a3eed582452c5784ed11746685df494c0ffe4a8ae4de52945916593a SHA512 845c6bc6ce5ade57eeddd8b40cc3458f5e7d40d881cb4017615897eebd5349bfecfef8cd3e3b05a09b33ecf9ee0262d4a84700b0965a27b40cb60d701457a7ea WHIRLPOOL 9d820026e97f96402fc6b69a06f24d2f79df830a0afdba808ab98f14a32312bc999692ad5822005acf6fdcd1b4261918a318f9f20980c640cf32292d5df83a05
 DIST gwt-2.6.0.zip 108819959 SHA256 bd4c13a5d1078446d519a742ee233971e55c447d1b87ffd5b1f90e54dd876b9a SHA512 40690f83f6271ab58abf0ccbf2da1045ea142867ed88accdce91f65a70e39ecf48070696caffcab3f797523ee69b0431b67155b7f04c2856cd95856a7e20d2fb WHIRLPOOL d59ce0f9b13a9956b07905479b394397020fcbc85ac3aabff9ebd74d39b7e660c862e7fe1adb32160e82186d83db10d1254121846e1a9bdafacc38efc55a38fd
+DIST gwt-2.7.0.zip 108818328 SHA256 aa65061b73836190410720bea422eb8e787680d7bc0c2b244ae6c9a0d24747b3 SHA512 a1eed5cc25c888cf81d4f22b1f9494d5d8567b911f7aeb1d164a6359120543668280afe1a3ffc9ed87b139c7db67fbcaaabde2066e3279909d7cd6fc22eaf499 WHIRLPOOL 96ca3c3bd39116fd6109a3e436f41875b6e3343596165d2a7941a961562f5ebd412f0a455d57fc47a9551d0ba76df172a4ad2622500715625faa325d94f3d961
 DIST packrat-0.98.1000.tar.gz 97677 SHA256 c2da99ea6b62fd460f36b76f6c9b91865c42851545d61817c181bf6109e2df6b SHA512 2290c768ecf27a037e73c3f8336b9fd71c68ff19d071b4a8fbc469550d29007cacacdb75f854f73b5db2139a5104f129b85a3612e2ee47bd6118ee13f7d103a6 WHIRLPOOL a2d0c3c3e04cbc496f59abbf1065fcd0b7ae25433ce0b7ca8e75ab59362f320508537b2a62ed1028dd5baad6cbab5ef2e91dd9d3af327bbd04c08a96c57d80f4
 DIST packrat_0.3.0.tar.gz 79974 SHA256 5ea35b6cb964188f4ffe58a3c9cf2c1f5a436569117c218d097e0fa66d032ebb SHA512 7f964e94e62193466e9bc880fea2c2fef8a0996061d9b971789e4e33a2d1e6327033f03236327545aa73e1112e2bea730c3fc0984729ecdec6f1582855c1b249 WHIRLPOOL 7ff4c3f3681300d402e8738b1aceac7ee2dbd55edb36966e3b7453b1b90182093979436d2c1193d460418251bc370ab222f61142311d8fe1a5a42527c5869aa3
 DIST rmarkdown-0.98.1000.tar.gz 1423820 SHA256 56e9f964f805627f6d6face9bf09e6435be4cc48321447ad4041fee86d6f88b4 SHA512 df3540c24c87930fe55bff2ffe67c86c219800cb00ed72ba9451ecd0d0cad411548a78c1a04b9a2e301e853616dcb77e09129c4e48ade6f16d3f14b7ea7e4852 WHIRLPOOL 51098cd48a12a61da312fc1cc96927626db4a19cc069c88f615dd20abe40f52a7b1ac1325b52b1922110ffa76a7f255d9ff2a75cd05d3de01d1b96f0c8286790
 DIST rmarkdown_0.2.49.tar.gz 3846795 SHA256 56b9a032b07d62c6af2a4a2d04007cccf379a9c8e91426c59f265c8b7fd992ee SHA512 46d15c354c9a90ae75a7dc3660b1ea82d097aaceb3dd220a4a8c6f4b22751ad2d63fd5ef3d56821160716ab6552529cef6513b5cd7043368d13513f537511fef WHIRLPOOL d658a091d1b4508ea38fbf2f3691517dc2b814aa3ffaec25483263266106756a89712d7c8a2ec3de8d6d45234d5f8b11340c287509bd836be5875527077f7fcd
+DIST rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz 197051 SHA256 e1e3e1f799eb8be679be9a2ed5aad7e9ce6cd603e3cb43fdc242490f0c311113 SHA512 208dc349f4aa7613ecf94939aba60d22d3a06972344b526c9b6c951015571f5922927bca08db571a7b8a268e42609a4f558f01278c9685f6da2ffc66a1f95ade WHIRLPOOL 4e3d64de00a98190c435d76f12a401d30950fdc7590b6bcc886ae50d4771825d39f93ea2bdcb4a9db026361c522f16f11297ff89dcb15c35f9471c1abf4f4e2c
 DIST rstudio-0.97.336.tar.gz 12598580 SHA256 e6c24d6a865827d3a39e64508976a825bba705efe0921eb06f9a95ba58aefcd1 SHA512 bfaf6218cb400e83a97a320cf633e4656f1552e27bb9843fda1837945a3823fb0df20a2c86e0b6d76608d98806b0acf163aaba10783c923ef900b3eaf03b7569 WHIRLPOOL eca7b837ccff6cc6595298c3137f8663c0754256763a1d049e44a11e10daf53914234c426e004cc1f0158d7b4a38319f61653f78785c7189a64413fc196848c2
 DIST rstudio-0.97.551.tar.gz 12602738 SHA256 caed5f6b6ec57139ddf550dc2f51c1f9a74b39b81b878863b97e1a12edecf498 SHA512 f855a5ba3a86e44c870a4843e94678a1f6eeedc49934d8ad42f202815f93d282913a0be739435be63e510a6ec81b7a1436e4c911acbff955f5fb28b78b00fd10 WHIRLPOOL d8cd3d2978b690fc8c83696cb2017748e74b38309174ac85d6d35d5a1dd91d8e0d8ea06177b349754b3be9eb5e78e04b1d23b82f9e7940d062b262c1eb7eb58e
 DIST rstudio-0.98.1028.tar.gz 15555649 SHA256 19827c3d05b4817530fb07f235fe38ec5e391324acd1d5d8ab6711d0db4757ef SHA512 db1be9f91263386ad0fb8addc80421434695d2c8dd53101af268e878fd59c59b9349cc9456d7096d2c660ee2681cd0172d8f4d8432ccf7322a1a2b473ce291fd WHIRLPOOL ab2974d2e529fea03fe641569d4b74a6eb1d86179be47de46531a970d5f70624824e08573835d531a5033d20f800117174926b83aee290f784ac31f7a9627d7d
@@ -15,6 +17,7 @@ DIST rstudio-0.98.1091.tar.gz 15551758 SHA256 61745708096b5feb3d88befab65adf67dd
 DIST rstudio-0.98.490.tar.gz 14989329 SHA256 e38296a10b12c9e769a8be0545c36745999b9ba90942f7ffb6d27f05192a7f93 SHA512 b167083eb4adf1203da63299e61c9e3f40b8aeb4728d25c9d840f8a22659aad8de442dbba3a68e7d11f6157680d3a3636f6d5fecbabab82fd8d1a8278e3f1cb1 WHIRLPOOL d7c07aea3aef424aa9fa05f74b8222cae69b9ce287ba67d80591dc2a433471e7127d975119667560bf6667190d128b0ffcf82f641792075dacf826f4d76df568
 DIST rstudio-0.98.932.tar.gz 15515025 SHA256 e4a69a2f746cb7cfcacd3811f15e41a9d156175607da334f412614cc4cb70728 SHA512 beeb8c035d4f8524bd3e497162e3a218e92fbd1c1704ff3bc99a70a1248244155e3998272a6aa985b59cfa67c640adec877465f5d50acb9e47abca2657f2a06f WHIRLPOOL e422a2cef857aa9d094dd11e62b6c762a2a7477e7d84fd66456152c6521aebd94d4c365980ed6c06fc1c90d5a62426376d978de0ed23186d4732c0b148cc62bc
 DIST rstudio-0.98.953.tar.gz 15518231 SHA256 944f5882a0d61f551cd6f6cbe7882b5a5ea5be12d2c6d5ec9e79cee65869dbb7 SHA512 38a17d1abf91f4e775c4d735152fe6c8030b2df771bd7333fb3c9408fe14ac0b6180d7eaad7ac09ce2d50e5dcaa5a3b828909b30f507fd7c35fe27f7bd96866c WHIRLPOOL e2135f425b48b952282d8c44bd121517098521715c70537a6ac1a3be1732928666c5cb40fbc20b9f394a606e0e116723190790a202cbf62986ffbca528646058
+DIST rstudio-0.99.473.tar.gz 16993092 SHA256 a402995251393d50fa70e2e02188a8b32dc34e067f2f8461f087bf71f643585c SHA512 5615840501f7629e82100fee78c35b8d4dc78d78932d65c2e91a6472bc94726389566f5853a99e3d0631fd260e59acea5a40acf82f72709741b89a1ed3c901af WHIRLPOOL 809549c76efee8b29452584ab4295bcbbf533f8100c8caf4dd3b4a3c8843dc54a0d8f3178a6aecab5c188f2498a74daa6c6677fc6d43bd7dd861487c557e48df
 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-0.99.473-clang-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-0.99.473-clang-pandoc.patch
new file mode 100644
index 000000000000..b37a91929574
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-0.99.473-clang-pandoc.patch
@@ -0,0 +1,77 @@
+--- rstudio-0.99.473-orig/src/cpp/session/CMakeLists.txt	2015-08-12 09:58:43.000000000 +1000
++++ rstudio-0.99.473/src/cpp/session/CMakeLists.txt	2015-08-27 00:51:48.395751378 +1000
+@@ -25,30 +25,11 @@
+ 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/rsconnect")
+   message(FATAL_ERROR "rsconnect package 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
+ file(GLOB_RECURSE SESSION_HEADER_FILES "*.h*")
+ 
+@@ -391,18 +372,6 @@
+    install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-23"
+            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.13.1${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 rsconnect package
+    file(GLOB RSCONNECT_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rsconnect*.tar.gz")
+    install(FILES ${RSCONNECT_PACKAGE}
+@@ -420,24 +389,6 @@
+    install(DIRECTORY "resources/help_resources"
+            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-0.99.473-paths.patch b/sci-mathematics/rstudio/files/rstudio-0.99.473-paths.patch
new file mode 100644
index 000000000000..6b8d8886e21e
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-0.99.473-paths.patch
@@ -0,0 +1,130 @@
+--- rstudio-0.99.473-orig/CMakeGlobals.txt	2015-08-12 09:58:43.000000000 +1000
++++ rstudio-0.99.473/CMakeGlobals.txt	2015-08-26 22:12:43.614346285 +1000
+@@ -111,7 +111,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-0.99.473-orig/src/cpp/server/CMakeLists.txt	2015-08-12 09:58:43.000000000 +1000
++++ rstudio-0.99.473/src/cpp/server/CMakeLists.txt	2015-08-26 22:15:30.988353389 +1000
+@@ -160,7 +160,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")
+@@ -168,7 +168,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")
+@@ -176,13 +176,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")
+@@ -190,9 +190,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")
+@@ -200,12 +200,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-0.99.473-orig/src/cpp/server/ServerOptions.cpp	2015-08-12 09:58:43.000000000 +1000
++++ rstudio-0.99.473/src/cpp/server/ServerOptions.cpp	2015-08-26 22:12:43.615346286 +1000
+@@ -314,8 +314,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-0.99.473-orig/src/cpp/session/SessionOptions.cpp	2015-08-12 09:58:43.000000000 +1000
++++ rstudio-0.99.473/src/cpp/session/SessionOptions.cpp	2015-08-26 22:17:40.594358890 +1000
+@@ -43,7 +43,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";
+ } // anonymous namespace
+@@ -431,14 +431,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_);
+@@ -447,7 +447,7 @@
+    resolvePath(resourcePath, &msysSshPath_);
+    resolvePath(resourcePath, &sumatraPath_);
+ #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/rstudio-0.99.473.ebuild b/sci-mathematics/rstudio/rstudio-0.99.473.ebuild
new file mode 100644
index 000000000000..f98cffe1dab8
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-0.99.473.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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
+GWT_VER=2.7.0
+GIN_VER=1.5
+SELENIUM_VER=2.37.0
+CHROMEDRIVER_VER=2.7
+PANDOC_VER=1.13.1
+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.3
+	dev-libs/openssl:0
+	sys-apps/util-linux
+	>=sys-devel/clang-3.5.0 <sys-devel/clang-3.6.0
+	sys-libs/zlib
+	|| ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+	x11-libs/pango
+	!dedicated? (
+		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebkit-${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.7*:= =virtual/jdk-1.8*:= )
+	virtual/pkgconfig"
+#	test? ( dev-java/junit:4 )
+
+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() {
+	java-pkg-2_src_prepare
+
+	find . -name .gitignore -delete || die
+
+	epatch "${FILESDIR}"/${PN}-0.98.490-prefs.patch \
+		"${FILESDIR}"/${PN}-0.99.473-paths.patch \
+		"${FILESDIR}"/${PN}-0.99.473-clang-pandoc.patch \
+		"${FILESDIR}"/${PN}-0.98.490-linker_flags.patch \
+		"${FILESDIR}"/${PN}-0.98.1091-boost-1.57.patch
+
+	# 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-23 || 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
+}
+
+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}
+		$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP)
+		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
+		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/cmake
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	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 ;}
+}