commit:     07ba37d27c35a88152a5f413289892c47b8325c6
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  3 02:09:07 2018 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Tue Jul  3 02:38:40 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07ba37d2

sci-mathematics/rstudio: Bump to 1.1.453

Thanks to John Dough for reporting 652116.
Thanks to Harris Landgarten for reporting 626056.
Closes https://bugs.gentoo.org/652116
Closes https://bugs.gentoo.org/626056

 sci-mathematics/rstudio/Manifest                   |   1 +
 .../files/rstudio-1.1.453-boost-1.67.0.patch       |  38 ++++
 .../rstudio/files/rstudio-1.1.453-core.patch       | 143 ++++++++++++
 sci-mathematics/rstudio/rstudio-1.1.453.ebuild     | 249 +++++++++++++++++++++
 4 files changed, 431 insertions(+)

diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 68418950fa6..77cc3217237 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -6,6 +6,7 @@ DIST packrat-0.98.1000.tar.gz 97677 BLAKE2B 
282fe33dc5ba366ceea05a222ae2d018bc3a
 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 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.453-boost-1.67.0.patch 
b/sci-mathematics/rstudio/files/rstudio-1.1.453-boost-1.67.0.patch
new file mode 100644
index 00000000000..760c9b56105
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.1.453-boost-1.67.0.patch
@@ -0,0 +1,38 @@
+--- rstudio-1.1.453-orig/src/cpp/core/DateTime.cpp     2018-05-15 
04:19:30.000000000 +1000
++++ rstudio-1.1.453/src/cpp/core/DateTime.cpp  2018-07-02 16:19:21.335703471 
+1000
+@@ -65,7 +65,7 @@
+    using namespace boost::posix_time;
+ 
+    ptime time_t_epoch(date(1970,1,1));
+-   return time_t_epoch + seconds(sec);
++   return time_t_epoch + seconds(static_cast<long>(sec));
+ }
+ 
+ boost::posix_time::ptime timeFromMillisecondsSinceEpoch(int64_t ms)
+--- rstudio-1.1.453-orig/src/cpp/core/file_lock/FileLock.cpp   2018-05-15 
04:19:30.000000000 +1000
++++ rstudio-1.1.453/src/cpp/core/file_lock/FileLock.cpp        2018-07-02 
17:00:35.915695201 +1000
+@@ -133,11 +133,11 @@
+ 
+    // timeout interval
+    double timeoutInterval = getFieldPositive(settings, "timeout-interval", 
kDefaultTimeoutInterval);
+-   FileLock::s_timeoutInterval = boost::posix_time::seconds(timeoutInterval);
++   FileLock::s_timeoutInterval = 
boost::posix_time::seconds(static_cast<long>(timeoutInterval));
+    
+    // refresh rate
+    double refreshRate = getFieldPositive(settings, "refresh-rate", 
kDefaultRefreshRate);
+-   FileLock::s_refreshRate = boost::posix_time::seconds(refreshRate);
++   FileLock::s_refreshRate = 
boost::posix_time::seconds(static_cast<long>(refreshRate));
+    
+    // logging
+    bool loggingEnabled = settings.getBool("enable-logging", false);
+@@ -212,8 +212,8 @@
+ 
+ // default values for static members
+ FileLock::LockType FileLock::s_defaultType(FileLock::LOCKTYPE_LINKBASED);
+-boost::posix_time::seconds 
FileLock::s_timeoutInterval(kDefaultTimeoutInterval);
+-boost::posix_time::seconds FileLock::s_refreshRate(kDefaultRefreshRate);
++boost::posix_time::seconds 
FileLock::s_timeoutInterval(static_cast<long>(kDefaultTimeoutInterval));
++boost::posix_time::seconds 
FileLock::s_refreshRate(static_cast<long>(kDefaultRefreshRate));
+ bool FileLock::s_loggingEnabled(false);
+ bool FileLock::s_isLoadBalanced(false);
+ FilePath FileLock::s_logFile;

diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.453-core.patch 
b/sci-mathematics/rstudio/files/rstudio-1.1.453-core.patch
new file mode 100644
index 00000000000..641f7710167
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.1.453-core.patch
@@ -0,0 +1,143 @@
+--- rstudio-1.1.453-orig/src/cpp/session/SessionClientInit.cpp 2018-05-15 
04:19:30.000000000 +1000
++++ rstudio-1.1.453/src/cpp/session/SessionClientInit.cpp      2018-07-02 
20:21:41.595654877 +1000
+@@ -105,7 +105,7 @@
+    }
+ 
+    // prepare session info 
+-   json::Object sessionInfo ;
++   core::json::Object sessionInfo ;
+    sessionInfo["clientId"] = clientId;
+    sessionInfo["mode"] = options.programMode();
+    
+@@ -119,8 +119,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();
+@@ -132,12 +132,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);
+@@ -159,7 +159,7 @@
+    if (resumed)
+    {
+       // console actions
+-      json::Object actionsObject;
++     core::json::Object actionsObject;
+       consoleActions.asJson(&actionsObject);
+       sessionInfo["console_actions"] = actionsObject;
+    }
+@@ -211,12 +211,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));
+@@ -253,20 +253,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;
+       }
+@@ -274,9 +274,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;
+    }
+@@ -285,7 +285,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();
+@@ -296,7 +296,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"] =
+@@ -364,13 +364,13 @@
+ 
+    sessionInfo["multi_session"] = options.multiSession();
+ 
+-   json::Object rVersionsJson;
++   core::json::Object rVersionsJson;
+    rVersionsJson["r_version"] = module_context::rVersion();
+    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();
+@@ -394,7 +394,7 @@
+ 
+    // send 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) ;
+    ptrConnection->sendJsonRpcResponse(jsonRpcResponse);

diff --git a/sci-mathematics/rstudio/rstudio-1.1.453.ebuild 
b/sci-mathematics/rstudio/rstudio-1.1.453.ebuild
new file mode 100644
index 00000000000..35c991b9bd1
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-1.1.453.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils user cmake-utils gnome2-utils pam versionator 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 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
+       dev-libs/openssl:0
+       sys-apps/util-linux
+       >=sys-devel/clang-3.5.0:*
+       sys-libs/zlib
+       >=virtual/jre-1.8:=
+       x11-libs/pango
+       !dedicated? (
+               >=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
+               >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
+               >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
+               >=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
+               >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
+               >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
+               >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
+               >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
+               >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)]
+               >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
+               >=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
+               >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
+               >=dev-qt/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 )"
+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"
+)
+
+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=$(get_version_component_range 1)
+       export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2)
+       export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3)
+
+       local mycmakeargs=(
+               -DDISTRO_SHARE=share/${PN}
+               -DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
+               -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server 
"Development" "Desktop")")
+               -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
+               -DRSTUDIO_VERIFY_R_VERSION=FALSE
+               )
+
+       cmake-utils_src_configure
+}
+
+src_compile() {
+       # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: 
mkdir S: deny
+       # P: /root/.oracle_jre_usage.
+       export ANT_OPTS="-Duser.home=${T}"
+       cmake-utils_src_compile
+}
+
+src_install() {
+       export ANT_OPTS="-Duser.home=${T}"
+       cmake-utils_src_install
+       pax-mark m "${ED}usr/bin/rstudio"
+       doconfd "${FILESDIR}"/rstudio-server.conf
+       dodir /etc/rstudio
+       insinto /etc/rstudio
+       doins "${FILESDIR}"/rsession.conf
+       dosym "${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 ;}
+}

Reply via email to