sci-mathematics/rstudio: Remove old

Package-Manager: Portage-2.3.14, Repoman-2.3.6
author: David Seifert <soap@gentoo.org> 2017-11-19 13:49:48 +0100
committer: David Seifert <soap@gentoo.org> 2017-11-19 13:52:27 +0100
commit: 13286961d7bff3782a86321066e83cd944a22466 (patch)
tree: 347558a767435c74d65b1816dee583618c14c9c4 /sci-mathematics
parent: sci-visualization/gnuplot: Rename live ebuild to reflect upstream version. (diff)
download: gentoo-13286961d7bff3782a86321066e83cd944a22466.tar.gz
gentoo-13286961d7bff3782a86321066e83cd944a22466.tar.bz2
gentoo-13286961d7bff3782a86321066e83cd944a22466.zip
27 files changed, 0 insertions, 4546 deletions
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 5d4b2fdc3699..76c18739074d 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -5,21 +5,6 @@ DIST gwt-2.7.0.zip 108818328 SHA256 aa65061b73836190410720bea422eb8e787680d7bc0c
 DIST packrat-0.98.1000.tar.gz 97677 SHA256 c2da99ea6b62fd460f36b76f6c9b91865c42851545d61817c181bf6109e2df6b SHA512 2290c768ecf27a037e73c3f8336b9fd71c68ff19d071b4a8fbc469550d29007cacacdb75f854f73b5db2139a5104f129b85a3612e2ee47bd6118ee13f7d103a6 WHIRLPOOL a2d0c3c3e04cbc496f59abbf1065fcd0b7ae25433ce0b7ca8e75ab59362f320508537b2a62ed1028dd5baad6cbab5ef2e91dd9d3af327bbd04c08a96c57d80f4
 DIST rmarkdown-0.98.1000.tar.gz 1423820 SHA256 56e9f964f805627f6d6face9bf09e6435be4cc48321447ad4041fee86d6f88b4 SHA512 df3540c24c87930fe55bff2ffe67c86c219800cb00ed72ba9451ecd0d0cad411548a78c1a04b9a2e301e853616dcb77e09129c4e48ade6f16d3f14b7ea7e4852 WHIRLPOOL 51098cd48a12a61da312fc1cc96927626db4a19cc069c88f615dd20abe40f52a7b1ac1325b52b1922110ffa76a7f255d9ff2a75cd05d3de01d1b96f0c8286790
 DIST rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz 197051 SHA256 e1e3e1f799eb8be679be9a2ed5aad7e9ce6cd603e3cb43fdc242490f0c311113 SHA512 208dc349f4aa7613ecf94939aba60d22d3a06972344b526c9b6c951015571f5922927bca08db571a7b8a268e42609a4f558f01278c9685f6da2ffc66a1f95ade WHIRLPOOL 4e3d64de00a98190c435d76f12a401d30950fdc7590b6bcc886ae50d4771825d39f93ea2bdcb4a9db026361c522f16f11297ff89dcb15c35f9471c1abf4f4e2c
