1 |
commit: 6fc8257f0c1be1c4ebd2f7db5486d43ab0749006 |
2 |
Author: Mark Wright <gienah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 20 07:46:56 2016 +0000 |
4 |
Commit: Mark Wright <gienah <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 20 07:47:53 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fc8257f |
7 |
|
8 |
sci-mathematics/rstudio: Bump to 0.99.879 |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
|
12 |
sci-mathematics/rstudio/Manifest | 1 + |
13 |
.../files/rstudio-0.99.879-clang-pandoc.patch | 77 +++++++ |
14 |
.../rstudio/files/rstudio-0.99.879-paths.patch | 130 +++++++++++ |
15 |
.../rstudio/files/rstudio-0.99.879-prefs.patch | 45 ++++ |
16 |
sci-mathematics/rstudio/rstudio-0.99.879.ebuild | 250 +++++++++++++++++++++ |
17 |
5 files changed, 503 insertions(+) |
18 |
|
19 |
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest |
20 |
index cc582ca..d84f721 100644 |
21 |
--- a/sci-mathematics/rstudio/Manifest |
22 |
+++ b/sci-mathematics/rstudio/Manifest |
23 |
@@ -23,6 +23,7 @@ DIST rstudio-0.99.483.tar.gz 16993049 SHA256 85ce1a2f40690e4ed0338b153a1b3279ce9 |
24 |
DIST rstudio-0.99.484.tar.gz 16993033 SHA256 8ca4abccb9b554713077cf1057ac13abadfd7606f22ac3386b2a88a38ae8a427 SHA512 407f50747bca749ef2c512e727cbe062abdd99c1eb76af09761e6bdfb4208f30117e1ee55b485447f64f6cf249bc939ef1fb4f8ce0199595e241a3cc617b4b8b WHIRLPOOL 8cc16553ea2703f005908c69803b64da4172092cb0b3ff9015e7ec354340fcd1cfa82a218ac890adffafe3565ead94bee6f7bd239b1c56ee38cbeb5896f556b0 |
25 |
DIST rstudio-0.99.486.tar.gz 16992775 SHA256 4057195465e5032625bad0304bfbd9d123a78c3e4d6d5d41abcc6ef6ccd18a6f SHA512 bb88d12f8ae2f79779532371d03a698a2c2897c212c42c8438d5223c14e1033098dbd7c278a929958fa4bbc764a3ceb101abe03634f0e33192de44cf97128a1f WHIRLPOOL 13c35a69e525d90c6694d068526a2aede76a086427539294e46db67d0fc92759fb9cb0a1169cf88745ae1e121fdd7ba2e46bd2d2fb3fa17dc7fcc65848820941 |
26 |
DIST rstudio-0.99.491.tar.gz 16992702 SHA256 e8c21e2262b610a7ccf39283b97d114bee33c6840a060067b8019404ff44b03f SHA512 2658694d6154f4b91b2dc07a7ec653edb7f593c4d9829a06a5e600e4db465ca6059418be6812d5ba2529fd6202dd136f0f58d74576f856fdcf6f81032d74f3c2 WHIRLPOOL e71650a07cc010ab3c25955c7fa9e90eee68577c1ef78e02a5f81a0160c688908ec5ec4fd89c89e5a9bc49b926623cd5de976fb249aa2d472354d23f5fad76de |
27 |
+DIST rstudio-0.99.879.tar.gz 17406999 SHA256 73fa59be34eb63d9ed194642a93ad529d2c67cdcbcd2f291952fdef8e999a097 SHA512 c2bbe598a4a9c2abc69e39807af70be5729a06bbcb73bac5249f74f3c3daddb2909bf4a46d988f0d4bfeabe308f0c31d2a75aa28a52f11c1343dfcead07e2c45 WHIRLPOOL 5c9c75a7891ac53eb80a36eff518d77a0c281b16bff383526ac1ede07ee57486d7b00be4e400a0cad48dfea92729becf25c67f18782af7930f9b4218592afe5c |
28 |
DIST selenium-java-2.37.0.zip 24625928 SHA256 0eebba65d8edb01c1f46e462907c58f5d6e1cb0ddf63660a9985c8432bdffbb7 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779 WHIRLPOOL eb6659aae26f3c78b6f998546b23d0636c9d00ed8a7f985db1463ac4bd483ccb3e643d84e2ca0f59e0636a8de79eb552ff1d68eb6f9c06907029f7552d8f7777 |
29 |
DIST selenium-server-standalone-2.37.0.jar 34730734 SHA256 97bc8c699037fb6e99ba7af570fb60dbb1b7ce30cde2448287a44ef65b13023e SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018 WHIRLPOOL 20640591534f31f24825a9ed139589b182e8b60d86541bf0be104d3cc0280983f6566bd0459f2253ac3875b48a2798b205bac8f815a119fff6db625ce9bbc29e |
30 |
DIST shinyapps-0.98.1000.tar.gz 910095 SHA256 b95c512ae0a0fb4335878d9cfcf9073e2cb3ccfed73543abe27ea8878ed36d57 SHA512 3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c WHIRLPOOL ecc2bce78387cb42e9989163d8fca29220e66f085acde3323417058aebb624dafa8c0e1873c7d79e67324cbd5aad250ef9fcdbbc8f659d64482233b95d898a15 |
31 |
|
32 |
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 |
33 |
new file mode 100644 |
34 |
index 0000000..c3af2b7 |
35 |
--- /dev/null |
36 |
+++ b/sci-mathematics/rstudio/files/rstudio-0.99.879-clang-pandoc.patch |
37 |
@@ -0,0 +1,77 @@ |
38 |
+--- rstudio-0.99.879-orig/src/cpp/session/CMakeLists.txt 2016-02-12 09:24:39.000000000 +1100 |
39 |
++++ rstudio-0.99.879/src/cpp/session/CMakeLists.txt 2016-02-19 23:04:57.266186448 +1100 |
40 |
+@@ -25,30 +25,11 @@ |
41 |
+ if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-23") |
42 |
+ message(FATAL_ERROR "Mathjax 2.3 not found (re-run install-dependencies script to install)") |
43 |
+ endif() |
44 |
+-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc") |
45 |
+- message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)") |
46 |
+-endif() |
47 |
+ if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/rsconnect") |
48 |
+ message(FATAL_ERROR "rsconnect package not found (re-run install-dependencies script to install)") |
49 |
+ endif() |
50 |
+ |
51 |
+ |
52 |
+-# verify libclang is installed |
53 |
+-if(WIN32) |
54 |
+- set(LIBCLANG_VERSION "3.4") |
55 |
+-else() |
56 |
+- set(LIBCLANG_VERSION "3.5") |
57 |
+-endif() |
58 |
+-set(LIBCLANG_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/${LIBCLANG_VERSION}") |
59 |
+-if(NOT EXISTS "${LIBCLANG_DIR}") |
60 |
+- message(FATAL_ERROR "libclang ${LIBCLANG_VERSION} not found (re-run install-dependencies script to install)") |
61 |
+-endif() |
62 |
+-set(LIBCLANG_HEADERS_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers") |
63 |
+-if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}") |
64 |
+- message(FATAL_ERROR "libclang builtin-headers not found (re-run install-dependencies script to install)") |
65 |
+-endif() |
66 |
+- |
67 |
+- |
68 |
+ # include files |
69 |
+ file(GLOB_RECURSE SESSION_HEADER_FILES "*.h*") |
70 |
+ |
71 |
+@@ -399,18 +380,6 @@ |
72 |
+ install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-23" |
73 |
+ DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") |
74 |
+ |
75 |
+- # install pandoc |
76 |
+- if(RSTUDIO_PACKAGE_BUILD_SLES) |
77 |
+- # when producing a SUSE Linux Enterpise build, we want to install the |
78 |
+- # static Pandoc binaries (see dependencies/common/install-pandoc) |
79 |
+- set(PANDOC_EXTENSION_DIR "/static") |
80 |
+- endif() |
81 |
+- set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/1.15.2${PANDOC_EXTENSION_DIR}") |
82 |
+- file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*") |
83 |
+- install(FILES ${PANDOC_FILES} |
84 |
+- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE |
85 |
+- DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc) |
86 |
+- |
87 |
+ # install rsconnect package |
88 |
+ file(GLOB RSCONNECT_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rsconnect*.tar.gz") |
89 |
+ install(FILES ${RSCONNECT_PACKAGE} |
90 |
+@@ -428,24 +397,6 @@ |
91 |
+ install(DIRECTORY "resources/help_resources" |
92 |
+ DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) |
93 |
+ |
94 |
+- # install libclang |
95 |
+- if(WIN32) |
96 |
+- file(GLOB LIBCLANG_32_FILES "${LIBCLANG_DIR}/x86/libclang.*") |
97 |
+- install(PROGRAMS ${LIBCLANG_32_FILES} |
98 |
+- DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86) |
99 |
+- file(GLOB LIBCLANG_64_FILES "${LIBCLANG_DIR}/x86_64/libclang.*") |
100 |
+- install(PROGRAMS ${LIBCLANG_64_FILES} |
101 |
+- DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64) |
102 |
+- else() |
103 |
+- file(GLOB_RECURSE LIBCLANG_FILES "${LIBCLANG_DIR}/libclang.*") |
104 |
+- install(PROGRAMS ${LIBCLANG_FILES} |
105 |
+- DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang) |
106 |
+- endif() |
107 |
+- |
108 |
+- # install libclang builtin-headers |
109 |
+- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers" |
110 |
+- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang") |
111 |
+- |
112 |
+ # install 64 bit binaries if we are on win64 |
113 |
+ if(WIN32) |
114 |
+ if(NOT ("$ENV{PROGRAMW6432}" STREQUAL "")) |
115 |
|
116 |
diff --git a/sci-mathematics/rstudio/files/rstudio-0.99.879-paths.patch b/sci-mathematics/rstudio/files/rstudio-0.99.879-paths.patch |
117 |
new file mode 100644 |
118 |
index 0000000..a8b48f2 |
119 |
--- /dev/null |
120 |
+++ b/sci-mathematics/rstudio/files/rstudio-0.99.879-paths.patch |
121 |
@@ -0,0 +1,130 @@ |
122 |
+--- rstudio-0.99.879-orig/CMakeGlobals.txt 2016-02-12 09:24:39.000000000 +1100 |
123 |
++++ rstudio-0.99.879/CMakeGlobals.txt 2016-02-19 22:58:41.396818474 +1100 |
124 |
+@@ -120,7 +120,7 @@ |
125 |
+ else() |
126 |
+ set(RSTUDIO_INSTALL_BIN bin) |
127 |
+ endif() |
128 |
+- set(RSTUDIO_INSTALL_SUPPORTING .) |
129 |
++ set(RSTUDIO_INSTALL_SUPPORTING ${DISTRO_SHARE}) |
130 |
+ endif() |
131 |
+ |
132 |
+ # if the install prefix is /usr/local then tweak as appropriate |
133 |
+--- rstudio-0.99.879-orig/src/cpp/server/CMakeLists.txt 2016-02-12 09:24:39.000000000 +1100 |
134 |
++++ rstudio-0.99.879/src/cpp/server/CMakeLists.txt 2016-02-19 22:58:41.397818478 +1100 |
135 |
+@@ -155,7 +155,7 @@ |
136 |
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in |
137 |
+ ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}) |
138 |
+ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT} |
139 |
+- DESTINATION ${RSERVER_INITD_DEBIAN_DIR}) |
140 |
++ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_DEBIAN_DIR}) |
141 |
+ |
142 |
+ # install configured redhat init.d script |
143 |
+ set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat") |
144 |
+@@ -163,7 +163,7 @@ |
145 |
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in |
146 |
+ ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}) |
147 |
+ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT} |
148 |
+- DESTINATION ${RSERVER_INITD_REDHAT_DIR}) |
149 |
++ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_REDHAT_DIR}) |
150 |
+ |
151 |
+ # install configured suse init.d script |
152 |
+ set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse") |
153 |
+@@ -171,13 +171,13 @@ |
154 |
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in |
155 |
+ ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}) |
156 |
+ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT} |
157 |
+- DESTINATION ${RSERVER_INITD_SUSE_DIR}) |
158 |
++ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_SUSE_DIR}) |
159 |
+ |
160 |
+ # install pam profile |
161 |
+ set(RSERVER_PAM_DIR "extras/pam") |
162 |
+ set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio") |
163 |
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE} |
164 |
+- DESTINATION ${RSERVER_PAM_DIR}) |
165 |
++ DESTINATION ${DISTRO_SHARE}/${RSERVER_PAM_DIR}) |
166 |
+ |
167 |
+ # install configured apparmor profile |
168 |
+ set(RSERVER_APPARMOR_DIR "extras/apparmor") |
169 |
+@@ -185,9 +185,9 @@ |
170 |
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_PROFILE}.in |
171 |
+ ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE}) |
172 |
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE} |
173 |
+- DESTINATION ${RSERVER_APPARMOR_DIR}) |
174 |
++ DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR}) |
175 |
+ install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_DIR}/apparmor-profile-load |
176 |
+- DESTINATION ${RSERVER_APPARMOR_DIR}) |
177 |
++ DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR}) |
178 |
+ |
179 |
+ # install configured upstart profile |
180 |
+ set(RSERVER_UPSTART_DIR "extras/upstart") |
181 |
+@@ -195,12 +195,12 @@ |
182 |
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in |
183 |
+ ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}) |
184 |
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE} |
185 |
+- DESTINATION ${RSERVER_UPSTART_DIR}) |
186 |
++ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) |
187 |
+ set(RSERVER_UPSTART_PROFILE_REDHAT "${RSERVER_UPSTART_DIR}/rstudio-server.redhat.conf") |
188 |
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}.in |
189 |
+ ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}) |
190 |
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT} |
191 |
+- DESTINATION ${RSERVER_UPSTART_DIR}) |
192 |
++ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) |
193 |
+ |
194 |
+ # install configured systemd profile |
195 |
+ set(RSERVER_SYSTEMD_DIR "extras/systemd") |
196 |
+--- rstudio-0.99.879-orig/src/cpp/server/ServerOptions.cpp 2016-02-12 09:24:39.000000000 +1100 |
197 |
++++ rstudio-0.99.879/src/cpp/server/ServerOptions.cpp 2016-02-19 22:58:41.397818478 +1100 |
198 |
+@@ -382,8 +382,8 @@ |
199 |
+ |
200 |
+ // convert relative paths by completing from the system installation |
201 |
+ // path (this allows us to be relocatable) |
202 |
+- resolvePath(resourcePath, &wwwLocalPath_); |
203 |
+- resolvePath(resourcePath, &wwwSymbolMapsPath_); |
204 |
++ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_); |
205 |
++ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_); |
206 |
+ resolvePath(binaryPath, &authPamHelperPath_); |
207 |
+ resolvePath(binaryPath, &rsessionPath_); |
208 |
+ resolvePath(binaryPath, &rldpathPath_); |
209 |
+--- rstudio-0.99.879-orig/src/cpp/session/SessionOptions.cpp 2016-02-12 09:24:39.000000000 +1100 |
210 |
++++ rstudio-0.99.879/src/cpp/session/SessionOptions.cpp 2016-02-20 18:13:34.807771539 +1100 |
211 |
+@@ -49,7 +49,7 @@ |
212 |
+ namespace session { |
213 |
+ |
214 |
+ namespace { |
215 |
+-const char* const kDefaultPandocPath = "bin/pandoc"; |
216 |
++const char* const kDefaultPandocPath = "bin"; |
217 |
+ const char* const kDefaultPostbackPath = "bin/postback/rpostback"; |
218 |
+ const char* const kDefaultRsclangPath = "bin/rsclang"; |
219 |
+ } // anonymous namespace |
220 |
+@@ -451,14 +451,14 @@ |
221 |
+ } |
222 |
+ |
223 |
+ // convert relative paths by completing from the app resource path |
224 |
+- resolvePath(resourcePath_, &rResourcesPath_); |
225 |
+- resolvePath(resourcePath_, &agreementFilePath_); |
226 |
+- resolvePath(resourcePath_, &wwwLocalPath_); |
227 |
+- resolvePath(resourcePath_, &wwwSymbolMapsPath_); |
228 |
+- resolvePath(resourcePath_, &coreRSourcePath_); |
229 |
+- resolvePath(resourcePath_, &modulesRSourcePath_); |
230 |
+- resolvePath(resourcePath_, &sessionLibraryPath_); |
231 |
+- resolvePath(resourcePath_, &sessionPackageArchivesPath_); |
232 |
++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &rResourcesPath_); |
233 |
++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &agreementFilePath_); |
234 |
++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwLocalPath_); |
235 |
++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_); |
236 |
++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &coreRSourcePath_); |
237 |
++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &modulesRSourcePath_); |
238 |
++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionLibraryPath_); |
239 |
++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionPackageArchivesPath_); |
240 |
+ resolvePostbackPath(resourcePath_, &rpostbackPath_); |
241 |
+ #ifdef _WIN32 |
242 |
+ resolvePath(resourcePath_, &consoleIoPath_); |
243 |
+@@ -467,7 +467,7 @@ |
244 |
+ resolvePath(resourcePath_, &msysSshPath_); |
245 |
+ resolvePath(resourcePath_, &sumatraPath_); |
246 |
+ #endif |
247 |
+- resolvePath(resourcePath_, &hunspellDictionariesPath_); |
248 |
++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &hunspellDictionariesPath_); |
249 |
+ resolvePath(resourcePath_, &mathjaxPath_); |
250 |
+ resolvePath(resourcePath_, &libclangHeadersPath_); |
251 |
+ resolvePandocPath(resourcePath_, &pandocPath_); |
252 |
|
253 |
diff --git a/sci-mathematics/rstudio/files/rstudio-0.99.879-prefs.patch b/sci-mathematics/rstudio/files/rstudio-0.99.879-prefs.patch |
254 |
new file mode 100644 |
255 |
index 0000000..483613c |
256 |
--- /dev/null |
257 |
+++ b/sci-mathematics/rstudio/files/rstudio-0.99.879-prefs.patch |
258 |
@@ -0,0 +1,45 @@ |
259 |
+--- rstudio-0.99.879-orig/src/gwt/build.xml 2016-02-12 09:24:39.000000000 +1100 |
260 |
++++ rstudio-0.99.879/src/gwt/build.xml 2016-02-20 00:25:39.458756693 +1100 |
261 |
+@@ -25,6 +25,7 @@ |
262 |
+ <property name="gwt.extra.args" value=""/> |
263 |
+ <property name="gwt.main.module" value="org.rstudio.studio.RStudio"/> |
264 |
+ <property name="ace.bin" value="src/org/rstudio/studio/client/workbench/views/source/editors/text/ace"/> |
265 |
++ <property environment="env"/> |
266 |
+ |
267 |
+ <path id="project.class.path"> |
268 |
+ <pathelement location="bin"/> |
269 |
+@@ -101,8 +102,10 @@ |
270 |
+ <pathelement location="src"/> |
271 |
+ <path refid="project.class.path"/> |
272 |
+ </classpath> |
273 |
++ <jvmarg value="-Duser.home=${env.T}"/> |
274 |
+ <!-- add jvmarg -Xss16M or similar if you see a StackOverflowError --> |
275 |
+ <jvmarg value="-Xmx1536M"/> |
276 |
++ <jvmarg value="-Djava.util.prefs.userRoot=${env.T}"/> |
277 |
+ <arg value="-war"/> |
278 |
+ <arg value="www"/> |
279 |
+ <arg value="-localWorkers"/> |
280 |
+@@ -142,6 +145,7 @@ |
281 |
+ <pathelement location="src"/> |
282 |
+ <path refid="project.class.path"/> |
283 |
+ </classpath> |
284 |
++ <jvmarg value="-Duser.home=${env.T}"/> |
285 |
+ <jvmarg value="-Xmx2048M"/> |
286 |
+ <arg value="-war"/> |
287 |
+ <arg value="www"/> |
288 |
+@@ -163,6 +167,7 @@ |
289 |
+ <pathelement location="src"/> |
290 |
+ <path refid="project.class.path"/> |
291 |
+ </classpath> |
292 |
++ <jvmarg value="-Duser.home=${env.T}"/> |
293 |
+ <jvmarg value="-Xmx2048M"/> |
294 |
+ <arg value="-src"/> |
295 |
+ <arg value = "src"/> |
296 |
+@@ -194,6 +199,7 @@ |
297 |
+ <pathelement location="src"/> |
298 |
+ <path refid="test.class.path"/> |
299 |
+ </classpath> |
300 |
++ <jvmarg value="-Duser.home=${env.T}"/> |
301 |
+ <arg value="org.rstudio.studio.selenium.RStudioTestSuite"/> |
302 |
+ </java> |
303 |
+ </sequential> |
304 |
|
305 |
diff --git a/sci-mathematics/rstudio/rstudio-0.99.879.ebuild b/sci-mathematics/rstudio/rstudio-0.99.879.ebuild |
306 |
new file mode 100644 |
307 |
index 0000000..35a886b |
308 |
--- /dev/null |
309 |
+++ b/sci-mathematics/rstudio/rstudio-0.99.879.ebuild |
310 |
@@ -0,0 +1,250 @@ |
311 |
+# Copyright 1999-2016 Gentoo Foundation |
312 |
+# Distributed under the terms of the GNU General Public License v2 |
313 |
+# $Id$ |
314 |
+ |
315 |
+EAPI=5 |
316 |
+ |
317 |
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils |
318 |
+ |
319 |
+# TODO |
320 |
+# * package gin and gwt |
321 |
+# * use dict from tree, linguas |
322 |
+# * do src_test (use junit from tree?) |
323 |
+ |
324 |
+# update from scripts in dependencies/common |
325 |
+# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt |
326 |
+GWT_VER=2.7.0 |
327 |
+GIN_VER=1.5 |
328 |
+SELENIUM_VER=2.37.0 |
329 |
+CHROMEDRIVER_VER=2.7 |
330 |
+# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc |
331 |
+PANDOC_VER=1.13.1 |
332 |
+# ls dependencies/common/*.tar.gz |
333 |
+PACKRAT_VER=0.98.1000 |
334 |
+RMARKDOWN_VER=0.98.1000 |
335 |
+SHINYAPPS_VER=0.98.1000 |
336 |
+RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0 |
337 |
+ |
338 |
+DESCRIPTION="IDE for the R language" |
339 |
+HOMEPAGE=" |
340 |
+ http://www.rstudio.org |
341 |
+ https://github.com/rstudio/rstudio/" |
342 |
+SRC_URI=" |
343 |
+ https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz |
344 |
+ https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip |
345 |
+ https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip |
346 |
+ https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip |
347 |
+ https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar |
348 |
+ https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux |
349 |
+ https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip |
350 |
+ https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz |
351 |
+ https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz |
352 |
+ https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz |
353 |
+ https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz |
354 |
+" |
355 |
+ |
356 |
+LICENSE="AGPL-3" |
357 |
+SLOT="0" |
358 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
359 |
+IUSE="dedicated server" |
360 |
+ |
361 |
+QT_VER=5.4 |
362 |
+QT_SLOT=5 |
363 |
+RDEPEND=" |
364 |
+ app-text/pandoc |
365 |
+ dev-haskell/pandoc-citeproc |
366 |
+ >=dev-lang/R-2.11.1 |
367 |
+ >=dev-libs/boost-1.50:= |
368 |
+ >=dev-libs/mathjax-2.3 |
369 |
+ dev-libs/openssl:0 |
370 |
+ sys-apps/util-linux |
371 |
+ >=sys-devel/clang-3.5.0 |
372 |
+ sys-libs/zlib |
373 |
+ || ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= ) |
374 |
+ x11-libs/pango |
375 |
+ !dedicated? ( |
376 |
+ >=dev-qt/qtcore-${QT_VER}:${QT_SLOT} |
377 |
+ >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT} |
378 |
+ >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT} |
379 |
+ >=dev-qt/qtgui-${QT_VER}:${QT_SLOT} |
380 |
+ >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT} |
381 |
+ >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} |
382 |
+ >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} |
383 |
+ >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} |
384 |
+ >=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5] |
385 |
+ >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} |
386 |
+ >=dev-qt/qtsql-${QT_VER}:${QT_SLOT} |
387 |
+ >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} |
388 |
+ >=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT} |
389 |
+ >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} |
390 |
+ >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} |
391 |
+ >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} |
392 |
+ server? ( virtual/pam ) |
393 |
+ ) |
394 |
+ dedicated? ( virtual/pam )" |
395 |
+DEPEND="${RDEPEND} |
396 |
+ app-arch/unzip |
397 |
+ dev-java/ant-core |
398 |
+ || ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= ) |
399 |
+ virtual/pkgconfig" |
400 |
+# test? ( dev-java/junit:4 ) |
401 |
+ |
402 |
+PATCHES=( |
403 |
+ "${FILESDIR}/${PN}-0.99.879-prefs.patch" |
404 |
+ "${FILESDIR}/${PN}-0.99.879-paths.patch" |
405 |
+ "${FILESDIR}/${PN}-0.99.879-clang-pandoc.patch" |
406 |
+ "${FILESDIR}/${PN}-0.98.490-linker_flags.patch" |
407 |
+ "${FILESDIR}/${PN}-0.98.1091-boost-1.57.patch" |
408 |
+ "${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch" |
409 |
+ "${FILESDIR}/${PN}-0.99.486-systemd.patch" |
410 |
+) |
411 |
+ |
412 |
+src_unpack() { |
413 |
+ unpack ${P}.tar.gz gwt-${GWT_VER}.zip |
414 |
+ cd "${S}" || die |
415 |
+ mkdir -p src/gwt/lib/{gin,gwt} \ |
416 |
+ dependencies/common/dictionaries \ |
417 |
+ src/gwt/lib/selenium/${SELENIUM_VER} \ |
418 |
+ src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die |
419 |
+ mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die |
420 |
+ unzip -qd src/gwt/lib/gin/${GIN_VER} \ |
421 |
+ "${DISTDIR}"/gin-${GIN_VER}.zip || die |
422 |
+ unzip -qd dependencies/common/dictionaries \ |
423 |
+ "${DISTDIR}"/core-dictionaries.zip || die |
424 |
+ unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \ |
425 |
+ "${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die |
426 |
+ cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \ |
427 |
+ src/gwt/lib/selenium/${SELENIUM_VER}/ || die |
428 |
+ cp "${DISTDIR}"/chromedriver-linux \ |
429 |
+ src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die |
430 |
+ cd dependencies/common || die |
431 |
+ unpack packrat-${PACKRAT_VER}.tar.gz |
432 |
+ unpack rmarkdown-${RMARKDOWN_VER}.tar.gz |
433 |
+ unpack shinyapps-${SHINYAPPS_VER}.tar.gz |
434 |
+ unpack rsconnect_${RSCONNECT_VER}.tar.gz |
435 |
+ cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \ |
436 |
+ . || die |
437 |
+ cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \ |
438 |
+ . || die |
439 |
+ cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \ |
440 |
+ . || die |
441 |
+ cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \ |
442 |
+ . || die |
443 |
+} |
444 |
+ |
445 |
+src_prepare() { |
446 |
+ java-pkg-2_src_prepare |
447 |
+ |
448 |
+ egit_clean |
449 |
+ |
450 |
+ epatch "${PATCHES[@]}" |
451 |
+ |
452 |
+ # Enable CMake to install our .service file for systemd usage |
453 |
+ mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die |
454 |
+ cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die |
455 |
+ |
456 |
+ # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using |
457 |
+ # this sed hack for now. ~RMH |
458 |
+ sed -i \ |
459 |
+ -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \ |
460 |
+ src/cpp/server/ServerOptions.cpp \ |
461 |
+ src/cpp/session/SessionOptions.cpp || die |
462 |
+ |
463 |
+ # use mathjax from system |
464 |
+ ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-23 || die |
465 |
+ |
466 |
+ # make sure icons and mime stuff are with prefix |
467 |
+ sed -i \ |
468 |
+ -e "s:/usr:${EPREFIX}/usr:g" \ |
469 |
+ CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die |
470 |
+ |
471 |
+ # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf |
472 |
+ sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \ |
473 |
+ -i src/cpp/server/ServerOptions.cpp \ |
474 |
+ || die |
475 |
+ |
476 |
+ # Set the rsession.conf file location for Gentoo prefix |
477 |
+ sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \ |
478 |
+ -i src/cpp/session/SessionOptions.cpp \ |
479 |
+ || die |
480 |
+ |
481 |
+ # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module. |
482 |
+ # It provides a library that has its version number appended to the end, |
483 |
+ # which is difficult to handle in cmake, as find_library does not support |
484 |
+ # searching for wildcard library names. So I find the library name from the |
485 |
+ # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. |
486 |
+ rm -rf "${S}"/src/cpp/desktop/3rdparty || die |
487 |
+ local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ |
488 |
+ "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \ |
489 |
+ | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ |
490 |
+ -e 's@LIBS \*= -l@@') |
491 |
+ sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ |
492 |
+ -i "${S}"/src/cpp/desktop/CMakeLists.txt \ |
493 |
+ || die |
494 |
+ |
495 |
+ # The git commit for tag v0.99.879 |
496 |
+ sed -e 's@git ARGS rev-parse HEAD@echo ARGS 9ac918338d6f9d6dd25807d6d746b470f1cfcf6d@'\ |
497 |
+ -i "${S}"/CMakeLists.txt \ |
498 |
+ "${S}"/CMakeGlobals.txt \ |
499 |
+ || die |
500 |
+} |
501 |
+ |
502 |
+src_configure() { |
503 |
+ export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1) |
504 |
+ export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2) |
505 |
+ export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3) |
506 |
+ |
507 |
+ local mycmakeargs=( |
508 |
+ -DDISTRO_SHARE=share/${PN} |
509 |
+ $(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP) |
510 |
+ -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") |
511 |
+ -DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake |
512 |
+ -DRSTUDIO_VERIFY_R_VERSION=FALSE |
513 |
+ ) |
514 |
+ |
515 |
+ cmake-utils_src_configure |
516 |
+} |
517 |
+ |
518 |
+src_compile() { |
519 |
+ # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny |
520 |
+ # P: /root/.oracle_jre_usage. |
521 |
+ export ANT_OPTS="-Duser.home=${T}" |
522 |
+ cmake-utils_src_compile |
523 |
+} |
524 |
+ |
525 |
+src_install() { |
526 |
+ export ANT_OPTS="-Duser.home=${T}" |
527 |
+ cmake-utils_src_install |
528 |
+ pax-mark m "${ED}usr/bin/rstudio" |
529 |
+ doconfd "${FILESDIR}"/rstudio-server.conf |
530 |
+ dodir /etc/rstudio |
531 |
+ insinto /etc/rstudio |
532 |
+ doins "${FILESDIR}"/rsession.conf |
533 |
+ dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf |
534 |
+ if use dedicated || use server; then |
535 |
+ dopamd src/cpp/server/extras/pam/rstudio |
536 |
+ newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server |
537 |
+ fi |
538 |
+} |
539 |
+ |
540 |
+pkg_preinst() { |
541 |
+ use dedicated || gnome2_icon_savelist |
542 |
+ java-pkg-2_pkg_preinst |
543 |
+} |
544 |
+ |
545 |
+pkg_postinst() { |
546 |
+ use dedicated || { fdo-mime_desktop_database_update |
547 |
+ fdo-mime_mime_database_update |
548 |
+ gnome2_icon_cache_update ;} |
549 |
+ |
550 |
+ if use dedicated || use server; then |
551 |
+ enewgroup rstudio-server |
552 |
+ enewuser rstudio-server -1 -1 -1 rstudio-server |
553 |
+ fi |
554 |
+} |
555 |
+ |
556 |
+pkg_postrm() { |
557 |
+ use dedicated || { fdo-mime_desktop_database_update |
558 |
+ fdo-mime_mime_database_update |
559 |
+ gnome2_icon_cache_update ;} |
560 |
+} |