hasufell 14/07/04 13:53:22 Modified: ChangeLog Added: rstudio-0.98.932.ebuild Log: version bump wrt #513862 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020)
Revision Changes Path 1.10 sci-mathematics/rstudio/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/ChangeLog?rev=1.10&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/ChangeLog?rev=1.10&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/ChangeLog?r1=1.9&r2=1.10 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/ChangeLog,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ChangeLog 23 Dec 2013 21:33:01 -0000 1.9 +++ ChangeLog 4 Jul 2014 13:53:22 -0000 1.10 @@ -1,6 +1,12 @@ # ChangeLog for sci-mathematics/rstudio -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/ChangeLog,v 1.9 2013/12/23 21:33:01 hasufell Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/ChangeLog,v 1.10 2014/07/04 13:53:22 hasufell Exp $ + +*rstudio-0.98.932 (04 Jul 2014) + + 04 Jul 2014; Julian Ospald <[email protected]> +rstudio-0.98.932.ebuild, + +files/rstudio-0.98.932-pandoc.patch, +files/rstudio-0.98.932-paths.patch: + version bump wrt #513862 23 Dec 2013; Julian Ospald <[email protected]> rstudio-0.98.490.ebuild: fix build with +server wrt #494362 1.1 sci-mathematics/rstudio/rstudio-0.98.932.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.932.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.932.ebuild?rev=1.1&content-type=text/plain Index: rstudio-0.98.932.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.932.ebuild,v 1.1 2014/07/04 13:53:22 hasufell Exp $ EAPI=5 inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 # TODO # * package gin and gwt # * use dict from tree, linguas # * do src_test (use junit from tree?) GWTVER=2.6.0 GINVER=1.5 SELENIUMVER=2.37.0 CHROMEDRIVER_VER=2.7 PANDOC_VER=1.12.3 PACKRAT_VER=0.3.0 RMARKDOWN_VER=0.2.49 DESCRIPTION="IDE for the R language" HOMEPAGE="http://www.rstudio.org"; SRC_URI="https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz https://s3.amazonaws.com/rstudio-buildtools/gin-${GINVER}.zip https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWTVER}.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUMVER}.zip https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUMVER}.jar https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip http://dev.gentoo.org/~hasufell/distfiles/packrat_${PACKRAT_VER}.tar.gz http://dev.gentoo.org/~hasufell/distfiles/rmarkdown_${RMARKDOWN_VER}.tar.gz"; LICENSE="AGPL-3" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="dedicated server" QTVER=4.8 QTSLOT=4 RDEPEND=" app-text/pandoc dev-haskell/pandoc-citeproc >=dev-lang/R-2.11.1 >=dev-libs/boost-1.50 dev-libs/mathjax dev-libs/openssl sys-libs/zlib >=virtual/jre-1.5 x11-libs/pango !dedicated? ( >=dev-qt/qtcore-${QTVER}:${QTSLOT} >=dev-qt/qtdbus-${QTVER}:${QTSLOT} >=dev-qt/qtgui-${QTVER}:${QTSLOT} >=dev-qt/qtwebkit-${QTVER}:${QTSLOT} >=dev-qt/qtxmlpatterns-${QTVER}:${QTSLOT} server? ( virtual/pam ) ) dedicated? ( virtual/pam )" DEPEND="${RDEPEND} app-arch/unzip dev-java/ant-core >=virtual/jdk-1.5 virtual/pkgconfig" # test? ( dev-java/junit:4 ) src_unpack() { unpack ${P}.tar.gz gwt-${GWTVER}.zip cd "${S}" || die mkdir -p src/gwt/lib/{gin,gwt} \ dependencies/common/dictionaries \ src/gwt/lib/selenium/${SELENIUMVER} \ src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die mv ../gwt-${GWTVER} src/gwt/lib/gwt/${GWTVER} || die unzip -qd src/gwt/lib/gin/${GINVER} \ "${DISTDIR}"/gin-${GINVER}.zip || die unzip -qd dependencies/common/dictionaries \ "${DISTDIR}"/core-dictionaries.zip || die unzip -qd src/gwt/lib/selenium/${SELENIUMVER} \ "${DISTDIR}"/selenium-java-${SELENIUMVER}.zip || die cp "${DISTDIR}"/selenium-server-standalone-${SELENIUMVER}.jar \ src/gwt/lib/selenium/${SELENIUMVER}/ || 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 cp "${DISTDIR}"/rmarkdown_${RMARKDOWN_VER}.tar.gz \ . || die cp "${DISTDIR}"/packrat_${PACKRAT_VER}.tar.gz \ . || die } src_prepare() { java-pkg-2_src_prepare find . -name .gitignore -delete || die epatch "${FILESDIR}"/${PN}-0.98.490-prefs.patch \ "${FILESDIR}"/${P}-paths.patch \ "${FILESDIR}"/${P}-pandoc.patch \ "${FILESDIR}"/${PN}-0.98.490-linker_flags.patch # 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 || 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 } 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} $(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP) -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") ) cmake-utils_src_configure } src_compile() { cmake-utils_src_compile } src_install() { cmake-utils_src_install if use dedicated || use server; then dopamd src/cpp/server/extras/pam/rstudio newinitd "${FILESDIR}"/rstudio-rserver.initd rstudio-rserver fi } pkg_preinst() { use dedicated || gnome2_icon_savelist java-pkg-2_pkg_preinst } pkg_postinst() { use dedicated || { fdo-mime_desktop_database_update fdo-mime_mime_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 || { fdo-mime_desktop_database_update fdo-mime_mime_database_update gnome2_icon_cache_update ;} }
