From fe1c8b732bd548b699d4c2ef725f67f8b8c8911c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 4 May 2018 11:22:40 +0100 Subject: gentoo resync : 04.05.2018 --- sci-mathematics/Manifest.gz | Bin 14824 -> 14821 bytes sci-mathematics/rstudio/Manifest | 3 - .../files/rstudio-0.98.1091-boost-1.57.patch | 60 ----- sci-mathematics/rstudio/rstudio-1.1.368.ebuild | 248 --------------------- 4 files changed, 311 deletions(-) delete mode 100644 sci-mathematics/rstudio/files/rstudio-0.98.1091-boost-1.57.patch delete mode 100644 sci-mathematics/rstudio/rstudio-1.1.368.ebuild (limited to 'sci-mathematics') diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz index cc4352ad91ce..d28bc68c9b6c 100644 Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest index b60fe50eb073..7d3b5d3ae0fb 100644 --- a/sci-mathematics/rstudio/Manifest +++ b/sci-mathematics/rstudio/Manifest @@ -1,5 +1,4 @@ AUX rsession.conf 1145 BLAKE2B 81e0ba1c273cbebe1fcd95917cbfd9269525e4994f594734207972948ffbda5f500483ea21678dd15f28aed25ca060698f710fc3586522043347e55d3f4890a1 SHA512 90395faac5aa80ce52ae56da3565512b8a880a14ab2acf9a24c7a56c9d03f1e3d5f63ebaca66efa68f5c5c9c831235846df22ca37f20ba071437a2a963b808cf -AUX rstudio-0.98.1091-boost-1.57.patch 1876 BLAKE2B 5dc8464a0e4e47e2242ffc983c782fc7407fa2035e850095c8e9188f089770b0361b69611576b9fa1608b41c1ab0044698c16de665c1e6845a16714382c21ff3 SHA512 5edda18a495e6e95683e4822cda632fbf965cab040424e82368c2d45a2a632057de69c7d3211c40295dd17985fc5786714ef3076b6cb41894f9eeeee1ab5b9ae AUX rstudio-0.98.490-linker_flags.patch 806 BLAKE2B dc32a4a3bbe7ed2467c187aab7a1cfa0dae3862db8b091edff69608163181f4d073d94a58ce017b94b5d4701783eb41561de5e1b4a73a49ea349129f4a8650d1 SHA512 2049077768ef72faf502387b5eeef80948d0ec748bc52df7bff6e507dd92a8c52b3a7f7f82eda526ea1289f16720ae51fd40c059bd2d04f5eacd51911b995f06 AUX rstudio-0.99.473-qtsingleapplication.patch 1889 BLAKE2B 1346ed138abd08318f23cbe4b34a0d2ee4ac0cf83206eba04c238c08c659859c11e207e3e6d03ad23e5baf6353a5f8ad49fbdffcea31104dc810fbb05f4ec9c3 SHA512 07af71ac080c0a2d4c2c62ec8f0ac451e6100a94e5360fafd274c62e2205d60d0c4b7fe18ed4536e515fa4a51a4ab819e47c529ce4fcbf93532dbb57e123fb37 AUX rstudio-0.99.879-prefs.patch 1859 BLAKE2B f324ab7b87e7cef32ac8b2718059200e4040d82258ba6d47bf41527ba413627b5a0971924ce3e1bfa1337d206838cb9f1ade11a1fe35786fe2371b0cb86a4c11 SHA512 987d46d7dd8955ae55f29aa2ca51241697405d8219b719342a5e8b6621dcec8bffa5b41d09a82e03d65c6b9797fb6aea8791ea161f4406600a5d5bd20aaf00f8 @@ -16,11 +15,9 @@ DIST gwt-2.7.0.zip 108818328 BLAKE2B 9af969f3f2577be041fcfb58f228fab4b5479fa0da5 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.368.tar.gz 20197144 BLAKE2B c97a86faa28b40552539eebc4faeec8a4199df6972efc2b112a2af08e47982e41b7cd92a6f06d14411dd67c21efa632ab017d99d28c1521f90b6075ed0232ce0 SHA512 39cdf583d7dcd22338916cc0ea4f90681580e41663b2d3e04b2e650759c6b030c85ee111cdfe1f717f931932a9b7ca423a21585d69a785f056f754f6d50399a1 DIST rstudio-1.1.383.tar.gz 20196702 BLAKE2B 5164230a92618e4252269ad0016b200294d1e7fa502cc49aa694486cda098ee7ffc65e6c74a87d891d0532f5cc15d1552aa86d04047d07b4f275cbc4d2758647 SHA512 3f637f9bce2c1ad1a4ed3e74287da722190a4e12b0cace6ffcca271977d49dcecca9365f2064366aad94e87851593cab83fa9361e9a9222a9f67fe9451f31ed2 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 -EBUILD rstudio-1.1.368.ebuild 8385 BLAKE2B f548f080c2787cbb01095cc5482ce29196da85734a61cd6fad51441ffc58b2224d98f7099469beba8b9ff91e8298ccb56467bd98068a3b49d684e75ba63e9a2d SHA512 99b9393eb641b77b794392dc7a56087a34e7cc970427286ae90121776dafe8e1184d06100d95c1ef3a14770ff7f08016d9c31ca0dc0f4750ffd92ab8c105c9a2 EBUILD rstudio-1.1.383-r1.ebuild 8339 BLAKE2B d6dd6efec40207a2a042827dffa99eb3bf9c820e385ee22dbe89ec0dabe60af523da054a8492ee97164eb4a2da47f3cb8848637a5d858111200767c2f689e53a SHA512 05cff959e87bf90125935b130544ae6d1ea4283069bae3d55f415037f97e44ca1ae032d595701157abd9d49d106e77bb8fd42085fa8a9167e7ff5ed981dcf86c MISC metadata.xml 590 BLAKE2B 53dc62775e118c9c26ee05e20ee1da1ac31b6a6b74cf7dac410856fe4e0cce40fbb800c7a03e60f59e14442baf3aad866ad42616ad5fbb5724f7f6d8c1636eea SHA512 7111442aaa52da1e554c34f824113ec0e227798dd11b0ea9148b81e7a31c08b2a527b9995e3adb9363c7a4f2a8594f30cbd4a179545bf31d69f07d5558c20f52 diff --git a/sci-mathematics/rstudio/files/rstudio-0.98.1091-boost-1.57.patch b/sci-mathematics/rstudio/files/rstudio-0.98.1091-boost-1.57.patch deleted file mode 100644 index 3a157183c22c..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-0.98.1091-boost-1.57.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- rstudio-0.98.1091-orig/src/cpp/desktop/DesktopApplicationLaunch.hpp 2014-11-06 23:15:47.000000000 +1100 -+++ rstudio-0.98.1091/src/cpp/desktop/DesktopApplicationLaunch.hpp 2015-02-28 14:01:51.970672316 +1100 -@@ -19,7 +19,10 @@ - #include - #include - #include -+// see https://bugreports.qt-project.org/browse/QTBUG-22829 -+#ifndef Q_MOC_RUN - #include -+#endif - - namespace desktop { - ---- rstudio-0.98.1091-orig/src/cpp/desktop/DesktopSessionLauncher.hpp 2014-11-06 23:15:47.000000000 +1100 -+++ rstudio-0.98.1091/src/cpp/desktop/DesktopSessionLauncher.hpp 2015-02-28 14:01:51.972672316 +1100 -@@ -18,7 +18,10 @@ - - #include - -+// see https://bugreports.qt-project.org/browse/QTBUG-22829 -+#ifndef Q_MOC_RUN - #include -+#endif - - #include - #include ---- rstudio-0.98.1091-orig/src/cpp/core/include/core/FilePath.hpp 2014-11-06 23:15:47.000000000 +1100 -+++ rstudio-0.98.1091/src/cpp/core/include/core/FilePath.hpp 2015-02-28 14:01:51.984672314 +1100 -@@ -23,11 +23,14 @@ - #include - #include - -+// see https://bugreports.qt-project.org/browse/QTBUG-22829 -+#ifndef Q_MOC_RUN - #include - #include - #include - - #include -+#endif - - #include - #include ---- rstudio-0.98.1091-orig/src/cpp/core/include/core/Error.hpp 2014-11-06 23:15:47.000000000 +1100 -+++ rstudio-0.98.1091/src/cpp/core/include/core/Error.hpp 2015-02-28 14:01:51.977672315 +1100 -@@ -20,11 +20,14 @@ - #include - #include - -+// see https://bugreports.qt-project.org/browse/QTBUG-22829 -+#ifndef Q_MOC_RUN - #include - - #include - - #include -+#endif - - namespace core { - diff --git a/sci-mathematics/rstudio/rstudio-1.1.368.ebuild b/sci-mathematics/rstudio/rstudio-1.1.368.ebuild deleted file mode 100644 index 221887f8aa32..000000000000 --- a/sci-mathematics/rstudio/rstudio-1.1.368.ebuild +++ /dev/null @@ -1,248 +0,0 @@ -# Copyright 1999-2017 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/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.63:= - >=dev-libs/mathjax-2.7.0 - 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.98.1091-boost-1.57.patch" - "${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch" - "${FILESDIR}/${PN}-1.0.44-systemd.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 v0.99.903 - sed -e 's@git ARGS rev-parse HEAD@echo ARGS 0eb2d8ea28ebc1ac6ac327e023becb6133b679c4@'\ - -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 ;} -} -- cgit v1.2.3