sci-mathematics/rstudio: Bump to rstudio-0.99.482.
authorMark Wright <gienah@gentoo.org>
Fri, 4 Sep 2015 11:32:57 +0000 (21:32 +1000)
committerMark Wright <gienah@gentoo.org>
Fri, 4 Sep 2015 11:32:57 +0000 (21:32 +1000)
Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
P: /root/.oracle_jre_usage. in rstudio-0.99.473-r1 and rstudio-0.99.482.

Package-Manager: portage-2.2.20.1

sci-mathematics/rstudio/Manifest
sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
sci-mathematics/rstudio/rstudio-0.99.482.ebuild [new file with mode: 0644]

index 8010bbd2e045e85d39e09dc17d77d575b0c048dd..7bc3ab2cb9daff8f5ffe5f2ddae3bc43345ca3e4 100644 (file)
@@ -18,6 +18,7 @@ DIST rstudio-0.98.490.tar.gz 14989329 SHA256 e38296a10b12c9e769a8be0545c36745999
 DIST rstudio-0.98.932.tar.gz 15515025 SHA256 e4a69a2f746cb7cfcacd3811f15e41a9d156175607da334f412614cc4cb70728 SHA512 beeb8c035d4f8524bd3e497162e3a218e92fbd1c1704ff3bc99a70a1248244155e3998272a6aa985b59cfa67c640adec877465f5d50acb9e47abca2657f2a06f WHIRLPOOL e422a2cef857aa9d094dd11e62b6c762a2a7477e7d84fd66456152c6521aebd94d4c365980ed6c06fc1c90d5a62426376d978de0ed23186d4732c0b148cc62bc
 DIST rstudio-0.98.953.tar.gz 15518231 SHA256 944f5882a0d61f551cd6f6cbe7882b5a5ea5be12d2c6d5ec9e79cee65869dbb7 SHA512 38a17d1abf91f4e775c4d735152fe6c8030b2df771bd7333fb3c9408fe14ac0b6180d7eaad7ac09ce2d50e5dcaa5a3b828909b30f507fd7c35fe27f7bd96866c WHIRLPOOL e2135f425b48b952282d8c44bd121517098521715c70537a6ac1a3be1732928666c5cb40fbc20b9f394a606e0e116723190790a202cbf62986ffbca528646058
 DIST rstudio-0.99.473.tar.gz 16993092 SHA256 a402995251393d50fa70e2e02188a8b32dc34e067f2f8461f087bf71f643585c SHA512 5615840501f7629e82100fee78c35b8d4dc78d78932d65c2e91a6472bc94726389566f5853a99e3d0631fd260e59acea5a40acf82f72709741b89a1ed3c901af WHIRLPOOL 809549c76efee8b29452584ab4295bcbbf533f8100c8caf4dd3b4a3c8843dc54a0d8f3178a6aecab5c188f2498a74daa6c6677fc6d43bd7dd861487c557e48df
+DIST rstudio-0.99.482.tar.gz 16992873 SHA256 1185d6ce5d3872e134f3255668d8f082370c760f06ec409c7b84c0936f52c4bf SHA512 bdb845cceae851d27323448a3570621bcb2aba7742e9e1669c88f3ebeaaade8c8371eb38f2ad348d7e2b740778c34f73e59013502ae3cebafba84e5d249c3e52 WHIRLPOOL 743440227c8d7e56000b1ff0b1a12def50e006b4f34d2067587274e2bae0eda42656787fc0cf6c51ffdbfcca08fc6eab0d042891bd77e4446b6fe26c6d19cc05
 DIST selenium-java-2.37.0.zip 24625928 SHA256 0eebba65d8edb01c1f46e462907c58f5d6e1cb0ddf63660a9985c8432bdffbb7 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779 WHIRLPOOL eb6659aae26f3c78b6f998546b23d0636c9d00ed8a7f985db1463ac4bd483ccb3e643d84e2ca0f59e0636a8de79eb552ff1d68eb6f9c06907029f7552d8f7777
 DIST selenium-server-standalone-2.37.0.jar 34730734 SHA256 97bc8c699037fb6e99ba7af570fb60dbb1b7ce30cde2448287a44ef65b13023e SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018 WHIRLPOOL 20640591534f31f24825a9ed139589b182e8b60d86541bf0be104d3cc0280983f6566bd0459f2253ac3875b48a2798b205bac8f815a119fff6db625ce9bbc29e
 DIST shinyapps-0.98.1000.tar.gz 910095 SHA256 b95c512ae0a0fb4335878d9cfcf9073e2cb3ccfed73543abe27ea8878ed36d57 SHA512 3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c WHIRLPOOL ecc2bce78387cb42e9989163d8fca29220e66f085acde3323417058aebb624dafa8c0e1873c7d79e67324cbd5aad250ef9fcdbbc8f659d64482233b95d898a15
