Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
Date: Sun, 03 Dec 2017 15:58:15
Message-Id: 1512316664.3fcb31051b785dc5e617e418073f07eedfcc8a1b.monsieurp@gentoo
1 commit: 3fcb31051b785dc5e617e418073f07eedfcc8a1b
2 Author: Bernd Waibel <waebbl <AT> gmail <DOT> com>
3 AuthorDate: Tue Nov 7 19:54:42 2017 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 3 15:57:44 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fcb3105
7
8 sci-mathematics/rstudio: version bump to 1.1.383
9
10 Ebuild is based on https://bugs.gentoo.org/attachment.cgi?id=494772
11 and the published rstudio-1.1.368.ebuild file.
12
13 files/rstudio-0.98.1091-boost-1.57.patch: removed from patches, it's no
14 longer possible to apply this patch, due to changes in
15 src/cpp/desktop/DesktopApplicationLaunch.hpp (see
16 https://github.com/rstudio/rstudio/commit/585f7244797814d969418d8fe795d1952d84f6df)
17 which added an #include <QProcess> statement which lets the patch fail.
18
19 Thanks to Bernd Feige <Bernd.Feige <AT> gmx.net> for the initial ebuild
20 and a17r on github for his suggestions on my first try to create a
21 PR for this.
22
23 Bug: https://bugs.gentoo.org/633936
24 Bug: https://bugs.gentoo.org/622254
25
26 Reported-by: Neil <nshephard <AT> gmail.com> (#633936)
27 Reported-by: Jonas Stein <jstein <AT> gentoo.org> (#622254)
28
29 Package Manager: portage-2.3.13 repoman-2.3.4
30 Closes: https://github.com/gentoo/gentoo/pull/6145
31
32 sci-mathematics/rstudio/Manifest | 1 +
33 sci-mathematics/rstudio/rstudio-1.1.383.ebuild | 247 +++++++++++++++++++++++++
34 2 files changed, 248 insertions(+)
35
36 diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
37 index 76c18739074..b86371e8947 100644
38 --- a/sci-mathematics/rstudio/Manifest
39 +++ b/sci-mathematics/rstudio/Manifest
40 @@ -6,6 +6,7 @@ DIST packrat-0.98.1000.tar.gz 97677 SHA256 c2da99ea6b62fd460f36b76f6c9b91865c428
41 DIST rmarkdown-0.98.1000.tar.gz 1423820 SHA256 56e9f964f805627f6d6face9bf09e6435be4cc48321447ad4041fee86d6f88b4 SHA512 df3540c24c87930fe55bff2ffe67c86c219800cb00ed72ba9451ecd0d0cad411548a78c1a04b9a2e301e853616dcb77e09129c4e48ade6f16d3f14b7ea7e4852 WHIRLPOOL 51098cd48a12a61da312fc1cc96927626db4a19cc069c88f615dd20abe40f52a7b1ac1325b52b1922110ffa76a7f255d9ff2a75cd05d3de01d1b96f0c8286790
42 DIST rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz 197051 SHA256 e1e3e1f799eb8be679be9a2ed5aad7e9ce6cd603e3cb43fdc242490f0c311113 SHA512 208dc349f4aa7613ecf94939aba60d22d3a06972344b526c9b6c951015571f5922927bca08db571a7b8a268e42609a4f558f01278c9685f6da2ffc66a1f95ade WHIRLPOOL 4e3d64de00a98190c435d76f12a401d30950fdc7590b6bcc886ae50d4771825d39f93ea2bdcb4a9db026361c522f16f11297ff89dcb15c35f9471c1abf4f4e2c
43 DIST rstudio-1.1.368.tar.gz 20197144 SHA256 586573707a488b5f528680b932ba5f8ea6d07667cc5ae6426104e2abf5ddab75 SHA512 39cdf583d7dcd22338916cc0ea4f90681580e41663b2d3e04b2e650759c6b030c85ee111cdfe1f717f931932a9b7ca423a21585d69a785f056f754f6d50399a1 WHIRLPOOL e18ff21823638d458179819e0b0b234b80be2f095f5b7bf5b9ac0190b078f0d7acb51e8896cbfcf1ce33cd203ed4e9fbe097aac6eee62515cace1d2f08c08219
44 +DIST rstudio-1.1.383.tar.gz 20196702 BLAKE2B 5164230a92618e4252269ad0016b200294d1e7fa502cc49aa694486cda098ee7ffc65e6c74a87d891d0532f5cc15d1552aa86d04047d07b4f275cbc4d2758647 SHA512 3f637f9bce2c1ad1a4ed3e74287da722190a4e12b0cace6ffcca271977d49dcecca9365f2064366aad94e87851593cab83fa9361e9a9222a9f67fe9451f31ed2
45 DIST selenium-java-2.37.0.zip 24625928 SHA256 0eebba65d8edb01c1f46e462907c58f5d6e1cb0ddf63660a9985c8432bdffbb7 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779 WHIRLPOOL eb6659aae26f3c78b6f998546b23d0636c9d00ed8a7f985db1463ac4bd483ccb3e643d84e2ca0f59e0636a8de79eb552ff1d68eb6f9c06907029f7552d8f7777
46 DIST selenium-server-standalone-2.37.0.jar 34730734 SHA256 97bc8c699037fb6e99ba7af570fb60dbb1b7ce30cde2448287a44ef65b13023e SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018 WHIRLPOOL 20640591534f31f24825a9ed139589b182e8b60d86541bf0be104d3cc0280983f6566bd0459f2253ac3875b48a2798b205bac8f815a119fff6db625ce9bbc29e
47 DIST shinyapps-0.98.1000.tar.gz 910095 SHA256 b95c512ae0a0fb4335878d9cfcf9073e2cb3ccfed73543abe27ea8878ed36d57 SHA512 3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c WHIRLPOOL ecc2bce78387cb42e9989163d8fca29220e66f085acde3323417058aebb624dafa8c0e1873c7d79e67324cbd5aad250ef9fcdbbc8f659d64482233b95d898a15
48
49 diff --git a/sci-mathematics/rstudio/rstudio-1.1.383.ebuild b/sci-mathematics/rstudio/rstudio-1.1.383.ebuild
50 new file mode 100644
51 index 00000000000..7b4808efd4e
52 --- /dev/null
53 +++ b/sci-mathematics/rstudio/rstudio-1.1.383.ebuild
54 @@ -0,0 +1,247 @@
55 +# Copyright 1999-2017 Gentoo Foundation
56 +# Distributed under the terms of the GNU General Public License v2
57 +
58 +EAPI=6
59 +
60 +inherit eutils user cmake-utils gnome2-utils pam versionator xdg-utils java-pkg-2 pax-utils qmake-utils
61 +
62 +# TODO
63 +# * package gin and gwt
64 +# * use dict from tree, linguas
65 +# * do src_test (use junit from tree?)
66 +
67 +# update from scripts in dependencies/common
68 +# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
69 +GWT_VER=2.7.0
70 +GIN_VER=1.5
71 +SELENIUM_VER=2.37.0
72 +CHROMEDRIVER_VER=2.7
73 +# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc
74 +PANDOC_VER=1.13.1
75 +# ls dependencies/common/*.tar.gz
76 +PACKRAT_VER=0.98.1000
77 +RMARKDOWN_VER=0.98.1000
78 +SHINYAPPS_VER=0.98.1000
79 +RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
80 +
81 +DESCRIPTION="IDE for the R language"
82 +HOMEPAGE="
83 + http://www.rstudio.org
84 + https://github.com/rstudio/rstudio/"
85 +SRC_URI="
86 + https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
87 + https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
88 + https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
89 + https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
90 + https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
91 + https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
92 + https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
93 + https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
94 + https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
95 + https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
96 + https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
97 +"
98 +
99 +LICENSE="AGPL-3"
100 +SLOT="0"
101 +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
102 +IUSE="dedicated server"
103 +
104 +QT_VER=5.4
105 +QT_SLOT=5
106 +RDEPEND="
107 + app-text/pandoc
108 + dev-haskell/pandoc-citeproc
109 + >=dev-lang/R-2.11.1
110 + >=dev-libs/boost-1.63:=
111 + >=dev-libs/mathjax-2.7.0
112 + dev-libs/openssl:0
113 + sys-apps/util-linux
114 + >=sys-devel/clang-3.5.0:*
115 + sys-libs/zlib
116 + >=virtual/jre-1.8:=
117 + x11-libs/pango
118 + !dedicated? (
119 + >=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
120 + >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
121 + >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
122 + >=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
123 + >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
124 + >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
125 + >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
126 + >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
127 + >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5]
128 + >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
129 + >=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
130 + >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
131 + >=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT}
132 + >=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT}
133 + >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
134 + >=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
135 + >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
136 + server? ( virtual/pam )
137 + )
138 + dedicated? ( virtual/pam )"
139 +DEPEND="${RDEPEND}
140 + app-arch/unzip
141 + dev-java/ant-core
142 + >=virtual/jdk-1.8:=
143 + virtual/pkgconfig"
144 +# test? ( dev-java/junit:4 )
145 +
146 +PATCHES=(
147 + "${FILESDIR}/${PN}-0.99.879-prefs.patch"
148 + "${FILESDIR}/${PN}-1.0.44-paths.patch"
149 + "${FILESDIR}/${PN}-1.1.357-clang-pandoc.patch"
150 + "${FILESDIR}/${PN}-0.98.490-linker_flags.patch"
151 + "${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch"
152 + "${FILESDIR}/${PN}-1.0.44-systemd.patch"
153 +)
154 +
155 +src_unpack() {
156 + unpack ${P}.tar.gz gwt-${GWT_VER}.zip
157 + cd "${S}" || die
158 + mkdir -p src/gwt/lib/{gin,gwt} \
159 + dependencies/common/dictionaries \
160 + src/gwt/lib/selenium/${SELENIUM_VER} \
161 + src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
162 + mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
163 + unzip -qd src/gwt/lib/gin/${GIN_VER} \
164 + "${DISTDIR}"/gin-${GIN_VER}.zip || die
165 + unzip -qd dependencies/common/dictionaries \
166 + "${DISTDIR}"/core-dictionaries.zip || die
167 + unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
168 + "${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
169 + cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
170 + src/gwt/lib/selenium/${SELENIUM_VER}/ || die
171 + cp "${DISTDIR}"/chromedriver-linux \
172 + src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die
173 + cd dependencies/common || die
174 + unpack packrat-${PACKRAT_VER}.tar.gz
175 + unpack rmarkdown-${RMARKDOWN_VER}.tar.gz
176 + unpack shinyapps-${SHINYAPPS_VER}.tar.gz
177 + unpack rsconnect_${RSCONNECT_VER}.tar.gz
178 + cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
179 + . || die
180 + cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
181 + . || die
182 + cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
183 + . || die
184 + cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \
185 + . || die
186 +}
187 +
188 +src_prepare() {
189 + default
190 + java-pkg-2_src_prepare
191 + egit_clean
192 +
193 + # Enable CMake to install our .service file for systemd usage
194 + mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
195 + cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
196 +
197 + # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using
198 + # this sed hack for now. ~RMH
199 + sed -i \
200 + -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \
201 + src/cpp/server/ServerOptions.cpp \
202 + src/cpp/session/SessionOptions.cpp || die
203 +
204 + # use mathjax from system
205 + ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die
206 +
207 + # make sure icons and mime stuff are with prefix
208 + sed -i \
209 + -e "s:/usr:${EPREFIX}/usr:g" \
210 + CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
211 +
212 + # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
213 + sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
214 + -i src/cpp/server/ServerOptions.cpp \
215 + || die
216 +
217 + # Set the rsession.conf file location for Gentoo prefix
218 + sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
219 + -i src/cpp/session/SessionOptions.cpp \
220 + || die
221 +
222 + # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
223 + # It provides a library that has its version number appended to the end,
224 + # which is difficult to handle in cmake, as find_library does not support
225 + # searching for wildcard library names. So I find the library name from the
226 + # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
227 + rm -rf "${S}"/src/cpp/desktop/3rdparty || die
228 + local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
229 + $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
230 + | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
231 + -e 's@LIBS \*= -l@@')
232 + sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
233 + -i "${S}"/src/cpp/desktop/CMakeLists.txt \
234 + || die
235 +
236 + # The git commit for tag: git rev-list -n 1 v0.99.903
237 + sed -e 's@git ARGS rev-parse HEAD@echo ARGS 0eb2d8ea28ebc1ac6ac327e023becb6133b679c4@'\
238 + -i "${S}"/CMakeLists.txt \
239 + "${S}"/CMakeGlobals.txt \
240 + || die
241 +}
242 +
243 +src_configure() {
244 + export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1)
245 + export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2)
246 + export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3)
247 +
248 + local mycmakeargs=(
249 + -DDISTRO_SHARE=share/${PN}
250 + -DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
251 + -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
252 + -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
253 + -DRSTUDIO_VERIFY_R_VERSION=FALSE
254 + )
255 +
256 + cmake-utils_src_configure
257 +}
258 +
259 +src_compile() {
260 + # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
261 + # P: /root/.oracle_jre_usage.
262 + export ANT_OPTS="-Duser.home=${T}"
263 + cmake-utils_src_compile
264 +}
265 +
266 +src_install() {
267 + export ANT_OPTS="-Duser.home=${T}"
268 + cmake-utils_src_install
269 + pax-mark m "${ED}usr/bin/rstudio"
270 + doconfd "${FILESDIR}"/rstudio-server.conf
271 + dodir /etc/rstudio
272 + insinto /etc/rstudio
273 + doins "${FILESDIR}"/rsession.conf
274 + dosym "${ROOT}etc/conf.d/rstudio-server.conf" "${ROOT}etc/rstudio/rserver.conf"
275 + if use dedicated || use server; then
276 + dopamd src/cpp/server/extras/pam/rstudio
277 + newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
278 + fi
279 +}
280 +
281 +pkg_preinst() {
282 + use dedicated || gnome2_icon_savelist
283 + java-pkg-2_pkg_preinst
284 +}
285 +
286 +pkg_postinst() {
287 + use dedicated || { xdg_desktop_database_update
288 + xdg_mimeinfo_database_update
289 + gnome2_icon_cache_update ;}
290 +
291 + if use dedicated || use server; then
292 + enewgroup rstudio-server
293 + enewuser rstudio-server -1 -1 -1 rstudio-server
294 + fi
295 +}
296 +
297 +pkg_postrm() {
298 + use dedicated || { xdg_desktop_database_update
299 + xdg_mimeinfo_database_update
300 + gnome2_icon_cache_update ;}
301 +}