summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wright <gienah@gentoo.org>2019-08-22 00:03:46 +1000
committerMark Wright <gienah@gentoo.org>2019-08-22 00:03:46 +1000
commitcdda9adf72b626d020a063419c1f376755d1b456 (patch)
tree4ca0ef5398e5d5e8c68d4424da0e399980d17528 /sci-mathematics
parentnet-im/telegram-desktop-bin: drop old (diff)
downloadgentoo-cdda9adf72b626d020a063419c1f376755d1b456.tar.gz
gentoo-cdda9adf72b626d020a063419c1f376755d1b456.tar.bz2
gentoo-cdda9adf72b626d020a063419c1f376755d1b456.zip
sci-mathematics/rstudio: Bump to 1.2.1335, fix compile with >=boost 1.70.0
Bump, thanks to Neil, Ulenrich, François Valenduc, Thomas Bettler, Simon Maurer, Bernd Feige and asturm for helping. Split the rstudio-1.1.463-boost-1.69.0_p?.patch patches into 3 patch files. Closes: https://bugs.gentoo.org/683050 Closes: https://bugs.gentoo.org/686186 Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Mark Wright <gienah@gentoo.org>
Diffstat (limited to 'sci-mathematics')
-rw-r--r--sci-mathematics/rstudio/Manifest3
-rw-r--r--sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p1.patch222
-rw-r--r--sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p2.patch377
-rw-r--r--sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p3.patch167
-rw-r--r--sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.70.0.patch46
-rw-r--r--sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p1.patch46
-rw-r--r--sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p2.patch17
-rw-r--r--sci-mathematics/rstudio/files/rstudio-1.2.1335-core.patch160
-rw-r--r--sci-mathematics/rstudio/files/rstudio-1.2.1335-fix-ptr-int-compare.patch13
-rw-r--r--sci-mathematics/rstudio/files/rstudio-1.2.1335-linker_flags.patch11
-rw-r--r--sci-mathematics/rstudio/files/rstudio-1.2.1335-pandoc.patch32
-rw-r--r--sci-mathematics/rstudio/files/rstudio-1.2.1335-paths.patch118
-rw-r--r--sci-mathematics/rstudio/files/rstudio-1.2.1335-prefs.patch53
-rw-r--r--sci-mathematics/rstudio/files/rstudio-1.2.1335-qtsingleapplication.patch60
-rw-r--r--sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild255
-rw-r--r--sci-mathematics/rstudio/rstudio-1.1.463.ebuild1
-rw-r--r--sci-mathematics/rstudio/rstudio-1.2.1335.ebuild253
17 files changed, 1451 insertions, 383 deletions
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 79c6b60ad010..0b00d0f295ae 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -1,13 +1,16 @@
DIST chromedriver-linux 19303552 BLAKE2B 610396fd74f2adc4c249ca971a53a6dd4ab06145d0b37d59adf66180dfada52192b20203bf3d992c270bd4f787df5c85511ca325aed06cbd9318add3eccfde30 SHA512 18774ede961dec222058dd0e3f128d63732cd444ee310136b44d5bf508a4f2f2c164a2c8d195d80bce8b5fb6303559e167f82f384e4a58e30f48b151a4206ee8
DIST core-dictionaries.zip 876339 BLAKE2B f29afcbf5a7f8ec635e5a5b248d978af286d18488f54c9a09a2b95fde19b796e4473e5846402a46dd24b71c6e4167512539aaa32ab6d99713d500a80aaf46796 SHA512 9c5830cc9fed575e223f1c61f02e48c5aea6801bb0cd2586f02437c17fdffdb1d36c396d5a8ecbe02ba01196e73458304345b1f6b92c052bc7a7d05961fac2c9
DIST gin-1.5.zip 1055663 BLAKE2B 11b86245d54967f0c76f22f7460fb752c410db3c59a019bb538a48fd0de7e87552f2f5bb9ce604e6ed508136a6a2b0814f061161579429daae8ca55b1a448114 SHA512 3f6649565f9600daaca6ddf3fb431925b5a1ce1ada38e6389de64cef617abba9d3f49c555d0a20053fb06f17ccbe4e1141b39966fbe4b2975d7b120377504897
+DIST gin-2.1.2.zip 1341053 BLAKE2B 515338ba50ba2183c101b42183e42ebf15613aae8751a0dcedb4b047de4ca8fab85eb240f5f0c92955441dbb87e80b3edbdae8d83f1e74f74c7de067d18cf108 SHA512 03407b6318ffb0dd504ce520649ed90e845f13fbdbd0bfb4d7e3b127842f1735093e39674077c3a04a11d434aefdc3a734652c3f85e8ab00ff37ae760ccb8dbb
DIST gwt-2.7.0.zip 108818328 BLAKE2B 9af969f3f2577be041fcfb58f228fab4b5479fa0da5ff054ab0a59cad751590a1b4ae8d7fabc8a50e3b0e5d7eb9b2896c485d929421f75e6a2f6513480438a31 SHA512 a1eed5cc25c888cf81d4f22b1f9494d5d8567b911f7aeb1d164a6359120543668280afe1a3ffc9ed87b139c7db67fbcaaabde2066e3279909d7cd6fc22eaf499
+DIST gwt-2.8.1.zip 95650299 BLAKE2B 3853d50d1346e313903b6f0c4b8405ce9e896e51652483e5c7e9d711daa213e1341c71765b4a3fb061b58f90d49420245963a0480db8b71fe7aed6cd43782c14 SHA512 feeb00cb0413c2703dfd6931f57ba669813bd65f814715f2c04dd6dc69e885a8048337272333d7504c48e9fa52cdab699f854ee13211228ab142a1f458ee33ae
DIST packrat-0.98.1000.tar.gz 97677 BLAKE2B 282fe33dc5ba366ceea05a222ae2d018bc3ad8f35fad73c585a3d4901c3287e6902277a9c7ca087854f3944bd85ff1b1d1f02869ece686b10f946e2f1cb1296c SHA512 2290c768ecf27a037e73c3f8336b9fd71c68ff19d071b4a8fbc469550d29007cacacdb75f854f73b5db2139a5104f129b85a3612e2ee47bd6118ee13f7d103a6
DIST rmarkdown-0.98.1000.tar.gz 1423820 BLAKE2B eac8c9cf438c9b44ddfe954602dd67a83764b0c988b3ba571877c986b0d5d237059ed6643a86bb404428857ec8c346bfecd12f7cd15cde301cb0ce331f842b7f SHA512 df3540c24c87930fe55bff2ffe67c86c219800cb00ed72ba9451ecd0d0cad411548a78c1a04b9a2e301e853616dcb77e09129c4e48ade6f16d3f14b7ea7e4852
DIST rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz 197051 BLAKE2B 1f3f9fe71d7b50ab5108dfdbd3cc0b882bcc935ee58e8a9145b07a18bb86c39bc45e321a13add24df99492bc30548df716775c339bcbf4efc2bfe158299ae55a SHA512 208dc349f4aa7613ecf94939aba60d22d3a06972344b526c9b6c951015571f5922927bca08db571a7b8a268e42609a4f558f01278c9685f6da2ffc66a1f95ade
DIST rstudio-1.1.383.tar.gz 20196702 BLAKE2B 5164230a92618e4252269ad0016b200294d1e7fa502cc49aa694486cda098ee7ffc65e6c74a87d891d0532f5cc15d1552aa86d04047d07b4f275cbc4d2758647 SHA512 3f637f9bce2c1ad1a4ed3e74287da722190a4e12b0cace6ffcca271977d49dcecca9365f2064366aad94e87851593cab83fa9361e9a9222a9f67fe9451f31ed2
DIST rstudio-1.1.453.tar.gz 20200360 BLAKE2B 560b89e53b04356ecf9a02dd8a7e72ad8d6c30bf406fbe7e22a82cc6d33d40e84bececf5ecda9cf086360b2bd2fa64d6b33c2dd675ef5f605f9e825d7ca2dc84 SHA512 f2be0866f645007a6f80959109928820c89480057c3660d23e790591797d4f4c371733f49290dae9c81bfc2715821528e2a105e7a66d4d9ffbfc7ee2a596976c
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 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.1.463-boost-1.69.0_p1.patch b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p1.patch
index aa3db25f3c01..a7a48572de30 100644
--- a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p1.patch
+++ b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p1.patch
@@ -1,4 +1,4 @@
---- /dev/null 2018-11-10 15:32:26.332997437 +1100
+--- /dev/null 2019-03-19 11:03:33.121000004 +1100
+++ rstudio-1.1.463/src/cpp/core/include/core/BoostSignals.hpp 2018-11-17 21:24:35.285976284 +1100
@@ -0,0 +1,40 @@
+/*
@@ -458,223 +458,3 @@
};
ProjectContext& projectContext();
---- rstudio-1.1.463-orig/src/cpp/session/modules/SessionPlots.hpp 2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/cpp/session/modules/SessionPlots.hpp 2018-11-17 21:24:35.292976352 +1100
-@@ -16,7 +16,7 @@
- #ifndef SESSION_PLOTS_HPP
- #define SESSION_PLOTS_HPP
-
--#include <boost/signals.hpp>
-+#include <core/BoostSignals.hpp>
-
- namespace rstudio {
- namespace core {
-@@ -35,9 +35,9 @@
-
- struct Events : boost::noncopyable
- {
-- boost::signal<void()> onBeforeNewPlot;
-- boost::signal<void()> onBeforeNewGridPage;
-- boost::signal<void()> onNewPlot;
-+ RSTUDIO_BOOST_SIGNAL<void()> onBeforeNewPlot;
-+ RSTUDIO_BOOST_SIGNAL<void()> onBeforeNewGridPage;
-+ RSTUDIO_BOOST_SIGNAL<void()> onNewPlot;
- };
-
- Events& events();
---- rstudio-1.1.463-orig/src/cpp/session/modules/build/SessionSourceCpp.cpp 2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/cpp/session/modules/build/SessionSourceCpp.cpp 2018-11-17 21:24:35.293976361 +1100
-@@ -15,11 +15,11 @@
-
- #include "SessionSourceCpp.hpp"
-
--#include <boost/signal.hpp>
- #include <boost/algorithm/string/trim.hpp>
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/algorithm/string/join.hpp>
-
-+#include <core/BoostSignals.hpp>
- #include <core/Error.hpp>
- #include <core/FilePath.hpp>
- #include <core/StringUtils.hpp>
---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookAlternateEngines.cpp 2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookAlternateEngines.cpp 2018-11-17 21:24:35.294976371 +1100
-@@ -142,7 +142,7 @@
- LOG_ERROR(error);
-
- // capture console output, error
-- boost::signals::scoped_connection consoleHandler =
-+ RSTUDIO_BOOST_SCOPED_CONNECTION consoleHandler =
- module_context::events().onConsoleOutput.connect(
- boost::bind(chunkConsoleOutputHandler,
- _1,
-@@ -219,7 +219,7 @@
- LOG_ERROR(error);
-
- // capture console output, error
-- boost::signals::scoped_connection consoleHandler =
-+ RSTUDIO_BOOST_SCOPED_CONNECTION consoleHandler =
- module_context::events().onConsoleOutput.connect(
- boost::bind(chunkConsoleOutputHandler,
- _1,
-@@ -363,7 +363,7 @@
- LOG_ERROR(error);
-
- // capture console output, error
-- boost::signals::scoped_connection consoleHandler =
-+ RSTUDIO_BOOST_SCOPED_CONNECTION consoleHandler =
- module_context::events().onConsoleOutput.connect(
- boost::bind(chunkConsoleOutputHandler,
- _1,
---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookCapture.cpp 2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookCapture.cpp 2018-11-17 21:24:35.294976371 +1100
-@@ -16,6 +16,8 @@
- #include "SessionRmdNotebook.hpp"
- #include "NotebookCapture.hpp"
-
-+#include <boost/make_shared.hpp>
-+
- namespace rstudio {
- namespace session {
- namespace modules {
---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookExec.cpp 2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookExec.cpp 2018-11-17 21:24:35.295976381 +1100
-@@ -441,7 +441,7 @@
- }
-
- // unhook all our event handlers
-- BOOST_FOREACH(const boost::signals::connection connection, connections_)
-+ BOOST_FOREACH(const RSTUDIO_BOOST_CONNECTION connection, connections_)
- {
- connection.disconnect();
- }
---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookExec.hpp 2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookExec.hpp 2018-11-17 21:24:35.295976381 +1100
-@@ -18,8 +18,7 @@
-
- #include <session/SessionModuleContext.hpp>
-
--#include <boost/signal.hpp>
--
-+#include <core/BoostSignals.hpp>
- #include <core/json/Json.hpp>
-
- #include <r/RSexp.hpp>
-@@ -99,7 +98,7 @@
- bool hasErrors_;
-
- std::vector<boost::shared_ptr<NotebookCapture> > captures_;
-- std::vector<boost::signals::connection> connections_;
-+ std::vector<RSTUDIO_BOOST_CONNECTION> connections_;
- };
-
- } // namespace notebook
---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookPlots.cpp 2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookPlots.cpp 2018-11-17 21:24:35.295976381 +1100
-@@ -20,11 +20,12 @@
-
- #include <boost/format.hpp>
- #include <boost/foreach.hpp>
--#include <boost/signals/connection.hpp>
-
--#include <core/system/FileMonitor.hpp>
--#include <core/StringUtils.hpp>
-+#include <core/BoostSignals.hpp>
- #include <core/Exec.hpp>
-+#include <core/StringUtils.hpp>
-+
-+#include <core/system/FileMonitor.hpp>
-
- #include <session/SessionModuleContext.hpp>
-
---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookPlots.hpp 2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookPlots.hpp 2018-11-17 21:24:35.296976391 +1100
-@@ -18,8 +18,10 @@
- #define SESSION_NOTEBOOK_PLOTS_HPP
-
- #include <boost/function.hpp>
--#include <boost/signals/connection.hpp>
-+
-+#include <core/BoostSignals.hpp>
- #include <core/FilePath.hpp>
-+
- #include <r/RSexp.hpp>
-
- #include "NotebookCapture.hpp"
-@@ -80,9 +82,9 @@
-
- unsigned lastOrdinal_;
-
-- boost::signals::connection onBeforeNewPlot_;
-- boost::signals::connection onBeforeNewGridPage_;
-- boost::signals::connection onNewPlot_;
-+ RSTUDIO_BOOST_CONNECTION onBeforeNewPlot_;
-+ RSTUDIO_BOOST_CONNECTION onBeforeNewGridPage_;
-+ RSTUDIO_BOOST_CONNECTION onNewPlot_;
-
- double width_;
- double height_;
---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookQueue.cpp 2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookQueue.cpp 2018-11-17 21:24:35.296976391 +1100
-@@ -87,7 +87,7 @@
- pInput_->enque(kThreadQuitCommand);
-
- // unregister handlers
-- BOOST_FOREACH(boost::signals::connection connection, handlers_)
-+ BOOST_FOREACH(RSTUDIO_BOOST_CONNECTION connection, handlers_)
- {
- connection.disconnect();
- }
-@@ -651,7 +651,7 @@
- boost::shared_ptr<ChunkExecContext> execContext_;
-
- // registered signal handlers
-- std::vector<boost::signals::connection> handlers_;
-+ std::vector<RSTUDIO_BOOST_CONNECTION> handlers_;
-
- // the thread which submits console input, and the queue which feeds it
- boost::thread console_;
---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/SessionRmdNotebook.hpp 2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/SessionRmdNotebook.hpp 2018-11-17 21:24:35.296976391 +1100
-@@ -18,7 +18,8 @@
- #define SESSION_RMARKDOWN_NOTEBOOK_HPP
-
- #include <ctime>
--#include <boost/signals.hpp>
-+
-+#include <core/BoostSignals.hpp>
- #include <core/json/Json.hpp>
-
- #define kChunkLibDir "lib"
-@@ -76,24 +77,24 @@
- struct Events : boost::noncopyable
- {
- // Document {0}, chunk {1} from context id {3} execution completed
-- boost::signal<void(const std::string&, const std::string&,
-+ RSTUDIO_BOOST_SIGNAL<void(const std::string&, const std::string&,
- const std::string&)>
- onChunkExecCompleted;
-
- // Document {0}, chunk {1} had console output of type {2} and text {3}
-- boost::signal<void(const std::string&, const std::string&, int,
-+ RSTUDIO_BOOST_SIGNAL<void(const std::string&, const std::string&, int,
- const std::string&)>
- onChunkConsoleOutput;
-
-- boost::signal<void(const core::FilePath&, const core::FilePath&,
-+ RSTUDIO_BOOST_SIGNAL<void(const core::FilePath&, const core::FilePath&,
- const core::json::Value& metadata, unsigned ordinal)>
- onPlotOutput;
-- boost::signal<void(const core::FilePath&, const core::FilePath&,
-+ RSTUDIO_BOOST_SIGNAL<void(const core::FilePath&, const core::FilePath&,
- const core::json::Value& metadata)> onHtmlOutput;
-- boost::signal<void(const core::json::Object&)> onErrorOutput;
-- boost::signal<void(const core::FilePath&, const core::FilePath&,
-+ RSTUDIO_BOOST_SIGNAL<void(const core::json::Object&)> onErrorOutput;
-+ RSTUDIO_BOOST_SIGNAL<void(const core::FilePath&, const core::FilePath&,
- const core::json::Value& metadata)> onDataOutput;
-- boost::signal<void(Condition condition, const std::string& message)>
-+ RSTUDIO_BOOST_SIGNAL<void(Condition condition, const std::string& message)>
- onCondition;
- };
-
diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p2.patch b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p2.patch
index 961723fd224f..d90ce005a1a0 100644
--- a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p2.patch
+++ b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p2.patch
@@ -1,167 +1,220 @@
---- rstudio-1.1.463-orig/src/cpp/CMakeLists.txt 2018-11-17 21:24:35.285976284 +1100
-+++ rstudio-1.1.463/src/cpp/CMakeLists.txt 2018-11-17 21:41:02.712507842 +1100
-@@ -175,6 +175,9 @@
- set(Boost_USE_STATIC_LIBS ON)
- set(BOOST_INCLUDEDIR ${RSTUDIO_TOOLS_BOOST}/include)
- find_package(Boost ${BOOST_VERSION} REQUIRED)
-+ if(NOT Boost_VERSION VERSION_LESS 1.69.0)
-+ list(REMOVE_ITEM BOOST_LIBS signals)
-+ endif()
-
- # define library list manually (find_package doesn't always pick them up)
- set(BOOST_LIB_DIR ${RSTUDIO_TOOLS_BOOST}/lib)
-@@ -184,11 +187,15 @@
- message(STATUS "Using RStudio-provided Boost ${BOOST_VERSION}")
- else()
- add_definitions(-DRSTUDIO_BOOST_NAMESPACE=boost)
-+ find_package(Boost ${BOOST_VERSION} REQUIRED)
-+ if(NOT Boost_VERSION VERSION_LESS 1.69.0)
-+ list(REMOVE_ITEM BOOST_LIBS signals)
-+ endif()
- find_package(Boost ${BOOST_VERSION} REQUIRED COMPONENTS ${BOOST_LIBS})
- message(STATUS "Using system Boost ${BOOST_VERSION}")
- endif()
-
-- # WIN32 BOOST
-+# WIN32 BOOST
- else()
- # hard-code to our own prebuilt boost libs
- add_definitions(-DRSTUDIO_BOOST_NAMESPACE=rstudio_boost)
-@@ -211,14 +218,14 @@
- # allow opt-in to using Boost.Signals2
- # TODO: remove this in RStudio v1.3 and port to signals2
- if(NOT RSTUDIO_BOOST_SIGNALS_VERSION)
-- if (BOOST_VERSION VERSION_LESS 1.69.0)
-+ if (Boost_VERSION VERSION_LESS 1.69.0)
- set(RSTUDIO_BOOST_SIGNALS_VERSION 1)
- else()
- set(RSTUDIO_BOOST_SIGNALS_VERSION 2)
- endif()
- endif()
-
--message(STATUS "Using Booost.Signals version ${RSTUDIO_BOOST_SIGNALS_VERSION}")
-+message(STATUS "Using Boost.Signals version ${RSTUDIO_BOOST_SIGNALS_VERSION}")
- add_definitions(-DRSTUDIO_BOOST_SIGNALS_VERSION=${RSTUDIO_BOOST_SIGNALS_VERSION})
-
- # add boost as system include directory
---- rstudio-1.1.463-orig/src/cpp/core/include/core/r_util/RFunctionInformation.hpp 2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/cpp/core/include/core/r_util/RFunctionInformation.hpp 2018-11-17 21:41:02.713507852 +1100
-@@ -75,9 +75,9 @@
- const std::string& name() const { return name_; }
- const boost::optional<std::string>& defaultValue() const { return defaultValue_; }
- boost::tribool hasDefault() const { return hasDefault_; }
-- bool isUsed() const { return isUsed_; }
-+ bool isUsed() const { return bool(isUsed_); }
- void setIsUsed(bool value) { isUsed_ = value; }
-- bool isMissingnessHandled() const { return isMissingnessHandled_; }
-+ bool isMissingnessHandled() const { return bool(isMissingnessHandled_); }
- void setMissingnessHandled(bool value) { isMissingnessHandled_ = value; }
+--- rstudio-1.1.463-orig/src/cpp/session/modules/SessionPlots.hpp 2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/session/modules/SessionPlots.hpp 2018-11-17 21:24:35.292976352 +1100
+@@ -16,7 +16,7 @@
+ #ifndef SESSION_PLOTS_HPP
+ #define SESSION_PLOTS_HPP
+
+-#include <boost/signals.hpp>
++#include <core/BoostSignals.hpp>
+
+ namespace rstudio {
+ namespace core {
+@@ -35,9 +35,9 @@
+
+ struct Events : boost::noncopyable
+ {
+- boost::signal<void()> onBeforeNewPlot;
+- boost::signal<void()> onBeforeNewGridPage;
+- boost::signal<void()> onNewPlot;
++ RSTUDIO_BOOST_SIGNAL<void()> onBeforeNewPlot;
++ RSTUDIO_BOOST_SIGNAL<void()> onBeforeNewGridPage;
++ RSTUDIO_BOOST_SIGNAL<void()> onNewPlot;
+ };
+
+ Events& events();
+--- rstudio-1.1.463-orig/src/cpp/session/modules/build/SessionSourceCpp.cpp 2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/session/modules/build/SessionSourceCpp.cpp 2018-11-17 21:24:35.293976361 +1100
+@@ -15,11 +15,11 @@
+
+ #include "SessionSourceCpp.hpp"
+
+-#include <boost/signal.hpp>
+ #include <boost/algorithm/string/trim.hpp>
+ #include <boost/algorithm/string/predicate.hpp>
+ #include <boost/algorithm/string/join.hpp>
+
++#include <core/BoostSignals.hpp>
+ #include <core/Error.hpp>
+ #include <core/FilePath.hpp>
+ #include <core/StringUtils.hpp>
+--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookAlternateEngines.cpp 2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookAlternateEngines.cpp 2018-11-17 21:24:35.294976371 +1100
+@@ -142,7 +142,7 @@
+ LOG_ERROR(error);
- private:
-@@ -130,7 +130,7 @@
+ // capture console output, error
+- boost::signals::scoped_connection consoleHandler =
++ RSTUDIO_BOOST_SCOPED_CONNECTION consoleHandler =
+ module_context::events().onConsoleOutput.connect(
+ boost::bind(chunkConsoleOutputHandler,
+ _1,
+@@ -219,7 +219,7 @@
+ LOG_ERROR(error);
- bool isPrimitive()
- {
-- return isPrimitive_ == true;
-+ return bool(isPrimitive_);
- }
+ // capture console output, error
+- boost::signals::scoped_connection consoleHandler =
++ RSTUDIO_BOOST_SCOPED_CONNECTION consoleHandler =
+ module_context::events().onConsoleOutput.connect(
+ boost::bind(chunkConsoleOutputHandler,
+ _1,
+@@ -363,7 +363,7 @@
+ LOG_ERROR(error);
- void setIsPrimitive(bool isPrimitive)
---- rstudio-1.1.463-orig/src/cpp/session/modules/SessionRParser.cpp 2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/cpp/session/modules/SessionRParser.cpp 2018-11-17 21:41:02.714507862 +1100
-@@ -390,7 +390,7 @@
- if (!failed)
+ // capture console output, error
+- boost::signals::scoped_connection consoleHandler =
++ RSTUDIO_BOOST_SCOPED_CONNECTION consoleHandler =
+ module_context::events().onConsoleOutput.connect(
+ boost::bind(chunkConsoleOutputHandler,
+ _1,
+--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookCapture.cpp 2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookCapture.cpp 2018-11-17 21:24:35.294976371 +1100
+@@ -16,6 +16,8 @@
+ #include "SessionRmdNotebook.hpp"
+ #include "NotebookCapture.hpp"
+
++#include <boost/make_shared.hpp>
++
+ namespace rstudio {
+ namespace session {
+ namespace modules {
+--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookExec.cpp 2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookExec.cpp 2018-11-17 21:24:35.295976381 +1100
+@@ -441,7 +441,7 @@
+ }
+
+ // unhook all our event handlers
+- BOOST_FOREACH(const boost::signals::connection connection, connections_)
++ BOOST_FOREACH(const RSTUDIO_BOOST_CONNECTION connection, connections_)
{
- DEBUG("--- Found function in pkgInfo index: " << *fnInfo.binding());
-- return fnInfo.performsNse();
-+ return bool(fnInfo.performsNse());
+ connection.disconnect();
}
-
- // Handle some special cases first.
---- rstudio-1.1.463-orig/src/tools/clang-ubsan-build 2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/tools/clang-ubsan-build 2018-11-17 21:41:02.714507862 +1100
-@@ -10,19 +10,19 @@
-
- : ${RSTUDIO_USE_LIBCXX="Yes"}
- : ${RSTUDIO_USE_SYSTEM_BOOST="Yes"}
--: ${RSTUDIO_BOOST_VERSION="1.56.0"}
-+: ${RSTUDIO_BOOST_REQUESTED_VERSION="1.56.0"}
-
- mkdir -p "${BUILD_DIR}"
- cd "${BUILD_DIR}"
--cmake ../cpp \
-- -DLIBR_HOME="${R_HOME}" \
-- -DCMAKE_C_COMPILER="${CC}" \
-- -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}" \
-- -DCMAKE_CXX_COMPILER="${CXX}" \
-- -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}" \
-- -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}" \
-- -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}" \
-- -DRSTUDIO_BOOST_VERSION="${RSTUDIO_BOOST_VERSION}" \
-+cmake ../cpp \
-+ -DLIBR_HOME="${R_HOME}" \
-+ -DCMAKE_C_COMPILER="${CC}" \
-+ -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}" \
-+ -DCMAKE_CXX_COMPILER="${CXX}" \
-+ -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}" \
-+ -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}" \
-+ -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}" \
-+ -DRSTUDIO_BOOST_REQUESTED_VERSION="${RSTUDIO_BOOST_REQUESTED_VERSION}" \
- "$@"
- cd ..
-
---- rstudio-1.1.463-orig/src/tools/gcc-ubsan-build 2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/tools/gcc-ubsan-build 2018-11-17 21:41:02.715507871 +1100
-@@ -19,19 +19,19 @@
- # NOTE: Boost 1.50.0 not compatible with gcc-6
- : ${RSTUDIO_USE_LIBCXX="No"}
- : ${RSTUDIO_USE_SYSTEM_BOOST="Yes"}
--: ${RSTUDIO_BOOST_VERSION="1.54.0"}
-+: ${RSTUDIO_BOOST_REQUESTED_VERSION="1.54.0"}
-
- mkdir -p "${BUILD_DIR}"
- cd "${BUILD_DIR}"
--cmake ../cpp \
-- -DLIBR_HOME="${R_HOME}" \
-- -DCMAKE_C_COMPILER="${CC}" \
-- -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}" \
-- -DCMAKE_CXX_COMPILER="${CXX}" \
-- -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}" \
-- -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}" \
-- -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}" \
-- -DRSTUDIO_BOOST_VERSION="${RSTUDIO_BOOST_VERSION}" \
-+cmake ../cpp \
-+ -DLIBR_HOME="${R_HOME}" \
-+ -DCMAKE_C_COMPILER="${CC}" \
-+ -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}" \
-+ -DCMAKE_CXX_COMPILER="${CXX}" \
-+ -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}" \
-+ -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}" \
-+ -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}" \
-+ -DRSTUDIO_BOOST_REQUESTED_VERSION="${RSTUDIO_BOOST_REQUESTED_VERSION}" \
- "$@"
- cd ..
-
---- rstudio-1.1.463-orig/src/tools/xcode-ubsan-build 2018-10-25 09:42:55.000000000 +1100
-+++ rstudio-1.1.463/src/tools/xcode-ubsan-build 2018-11-17 21:41:02.715507871 +1100
-@@ -15,13 +15,13 @@
- # sanitizers released with newer versions of clang)
- mkdir -p "${BUILD_DIR}"
- cd "${BUILD_DIR}"
--cmake ../cpp -GXcode \
-- -DLIBR_HOME="${R_HOME}" \
-- -DLIBR_INCLUDE_DIRS="${R_INCL}" \
-- -DLIBR_DOC_DIR="${R_DOCS}" \
-- -DRSTUDIO_USE_LIBCXX="Yes" \
-- -DRSTUDIO_USE_SYSTEM_BOOST="Yes" \
-- -DRSTUDIO_BOOST_VERSION="1.56.0" \
-+cmake ../cpp -GXcode \
-+ -DLIBR_HOME="${R_HOME}" \
-+ -DLIBR_INCLUDE_DIRS="${R_INCL}" \
-+ -DLIBR_DOC_DIR="${R_DOCS}" \
-+ -DRSTUDIO_USE_LIBCXX="Yes" \
-+ -DRSTUDIO_USE_SYSTEM_BOOST="Yes" \
-+ -DRSTUDIO_BOOST_REQUESTED_VERSION="1.56.0" \
- "$@"
- cmake ../cpp -DLIBR_LIBRARIES="${R_LIBS}/libR.dylib"
- cd ..
+--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookExec.hpp 2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookExec.hpp 2018-11-17 21:24:35.295976381 +1100
+@@ -18,8 +18,7 @@
+
+ #include <session/SessionModuleContext.hpp>
+
+-#include <boost/signal.hpp>
+-
++#include <core/BoostSignals.hpp>
+ #include <core/json/Json.hpp>
+
+ #include <r/RSexp.hpp>
+@@ -99,7 +98,7 @@
+ bool hasErrors_;
+
+ std::vector<boost::shared_ptr<NotebookCapture> > captures_;
+- std::vector<boost::signals::connection> connections_;
++ std::vector<RSTUDIO_BOOST_CONNECTION> connections_;
+ };
+
+ } // namespace notebook
+--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookPlots.cpp 2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookPlots.cpp 2018-11-17 21:24:35.295976381 +1100
+@@ -20,11 +20,12 @@
+
+ #include <boost/format.hpp>
+ #include <boost/foreach.hpp>
+-#include <boost/signals/connection.hpp>
+
+-#include <core/system/FileMonitor.hpp>
+-#include <core/StringUtils.hpp>
++#include <core/BoostSignals.hpp>
+ #include <core/Exec.hpp>
++#include <core/StringUtils.hpp>
++
++#include <core/system/FileMonitor.hpp>
+
+ #include <session/SessionModuleContext.hpp>
+
+--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookPlots.hpp 2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookPlots.hpp 2018-11-17 21:24:35.296976391 +1100
+@@ -18,8 +18,10 @@
+ #define SESSION_NOTEBOOK_PLOTS_HPP
+
+ #include <boost/function.hpp>
+-#include <boost/signals/connection.hpp>
++
++#include <core/BoostSignals.hpp>
+ #include <core/FilePath.hpp>
++
+ #include <r/RSexp.hpp>
+
+ #include "NotebookCapture.hpp"
+@@ -80,9 +82,9 @@
+
+ unsigned lastOrdinal_;
+
+- boost::signals::connection onBeforeNewPlot_;
+- boost::signals::connection onBeforeNewGridPage_;
+- boost::signals::connection onNewPlot_;
++ RSTUDIO_BOOST_CONNECTION onBeforeNewPlot_;
++ RSTUDIO_BOOST_CONNECTION onBeforeNewGridPage_;
++ RSTUDIO_BOOST_CONNECTION onNewPlot_;
+
+ double width_;
+ double height_;
+--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookQueue.cpp 2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookQueue.cpp 2018-11-17 21:24:35.296976391 +1100
+@@ -87,7 +87,7 @@
+ pInput_->enque(kThreadQuitCommand);
+
+ // unregister handlers
+- BOOST_FOREACH(boost::signals::connection connection, handlers_)
++ BOOST_FOREACH(RSTUDIO_BOOST_CONNECTION connection, handlers_)
+ {
+ connection.disconnect();
+ }
+@@ -651,7 +651,7 @@
+ boost::shared_ptr<ChunkExecContext> execContext_;
+
+ // registered signal handlers
+- std::vector<boost::signals::connection> handlers_;
++ std::vector<RSTUDIO_BOOST_CONNECTION> handlers_;
+
+ // the thread which submits console input, and the queue which feeds it
+ boost::thread console_;
+--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/SessionRmdNotebook.hpp 2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/SessionRmdNotebook.hpp 2018-11-17 21:24:35.296976391 +1100
+@@ -18,7 +18,8 @@
+ #define SESSION_RMARKDOWN_NOTEBOOK_HPP
+
+ #include <ctime>
+-#include <boost/signals.hpp>
++
++#include <core/BoostSignals.hpp>
+ #include <core/json/Json.hpp>
+
+ #define kChunkLibDir "lib"
+@@ -76,24 +77,24 @@
+ struct Events : boost::noncopyable
+ {
+ // Document {0}, chunk {1} from context id {3} execution completed
+- boost::signal<void(const std::string&, const std::string&,
++ RSTUDIO_BOOST_SIGNAL<void(const std::string&, const std::string&,
+ const std::string&)>
+ onChunkExecCompleted;
+
+ // Document {0}, chunk {1} had console output of type {2} and text {3}
+- boost::signal<void(const std::string&, const std::string&, int,
++ RSTUDIO_BOOST_SIGNAL<void(const std::string&, const std::string&, int,
+ const std::string&)>
+ onChunkConsoleOutput;
+
+- boost::signal<void(const core::FilePath&, const core::FilePath&,
++ RSTUDIO_BOOST_SIGNAL<void(const core::FilePath&, const core::FilePath&,
+ const core::json::Value& metadata, unsigned ordinal)>
+ onPlotOutput;
+- boost::signal<void(const core::FilePath&, const core::FilePath&,
++ RSTUDIO_BOOST_SIGNAL<void(const core::FilePath&, const core::FilePath&,
+ const core::json::Value& metadata)> onHtmlOutput;
+- boost::signal<void(const core::json::Object&)> onErrorOutput;
+- boost::signal<void(const core::FilePath&, const core::FilePath&,
++ RSTUDIO_BOOST_SIGNAL<void(const core::json::Object&)> onErrorOutput;
++ RSTUDIO_BOOST_SIGNAL<void(const core::FilePath&, const core::FilePath&,
+ const core::json::Value& metadata)> onDataOutput;
+- boost::signal<void(Condition condition, const std::string& message)>
++ RSTUDIO_BOOST_SIGNAL<void(Condition condition, const std::string& message)>
+ onCondition;
+ };
+
diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p3.patch b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p3.patch
new file mode 100644
index 000000000000..961723fd224f
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p3.patch
@@ -0,0 +1,167 @@
+--- rstudio-1.1.463-orig/src/cpp/CMakeLists.txt 2018-11-17 21:24:35.285976284 +1100
++++ rstudio-1.1.463/src/cpp/CMakeLists.txt 2018-11-17 21:41:02.712507842 +1100
+@@ -175,6 +175,9 @@
+ set(Boost_USE_STATIC_LIBS ON)
+ set(BOOST_INCLUDEDIR ${RSTUDIO_TOOLS_BOOST}/include)
+ find_package(Boost ${BOOST_VERSION} REQUIRED)
++ if(NOT Boost_VERSION VERSION_LESS 1.69.0)
++ list(REMOVE_ITEM BOOST_LIBS signals)
++ endif()
+
+ # define library list manually (find_package doesn't always pick them up)
+ set(BOOST_LIB_DIR ${RSTUDIO_TOOLS_BOOST}/lib)
+@@ -184,11 +187,15 @@
+ message(STATUS "Using RStudio-provided Boost ${BOOST_VERSION}")
+ else()
+ add_definitions(-DRSTUDIO_BOOST_NAMESPACE=boost)
++ find_package(Boost ${BOOST_VERSION} REQUIRED)
++ if(NOT Boost_VERSION VERSION_LESS 1.69.0)
++ list(REMOVE_ITEM BOOST_LIBS signals)
++ endif()
+ find_package(Boost ${BOOST_VERSION} REQUIRED COMPONENTS ${BOOST_LIBS})
+ message(STATUS "Using system Boost ${BOOST_VERSION}")
+ endif()
+
+- # WIN32 BOOST
++# WIN32 BOOST
+ else()
+ # hard-code to our own prebuilt boost libs
+ add_definitions(-DRSTUDIO_BOOST_NAMESPACE=rstudio_boost)
+@@ -211,14 +218,14 @@
+ # allow opt-in to using Boost.Signals2
+ # TODO: remove this in RStudio v1.3 and port to signals2
+ if(NOT RSTUDIO_BOOST_SIGNALS_VERSION)
+- if (BOOST_VERSION VERSION_LESS 1.69.0)
++ if (Boost_VERSION VERSION_LESS 1.69.0)
+ set(RSTUDIO_BOOST_SIGNALS_VERSION 1)
+ else()
+ set(RSTUDIO_BOOST_SIGNALS_VERSION 2)
+ endif()
+ endif()
+
+-message(STATUS "Using Booost.Signals version ${RSTUDIO_BOOST_SIGNALS_VERSION}")
++message(STATUS "Using Boost.Signals version ${RSTUDIO_BOOST_SIGNALS_VERSION}")
+ add_definitions(-DRSTUDIO_BOOST_SIGNALS_VERSION=${RSTUDIO_BOOST_SIGNALS_VERSION})
+
+ # add boost as system include directory
+--- rstudio-1.1.463-orig/src/cpp/core/include/core/r_util/RFunctionInformation.hpp 2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/core/include/core/r_util/RFunctionInformation.hpp 2018-11-17 21:41:02.713507852 +1100
+@@ -75,9 +75,9 @@
+ const std::string& name() const { return name_; }
+ const boost::optional<std::string>& defaultValue() const { return defaultValue_; }
+ boost::tribool hasDefault() const { return hasDefault_; }
+- bool isUsed() const { return isUsed_; }
++ bool isUsed() const { return bool(isUsed_); }
+ void setIsUsed(bool value) { isUsed_ = value; }
+- bool isMissingnessHandled() const { return isMissingnessHandled_; }
++ bool isMissingnessHandled() const { return bool(isMissingnessHandled_); }
+ void setMissingnessHandled(bool value) { isMissingnessHandled_ = value; }
+
+ private:
+@@ -130,7 +130,7 @@
+
+ bool isPrimitive()
+ {
+- return isPrimitive_ == true;
++ return bool(isPrimitive_);
+ }
+
+ void setIsPrimitive(bool isPrimitive)
+--- rstudio-1.1.463-orig/src/cpp/session/modules/SessionRParser.cpp 2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/session/modules/SessionRParser.cpp 2018-11-17 21:41:02.714507862 +1100
+@@ -390,7 +390,7 @@
+ if (!failed)
+ {
+ DEBUG("--- Found function in pkgInfo index: " << *fnInfo.binding());
+- return fnInfo.performsNse();
++ return bool(fnInfo.performsNse());
+ }
+
+ // Handle some special cases first.
+--- rstudio-1.1.463-orig/src/tools/clang-ubsan-build 2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/tools/clang-ubsan-build 2018-11-17 21:41:02.714507862 +1100
+@@ -10,19 +10,19 @@
+
+ : ${RSTUDIO_USE_LIBCXX="Yes"}
+ : ${RSTUDIO_USE_SYSTEM_BOOST="Yes"}
+-: ${RSTUDIO_BOOST_VERSION="1.56.0"}
++: ${RSTUDIO_BOOST_REQUESTED_VERSION="1.56.0"}
+
+ mkdir -p "${BUILD_DIR}"
+ cd "${BUILD_DIR}"
+-cmake ../cpp \
+- -DLIBR_HOME="${R_HOME}" \
+- -DCMAKE_C_COMPILER="${CC}" \
+- -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}" \
+- -DCMAKE_CXX_COMPILER="${CXX}" \
+- -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}" \
+- -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}" \
+- -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}" \
+- -DRSTUDIO_BOOST_VERSION="${RSTUDIO_BOOST_VERSION}" \
++cmake ../cpp \
++ -DLIBR_HOME="${R_HOME}" \
++ -DCMAKE_C_COMPILER="${CC}" \
++ -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}" \
++ -DCMAKE_CXX_COMPILER="${CXX}" \
++ -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}" \
++ -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}" \
++ -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}" \
++ -DRSTUDIO_BOOST_REQUESTED_VERSION="${RSTUDIO_BOOST_REQUESTED_VERSION}" \
+ "$@"
+ cd ..
+
+--- rstudio-1.1.463-orig/src/tools/gcc-ubsan-build 2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/tools/gcc-ubsan-build 2018-11-17 21:41:02.715507871 +1100
+@@ -19,19 +19,19 @@
+ # NOTE: Boost 1.50.0 not compatible with gcc-6
+ : ${RSTUDIO_USE_LIBCXX="No"}
+ : ${RSTUDIO_USE_SYSTEM_BOOST="Yes"}
+-: ${RSTUDIO_BOOST_VERSION="1.54.0"}
++: ${RSTUDIO_BOOST_REQUESTED_VERSION="1.54.0"}
+
+ mkdir -p "${BUILD_DIR}"
+ cd "${BUILD_DIR}"
+-cmake ../cpp \
+- -DLIBR_HOME="${R_HOME}" \
+- -DCMAKE_C_COMPILER="${CC}" \
+- -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}" \
+- -DCMAKE_CXX_COMPILER="${CXX}" \
+- -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}" \
+- -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}" \
+- -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}" \
+- -DRSTUDIO_BOOST_VERSION="${RSTUDIO_BOOST_VERSION}" \
++cmake ../cpp \
++ -DLIBR_HOME="${R_HOME}" \
++ -DCMAKE_C_COMPILER="${CC}" \
++ -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}" \
++ -DCMAKE_CXX_COMPILER="${CXX}" \
++ -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}" \
++ -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}" \
++ -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}" \
++ -DRSTUDIO_BOOST_REQUESTED_VERSION="${RSTUDIO_BOOST_REQUESTED_VERSION}" \
+ "$@"
+ cd ..
+
+--- rstudio-1.1.463-orig/src/tools/xcode-ubsan-build 2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/tools/xcode-ubsan-build 2018-11-17 21:41:02.715507871 +1100
+@@ -15,13 +15,13 @@
+ # sanitizers released with newer versions of clang)
+ mkdir -p "${BUILD_DIR}"
+ cd "${BUILD_DIR}"
+-cmake ../cpp -GXcode \
+- -DLIBR_HOME="${R_HOME}" \
+- -DLIBR_INCLUDE_DIRS="${R_INCL}" \
+- -DLIBR_DOC_DIR="${R_DOCS}" \
+- -DRSTUDIO_USE_LIBCXX="Yes" \
+- -DRSTUDIO_USE_SYSTEM_BOOST="Yes" \
+- -DRSTUDIO_BOOST_VERSION="1.56.0" \
++cmake ../cpp -GXcode \
++ -DLIBR_HOME="${R_HOME}" \
++ -DLIBR_INCLUDE_DIRS="${R_INCL}" \
++ -DLIBR_DOC_DIR="${R_DOCS}" \
++ -DRSTUDIO_USE_LIBCXX="Yes" \
++ -DRSTUDIO_USE_SYSTEM_BOOST="Yes" \
++ -DRSTUDIO_BOOST_REQUESTED_VERSION="1.56.0" \
+ "$@"
+ cmake ../cpp -DLIBR_LIBRARIES="${R_LIBS}/libR.dylib"
+ cd ..
diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.70.0.patch b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.70.0.patch
new file mode 100644
index 000000000000..320b823355a3
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.70.0.patch
@@ -0,0 +1,46 @@
+--- rstudio-1.1.463-orig/src/cpp/ext/websocketpp/transport/asio/connection.hpp 2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/ext/websocketpp/transport/asio/connection.hpp 2019-03-30 20:14:40.634057634 +1100
+@@ -296,7 +296,11 @@
+ */
+ timer_ptr set_timer(long duration, timer_handler callback) {
+ timer_ptr new_timer = lib::make_shared<boost::asio::deadline_timer>(
++#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
++ *m_io_service,
++#else
+ lib::ref(*m_io_service),
++#endif
+ boost::posix_time::milliseconds(duration)
+ );
+
+--- rstudio-1.1.463-orig/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp 2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp 2019-03-30 20:14:36.319021594 +1100
+@@ -184,7 +184,12 @@
+ m_io_service = ptr;
+ m_external_io_service = true;
+ m_acceptor = lib::make_shared<boost::asio::ip::tcp::acceptor>(
+- lib::ref(*m_io_service));
++#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
++ *m_io_service
++#else
++ lib::ref(*m_io_service)
++#endif
++ );
+
+ m_state = READY;
+ ec = lib::error_code();
+--- rstudio-1.1.463-orig/src/cpp/ext/websocketpp/transport/asio/security/none.hpp 2018-10-25 09:42:55.000000000 +1100
++++ rstudio-1.1.463/src/cpp/ext/websocketpp/transport/asio/security/none.hpp 2019-03-30 20:15:22.353406097 +1100
+@@ -167,7 +167,12 @@
+ }
+
+ m_socket = lib::make_shared<boost::asio::ip::tcp::socket>(
+- lib::ref(*service));
++#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
++ *service
++#else
++ lib::ref(*service)
++#endif
++ );
+
+ m_state = READY;
+
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p1.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p1.patch
new file mode 100644
index 000000000000..1ec458bb8698
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p1.patch
@@ -0,0 +1,46 @@
+--- rstudio-1.2.1335-orig/src/cpp/ext/websocketpp/transport/asio/connection.hpp 2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/src/cpp/ext/websocketpp/transport/asio/connection.hpp 2019-08-20 22:38:53.808923305 +1000
+@@ -296,7 +296,11 @@
+ */
+ timer_ptr set_timer(long duration, timer_handler callback) {
+ timer_ptr new_timer = lib::make_shared<boost::asio::deadline_timer>(
++#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
++ *m_io_service,
++#else
+ lib::ref(*m_io_service),
++#endif
+ boost::posix_time::milliseconds(duration)
+ );
+
+--- rstudio-1.2.1335-orig/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp 2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp 2019-08-20 22:38:53.822923358 +1000
+@@ -184,7 +184,12 @@
+ m_io_service = ptr;
+ m_external_io_service = true;
+ m_acceptor = lib::make_shared<boost::asio::ip::tcp::acceptor>(
+- lib::ref(*m_io_service));
++#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
++ *m_io_service
++#else
++ lib::ref(*m_io_service)
++#endif
++ );
+
+ m_state = READY;
+ ec = lib::error_code();
+--- rstudio-1.2.1335-orig/src/cpp/ext/websocketpp/transport/asio/security/none.hpp 2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/src/cpp/ext/websocketpp/transport/asio/security/none.hpp 2019-08-20 22:38:53.823923362 +1000
+@@ -167,7 +167,12 @@
+ }
+
+ m_socket = lib::make_shared<boost::asio::ip::tcp::socket>(
+- lib::ref(*service));
++#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
++ *service
++#else
++ lib::ref(*service)
++#endif
++ );
+
+ m_state = READY;
+
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p2.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p2.patch
new file mode 100644
index 000000000000..eed2c5c955cb
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p2.patch
@@ -0,0 +1,17 @@
+--- rstudio-1.2.1335-orig/src/cpp/core/include/core/http/TcpIpAsyncConnector.hpp 2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/src/cpp/core/include/core/http/TcpIpAsyncConnector.hpp 2019-04-09 22:08:45.331273559 +1000
+@@ -77,7 +77,13 @@
+ {
+ // start a timer that will cancel any outstanding asynchronous operations
+ // when it elapses if the connection operation has not succeeded
+- pConnectionTimer_.reset(new boost::asio::deadline_timer(resolver_.get_io_service(), timeout));
++ pConnectionTimer_.reset(new boost::asio::deadline_timer(
++#if BOOST_VERSION >= 107000
++ resolver_.get_executor(),
++#else
++ resolver_.get_io_service(),
++#endif
++ timeout));
+ pConnectionTimer_->async_wait(boost::bind(&TcpIpAsyncConnector::onConnectionTimeout,
+ TcpIpAsyncConnector::shared_from_this(),
+ boost::asio::placeholders::error));
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-core.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-core.patch
new file mode 100644
index 000000000000..2c4374bb8045
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-core.patch
@@ -0,0 +1,160 @@
+--- rstudio-1.2.1335-orig/src/cpp/session/SessionClientInit.cpp 2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/src/cpp/session/SessionClientInit.cpp 2019-04-09 18:15:37.746363789 +1000
+@@ -87,13 +87,13 @@
+ boost::shared_ptr<http::Cookie>* pCookie)
+ {
+ // extract the base URL
+- json::JsonRpcRequest request;
++ core::json::JsonRpcRequest request;
+ Error error = parseJsonRpcRequest(ptrConnection->request().body(), &request);
+ if (error)
+ return error;
+ std::string baseURL;
+
+- error = json::readParams(request.params, &baseURL);
++ error = core::json::readParams(request.params, &baseURL);
+ if (error)
+ return error;
+
+@@ -161,7 +161,7 @@
+ }
+
+ // prepare session info
+- json::Object sessionInfo ;
++ core::json::Object sessionInfo ;
+ sessionInfo["clientId"] = clientId;
+ sessionInfo["mode"] = options.programMode();
+
+@@ -175,8 +175,8 @@
+ }
+
+ // temp dir
+- FilePath tempDir = rstudio::r::session::utils::tempDir();
+- Error error = tempDir.ensureDirectory();
++ core::FilePath tempDir = rstudio::r::session::utils::tempDir();
++ core::Error error = tempDir.ensureDirectory();
+ if (error)
+ LOG_ERROR(error);
+ sessionInfo["temp_dir"] = tempDir.absolutePath();
+@@ -194,12 +194,12 @@
+ sessionInfo["prompt"] = rstudio::r::options::getOption<std::string>("prompt");
+
+ // client state
+- json::Object clientStateObject;
++ core::json::Object clientStateObject;
+ rstudio::r::session::clientState().currentState(&clientStateObject);
+ sessionInfo["client_state"] = clientStateObject;
+
+ // source documents
+- json::Array jsonDocs;
++ core::json::Array jsonDocs;
+ error = modules::source::clientInitDocuments(&jsonDocs);
+ if (error)
+ LOG_ERROR(error);
+@@ -224,7 +224,7 @@
+ if (resumed)
+ {
+ // console actions
+- json::Object actionsObject;
++ core::json::Object actionsObject;
+ consoleActions.asJson(&actionsObject);
+ sessionInfo["console_actions"] = actionsObject;
+ }
+@@ -290,12 +290,12 @@
+ }
+ else
+ {
+- sessionInfo["active_project_file"] = json::Value();
+- sessionInfo["project_ui_prefs"] = json::Value();
+- sessionInfo["project_open_docs"] = json::Value();
++ sessionInfo["active_project_file"] = core::json::Value();
++ sessionInfo["project_ui_prefs"] = core::json::Value();
++ sessionInfo["project_open_docs"] = core::json::Value();
+ sessionInfo["project_supports_sharing"] = false;
+ sessionInfo["project_owned_by_user"] = false;
+- sessionInfo["project_user_data_directory"] = json::Value();
++ sessionInfo["project_user_data_directory"] = core::json::Value();
+ }
+
+ sessionInfo["system_encoding"] = std::string(::locale2charset(NULL));
+@@ -332,20 +332,20 @@
+ sessionInfo["build_tools_bookdown_website"] =
+ module_context::isBookdownWebsite();
+
+- FilePath buildTargetDir = projects::projectContext().buildTargetPath();
++ core::FilePath buildTargetDir = projects::projectContext().buildTargetPath();
+ if (!buildTargetDir.empty())
+ {
+ sessionInfo["build_target_dir"] = module_context::createAliasedPath(
+ buildTargetDir);
+- sessionInfo["has_pkg_src"] = (type == r_util::kBuildTypePackage) &&
++ sessionInfo["has_pkg_src"] = (type == core::r_util::kBuildTypePackage) &&
+ buildTargetDir.childPath("src").exists();
+ sessionInfo["has_pkg_vig"] =
+- (type == r_util::kBuildTypePackage) &&
++ (type == core::r_util::kBuildTypePackage) &&
+ buildTargetDir.childPath("vignettes").exists();
+ }
+ else
+ {
+- sessionInfo["build_target_dir"] = json::Value();
++ sessionInfo["build_target_dir"] = core::json::Value();
+ sessionInfo["has_pkg_src"] = false;
+ sessionInfo["has_pkg_vig"] = false;
+ }
+@@ -353,9 +353,9 @@
+ }
+ else
+ {
+- sessionInfo["build_tools_type"] = r_util::kBuildTypeNone;
++ sessionInfo["build_tools_type"] = core::r_util::kBuildTypeNone;
+ sessionInfo["build_tools_bookdown_website"] = false;
+- sessionInfo["build_target_dir"] = json::Value();
++ sessionInfo["build_target_dir"] = core::json::Value();
+ sessionInfo["has_pkg_src"] = false;
+ sessionInfo["has_pkg_vig"] = false;
+ }
+@@ -364,7 +364,7 @@
+ sessionInfo["presentation_commands"] = options.allowPresentationCommands();
+
+ sessionInfo["tutorial_api_available"] = false;
+- sessionInfo["tutorial_api_client_origin"] = json::Value();
++ sessionInfo["tutorial_api_client_origin"] = core::json::Value();
+
+ sessionInfo["build_state"] = modules::build::buildStateAsJson();
+ sessionInfo["devtools_installed"] = module_context::isMinimumDevtoolsInstalled();
+@@ -375,7 +375,7 @@
+
+ // console history -- we do this at the end because
+ // restoreBuildRestartContext may have reset it
+- json::Array historyArray;
++ core::json::Array historyArray;
+ rstudio::r::session::consoleHistory().asJson(&historyArray);
+ sessionInfo["console_history"] = historyArray;
+ sessionInfo["console_history_capacity"] =
+@@ -447,14 +447,14 @@
+
+ sessionInfo["multi_session"] = options.multiSession();
+
+- json::Object rVersionsJson;
++ core::json::Object rVersionsJson;
+ rVersionsJson["r_version"] = module_context::rVersion();
+ rVersionsJson["r_version_label"] = module_context::rVersionLabel();
+ rVersionsJson["r_home_dir"] = module_context::rHomeDir();
+ sessionInfo["r_versions_info"] = rVersionsJson;
+
+ sessionInfo["show_user_home_page"] = options.showUserHomePage();
+- sessionInfo["user_home_page_url"] = json::Value();
++ sessionInfo["user_home_page_url"] = core::json::Value();
+
+ sessionInfo["r_addins"] = modules::r_addins::addinRegistryAsJson();
+ sessionInfo["package_provided_extensions"] = modules::ppe::indexer().getPayload();
+@@ -491,7 +491,7 @@
+
+ // create response (we always set kEventsPending to false so that the client
+ // won't poll for events until it is ready)
+- json::JsonRpcResponse jsonRpcResponse;
++ core::json::JsonRpcResponse jsonRpcResponse;
+ jsonRpcResponse.setField(kEventsPending, "false");
+ jsonRpcResponse.setResult(sessionInfo);
+
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-fix-ptr-int-compare.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-fix-ptr-int-compare.patch
new file mode 100644
index 000000000000..e38f5e0c4448
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-fix-ptr-int-compare.patch
@@ -0,0 +1,13 @@
+--- rstudio-1.2.1335-orig/src/cpp/server_core/SecureKeyFile.cpp 2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/src/cpp/server_core/SecureKeyFile.cpp 2019-04-09 20:47:57.943317208 +1000
+@@ -68,8 +68,8 @@
+ return error;
+
+ // change mode it so it is only readable and writeable by this user
+- if (changeFileMode(secureKeyPath,
+- core::system::UserReadWriteMode) < 0)
++ if (!!changeFileMode(secureKeyPath,
++ core::system::UserReadWriteMode))
+ {
+ return systemError(errno, ERROR_LOCATION);
+ }
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-linker_flags.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-linker_flags.patch
new file mode 100644
index 000000000000..e07ead68969e
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-linker_flags.patch
@@ -0,0 +1,11 @@
+--- rstudio-1.2.1335-orig/src/cpp/CMakeLists.txt 2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/src/cpp/CMakeLists.txt 2019-04-09 17:58:59.926559001 +1000
+@@ -117,7 +117,7 @@
+ add_definitions(-O0)
+ add_definitions(-D_GLIBCXX_ASSERTIONS)
+ endif()
+- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie -Wl,-z,relro,-z,now")
++ set(CMAKE_EXE_LINKER_FLAGS "-pie -Wl,-z,relro,-z,now ${CMAKE_EXE_LINKER_FLAGS}")
+ endif()
+
+ # other useful gcc diagnostics
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-pandoc.patch
new file mode 100644
index 000000000000..e2fe83867bcd
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-pandoc.patch
@@ -0,0 +1,32 @@
+--- rstudio-1.2.1335-orig/src/cpp/session/CMakeLists.txt 2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/src/cpp/session/CMakeLists.txt 2019-04-09 17:22:59.210201624 +1000
+@@ -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")
+- message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)")
+-endif()
+
+ # we often install embedded versions of these packages but don't do so currently
+
+@@ -479,19 +476,6 @@
+ install(DIRECTORY "resources/connections"
+ DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
+
+-# install pandoc
+-if(WIN32)
+- set(PANDOC_VERSION "2.6" CACHE INTERNAL "Pandoc version")
+-else()
+- set(PANDOC_VERSION "2.3.1" CACHE INTERNAL "Pandoc version")
+-endif()
+-
+-set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}")
+-file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*")
+-install(FILES ${PANDOC_FILES}
+- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+- DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc)
+-
+ # install rmarkdown package
+ # file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz")
+ # install(FILES ${RMARKDOWN_PACKAGE}
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-paths.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-paths.patch
new file mode 100644
index 000000000000..ba66ef9f0ea1
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-paths.patch
@@ -0,0 +1,118 @@
+--- rstudio-1.2.1335-orig/CMakeGlobals.txt 2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/CMakeGlobals.txt 2019-04-09 17:10:07.680657631 +1000
+@@ -161,7 +161,7 @@
+ set(RSTUDIO_INSTALL_SUPPORTING RStudio.app/Contents/Resources)
+ else()
+ set(RSTUDIO_INSTALL_BIN bin)
+- set(RSTUDIO_INSTALL_SUPPORTING .)
++ set(RSTUDIO_INSTALL_SUPPORTING ${DISTRO_SHARE})
+ endif()
+
+ # if the install prefix is /usr/local then tweak as appropriate
+--- rstudio-1.2.1335-orig/src/cpp/server/CMakeLists.txt 2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/src/cpp/server/CMakeLists.txt 2019-04-09 16:54:34.740739744 +1000
+@@ -194,7 +194,7 @@
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in
+ ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT})
+ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}
+- DESTINATION ${RSERVER_INITD_DEBIAN_DIR})
++ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_DEBIAN_DIR})
+
+ # install configured redhat init.d script
+ set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat")
+@@ -202,7 +202,7 @@
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in
+ ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT})
+ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}
+- DESTINATION ${RSERVER_INITD_REDHAT_DIR})
++ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_REDHAT_DIR})
+
+ # install configured suse init.d script
+ set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse")
+@@ -210,13 +210,13 @@
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in
+ ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT})
+ install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}
+- DESTINATION ${RSERVER_INITD_SUSE_DIR})
++ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_SUSE_DIR})
+
+ # install pam profile
+ set(RSERVER_PAM_DIR "extras/pam")
+ set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio")
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE}
+- DESTINATION ${RSERVER_PAM_DIR})
++ DESTINATION ${DISTRO_SHARE}/${RSERVER_PAM_DIR})
+
+ # install configured upstart profile
+ set(RSERVER_UPSTART_DIR "extras/upstart")
+@@ -224,12 +224,12 @@
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in
+ ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE})
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}
+- DESTINATION ${RSERVER_UPSTART_DIR})
++ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR})
+ set(RSERVER_UPSTART_PROFILE_REDHAT "${RSERVER_UPSTART_DIR}/rstudio-server.redhat.conf")
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}.in
+ ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT})
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}
+- DESTINATION ${RSERVER_UPSTART_DIR})
++ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR})
+
+ # install configured systemd profile
+ set(RSERVER_SYSTEMD_DIR "extras/systemd")
+--- rstudio-1.2.1335-orig/src/cpp/server/ServerOptions.cpp 2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/src/cpp/server/ServerOptions.cpp 2019-04-09 16:54:34.740739744 +1000
+@@ -389,8 +389,8 @@
+
+ // convert relative paths by completing from the system installation
+ // path (this allows us to be relocatable)
+- resolvePath(resourcePath, &wwwLocalPath_);
+- resolvePath(resourcePath, &wwwSymbolMapsPath_);
++ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_);
++ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_);
+ resolvePath(binaryPath, &authPamHelperPath_);
+ resolvePath(binaryPath, &rsessionPath_);
+ resolvePath(binaryPath, &rldpathPath_);
+--- rstudio-1.2.1335-orig/src/cpp/session/SessionOptions.cpp 2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/src/cpp/session/SessionOptions.cpp 2019-04-09 17:17:06.035206050 +1000
+@@ -53,7 +53,7 @@
+ namespace session {
+
+ namespace {
+-const char* const kDefaultPandocPath = "bin/pandoc";
++const char* const kDefaultPandocPath = "bin";
+ const char* const kDefaultPostbackPath = "bin/postback/rpostback";
+ const char* const kDefaultRsclangPath = "bin/rsclang";
+
+@@ -569,14 +569,14 @@
+ }
+
+ // convert relative paths by completing from the app resource path
+- resolvePath(resourcePath_, &rResourcesPath_);
+- resolvePath(resourcePath_, &agreementFilePath_);
+- resolvePath(resourcePath_, &wwwLocalPath_);
+- resolvePath(resourcePath_, &wwwSymbolMapsPath_);
+- resolvePath(resourcePath_, &coreRSourcePath_);
+- resolvePath(resourcePath_, &modulesRSourcePath_);
+- resolvePath(resourcePath_, &sessionLibraryPath_);
+- resolvePath(resourcePath_, &sessionPackageArchivesPath_);
++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &rResourcesPath_);
++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &agreementFilePath_);
++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwLocalPath_);
++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_);
++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &coreRSourcePath_);
++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &modulesRSourcePath_);
++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionLibraryPath_);
++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionPackageArchivesPath_);
+ resolvePostbackPath(resourcePath_, &rpostbackPath_);
+ #ifdef _WIN32
+ resolvePath(resourcePath_, &consoleIoPath_);
+@@ -601,7 +601,7 @@
+ }
+ winptyPath_ = pty.complete(completion).absolutePath();
+ #endif // _WIN32
+- resolvePath(resourcePath_, &hunspellDictionariesPath_);
++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &hunspellDictionariesPath_);
+ resolvePath(resourcePath_, &mathjaxPath_);
+ resolvePath(resourcePath_, &libclangHeadersPath_);
+ resolvePandocPath(resourcePath_, &pandocPath_);
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-prefs.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-prefs.patch
new file mode 100644
index 000000000000..e72df553eeb6
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-prefs.patch
@@ -0,0 +1,53 @@
+--- rstudio-1.2.1335-orig/src/gwt/build.xml 2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/src/gwt/build.xml 2019-04-09 16:44:15.089471934 +1000
+@@ -34,6 +34,7 @@
+ <property name="gwt.extra.args" value=""/>
+ <property name="gwt.main.module" value="org.rstudio.studio.RStudio"/>
+ <property name="ace.bin" value="${src.dir}/org/rstudio/studio/client/workbench/views/source/editors/text/ace"/>
++ <property environment="env"/>
+
+ <path id="project.class.path">
+ <pathelement location="${build.dir}"/>
+@@ -112,8 +113,10 @@
+ <pathelement location="${src.dir}"/>
+ <path refid="project.class.path"/>
+ </classpath>
++ <jvmarg value="-Duser.home=${env.T}"/>
+ <!-- add jvmarg -Xss16M or similar if you see a StackOverflowError -->
+ <jvmarg value="-Xmx1536M"/>
++ <jvmarg value="-Djava.util.prefs.userRoot=${env.T}"/>
+ <arg value="-war"/>
+ <arg value="${www.dir}"/>
+ <arg value="-localWorkers"/>
+@@ -154,6 +157,7 @@
+ <pathelement location="${src.dir}"/>
+ <path refid="project.class.path"/>
+ </classpath>
++ <jvmarg value="-Duser.home=${env.T}"/>
+ <jvmarg value="-Xmx2048M"/>
+ <arg value="-style"/>
+ <arg value="PRETTY"/>
+@@ -176,6 +180,7 @@
+ <pathelement location="src"/>
+ <path refid="project.class.path"/>
+ </classpath>
++ <jvmarg value="-Duser.home=${env.T}"/>
+ <jvmarg value="-Xmx2048M"/>
+ <arg value="-style"/>
+ <arg value="PRETTY"/>
+@@ -202,6 +207,7 @@
+ <pathelement location="src"/>
+ <path refid="project.class.path"/>
+ </classpath>
++ <jvmarg value="-Duser.home=${env.T}"/>
+ <jvmarg value="-Xmx2048M"/>
+ <arg value="-src"/>
+ <arg value = "src"/>
+@@ -237,6 +243,7 @@
+ <pathelement location="${test.dir}"/>
+ <pathelement location="${src.dir}"/>
+ </classpath>
++ <jvmarg value="-Duser.home=${env.T}"/>
+ <classpath refid="project.class.path"/>
+ <classpath refid="unittest.class.path"/>
+ <arg value="org.rstudio.studio.client.RStudioUnitTestSuite"/>
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-qtsingleapplication.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-qtsingleapplication.patch
new file mode 100644
index 000000000000..a59fa02f1d2c
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-qtsingleapplication.patch
@@ -0,0 +1,60 @@
+--- rstudio-1.2.1335-orig/src/cpp/desktop/CMakeLists.txt 2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/src/cpp/desktop/CMakeLists.txt 2019-04-09 18:04:57.783616412 +1000
+@@ -140,6 +140,13 @@
+ get_filename_component(QT_LIBRARY_PATH "${QT_BIN_DIR}/../lib" ABSOLUTE CACHE)
+ get_filename_component(QT_INSTALL_PATH "${QT_BIN_DIR}/.." ABSOLUTE CACHE)
+
++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)
+ add_definitions(-Wno-unused-private-field
+@@ -158,7 +165,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
+@@ -224,8 +230,6 @@
+ DesktopSlotBinders.cpp
+ DesktopSubMenu.cpp
+ DesktopSynctex.cpp
+- 3rdparty/qtsingleapplication/qtsingleapplication.cpp
+- 3rdparty/qtsingleapplication/qtlocalpeer.cpp
+ )
+
+ if(WIN32)
+@@ -280,6 +284,7 @@
+ ${CORE_SOURCE_DIR}/include
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
++ ${QTSINGLEAPPLIB_INCLUDE_DIR}
+ ${TESTS_INCLUDE_DIR}
+ )
+
+@@ -384,6 +389,7 @@
+ # set link dependencies
+ target_link_libraries(rstudio
+ ${RSTUDIO_QTMODULES}
++ ${QTSINGLEAPPLIB}
+ ${QT_LIBRARIES}
+ ${Boost_LIBRARIES}
+ rstudio-core
+--- rstudio-1.2.1335-orig/src/cpp/desktop/DesktopPosixApplication.hpp 2019-03-28 16:08:20.000000000 +1100
++++ rstudio-1.2.1335/src/cpp/desktop/DesktopPosixApplication.hpp 2019-04-09 18:01:39.333920927 +1000
+@@ -16,7 +16,7 @@
+ #ifndef DESKTOP_POSIX_APPLICATION_HPP
+ #define DESKTOP_POSIX_APPLICATION_HPP
+
+-#include "3rdparty/qtsingleapplication/QtSingleApplication"
++#include <QtSingleApplication>
+
+ #include "DesktopApplicationLaunch.hpp"
+
diff --git a/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild b/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild
new file mode 100644
index 000000000000..86b6db8da4ba
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils user cmake-utils gnome2-utils pam xdg-utils java-pkg-2 pax-utils qmake-utils
+
+# TODO
+# * package gin and gwt
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+# update from scripts in dependencies/common
+# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
+GWT_VER=2.7.0
+GIN_VER=1.5
+SELENIUM_VER=2.37.0
+CHROMEDRIVER_VER=2.7
+# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc
+PANDOC_VER=1.19.2.1
+# ls dependencies/common/*.tar.gz
+PACKRAT_VER=0.98.1000
+RMARKDOWN_VER=0.98.1000
+SHINYAPPS_VER=0.98.1000
+RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
+
+DESCRIPTION="IDE for the R language"
+HOMEPAGE="
+ http://www.rstudio.org
+ https://github.com/rstudio/rstudio/"
+SRC_URI="
+ https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
+ https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
+ https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
+ https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
+ https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
+ https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
+ https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
+ https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
+ https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
+ https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dedicated libressl server"
+
+QT_VER=5.4
+QT_SLOT=5
+RDEPEND="
+ >=app-text/pandoc-${PANDOC_VER}
+ dev-haskell/pandoc-citeproc
+ >=dev-lang/R-2.11.1
+ >=dev-libs/boost-1.63:=
+ >=dev-libs/mathjax-2.7.4
+ sys-apps/util-linux
+ >=sys-devel/clang-3.5.0:*
+ sys-libs/zlib
+ >=virtual/jre-1.8:=
+ x11-libs/pango
+ !dedicated? (
+ >=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)]
+ >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
+ server? ( virtual/pam )
+ )
+ dedicated? ( virtual/pam )
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+ app-arch/unzip
+ dev-java/ant-core
+ >=virtual/jdk-1.8:=
+ virtual/pkgconfig"
+# test? ( dev-java/junit:4 )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.99.879-prefs.patch"
+ "${FILESDIR}/${PN}-1.0.44-paths.patch"
+ "${FILESDIR}/${PN}-1.1.357-clang-pandoc.patch"
+ "${FILESDIR}/${PN}-0.98.490-linker_flags.patch"
+ "${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch"
+ "${FILESDIR}/${PN}-1.0.44-systemd.patch"
+ "${FILESDIR}/${PN}-1.1.453-boost-1.67.0.patch"
+ "${FILESDIR}/${PN}-1.1.453-core.patch"
+ "${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p1.patch"
+ "${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p2.patch"
+ "${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p3.patch"
+ "${FILESDIR}/${PN}-1.1.463-fix-ptr-int-compare.patch"
+ "${FILESDIR}/${PN}-1.1.463-boost-1.70.0.patch"
+)
+
+src_unpack() {
+ unpack ${P}.tar.gz gwt-${GWT_VER}.zip
+ cd "${S}" || die
+ mkdir -p src/gwt/lib/{gin,gwt} \
+ dependencies/common/dictionaries \
+ src/gwt/lib/selenium/${SELENIUM_VER} \
+ src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
+ mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
+ unzip -qd src/gwt/lib/gin/${GIN_VER} \
+ "${DISTDIR}"/gin-${GIN_VER}.zip || die
+ unzip -qd dependencies/common/dictionaries \
+ "${DISTDIR}"/core-dictionaries.zip || die
+ unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
+ "${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
+ cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
+ src/gwt/lib/selenium/${SELENIUM_VER}/ || die
+ cp "${DISTDIR}"/chromedriver-linux \
+ src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die
+ cd dependencies/common || die
+ unpack packrat-${PACKRAT_VER}.tar.gz
+ unpack rmarkdown-${RMARKDOWN_VER}.tar.gz
+ unpack shinyapps-${SHINYAPPS_VER}.tar.gz
+ unpack rsconnect_${RSCONNECT_VER}.tar.gz
+ cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
+ . || die
+ cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
+ . || die
+ cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
+ . || die
+ cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \
+ . || die
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+ java-pkg-2_src_prepare
+ egit_clean
+
+ # Enable CMake to install our .service file for systemd usage
+ mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
+ cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
+
+ # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using
+ # this sed hack for now. ~RMH
+ sed -i \
+ -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \
+ src/cpp/server/ServerOptions.cpp \
+ src/cpp/session/SessionOptions.cpp || die
+
+ # use mathjax from system
+ ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die
+
+ # make sure icons and mime stuff are with prefix
+ sed -i \
+ -e "s:/usr:${EPREFIX}/usr:g" \
+ CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
+
+ # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
+ sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
+ -i src/cpp/server/ServerOptions.cpp \
+ || die
+
+ # Set the rsession.conf file location for Gentoo prefix
+ sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
+ -i src/cpp/session/SessionOptions.cpp \
+ || die
+
+ # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
+ # It provides a library that has its version number appended to the end,
+ # which is difficult to handle in cmake, as find_library does not support
+ # searching for wildcard library names. So I find the library name from the
+ # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
+ rm -rf "${S}"/src/cpp/desktop/3rdparty || die
+ local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
+ $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
+ | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
+ -e 's@LIBS \*= -l@@')
+ sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
+ -i "${S}"/src/cpp/desktop/CMakeLists.txt \
+ || die
+
+ # The git commit for tag: git rev-list -n 1 v${PV}
+ sed -e 's@git ARGS rev-parse HEAD@echo ARGS 6871a99b32add885fe6fa3d50fe15f62346142e7@'\
+ -i "${S}"/CMakeLists.txt \
+ "${S}"/CMakeGlobals.txt \
+ || die
+}
+
+src_configure() {
+ export RSTUDIO_VERSION_MAJOR=$(ver_cut 1)
+ export RSTUDIO_VERSION_MINOR=$(ver_cut 2)
+ export RSTUDIO_VERSION_PATCH=$(ver_cut 3)
+
+ local mycmakeargs=(
+ -DDISTRO_SHARE=share/${PN}
+ -DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
+ -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
+ -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
+ -DRSTUDIO_VERIFY_R_VERSION=FALSE
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+ # P: /root/.oracle_jre_usage.
+ export ANT_OPTS="-Duser.home=${T}"
+ cmake-utils_src_compile
+}
+
+src_install() {
+ export ANT_OPTS="-Duser.home=${T}"
+ cmake-utils_src_install
+ pax-mark m "${ED}/usr/bin/rstudio"
+ doconfd "${FILESDIR}"/rstudio-server.conf
+ dodir /etc/rstudio
+ insinto /etc/rstudio
+ doins "${FILESDIR}"/rsession.conf
+ dosym "${ROOT}etc/conf.d/rstudio-server.conf" "${ROOT}etc/rstudio/rserver.conf"
+ if use dedicated || use server; then
+ dopamd src/cpp/server/extras/pam/rstudio
+ newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
+ fi
+}
+
+pkg_preinst() {
+ use dedicated || gnome2_icon_savelist
+ java-pkg-2_pkg_preinst
+}
+
+pkg_postinst() {
+ use dedicated || { xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ gnome2_icon_cache_update ;}
+
+ if use dedicated || use server; then
+ enewgroup rstudio-server
+ enewuser rstudio-server -1 -1 -1 rstudio-server
+ fi
+}
+
+pkg_postrm() {
+ use dedicated || { xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ gnome2_icon_cache_update ;}
+}
diff --git a/sci-mathematics/rstudio/rstudio-1.1.463.ebuild b/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
index 271588e60b84..5c0511bb9a52 100644
--- a/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
@@ -101,6 +101,7 @@ PATCHES=(
"${FILESDIR}/${PN}-1.1.453-core.patch"
"${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p1.patch"
"${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p2.patch"
+ "${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p3.patch"
"${FILESDIR}/${PN}-1.1.463-fix-ptr-int-compare.patch"
)
diff --git a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
new file mode 100644
index 000000000000..4ff5da665091
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils user cmake-utils gnome2-utils pam xdg-utils java-pkg-2 pax-utils qmake-utils
+
+# TODO
+# * package gin and gwt
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+# update from scripts in dependencies/common
+# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
+GWT_VER=2.8.1
+GIN_VER=2.1.2
+SELENIUM_VER=2.37.0
+CHROMEDRIVER_VER=2.7
+# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc
+# It should be PANDOC_VER=2.3.1 however >=app-text/pandoc-2.3.1 is not yet in portage
+PANDOC_VER=1.19.2.1
+# ls dependencies/common/*.tar.gz
+PACKRAT_VER=0.98.1000
+RMARKDOWN_VER=0.98.1000
+SHINYAPPS_VER=0.98.1000
+RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
+
+DESCRIPTION="IDE for the R language"
+HOMEPAGE="
+ http://www.rstudio.org
+ https://github.com/rstudio/rstudio/"
+SRC_URI="
+ https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
+ https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
+ https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
+ https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
+ https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
+ https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
+ https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
+ https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
+ https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
+ https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dedicated libressl server"
+
+QT_VER=5.4
+QT_SLOT=5
+RDEPEND="
+ >=app-text/pandoc-${PANDOC_VER}
+ dev-haskell/pandoc-citeproc
+ >=dev-lang/R-2.11.1
+ >=dev-libs/boost-1.63:=
+ >=dev-libs/mathjax-2.7.4
+ sys-apps/util-linux
+ >=sys-devel/clang-3.5.0:*
+ sys-libs/zlib
+ >=virtual/jre-1.8:=
+ x11-libs/pango
+ !dedicated? (
+ >=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)]
+ >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
+ >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
+ server? ( virtual/pam )
+ )
+ dedicated? ( virtual/pam )
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+ app-arch/unzip
+ dev-java/ant-core
+ >=virtual/jdk-1.8:=
+ virtual/pkgconfig"
+# 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"
+)
+
+src_unpack() {
+ unpack ${P}.tar.gz gwt-${GWT_VER}.zip
+ cd "${S}" || die
+ mkdir -p src/gwt/lib/{gin,gwt} \
+ dependencies/common/dictionaries \
+ src/gwt/lib/selenium/${SELENIUM_VER} \
+ src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
+ mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
+ unzip -qd src/gwt/lib/gin/${GIN_VER} \
+ "${DISTDIR}"/gin-${GIN_VER}.zip || die
+ unzip -qd dependencies/common/dictionaries \
+ "${DISTDIR}"/core-dictionaries.zip || die
+ unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
+ "${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
+ cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
+ src/gwt/lib/selenium/${SELENIUM_VER}/ || die
+ cp "${DISTDIR}"/chromedriver-linux \
+ src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die
+ cd dependencies/common || die
+ unpack packrat-${PACKRAT_VER}.tar.gz
+ unpack rmarkdown-${RMARKDOWN_VER}.tar.gz
+ unpack shinyapps-${SHINYAPPS_VER}.tar.gz
+ unpack rsconnect_${RSCONNECT_VER}.tar.gz
+ cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
+ . || die
+ cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
+ . || die
+ cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
+ . || die
+ cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \
+ . || die
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+ java-pkg-2_src_prepare
+ egit_clean
+
+ # Enable CMake to install our .service file for systemd usage
+ mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
+ cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
+
+ # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using
+ # this sed hack for now. ~RMH
+ sed -i \
+ -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \
+ src/cpp/server/ServerOptions.cpp \
+ src/cpp/session/SessionOptions.cpp || die
+
+ # use mathjax from system
+ ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die
+
+ # make sure icons and mime stuff are with prefix
+ sed -i \
+ -e "s:/usr:${EPREFIX}/usr:g" \
+ CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
+
+ # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
+ sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
+ -i src/cpp/server/ServerOptions.cpp \
+ || die
+
+ # Set the rsession.conf file location for Gentoo prefix
+ sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
+ -i src/cpp/session/SessionOptions.cpp \
+ || die
+
+ # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
+ # It provides a library that has its version number appended to the end,
+ # which is difficult to handle in cmake, as find_library does not support
+ # searching for wildcard library names. So I find the library name from the
+ # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
+ rm -rf "${S}"/src/cpp/desktop/3rdparty || die
+ local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
+ $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
+ | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
+ -e 's@LIBS \*= -l@@')
+ sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
+ -i "${S}"/src/cpp/desktop/CMakeLists.txt \
+ || die
+
+ # The git commit for tag: git rev-list -n 1 v${PV}
+ sed -e 's@git ARGS rev-parse HEAD@echo ARGS 6871a99b32add885fe6fa3d50fe15f62346142e7@'\
+ -i "${S}"/CMakeLists.txt \
+ "${S}"/CMakeGlobals.txt \
+ || die
+}
+
+src_configure() {
+ export RSTUDIO_VERSION_MAJOR=$(ver_cut 1)
+ export RSTUDIO_VERSION_MINOR=$(ver_cut 2)
+ export RSTUDIO_VERSION_PATCH=$(ver_cut 3)
+
+ local mycmakeargs=(
+ -DDISTRO_SHARE=share/${PN}
+ -DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
+ -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
+ -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
+ -DRSTUDIO_VERIFY_R_VERSION=FALSE
+ )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+ # P: /root/.oracle_jre_usage.
+ export ANT_OPTS="-Duser.home=${T}"
+ cmake-utils_src_compile
+}
+
+src_install() {
+ export ANT_OPTS="-Duser.home=${T}"
+ cmake-utils_src_install
+ pax-mark m "${ED}/usr/bin/rstudio"
+ doconfd "${FILESDIR}"/rstudio-server.conf
+ dodir /etc/rstudio
+ insinto /etc/rstudio
+ doins "${FILESDIR}"/rsession.conf
+ dosym "${ROOT}etc/conf.d/rstudio-server.conf" "${ROOT}etc/rstudio/rserver.conf"
+ if use dedicated || use server; then
+ dopamd src/cpp/server/extras/pam/rstudio
+ newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
+ fi
+}
+
+pkg_preinst() {
+ use dedicated || gnome2_icon_savelist
+ java-pkg-2_pkg_preinst
+}
+
+pkg_postinst() {
+ use dedicated || { xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ gnome2_icon_cache_update ;}
+
+ if use dedicated || use server; then
+ enewgroup rstudio-server
+ enewuser rstudio-server -1 -1 -1 rstudio-server
+ fi
+}
+
+pkg_postrm() {
+ use dedicated || { xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ gnome2_icon_cache_update ;}
+}