[gentoo-commits] proj/sci:master commit in: sci-mathematics/rstudio/, sci-mathematics/rstudio/files/

[Sebastien Fabbro]

commit:     26ab7b99ac596bbc38421020666973047d218069
Author:     Sebastien Fabbro <sfabbro <AT> uvic <DOT> ca>
AuthorDate: Fri Jun 29 20:31:59 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Jun 29 20:31:59 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=26ab7b99

sci-mathematics/rstudio: initial import

---
 sci-mathematics/rstudio/ChangeLog                  |   12 ++
 .../files/rstudio-0.96.316-linker_flags.patch      |   13 ++
 .../rstudio/files/rstudio-0.96.316-paths.patch     |  106 +++++++++++++++
 .../rstudio/files/rstudio-0.96.316-prefs.patch     |   20 +++
 .../rstudio/files/rstudio-rserver.initd            |   15 ++
 sci-mathematics/rstudio/metadata.xml               |   13 ++
 sci-mathematics/rstudio/rstudio-0.96.316.ebuild    |  140 ++++++++++++++++++++
 7 files changed, 319 insertions(+), 0 deletions(-)

diff --git a/sci-mathematics/rstudio/.Rhistory b/sci-mathematics/rstudio/.Rhistory
new file mode 100644
index 0000000..e69de29

diff --git a/sci-mathematics/rstudio/ChangeLog b/sci-mathematics/rstudio/ChangeLog
new file mode 100644
index 0000000..c85d8ca
--- /dev/null
+++ b/sci-mathematics/rstudio/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for sci-mathematics/rstudio
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*rstudio-0.96.316 (29 Jun 2012)
+
+  29 Jun 2012; Sebastien Fabbro <fabbros@g.o> +rstudio-0.96.316.ebuild,
+  +files/rstudio-0.96.316-linker_flags.patch,
+  +files/rstudio-0.96.316-paths.patch, +files/rstudio-0.96.316-prefs.patch,
+  +.Rhistory, +files/rstudio-rserver.initd, +metadata.xml:
+  Initial import. Ebuild inspired from Eric Johnson and others, bug #365595
+

diff --git a/sci-mathematics/rstudio/files/rstudio-0.96.316-linker_flags.patch b/sci-mathematics/rstudio/files/rstudio-0.96.316-linker_flags.patch
new file mode 100644
index 0000000..e68399d
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-0.96.316-linker_flags.patch
@@ -0,0 +1,13 @@
+diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
+index 0589ca0..fe5bd5f 100644
+--- a/src/cpp/CMakeLists.txt
++++ b/src/cpp/CMakeLists.txt
+@@ -57,7 +57,7 @@ if(UNIX)
+       add_definitions(-D_FORTIFY_SOURCE=2)
+       add_definitions(-fstack-protector --param ssp-buffer-size=4)
+       add_definitions(-pie -fPIE)
+-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro,-z,now")
++      set(CMAKE_EXE_LINKER_FLAGS "-Wl,-z,relro,-z,now ${CMAKE_EXE_LINKER_FLAGS}")
+    endif()
+ 
+ # Win32 specific global directives

