From e3ca911b12cb1ec292f6d15535c0beef3faa0549 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Fri, 11 Jun 2021 20:27:50 +0200 Subject: sci-mathematics/rstudio: Fix server startup scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/765856 Thanks-to: viktor.polak Thanks-to: François Valenduc Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Pacho Ramos --- sci-mathematics/rstudio/files/rstudio-server.initd | 6 +- .../rstudio/files/rstudio-server.service.in | 1 + sci-mathematics/rstudio/rstudio-1.3.1093-r1.ebuild | 233 +++++++++++++++++++++ sci-mathematics/rstudio/rstudio-1.3.1093.ebuild | 233 --------------------- 4 files changed, 239 insertions(+), 234 deletions(-) create mode 100644 sci-mathematics/rstudio/rstudio-1.3.1093-r1.ebuild delete mode 100644 sci-mathematics/rstudio/rstudio-1.3.1093.ebuild (limited to 'sci-mathematics') diff --git a/sci-mathematics/rstudio/files/rstudio-server.initd b/sci-mathematics/rstudio/files/rstudio-server.initd index caa7e46d5df8..96c1e4f210c1 100644 --- a/sci-mathematics/rstudio/files/rstudio-server.initd +++ b/sci-mathematics/rstudio/files/rstudio-server.initd @@ -1,7 +1,11 @@ #!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +depend() { + need net +} + start() { ebegin "Starting RStudio Server" start-stop-daemon --start --quiet --exec /usr/bin/rserver diff --git a/sci-mathematics/rstudio/files/rstudio-server.service.in b/sci-mathematics/rstudio/files/rstudio-server.service.in index fb3e37305e00..08965a836a27 100644 --- a/sci-mathematics/rstudio/files/rstudio-server.service.in +++ b/sci-mathematics/rstudio/files/rstudio-server.service.in @@ -1,5 +1,6 @@ [Unit] Description=RStudio Server +After=network.target [Service] Type=forking diff --git a/sci-mathematics/rstudio/rstudio-1.3.1093-r1.ebuild b/sci-mathematics/rstudio/rstudio-1.3.1093-r1.ebuild new file mode 100644 index 000000000000..851ffef54c98 --- /dev/null +++ b/sci-mathematics/rstudio/rstudio-1.3.1093-r1.ebuild @@ -0,0 +1,233 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit eutils cmake pam xdg-utils java-pkg-2 java-ant-2 pax-utils prefix qmake-utils vcs-clean + +# TODO +# * use dict from tree, linguas +# * do src_test (use junit from tree?) + +GIN_VER=2.1.2 +# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc +PANDOC_VER=2.9.2.1 +# grep -5 QT_CANDIDATES src/cpp/desktop/CMakeLists.txt +QT_VER=5.12.6 +QT_SLOT=5 + +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-dictionaries/core-dictionaries.zip +" + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="dedicated server" + +RDEPEND=" + >=app-text/pandoc-${PANDOC_VER} + dev-java/aopalliance:1 + dev-java/gin:2.1 + dev-java/javax-inject + =dev-java/validation-api-1.0*:1.0[source] + dev-haskell/pandoc-citeproc + dev-lang/R + dev-libs/boost:= + >=dev-libs/mathjax-2.7.4 + sys-apps/util-linux + sys-devel/clang:* + 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/qtwebengine-${QT_VER}:${QT_SLOT}[widgets] + >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} + >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} + >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} + server? ( sys-libs/pam ) + ) + dedicated? ( sys-libs/pam ) + dedicated? ( + sys-libs/pam + acct-user/rstudio-server + acct-group/rstudio-server + ) + server? ( + acct-user/rstudio-server + acct-group/rstudio-server + ) + dev-libs/openssl: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.3.959-prefs.patch + "${FILESDIR}"/${PN}-1.3.959-paths.patch + "${FILESDIR}"/${PN}-1.3.959-pandoc-mathjax.patch + "${FILESDIR}"/${PN}-1.2.1335-linker_flags.patch + "${FILESDIR}"/${PN}-1.3.959-qtsingleapplication.patch + "${FILESDIR}"/${PN}-1.0.44-systemd.patch + "${FILESDIR}"/${PN}-1.3.959-core.patch + "${FILESDIR}"/${PN}-1.2.5042-boost-1.73.0.patch + "${FILESDIR}"/${PN}-1.3.1056-R-4.0.0.patch + "${FILESDIR}"/${PN}-1.3.1056-boost-1.74.0.patch + "${FILESDIR}"/${PN}-1.3.1093-boost-1.76.patch +) + +src_unpack() { + unpack ${P}.tar.gz + cd "${S}" || die + mkdir -p dependencies/common/dictionaries + unzip -qd dependencies/common/dictionaries \ + "${DISTDIR}"/core-dictionaries.zip || die +} + +src_prepare() { + cmake_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 + + # install themes in /etc/rstudio/extra/sthemes instead of /usr/extra/themes + sed -i \ + -e "s@\(DESTINATION \"\)\(extras/themes\"\)@\1${EROOT}/etc/rstudio/\2@" \ + src/cpp/server/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 aee44535570639672cf61c0545113e7a62c90b5b@'\ + -i "${S}"/CMakeLists.txt \ + "${S}"/CMakeGlobals.txt \ + || die + + eprefixify src/gwt/build.xml +} + +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_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") + -DRSTUDIO_VERIFY_R_VERSION=FALSE + -DRSTUDIO_USE_SYSTEM_BOOST=TRUE + -DRSTUDIO_BOOST_SIGNALS_VERSION=2 + ) + + if use !dedicated; then + mycmakeargs+=( + -DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")" + -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake + ) + fi + cmake_src_configure +} + +src_compile() { + local JAVA_ANT_REWRITE_CLASSPATH="yes" + local EANT_BUILD_XML="src/gwt/build.xml" + local EANT_BUILD_TARGET="clean" + java-pkg-2_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_src_compile +} + +src_install() { + export ANT_OPTS="-Duser.home=${T}" + cmake_src_install + use dedicated || pax-mark m "${ED}/usr/bin/rstudio" + doconfd "${FILESDIR}"/rstudio-server.conf + insinto /etc/rstudio + doins "${FILESDIR}"/rsession.conf + dosym ../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() { + java-pkg-2_pkg_preinst +} + +pkg_postinst() { + use dedicated || { xdg_desktop_database_update + xdg_mimeinfo_database_update + xdg_icon_cache_update ;} +} + +pkg_postrm() { + use dedicated || { xdg_desktop_database_update + xdg_mimeinfo_database_update + xdg_icon_cache_update ;} +} diff --git a/sci-mathematics/rstudio/rstudio-1.3.1093.ebuild b/sci-mathematics/rstudio/rstudio-1.3.1093.ebuild deleted file mode 100644 index 851ffef54c98..000000000000 --- a/sci-mathematics/rstudio/rstudio-1.3.1093.ebuild +++ /dev/null @@ -1,233 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit eutils cmake pam xdg-utils java-pkg-2 java-ant-2 pax-utils prefix qmake-utils vcs-clean - -# TODO -# * use dict from tree, linguas -# * do src_test (use junit from tree?) - -GIN_VER=2.1.2 -# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc -PANDOC_VER=2.9.2.1 -# grep -5 QT_CANDIDATES src/cpp/desktop/CMakeLists.txt -QT_VER=5.12.6 -QT_SLOT=5 - -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-dictionaries/core-dictionaries.zip -" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="dedicated server" - -RDEPEND=" - >=app-text/pandoc-${PANDOC_VER} - dev-java/aopalliance:1 - dev-java/gin:2.1 - dev-java/javax-inject - =dev-java/validation-api-1.0*:1.0[source] - dev-haskell/pandoc-citeproc - dev-lang/R - dev-libs/boost:= - >=dev-libs/mathjax-2.7.4 - sys-apps/util-linux - sys-devel/clang:* - 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/qtwebengine-${QT_VER}:${QT_SLOT}[widgets] - >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} - >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} - server? ( sys-libs/pam ) - ) - dedicated? ( sys-libs/pam ) - dedicated? ( - sys-libs/pam - acct-user/rstudio-server - acct-group/rstudio-server - ) - server? ( - acct-user/rstudio-server - acct-group/rstudio-server - ) - dev-libs/openssl: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.3.959-prefs.patch - "${FILESDIR}"/${PN}-1.3.959-paths.patch - "${FILESDIR}"/${PN}-1.3.959-pandoc-mathjax.patch - "${FILESDIR}"/${PN}-1.2.1335-linker_flags.patch - "${FILESDIR}"/${PN}-1.3.959-qtsingleapplication.patch - "${FILESDIR}"/${PN}-1.0.44-systemd.patch - "${FILESDIR}"/${PN}-1.3.959-core.patch - "${FILESDIR}"/${PN}-1.2.5042-boost-1.73.0.patch - "${FILESDIR}"/${PN}-1.3.1056-R-4.0.0.patch - "${FILESDIR}"/${PN}-1.3.1056-boost-1.74.0.patch - "${FILESDIR}"/${PN}-1.3.1093-boost-1.76.patch -) - -src_unpack() { - unpack ${P}.tar.gz - cd "${S}" || die - mkdir -p dependencies/common/dictionaries - unzip -qd dependencies/common/dictionaries \ - "${DISTDIR}"/core-dictionaries.zip || die -} - -src_prepare() { - cmake_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 - - # install themes in /etc/rstudio/extra/sthemes instead of /usr/extra/themes - sed -i \ - -e "s@\(DESTINATION \"\)\(extras/themes\"\)@\1${EROOT}/etc/rstudio/\2@" \ - src/cpp/server/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 aee44535570639672cf61c0545113e7a62c90b5b@'\ - -i "${S}"/CMakeLists.txt \ - "${S}"/CMakeGlobals.txt \ - || die - - eprefixify src/gwt/build.xml -} - -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_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") - -DRSTUDIO_VERIFY_R_VERSION=FALSE - -DRSTUDIO_USE_SYSTEM_BOOST=TRUE - -DRSTUDIO_BOOST_SIGNALS_VERSION=2 - ) - - if use !dedicated; then - mycmakeargs+=( - -DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")" - -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake - ) - fi - cmake_src_configure -} - -src_compile() { - local JAVA_ANT_REWRITE_CLASSPATH="yes" - local EANT_BUILD_XML="src/gwt/build.xml" - local EANT_BUILD_TARGET="clean" - java-pkg-2_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_src_compile -} - -src_install() { - export ANT_OPTS="-Duser.home=${T}" - cmake_src_install - use dedicated || pax-mark m "${ED}/usr/bin/rstudio" - doconfd "${FILESDIR}"/rstudio-server.conf - insinto /etc/rstudio - doins "${FILESDIR}"/rsession.conf - dosym ../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() { - java-pkg-2_pkg_preinst -} - -pkg_postinst() { - use dedicated || { xdg_desktop_database_update - xdg_mimeinfo_database_update - xdg_icon_cache_update ;} -} - -pkg_postrm() { - use dedicated || { xdg_desktop_database_update - xdg_mimeinfo_database_update - xdg_icon_cache_update ;} -} -- cgit v1.2.3-65-gdbad