Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/, sci-mathematics/rstudio/files/
Date: Thu, 03 May 2018 11:48:58
Message-Id: 1525348122.501d7bfb446a299cd64c67eec0ba789e79004ac9.asturm@gentoo
1 commit: 501d7bfb446a299cd64c67eec0ba789e79004ac9
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 3 11:48:42 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu May 3 11:48:42 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=501d7bfb
7
8 sci-mathematics/rstudio: Drop old
9
10 Package-Manager: Portage-2.3.33, Repoman-2.3.9
11
12 sci-mathematics/rstudio/Manifest | 1 -
13 .../files/rstudio-0.98.1091-boost-1.57.patch | 60 -----
14 sci-mathematics/rstudio/rstudio-1.1.368.ebuild | 248 ---------------------
15 3 files changed, 309 deletions(-)
16
17 diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
18 index 41930c74cdf..68418950fa6 100644
19 --- a/sci-mathematics/rstudio/Manifest
20 +++ b/sci-mathematics/rstudio/Manifest
21 @@ -5,7 +5,6 @@ DIST gwt-2.7.0.zip 108818328 BLAKE2B 9af969f3f2577be041fcfb58f228fab4b5479fa0da5
22 DIST packrat-0.98.1000.tar.gz 97677 BLAKE2B 282fe33dc5ba366ceea05a222ae2d018bc3ad8f35fad73c585a3d4901c3287e6902277a9c7ca087854f3944bd85ff1b1d1f02869ece686b10f946e2f1cb1296c SHA512 2290c768ecf27a037e73c3f8336b9fd71c68ff19d071b4a8fbc469550d29007cacacdb75f854f73b5db2139a5104f129b85a3612e2ee47bd6118ee13f7d103a6
23 DIST rmarkdown-0.98.1000.tar.gz 1423820 BLAKE2B eac8c9cf438c9b44ddfe954602dd67a83764b0c988b3ba571877c986b0d5d237059ed6643a86bb404428857ec8c346bfecd12f7cd15cde301cb0ce331f842b7f SHA512 df3540c24c87930fe55bff2ffe67c86c219800cb00ed72ba9451ecd0d0cad411548a78c1a04b9a2e301e853616dcb77e09129c4e48ade6f16d3f14b7ea7e4852
24 DIST rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz 197051 BLAKE2B 1f3f9fe71d7b50ab5108dfdbd3cc0b882bcc935ee58e8a9145b07a18bb86c39bc45e321a13add24df99492bc30548df716775c339bcbf4efc2bfe158299ae55a SHA512 208dc349f4aa7613ecf94939aba60d22d3a06972344b526c9b6c951015571f5922927bca08db571a7b8a268e42609a4f558f01278c9685f6da2ffc66a1f95ade
25 -DIST rstudio-1.1.368.tar.gz 20197144 BLAKE2B c97a86faa28b40552539eebc4faeec8a4199df6972efc2b112a2af08e47982e41b7cd92a6f06d14411dd67c21efa632ab017d99d28c1521f90b6075ed0232ce0 SHA512 39cdf583d7dcd22338916cc0ea4f90681580e41663b2d3e04b2e650759c6b030c85ee111cdfe1f717f931932a9b7ca423a21585d69a785f056f754f6d50399a1
26 DIST rstudio-1.1.383.tar.gz 20196702 BLAKE2B 5164230a92618e4252269ad0016b200294d1e7fa502cc49aa694486cda098ee7ffc65e6c74a87d891d0532f5cc15d1552aa86d04047d07b4f275cbc4d2758647 SHA512 3f637f9bce2c1ad1a4ed3e74287da722190a4e12b0cace6ffcca271977d49dcecca9365f2064366aad94e87851593cab83fa9361e9a9222a9f67fe9451f31ed2
27 DIST selenium-java-2.37.0.zip 24625928 BLAKE2B b369a805ae96f0d0913c4be42888d9c2a1e213ff982f9daefe73fadb705baa80ab0186ab50ed52609e83697cffaf8d617d06d75405cb8e1c3fe8e7c5b81dba25 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779
28 DIST selenium-server-standalone-2.37.0.jar 34730734 BLAKE2B 3899b1d4c5f9153c1f9f13bec66f7c1456ea2e0f34db7d8e54a1ce9063c33a05b3cf95216c2ae06bb40504f72f343a4b9ba6c8553fbbc340e7c18a5b612dde5c SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018
29
30 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
31 deleted file mode 100644
32 index 3a157183c22..00000000000
33 --- a/sci-mathematics/rstudio/files/rstudio-0.98.1091-boost-1.57.patch
34 +++ /dev/null
35 @@ -1,60 +0,0 @@
36 ---- rstudio-0.98.1091-orig/src/cpp/desktop/DesktopApplicationLaunch.hpp 2014-11-06 23:15:47.000000000 +1100
37 -+++ rstudio-0.98.1091/src/cpp/desktop/DesktopApplicationLaunch.hpp 2015-02-28 14:01:51.970672316 +1100
38 -@@ -19,7 +19,10 @@
39 - #include <QObject>
40 - #include <QWidget>
41 - #include <QApplication>
42 -+// see https://bugreports.qt-project.org/browse/QTBUG-22829
43 -+#ifndef Q_MOC_RUN
44 - #include <boost/scoped_ptr.hpp>
45 -+#endif
46 -
47 - namespace desktop {
48 -
49 ---- rstudio-0.98.1091-orig/src/cpp/desktop/DesktopSessionLauncher.hpp 2014-11-06 23:15:47.000000000 +1100
50 -+++ rstudio-0.98.1091/src/cpp/desktop/DesktopSessionLauncher.hpp 2015-02-28 14:01:51.972672316 +1100
51 -@@ -18,7 +18,10 @@
52 -
53 - #include <string>
54 -
55 -+// see https://bugreports.qt-project.org/browse/QTBUG-22829
56 -+#ifndef Q_MOC_RUN
57 - #include <boost/utility.hpp>
58 -+#endif
59 -
60 - #include <core/Error.hpp>
61 - #include <core/FilePath.hpp>
62 ---- rstudio-0.98.1091-orig/src/cpp/core/include/core/FilePath.hpp 2014-11-06 23:15:47.000000000 +1100
63 -+++ rstudio-0.98.1091/src/cpp/core/include/core/FilePath.hpp 2015-02-28 14:01:51.984672314 +1100
64 -@@ -23,11 +23,14 @@
65 - #include <vector>
66 - #include <iosfwd>
67 -
68 -+// see https://bugreports.qt-project.org/browse/QTBUG-22829
69 -+#ifndef Q_MOC_RUN
70 - #include <boost/shared_ptr.hpp>
71 - #include <boost/scoped_ptr.hpp>
72 - #include <boost/function.hpp>
73 -
74 - #include <boost/utility.hpp>
75 -+#endif
76 -
77 - #include <core/Error.hpp>
78 - #include <core/Log.hpp>
79 ---- rstudio-0.98.1091-orig/src/cpp/core/include/core/Error.hpp 2014-11-06 23:15:47.000000000 +1100
80 -+++ rstudio-0.98.1091/src/cpp/core/include/core/Error.hpp 2015-02-28 14:01:51.977672315 +1100
81 -@@ -20,11 +20,14 @@
82 - #include <string>
83 - #include <vector>
84 -
85 -+// see https://bugreports.qt-project.org/browse/QTBUG-22829
86 -+#ifndef Q_MOC_RUN
87 - #include <boost/shared_ptr.hpp>
88 -
89 - #include <boost/system/error_code.hpp>
90 -
91 - #include <boost/current_function.hpp>
92 -+#endif
93 -
94 - namespace core {
95 -
96
97 diff --git a/sci-mathematics/rstudio/rstudio-1.1.368.ebuild b/sci-mathematics/rstudio/rstudio-1.1.368.ebuild
98 deleted file mode 100644
99 index 221887f8aa3..00000000000
100 --- a/sci-mathematics/rstudio/rstudio-1.1.368.ebuild
101 +++ /dev/null
102 @@ -1,248 +0,0 @@
103 -# Copyright 1999-2017 Gentoo Foundation
104 -# Distributed under the terms of the GNU General Public License v2
105 -
106 -EAPI=6
107 -
108 -inherit eutils user cmake-utils gnome2-utils pam versionator xdg-utils java-pkg-2 pax-utils qmake-utils
109 -
110 -# TODO
111 -# * package gin and gwt
112 -# * use dict from tree, linguas
113 -# * do src_test (use junit from tree?)
114 -
115 -# update from scripts in dependencies/common
116 -# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
117 -GWT_VER=2.7.0
118 -GIN_VER=1.5
119 -SELENIUM_VER=2.37.0
120 -CHROMEDRIVER_VER=2.7
121 -# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc
122 -PANDOC_VER=1.13.1
123 -# ls dependencies/common/*.tar.gz
124 -PACKRAT_VER=0.98.1000
125 -RMARKDOWN_VER=0.98.1000
126 -SHINYAPPS_VER=0.98.1000
127 -RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
128 -
129 -DESCRIPTION="IDE for the R language"
130 -HOMEPAGE="
131 - http://www.rstudio.org
132 - https://github.com/rstudio/rstudio/"
133 -SRC_URI="
134 - https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
135 - https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
136 - https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
137 - https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
138 - https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
139 - https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
140 - https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
141 - https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
142 - https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
143 - https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
144 - https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
145 -"
146 -
147 -LICENSE="AGPL-3"
148 -SLOT="0"
149 -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
150 -IUSE="dedicated server"
151 -
152 -QT_VER=5.4
153 -QT_SLOT=5
154 -RDEPEND="
155 - app-text/pandoc
156 - dev-haskell/pandoc-citeproc
157 - >=dev-lang/R-2.11.1
158 - >=dev-libs/boost-1.63:=
159 - >=dev-libs/mathjax-2.7.0
160 - dev-libs/openssl:0
161 - sys-apps/util-linux
162 - >=sys-devel/clang-3.5.0:*
163 - sys-libs/zlib
164 - >=virtual/jre-1.8:=
165 - x11-libs/pango
166 - !dedicated? (
167 - >=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
168 - >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
169 - >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
170 - >=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
171 - >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
172 - >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
173 - >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
174 - >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
175 - >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5]
176 - >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
177 - >=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
178 - >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
179 - >=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT}
180 - >=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT}
181 - >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
182 - >=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
183 - >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
184 - server? ( virtual/pam )
185 - )
186 - dedicated? ( virtual/pam )"
187 -DEPEND="${RDEPEND}
188 - app-arch/unzip
189 - dev-java/ant-core
190 - >=virtual/jdk-1.8:=
191 - virtual/pkgconfig"
192 -# test? ( dev-java/junit:4 )
193 -
194 -PATCHES=(
195 - "${FILESDIR}/${PN}-0.99.879-prefs.patch"
196 - "${FILESDIR}/${PN}-1.0.44-paths.patch"
197 - "${FILESDIR}/${PN}-1.1.357-clang-pandoc.patch"
198 - "${FILESDIR}/${PN}-0.98.490-linker_flags.patch"
199 - "${FILESDIR}/${PN}-0.98.1091-boost-1.57.patch"
200 - "${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch"
201 - "${FILESDIR}/${PN}-1.0.44-systemd.patch"
202 -)
203 -
204 -src_unpack() {
205 - unpack ${P}.tar.gz gwt-${GWT_VER}.zip
206 - cd "${S}" || die
207 - mkdir -p src/gwt/lib/{gin,gwt} \
208 - dependencies/common/dictionaries \
209 - src/gwt/lib/selenium/${SELENIUM_VER} \
210 - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
211 - mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
212 - unzip -qd src/gwt/lib/gin/${GIN_VER} \
213 - "${DISTDIR}"/gin-${GIN_VER}.zip || die
214 - unzip -qd dependencies/common/dictionaries \
215 - "${DISTDIR}"/core-dictionaries.zip || die
216 - unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
217 - "${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
218 - cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
219 - src/gwt/lib/selenium/${SELENIUM_VER}/ || die
220 - cp "${DISTDIR}"/chromedriver-linux \
221 - src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die
222 - cd dependencies/common || die
223 - unpack packrat-${PACKRAT_VER}.tar.gz
224 - unpack rmarkdown-${RMARKDOWN_VER}.tar.gz
225 - unpack shinyapps-${SHINYAPPS_VER}.tar.gz
226 - unpack rsconnect_${RSCONNECT_VER}.tar.gz
227 - cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
228 - . || die
229 - cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
230 - . || die
231 - cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
232 - . || die
233 - cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \
234 - . || die
235 -}
236 -
237 -src_prepare() {
238 - cmake-utils_src_prepare
239 - java-pkg-2_src_prepare
240 - egit_clean
241 -
242 - # Enable CMake to install our .service file for systemd usage
243 - mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
244 - cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
245 -
246 - # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using
247 - # this sed hack for now. ~RMH
248 - sed -i \
249 - -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \
250 - src/cpp/server/ServerOptions.cpp \
251 - src/cpp/session/SessionOptions.cpp || die
252 -
253 - # use mathjax from system
254 - ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die
255 -
256 - # make sure icons and mime stuff are with prefix
257 - sed -i \
258 - -e "s:/usr:${EPREFIX}/usr:g" \
259 - CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
260 -
261 - # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
262 - sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
263 - -i src/cpp/server/ServerOptions.cpp \
264 - || die
265 -
266 - # Set the rsession.conf file location for Gentoo prefix
267 - sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
268 - -i src/cpp/session/SessionOptions.cpp \
269 - || die
270 -
271 - # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
272 - # It provides a library that has its version number appended to the end,
273 - # which is difficult to handle in cmake, as find_library does not support
274 - # searching for wildcard library names. So I find the library name from the
275 - # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
276 - rm -rf "${S}"/src/cpp/desktop/3rdparty || die
277 - local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
278 - $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
279 - | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
280 - -e 's@LIBS \*= -l@@')
281 - sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
282 - -i "${S}"/src/cpp/desktop/CMakeLists.txt \
283 - || die
284 -
285 - # The git commit for tag: git rev-list -n 1 v0.99.903
286 - sed -e 's@git ARGS rev-parse HEAD@echo ARGS 0eb2d8ea28ebc1ac6ac327e023becb6133b679c4@'\
287 - -i "${S}"/CMakeLists.txt \
288 - "${S}"/CMakeGlobals.txt \
289 - || die
290 -}
291 -
292 -src_configure() {
293 - export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1)
294 - export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2)
295 - export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3)
296 -
297 - local mycmakeargs=(
298 - -DDISTRO_SHARE=share/${PN}
299 - -DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
300 - -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
301 - -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
302 - -DRSTUDIO_VERIFY_R_VERSION=FALSE
303 - )
304 -
305 - cmake-utils_src_configure
306 -}
307 -
308 -src_compile() {
309 - # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
310 - # P: /root/.oracle_jre_usage.
311 - export ANT_OPTS="-Duser.home=${T}"
312 - cmake-utils_src_compile
313 -}
314 -
315 -src_install() {
316 - export ANT_OPTS="-Duser.home=${T}"
317 - cmake-utils_src_install
318 - pax-mark m "${ED}usr/bin/rstudio"
319 - doconfd "${FILESDIR}"/rstudio-server.conf
320 - dodir /etc/rstudio
321 - insinto /etc/rstudio
322 - doins "${FILESDIR}"/rsession.conf
323 - dosym "${ROOT}etc/conf.d/rstudio-server.conf" "${ROOT}etc/rstudio/rserver.conf"
324 - if use dedicated || use server; then
325 - dopamd src/cpp/server/extras/pam/rstudio
326 - newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
327 - fi
328 -}
329 -
330 -pkg_preinst() {
331 - use dedicated || gnome2_icon_savelist
332 - java-pkg-2_pkg_preinst
333 -}
334 -
335 -pkg_postinst() {
336 - use dedicated || { xdg_desktop_database_update
337 - xdg_mimeinfo_database_update
338 - gnome2_icon_cache_update ;}
339 -
340 - if use dedicated || use server; then
341 - enewgroup rstudio-server
342 - enewuser rstudio-server -1 -1 -1 rstudio-server
343 - fi
344 -}
345 -
346 -pkg_postrm() {
347 - use dedicated || { xdg_desktop_database_update
348 - xdg_mimeinfo_database_update
349 - gnome2_icon_cache_update ;}
350 -}