diff --git a/sci-mathematics/rstudio/files/rstudio-0.96.316-paths.patch b/sci-mathematics/rstudio/files/rstudio-0.96.316-paths.patch
new file mode 100644
index 0000000..917e220
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-0.96.316-paths.patch
@@ -0,0 +1,106 @@
+diff --git a/CMakeGlobals.txt b/CMakeGlobals.txt
+index da74970..1537bff 100644
+--- a/CMakeGlobals.txt
++++ b/CMakeGlobals.txt
+@@ -103,7 +103,7 @@ else()
+    else()
+      set(RSTUDIO_INSTALL_BIN bin)
+    endif()
+-   set(RSTUDIO_INSTALL_SUPPORTING .)
++   set(RSTUDIO_INSTALL_SUPPORTING ${DISTRO_SHARE})
+ endif()
+ 
+ # if the install prefix is /usr/local then tweak as appropriate
+diff --git a/src/cpp/server/CMakeLists.txt b/src/cpp/server/CMakeLists.txt
+index af4db1c..96b767e 100644
+--- a/src/cpp/server/CMakeLists.txt
++++ b/src/cpp/server/CMakeLists.txt
+@@ -142,7 +142,7 @@ if (UNIX AND NOT APPLE)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT})
+    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}
+-           DESTINATION ${RSERVER_INITD_DEBIAN_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_DEBIAN_DIR})
+ 
+    # install configured redhat init.d script
+    set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat")
+@@ -150,7 +150,7 @@ if (UNIX AND NOT APPLE)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT})
+    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}
+-           DESTINATION ${RSERVER_INITD_REDHAT_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_REDHAT_DIR})
+ 
+    # install configured suse init.d script
+    set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse")
+@@ -158,13 +158,13 @@ if (UNIX AND NOT APPLE)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT})
+    install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}
+-           DESTINATION ${RSERVER_INITD_SUSE_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_SUSE_DIR})
+ 
+    # install pam profile
+    set(RSERVER_PAM_DIR "extras/pam")
+    set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio")
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE}
+-           DESTINATION ${RSERVER_PAM_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_PAM_DIR})
+ 
+    # install configured apparmor profile
+    set(RSERVER_APPARMOR_DIR "extras/apparmor")
+@@ -172,9 +172,9 @@ if (UNIX AND NOT APPLE)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_PROFILE}.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE})
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE}
+-           DESTINATION ${RSERVER_APPARMOR_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR})
+    install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_DIR}/apparmor-profile-load
+-           DESTINATION ${RSERVER_APPARMOR_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR})
+ 
+    # install configured upstart profile
+    set(RSERVER_UPSTART_DIR "extras/upstart")
+@@ -182,6 +182,6 @@ if (UNIX AND NOT APPLE)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in
+                   ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE})
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}
+-           DESTINATION ${RSERVER_UPSTART_DIR})
++           DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR})
+ 
+ endif()
+diff --git a/src/cpp/server/ServerOptions.cpp b/src/cpp/server/ServerOptions.cpp
+index 77a63f1..f0d25f0 100644
+--- a/src/cpp/server/ServerOptions.cpp
++++ b/src/cpp/server/ServerOptions.cpp
+@@ -201,7 +201,7 @@ ProgramStatus Options::read(int argc, char * const argv[])
+ 
+    // convert relative paths by completing from the system installation
+    // path (this allows us to be relocatable)
+-   resolvePath(installPath, &wwwLocalPath_);
++   resolvePath(installPath.childPath(DISTRO_SHARE), &wwwLocalPath_);
+    resolvePath(installPath, &authPamHelperPath_);
+    resolvePath(installPath, &rsessionPath_);
+    resolvePath(installPath, &rldpathPath_);
+diff --git a/src/cpp/session/SessionOptions.cpp b/src/cpp/session/SessionOptions.cpp
+index 0df1081..777cc6a 100644
+--- a/src/cpp/session/SessionOptions.cpp
++++ b/src/cpp/session/SessionOptions.cpp
+@@ -314,12 +314,12 @@ core::ProgramStatus Options::read(int argc, char * const argv[])
+    }
+ 
+    // convert relative paths by completing from the app resource path
+-   resolvePath(resourcePath, &rResourcesPath_);
++   resolvePath(resourcePath.childPath(DISTRO_SHARE), &rResourcesPath_);
+    resolvePath(resourcePath, &agreementFilePath_);
+-   resolvePath(resourcePath, &wwwLocalPath_);
+-   resolvePath(resourcePath, &coreRSourcePath_);
+-   resolvePath(resourcePath, &modulesRSourcePath_);
+-   resolvePath(resourcePath, &sessionPackagesPath_);
++   resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_);
++   resolvePath(resourcePath.childPath(DISTRO_SHARE), &coreRSourcePath_);
++   resolvePath(resourcePath.childPath(DISTRO_SHARE), &modulesRSourcePath_);
++   resolvePath(resourcePath.childPath(DISTRO_SHARE), &sessionPackagesPath_);
+    resolvePostbackPath(resourcePath, &rpostbackPath_);
+ #ifdef _WIN32
+    resolvePath(resourcePath, &consoleIoPath_);

diff --git a/sci-mathematics/rstudio/files/rstudio-0.96.316-prefs.patch b/sci-mathematics/rstudio/files/rstudio-0.96.316-prefs.patch
new file mode 100644
index 0000000..0d5401c
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-0.96.316-prefs.patch
@@ -0,0 +1,20 @@
+diff --git a/src/gwt/build.xml b/src/gwt/build.xml
+index 6581bd9..36eadc1 100644
+--- a/src/gwt/build.xml
++++ b/src/gwt/build.xml
+@@ -26,6 +26,7 @@
+    <property name="gwt.main.module" value="org.rstudio.studio.RStudio"/>
+    <property name="ace.bin" value="src/org/rstudio/studio/client/workbench/views/source/editors/text/ace"/>
+    <property name="json2.bin" value="www/js"/>
++   <property environment="env"/>
+ 
+    <path id="project.class.path">
+       <pathelement location="bin"/>
+@@ -102,6 +103,7 @@
+          </classpath>
+          <!-- add jvmarg -Xss16M or similar if you see a StackOverflowError -->
+          <jvmarg value="-Xmx1024M"/>
++         <jvmarg value="-Djava.util.prefs.userRoot=${env.T}"/>
+          <arg value="-war"/>
+          <arg value="www"/>
+          <arg value="-localWorkers"/>

diff --git a/sci-mathematics/rstudio/files/rstudio-rserver.initd b/sci-mathematics/rstudio/files/rstudio-rserver.initd
new file mode 100644
index 0000000..a74f240
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-rserver.initd
@@ -0,0 +1,15 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+start() {
+	ebegin "Starting RStudio Server"
+	start-stop-daemon --start --quiet --exec /usr/bin/rserver
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping RStudio Server"
+	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --name /usr/bin/rserver
+	eend $?
+}