index b247a88618c5dd8f45b22a6d36338c9f33f27221..3682c5ca0fd0b773f26bb06db465f00147bb55e6 100644 (file)
@@ -12,11 +12,14 @@ inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2
 # * 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/update-pandoc
 PANDOC_VER=1.13.1
+# ls dependencies/common/*.tar.gz
 PACKRAT_VER=0.98.1000
 RMARKDOWN_VER=0.98.1000
 SHINYAPPS_VER=0.98.1000
@@ -167,6 +170,12 @@ src_prepare() {
        sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
                -i "${S}"/src/cpp/desktop/CMakeLists.txt \
                || die
+
+       # Avoid some of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+       # P: /root/.oracle_jre_usage.
+       sed -e 's@\(\s*\)\(</classpath>\)@\1\2\n\1\<jvmarg value="-Duser.home=${env.T}"/>@g' \
+               -i "${S}"/src/gwt/build.xml \
+               || die
 }
 
 src_configure() {
@@ -185,10 +194,14 @@ 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
diff --git a/sci-mathematics/rstudio/rstudio-0.99.482.ebuild b/sci-mathematics/rstudio/rstudio-0.99.482.ebuild
new file mode 100644 (file)
index 0000000..3682c5c
--- /dev/null
@@ -0,0 +1,238 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
+
+# TODO
+# * package gin and gwt
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+# update from scripts in dependencies/common
+# 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/update-pandoc
+PANDOC_VER=1.13.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
+       dev-haskell/pandoc-citeproc
+       >=dev-lang/R-2.11.1
+       >=dev-libs/boost-1.50:=
+       >=dev-libs/mathjax-2.3
+       dev-libs/openssl:0
+       sys-apps/util-linux
+       >=sys-devel/clang-3.5.0
+       sys-libs/zlib
+       || ( =virtual/jre-1.7*:= =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[qt5]
+               >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
+               >=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
+               >=dev-qt/qtsvg-${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.7*:= =virtual/jdk-1.8*:= )
+       virtual/pkgconfig"
+#      test? ( dev-java/junit:4 )
+
+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() {
+       java-pkg-2_src_prepare
+
+       find . -name .gitignore -delete || die
+
+       epatch "${FILESDIR}"/${PN}-0.98.490-prefs.patch \
+               "${FILESDIR}"/${PN}-0.99.473-paths.patch \
+               "${FILESDIR}"/${PN}-0.99.473-clang-pandoc.patch \
+               "${FILESDIR}"/${PN}-0.98.490-linker_flags.patch \
+               "${FILESDIR}"/${PN}-0.98.1091-boost-1.57.patch \
+               "${FILESDIR}"/${PN}-0.99.473-qtsingleapplication.patch
+
+       # 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-23 || 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' \
+                                  "${EROOT}"/usr/lib64/qt5/mkspecs/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
+
+       # Avoid some of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+       # P: /root/.oracle_jre_usage.
+       sed -e 's@\(\s*\)\(</classpath>\)@\1\2\n\1\<jvmarg value="-Duser.home=${env.T}"/>@g' \
+               -i "${S}"/src/gwt/build.xml \
+               || 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}
+               $(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP)
+               -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
+               -DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
+               )
+
+       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 /etc/conf.d/rstudio-server.conf /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 || { fdo-mime_desktop_database_update
+               fdo-mime_mime_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 || { fdo-mime_desktop_database_update
+               fdo-mime_mime_database_update
+               gnome2_icon_cache_update ;}
+}