-DIST rstudio-0.99.473.tar.gz 16993092 SHA256 a402995251393d50fa70e2e02188a8b32dc34e067f2f8461f087bf71f643585c SHA512 5615840501f7629e82100fee78c35b8d4dc78d78932d65c2e91a6472bc94726389566f5853a99e3d0631fd260e59acea5a40acf82f72709741b89a1ed3c901af WHIRLPOOL 809549c76efee8b29452584ab4295bcbbf533f8100c8caf4dd3b4a3c8843dc54a0d8f3178a6aecab5c188f2498a74daa6c6677fc6d43bd7dd861487c557e48df
-DIST rstudio-0.99.482.tar.gz 16992873 SHA256 1185d6ce5d3872e134f3255668d8f082370c760f06ec409c7b84c0936f52c4bf SHA512 bdb845cceae851d27323448a3570621bcb2aba7742e9e1669c88f3ebeaaade8c8371eb38f2ad348d7e2b740778c34f73e59013502ae3cebafba84e5d249c3e52 WHIRLPOOL 743440227c8d7e56000b1ff0b1a12def50e006b4f34d2067587274e2bae0eda42656787fc0cf6c51ffdbfcca08fc6eab0d042891bd77e4446b6fe26c6d19cc05
-DIST rstudio-0.99.483.tar.gz 16993049 SHA256 85ce1a2f40690e4ed0338b153a1b3279ce9564396d8c6d6201a0ad39297d4a9a SHA512 7d9cc8b471a4d799f286193da5f6f950f85e82949ede0f1ffe3626a429a49204878fb731250e5f54164a48e1d6e9cbb19a04a38ff83e35fd46c0ba05ef78a9bc WHIRLPOOL 0c5c1d86b0bafe9d5ca02397793f902b4dca7edc3f507a472b8b235f91965d8a769a7873cc87d834fbb121792b52eb6908018ce6579acdf3d285b6ec986abc20
-DIST rstudio-0.99.484.tar.gz 16993033 SHA256 8ca4abccb9b554713077cf1057ac13abadfd7606f22ac3386b2a88a38ae8a427 SHA512 407f50747bca749ef2c512e727cbe062abdd99c1eb76af09761e6bdfb4208f30117e1ee55b485447f64f6cf249bc939ef1fb4f8ce0199595e241a3cc617b4b8b WHIRLPOOL 8cc16553ea2703f005908c69803b64da4172092cb0b3ff9015e7ec354340fcd1cfa82a218ac890adffafe3565ead94bee6f7bd239b1c56ee38cbeb5896f556b0
-DIST rstudio-0.99.486.tar.gz 16992775 SHA256 4057195465e5032625bad0304bfbd9d123a78c3e4d6d5d41abcc6ef6ccd18a6f SHA512 bb88d12f8ae2f79779532371d03a698a2c2897c212c42c8438d5223c14e1033098dbd7c278a929958fa4bbc764a3ceb101abe03634f0e33192de44cf97128a1f WHIRLPOOL 13c35a69e525d90c6694d068526a2aede76a086427539294e46db67d0fc92759fb9cb0a1169cf88745ae1e121fdd7ba2e46bd2d2fb3fa17dc7fcc65848820941
-DIST rstudio-0.99.491.tar.gz 16992702 SHA256 e8c21e2262b610a7ccf39283b97d114bee33c6840a060067b8019404ff44b03f SHA512 2658694d6154f4b91b2dc07a7ec653edb7f593c4d9829a06a5e600e4db465ca6059418be6812d5ba2529fd6202dd136f0f58d74576f856fdcf6f81032d74f3c2 WHIRLPOOL e71650a07cc010ab3c25955c7fa9e90eee68577c1ef78e02a5f81a0160c688908ec5ec4fd89c89e5a9bc49b926623cd5de976fb249aa2d472354d23f5fad76de
-DIST rstudio-0.99.879.tar.gz 17406999 SHA256 73fa59be34eb63d9ed194642a93ad529d2c67cdcbcd2f291952fdef8e999a097 SHA512 c2bbe598a4a9c2abc69e39807af70be5729a06bbcb73bac5249f74f3c3daddb2909bf4a46d988f0d4bfeabe308f0c31d2a75aa28a52f11c1343dfcead07e2c45 WHIRLPOOL 5c9c75a7891ac53eb80a36eff518d77a0c281b16bff383526ac1ede07ee57486d7b00be4e400a0cad48dfea92729becf25c67f18782af7930f9b4218592afe5c
-DIST rstudio-0.99.893.tar.gz 17407634 SHA256 90a657b1fa16cfc575ca884789bac47f17832eb8b92496d044da3c5d79b0b874 SHA512 baa2a8c27e101e74b8a3f3b1cd290c90031881ae11fb44606b9af1efa4114c4c6fe68298f554d8b83f96418159477579414ddb99d49d2942c021aa0697947222 WHIRLPOOL a81ed5ee17a730e9674b2a98b95f87e70c532df95fda15402952901f7def24cc673db724841579e5dbf184a3e9fc16cfada93284b40014edf74863a61e0798a5
-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.136.tar.gz 17786389 SHA256 bb6a8aa475e09dd090cd2b5ea505f578d270858784120599aee5c10bd8ca58e8 SHA512 cb4f98834f287267925169c8141bd0f95fd23cefdba8f407f76a24617bc40da56430745f112774838345330b9f99b9cac86d5b99517346a019e8e2cb3b01f713 WHIRLPOOL 5932ef2572670951a094f79e8805215fd50c3643b4a4654cb469d7181708a3327763531cb68e968e64ebdb7b44df03da0c18f9a06a12d968e908bedc43dac52f
-DIST rstudio-1.0.143.tar.gz 17791067 SHA256 8ae88731b4474e5e2ff9030aa14e168903fe3a7ffc4fa716f497084a86801062 SHA512 46eaa88dd8332f18bb3a43de6e262d8a365860d9add78aea6a2d345784b239972c9c73bf0b56f1736b2981b8f688dbaf5a83c6848d170c0cf61d0e51dd636a82 WHIRLPOOL db1c11be240db3528e46d359c7d40d64068dfe5f7d915c4a6b690444f7f7fbc11f3898a6e262fa625bfab906f0cbfb2a8e3288a4fd20470423a99d992972fcda
-DIST rstudio-1.0.153.tar.gz 17790922 SHA256 79b90e21e56b114e28b03fd8543a208c55bb9d5f47a87fd29143d08b9a06f7a0 SHA512 d970a9bde88845e3fc6cdaff5233ffb65c03939c685c3fca0dd052246e065c7580b3f9bc4e053a79d2ecbb5f8c283d3fce7b97cc69e43176bd49587c736dab86 WHIRLPOOL c1f4c7bdc8e5a85af53411a35d736278b83f4732d2e273378fecc77cb075dff507147d56012682564edd58041c91cc051189eb38a7348d0827b76c7ac37bd54d
-DIST rstudio-1.0.44.tar.gz 17774065 SHA256 43ece6cfdd1a13ac0e17f2a50154a30a1a14ad6c1b3cf381cc6007988ce44a0f SHA512 a8b975dc517125a257e5f61db5bb137e133b02d738d55553770aa65e388cd112ce646b53b77dc069d1ca95ccd95979f4a57ad60b99fc3b91543cf61e737e8169 WHIRLPOOL 4ad472aed130451e81d8d8e3251d3bbd701a8b8e2fbddf17dc357f39335e33c75505f9443c2c7208e60a19c2767b9328134433e5d4fd22504813020712c658ef
 DIST rstudio-1.1.368.tar.gz 20197144 SHA256 586573707a488b5f528680b932ba5f8ea6d07667cc5ae6426104e2abf5ddab75 SHA512 39cdf583d7dcd22338916cc0ea4f90681580e41663b2d3e04b2e650759c6b030c85ee111cdfe1f717f931932a9b7ca423a21585d69a785f056f754f6d50399a1 WHIRLPOOL e18ff21823638d458179819e0b0b234b80be2f095f5b7bf5b9ac0190b078f0d7acb51e8896cbfcf1ce33cd203ed4e9fbe097aac6eee62515cace1d2f08c08219
 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