diff --git a/sci-mathematics/rstudio/metadata.xml b/sci-mathematics/rstudio/metadata.xml
new file mode 100644
index 0000000..d76a14f
--- /dev/null
+++ b/sci-mathematics/rstudio/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci-mathematics</herd>
+<longdescription lang="en">
+  RStudio is an integrated development environment (IDE) for R. It can
+  run it on a desktop or even over the web using RStudio Server.
+</longdescription>
+<use>
+  <flag name='desktop'>Build the QT4 desktop interface</flag>
+  <flag name='server'>Build and install the RStudio server</flag>
+</use>
+</pkgmetadata>

diff --git a/sci-mathematics/rstudio/rstudio-0.96.316.ebuild b/sci-mathematics/rstudio/rstudio-0.96.316.ebuild
new file mode 100644
index 0000000..c2f9e78
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-0.96.316.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils cmake-utils pam versionator fdo-mime java-pkg-2
+
+# TODO
+# * make sure icon/menu and mime type work
+# * work out server (see package/linux/debian-control/*)
+# * package gin and gwt
+# * use dict from tree, linguas
+# * use java-pkg-2 eclass
+# * do src_test (use junit from tree?)
+# * fix the about/help/menu and get rid of license
+# * desktop flag -> qt4 flag?
+# * more prefix love
+
+GWTVER=2.4.0
+GINVER=1.5
+
+DESCRIPTION="IDE for the R language"
+HOMEPAGE="http://www.rstudio.org"
+SRC_URI="https://github.com/${PN}/${PN}/tarball/v${PV} -> ${P}.tar.gz
+	https://s3.amazonaws.com/${PN}-buildtools/gin-${GINVER}.zip
+	https://s3.amazonaws.com/${PN}-buildtools/gwt-${GWTVER}.zip
+	https://s3.amazonaws.com/${PN}-dictionaries/core-dictionaries.zip"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+desktop server test"
+
+QTVER=4.8
+RDEPEND="dev-lang/R
+	>=dev-libs/boost-1.42
+	dev-libs/mathjax
+	dev-libs/openssl
+	>=virtual/jre-1.5
+	x11-libs/pango
+	desktop? (	>=x11-libs/qt-core-${QTVER}
+				>=x11-libs/qt-dbus-${QTVER}
+				>=x11-libs/qt-gui-${QTVER}
+				>=x11-libs/qt-webkit-${QTVER}
+				>=x11-libs/qt-xmlpatterns-${QTVER} )
+	server? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	>=virtual/jdk-1.5
+	virtual/pkgconfig"
+#	test? ( dev-java/junit:4 )
+
+REQUIRED_USE="!server? ( desktop ) !desktop? ( server )"
+
+src_unpack() {
+	unpack ${P}.tar.gz gwt-${GWTVER}.zip
+	mv rstudio-rstudio-* ${P}
+	cd "${S}"
+	mkdir -p src/gwt/lib/{gin,gwt} dependencies/common/dictionaries || die
+	mv ../gwt-${GWTVER} src/gwt/lib/gwt/${GWTVER}
+	unzip -qd src/gwt/lib/gin/${GINVER} "${DISTDIR}"/gin-${GINVER}.zip || die
+	unzip -qd dependencies/common/dictionaries "${DISTDIR}"/core-dictionaries.zip || die
+}
+
+src_prepare() {
+	find . -name .gitignore -delete
+	# And now we fix src/gwt/build.xml since java's user preference class is
+	# braindead and insists on writing where it is not allowed.
+	# much thanks to http://www.allaboutbalance.com/articles/disableprefs/
+	epatch "${FILESDIR}"/${P}-prefs.patch
+	# change the install path, as by default everything is dumped right under
+	# the prefix. After fixing install paths, now fix the source so the
+	# program can find the moved resources.
+	epatch "${FILESDIR}"/${P}-paths.patch
+	# Some gcc hardening options were added, however since we add
+	# "-Wl,--as-needed" we end up with "-Wl,--as-needed;-Wl,-z,relro" which
+	# leads to linker errors about unknown options, if we make it so the
+	# as-needed option is the last option on the line, everything is fine.
+	epatch "${FILESDIR}"/${P}-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 -s "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax
+	# 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} )
+	if use server; then
+		if use desktop; then
+			mycmakeargs+=(
+				-DRSTUDIO_INSTALL_FREEDESKTOP=ON
+				-DRSTUDIO_TARGET=All )
+		else
+			mycmakeargs+=( -DRSTUDIO_TARGET=Server )
+		fi
+	else
+		mycmakeargs+=(
+			-DRSTUDIO_INSTALL_FREEDESKTOP=ON
+			-DRSTUDIO_TARGET=Desktop
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use server; then
+		dopamd src/cpp/server/extras/pam/rstudio
+		newinitd "${FILESDIR}"/rstudio-rserver.initd rstudio-rserver
+	fi
+}
+
+pkg_postinst() {
+	use desktop && fdo-mime_mime_database_update
+	if use server; then
+		enewgroup rstudio-server
+		enewuser rstudio-server -1 -1 -1 rstudio-server
+	fi
+}
+
+pkg_postrm() {
+	use desktop && fdo-mime_mime_database_update
+}