From bd7908c6630f38067350d396ac5d18c3cc2434a0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 29 Oct 2017 11:22:34 +0000 Subject: gentoo resync : 29.10.2017 --- sci-mathematics/rstudio/Manifest | 3 + .../files/rstudio-1.1.357-clang-pandoc.patch | 76 +++++++ sci-mathematics/rstudio/rstudio-1.1.368.ebuild | 248 +++++++++++++++++++++ sci-mathematics/why3-for-spark/Manifest | 4 +- sci-mathematics/why3-for-spark/metadata.xml | 1 + .../why3-for-spark/why3-for-spark-2017.ebuild | 13 +- 6 files changed, 338 insertions(+), 7 deletions(-) create mode 100644 sci-mathematics/rstudio/files/rstudio-1.1.357-clang-pandoc.patch create mode 100644 sci-mathematics/rstudio/rstudio-1.1.368.ebuild (limited to 'sci-mathematics') diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest index e16435a3b7d3..9d3e01e427b9 100644 --- a/sci-mathematics/rstudio/Manifest +++ b/sci-mathematics/rstudio/Manifest @@ -16,6 +16,7 @@ AUX rstudio-0.99.879-prefs.patch 1859 SHA256 af9e07ced5c0fde92f6804d634750337252 AUX rstudio-1.0.44-clang-pandoc.patch 3104 SHA256 a7cdd272ae114d90edd15ace2a6691e55af6b0ab847202e83acaca695f4ee091 SHA512 74b0f3dcc3dd60590dd2106861282f55bca7de157fb2e5fe587ca9311aa4527c8a8d64fc3e914f8d4e11ce65de9abbb79f917d7032b2fbfe4a4a9e8b83eea89b WHIRLPOOL 35f85c9417a0bbe20a7f612989d6923d66400bbb375ef14bda4582abe3b47e22c1c5e8b60dff43a5e9cafab91dd7bb9e772005afc0b1f4c71665f73313b53054 AUX rstudio-1.0.44-paths.patch 6722 SHA256 615db327a359908fe6e9b54fba13d67a960a29fd4d05f48a0e6ad60f1b15f2e1 SHA512 6191520733f33466cf45bcc102a386763acc37a0cc1c58718cb59f3e3b5549afe5a051039f50aa390d773433d992cdff11bdf27c7e2960eb6177cd99c3169828 WHIRLPOOL 2278a1e75f23099f8fbd0e8b9a5ed50c355618b25f9123b4aaaee7882c616cd0b33379db8980c77c3288d6142d178ac7089edfea18e36b5ef7d590daefa50ba5 AUX rstudio-1.0.44-systemd.patch 1147 SHA256 eb8dd9881fdd98c0f0600cfa77b610452bc6fec229f68bcdbf95f7945beea2a8 SHA512 ee22d4421ab52cff1815200ce1bda33ba7af752363537c6875ea19151767722183861301082eb03cb34403a08981cb10d66fd496e9e2687a4f3ca9de98f33d91 WHIRLPOOL 422ffb90a2efa587ff5fa3823b5cd6e749f30b65a51dc57d5f3a4464e2024926021aea1a7018da05250d4614aee9ea65d1de8e496bb00c7f29118b7a1900aabe +AUX rstudio-1.1.357-clang-pandoc.patch 3240 SHA256 c190da98b7344f39d357bbda359c871a1331f809a36e68d51bbdc7b5ca983451 SHA512 3a2fc154f934b4bbd92df6359dc26c27bf2f4f06b2dde572faba3c083879c8e0e98ed776701282d9f3a5cb3f4ac2416e04e6a30beedf4ffa5cbeca3a7e72421b WHIRLPOOL 7c9d667bea8642a938cac46e1b4533f46d4f442ba88c94aa6efdb48c4d46cf2c56a81de81720cab2b2e39c83674c875583cc6f3a2765769564347d08c7f4e176 AUX rstudio-server.conf 1337 SHA256 327e1a2b7d11c28962924290af19db62987a253ae31065e58d00df0b04233d12 SHA512 f166f1aa4bd370fcfcb44c5694d4e6af8bc64c5f43671e0c1def10c555d248bebf54199097f37d628a083c65913f522b7b44c3bd6a1227c011cf25eed1dba4a6 WHIRLPOOL 77695c3c1b09684adf9318ae5febab97199af58436d1cb0783b78c82ff2da33a98bebd7f5ac9c43a90e0ad852a133caac2a3a0568bbaa4fedca50577172b744b AUX rstudio-server.initd 377 SHA256 7b9f1ab9ca75426366649e3fd94c779c1e4f907b8b6fac0ef3d6af680ad00b4e SHA512 828a485338088d129c57debec6557ad35db5b042c61489ae4341717ce2218bec59a873541c270f964bb9c708b75896f1a3e2e64a4245a1713979d3bd42c9d5c8 WHIRLPOOL 7c21bbc40c07898b0866e6d49d2310f804e77882854c75da49b71865c33fd43a15ecf1b8d718f42587b37bbf2defd849275a78657337c31ac2b8714cb9269193 AUX rstudio-server.service.in 161 SHA256 446649a73c0722950656ff858895f9d0eff98f4455082cdf0175ca11bb0d55a7 SHA512 bcf1f30e460dd5f0562b20489ca5544c6bcfbfb0ee1c636c4365df433e97e02e9e3b233e4159a0c71ad6d319f34f93c22b8fbf6b36463e29f22df2acd71da173 WHIRLPOOL 57c8156f37de4eb4b481ca93c63b455b85c7e192c6b2488b0568b6c82238f56277859e10ce1a1fb25aa06cd3c2d37dfc7f4704b802a59daedb8b9893e48c9c5e @@ -41,6 +42,7 @@ DIST rstudio-1.0.136.tar.gz 17786389 SHA256 bb6a8aa475e09dd090cd2b5ea505f578d270 DIST rstudio-1.0.143.tar.gz 17791067 SHA256 8ae88731b4474e5e2ff9030aa14e168903fe3a7ffc4fa716f497084a86801062 SHA512 46eaa88dd8332f18bb3a43de6e262d8a365860d9add78aea6a2d345784b239972c9c73bf0b56f1736b2981b8f688dbaf5a83c6848d170c0cf61d0e51dd636a82 WHIRLPOOL db1c11be240db3528e46d359c7d40d64068dfe5f7d915c4a6b690444f7f7fbc11f3898a6e262fa625bfab906f0cbfb2a8e3288a4fd20470423a99d992972fcda DIST rstudio-1.0.153.tar.gz 17790922 SHA256 79b90e21e56b114e28b03fd8543a208c55bb9d5f47a87fd29143d08b9a06f7a0 SHA512 d970a9bde88845e3fc6cdaff5233ffb65c03939c685c3fca0dd052246e065c7580b3f9bc4e053a79d2ecbb5f8c283d3fce7b97cc69e43176bd49587c736dab86 WHIRLPOOL c1f4c7bdc8e5a85af53411a35d736278b83f4732d2e273378fecc77cb075dff507147d56012682564edd58041c91cc051189eb38a7348d0827b76c7ac37bd54d DIST rstudio-1.0.44.tar.gz 17774065 SHA256 43ece6cfdd1a13ac0e17f2a50154a30a1a14ad6c1b3cf381cc6007988ce44a0f SHA512 a8b975dc517125a257e5f61db5bb137e133b02d738d55553770aa65e388cd112ce646b53b77dc069d1ca95ccd95979f4a57ad60b99fc3b91543cf61e737e8169 WHIRLPOOL 4ad472aed130451e81d8d8e3251d3bbd701a8b8e2fbddf17dc357f39335e33c75505f9443c2c7208e60a19c2767b9328134433e5d4fd22504813020712c658ef +DIST rstudio-1.1.368.tar.gz 20197144 SHA256 586573707a488b5f528680b932ba5f8ea6d07667cc5ae6426104e2abf5ddab75 SHA512 39cdf583d7dcd22338916cc0ea4f90681580e41663b2d3e04b2e650759c6b030c85ee111cdfe1f717f931932a9b7ca423a21585d69a785f056f754f6d50399a1 WHIRLPOOL e18ff21823638d458179819e0b0b234b80be2f095f5b7bf5b9ac0190b078f0d7acb51e8896cbfcf1ce33cd203ed4e9fbe097aac6eee62515cace1d2f08c08219 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 @@ -59,6 +61,7 @@ EBUILD rstudio-1.0.136.ebuild 8318 SHA256 0d5aa29e848b567bc13475a5e81d0dc198147d EBUILD rstudio-1.0.143.ebuild 8318 SHA256 0d5aa29e848b567bc13475a5e81d0dc198147dbdca5d05f2c7de6b577cf944cf SHA512 2e18400a80692509cf5381ea93c322245697e3ee9354aa50c0fb752b3332a5a6db25f0c5df51165202869795fc87a876abe2a370c1be32a41401ec7f911908de WHIRLPOOL b3f584ad5e38a433bd086712bfab22253496d6e1b12b2a2ec3bd8d3f33ed0d596b850118a95049254862047accda829c6b5b55705cb1b5101740301ea97b7cab EBUILD rstudio-1.0.153.ebuild 8318 SHA256 0d5aa29e848b567bc13475a5e81d0dc198147dbdca5d05f2c7de6b577cf944cf SHA512 2e18400a80692509cf5381ea93c322245697e3ee9354aa50c0fb752b3332a5a6db25f0c5df51165202869795fc87a876abe2a370c1be32a41401ec7f911908de WHIRLPOOL b3f584ad5e38a433bd086712bfab22253496d6e1b12b2a2ec3bd8d3f33ed0d596b850118a95049254862047accda829c6b5b55705cb1b5101740301ea97b7cab EBUILD rstudio-1.0.44.ebuild 8318 SHA256 0d5aa29e848b567bc13475a5e81d0dc198147dbdca5d05f2c7de6b577cf944cf SHA512 2e18400a80692509cf5381ea93c322245697e3ee9354aa50c0fb752b3332a5a6db25f0c5df51165202869795fc87a876abe2a370c1be32a41401ec7f911908de WHIRLPOOL b3f584ad5e38a433bd086712bfab22253496d6e1b12b2a2ec3bd8d3f33ed0d596b850118a95049254862047accda829c6b5b55705cb1b5101740301ea97b7cab +EBUILD rstudio-1.1.368.ebuild 8369 SHA256 82b1926a1ce7041537fbb2f0ecb707bf4db87476aced4349026845aa72426167 SHA512 3c282333f637fcbe4c3db1672e794037e570c8340c0af831461e711d55926dc4a509b89af709de0f0d554b5b354ea3cf94ea3bcc86cb09a3f0fa92e29557d017 WHIRLPOOL 9743b684844afe904c3be1cca10e10cd7cb284d11a79e63209d2bd2e8a29437fa7b317207cb8e3bf9b431f5fb5eb18db6263dd0cb3e56ced89bfcabc32a9ec4f MISC ChangeLog 8907 SHA256 459e4ab51e87acfac9f99eb1c080fe9f34ad5c9e57970b43e4c1cf58b7e62985 SHA512 73e5e23815cb427fb52411f57da406406b602190616ec9a02176aef0a8ce927a27f11d63ebc06fb5ebde1225997999200f1e662c9affa105f2e874cc23e257dd WHIRLPOOL 96c1c0e04217317cf7f662584bece57828f5dc5b39317e34559acd12133c0e87dedc018f2849f40c20ed341deb6652c86cd71658974697e4ba59ea4983903f29 MISC ChangeLog-2015 5297 SHA256 b7d149869d58c687ab524a33726c4f4df1163475ed6af648fd5eba8e88bc1910 SHA512 cb38d57dc56ec46860e738aa1cd5a8206cc1d74758181900b2cfe60c837160365fec38e68fedf071a16c2296499da7b438cb435487d192b0d52d81e20a7605f2 WHIRLPOOL b3d4cb4b14afeae885e1265bfdc1700061b583152a62db5c4e64add96f0e2e9e3dc3ad6f53397283c85b7eea9fecce589373d392f2f4f3ea94f73267439d3927 MISC metadata.xml 589 SHA256 9a4c84314097c0bbd3fcd933f22aea585936d114b700c65d5baef3171bb57dc9 SHA512 c2c0e93e8845248cf23b1c85d3373c6c79c5994e077c7ab4050f6460f7852c8ed154b53605acb4495e2b7b7416fddc475a83037511231efb14075b69f9a03b5f WHIRLPOOL bb6aec9bcdf862d61b5f19c7d74a1cf3b45538540825402d253237788b9b93578da51921aa231cdb1455e72f0065eb28d03fc3b4d6d5e98b3367d6f0f9cc04ab diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.357-clang-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-1.1.357-clang-pandoc.patch new file mode 100644 index 000000000000..28b0220912a0 --- /dev/null +++ b/sci-mathematics/rstudio/files/rstudio-1.1.357-clang-pandoc.patch @@ -0,0 +1,76 @@ +Index: rstudio-1.1.357/src/cpp/session/CMakeLists.txt +=================================================================== +--- rstudio-1.1.357.orig/src/cpp/session/CMakeLists.txt ++++ rstudio-1.1.357/src/cpp/session/CMakeLists.txt +@@ -25,9 +25,6 @@ endif() + 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 + +@@ -38,22 +35,6 @@ endif() + # message(FATAL_ERROR "rsconnect package not found (re-run install-dependencies script to install)") + # endif() + +-# verify libclang is installed +-if(WIN32) +- set(LIBCLANG_VERSION "3.4") +-else() +- set(LIBCLANG_VERSION "3.5") +-endif() +-set(LIBCLANG_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/${LIBCLANG_VERSION}") +-if(NOT EXISTS "${LIBCLANG_DIR}") +- message(FATAL_ERROR "libclang ${LIBCLANG_VERSION} not found (re-run install-dependencies script to install)") +-endif() +-set(LIBCLANG_HEADERS_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers") +-if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}") +- message(FATAL_ERROR "libclang builtin-headers not found (re-run install-dependencies script to install)") +-endif() +- +- + # include files + file(GLOB_RECURSE SESSION_HEADER_FILES "*.h*") + +@@ -465,13 +446,6 @@ if (NOT RSTUDIO_SESSION_WIN64) + install(DIRECTORY "resources/connections" + DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) + +- # install pandoc +- set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/1.19.2.1") +- 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} +@@ -502,24 +476,6 @@ if (NOT RSTUDIO_SESSION_WIN64) + install(DIRECTORY "resources/profiler" + DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) + +- # install libclang +- if(WIN32) +- file(GLOB LIBCLANG_32_FILES "${LIBCLANG_DIR}/x86/libclang.*") +- install(PROGRAMS ${LIBCLANG_32_FILES} +- DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86) +- file(GLOB LIBCLANG_64_FILES "${LIBCLANG_DIR}/x86_64/libclang.*") +- install(PROGRAMS ${LIBCLANG_64_FILES} +- DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64) +- else() +- file(GLOB_RECURSE LIBCLANG_FILES "${LIBCLANG_DIR}/libclang.*") +- install(PROGRAMS ${LIBCLANG_FILES} +- DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang) +- endif() +- +- # install libclang builtin-headers +- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers" +- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang") +- + # install winpty on windows + if(WIN32) + install(PROGRAMS "${WINPTY_BINDIR_32}/winpty.dll" diff --git a/sci-mathematics/rstudio/rstudio-1.1.368.ebuild b/sci-mathematics/rstudio/rstudio-1.1.368.ebuild new file mode 100644 index 000000000000..38ac6d8ddf2f --- /dev/null +++ b/sci-mathematics/rstudio/rstudio-1.1.368.ebuild @@ -0,0 +1,248 @@ +# 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() { + default + 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 ;} +} diff --git a/sci-mathematics/why3-for-spark/Manifest b/sci-mathematics/why3-for-spark/Manifest index e5c0b2a5e8ea..226a3ac30a8b 100644 --- a/sci-mathematics/why3-for-spark/Manifest +++ b/sci-mathematics/why3-for-spark/Manifest @@ -1,4 +1,4 @@ AUX why3-for-spark-2017-gentoo.patch 488 SHA256 7fe1764ad2502c9983023417e1645299ae9a141e683f2a2b6abdf9fe5920ee7f SHA512 53c31e57021e1f7f9ca3e74447be403f99bff8009634ef400b72c48a15458230f1007e26c4070e04e3bea732d596a68ea20717a413ea13282a518d2eb29c6215 WHIRLPOOL 8514135f362dd67512a19095bfc15fcee2f22e07c9e23a069f18a7bd9e4a4ff15218a8c5368a56a6cefedc3e40ef11051a07243c315f05105c8f083145663fb1 DIST why3-for-spark-gpl-2017-src.tar.gz 9248235 SHA256 7e7aee3912421847c416bc1f066ac342e811601c29d7b69e98e789a59a724d8e SHA512 8f444402f6c1744cd7c565117732935791b1ae7996a94314c40a66d125eae8a81f2257314246c94fd29d3cd16abcff6a50a152a1191a4aae39a2c8a8d7c3b9e1 WHIRLPOOL 256648567b3a220f762c7e30d0f90265fd10af21b66c3607b9072e81444b0a33dc971126232e11f3edc64eac2598fbd3ad428d063f2c9db8d247be2abe5be904 -EBUILD why3-for-spark-2017.ebuild 1536 SHA256 046ef9e20ce360ada8d848552391e6e304bc3faf10ad6ce0f16434e2b498b59e SHA512 2e8764f302313f5d4779e3a1ead43716ba0da210eaee8a176a983ba3e3fe085d33da032ec78ddbe6c959e147d33d777c6745d2f6691e98e595beafdf2d971f27 WHIRLPOOL 55718e4feeffa9f7c345258d2da626ea25c93ad825f222358fa5b09dbf22046e475bb637360a31c3e7a76fc8ec7e232e5acea25a4062149d3f5b7457d6dc603f -MISC metadata.xml 1301 SHA256 9a581657e60cdc997d5541d7361ad05353fd278160e3fdb78cb32660f18737c6 SHA512 390303b44331c039d301a143c151c01a9ac6ce2467bf9079b16ac169af4bf5b24e21326c7a01747e8156e661e88d489d440344aa5cfb166e66cd6687fc7b95fd WHIRLPOOL 7b0df2710e2ac8dad3dca0103cc1326d966e9343c6dd7bda0f5103c28615bdaa1a5b6f87399cd124bfdee5d6ff700e2fb8ad61d9c742eabae68a1b8d0da13c79 +EBUILD why3-for-spark-2017.ebuild 1633 SHA256 1d3767e35c285d3933cadd73f315de72abd9433bb63e3eda874d8def4177ae0f SHA512 7ddb95b779680f509f338ecf6bbef138c99294ccc203c18e5a813e008dc0ac38dddf5c622e00f6ed2d910ab716075a8e6244922cf701fd104ccaa6c4e4b799bd WHIRLPOOL 8ea4774e4a7d113f83e8ffecfb0985ca68b230d3fbbe6d53ebd012e625bfac3e4a0a3f9e47d123556048a1ae0ac02664916aa688a1f7d47d1bfcd366502fd5ed +MISC metadata.xml 1363 SHA256 013b66bd8ddb397a162291f83ed6744ea78521b89ed4014f67ad7f794aa2a3d5 SHA512 ee8323cc37fdea800e355fc14ba67cac66c3ec3c41528d481a7e938b1d3e23859bdddfb06d3b6653725cdcfcc0d07e66ba1d3cc80b3637a781db7bab5f7dc677 WHIRLPOOL f0804ec3311720be99db48f0839ee7269a4aba8ea6c07ea8abb69591c281fca7719b565694f47c43797debcafe65d19005674a1e53e13a8c9701257f50333bf8 diff --git a/sci-mathematics/why3-for-spark/metadata.xml b/sci-mathematics/why3-for-spark/metadata.xml index f73ffa40b698..dfc2bea31bd5 100644 --- a/sci-mathematics/why3-for-spark/metadata.xml +++ b/sci-mathematics/why3-for-spark/metadata.xml @@ -23,5 +23,6 @@ Enable hypothesis selection Enable profiling Use dev-ml/zarith + Enable compression of session files diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2017.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2017.ebuild index b69b22e506fc..c143320a492d 100644 --- a/sci-mathematics/why3-for-spark/why3-for-spark-2017.ebuild +++ b/sci-mathematics/why3-for-spark/why3-for-spark-2017.ebuild @@ -9,13 +9,13 @@ MYP=${PN}-gpl-${PV}-src DESCRIPTION="Platform for deductive program verification" HOMEPAGE="http://why3.lri.fr/" -SRC_URI="https//mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed055 +SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed055 -> ${MYP}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" -IUSE="coq doc emacs gtk html hypothesis-selection profiling zarith" +IUSE="coq doc emacs gtk html hypothesis-selection profiling zarith zip" DEPEND=">=dev-lang/ocaml-4.02.3 dev-ml/menhir @@ -25,7 +25,8 @@ DEPEND=">=dev-lang/ocaml-4.02.3 emacs? ( app-editors/emacs:* ) html? ( dev-tex/hevea ) hypothesis-selection? ( dev-ml/ocamlgraph ) - zarith? ( dev-ml/zarith )" + zarith? ( dev-ml/zarith ) + zip? ( dev-ml/camlzip )" RDEPEND="${DEPEND}" S="${WORKDIR}"/${MYP} @@ -48,7 +49,6 @@ src_configure() { --disable-coq-tactic \ --disable-pvs-libs \ --disable-isabelle-libs \ - --disable-zip \ $(use_enable coq coq-libs) \ $(use_enable doc) \ $(use_enable emacs emacs-compilation) \ @@ -56,7 +56,8 @@ src_configure() { $(use_enable html html-doc) \ $(use_enable hypothesis-selection) \ $(use_enable profiling) \ - $(use_enable zarith) + $(use_enable zarith) \ + $(use_enable zip) } src_compile() { @@ -67,6 +68,8 @@ src_compile() { src_install() { default emake DESTDIR="${D}" install_spark2014_dev + docompress -x /usr/share/doc/${PF}/examples + dodoc -r examples if use doc; then dodoc doc/manual.pdf use html && dodoc -r doc/html -- cgit v1.2.3