diff --git a/sci-mathematics/rstudio/files/rstudio-0.98.1091-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-0.98.1091-pandoc.patch
deleted file mode 100644
index 3df8d1a986a3..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-0.98.1091-pandoc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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}
diff --git a/sci-mathematics/rstudio/files/rstudio-0.98.490-paths.patch b/sci-mathematics/rstudio/files/rstudio-0.98.490-paths.patch
deleted file mode 100644
index d28ad5cb0752..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-0.98.490-paths.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-diff --git a/CMakeGlobals.txt b/CMakeGlobals.txt
-index cc10191..f75b85a 100644
---- a/CMakeGlobals.txt
-+++ b/CMakeGlobals.txt
-@@ -105,7 +105,7 @@ else()
-    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
-diff --git a/src/cpp/server/CMakeLists.txt b/src/cpp/server/CMakeLists.txt
-index 184e514..d09aac5 100644
---- a/src/cpp/server/CMakeLists.txt
-+++ b/src/cpp/server/CMakeLists.txt
-@@ -145,7 +145,7 @@ if (UNIX AND NOT APPLE)
-    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")
-@@ -153,7 +153,7 @@ if (UNIX AND NOT APPLE)
-    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")
-@@ -161,13 +161,13 @@ if (UNIX AND NOT APPLE)
-    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")
-@@ -175,9 +175,9 @@ if (UNIX AND NOT APPLE)
-    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")
-@@ -185,12 +185,12 @@ if (UNIX AND NOT APPLE)
-    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})
- 
- endif()
- 
-diff --git a/src/cpp/server/ServerOptions.cpp b/src/cpp/server/ServerOptions.cpp
-index 1eaf7c0..4b25fa1 100644
---- a/src/cpp/server/ServerOptions.cpp
-+++ b/src/cpp/server/ServerOptions.cpp
-@@ -307,8 +307,8 @@ ProgramStatus Options::read(int argc,
- 
-    // 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_);
-diff --git a/src/cpp/session/SessionOptions.cpp b/src/cpp/session/SessionOptions.cpp
-index 44b3d55..a48cdb6 100644
---- a/src/cpp/session/SessionOptions.cpp
-+++ b/src/cpp/session/SessionOptions.cpp
-@@ -357,14 +357,14 @@ core::ProgramStatus Options::read(int argc, char * const argv[])
-       timeoutMinutes_ = 0;
- 
-    // 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, &sessionPackagesPath_);
-+   resolvePath(resourcePath.childPath(DISTRO_SHARE), &rResourcesPath_);
-+   resolvePath(resourcePath.childPath(DISTRO_SHARE), &agreementFilePath_);
-+   resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_);
-+   resolvePath(resourcePath.childPath(DISTRO_SHARE), &coreRSourcePath_);
-+   resolvePath(resourcePath.childPath(DISTRO_SHARE), &modulesRSourcePath_);
-+   resolvePath(resourcePath.childPath(DISTRO_SHARE), &sessionLibraryPath_);
-+   resolvePath(resourcePath.childPath(DISTRO_SHARE), &sessionPackagesPath_);
-+   resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_);
-    resolvePostbackPath(resourcePath, &rpostbackPath_);
- #ifdef _WIN32
-    resolvePath(resourcePath, &consoleIoPath_);
diff --git a/sci-mathematics/rstudio/files/rstudio-0.98.490-prefs.patch b/sci-mathematics/rstudio/files/rstudio-0.98.490-prefs.patch
deleted file mode 100644
index 3175d47235ab..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-0.98.490-prefs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-And now we fix src/gwt/build.xml since java's user preference class is
-braindead and insists on writing where it is not allowed.
-much thanks to http://www.allaboutbalance.com/articles/disableprefs/
-
-diff --git a/src/gwt/build.xml b/src/gwt/build.xml
-index e7d2418..ae3a331 100644
---- a/src/gwt/build.xml
-+++ b/src/gwt/build.xml
-@@ -25,6 +25,7 @@
-    <property name="gwt.extra.args" value=""/>
-    <property name="gwt.main.module" value="org.rstudio.studio.RStudio"/>
-    <property name="ace.bin" value="src/org/rstudio/studio/client/workbench/views/source/editors/text/ace"/>
-+   <property environment="env"/>
- 
-    <path id="project.class.path">
-       <pathelement location="bin"/>
-@@ -109,6 +110,7 @@
-          </classpath>
-          <!-- add jvmarg -Xss16M or similar if you see a StackOverflowError -->
-          <jvmarg value="-Xmx1024M"/>
-+         <jvmarg value="-Djava.util.prefs.userRoot=${env.T}"/>
-          <arg value="-war"/>
-          <arg value="www"/>
-          <arg value="-localWorkers"/>
diff --git a/sci-mathematics/rstudio/files/rstudio-0.98.932-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-0.98.932-pandoc.patch
deleted file mode 100644
index d2b6911eabb8..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-0.98.932-pandoc.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/src/cpp/session/CMakeLists.txt
-+++ b/src/cpp/session/CMakeLists.txt
-@@ -25,9 +25,6 @@
- if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax")
-   message(FATAL_ERROR "Mathjax 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()
-@@ -337,12 +334,6 @@
-    install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax"
-            DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
- 
--   # install pandoc
--   set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/1.12.3")
--   file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*")
--   install(PROGRAMS ${PANDOC_FILES}
--           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-0.98.932-paths.patch b/sci-mathematics/rstudio/files/rstudio-0.98.932-paths.patch
deleted file mode 100644
index d4bb4249f1a6..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-0.98.932-paths.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-diff --git a/CMakeGlobals.txt b/CMakeGlobals.txt
-index cc10191..f75b85a 100644
---- a/CMakeGlobals.txt
-+++ b/CMakeGlobals.txt
-@@ -105,7 +105,7 @@ else()
-    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
-diff --git a/src/cpp/server/CMakeLists.txt b/src/cpp/server/CMakeLists.txt
-index 184e514..d09aac5 100644
---- a/src/cpp/server/CMakeLists.txt
-+++ b/src/cpp/server/CMakeLists.txt
-@@ -145,7 +145,7 @@ if (UNIX AND NOT APPLE)
-    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")
-@@ -153,7 +153,7 @@ if (UNIX AND NOT APPLE)
-    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")
-@@ -161,13 +161,13 @@ if (UNIX AND NOT APPLE)
-    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")
-@@ -175,9 +175,9 @@ if (UNIX AND NOT APPLE)
-    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")
-@@ -185,12 +185,12 @@ if (UNIX AND NOT APPLE)
-    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})
- 
- endif()
- 
-diff --git a/src/cpp/server/ServerOptions.cpp b/src/cpp/server/ServerOptions.cpp
-index 1eaf7c0..4b25fa1 100644
---- a/src/cpp/server/ServerOptions.cpp
-+++ b/src/cpp/server/ServerOptions.cpp
-@@ -307,8 +307,8 @@ ProgramStatus Options::read(int argc,
- 
-    // 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_);
-diff --git a/src/cpp/session/SessionOptions.cpp b/src/cpp/session/SessionOptions.cpp
-index 44b3d55..a48cdb6 100644
---- a/src/cpp/session/SessionOptions.cpp
-+++ b/src/cpp/session/SessionOptions.cpp
-@@ -40,7 +40,7 @@
- namespace session {  
- 
- namespace {
--const char* const kDefaultPandocPath = "bin/pandoc";
-+const char* const kDefaultPandocPath = "bin";
- const char* const kDefaultPostbackPath = "bin/postback/rpostback";
- } // anonymous namespace
- 
-@@ -392,15 +392,15 @@
-    }
- 
-    // 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, &sessionPackagesPath_);
--   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), &coreRSourcePath_);
-+   resolvePath(resourcePath.childPath(DISTRO_SHARE), &modulesRSourcePath_);
-+   resolvePath(resourcePath.childPath(DISTRO_SHARE), &sessionLibraryPath_);
-+   resolvePath(resourcePath.childPath(DISTRO_SHARE), &sessionPackagesPath_);
-+   resolvePath(resourcePath.childPath(DISTRO_SHARE), &sessionPackageArchivesPath_);
-+   resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_);
-    resolvePostbackPath(resourcePath, &rpostbackPath_);
- #ifdef _WIN32
-    resolvePath(resourcePath, &consoleIoPath_);
-@@ -409,7 +409,7 @@
-    resolvePath(resourcePath, &msysSshPath_);
-    resolvePath(resourcePath, &sumatraPath_);
- #endif
--   resolvePath(resourcePath, &hunspellDictionariesPath_);
-+   resolvePath(resourcePath.childPath(DISTRO_SHARE), &hunspellDictionariesPath_);
-    resolvePath(resourcePath, &mathjaxPath_);
-    resolvePandocPath(resourcePath, &pandocPath_);
- 
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
deleted file mode 100644
index b37a91929574..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-0.99.473-clang-pandoc.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- 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
deleted file mode 100644
index 6b8d8886e21e..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-0.99.473-paths.patch
+++ /dev/null
@@ -1,130 +0,0 @@
---- 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/files/rstudio-0.99.486-systemd.patch b/sci-mathematics/rstudio/files/rstudio-0.99.486-systemd.patch
deleted file mode 100644
index 4c7eda39cc29..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-0.99.486-systemd.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur /tmp/rstudio.org/work/rstudio-0.99.486/src/cpp/server/CMakeLists.txt ./work/rstudio-0.99.486/src/cpp/server/CMakeLists.txt
---- /tmp/rstudio.org/work/rstudio-0.99.486/src/cpp/server/CMakeLists.txt	2015-12-10 19:29:24.408267862 +0100
-+++ ./work/rstudio-0.99.486/src/cpp/server/CMakeLists.txt	2015-12-10 19:35:24.660194216 +0100
-@@ -208,17 +208,12 @@
-            DESTINATION ${DISTRO_SHARE}/${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})
- 
- endif()
- 
diff --git a/sci-mathematics/rstudio/files/rstudio-0.99.879-clang-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-0.99.879-clang-pandoc.patch
deleted file mode 100644
index c3af2b7a6f56..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-0.99.879-clang-pandoc.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- rstudio-0.99.879-orig/src/cpp/session/CMakeLists.txt	2016-02-12 09:24:39.000000000 +1100
-+++ rstudio-0.99.879/src/cpp/session/CMakeLists.txt	2016-02-19 23:04:57.266186448 +1100
-@@ -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*")
- 
-@@ -399,18 +380,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.15.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 rsconnect package
-    file(GLOB RSCONNECT_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rsconnect*.tar.gz")
-    install(FILES ${RSCONNECT_PACKAGE}
-@@ -428,24 +397,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.879-paths.patch b/sci-mathematics/rstudio/files/rstudio-0.99.879-paths.patch
deleted file mode 100644
index a8b48f24968c..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-0.99.879-paths.patch
+++ /dev/null
@@ -1,130 +0,0 @@
---- rstudio-0.99.879-orig/CMakeGlobals.txt	2016-02-12 09:24:39.000000000 +1100
-+++ rstudio-0.99.879/CMakeGlobals.txt	2016-02-19 22:58:41.396818474 +1100
-@@ -120,7 +120,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.879-orig/src/cpp/server/CMakeLists.txt	2016-02-12 09:24:39.000000000 +1100
-+++ rstudio-0.99.879/src/cpp/server/CMakeLists.txt	2016-02-19 22:58:41.397818478 +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-0.99.879-orig/src/cpp/server/ServerOptions.cpp	2016-02-12 09:24:39.000000000 +1100
-+++ rstudio-0.99.879/src/cpp/server/ServerOptions.cpp	2016-02-19 22:58:41.397818478 +1100
-@@ -382,8 +382,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.879-orig/src/cpp/session/SessionOptions.cpp	2016-02-12 09:24:39.000000000 +1100
-+++ rstudio-0.99.879/src/cpp/session/SessionOptions.cpp	2016-02-20 18:13:34.807771539 +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";
- } // anonymous namespace
-@@ -451,14 +451,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_);
-@@ -467,7 +467,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/files/rstudio-1.0.44-clang-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-1.0.44-clang-pandoc.patch
deleted file mode 100644
index ed0fc8ebce4b..000000000000
--- a/sci-mathematics/rstudio/files/rstudio-1.0.44-clang-pandoc.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- 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/rstudio-0.99.473-r1.ebuild b/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
deleted file mode 100644
index cd4815f5d332..000000000000
--- a/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-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.3
-	dev-libs/openssl:0
-	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0:*
-	sys-libs/zlib
-	>=virtual/jre-1.7:=
-	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/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.7:=
-	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
-
-	egit_clean
-
-	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 \
-		"${FILESDIR}"/${PN}-0.99.473-qtsingleapplication.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
-
-	# 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
-
-	# Avoid some of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
-	# P: /root/.oracle_jre_usage.
-	sed -e 's@\(\s*\)\(</classpath>\)@\1\2\n\1\<jvmarg value="-Duser.home=${env.T}"/>@g' \
-		-i "${S}"/src/gwt/build.xml \
-		|| 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=$(qt5_get_bindir)/qmake
-		)
-
-	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 ;}
-}
diff --git a/sci-mathematics/rstudio/rstudio-0.99.482.ebuild b/sci-mathematics/rstudio/rstudio-0.99.482.ebuild
deleted file mode 100644
index cd4815f5d332..000000000000
--- a/sci-mathematics/rstudio/rstudio-0.99.482.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-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.3
-	dev-libs/openssl:0
-	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0:*
-	sys-libs/zlib
-	>=virtual/jre-1.7:=
-	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/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.7:=
-	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
-
-	egit_clean
-
-	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 \
-		"${FILESDIR}"/${PN}-0.99.473-qtsingleapplication.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
-
-	# 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
-
-	# Avoid some of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
-	# P: /root/.oracle_jre_usage.
-	sed -e 's@\(\s*\)\(</classpath>\)@\1\2\n\1\<jvmarg value="-Duser.home=${env.T}"/>@g' \
-		-i "${S}"/src/gwt/build.xml \
-		|| 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=$(qt5_get_bindir)/qmake
-		)
-
-	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 ;}
-}
diff --git a/sci-mathematics/rstudio/rstudio-0.99.483.ebuild b/sci-mathematics/rstudio/rstudio-0.99.483.ebuild
deleted file mode 100644
index cd4815f5d332..000000000000
--- a/sci-mathematics/rstudio/rstudio-0.99.483.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-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.3
-	dev-libs/openssl:0
-	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0:*
-	sys-libs/zlib
-	>=virtual/jre-1.7:=
-	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/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.7:=
-	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
-
-	egit_clean
-
-	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 \
-		"${FILESDIR}"/${PN}-0.99.473-qtsingleapplication.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
-
-	# 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
-
-	# Avoid some of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
-	# P: /root/.oracle_jre_usage.
-	sed -e 's@\(\s*\)\(</classpath>\)@\1\2\n\1\<jvmarg value="-Duser.home=${env.T}"/>@g' \
-		-i "${S}"/src/gwt/build.xml \
-		|| 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=$(qt5_get_bindir)/qmake
-		)
-
-	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 ;}
-}
diff --git a/sci-mathematics/rstudio/rstudio-0.99.484.ebuild b/sci-mathematics/rstudio/rstudio-0.99.484.ebuild
deleted file mode 100644
index cd4815f5d332..000000000000
--- a/sci-mathematics/rstudio/rstudio-0.99.484.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-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.3
-	dev-libs/openssl:0
-	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0:*
-	sys-libs/zlib
-	>=virtual/jre-1.7:=
-	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/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.7:=
-	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
-
-	egit_clean
-
-	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 \
-		"${FILESDIR}"/${PN}-0.99.473-qtsingleapplication.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
-
-	# 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
-
-	# Avoid some of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
-	# P: /root/.oracle_jre_usage.
-	sed -e 's@\(\s*\)\(</classpath>\)@\1\2\n\1\<jvmarg value="-Duser.home=${env.T}"/>@g' \
-		-i "${S}"/src/gwt/build.xml \
-		|| 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=$(qt5_get_bindir)/qmake
-		)
-
-	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 ;}
-}
diff --git a/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild b/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild
deleted file mode 100644
index a0c4907f68f8..000000000000
--- a/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-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.3
-	dev-libs/openssl:0
-	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0:*
-	sys-libs/zlib
-	>=virtual/jre-1.7:=
-	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/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.7:=
-	virtual/pkgconfig"
-#	test? ( dev-java/junit:4 )
-
-PATCHES=(
-		"${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"
-		"${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch"
-		"${FILESDIR}/${PN}-0.99.486-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() {
-	java-pkg-2_src_prepare
-
-	egit_clean
-
-	epatch "${PATCHES[@]}"
-
-	# 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-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
-
-	# 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
-
-	# Avoid some of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
-	# P: /root/.oracle_jre_usage.
-	sed -e 's@\(\s*\)\(</classpath>\)@\1\2\n\1\<jvmarg value="-Duser.home=${env.T}"/>@g' \
-		-i "${S}"/src/gwt/build.xml \
-		|| 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=$(qt5_get_bindir)/qmake
-		)
-
-	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 ;}
-}
diff --git a/sci-mathematics/rstudio/rstudio-0.99.491.ebuild b/sci-mathematics/rstudio/rstudio-0.99.491.ebuild
deleted file mode 100644
index a0c4907f68f8..000000000000
--- a/sci-mathematics/rstudio/rstudio-0.99.491.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-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.3
-	dev-libs/openssl:0
-	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0:*
-	sys-libs/zlib
-	>=virtual/jre-1.7:=
-	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/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.7:=
-	virtual/pkgconfig"
-#	test? ( dev-java/junit:4 )
-
-PATCHES=(
-		"${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"
-		"${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch"
-		"${FILESDIR}/${PN}-0.99.486-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() {
-	java-pkg-2_src_prepare
-
-	egit_clean
-
-	epatch "${PATCHES[@]}"
-
-	# 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-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
-
-	# 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
-
-	# Avoid some of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
-	# P: /root/.oracle_jre_usage.
-	sed -e 's@\(\s*\)\(</classpath>\)@\1\2\n\1\<jvmarg value="-Duser.home=${env.T}"/>@g' \
-		-i "${S}"/src/gwt/build.xml \
-		|| 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=$(qt5_get_bindir)/qmake
-		)
-
-	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 ;}
-}
diff --git a/sci-mathematics/rstudio/rstudio-0.99.879.ebuild b/sci-mathematics/rstudio/rstudio-0.99.879.ebuild
deleted file mode 100644
index 6adb372e5cd4..000000000000
--- a/sci-mathematics/rstudio/rstudio-0.99.879.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-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.3
-	dev-libs/openssl:0
-	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0:*
-	sys-libs/zlib
-	>=virtual/jre-1.7:=
-	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/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.7:=
-	virtual/pkgconfig"
-#	test? ( dev-java/junit:4 )
-
-PATCHES=(
-		"${FILESDIR}/${PN}-0.99.879-prefs.patch"
-		"${FILESDIR}/${PN}-0.99.879-paths.patch"
-		"${FILESDIR}/${PN}-0.99.879-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}-0.99.486-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() {
-	java-pkg-2_src_prepare
-
-	egit_clean
-
-	epatch "${PATCHES[@]}"
-
-	# 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-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
-
-	# 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 v0.99.879
-	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 9ac918338d6f9d6dd25807d6d746b470f1cfcf6d@'\
-		-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}
-		$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP)
-		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/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 ;}
-}
diff --git a/sci-mathematics/rstudio/rstudio-0.99.893.ebuild b/sci-mathematics/rstudio/rstudio-0.99.893.ebuild
deleted file mode 100644
index c3bc93830dde..000000000000
--- a/sci-mathematics/rstudio/rstudio-0.99.893.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-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.3
-	dev-libs/openssl:0
-	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0:*
-	sys-libs/zlib
-	>=virtual/jre-1.7:=
-	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/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.7:=
-	virtual/pkgconfig"
-#	test? ( dev-java/junit:4 )
-
-PATCHES=(
-		"${FILESDIR}/${PN}-0.99.879-prefs.patch"
-		"${FILESDIR}/${PN}-0.99.879-paths.patch"
-		"${FILESDIR}/${PN}-0.99.879-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}-0.99.486-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() {
-	java-pkg-2_src_prepare
-
-	egit_clean
-
-	epatch "${PATCHES[@]}"
-
-	# 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-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
-
-	# 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 v0.99.893
-	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 7510856081e5b1b577bcc230fc2c8ac62eafa62e@'\
-		-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}
-		$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP)
-		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/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 ;}
-}
diff --git a/sci-mathematics/rstudio/rstudio-0.99.896.ebuild b/sci-mathematics/rstudio/rstudio-0.99.896.ebuild
deleted file mode 100644
index 134838bcf653..000000000000
--- a/sci-mathematics/rstudio/rstudio-0.99.896.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-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.3
-	dev-libs/openssl:0
-	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0:*
-	sys-libs/zlib
-	>=virtual/jre-1.7:=
-	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/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.7:=
-	virtual/pkgconfig"
-#	test? ( dev-java/junit:4 )
-
-PATCHES=(
-		"${FILESDIR}/${PN}-0.99.879-prefs.patch"
-		"${FILESDIR}/${PN}-0.99.879-paths.patch"
-		"${FILESDIR}/${PN}-0.99.879-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}-0.99.486-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() {
-	java-pkg-2_src_prepare
-
-	egit_clean
-
-	epatch "${PATCHES[@]}"
-
-	# 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-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
-
-	# 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 v0.99.896
-	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 5dbc604635bb296bc41fb7fa21e56f7195fbe1ca@'\
-		-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}
-		$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP)
-		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/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 ;}
-}
diff --git a/sci-mathematics/rstudio/rstudio-0.99.902.ebuild b/sci-mathematics/rstudio/rstudio-0.99.902.ebuild
deleted file mode 100644
index bd0e219d50ff..000000000000
--- a/sci-mathematics/rstudio/rstudio-0.99.902.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-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.3
-	dev-libs/openssl:0
-	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0:*
-	sys-libs/zlib
-	>=virtual/jre-1.7:=
-	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/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.7:=
-	virtual/pkgconfig"
-#	test? ( dev-java/junit:4 )
-
-PATCHES=(
-		"${FILESDIR}/${PN}-0.99.879-prefs.patch"
-		"${FILESDIR}/${PN}-0.99.879-paths.patch"
-		"${FILESDIR}/${PN}-0.99.879-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}-0.99.486-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() {
-	java-pkg-2_src_prepare
-
-	egit_clean
-
-	epatch "${PATCHES[@]}"
-
-	# 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-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
-
-	# 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 v0.99.902
-	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 4daf125408b86eeba48a39f62df34eb81d934639@'\
-		-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}
-		$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP)
-		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/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 ;}
-}
diff --git a/sci-mathematics/rstudio/rstudio-0.99.903.ebuild b/sci-mathematics/rstudio/rstudio-0.99.903.ebuild
deleted file mode 100644
index 60d0858c53c8..000000000000
--- a/sci-mathematics/rstudio/rstudio-0.99.903.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-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.3
-	dev-libs/openssl:0
-	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0:*
-	sys-libs/zlib
-	>=virtual/jre-1.7:=
-	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/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.7:=
-	virtual/pkgconfig"
-#	test? ( dev-java/junit:4 )
-
-PATCHES=(
-		"${FILESDIR}/${PN}-0.99.879-prefs.patch"
-		"${FILESDIR}/${PN}-0.99.879-paths.patch"
-		"${FILESDIR}/${PN}-0.99.879-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}-0.99.486-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() {
-	java-pkg-2_src_prepare
-
-	egit_clean
-
-	epatch "${PATCHES[@]}"
-
-	# 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-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
-
-	# 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 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}
-		$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP)
-		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/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 ;}
-}
diff --git a/sci-mathematics/rstudio/rstudio-1.0.136.ebuild b/sci-mathematics/rstudio/rstudio-1.0.136.ebuild
deleted file mode 100644
index dcb101cac4e3..000000000000
--- a/sci-mathematics/rstudio/rstudio-1.0.136.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-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[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/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' \
-				   $(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 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=$(qt5_get_bindir)/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 ;}
-}
diff --git a/sci-mathematics/rstudio/rstudio-1.0.143.ebuild b/sci-mathematics/rstudio/rstudio-1.0.143.ebuild
deleted file mode 100644
index dcb101cac4e3..000000000000
--- a/sci-mathematics/rstudio/rstudio-1.0.143.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-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[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/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' \
-				   $(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 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=$(qt5_get_bindir)/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 ;}
-}
diff --git a/sci-mathematics/rstudio/rstudio-1.0.153.ebuild b/sci-mathematics/rstudio/rstudio-1.0.153.ebuild
deleted file mode 100644
index dcb101cac4e3..000000000000
--- a/sci-mathematics/rstudio/rstudio-1.0.153.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-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[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/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' \
-				   $(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 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=$(qt5_get_bindir)/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 ;}
-}
diff --git a/sci-mathematics/rstudio/rstudio-1.0.44.ebuild b/sci-mathematics/rstudio/rstudio-1.0.44.ebuild
deleted file mode 100644
index dcb101cac4e3..000000000000
--- a/sci-mathematics/rstudio/rstudio-1.0.44.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-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[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/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' \
-				   $(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 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=$(qt5_get_bindir)/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 ;}
-}
author	David Seifert <soap@gentoo.org>	2017-11-19 13:49:48 +0100
committer	David Seifert <soap@gentoo.org>	2017-11-19 13:52:27 +0100
commit	13286961d7bff3782a86321066e83cd944a22466 (patch)
tree	347558a767435c74d65b1816dee583618c14c9c4 /sci-mathematics
parent	sci-visualization/gnuplot: Rename live ebuild to reflect upstream version. (diff)
download	gentoo-13286961d7bff3782a86321066e83cd944a22466.tar.gz gentoo-13286961d7bff3782a86321066e83cd944a22466.tar.bz2 gentoo-13286961d7bff3782a86321066e83cd944a22466.zip