diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
deleted file mode 100644
index e2beb6ae508d9ed8a76f3988d1eebb0842ca8739..0000000000000000000000000000000000000000
--- a/sci-mathematics/rstudio/Manifest
+++ /dev/null
@@ -1,20 +0,0 @@
-AUX rstudio-0.94.106-linker_flags.patch 729 SHA256 5501af495ca27a4028e1cef976277a0a3225d83fdc8a4d3dcbde26fbf751ec9a SHA512 a723c56577258a940f3aa59da92add5f7cd178a507dbc03e4c70c199bbaeb43d1b71cbaec66c8a74cce08370d4ed25314728831c075efd2aae7a13c8d881c1fe WHIRLPOOL 9f589583f47a6c989ca750557feb94c2baeb4e2a1696933cba26eebba96b654525599a62dc3bf35b2b9da342eb0d02c281f6da8a0918d8a35db96009a43817e1
-AUX rstudio-0.94.106-paths.patch 5314 SHA256 69f684e1e977b30feb5447d69959eff762dd3ee3ca83e69cf98d9978b8db08f2 SHA512 01b984b3d70f92dbfbafb94700a588c4568cddf7a5b99ad5d4c0db5c14431e9845ad4e3a3e1f12c5a48fa9bc10ed1f71640602dfbdc1e10309d03b26226fbc96 WHIRLPOOL b4d130d7ed770e4c673b11222b55c2014bf784588be3625a08710b586fa4e8cd44599049a8510348664fd81a953b75c0609b509e52ebf2d4b63015fa49ee7cc6
-AUX rstudio-0.94.106-prefs.patch 1044 SHA256 96c327675f0224ce053c33e266fe51e1a3cc97b4aa403ef89676bf5b7ef9062b SHA512 0aa8860f7be03bd2835ace92066408dc14299f99ba84b454ee9332d4b171932e59455af37b3a863a5f618a4ca8dfbd60b2c34c67adf2b896da3575ce67ab8ced WHIRLPOOL a55ce8227b4077b88eb815a34d32dda8d0c5d45af57d48cc977ac58971372d5f358cb6578c71944b0a18f0318a3243ef3ae79ca5c3203b87a5828130f9f09ab4
-AUX rstudio-0.94.110-linker_flags.patch 735 SHA256 5cb72583f7f44bfc3be5ad15b07b325567da057569e17deb561ca2df2ed088cc SHA512 4631900b5a18b5bcc4c701c9f5ebac5a607b344d39eaaa7099fee19632ce7125790fbdb178a418171491b466149f4b2769d84257bd429fd09b28fc6f30a87c20 WHIRLPOOL a571c27bdbe8cdac7a43d462f7001ae2bcb42304b5155658ca0023723b33aa1f47f4f78b5d74db518096883bc37f3a16187902ebad892c4d80b16ae98ed529b1
-AUX rstudio-0.94.110-paths.patch 5338 SHA256 43aad37002213c7cd3f80588b051a900e1c11223585fb5829796f584810fbd57 SHA512 9daf02a40788c7f5f962466e93a613edb5a6debe66483b7def8dc4248e95fbd0fb7f15e3f45a6723bc0fa0141f1d1e77067c495de2dc1356a2253d2603df3508 WHIRLPOOL c065c042ebc844dbfac728fe4af6c76d7ab98af22d37f645e2ce9bcfe7af01b1155886b305ed855d25ef576de9ffbdb0e2aaabb9e0e863e134819bff50b5f6cf
-AUX rstudio-0.94.110-prefs.patch 1044 SHA256 2da49a836daa1d3ddf3ace0ca0523335fb5bea1733273bd7eb1e7a7311922d7d SHA512 53bbd0f5407438bc7019bb4e1c67d8e17e30f384ece6d3aa633cda64f2ab3040bf34307659ccf74270e59dae8c18e04aabd55551bf42bb5725710a5aca195649 WHIRLPOOL 695485793168639aa96e955ad0df650d0774365786833e2f8a40e8ede6b94885f1bd8a741921fd1f3f1b33ae60476e326a5d05e9703eb8bb8e1a779000045a5c
-AUX rstudio-0.95.263-linker_flags.patch 539 SHA256 55265fe3d1d2f785a64855ffd47ec606471cbe5eb0d6723337f8a26b9e41bf84 SHA512 bde696830f3aa896fae9032e7c6df4f4689de78e2ca523cdce581733dcaa2c2cab4e27f653ec1763ba4fe1c3b7c7d93458db5fbd64ac5d2b2a0377405a554c64 WHIRLPOOL 0a451b2dfbe07bfb89d5f86f33d5bd729fffa728611d69bfc92396be17bd8bd78dd2bfbcd70804884cd2eedf2909051814efac99611c1ea2166f27a2d7127a50
-AUX rstudio-0.95.263-paths.patch 5244 SHA256 529aa1026f76f9d330b45d4f4cc5db581ea40f8c647cf8db5cd15262f9b88850 SHA512 024dac7230f2518fb4b3a41b87a3321224163032f28d75bf4333e05f6997f89bdc3acc23bdfce2c02cc74539437d1de2781d39a388440b4c7ae03e135da5dc4f WHIRLPOOL 07feea9edafe0706dde57ae7c23bf550df6dd3b965c1e38b143c198a922c0b5c3b69dd7c6c45e9c1256055467aeababa50ff95c208d054c78a8ce420a2864489
-AUX rstudio-0.95.263-prefs.patch 809 SHA256 214974374ea629ef11603f71acad491d83cd283f66af9bd38ed48451c9d17bc7 SHA512 9bd75443938362a6d68faf196123bbfad7478b8668894b9ca46769cddb4a5fe40b23656b3ce178218d47cb6110639522e4ca36493c0ac492cd4761084c9a6c94 WHIRLPOOL 39505fcf0c1348d30f7dc2c748b5dcecbb5a3dddaed74b8439d53aa138c2d158d7d3cdaab4ca801f5631016b6bdaa5e122019e7e8193016f88aa2733ffe00200
-AUX rstudio-rserver.initd 376 SHA256 1ae2913cd60b59ac91cc73a3656d7a61e0df0ef85be9a534b99259ad2d5dfe0b SHA512 d0259040fd725aa475c6a064f501301d08b110fa33e7ad707f628cd068e66e6c583262abf04c07e4d6313a793d4b4a6c38b711d63713c447fc62dcc104f247a7 WHIRLPOOL 7605b7b4a5adae2df2095dce89b7d3fbc0b91d94de049d621af40cb0e20a67c07c2d6bbcec438899aabef8607c6832d1e20ad6a5c3bb9c057007bfad93ec3083
-AUX rstudio-rstudio.desktop 182 SHA256 3f5c3e1fa70a54b73b257bfbcbe7b7e17b3674199ce6c16656d1bf8d0a1dface SHA512 8c70f1bbc6d954f15619bdbfba7463bfc16b0c4167d3be41dafd02eb1458b49b6fa5cf723adb46c8f966413b873eb55fe8261dee2fe4d28ba913b320b64ebc9f WHIRLPOOL ef11f9aaae124836a9835e7798a0e6bbdc4275fd5516f9f66415d8cd357b7e22e68905066c479981bd2e7d710ac668365d263141a927176c9a22b7639f90c12d
-DIST rstudio-0.94.106.tar.gz 8164070 SHA256 e9f42eb775db1795889624c1619d9d57bdd50c7c13bb845159dfc33645caec97 SHA512 c784c783c02b219cf21cfd09808e7973465d3287e9eb44d2619a988f4d6e4af477905e0bb317fbbda9429c655658040ad8a9db404c13c701aae9be625d21d4cd WHIRLPOOL 1e95a055701690d295bf68cc9e86f46be14bbb9488b72103dc2cde1d816768b06567c3cf2b848c8127d1a049fc141b9a2d439e88df9e67fcacc38fe49519e1a3
-DIST rstudio-0.94.110.tar.gz 8164205 SHA256 d7d25cd1933c227578fe573e2eac8bd0752d4bd4fa2b3a7dcc112b72d186c381 SHA512 bd0e52d436b95adafde7f8f846742e606459777aae89f1aecba0e7da8aaff5070af4e857fa0f63c47d2d6f46f019db894e3bbeeb5e29141f724f3f8f30826930 WHIRLPOOL fa819d58a0451f6d665a5b1448673d4249b71ef3f4d723663612cfaf39926ff835fc46b94c218ef85ce9e0e1fc583dbd1448056001692bd1b410364ce710522e
-DIST rstudio-0.95.263.tar.gz 9144590 SHA256 438b2a073dd16f8af519b55b254ab03650b2c04614a3bc746aeb5d7ee94b5b64 SHA512 8d7d5633dc7488aa85c22bb0554eedb08d2a29f7c49d779a190b0a7834ed64d1e708d3abec8aa9355a248a404056889776cd95be90eee69964e4451bb6682019 WHIRLPOOL cc1e9811a5375528dd38d4e0ecd57f8accb56945783cf75eb13b2c8979ea7fe8448c892875aa2e7f5c5ec8a007062369155a3e37c60afd8f6361620bf72ae932
-DIST rstudio-gin-1.5.zip 1055663 SHA256 f561f4eb5d5fe1cff95c881e6aed53a86e9f0de8a52863295a8600375f96ab94 SHA512 3f6649565f9600daaca6ddf3fb431925b5a1ce1ada38e6389de64cef617abba9d3f49c555d0a20053fb06f17ccbe4e1141b39966fbe4b2975d7b120377504897 WHIRLPOOL e66d348ed275eb20518369c39592a5a03ee4257422e2947520385377939de65a54d131332818362a47597392026db48ed1332f11ae218e336798498ae5d5b196
-DIST rstudio-gwt-2.3.0.zip 78142980 SHA256 80180317159465547518998f0b7b03ddf55179902c1358e418d504f55e273c02 SHA512 2a1d1ed02e0f6cdd57a3c955424a8b62704420e3643596e22bf10397b2c35c23636d63aa4e2aee70e99fb5172a52b507afbd0576672dc1813af2744d091633ec WHIRLPOOL a7856001cde722d0b81fd125be7066922cbedb23421d41357d95222008ad1e33b5106cc42dc18d8d3feab60285dd5b07063d173a76b83c894db66cc37c91c56f
-DIST rstudio-gwt-2.4.0.zip 89734508 SHA256 27d48a4b6df9de01eaf1bd3ba3971a8f32742886f67041ddc3cd9dbe01787ebf SHA512 7c64e4fdcf2114700112ea8258f91eed3c5c64ce1067100f86a4201eb4a2f9ba2b8d89663a3bd9c45b1a0555bd3d8b1dcabeb2b59b38ffc0ebb429bcad255ec2 WHIRLPOOL 94fa83ab291434e4975f7c526712dc6b0068ea96213d039b5483c8cc6b6bcd7ee7ebab3d00dc3b8202b25db34732d8b9af1a3fe1d02bc6189699baa2c24a6b82
-EBUILD rstudio-0.94.106.ebuild 3683 SHA256 337385a398b2456966abb98245b5dbf9a5c3bd4a69ca614003d0a2b250d052f6 SHA512 95882bdef0eaa95d7331b4e6eadd1d01fe8ff9213ca836d1b67a723d9b1f5f2a89adf6a96269b0e00d0d83720a6b0c4f855e055c5ad6aec3fb6ae38503718625 WHIRLPOOL 199e692228e0b9cfd766a5dbc7d5593d54526b7ee869fc72cd6d6f1013f7594ec2c0327d800e1b289a6f1d90d7dcfa7ce890b84f182c265d30f9895824f4188a
-EBUILD rstudio-0.94.110.ebuild 3683 SHA256 337385a398b2456966abb98245b5dbf9a5c3bd4a69ca614003d0a2b250d052f6 SHA512 95882bdef0eaa95d7331b4e6eadd1d01fe8ff9213ca836d1b67a723d9b1f5f2a89adf6a96269b0e00d0d83720a6b0c4f855e055c5ad6aec3fb6ae38503718625 WHIRLPOOL 199e692228e0b9cfd766a5dbc7d5593d54526b7ee869fc72cd6d6f1013f7594ec2c0327d800e1b289a6f1d90d7dcfa7ce890b84f182c265d30f9895824f4188a
-EBUILD rstudio-0.95.263.ebuild 4473 SHA256 beda2ce4d4a8e1bd532805fe121e2cb2a4cc4041f657032c8066a0feb4bbb31f SHA512 bc5927c2a3acef5dc6efb9612bceef985524ad5092ce9aced4d679072d27619d8cb4c2657f19730abea7e22096a711827a6b06b3bdada86864c77d6a0ae6341a WHIRLPOOL f21398c1dbb8a7d8feedfb4b7f60e7b0823b3fe3f28b40856420809f19d22ad4617171ce2ccb3af023f08b323f35e0332b4db4d569a2dc8ff4c3249697e70ae3
diff --git a/sci-mathematics/rstudio/files/rstudio-0.94.106-linker_flags.patch b/sci-mathematics/rstudio/files/rstudio-0.94.106-linker_flags.patch
deleted file mode 100644
index c67e501c6a52d0a50361bd3dc86e08e647091661..0000000000000000000000000000000000000000
--- a/sci-mathematics/rstudio/files/rstudio-0.94.106-linker_flags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN paths/src/cpp/CMakeLists.txt linker_flags/src/cpp/CMakeLists.txt
---- paths/src/cpp/CMakeLists.txt 2011-09-20 08:15:44.000000000 -0700
-+++ linker_flags/src/cpp/CMakeLists.txt 2011-09-24 00:53:52.553091241 -0700
-@@ -54,8 +54,8 @@
- add_definitions(-D_FORTIFY_SOURCE=2)
- add_definitions(-fstack-protector --param ssp-buffer-size=4)
- add_definitions(-pie -fPIE)
-- set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro)
-- set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,now)
-+ set(CMAKE_EXE_LINKER_FLAGS -Wl,-z,relro ${CMAKE_EXE_LINKER_FLAGS})
-+ set(CMAKE_EXE_LINKER_FLAGS -Wl,-z,now ${CMAKE_EXE_LINKER_FLAGS})
- endif()
-
- # Win32 specific global directives
diff --git a/sci-mathematics/rstudio/files/rstudio-0.94.106-paths.patch b/sci-mathematics/rstudio/files/rstudio-0.94.106-paths.patch
deleted file mode 100644
index bf510c8bbcd7c60b8f31e95f947f15ac5787c663..0000000000000000000000000000000000000000
--- a/sci-mathematics/rstudio/files/rstudio-0.94.106-paths.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -urN prefs/CMakeGlobals.txt paths/CMakeGlobals.txt
---- prefs/CMakeGlobals.txt 2011-09-20 08:15:44.000000000 -0700
-+++ paths/CMakeGlobals.txt 2011-09-24 00:51:30.488867289 -0700
-@@ -98,7 +98,7 @@
- else()
- set(RSTUDIO_INSTALL_BIN bin)
- endif()
-- set(RSTUDIO_INSTALL_SUPPORTING .)
-+ set(RSTUDIO_INSTALL_SUPPORTING ./share/rstudio-0.94.106/)
- endif()
-
- # if the install prefix is /usr/local then tweak as appropriate
-diff -urN prefs/src/cpp/server/CMakeLists.txt paths/src/cpp/server/CMakeLists.txt
---- prefs/src/cpp/server/CMakeLists.txt 2011-09-20 08:15:44.000000000 -0700
-+++ paths/src/cpp/server/CMakeLists.txt 2011-09-24 00:51:30.495867201 -0700
-@@ -141,7 +141,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 share/rstudio-0.94.106/${RSERVER_INITD_DEBIAN_DIR})
-
- # install configured redhat init.d script
- set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat")
-@@ -149,7 +149,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 share/rstudio-0.94.106/${RSERVER_INITD_REDHAT_DIR})
-
- # install configured suse init.d script
- set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse")
-@@ -157,13 +157,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 share/rstudio-0.94.106/${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 share/rstudio-0.94.106/${RSERVER_PAM_DIR})
-
- # install configured apparmor profile
- set(RSERVER_APPARMOR_DIR "extras/apparmor")
-@@ -171,9 +171,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 share/rstudio-0.94.106/${RSERVER_APPARMOR_DIR})
- install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_DIR}/apparmor-profile-load
-- DESTINATION ${RSERVER_APPARMOR_DIR})
-+ DESTINATION share/rstudio-0.94.106/${RSERVER_APPARMOR_DIR})
-
- # install configured upstart profile
- set(RSERVER_UPSTART_DIR "extras/upstart")
-@@ -181,6 +181,6 @@
- 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 share/rstudio-0.94.106/${RSERVER_UPSTART_DIR})
-
- endif()
-diff -urN prefs/src/cpp/server/ServerOptions.cpp paths/src/cpp/server/ServerOptions.cpp
---- prefs/src/cpp/server/ServerOptions.cpp 2011-09-20 08:15:44.000000000 -0700
-+++ paths/src/cpp/server/ServerOptions.cpp 2011-09-24 00:51:30.510867013 -0700
-@@ -201,7 +201,7 @@
-
- // convert relative paths by completing from the system installation
- // path (this allows us to be relocatable)
-- resolvePath(installPath, &wwwLocalPath_);
-+ resolvePath(installPath.childPath("share/rstudio-0.94.106"), &wwwLocalPath_);
- resolvePath(installPath, &authPamHelperPath_);
- resolvePath(installPath, &rsessionPath_);
- resolvePath(installPath, &rldpathPath_);
-diff -urN prefs/src/cpp/session/SessionOptions.cpp paths/src/cpp/session/SessionOptions.cpp
---- prefs/src/cpp/session/SessionOptions.cpp 2011-09-20 08:15:44.000000000 -0700
-+++ paths/src/cpp/session/SessionOptions.cpp 2011-09-24 00:51:30.504867089 -0700
-@@ -272,12 +272,12 @@
- }
-
- // convert relative paths by completing from the app resource path
-- resolvePath(resourcePath, &rHelpCssFilePath_);
-+ resolvePath(resourcePath.childPath("share/rstudio-0.94.106"), &rHelpCssFilePath_);
- resolvePath(resourcePath, &agreementFilePath_);
-- resolvePath(resourcePath, &wwwLocalPath_);
-- resolvePath(resourcePath, &coreRSourcePath_);
-- resolvePath(resourcePath, &modulesRSourcePath_);
-- resolvePath(resourcePath, &sessionPackagesPath_);
-+ resolvePath(resourcePath.childPath("share/rstudio-0.94.106"), &wwwLocalPath_);
-+ resolvePath(resourcePath.childPath("share/rstudio-0.94.106"), &coreRSourcePath_);
-+ resolvePath(resourcePath.childPath("share/rstudio-0.94.106"), &modulesRSourcePath_);
-+ resolvePath(resourcePath.childPath("share/rstudio-0.94.106"), &sessionPackagesPath_);
- resolvePath(resourcePath, &rpostbackPath_);
-
- // shared secret with parent
diff --git a/sci-mathematics/rstudio/files/rstudio-0.94.106-prefs.patch b/sci-mathematics/rstudio/files/rstudio-0.94.106-prefs.patch
deleted file mode 100644
index 61f08b71cc4249c50b79a70d4e05fff24ca66174..0000000000000000000000000000000000000000
--- a/sci-mathematics/rstudio/files/rstudio-0.94.106-prefs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN original/src/gwt/build.xml prefs/src/gwt/build.xml
---- original/src/gwt/build.xml 2011-09-20 08:15:44.000000000 -0700
-+++ prefs/src/gwt/build.xml 2011-09-24 00:44:50.386869251 -0700
-@@ -101,7 +101,7 @@
-
-
-
--
-+
-
-
-
-@@ -145,7 +145,7 @@
-
-
-
--
-+
-
-
-
diff --git a/sci-mathematics/rstudio/files/rstudio-0.94.110-linker_flags.patch b/sci-mathematics/rstudio/files/rstudio-0.94.110-linker_flags.patch
deleted file mode 100644
index b0ed9e98bbc84426472eecb3ed9e5c78d71fb762..0000000000000000000000000000000000000000
--- a/sci-mathematics/rstudio/files/rstudio-0.94.110-linker_flags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN original/src/cpp/CMakeLists.txt linker_flags/src/cpp/CMakeLists.txt
---- original/src/cpp/CMakeLists.txt 2011-09-30 09:02:51.000000000 -0700
-+++ linker_flags/src/cpp/CMakeLists.txt 2011-10-08 17:41:00.813750986 -0700
-@@ -54,8 +54,8 @@
- add_definitions(-D_FORTIFY_SOURCE=2)
- add_definitions(-fstack-protector --param ssp-buffer-size=4)
- add_definitions(-pie -fPIE)
-- set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro)
-- set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,now)
-+ set(CMAKE_EXE_LINKER_FLAGS -Wl,-z,relro ${CMAKE_EXE_LINKER_FLAGS})
-+ set(CMAKE_EXE_LINKER_FLAGS -Wl,-z,now ${CMAKE_EXE_LINKER_FLAGS})
- endif()
-
- # Win32 specific global directives
diff --git a/sci-mathematics/rstudio/files/rstudio-0.94.110-paths.patch b/sci-mathematics/rstudio/files/rstudio-0.94.110-paths.patch
deleted file mode 100644
index a0546ae2cd13665d36a9bbc80d696aa148f5cb64..0000000000000000000000000000000000000000
--- a/sci-mathematics/rstudio/files/rstudio-0.94.110-paths.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -urN original/CMakeGlobals.txt paths/CMakeGlobals.txt
---- original/CMakeGlobals.txt 2011-09-30 09:02:51.000000000 -0700
-+++ paths/CMakeGlobals.txt 2011-10-08 17:32:13.420344312 -0700
-@@ -98,7 +98,7 @@
- else()
- set(RSTUDIO_INSTALL_BIN bin)
- endif()
-- set(RSTUDIO_INSTALL_SUPPORTING .)
-+ set(RSTUDIO_INSTALL_SUPPORTING ./share/rstudio-0.94.110/)
- endif()
-
- # if the install prefix is /usr/local then tweak as appropriate
-diff -urN original/src/cpp/server/CMakeLists.txt paths/src/cpp/server/CMakeLists.txt
---- original/src/cpp/server/CMakeLists.txt 2011-09-30 09:02:51.000000000 -0700
-+++ paths/src/cpp/server/CMakeLists.txt 2011-10-08 17:32:13.433344148 -0700
-@@ -141,7 +141,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 share/rstudio-0.94.110/${RSERVER_INITD_DEBIAN_DIR})
-
- # install configured redhat init.d script
- set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat")
-@@ -149,7 +149,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 share/rstudio-0.94.110/${RSERVER_INITD_REDHAT_DIR})
-
- # install configured suse init.d script
- set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse")
-@@ -157,13 +157,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 share/rstudio-0.94.110/${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 share/rstudio-0.94.110/${RSERVER_PAM_DIR})
-
- # install configured apparmor profile
- set(RSERVER_APPARMOR_DIR "extras/apparmor")
-@@ -171,9 +171,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 share/rstudio-0.94.110/${RSERVER_APPARMOR_DIR})
- install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_DIR}/apparmor-profile-load
-- DESTINATION ${RSERVER_APPARMOR_DIR})
-+ DESTINATION share/rstudio-0.94.110/${RSERVER_APPARMOR_DIR})
-
- # install configured upstart profile
- set(RSERVER_UPSTART_DIR "extras/upstart")
-@@ -181,6 +181,6 @@
- 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 share/rstudio-0.94.110/${RSERVER_UPSTART_DIR})
-
- endif()
-diff -urN original/src/cpp/server/ServerOptions.cpp paths/src/cpp/server/ServerOptions.cpp
---- original/src/cpp/server/ServerOptions.cpp 2011-09-30 09:02:51.000000000 -0700
-+++ paths/src/cpp/server/ServerOptions.cpp 2011-10-08 17:32:13.458343837 -0700
-@@ -201,7 +201,7 @@
-
- // convert relative paths by completing from the system installation
- // path (this allows us to be relocatable)
-- resolvePath(installPath, &wwwLocalPath_);
-+ resolvePath(installPath.childPath("share/rstudio-0.94.110"), &wwwLocalPath_);
- resolvePath(installPath, &authPamHelperPath_);
- resolvePath(installPath, &rsessionPath_);
- resolvePath(installPath, &rldpathPath_);
-diff -urN original/src/cpp/session/SessionOptions.cpp paths/src/cpp/session/SessionOptions.cpp
---- original/src/cpp/session/SessionOptions.cpp 2011-09-30 09:02:51.000000000 -0700
-+++ paths/src/cpp/session/SessionOptions.cpp 2011-10-08 17:32:13.447343974 -0700
-@@ -272,12 +272,12 @@
- }
-
- // convert relative paths by completing from the app resource path
-- resolvePath(resourcePath, &rHelpCssFilePath_);
-+ resolvePath(resourcePath.childPath("share/rstudio-0.94.110"), &rHelpCssFilePath_);
- resolvePath(resourcePath, &agreementFilePath_);
-- resolvePath(resourcePath, &wwwLocalPath_);
-- resolvePath(resourcePath, &coreRSourcePath_);
-- resolvePath(resourcePath, &modulesRSourcePath_);
-- resolvePath(resourcePath, &sessionPackagesPath_);
-+ resolvePath(resourcePath.childPath("share/rstudio-0.94.110"), &wwwLocalPath_);
-+ resolvePath(resourcePath.childPath("share/rstudio-0.94.110"), &coreRSourcePath_);
-+ resolvePath(resourcePath.childPath("share/rstudio-0.94.110"), &modulesRSourcePath_);
-+ resolvePath(resourcePath.childPath("share/rstudio-0.94.110"), &sessionPackagesPath_);
- resolvePath(resourcePath, &rpostbackPath_);
-
- // shared secret with parent
diff --git a/sci-mathematics/rstudio/files/rstudio-0.94.110-prefs.patch b/sci-mathematics/rstudio/files/rstudio-0.94.110-prefs.patch
deleted file mode 100644
index 1010c6b5ccc2db45245a3e4ac918fcb8c644467a..0000000000000000000000000000000000000000
--- a/sci-mathematics/rstudio/files/rstudio-0.94.110-prefs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN original/src/gwt/build.xml prefs/src/gwt/build.xml
---- original/src/gwt/build.xml 2011-09-30 09:02:51.000000000 -0700
-+++ prefs/src/gwt/build.xml 2011-10-08 17:23:36.144811146 -0700
-@@ -101,7 +101,7 @@
-
-
-
--
-+
-
-
-
-@@ -145,7 +145,7 @@
-
-
-
--
-+
-
-
-
diff --git a/sci-mathematics/rstudio/files/rstudio-0.95.263-linker_flags.patch b/sci-mathematics/rstudio/files/rstudio-0.95.263-linker_flags.patch
deleted file mode 100644
index e68399d13018d2cb9a71a079ac455c8766b3af32..0000000000000000000000000000000000000000
--- a/sci-mathematics/rstudio/files/rstudio-0.95.263-linker_flags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
-index 0589ca0..fe5bd5f 100644
---- a/src/cpp/CMakeLists.txt
-+++ b/src/cpp/CMakeLists.txt
-@@ -57,7 +57,7 @@ if(UNIX)
- add_definitions(-D_FORTIFY_SOURCE=2)
- add_definitions(-fstack-protector --param ssp-buffer-size=4)
- add_definitions(-pie -fPIE)
-- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro,-z,now")
-+ set(CMAKE_EXE_LINKER_FLAGS "-Wl,-z,relro,-z,now ${CMAKE_EXE_LINKER_FLAGS}")
- endif()
-
- # Win32 specific global directives
diff --git a/sci-mathematics/rstudio/files/rstudio-0.95.263-paths.patch b/sci-mathematics/rstudio/files/rstudio-0.95.263-paths.patch
deleted file mode 100644
index 40a869884f502bd5672638da6a2b689f5cf8e928..0000000000000000000000000000000000000000
--- a/sci-mathematics/rstudio/files/rstudio-0.95.263-paths.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-diff --git a/CMakeGlobals.txt b/CMakeGlobals.txt
-index da74970..1537bff 100644
---- a/CMakeGlobals.txt
-+++ b/CMakeGlobals.txt
-@@ -103,7 +103,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 af4db1c..96b767e 100644
---- a/src/cpp/server/CMakeLists.txt
-+++ b/src/cpp/server/CMakeLists.txt
-@@ -142,7 +142,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")
-@@ -150,7 +150,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")
-@@ -158,13 +158,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")
-@@ -172,9 +172,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")
-@@ -182,6 +182,6 @@ 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})
-
- endif()
-diff --git a/src/cpp/server/ServerOptions.cpp b/src/cpp/server/ServerOptions.cpp
-index 77a63f1..f0d25f0 100644
---- a/src/cpp/server/ServerOptions.cpp
-+++ b/src/cpp/server/ServerOptions.cpp
-@@ -201,7 +201,7 @@ ProgramStatus Options::read(int argc, char * const argv[])
-
- // convert relative paths by completing from the system installation
- // path (this allows us to be relocatable)
-- resolvePath(installPath, &wwwLocalPath_);
-+ resolvePath(installPath.childPath(DISTRO_SHARE), &wwwLocalPath_);
- resolvePath(installPath, &authPamHelperPath_);
- resolvePath(installPath, &rsessionPath_);
- resolvePath(installPath, &rldpathPath_);
-diff --git a/src/cpp/session/SessionOptions.cpp b/src/cpp/session/SessionOptions.cpp
-index 0df1081..777cc6a 100644
---- a/src/cpp/session/SessionOptions.cpp
-+++ b/src/cpp/session/SessionOptions.cpp
-@@ -314,12 +314,12 @@ core::ProgramStatus Options::read(int argc, char * const argv[])
- }
-
- // convert relative paths by completing from the app resource path
-- resolvePath(resourcePath, &rHelpCssFilePath_);
-+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &rHelpCssFilePath_);
- resolvePath(resourcePath, &agreementFilePath_);
-- resolvePath(resourcePath, &wwwLocalPath_);
-- resolvePath(resourcePath, &coreRSourcePath_);
-- resolvePath(resourcePath, &modulesRSourcePath_);
-- resolvePath(resourcePath, &sessionPackagesPath_);
-+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_);
-+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &coreRSourcePath_);
-+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &modulesRSourcePath_);
-+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &sessionPackagesPath_);
- resolvePostbackPath(resourcePath, &rpostbackPath_);
- #ifdef _WIN32
- resolvePath(resourcePath, &consoleIoPath_);
diff --git a/sci-mathematics/rstudio/files/rstudio-0.95.263-prefs.patch b/sci-mathematics/rstudio/files/rstudio-0.95.263-prefs.patch
deleted file mode 100644
index dd85a8ad934b279dafb354fab0a19f82e9abb8f3..0000000000000000000000000000000000000000
--- a/sci-mathematics/rstudio/files/rstudio-0.95.263-prefs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/gwt/build.xml b/src/gwt/build.xml
-index 6581bd9..36eadc1 100644
---- a/src/gwt/build.xml
-+++ b/src/gwt/build.xml
-@@ -26,6 +26,7 @@
-
-
-
-+
-
-
-
-@@ -102,6 +103,7 @@
-
-
-
-+
-
-
-
diff --git a/sci-mathematics/rstudio/files/rstudio-rserver.initd b/sci-mathematics/rstudio/files/rstudio-rserver.initd
deleted file mode 100644
index 6779052b82d6e202a1bb8f6c16ac82a1997ae76c..0000000000000000000000000000000000000000
--- a/sci-mathematics/rstudio/files/rstudio-rserver.initd
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-start() {
- ebegin "Starting RStudio Server"
- start-stop-daemon --start --quiet --exec /usr/bin/rserver
- eend $?
-}
-
-stop() {
- ebegin "Stopping RStudio Server"
- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --name /usr/bin/rserver
- eend $?
-}
diff --git a/sci-mathematics/rstudio/files/rstudio-rstudio.desktop b/sci-mathematics/rstudio/files/rstudio-rstudio.desktop
deleted file mode 100644
index d0513d897f836d2d0593d3dc4b7acb99bf3b249e..0000000000000000000000000000000000000000
--- a/sci-mathematics/rstudio/files/rstudio-rstudio.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=@VERSION@
-Name=RStudio
-Comment=An IDE for use with the R language
-Exec=rstudio
-Categories=Education;Math
-Icon=/usr/share/rstudio/rstudio.png
diff --git a/sci-mathematics/rstudio/rstudio-0.94.106.ebuild b/sci-mathematics/rstudio/rstudio-0.94.106.ebuild
deleted file mode 100644
index 9521cf35ec998f83e1e3aa764d2fa2df5d025233..0000000000000000000000000000000000000000
--- a/sci-mathematics/rstudio/rstudio-0.94.106.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-EAPI="5"
-inherit cmake-utils pam
-
-MY_GWTVER="2.3.0"
-MY_GINVER="1.5"
-DESCRIPTION="RStudio is an IDE for use with the R language."
-HOMEPAGE="http://www.rstudio.org"
-SRC_URI="https://github.com/rstudio/rstudio/tarball/v${PV} -> rstudio-${PV}.tar.gz
- https://s3.amazonaws.com/rstudio-buildtools/gin-${MY_GINVER}.zip ->
- rstudio-gin-${MY_GINVER}.zip
- https://s3.amazonaws.com/rstudio-buildtools/gwt-${MY_GWTVER}.zip ->
- rstudio-gwt-${MY_GWTVER}.zip"
-
-# The rstudio source can download its dependencies itself. Most are in portage
-# already, but not gwt and gin. Adding the source packages to SRC_URI instead of
-# using the provided install script so that an `ebuild fetch' will actually get
-# you everything you need, without requiring connectivity in the src_prepare
-# phase.
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+desktop server"
-QTVER="4.7"
-RDEPEND=">=dev-lang/R-2.11.1
- >=x11-libs/pango-1.14
- >=dev-libs/boost-1.42
- dev-libs/openssl
- desktop? ( >=x11-libs/qt-core-${QTVER}
- >=x11-libs/qt-gui-${QTVER}
- >=x11-libs/qt-webkit-${QTVER}
- >=x11-libs/qt-xmlpatterns-${QTVER} )
- server? ( virtual/pam )"
-DEPEND="${RDEPEND}
- >=dev-util/cmake-2.6
- app-arch/unzip
- dev-java/ant-core
- virtual/jdk"
-
-pkg_pretend() {
- if ! use desktop && ! use server; then
- eerror "Must select at least one of RStudio desktop or RStudio server to install"
- fi
-}
-
-src_unpack() {
- # since gin-1.5.zip has no toplevel dir, unpack that seperately
- unpack rstudio-${PV}.tar.gz rstudio-gwt-${MY_GWTVER}.zip
- mkdir "${WORKDIR}"/gin-${MY_GINVER}
- cd "${WORKDIR}"/gin-${MY_GINVER}
- unpack rstudio-gin-${MY_GINVER}.zip
- cd ..
- # packages extract to rstudio-rstudio-HASH, so find it this way so we don't
- # have to look up the hash for each version.
- S=$(ls -d "${WORKDIR}"/rstudio-rstudio-* | head -n 1)
- if [[ -z "${S}" ]]; then
- die "Failed to determine source directory."
- fi
-}
-
-src_prepare() {
- # extract the gin-ver.zip and gwt-ver.zip files to
- # the appropriate location
- mkdir -p "${S}"/src/gwt/lib/{gwt,gin}
- einfo "Adding missing gin to source."
- mv "${WORKDIR}"/gin-${MY_GINVER} "${S}"/src/gwt/lib/gin/${MY_GINVER}
- einfo "Adding missing gwt sdk to source."
- mv "${WORKDIR}"/gwt-${MY_GWTVER} "${S}"/src/gwt/lib/gwt/${MY_GWTVER}
- # 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/
- epatch "${FILESDIR}/${P}-prefs.patch"
- # change the install path, as by default everything is dumped right under
- # the prefix.After fixing install paths, now fix the source so the program can
- # find the moved resources.
- epatch "${FILESDIR}/${P}-paths.patch"
- # Some gcc hardening options were added, however since we add
- # "-Wl,--as-needed" we end up with "-Wl,--as-needed;-Wl,-z,relro" which
- # leads to linker errors about unknown options, if we make it so the
- # as-needed option is the last option on the line, everything is fine.
- epatch "${FILESDIR}/${P}-linker_flags.patch"
-}
-
-src_configure() {
- if use server; then
- if use desktop; then
- MYCMAKEARGS="-DRSTUDIO_TARGET=All"
- else
- MYCMAKEARGS="-DRSTUDIO_TARGET=Server"
- fi
- else
- MYCMAKEARGS="-DRSTUDIO_TARGET=Desktop"
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use server; then
- dopamd "${S}"/src/cpp/server/extras/pam/rstudio
- newinitd "${FILESDIR}"/rstudio-rserver.initd rstudio-rserver
- fi
-}
-
-pkg_postinst() {
- if use server; then
- enewgroup rstudio-server
- enewuser rstudio-server -1 -1 -1 rstudio-server
- fi
-}
-
diff --git a/sci-mathematics/rstudio/rstudio-0.94.110.ebuild b/sci-mathematics/rstudio/rstudio-0.94.110.ebuild
deleted file mode 100644
index 9521cf35ec998f83e1e3aa764d2fa2df5d025233..0000000000000000000000000000000000000000
--- a/sci-mathematics/rstudio/rstudio-0.94.110.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-EAPI="5"
-inherit cmake-utils pam
-
-MY_GWTVER="2.3.0"
-MY_GINVER="1.5"
-DESCRIPTION="RStudio is an IDE for use with the R language."
-HOMEPAGE="http://www.rstudio.org"
-SRC_URI="https://github.com/rstudio/rstudio/tarball/v${PV} -> rstudio-${PV}.tar.gz
- https://s3.amazonaws.com/rstudio-buildtools/gin-${MY_GINVER}.zip ->
- rstudio-gin-${MY_GINVER}.zip
- https://s3.amazonaws.com/rstudio-buildtools/gwt-${MY_GWTVER}.zip ->
- rstudio-gwt-${MY_GWTVER}.zip"
-
-# The rstudio source can download its dependencies itself. Most are in portage
-# already, but not gwt and gin. Adding the source packages to SRC_URI instead of
-# using the provided install script so that an `ebuild fetch' will actually get
-# you everything you need, without requiring connectivity in the src_prepare
-# phase.
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+desktop server"
-QTVER="4.7"
-RDEPEND=">=dev-lang/R-2.11.1
- >=x11-libs/pango-1.14
- >=dev-libs/boost-1.42
- dev-libs/openssl
- desktop? ( >=x11-libs/qt-core-${QTVER}
- >=x11-libs/qt-gui-${QTVER}
- >=x11-libs/qt-webkit-${QTVER}
- >=x11-libs/qt-xmlpatterns-${QTVER} )
- server? ( virtual/pam )"
-DEPEND="${RDEPEND}
- >=dev-util/cmake-2.6
- app-arch/unzip
- dev-java/ant-core
- virtual/jdk"
-
-pkg_pretend() {
- if ! use desktop && ! use server; then
- eerror "Must select at least one of RStudio desktop or RStudio server to install"
- fi
-}
-
-src_unpack() {
- # since gin-1.5.zip has no toplevel dir, unpack that seperately
- unpack rstudio-${PV}.tar.gz rstudio-gwt-${MY_GWTVER}.zip
- mkdir "${WORKDIR}"/gin-${MY_GINVER}
- cd "${WORKDIR}"/gin-${MY_GINVER}
- unpack rstudio-gin-${MY_GINVER}.zip
- cd ..
- # packages extract to rstudio-rstudio-HASH, so find it this way so we don't
- # have to look up the hash for each version.
- S=$(ls -d "${WORKDIR}"/rstudio-rstudio-* | head -n 1)
- if [[ -z "${S}" ]]; then
- die "Failed to determine source directory."
- fi
-}
-
-src_prepare() {
- # extract the gin-ver.zip and gwt-ver.zip files to
- # the appropriate location
- mkdir -p "${S}"/src/gwt/lib/{gwt,gin}
- einfo "Adding missing gin to source."
- mv "${WORKDIR}"/gin-${MY_GINVER} "${S}"/src/gwt/lib/gin/${MY_GINVER}
- einfo "Adding missing gwt sdk to source."
- mv "${WORKDIR}"/gwt-${MY_GWTVER} "${S}"/src/gwt/lib/gwt/${MY_GWTVER}
- # 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/
- epatch "${FILESDIR}/${P}-prefs.patch"
- # change the install path, as by default everything is dumped right under
- # the prefix.After fixing install paths, now fix the source so the program can
- # find the moved resources.
- epatch "${FILESDIR}/${P}-paths.patch"
- # Some gcc hardening options were added, however since we add
- # "-Wl,--as-needed" we end up with "-Wl,--as-needed;-Wl,-z,relro" which
- # leads to linker errors about unknown options, if we make it so the
- # as-needed option is the last option on the line, everything is fine.
- epatch "${FILESDIR}/${P}-linker_flags.patch"
-}
-
-src_configure() {
- if use server; then
- if use desktop; then
- MYCMAKEARGS="-DRSTUDIO_TARGET=All"
- else
- MYCMAKEARGS="-DRSTUDIO_TARGET=Server"
- fi
- else
- MYCMAKEARGS="-DRSTUDIO_TARGET=Desktop"
- fi
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use server; then
- dopamd "${S}"/src/cpp/server/extras/pam/rstudio
- newinitd "${FILESDIR}"/rstudio-rserver.initd rstudio-rserver
- fi
-}
-
-pkg_postinst() {
- if use server; then
- enewgroup rstudio-server
- enewuser rstudio-server -1 -1 -1 rstudio-server
- fi
-}
-
diff --git a/sci-mathematics/rstudio/rstudio-0.95.263.ebuild b/sci-mathematics/rstudio/rstudio-0.95.263.ebuild
deleted file mode 100644
index 6b25241e13493ac6ac5c6aa41b94bbbce6dc60a1..0000000000000000000000000000000000000000
--- a/sci-mathematics/rstudio/rstudio-0.95.263.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-EAPI="5"
-inherit cmake-utils pam versionator
-
-MY_GWTVER="2.4.0"
-MY_GINVER="1.5"
-DESCRIPTION="RStudio is an IDE for use with the R language."
-HOMEPAGE="http://www.rstudio.org"
-SRC_URI="https://github.com/rstudio/rstudio/tarball/v${PV} -> rstudio-${PV}.tar.gz
- https://s3.amazonaws.com/rstudio-buildtools/gin-${MY_GINVER}.zip ->
- rstudio-gin-${MY_GINVER}.zip
- https://s3.amazonaws.com/rstudio-buildtools/gwt-${MY_GWTVER}.zip ->
- rstudio-gwt-${MY_GWTVER}.zip"
-
-# The rstudio source can download its dependencies itself. Most are in portage
-# already, but not gwt and gin. Adding the source packages to SRC_URI instead of
-# using the provided install script so that an `ebuild fetch' will actually get
-# you everything you need, without requiring connectivity in the src_prepare
-# phase.
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+desktop server"
-QTVER="4.7"
-RDEPEND=">=dev-lang/R-2.11.1
- >=x11-libs/pango-1.14
- >=dev-libs/boost-1.42
- dev-libs/openssl
- desktop? ( >=x11-libs/qt-core-${QTVER}
- >=x11-libs/qt-gui-${QTVER}
- >=x11-libs/qt-webkit-${QTVER}
- >=x11-libs/qt-xmlpatterns-${QTVER} )
- server? ( virtual/pam )"
-DEPEND="${RDEPEND}
- >=dev-util/cmake-2.6
- app-arch/unzip
- dev-java/ant-core
- virtual/jdk"
-
-pkg_pretend() {
- if ! use desktop && ! use server; then
- eerror "Must select at least one of RStudio desktop or RStudio server to install"
- fi
-}
-
-src_unpack() {
- # since gin-1.5.zip has no toplevel dir, unpack that seperately
- unpack rstudio-${PV}.tar.gz rstudio-gwt-${MY_GWTVER}.zip
- mkdir "${WORKDIR}"/gin-${MY_GINVER}
- cd "${WORKDIR}"/gin-${MY_GINVER}
- unpack rstudio-gin-${MY_GINVER}.zip
- cd ..
- # packages extract to rstudio-rstudio-HASH, so find it this way so we don't
- # have to look up the hash for each version.
- S=$(ls -d "${WORKDIR}"/rstudio-rstudio-* | head -n 1)
- if [[ -z "${S}" ]]; then
- die "Failed to determine source directory."
- fi
-}
-
-src_prepare() {
- # extract the gin-ver.zip and gwt-ver.zip files to
- # the appropriate location
- mkdir -p "${S}"/src/gwt/lib/{gwt,gin}
- einfo "Adding missing gin to source."
- mv "${WORKDIR}"/gin-${MY_GINVER} "${S}"/src/gwt/lib/gin/${MY_GINVER}
- einfo "Adding missing gwt sdk to source."
- mv "${WORKDIR}"/gwt-${MY_GWTVER} "${S}"/src/gwt/lib/gwt/${MY_GWTVER}
- # 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/
- epatch "${FILESDIR}/${P}-prefs.patch"
- # change the install path, as by default everything is dumped right under
- # the prefix.After fixing install paths, now fix the source so the program can
- # find the moved resources.
- epatch "${FILESDIR}/${P}-paths.patch"
- # Some gcc hardening options were added, however since we add
- # "-Wl,--as-needed" we end up with "-Wl,--as-needed;-Wl,-z,relro" which
- # leads to linker errors about unknown options, if we make it so the
- # as-needed option is the last option on the line, everything is fine.
- epatch "${FILESDIR}/${P}-linker_flags.patch"
- # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using
- # this sed hack for now. ~RMH
- DISTRO_DIR="\"share/${PN}\""
- sed -i -e "s|DISTRO_SHARE|${DISTRO_DIR}|" src/cpp/server/ServerOptions.cpp
- sed -i -e "s|DISTRO_SHARE|${DISTRO_DIR}|" src/cpp/session/SessionOptions.cpp
-}
-
-src_configure() {
- # Set the proper version number (no more 99.9.9). ~RMH
- 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})
- if use server; then
- if use desktop; then
- mycmakeargs+=(-DRSTUDIO_TARGET=All)
- else
- mycmakeargs+=(-DRSTUDIO_TARGET=Server)
- fi
- else
- mycmakeargs+=(-DRSTUDIO_TARGET=Desktop)
- fi
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- if use server; then
- dopamd "${S}"/src/cpp/server/extras/pam/rstudio
- newinitd "${FILESDIR}"/rstudio-rserver.initd rstudio-rserver
- fi
- # Add a desktop entry. ~RMH
- if use desktop; then
- sed -e "s|\@VERSION\@|${PV}|" "${FILESDIR}/${PN}-${PN}.desktop" > "${T}/${PN}-${PN}.desktop"
- ls ${T}
- domenu "${T}/${PN}-${PN}.desktop" || die
- fi
-}
-
-pkg_postinst() {
- if use server; then
- enewgroup rstudio-server
- enewuser rstudio-server -1 -1 -1 rstudio-server
- fi
-}