[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/files/, sci-mathematics/rstudio/
commit: f6bde9a800ea09a38d7e0fab20ee1379bf339a89
Author: Pacho Ramos gentoo org>
AuthorDate: Fri Jun 11 18:25:07 2021 +
Commit: Pacho Ramos gentoo org>
CommitDate: Fri Jun 11 18:34:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6bde9a8
sci-mathematics/rstudio: Fix build with boost-1.76.0
Thanks-to: Dmitry S. Kulyabov
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Pacho Ramos gentoo.org>
.../files/rstudio-1.3.1093-boost-1.76.patch| 55 ++
sci-mathematics/rstudio/rstudio-1.3.1093.ebuild| 2 +
2 files changed, 57 insertions(+)
diff --git a/sci-mathematics/rstudio/files/rstudio-1.3.1093-boost-1.76.patch
b/sci-mathematics/rstudio/files/rstudio-1.3.1093-boost-1.76.patch
new file mode 100644
index 000..5e832db2883
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.3.1093-boost-1.76.patch
@@ -0,0 +1,55 @@
+--- rstudio-1.3.1093-orig/src/cpp/r/session/RStdCallbacks.cpp
rstudio-1.3.1093/src/cpp/r/session/RStdCallbacks.cpp
+@@ -19,7 +19,7 @@
+
+ #include
+ #include
+-#include
++#include
+
+ #include
+ #include
+@@ -58,6 +58,7 @@ __declspec(dllimport) SA_TYPE SaveAction
+ }
+
+ using namespace rstudio::core;
++using namespace boost::placeholders;
+
+ namespace rstudio {
+ namespace r {
+--- rstudio-1.3.1093-orig/src/cpp/core/HtmlUtils.cpp.orig
rstudio-1.3.1093/src/cpp/core/HtmlUtils.cpp
+@@ -19,13 +19,15 @@
+
+ #include
+ #include
+-#include
++#include
+
+ #include
+ #include
+ #include
+
+ #include
++
++using namespace boost::placeholders;
+
+ namespace rstudio {
+ namespace core {
+--- rstudio-1.3.1093-orig/src/cpp/core/file_lock/FileLock.cpp.orig
rstudio-1.3.1093/src/cpp/core/file_lock/FileLock.cpp
+@@ -26,10 +26,12 @@
+ #include
+
+ #include
+-#include
++#include
+
+ // borrowed from SessionConstants.hpp
+ #define kRStudioSessionRoute "RSTUDIO_SESSION_ROUTE"
++
++using namespace boost::placeholders;
+
+ namespace rstudio {
+ namespace core {
+
\ No newline at end of file
diff --git a/sci-mathematics/rstudio/rstudio-1.3.1093.ebuild
b/sci-mathematics/rstudio/rstudio-1.3.1093.ebuild
index 4fee0074c08..851ffef54c9 100644
--- a/sci-mathematics/rstudio/rstudio-1.3.1093.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.3.1093.ebuild
@@ -95,6 +95,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.2.5042-boost-1.73.0.patch
"${FILESDIR}"/${PN}-1.3.1056-R-4.0.0.patch
"${FILESDIR}"/${PN}-1.3.1056-boost-1.74.0.patch
+ "${FILESDIR}"/${PN}-1.3.1093-boost-1.76.patch
)
src_unpack() {
@@ -177,6 +178,7 @@ src_configure() {
-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server
"Development" "Desktop")")
-DRSTUDIO_VERIFY_R_VERSION=FALSE
-DRSTUDIO_USE_SYSTEM_BOOST=TRUE
+ -DRSTUDIO_BOOST_SIGNALS_VERSION=2
)
if use !dedicated; then
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/files/, sci-mathematics/rstudio/
commit: e3ca911b12cb1ec292f6d15535c0beef3faa0549
Author: Pacho Ramos gentoo org>
AuthorDate: Fri Jun 11 18:27:50 2021 +
Commit: Pacho Ramos gentoo org>
CommitDate: Fri Jun 11 18:34:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3ca911b
sci-mathematics/rstudio: Fix server startup scripts
Closes: https://bugs.gentoo.org/765856
Thanks-to: viktor.polak
Thanks-to: François Valenduc
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Pacho Ramos gentoo.org>
sci-mathematics/rstudio/files/rstudio-server.initd | 6 +-
sci-mathematics/rstudio/files/rstudio-server.service.in | 1 +
.../rstudio/{rstudio-1.3.1093.ebuild => rstudio-1.3.1093-r1.ebuild} | 0
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/sci-mathematics/rstudio/files/rstudio-server.initd
b/sci-mathematics/rstudio/files/rstudio-server.initd
index caa7e46d5df..96c1e4f210c 100644
--- a/sci-mathematics/rstudio/files/rstudio-server.initd
+++ b/sci-mathematics/rstudio/files/rstudio-server.initd
@@ -1,7 +1,11 @@
#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+depend() {
+ need net
+}
+
start() {
ebegin "Starting RStudio Server"
start-stop-daemon --start --quiet --exec /usr/bin/rserver
diff --git a/sci-mathematics/rstudio/files/rstudio-server.service.in
b/sci-mathematics/rstudio/files/rstudio-server.service.in
index fb3e37305e0..08965a836a2 100644
--- a/sci-mathematics/rstudio/files/rstudio-server.service.in
+++ b/sci-mathematics/rstudio/files/rstudio-server.service.in
@@ -1,5 +1,6 @@
[Unit]
Description=RStudio Server
+After=network.target
[Service]
Type=forking
diff --git a/sci-mathematics/rstudio/rstudio-1.3.1093.ebuild
b/sci-mathematics/rstudio/rstudio-1.3.1093-r1.ebuild
similarity index 100%
rename from sci-mathematics/rstudio/rstudio-1.3.1093.ebuild
rename to sci-mathematics/rstudio/rstudio-1.3.1093-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/files/, sci-mathematics/rstudio/
commit: d6cbaf2df3b45b5a470ecca8cd7fedf56b074413
Author: Mark Wright gentoo org>
AuthorDate: Sun May 24 05:03:52 2020 +
Commit: Mark Wright gentoo org>
CommitDate: Sun May 24 05:03:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6cbaf2d
sci-mathematics/rstudio: Fix build with R 4.0.0
Thanks to Francois Valenduc for reporting.
Closes: https://bugs.gentoo.org/722850
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Mark Wright gentoo.org>
.../rstudio/files/rstudio-1.2.5042-R-4.0.0.patch | 106 +
sci-mathematics/rstudio/rstudio-1.2.5033.ebuild| 1 +
sci-mathematics/rstudio/rstudio-1.2.5042.ebuild| 1 +
3 files changed, 108 insertions(+)
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.5042-R-4.0.0.patch
b/sci-mathematics/rstudio/files/rstudio-1.2.5042-R-4.0.0.patch
new file mode 100644
index 000..87ec83a7d4a
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.2.5042-R-4.0.0.patch
@@ -0,0 +1,106 @@
+From 71b1a935762efd24a79de193662450de5a89f67e Mon Sep 17 00:00:00 2001
+From: Jonathan McPherson
+Date: Tue, 14 Jan 2020 12:53:20 -0800
+Subject: [PATCH] use R_NoSave over R_Slave for R 4.0+
+
+---
+ src/cpp/r/CMakeLists.txt | 12
+ src/cpp/r/config.h.in| 8 +++-
+ src/cpp/r/session/REmbeddedPosix.cpp | 20 ++--
+ 3 files changed, 33 insertions(+), 7 deletions(-)
+
+diff --git a/src/cpp/r/CMakeLists.txt b/src/cpp/r/CMakeLists.txt
+index 6984ae309c..29784b8b67 100644
+--- a/src/cpp/r/CMakeLists.txt
b/src/cpp/r/CMakeLists.txt
+@@ -15,6 +15,18 @@
+
+ project (R)
+
++# find the version of R in play
++find_package(LibR REQUIRED)
++execute_process(
++COMMAND "${LIBR_EXECUTABLE}" "--vanilla" "--slave" "-e"
"cat(as.character(getRversion()))"
++OUTPUT_VARIABLE LIBR_VERSION)
++
++# parse and save the R version to a variable
++string(REPLACE "." ";" R_VERSION_LIST "${LIBR_VERSION}")
++list(GET R_VERSION_LIST 0 R_VERSION_MAJOR)
++list(GET R_VERSION_LIST 1 R_VERSION_MINOR)
++list(GET R_VERSION_LIST 2 R_VERSION_PATCH)
++
+ # include files
+ file(GLOB_RECURSE R_HEADER_FILES "*.h*")
+
+diff --git a/src/cpp/r/config.h.in b/src/cpp/r/config.h.in
+index 6ba67c8e09..00bc8b6191 100644
+--- a/src/cpp/r/config.h.in
b/src/cpp/r/config.h.in
+@@ -1,7 +1,7 @@
+ /*
+ * config.h.in
+ *
+- * Copyright (C) 2009-12 by RStudio, Inc.
++ * Copyright (C) 2009-20 by RStudio, Inc.
+ *
+ * Unless you have received this program directly from RStudio pursuant
+ * to the terms of a commercial license agreement with RStudio, then
+@@ -16,4 +16,10 @@
+
+ #cmakedefine PANGO_CAIRO_FOUND
+
++// Important: These variables represent the version of R found during
++// compile/link time, NOT the version of R present at runtime.
++#define R_VERSION_MAJOR ${R_VERSION_MAJOR}
++#define R_VERSION_MINOR ${R_VERSION_MINOR}
++#define R_VERSION_PATCH ${R_VERSION_PATCH}
++
+
+diff --git a/src/cpp/r/session/REmbeddedPosix.cpp
b/src/cpp/r/session/REmbeddedPosix.cpp
+index ac71b94522..73e2e2ce7f 100644
+--- a/src/cpp/r/session/REmbeddedPosix.cpp
b/src/cpp/r/session/REmbeddedPosix.cpp
+@@ -1,7 +1,7 @@
+ /*
+ * REmbeddedPosix.cpp
+ *
+- * Copyright (C) 2009-12 by RStudio, Inc.
++ * Copyright (C) 2009-20 by RStudio, Inc.
+ *
+ * Unless you have received this program directly from RStudio pursuant
+ * to the terms of a commercial license agreement with RStudio, then
+@@ -38,6 +38,8 @@ extern "C" void (*ptr_R_ProcessEvents)(void);
+ extern "C" typedef void (*ptr_QuartzCocoa_SetupEventLoop)(int, unsigned
long);
+ #endif
+
++#include "config.h"
++
+ extern int R_running_as_main_program; // from unix/system.c
+
+ using namespace rstudio::core;
+@@ -103,14 +105,20 @@ void runEmbeddedR(const core::FilePath& /*rHome*/,//
ignored on posix
+//
+structRstart rp;
+Rstart Rp =
+- R_DefParams(Rp) ;
+- Rp->R_Slave = FALSE ;
++ R_DefParams(Rp);
++#if R_VERSION_MAJOR > 3
++ // R 4.0 and above use --no-echo to suppress output
++ Rp->R_NoEcho = FALSE;
++#else
++ // R 3.x and below use --slave
++ Rp->R_Slave = FALSE;
++#endif
+Rp->R_Quiet = quiet ? TRUE : FALSE;
+- Rp->R_Interactive = TRUE ;
+- Rp->SaveAction = defaultSaveAction ;
++ Rp->R_Interactive = TRUE;
++ Rp->SaveAction = defaultSaveAction;
+Rp->RestoreAction = SA_NORESTORE; // handled within initialize()
+Rp->LoadInitFile = loadInitFile ? TRUE : FALSE;
+- R_SetParams(Rp) ;
++ R_SetParams(Rp);
+
+// redirect console
+R_Interactive = TRUE; // should have also been set by call to
Rf_initialize_R
diff --git a/sci-mathematics/rstudio/rstudio-1.2.5033.ebuild
b/sci-mathematics/rstudio/rstudio-1.2.5033.ebuild
index 77f9349a116..09ff6e9c516 100644
--- a/sci-mathematics/rstudio/rstudio-1.2.5033.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.2.5033.ebuild
@@ -100,6 +100,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p1.patch
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/files/, sci-mathematics/rstudio/
commit: 83f5ebaecb1e0351c10f988589fe2858259e6a85
Author: Mark Wright gentoo org>
AuthorDate: Tue Apr 28 12:23:49 2020 +
Commit: Mark Wright gentoo org>
CommitDate: Tue Apr 28 12:24:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83f5ebae
sci-mathematics/rstudio: Bump to 1.2.5042
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Mark Wright gentoo.org>
sci-mathematics/rstudio/Manifest | 1 +
.../files/rstudio-1.2.5042-boost-1.73.0.patch | 22 ++
sci-mathematics/rstudio/rstudio-1.2.5042.ebuild| 236 +
3 files changed, 259 insertions(+)
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 48c017368ef..314a334a3e7 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -10,6 +10,7 @@ DIST
rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz 197051 BL
DIST rstudio-1.1.463.tar.gz 20203779 BLAKE2B
97f879539cbb7051af362a8469795a47feb42d18ff46dbbdffe36e0685d1cd5704848b3bf5a5611d482a09567722e35288527302cd521b18e2a48b347c919e17
SHA512
987347563a9726363c28d866e1372eae8eb19a5cbd0e33c7ee0e0c8f90471c4b69de0f559c00410523841b6c090b584652e01496f5db33c015a4554d2f4e179b
DIST rstudio-1.2.1335.tar.gz 20440199 BLAKE2B
cdd54a7df5a234bcc6d440f4ba5b45e58ea469f8dac5a17d9088f9d65035495c86b5a308cde28a224648f96a74038299863291f3c516a1d567762ecc5bfb079c
SHA512
90657effc55264bf3efa1a8a5d2bbe94a37727f0450202ade99b9fbb71ea75b6dd9fa798d17cd4d1a1a97a16f186de8004d1888b6ea43f36d5252508520d3cde
DIST rstudio-1.2.5033.tar.gz 20456976 BLAKE2B
3cbca6a5180690104dddf1456168bd38708d4152ed9b7a167035dd66e270aeb6405169d34461cbd899738be1872607e3f3b6f81ff0b3c9e6a9ed965a889b1393
SHA512
3569d4fed342275a9905c87e4f97be63b6391d2c37f75397e06201a7c31f80d94799214f51ff8e57d458ef18d5e54afe1ec8a7c56ac05ed8b8225ecca72d1daf
+DIST rstudio-1.2.5042.tar.gz 20456999 BLAKE2B
3251ab2511daefefa395256fedb273ecc36dbc8118457474e3647f7616baea91301e597896582ad4b191195fc7baf17645c4c25b9a957a0c17a6251151b1dd87
SHA512
e09f2360abecde0c16e240e6838efb270a355bec3d3982ffde2b01b32b21e9281fef465734edbfeb5e05375529cc7f06d5b5d41304f367982f53ae7ad98e20f9
DIST selenium-java-2.37.0.zip 24625928 BLAKE2B
b369a805ae96f0d0913c4be42888d9c2a1e213ff982f9daefe73fadb705baa80ab0186ab50ed52609e83697cffaf8d617d06d75405cb8e1c3fe8e7c5b81dba25
SHA512
68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779
DIST selenium-server-standalone-2.37.0.jar 34730734 BLAKE2B
3899b1d4c5f9153c1f9f13bec66f7c1456ea2e0f34db7d8e54a1ce9063c33a05b3cf95216c2ae06bb40504f72f343a4b9ba6c8553fbbc340e7c18a5b612dde5c
SHA512
b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018
DIST shinyapps-0.98.1000.tar.gz 910095 BLAKE2B
4f9364692348bb52cbd12cc6ee447841cb0c805327f2518b2a9545920b602b954a98dea68ccb3daf32d2c3bab6464fb15402844d93277193315f1ae7b3ca5190
SHA512
3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.5042-boost-1.73.0.patch
b/sci-mathematics/rstudio/files/rstudio-1.2.5042-boost-1.73.0.patch
new file mode 100644
index 000..cd024e9ed91
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.2.5042-boost-1.73.0.patch
@@ -0,0 +1,22 @@
+--- rstudio-1.2.5042-orig/src/cpp/core/system/PosixChildProcessTracker.cpp
2020-04-02 03:16:24.0 +1100
rstudio-1.2.5042/src/cpp/core/system/PosixChildProcessTracker.cpp
2020-04-28 15:36:44.839368084 +1000
+@@ -19,6 +19,8 @@
+
+ #include
+
++using namespace boost::placeholders;
++
+ namespace rstudio {
+ namespace core {
+ namespace system {
+--- rstudio-1.2.5042-orig/src/cpp/core/system/PosixOutputCapture.cpp
2020-04-02 03:16:24.0 +1100
rstudio-1.2.5042/src/cpp/core/system/PosixOutputCapture.cpp
2020-04-28 15:35:50.869185435 +1000
+@@ -28,6 +28,8 @@
+
+ #include
+
++using namespace boost::placeholders;
++
+ namespace rstudio {
+ namespace core {
+ namespace system {
diff --git a/sci-mathematics/rstudio/rstudio-1.2.5042.ebuild
b/sci-mathematics/rstudio/rstudio-1.2.5042.ebuild
new file mode 100644
index 000..2de83f6f633
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-1.2.5042.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils cmake-utils pam xdg-utils java-pkg-2 java-ant-2 pax-utils
prefix qmake-utils vcs-clean
+
+# TODO
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+# update from scripts in dependencies/common
+# egrep '(GWT_SDK_VER=|GIN_VER=)' dependencies/common/install-gwt
+GWT_VER=2.8.1
+GIN_VER=2.1.2
+# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc
+# It should be
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/files/, sci-mathematics/rstudio/
commit: 8c2e866221a19364bb608688acd0794ecf86c204
Author: Mark Wright gentoo org>
AuthorDate: Fri Jan 10 08:42:28 2020 +
Commit: Mark Wright gentoo org>
CommitDate: Fri Jan 10 08:43:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c2e8662
sci-mathematics/rstudio: Bump to 1.2.5033, use acct rstudio-server
Thanks to John Dough for reporting the version bump bug #702140.
Thanks to toralf for reporting bug #693662. The egit_clean: command not found
is fixed by inherit vcs-clean.
The QA: other
The ebuild is installing to one or more unexpected paths:
/usr/extras
is fixed with the sed under this comment:
# install themes in /etc/rstudio/extra/sthemes instead of /usr/extra/themes
The: One or more CMake variables were not used by the project:
QT_QMAKE_EXECUTABLE
RSTUDIO_INSTALL_FREEDESKTOP
is fixed by only setting these variables if use !dedicated.
Thanks to Alessandro Barbieri reporting bug #696944, the dependencies are
unbundled in rstudio 1.2.5033.ebuild, and some needless dependencies are
removed.
Closes: https://bugs.gentoo.org/show_bug.cgi?id=702140
Closes: https://bugs.gentoo.org/show_bug.cgi?id=693662
Closes: https://bugs.gentoo.org/show_bug.cgi?id=696944
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mark Wright gentoo.org>
sci-mathematics/rstudio/Manifest | 1 +
.../rstudio/files/rstudio-1.2.5033-pandoc.patch| 32 +++
.../rstudio/files/rstudio-1.2.5033-paths.patch | 118 +++
.../rstudio/files/rstudio-1.2.5033-prefs.patch | 83
sci-mathematics/rstudio/rstudio-1.2.5033.ebuild| 235 +
5 files changed, 469 insertions(+)
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 2c0bab41204..48c017368ef 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -9,6 +9,7 @@ DIST rmarkdown-0.98.1000.tar.gz 1423820 BLAKE2B
eac8c9cf438c9b44ddfe954602dd67a8
DIST rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz 197051
BLAKE2B
1f3f9fe71d7b50ab5108dfdbd3cc0b882bcc935ee58e8a9145b07a18bb86c39bc45e321a13add24df99492bc30548df716775c339bcbf4efc2bfe158299ae55a
SHA512
208dc349f4aa7613ecf94939aba60d22d3a06972344b526c9b6c951015571f5922927bca08db571a7b8a268e42609a4f558f01278c9685f6da2ffc66a1f95ade
DIST rstudio-1.1.463.tar.gz 20203779 BLAKE2B
97f879539cbb7051af362a8469795a47feb42d18ff46dbbdffe36e0685d1cd5704848b3bf5a5611d482a09567722e35288527302cd521b18e2a48b347c919e17
SHA512
987347563a9726363c28d866e1372eae8eb19a5cbd0e33c7ee0e0c8f90471c4b69de0f559c00410523841b6c090b584652e01496f5db33c015a4554d2f4e179b
DIST rstudio-1.2.1335.tar.gz 20440199 BLAKE2B
cdd54a7df5a234bcc6d440f4ba5b45e58ea469f8dac5a17d9088f9d65035495c86b5a308cde28a224648f96a74038299863291f3c516a1d567762ecc5bfb079c
SHA512
90657effc55264bf3efa1a8a5d2bbe94a37727f0450202ade99b9fbb71ea75b6dd9fa798d17cd4d1a1a97a16f186de8004d1888b6ea43f36d5252508520d3cde
+DIST rstudio-1.2.5033.tar.gz 20456976 BLAKE2B
3cbca6a5180690104dddf1456168bd38708d4152ed9b7a167035dd66e270aeb6405169d34461cbd899738be1872607e3f3b6f81ff0b3c9e6a9ed965a889b1393
SHA512
3569d4fed342275a9905c87e4f97be63b6391d2c37f75397e06201a7c31f80d94799214f51ff8e57d458ef18d5e54afe1ec8a7c56ac05ed8b8225ecca72d1daf
DIST selenium-java-2.37.0.zip 24625928 BLAKE2B
b369a805ae96f0d0913c4be42888d9c2a1e213ff982f9daefe73fadb705baa80ab0186ab50ed52609e83697cffaf8d617d06d75405cb8e1c3fe8e7c5b81dba25
SHA512
68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779
DIST selenium-server-standalone-2.37.0.jar 34730734 BLAKE2B
3899b1d4c5f9153c1f9f13bec66f7c1456ea2e0f34db7d8e54a1ce9063c33a05b3cf95216c2ae06bb40504f72f343a4b9ba6c8553fbbc340e7c18a5b612dde5c
SHA512
b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018
DIST shinyapps-0.98.1000.tar.gz 910095 BLAKE2B
4f9364692348bb52cbd12cc6ee447841cb0c805327f2518b2a9545920b602b954a98dea68ccb3daf32d2c3bab6464fb15402844d93277193315f1ae7b3ca5190
SHA512
3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.5033-pandoc.patch
b/sci-mathematics/rstudio/files/rstudio-1.2.5033-pandoc.patch
new file mode 100644
index 000..b4f611063e1
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.2.5033-pandoc.patch
@@ -0,0 +1,32 @@
+--- rstudio-1.2.5033-orig/src/cpp/session/CMakeLists.txt 2019-12-04
17:22:17.0 +1100
rstudio-1.2.5033/src/cpp/session/CMakeLists.txt2020-01-07
12:29:20.174304185 +1100
+@@ -25,9 +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")
+-
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/files/, sci-mathematics/rstudio/
commit: 81c6a4956dd1bfed76c9845066f5ab0db75475ce
Author: David Seifert gentoo org>
AuthorDate: Fri Dec 20 17:53:44 2019 +
Commit: David Seifert gentoo org>
CommitDate: Fri Dec 20 17:53:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81c6a495
sci-mathematics/rstudio: Fix building with boost 1.72
Closes: https://bugs.gentoo.org/703124
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: David Seifert gentoo.org>
.../rstudio/files/rstudio-1.0.44-systemd.patch | 8 +++---
.../rstudio-1.2.1335-boost-1.72-filesystem.patch | 31 ++
sci-mathematics/rstudio/rstudio-1.2.1335.ebuild| 23
3 files changed, 47 insertions(+), 15 deletions(-)
diff --git a/sci-mathematics/rstudio/files/rstudio-1.0.44-systemd.patch
b/sci-mathematics/rstudio/files/rstudio-1.0.44-systemd.patch
index 7eafd4386ab..56601de5341 100644
--- a/sci-mathematics/rstudio/files/rstudio-1.0.44-systemd.patch
+++ b/sci-mathematics/rstudio/files/rstudio-1.0.44-systemd.patch
@@ -1,7 +1,7 @@
rstudio-1.0.44-orig/src/cpp/server/CMakeLists.txt 2016-10-19
08:32:41.0 +1100
-+++ rstudio-1.0.44/src/cpp/server/CMakeLists.txt 2016-12-02
11:11:45.259050839 +1100
-@@ -203,17 +203,12 @@
-DESTINATION ${RSERVER_UPSTART_DIR})
+--- a/src/cpp/server/CMakeLists.txt
b/src/cpp/server/CMakeLists.txt
+@@ -232,17 +232,12 @@
+DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR})
# install configured systemd profile
- set(RSERVER_SYSTEMD_DIR "extras/systemd")
diff --git
a/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.72-filesystem.patch
b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.72-filesystem.patch
new file mode 100644
index 000..b2c4d2392f6
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.72-filesystem.patch
@@ -0,0 +1,31 @@
+From a11d0454e5fe9c50005a03b9d9de84355df5c7fd Mon Sep 17 00:00:00 2001
+From: Kevin Ushey
+Date: Fri, 15 Nov 2019 14:54:02 -0800
+Subject: [PATCH] avoid use of deprecated APIs
+
+---
+ src/cpp/core/FilePath.cpp | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/cpp/shared_core/FilePath.cpp
b/src/cpp/shared_core/FilePath.cpp
+index 088366a9d6..495289e7fc 100644
+--- a/src/cpp/core/FilePath.cpp
b/src/cpp/core/FilePath.cpp
+@@ -22,8 +22,6 @@
+ #include
+ #endif
+
+-#define BOOST_FILESYSTEM_NO_DEPRECATED
+-
+ #define BOOST_NO_CXX11_SCOPED_ENUMS
+ #include
+ #undef BOOST_NO_CXX11_SCOPED_ENUMS
+@@ -1032,7 +1030,7 @@
+ {
+ // NOTE: The path gets round-tripped through toString/fromString,
would
+ // be nice to have a direct constructor
+- if (!iterationFunction(itr.level(),
++ if (!iterationFunction(itr.depth(),
+ FilePath(BOOST_FS_PATH2STR(itr->path()
+ {
+ // end the iteration if requested
diff --git a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
index 9d0dfd64d7d..2ba27bd5148 100644
--- a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit eutils user cmake-utils gnome2-utils pam xdg-utils java-pkg-2
pax-utils qmake-utils
+inherit eutils user cmake-utils gnome2-utils pam xdg-utils java-pkg-2
pax-utils qmake-utils vcs-clean
# TODO
# * package gin and gwt
@@ -92,16 +92,17 @@ DEPEND="${RDEPEND}
# test? ( dev-java/junit:4 )
PATCHES=(
- "${FILESDIR}/${PN}-1.2.1335-prefs.patch"
- "${FILESDIR}/${PN}-1.2.1335-paths.patch"
- "${FILESDIR}/${PN}-1.2.1335-pandoc.patch"
- "${FILESDIR}/${PN}-1.2.1335-linker_flags.patch"
- "${FILESDIR}/${PN}-1.2.1335-qtsingleapplication.patch"
- "${FILESDIR}/${PN}-1.0.44-systemd.patch"
- "${FILESDIR}/${PN}-1.2.1335-core.patch"
- "${FILESDIR}/${PN}-1.2.1335-fix-ptr-int-compare.patch"
- "${FILESDIR}/${PN}-1.2.1335-boost-1.70.0_p1.patch"
- "${FILESDIR}/${PN}-1.2.1335-boost-1.70.0_p2.patch"
+ "${FILESDIR}"/${PN}-1.2.1335-prefs.patch
+ "${FILESDIR}"/${PN}-1.2.1335-paths.patch
+ "${FILESDIR}"/${PN}-1.2.1335-pandoc.patch
+ "${FILESDIR}"/${PN}-1.2.1335-linker_flags.patch
+ "${FILESDIR}"/${PN}-1.2.1335-qtsingleapplication.patch
+ "${FILESDIR}"/${PN}-1.0.44-systemd.patch
+ "${FILESDIR}"/${PN}-1.2.1335-core.patch
+ "${FILESDIR}"/${PN}-1.2.1335-fix-ptr-int-compare.patch
+ "${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p1.patch
+ "${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p2.patch
+ "${FILESDIR}"/${PN}-1.2.1335-boost-1.72-filesystem.patch
)
src_unpack() {
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/files/
commit: 45c1ca5f91de40173202f0e89867223a4e5a851b
Author: Michael Mair-Keimberger (asterix) gmail
com>
AuthorDate: Thu Feb 2 17:59:33 2017 +
Commit: David Seifert gentoo org>
CommitDate: Fri Feb 3 07:57:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c1ca5f
sci-mathematics/rstudio: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/3777
.../files/rstudio-0.97.318-linker_flags.patch | 18
.../rstudio/files/rstudio-0.97.318-paths.patch | 110 -
.../rstudio/files/rstudio-0.97.318-prefs.patch | 24 -
3 files changed, 152 deletions(-)
diff --git a/sci-mathematics/rstudio/files/rstudio-0.97.318-linker_flags.patch
b/sci-mathematics/rstudio/files/rstudio-0.97.318-linker_flags.patch
deleted file mode 100644
index a336fcc..
--- a/sci-mathematics/rstudio/files/rstudio-0.97.318-linker_flags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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.
-
-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.97.318-paths.patch
b/sci-mathematics/rstudio/files/rstudio-0.97.318-paths.patch
deleted file mode 100644
index 26f11f5..
--- a/sci-mathematics/rstudio/files/rstudio-0.97.318-paths.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-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.
-
-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})
-+
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/files/
commit: d07fa9effb9ab4b6aba0a4bc7bbc3bb56695bad2 Author: Matthew Brewer sina cn> AuthorDate: Fri Jan 29 04:18:21 2016 + Commit: Mark Wright gentoo org> CommitDate: Fri Jan 29 04:18:21 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d07fa9ef sci-mathematics/rstudio: use the same group in rstudio-server.conf as in the .ebuild Package-Manager: portage-2.2.26 RepoMan-Options: --ignore-arches sci-mathematics/rstudio/files/rstudio-server.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sci-mathematics/rstudio/files/rstudio-server.conf b/sci-mathematics/rstudio/files/rstudio-server.conf index ebf1a16..34e93e9 100644 --- a/sci-mathematics/rstudio/files/rstudio-server.conf +++ b/sci-mathematics/rstudio/files/rstudio-server.conf @@ -32,4 +32,4 @@ rsession-which-r=/usr/bin/R # To limit the users who can login to RStudio to the members # of a specific group, you use the auth-required-user-group # setting -auth-required-user-group=rstudio_users +auth-required-user-group=rstudio-server
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/files/, sci-mathematics/rstudio/
commit: 53d873715b54186cbcced5c32bfdd8380a4a1508
Author: Matthew Brewer sina cn>
AuthorDate: Fri Jan 29 04:17:47 2016 +
Commit: Mark Wright gentoo org>
CommitDate: Fri Jan 29 04:17:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53d87371
sci-mathematics/rstudio: install systemd service unit for rstudio-server into
proper directory (bug #534152)
Package-Manager: portage-2.2.26
RepoMan-Options: --ignore-arches
.../rstudio/files/rstudio-0.99.486-systemd.patch | 22 ++
.../rstudio/files/rstudio-server.service.in| 10 ++
...-0.99.486.ebuild => rstudio-0.99.486-r1.ebuild} | 7 ++-
3 files changed, 38 insertions(+), 1 deletion(-)
diff --git a/sci-mathematics/rstudio/files/rstudio-0.99.486-systemd.patch
b/sci-mathematics/rstudio/files/rstudio-0.99.486-systemd.patch
new file mode 100644
index 000..4c7eda3
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-0.99.486-systemd.patch
@@ -0,0 +1,22 @@
+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-server.service.in
b/sci-mathematics/rstudio/files/rstudio-server.service.in
new file mode 100644
index 000..fb3e373
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-server.service.in
@@ -0,0 +1,10 @@
+[Unit]
+Description=RStudio Server
+
+[Service]
+Type=forking
+ExecStart=${CMAKE_INSTALL_PREFIX}/bin/rserver
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sci-mathematics/rstudio/rstudio-0.99.486.ebuild
b/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild
similarity index 96%
rename from sci-mathematics/rstudio/rstudio-0.99.486.ebuild
rename to sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild
index 3682c5c..c5b11ff 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.486.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild
@@ -130,7 +130,12 @@ src_prepare() {
"${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.473-qtsingleapplication.patch \
+ "${FILESDIR}"/${PN}-0.99.486-systemd.patch
+
+ # 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
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/files/, sci-mathematics/rstudio/
commit: 7a45c4dcb255f80d2bc7c891f532bc81a95ecaa8
Author: Mark Wright gienah AT gentoo DOT org
AuthorDate: Sun Aug 30 14:28:31 2015 +
Commit: Mark Wright gienah AT gentoo DOT org
CommitDate: Sun Aug 30 14:29:41 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a45c4dc
sci-mathematics/rstudio: Fix bug 558900, unbundle qtsingleapplication
Thanks to Helmut Jarausch for reporting, Franz Fellner for suggesting patching
rstudio to use dev-qt/qtsingleapplication[qt5] rather than the bundled version.
Remove sys-devel/clang upper bound, thanks to Helmut Jarausch for reporting and
testing with clang-3.6.2-r100. I tested it builds with clang-3.7.0_rc3.
Fix bug 558988 sci-mathematics/rstudio-0.99.473 missing qt dependencies,
thanks to Oleg and Anthony Staines for reporting and testing.
Package-Manager: portage-2.2.20.1
.../rstudio-0.99.473-qtsingleapplication.patch | 60 ++
sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild | 225 +
2 files changed, 285 insertions(+)
diff --git
a/sci-mathematics/rstudio/files/rstudio-0.99.473-qtsingleapplication.patch
b/sci-mathematics/rstudio/files/rstudio-0.99.473-qtsingleapplication.patch
new file mode 100644
index 000..bf66bd2
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-0.99.473-qtsingleapplication.patch
@@ -0,0 +1,60 @@
+--- rstudio-0.99.473-orig/src/cpp/desktop/CMakeLists.txt 2015-08-12
09:58:43.0 +1000
rstudio-0.99.473/src/cpp/desktop/CMakeLists.txt2015-08-30
23:16:11.396175587 +1000
+@@ -93,7 +93,12 @@
+find_package(Qt5DBus REQUIRED)
+ endif()
+
+-
++find_path(QTSINGLEAPPLIB_INCLUDE_DIR NAMES QtSingleApplication
++ PATH_SUFFIXES QtSolutions
++ PATHS
++ /usr/include/qt5)
++find_library(QTSINGLEAPPLIB Qt5Solutions_SingleApplication-2.6
++ libQt5Solutions_SingleApplication-2.6)
+
+ # disable clang warnings for qt sources
+ if(APPLE)
+@@ -113,7 +118,6 @@
+
+ set(MOC_DESKTOP_HEADER_FILES ${DESKTOP_HEADER_FILES})
+ list(REMOVE_ITEM MOC_DESKTOP_HEADER_FILES
+- ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication/qtlockedfile.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/DesktopDetectRHome.hpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/DesktopOptions.hpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/DesktopRVersion.hpp
+@@ -175,8 +179,6 @@
+ DesktopSubMenu.cpp
+ DesktopSynctex.cpp
+ DesktopNetworkAccessManager.cpp
+- 3rdparty/qtsingleapplication/qtsingleapplication.cpp
+- 3rdparty/qtsingleapplication/qtlocalpeer.cpp
+ )
+
+ if(WIN32)
+@@ -219,6 +221,7 @@
+ ${CORE_SOURCE_DIR}/include
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
++ ${QTSINGLEAPPLIB_INCLUDE_DIR}
+ ${TESTS_INCLUDE_DIR}
+ )
+
+@@ -332,6 +335,7 @@
+
+# set link dependencies
+target_link_libraries(rstudio
++ ${QTSINGLEAPPLIB}
+ ${QT_LIBRARIES}
+ rstudio-core
+ ${LINK_FLAGS}
+--- rstudio-0.99.473-orig/src/cpp/desktop/DesktopPosixApplication.hpp
2015-08-12 09:58:43.0 +1000
rstudio-0.99.473/src/cpp/desktop/DesktopPosixApplication.hpp
2015-08-30 21:41:21.616934106 +1000
+@@ -16,7 +16,7 @@
+ #ifndef DESKTOP_POSIX_APPLICATION_HPP
+ #define DESKTOP_POSIX_APPLICATION_HPP
+
+-#include 3rdparty/qtsingleapplication/QtSingleApplication
++#include QtSingleApplication
+
+ namespace rstudio {
+ namespace desktop {
diff --git a/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
b/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
new file mode 100644
index 000..b247a88
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime
java-pkg-2 pax-utils
+
+# TODO
+# * package gin and gwt
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+# update from scripts in dependencies/common
+GWT_VER=2.7.0
+GIN_VER=1.5
+SELENIUM_VER=2.37.0
+CHROMEDRIVER_VER=2.7
+PANDOC_VER=1.13.1
+PACKRAT_VER=0.98.1000
+RMARKDOWN_VER=0.98.1000
+SHINYAPPS_VER=0.98.1000
+RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
+
+DESCRIPTION=IDE for the R language
+HOMEPAGE=http://www.rstudio.org
+ https://github.com/rstudio/rstudio/;
+SRC_URI=https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -
${P}.tar.gz
+ https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
+ https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
+
https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
+
https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
+ https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
+ https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
+ https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
+
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/files/, sci-mathematics/rstudio/
commit: 694491a5c2e7cc112802816cc46edfba31815e4b Author: Mark Wright gienah AT gentoo DOT org AuthorDate: Thu Aug 27 00:12:22 2015 + Commit: Mark Wright gienah AT gentoo DOT org CommitDate: Thu Aug 27 00:12:58 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=694491a5 sci-mathematics/rstudio: Bump to rstudio-0.99.473 Fixes Bug 550724 - sci-mathematics/rstudio: version bump to 0.99.473, thanks to Anthony Staines and Pavel Kozlov for reporting. Package-Manager: portage-2.2.20.1 sci-mathematics/rstudio/Manifest | 3 + .../files/rstudio-0.99.473-clang-pandoc.patch | 77 .../rstudio/files/rstudio-0.99.473-paths.patch | 130 + sci-mathematics/rstudio/rstudio-0.99.473.ebuild| 201 + 4 files changed, 411 insertions(+) diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest index 69be18a..8010bbd 100644 --- a/sci-mathematics/rstudio/Manifest +++ b/sci-mathematics/rstudio/Manifest @@ -4,10 +4,12 @@ DIST gin-1.5.zip 1055663 SHA256 f561f4eb5d5fe1cff95c881e6aed53a86e9f0de8a5286329 DIST gwt-2.5.0.rc1.zip 104156555 SHA256 83a6dec583d1b7f3bf3fd2e321d89c1d95881eed1f81c7ea4056201fc105258b SHA512 c0c4f502b4ca191537eada53eb0458c0d33282661423f6d2648e6107ed8e38465b189377fcd0d9babcbf2c688e16080d33cbd7165ed20dafda7fedc39a74e163 WHIRLPOOL b37f12d1937b6479b97e274a59a1856dcf0c5cc3b767b6a19f65d7807e1f32cc2483358f1414c4c9e427d890eb1e0617fe8af84c6f0dca4a9ded64ae5ffde129 DIST gwt-2.5.1.zip 111070580 SHA256 c457df45a3eed582452c5784ed11746685df494c0ffe4a8ae4de52945916593a SHA512 845c6bc6ce5ade57eeddd8b40cc3458f5e7d40d881cb4017615897eebd5349bfecfef8cd3e3b05a09b33ecf9ee0262d4a84700b0965a27b40cb60d701457a7ea WHIRLPOOL 9d820026e97f96402fc6b69a06f24d2f79df830a0afdba808ab98f14a32312bc999692ad5822005acf6fdcd1b4261918a318f9f20980c640cf32292d5df83a05 DIST gwt-2.6.0.zip 108819959 SHA256 bd4c13a5d1078446d519a742ee233971e55c447d1b87ffd5b1f90e54dd876b9a SHA512 40690f83f6271ab58abf0ccbf2da1045ea142867ed88accdce91f65a70e39ecf48070696caffcab3f797523ee69b0431b67155b7f04c2856cd95856a7e20d2fb WHIRLPOOL d59ce0f9b13a9956b07905479b394397020fcbc85ac3aabff9ebd74d39b7e660c862e7fe1adb32160e82186d83db10d1254121846e1a9bdafacc38efc55a38fd +DIST gwt-2.7.0.zip 108818328 SHA256 aa65061b73836190410720bea422eb8e787680d7bc0c2b244ae6c9a0d24747b3 SHA512 a1eed5cc25c888cf81d4f22b1f9494d5d8567b911f7aeb1d164a6359120543668280afe1a3ffc9ed87b139c7db67fbcaaabde2066e3279909d7cd6fc22eaf499 WHIRLPOOL 96ca3c3bd39116fd6109a3e436f41875b6e3343596165d2a7941a961562f5ebd412f0a455d57fc47a9551d0ba76df172a4ad2622500715625faa325d94f3d961 DIST packrat-0.98.1000.tar.gz 97677 SHA256 c2da99ea6b62fd460f36b76f6c9b91865c42851545d61817c181bf6109e2df6b SHA512 2290c768ecf27a037e73c3f8336b9fd71c68ff19d071b4a8fbc469550d29007cacacdb75f854f73b5db2139a5104f129b85a3612e2ee47bd6118ee13f7d103a6 WHIRLPOOL a2d0c3c3e04cbc496f59abbf1065fcd0b7ae25433ce0b7ca8e75ab59362f320508537b2a62ed1028dd5baad6cbab5ef2e91dd9d3af327bbd04c08a96c57d80f4 DIST packrat_0.3.0.tar.gz 79974 SHA256 5ea35b6cb964188f4ffe58a3c9cf2c1f5a436569117c218d097e0fa66d032ebb SHA512 7f964e94e62193466e9bc880fea2c2fef8a0996061d9b971789e4e33a2d1e6327033f03236327545aa73e1112e2bea730c3fc0984729ecdec6f1582855c1b249 WHIRLPOOL 7ff4c3f3681300d402e8738b1aceac7ee2dbd55edb36966e3b7453b1b90182093979436d2c1193d460418251bc370ab222f61142311d8fe1a5a42527c5869aa3 DIST rmarkdown-0.98.1000.tar.gz 1423820 SHA256 56e9f964f805627f6d6face9bf09e6435be4cc48321447ad4041fee86d6f88b4 SHA512 df3540c24c87930fe55bff2ffe67c86c219800cb00ed72ba9451ecd0d0cad411548a78c1a04b9a2e301e853616dcb77e09129c4e48ade6f16d3f14b7ea7e4852 WHIRLPOOL 51098cd48a12a61da312fc1cc96927626db4a19cc069c88f615dd20abe40f52a7b1ac1325b52b1922110ffa76a7f255d9ff2a75cd05d3de01d1b96f0c8286790 DIST rmarkdown_0.2.49.tar.gz 3846795 SHA256 56b9a032b07d62c6af2a4a2d04007cccf379a9c8e91426c59f265c8b7fd992ee SHA512 46d15c354c9a90ae75a7dc3660b1ea82d097aaceb3dd220a4a8c6f4b22751ad2d63fd5ef3d56821160716ab6552529cef6513b5cd7043368d13513f537511fef WHIRLPOOL d658a091d1b4508ea38fbf2f3691517dc2b814aa3ffaec25483263266106756a89712d7c8a2ec3de8d6d45234d5f8b11340c287509bd836be5875527077f7fcd +DIST rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz 197051 SHA256 e1e3e1f799eb8be679be9a2ed5aad7e9ce6cd603e3cb43fdc242490f0c33 SHA512 208dc349f4aa7613ecf94939aba60d22d3a06972344b526c9b6c951015571f5922927bca08db571a7b8a268e42609a4f558f01278c9685f6da2ffc66a1f95ade WHIRLPOOL 4e3d64de00a98190c435d76f12a401d30950fdc7590b6bcc886ae50d4771825d39f93ea2bdcb4a9db026361c522f16f11297ff89dcb15c35f9471c1abf4f4e2c DIST rstudio-0.97.336.tar.gz 12598580 SHA256 e6c24d6a865827d3a39e64508976a825bba705efe0921eb06f9a95ba58aefcd1 SHA512 bfaf6218cb400e83a97a320cf633e4656f1552e27bb9843fda1837945a3823fb0df20a2c86e0b6d76608d98806b0acf163aaba10783c923ef900b3eaf03b7569 WHIRLPOOL
