Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Julian Ospald (hasufell)" <hasufell@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-mathematics/rstudio: rstudio-0.98.932.ebuild ChangeLog
Date: Fri, 04 Jul 2014 13:53:27
Message-Id: 20140704135322.8A8902004E@flycatcher.gentoo.org
1 hasufell 14/07/04 13:53:22
2
3 Modified: ChangeLog
4 Added: rstudio-0.98.932.ebuild
5 Log:
6 version bump wrt #513862
7
8 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020)
9
10 Revision Changes Path
11 1.10 sci-mathematics/rstudio/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/ChangeLog?rev=1.10&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/ChangeLog?rev=1.10&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/ChangeLog?r1=1.9&r2=1.10
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/ChangeLog,v
20 retrieving revision 1.9
21 retrieving revision 1.10
22 diff -u -r1.9 -r1.10
23 --- ChangeLog 23 Dec 2013 21:33:01 -0000 1.9
24 +++ ChangeLog 4 Jul 2014 13:53:22 -0000 1.10
25 @@ -1,6 +1,12 @@
26 # ChangeLog for sci-mathematics/rstudio
27 -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/ChangeLog,v 1.9 2013/12/23 21:33:01 hasufell Exp $
29 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
30 +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/ChangeLog,v 1.10 2014/07/04 13:53:22 hasufell Exp $
31 +
32 +*rstudio-0.98.932 (04 Jul 2014)
33 +
34 + 04 Jul 2014; Julian Ospald <hasufell@g.o> +rstudio-0.98.932.ebuild,
35 + +files/rstudio-0.98.932-pandoc.patch, +files/rstudio-0.98.932-paths.patch:
36 + version bump wrt #513862
37
38 23 Dec 2013; Julian Ospald <hasufell@g.o> rstudio-0.98.490.ebuild:
39 fix build with +server wrt #494362
40
41
42
43 1.1 sci-mathematics/rstudio/rstudio-0.98.932.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.932.ebuild?rev=1.1&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.932.ebuild?rev=1.1&content-type=text/plain
47
48 Index: rstudio-0.98.932.ebuild
49 ===================================================================
50 # Copyright 1999-2014 Gentoo Foundation
51 # Distributed under the terms of the GNU General Public License v2
52 # $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.932.ebuild,v 1.1 2014/07/04 13:53:22 hasufell Exp $
53
54 EAPI=5
55
56 inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2
57
58 # TODO
59 # * package gin and gwt
60 # * use dict from tree, linguas
61 # * do src_test (use junit from tree?)
62
63 GWTVER=2.6.0
64 GINVER=1.5
65 SELENIUMVER=2.37.0
66 CHROMEDRIVER_VER=2.7
67 PANDOC_VER=1.12.3
68 PACKRAT_VER=0.3.0
69 RMARKDOWN_VER=0.2.49
70
71 DESCRIPTION="IDE for the R language"
72 HOMEPAGE="http://www.rstudio.org"
73 SRC_URI="https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
74 https://s3.amazonaws.com/rstudio-buildtools/gin-${GINVER}.zip
75 https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWTVER}.zip
76 https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUMVER}.zip
77 https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUMVER}.jar
78 https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
79 https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
80 http://dev.gentoo.org/~hasufell/distfiles/packrat_${PACKRAT_VER}.tar.gz
81 http://dev.gentoo.org/~hasufell/distfiles/rmarkdown_${RMARKDOWN_VER}.tar.gz"
82
83 LICENSE="AGPL-3"
84 SLOT="0"
85 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
86 IUSE="dedicated server"
87
88 QTVER=4.8
89 QTSLOT=4
90 RDEPEND="
91 app-text/pandoc
92 dev-haskell/pandoc-citeproc
93 >=dev-lang/R-2.11.1
94 >=dev-libs/boost-1.50
95 dev-libs/mathjax
96 dev-libs/openssl
97 sys-libs/zlib
98 >=virtual/jre-1.5
99 x11-libs/pango
100 !dedicated? (
101 >=dev-qt/qtcore-${QTVER}:${QTSLOT}
102 >=dev-qt/qtdbus-${QTVER}:${QTSLOT}
103 >=dev-qt/qtgui-${QTVER}:${QTSLOT}
104 >=dev-qt/qtwebkit-${QTVER}:${QTSLOT}
105 >=dev-qt/qtxmlpatterns-${QTVER}:${QTSLOT}
106 server? ( virtual/pam )
107 )
108 dedicated? ( virtual/pam )"
109 DEPEND="${RDEPEND}
110 app-arch/unzip
111 dev-java/ant-core
112 >=virtual/jdk-1.5
113 virtual/pkgconfig"
114 # test? ( dev-java/junit:4 )
115
116 src_unpack() {
117 unpack ${P}.tar.gz gwt-${GWTVER}.zip
118 cd "${S}" || die
119 mkdir -p src/gwt/lib/{gin,gwt} \
120 dependencies/common/dictionaries \
121 src/gwt/lib/selenium/${SELENIUMVER} \
122 src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
123 mv ../gwt-${GWTVER} src/gwt/lib/gwt/${GWTVER} || die
124 unzip -qd src/gwt/lib/gin/${GINVER} \
125 "${DISTDIR}"/gin-${GINVER}.zip || die
126 unzip -qd dependencies/common/dictionaries \
127 "${DISTDIR}"/core-dictionaries.zip || die
128 unzip -qd src/gwt/lib/selenium/${SELENIUMVER} \
129 "${DISTDIR}"/selenium-java-${SELENIUMVER}.zip || die
130 cp "${DISTDIR}"/selenium-server-standalone-${SELENIUMVER}.jar \
131 src/gwt/lib/selenium/${SELENIUMVER}/ || die
132 cp "${DISTDIR}"/chromedriver-linux \
133 src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die
134 cd dependencies/common || die
135 unpack packrat_${PACKRAT_VER}.tar.gz
136 unpack rmarkdown_${RMARKDOWN_VER}.tar.gz
137 cp "${DISTDIR}"/rmarkdown_${RMARKDOWN_VER}.tar.gz \
138 . || die
139 cp "${DISTDIR}"/packrat_${PACKRAT_VER}.tar.gz \
140 . || die
141 }
142
143 src_prepare() {
144 java-pkg-2_src_prepare
145
146 find . -name .gitignore -delete || die
147
148 epatch "${FILESDIR}"/${PN}-0.98.490-prefs.patch \
149 "${FILESDIR}"/${P}-paths.patch \
150 "${FILESDIR}"/${P}-pandoc.patch \
151 "${FILESDIR}"/${PN}-0.98.490-linker_flags.patch
152
153 # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using
154 # this sed hack for now. ~RMH
155 sed -i \
156 -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \
157 src/cpp/server/ServerOptions.cpp \
158 src/cpp/session/SessionOptions.cpp || die
159
160 # use mathjax from system
161 ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax || die
162
163 # make sure icons and mime stuff are with prefix
164 sed -i \
165 -e "s:/usr:${EPREFIX}/usr:g" \
166 CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
167 }
168
169 src_configure() {
170 export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1)
171 export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2)
172 export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3)
173
174 local mycmakeargs=(
175 -DDISTRO_SHARE=share/${PN}
176 $(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP)
177 -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
178 )
179
180 cmake-utils_src_configure
181 }
182
183 src_compile() {
184 cmake-utils_src_compile
185 }
186
187 src_install() {
188 cmake-utils_src_install
189 if use dedicated || use server; then
190 dopamd src/cpp/server/extras/pam/rstudio
191 newinitd "${FILESDIR}"/rstudio-rserver.initd rstudio-rserver
192 fi
193 }
194
195 pkg_preinst() {
196 use dedicated || gnome2_icon_savelist
197 java-pkg-2_pkg_preinst
198 }
199
200 pkg_postinst() {
201 use dedicated || { fdo-mime_desktop_database_update
202 fdo-mime_mime_database_update
203 gnome2_icon_cache_update ;}
204
205 if use dedicated || use server; then
206 enewgroup rstudio-server
207 enewuser rstudio-server -1 -1 -1 rstudio-server
208 fi
209 }
210
211 pkg_postrm() {
212 use dedicated || { fdo-mime_desktop_database_update
213 fdo-mime_mime_database_update
214 gnome2_icon_cache_update ;}
215 }
Report Message
Find on MARC Find on Google Groups