[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2015-08-27  2:54 Mark Wright
  0 siblings, 0 replies; 36+ messages in thread
From: Mark Wright @ 2015-08-27  2:54 UTC (permalink / raw
  To: gentoo-commits

commit:     35c81bdb8b1c860bd93d247af2fadc664fe923de
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 02:54:12 2015 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 02:54:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35c81bdb

sci-mathematics/rstudio: Fix typo in rstudio-0.99.473 s/cmake/qmake/

Package-Manager: portage-2.2.20.1

 sci-mathematics/rstudio/rstudio-0.99.473.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/rstudio/rstudio-0.99.473.ebuild b/sci-mathematics/rstudio/rstudio-0.99.473.ebuild
index f98cffe..a5221e7 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.473.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.473.ebuild
@@ -154,7 +154,7 @@ src_configure() {
 		-DDISTRO_SHARE=share/${PN}
 		$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP)
 		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/cmake
+		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
 		)
 
 	cmake-utils_src_configure


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2015-09-04  3:20 Mark Wright
  0 siblings, 0 replies; 36+ messages in thread
From: Mark Wright @ 2015-09-04  3:20 UTC (permalink / raw
  To: gentoo-commits

commit:     ef8df0a39a3baab82bba4873a575f013ee3d76c9
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  4 03:18:40 2015 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Fri Sep  4 03:19:29 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef8df0a3

sci-mathematics/rstudio: Drop rstudio-0.99.473, replaced by rstudio-0.99.473-r1.

Package-Manager: portage-2.2.20.1

 sci-mathematics/rstudio/rstudio-0.99.473.ebuild | 201 ------------------------
 1 file changed, 201 deletions(-)

diff --git a/sci-mathematics/rstudio/rstudio-0.99.473.ebuild b/sci-mathematics/rstudio/rstudio-0.99.473.ebuild
deleted file mode 100644
index a5221e7..0000000
--- a/sci-mathematics/rstudio/rstudio-0.99.473.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
-
-# TODO
-# * package gin and gwt
-# * use dict from tree, linguas
-# * do src_test (use junit from tree?)
-
-# update from scripts in dependencies/common
-GWT_VER=2.7.0
-GIN_VER=1.5
-SELENIUM_VER=2.37.0
-CHROMEDRIVER_VER=2.7
-PANDOC_VER=1.13.1
-PACKRAT_VER=0.98.1000
-RMARKDOWN_VER=0.98.1000
-SHINYAPPS_VER=0.98.1000
-RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
-
-DESCRIPTION="IDE for the R language"
-HOMEPAGE="http://www.rstudio.org
-	https://github.com/rstudio/rstudio/"
-SRC_URI="https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
-	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
-	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
-	https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
-	https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
-	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
-	https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
-	https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
-	https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
-	https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
-"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dedicated server"
-
-QT_VER=5.4
-QT_SLOT=5
-RDEPEND="
-	app-text/pandoc
-	dev-haskell/pandoc-citeproc
-	>=dev-lang/R-2.11.1
-	>=dev-libs/boost-1.50:=
-	>=dev-libs/mathjax-2.3
-	dev-libs/openssl:0
-	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0 <sys-devel/clang-3.6.0
-	sys-libs/zlib
-	|| ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
-	x11-libs/pango
-	!dedicated? (
-		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
-		server? ( virtual/pam )
-	)
-	dedicated? ( virtual/pam )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-java/ant-core
-	|| ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
-	virtual/pkgconfig"
-#	test? ( dev-java/junit:4 )
-
-src_unpack() {
-	unpack ${P}.tar.gz gwt-${GWT_VER}.zip
-	cd "${S}" || die
-	mkdir -p src/gwt/lib/{gin,gwt} \
-		dependencies/common/dictionaries \
-		src/gwt/lib/selenium/${SELENIUM_VER} \
-		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
-	mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
-	unzip -qd src/gwt/lib/gin/${GIN_VER} \
-		"${DISTDIR}"/gin-${GIN_VER}.zip || die
-	unzip -qd dependencies/common/dictionaries \
-		"${DISTDIR}"/core-dictionaries.zip || die
-	unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
-		"${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
-	cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
-		src/gwt/lib/selenium/${SELENIUM_VER}/ || 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
-	unpack shinyapps-${SHINYAPPS_VER}.tar.gz
-	unpack rsconnect_${RSCONNECT_VER}.tar.gz
-	cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
-		. || die
-	cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
-		. || die
-	cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
-		. || die
-	cp "${DISTDIR}"/rsconnect_${RSCONNECT_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}"/${PN}-0.99.473-paths.patch \
-		"${FILESDIR}"/${PN}-0.99.473-clang-pandoc.patch \
-		"${FILESDIR}"/${PN}-0.98.490-linker_flags.patch \
-		"${FILESDIR}"/${PN}-0.98.1091-boost-1.57.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-23 || 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
-
-	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
-	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
-		-i src/cpp/server/ServerOptions.cpp \
-		|| die
-
-	# Set the rsession.conf file location for Gentoo prefix
-	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
-		-i src/cpp/session/SessionOptions.cpp \
-		|| 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")")
-		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
-		)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	pax-mark m "${ED}usr/bin/rstudio"
-	doconfd "${FILESDIR}"/rstudio-server.conf
-	dodir /etc/rstudio
-	insinto /etc/rstudio
-	doins "${FILESDIR}"/rsession.conf
-	dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf
-	if use dedicated || use server; then
-		dopamd src/cpp/server/extras/pam/rstudio
-		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
-	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 ;}
-}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2015-09-04 11:33 Mark Wright
  0 siblings, 0 replies; 36+ messages in thread
From: Mark Wright @ 2015-09-04 11:33 UTC (permalink / raw
  To: gentoo-commits

commit:     5744b9abe4fd4b23440d4c8d52d80666d99d8841
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  4 11:32:57 2015 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Fri Sep  4 11:32:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5744b9ab

sci-mathematics/rstudio: Bump to rstudio-0.99.482.

Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
P: /root/.oracle_jre_usage. in rstudio-0.99.473-r1 and rstudio-0.99.482.

Package-Manager: portage-2.2.20.1

 sci-mathematics/rstudio/Manifest                            |  1 +
 sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild          | 13 +++++++++++++
 .../{rstudio-0.99.473-r1.ebuild => rstudio-0.99.482.ebuild} | 13 +++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 8010bbd..7bc3ab2 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -18,6 +18,7 @@ DIST rstudio-0.98.490.tar.gz 14989329 SHA256 e38296a10b12c9e769a8be0545c36745999
 DIST rstudio-0.98.932.tar.gz 15515025 SHA256 e4a69a2f746cb7cfcacd3811f15e41a9d156175607da334f412614cc4cb70728 SHA512 beeb8c035d4f8524bd3e497162e3a218e92fbd1c1704ff3bc99a70a1248244155e3998272a6aa985b59cfa67c640adec877465f5d50acb9e47abca2657f2a06f WHIRLPOOL e422a2cef857aa9d094dd11e62b6c762a2a7477e7d84fd66456152c6521aebd94d4c365980ed6c06fc1c90d5a62426376d978de0ed23186d4732c0b148cc62bc
 DIST rstudio-0.98.953.tar.gz 15518231 SHA256 944f5882a0d61f551cd6f6cbe7882b5a5ea5be12d2c6d5ec9e79cee65869dbb7 SHA512 38a17d1abf91f4e775c4d735152fe6c8030b2df771bd7333fb3c9408fe14ac0b6180d7eaad7ac09ce2d50e5dcaa5a3b828909b30f507fd7c35fe27f7bd96866c WHIRLPOOL e2135f425b48b952282d8c44bd121517098521715c70537a6ac1a3be1732928666c5cb40fbc20b9f394a606e0e116723190790a202cbf62986ffbca528646058
 DIST rstudio-0.99.473.tar.gz 16993092 SHA256 a402995251393d50fa70e2e02188a8b32dc34e067f2f8461f087bf71f643585c SHA512 5615840501f7629e82100fee78c35b8d4dc78d78932d65c2e91a6472bc94726389566f5853a99e3d0631fd260e59acea5a40acf82f72709741b89a1ed3c901af WHIRLPOOL 809549c76efee8b29452584ab4295bcbbf533f8100c8caf4dd3b4a3c8843dc54a0d8f3178a6aecab5c188f2498a74daa6c6677fc6d43bd7dd861487c557e48df
+DIST rstudio-0.99.482.tar.gz 16992873 SHA256 1185d6ce5d3872e134f3255668d8f082370c760f06ec409c7b84c0936f52c4bf SHA512 bdb845cceae851d27323448a3570621bcb2aba7742e9e1669c88f3ebeaaade8c8371eb38f2ad348d7e2b740778c34f73e59013502ae3cebafba84e5d249c3e52 WHIRLPOOL 743440227c8d7e56000b1ff0b1a12def50e006b4f34d2067587274e2bae0eda42656787fc0cf6c51ffdbfcca08fc6eab0d042891bd77e4446b6fe26c6d19cc05
 DIST selenium-java-2.37.0.zip 24625928 SHA256 0eebba65d8edb01c1f46e462907c58f5d6e1cb0ddf63660a9985c8432bdffbb7 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779 WHIRLPOOL eb6659aae26f3c78b6f998546b23d0636c9d00ed8a7f985db1463ac4bd483ccb3e643d84e2ca0f59e0636a8de79eb552ff1d68eb6f9c06907029f7552d8f7777
 DIST selenium-server-standalone-2.37.0.jar 34730734 SHA256 97bc8c699037fb6e99ba7af570fb60dbb1b7ce30cde2448287a44ef65b13023e SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018 WHIRLPOOL 20640591534f31f24825a9ed139589b182e8b60d86541bf0be104d3cc0280983f6566bd0459f2253ac3875b48a2798b205bac8f815a119fff6db625ce9bbc29e
 DIST shinyapps-0.98.1000.tar.gz 910095 SHA256 b95c512ae0a0fb4335878d9cfcf9073e2cb3ccfed73543abe27ea8878ed36d57 SHA512 3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c WHIRLPOOL ecc2bce78387cb42e9989163d8fca29220e66f085acde3323417058aebb624dafa8c0e1873c7d79e67324cbd5aad250ef9fcdbbc8f659d64482233b95d898a15

diff --git a/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild b/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
index b247a88..3682c5c 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
@@ -12,11 +12,14 @@ inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2
 # * do src_test (use junit from tree?)
 
 # update from scripts in dependencies/common
+# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
 GWT_VER=2.7.0
 GIN_VER=1.5
 SELENIUM_VER=2.37.0
 CHROMEDRIVER_VER=2.7
+# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc
 PANDOC_VER=1.13.1
+# ls dependencies/common/*.tar.gz
 PACKRAT_VER=0.98.1000
 RMARKDOWN_VER=0.98.1000
 SHINYAPPS_VER=0.98.1000
@@ -167,6 +170,12 @@ src_prepare() {
 	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
 		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
 		|| die
+
+	# Avoid some of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	sed -e 's@\(\s*\)\(</classpath>\)@\1\2\n\1\<jvmarg value="-Duser.home=${env.T}"/>@g' \
+		-i "${S}"/src/gwt/build.xml \
+		|| die
 }
 
 src_configure() {
@@ -185,10 +194,14 @@ src_configure() {
 }
 
 src_compile() {
+	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	export ANT_OPTS="-Duser.home=${T}"
 	cmake-utils_src_compile
 }
 
 src_install() {
+	export ANT_OPTS="-Duser.home=${T}"
 	cmake-utils_src_install
 	pax-mark m "${ED}usr/bin/rstudio"
 	doconfd "${FILESDIR}"/rstudio-server.conf

diff --git a/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild b/sci-mathematics/rstudio/rstudio-0.99.482.ebuild
similarity index 92%
copy from sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
copy to sci-mathematics/rstudio/rstudio-0.99.482.ebuild
index b247a88..3682c5c 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.482.ebuild
@@ -12,11 +12,14 @@ inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2
 # * do src_test (use junit from tree?)
 
 # update from scripts in dependencies/common
+# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
 GWT_VER=2.7.0
 GIN_VER=1.5
 SELENIUM_VER=2.37.0
 CHROMEDRIVER_VER=2.7
+# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc
 PANDOC_VER=1.13.1
+# ls dependencies/common/*.tar.gz
 PACKRAT_VER=0.98.1000
 RMARKDOWN_VER=0.98.1000
 SHINYAPPS_VER=0.98.1000
@@ -167,6 +170,12 @@ src_prepare() {
 	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
 		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
 		|| die
+
+	# Avoid some of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	sed -e 's@\(\s*\)\(</classpath>\)@\1\2\n\1\<jvmarg value="-Duser.home=${env.T}"/>@g' \
+		-i "${S}"/src/gwt/build.xml \
+		|| die
 }
 
 src_configure() {
@@ -185,10 +194,14 @@ src_configure() {
 }
 
 src_compile() {
+	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	export ANT_OPTS="-Duser.home=${T}"
 	cmake-utils_src_compile
 }
 
 src_install() {
+	export ANT_OPTS="-Duser.home=${T}"
 	cmake-utils_src_install
 	pax-mark m "${ED}usr/bin/rstudio"
 	doconfd "${FILESDIR}"/rstudio-server.conf


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2015-09-05  4:27 Mark Wright
  0 siblings, 0 replies; 36+ messages in thread
From: Mark Wright @ 2015-09-05  4:27 UTC (permalink / raw
  To: gentoo-commits

commit:     22ba7432fd5a0834d1c7d2d6f14f7659727c87ba
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  5 04:27:07 2015 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Sat Sep  5 04:27:07 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22ba7432

sci-mathematics/rstudio: Bump to 0.99.483

Package-Manager: portage-2.2.20.1

 sci-mathematics/rstudio/Manifest                |   1 +
 sci-mathematics/rstudio/rstudio-0.99.483.ebuild | 238 ++++++++++++++++++++++++
 2 files changed, 239 insertions(+)

diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 7bc3ab2..1a56175 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -19,6 +19,7 @@ DIST rstudio-0.98.932.tar.gz 15515025 SHA256 e4a69a2f746cb7cfcacd3811f15e41a9d15
 DIST rstudio-0.98.953.tar.gz 15518231 SHA256 944f5882a0d61f551cd6f6cbe7882b5a5ea5be12d2c6d5ec9e79cee65869dbb7 SHA512 38a17d1abf91f4e775c4d735152fe6c8030b2df771bd7333fb3c9408fe14ac0b6180d7eaad7ac09ce2d50e5dcaa5a3b828909b30f507fd7c35fe27f7bd96866c WHIRLPOOL e2135f425b48b952282d8c44bd121517098521715c70537a6ac1a3be1732928666c5cb40fbc20b9f394a606e0e116723190790a202cbf62986ffbca528646058
 DIST rstudio-0.99.473.tar.gz 16993092 SHA256 a402995251393d50fa70e2e02188a8b32dc34e067f2f8461f087bf71f643585c SHA512 5615840501f7629e82100fee78c35b8d4dc78d78932d65c2e91a6472bc94726389566f5853a99e3d0631fd260e59acea5a40acf82f72709741b89a1ed3c901af WHIRLPOOL 809549c76efee8b29452584ab4295bcbbf533f8100c8caf4dd3b4a3c8843dc54a0d8f3178a6aecab5c188f2498a74daa6c6677fc6d43bd7dd861487c557e48df
 DIST rstudio-0.99.482.tar.gz 16992873 SHA256 1185d6ce5d3872e134f3255668d8f082370c760f06ec409c7b84c0936f52c4bf SHA512 bdb845cceae851d27323448a3570621bcb2aba7742e9e1669c88f3ebeaaade8c8371eb38f2ad348d7e2b740778c34f73e59013502ae3cebafba84e5d249c3e52 WHIRLPOOL 743440227c8d7e56000b1ff0b1a12def50e006b4f34d2067587274e2bae0eda42656787fc0cf6c51ffdbfcca08fc6eab0d042891bd77e4446b6fe26c6d19cc05
+DIST rstudio-0.99.483.tar.gz 16993049 SHA256 85ce1a2f40690e4ed0338b153a1b3279ce9564396d8c6d6201a0ad39297d4a9a SHA512 7d9cc8b471a4d799f286193da5f6f950f85e82949ede0f1ffe3626a429a49204878fb731250e5f54164a48e1d6e9cbb19a04a38ff83e35fd46c0ba05ef78a9bc WHIRLPOOL 0c5c1d86b0bafe9d5ca02397793f902b4dca7edc3f507a472b8b235f91965d8a769a7873cc87d834fbb121792b52eb6908018ce6579acdf3d285b6ec986abc20
 DIST selenium-java-2.37.0.zip 24625928 SHA256 0eebba65d8edb01c1f46e462907c58f5d6e1cb0ddf63660a9985c8432bdffbb7 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779 WHIRLPOOL eb6659aae26f3c78b6f998546b23d0636c9d00ed8a7f985db1463ac4bd483ccb3e643d84e2ca0f59e0636a8de79eb552ff1d68eb6f9c06907029f7552d8f7777
 DIST selenium-server-standalone-2.37.0.jar 34730734 SHA256 97bc8c699037fb6e99ba7af570fb60dbb1b7ce30cde2448287a44ef65b13023e SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018 WHIRLPOOL 20640591534f31f24825a9ed139589b182e8b60d86541bf0be104d3cc0280983f6566bd0459f2253ac3875b48a2798b205bac8f815a119fff6db625ce9bbc29e
 DIST shinyapps-0.98.1000.tar.gz 910095 SHA256 b95c512ae0a0fb4335878d9cfcf9073e2cb3ccfed73543abe27ea8878ed36d57 SHA512 3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c WHIRLPOOL ecc2bce78387cb42e9989163d8fca29220e66f085acde3323417058aebb624dafa8c0e1873c7d79e67324cbd5aad250ef9fcdbbc8f659d64482233b95d898a15

diff --git a/sci-mathematics/rstudio/rstudio-0.99.483.ebuild b/sci-mathematics/rstudio/rstudio-0.99.483.ebuild
new file mode 100644
index 0000000..3682c5c
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-0.99.483.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
+
+# TODO
+# * package gin and gwt
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+# update from scripts in dependencies/common
+# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
+GWT_VER=2.7.0
+GIN_VER=1.5
+SELENIUM_VER=2.37.0
+CHROMEDRIVER_VER=2.7
+# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc
+PANDOC_VER=1.13.1
+# ls dependencies/common/*.tar.gz
+PACKRAT_VER=0.98.1000
+RMARKDOWN_VER=0.98.1000
+SHINYAPPS_VER=0.98.1000
+RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
+
+DESCRIPTION="IDE for the R language"
+HOMEPAGE="http://www.rstudio.org
+	https://github.com/rstudio/rstudio/"
+SRC_URI="https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
+	https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
+	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
+	https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dedicated server"
+
+QT_VER=5.4
+QT_SLOT=5
+RDEPEND="
+	app-text/pandoc
+	dev-haskell/pandoc-citeproc
+	>=dev-lang/R-2.11.1
+	>=dev-libs/boost-1.50:=
+	>=dev-libs/mathjax-2.3
+	dev-libs/openssl:0
+	sys-apps/util-linux
+	>=sys-devel/clang-3.5.0
+	sys-libs/zlib
+	|| ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+	x11-libs/pango
+	!dedicated? (
+		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5]
+		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
+		server? ( virtual/pam )
+	)
+	dedicated? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	|| ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
+	virtual/pkgconfig"
+#	test? ( dev-java/junit:4 )
+
+src_unpack() {
+	unpack ${P}.tar.gz gwt-${GWT_VER}.zip
+	cd "${S}" || die
+	mkdir -p src/gwt/lib/{gin,gwt} \
+		dependencies/common/dictionaries \
+		src/gwt/lib/selenium/${SELENIUM_VER} \
+		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
+	mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
+	unzip -qd src/gwt/lib/gin/${GIN_VER} \
+		"${DISTDIR}"/gin-${GIN_VER}.zip || die
+	unzip -qd dependencies/common/dictionaries \
+		"${DISTDIR}"/core-dictionaries.zip || die
+	unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
+		"${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
+	cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
+		src/gwt/lib/selenium/${SELENIUM_VER}/ || 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
+	unpack shinyapps-${SHINYAPPS_VER}.tar.gz
+	unpack rsconnect_${RSCONNECT_VER}.tar.gz
+	cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/rsconnect_${RSCONNECT_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}"/${PN}-0.99.473-paths.patch \
+		"${FILESDIR}"/${PN}-0.99.473-clang-pandoc.patch \
+		"${FILESDIR}"/${PN}-0.98.490-linker_flags.patch \
+		"${FILESDIR}"/${PN}-0.98.1091-boost-1.57.patch \
+		"${FILESDIR}"/${PN}-0.99.473-qtsingleapplication.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-23 || 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
+
+	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
+	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
+		-i src/cpp/server/ServerOptions.cpp \
+		|| die
+
+	# Set the rsession.conf file location for Gentoo prefix
+	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
+		-i src/cpp/session/SessionOptions.cpp \
+		|| die
+
+	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
+	# It provides a library that has its version number appended to the end,
+	# which is difficult to handle in cmake, as find_library does not support
+	# searching for wildcard library names. So I find the library name from the
+	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
+	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
+	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
+				   "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \
+					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
+						   -e 's@LIBS \*= -l@@')
+	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
+		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
+		|| die
+
+	# Avoid some of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	sed -e 's@\(\s*\)\(</classpath>\)@\1\2\n\1\<jvmarg value="-Duser.home=${env.T}"/>@g' \
+		-i "${S}"/src/gwt/build.xml \
+		|| 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")")
+		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_compile
+}
+
+src_install() {
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_install
+	pax-mark m "${ED}usr/bin/rstudio"
+	doconfd "${FILESDIR}"/rstudio-server.conf
+	dodir /etc/rstudio
+	insinto /etc/rstudio
+	doins "${FILESDIR}"/rsession.conf
+	dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf
+	if use dedicated || use server; then
+		dopamd src/cpp/server/extras/pam/rstudio
+		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
+	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 ;}
+}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2015-09-09  2:27 Mark Wright
  0 siblings, 0 replies; 36+ messages in thread
From: Mark Wright @ 2015-09-09  2:27 UTC (permalink / raw
  To: gentoo-commits

commit:     433db8c492f4b28dbfa8d402633a4728e2f38033
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  9 02:26:35 2015 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Wed Sep  9 02:26:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=433db8c4

sci-mathematics/rstudio: Bump to 0.99.484

Package-Manager: portage-2.2.20.1

 sci-mathematics/rstudio/Manifest                |   1 +
 sci-mathematics/rstudio/rstudio-0.99.484.ebuild | 238 ++++++++++++++++++++++++
 2 files changed, 239 insertions(+)

diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 1a56175..53840be 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -20,6 +20,7 @@ DIST rstudio-0.98.953.tar.gz 15518231 SHA256 944f5882a0d61f551cd6f6cbe7882b5a5ea
 DIST rstudio-0.99.473.tar.gz 16993092 SHA256 a402995251393d50fa70e2e02188a8b32dc34e067f2f8461f087bf71f643585c SHA512 5615840501f7629e82100fee78c35b8d4dc78d78932d65c2e91a6472bc94726389566f5853a99e3d0631fd260e59acea5a40acf82f72709741b89a1ed3c901af WHIRLPOOL 809549c76efee8b29452584ab4295bcbbf533f8100c8caf4dd3b4a3c8843dc54a0d8f3178a6aecab5c188f2498a74daa6c6677fc6d43bd7dd861487c557e48df
 DIST rstudio-0.99.482.tar.gz 16992873 SHA256 1185d6ce5d3872e134f3255668d8f082370c760f06ec409c7b84c0936f52c4bf SHA512 bdb845cceae851d27323448a3570621bcb2aba7742e9e1669c88f3ebeaaade8c8371eb38f2ad348d7e2b740778c34f73e59013502ae3cebafba84e5d249c3e52 WHIRLPOOL 743440227c8d7e56000b1ff0b1a12def50e006b4f34d2067587274e2bae0eda42656787fc0cf6c51ffdbfcca08fc6eab0d042891bd77e4446b6fe26c6d19cc05
 DIST rstudio-0.99.483.tar.gz 16993049 SHA256 85ce1a2f40690e4ed0338b153a1b3279ce9564396d8c6d6201a0ad39297d4a9a SHA512 7d9cc8b471a4d799f286193da5f6f950f85e82949ede0f1ffe3626a429a49204878fb731250e5f54164a48e1d6e9cbb19a04a38ff83e35fd46c0ba05ef78a9bc WHIRLPOOL 0c5c1d86b0bafe9d5ca02397793f902b4dca7edc3f507a472b8b235f91965d8a769a7873cc87d834fbb121792b52eb6908018ce6579acdf3d285b6ec986abc20
+DIST rstudio-0.99.484.tar.gz 16993033 SHA256 8ca4abccb9b554713077cf1057ac13abadfd7606f22ac3386b2a88a38ae8a427 SHA512 407f50747bca749ef2c512e727cbe062abdd99c1eb76af09761e6bdfb4208f30117e1ee55b485447f64f6cf249bc939ef1fb4f8ce0199595e241a3cc617b4b8b WHIRLPOOL 8cc16553ea2703f005908c69803b64da4172092cb0b3ff9015e7ec354340fcd1cfa82a218ac890adffafe3565ead94bee6f7bd239b1c56ee38cbeb5896f556b0
 DIST selenium-java-2.37.0.zip 24625928 SHA256 0eebba65d8edb01c1f46e462907c58f5d6e1cb0ddf63660a9985c8432bdffbb7 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779 WHIRLPOOL eb6659aae26f3c78b6f998546b23d0636c9d00ed8a7f985db1463ac4bd483ccb3e643d84e2ca0f59e0636a8de79eb552ff1d68eb6f9c06907029f7552d8f7777
 DIST selenium-server-standalone-2.37.0.jar 34730734 SHA256 97bc8c699037fb6e99ba7af570fb60dbb1b7ce30cde2448287a44ef65b13023e SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018 WHIRLPOOL 20640591534f31f24825a9ed139589b182e8b60d86541bf0be104d3cc0280983f6566bd0459f2253ac3875b48a2798b205bac8f815a119fff6db625ce9bbc29e
 DIST shinyapps-0.98.1000.tar.gz 910095 SHA256 b95c512ae0a0fb4335878d9cfcf9073e2cb3ccfed73543abe27ea8878ed36d57 SHA512 3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c WHIRLPOOL ecc2bce78387cb42e9989163d8fca29220e66f085acde3323417058aebb624dafa8c0e1873c7d79e67324cbd5aad250ef9fcdbbc8f659d64482233b95d898a15

diff --git a/sci-mathematics/rstudio/rstudio-0.99.484.ebuild b/sci-mathematics/rstudio/rstudio-0.99.484.ebuild
new file mode 100644
index 0000000..3682c5c
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-0.99.484.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
+
+# TODO
+# * package gin and gwt
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+# update from scripts in dependencies/common
+# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
+GWT_VER=2.7.0
+GIN_VER=1.5
+SELENIUM_VER=2.37.0
+CHROMEDRIVER_VER=2.7
+# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc
+PANDOC_VER=1.13.1
+# ls dependencies/common/*.tar.gz
+PACKRAT_VER=0.98.1000
+RMARKDOWN_VER=0.98.1000
+SHINYAPPS_VER=0.98.1000
+RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
+
+DESCRIPTION="IDE for the R language"
+HOMEPAGE="http://www.rstudio.org
+	https://github.com/rstudio/rstudio/"
+SRC_URI="https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
+	https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
+	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
+	https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dedicated server"
+
+QT_VER=5.4
+QT_SLOT=5
+RDEPEND="
+	app-text/pandoc
+	dev-haskell/pandoc-citeproc
+	>=dev-lang/R-2.11.1
+	>=dev-libs/boost-1.50:=
+	>=dev-libs/mathjax-2.3
+	dev-libs/openssl:0
+	sys-apps/util-linux
+	>=sys-devel/clang-3.5.0
+	sys-libs/zlib
+	|| ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+	x11-libs/pango
+	!dedicated? (
+		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5]
+		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
+		server? ( virtual/pam )
+	)
+	dedicated? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	|| ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
+	virtual/pkgconfig"
+#	test? ( dev-java/junit:4 )
+
+src_unpack() {
+	unpack ${P}.tar.gz gwt-${GWT_VER}.zip
+	cd "${S}" || die
+	mkdir -p src/gwt/lib/{gin,gwt} \
+		dependencies/common/dictionaries \
+		src/gwt/lib/selenium/${SELENIUM_VER} \
+		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
+	mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
+	unzip -qd src/gwt/lib/gin/${GIN_VER} \
+		"${DISTDIR}"/gin-${GIN_VER}.zip || die
+	unzip -qd dependencies/common/dictionaries \
+		"${DISTDIR}"/core-dictionaries.zip || die
+	unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
+		"${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
+	cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
+		src/gwt/lib/selenium/${SELENIUM_VER}/ || 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
+	unpack shinyapps-${SHINYAPPS_VER}.tar.gz
+	unpack rsconnect_${RSCONNECT_VER}.tar.gz
+	cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/rsconnect_${RSCONNECT_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}"/${PN}-0.99.473-paths.patch \
+		"${FILESDIR}"/${PN}-0.99.473-clang-pandoc.patch \
+		"${FILESDIR}"/${PN}-0.98.490-linker_flags.patch \
+		"${FILESDIR}"/${PN}-0.98.1091-boost-1.57.patch \
+		"${FILESDIR}"/${PN}-0.99.473-qtsingleapplication.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-23 || 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
+
+	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
+	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
+		-i src/cpp/server/ServerOptions.cpp \
+		|| die
+
+	# Set the rsession.conf file location for Gentoo prefix
+	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
+		-i src/cpp/session/SessionOptions.cpp \
+		|| die
+
+	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
+	# It provides a library that has its version number appended to the end,
+	# which is difficult to handle in cmake, as find_library does not support
+	# searching for wildcard library names. So I find the library name from the
+	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
+	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
+	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
+				   "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \
+					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
+						   -e 's@LIBS \*= -l@@')
+	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
+		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
+		|| die
+
+	# Avoid some of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	sed -e 's@\(\s*\)\(</classpath>\)@\1\2\n\1\<jvmarg value="-Duser.home=${env.T}"/>@g' \
+		-i "${S}"/src/gwt/build.xml \
+		|| 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")")
+		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_compile
+}
+
+src_install() {
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_install
+	pax-mark m "${ED}usr/bin/rstudio"
+	doconfd "${FILESDIR}"/rstudio-server.conf
+	dodir /etc/rstudio
+	insinto /etc/rstudio
+	doins "${FILESDIR}"/rsession.conf
+	dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf
+	if use dedicated || use server; then
+		dopamd src/cpp/server/extras/pam/rstudio
+		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
+	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 ;}
+}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2015-10-14 10:22 Mark Wright
  0 siblings, 0 replies; 36+ messages in thread
From: Mark Wright @ 2015-10-14 10:22 UTC (permalink / raw
  To: gentoo-commits

commit:     aa212206f8f858ba4ce1fcd86ed75eb0610ccb86
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 14 10:21:28 2015 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Wed Oct 14 10:21:28 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa212206

sci-mathematics/rstudio: Bump to 0.99.486

Package-Manager: portage-2.2.23

 sci-mathematics/rstudio/Manifest                |   1 +
 sci-mathematics/rstudio/rstudio-0.99.486.ebuild | 238 ++++++++++++++++++++++++
 2 files changed, 239 insertions(+)

diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 53840be..36cc28c 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -21,6 +21,7 @@ DIST rstudio-0.99.473.tar.gz 16993092 SHA256 a402995251393d50fa70e2e02188a8b32dc
 DIST rstudio-0.99.482.tar.gz 16992873 SHA256 1185d6ce5d3872e134f3255668d8f082370c760f06ec409c7b84c0936f52c4bf SHA512 bdb845cceae851d27323448a3570621bcb2aba7742e9e1669c88f3ebeaaade8c8371eb38f2ad348d7e2b740778c34f73e59013502ae3cebafba84e5d249c3e52 WHIRLPOOL 743440227c8d7e56000b1ff0b1a12def50e006b4f34d2067587274e2bae0eda42656787fc0cf6c51ffdbfcca08fc6eab0d042891bd77e4446b6fe26c6d19cc05
 DIST rstudio-0.99.483.tar.gz 16993049 SHA256 85ce1a2f40690e4ed0338b153a1b3279ce9564396d8c6d6201a0ad39297d4a9a SHA512 7d9cc8b471a4d799f286193da5f6f950f85e82949ede0f1ffe3626a429a49204878fb731250e5f54164a48e1d6e9cbb19a04a38ff83e35fd46c0ba05ef78a9bc WHIRLPOOL 0c5c1d86b0bafe9d5ca02397793f902b4dca7edc3f507a472b8b235f91965d8a769a7873cc87d834fbb121792b52eb6908018ce6579acdf3d285b6ec986abc20
 DIST rstudio-0.99.484.tar.gz 16993033 SHA256 8ca4abccb9b554713077cf1057ac13abadfd7606f22ac3386b2a88a38ae8a427 SHA512 407f50747bca749ef2c512e727cbe062abdd99c1eb76af09761e6bdfb4208f30117e1ee55b485447f64f6cf249bc939ef1fb4f8ce0199595e241a3cc617b4b8b WHIRLPOOL 8cc16553ea2703f005908c69803b64da4172092cb0b3ff9015e7ec354340fcd1cfa82a218ac890adffafe3565ead94bee6f7bd239b1c56ee38cbeb5896f556b0
+DIST rstudio-0.99.486.tar.gz 16992775 SHA256 4057195465e5032625bad0304bfbd9d123a78c3e4d6d5d41abcc6ef6ccd18a6f SHA512 bb88d12f8ae2f79779532371d03a698a2c2897c212c42c8438d5223c14e1033098dbd7c278a929958fa4bbc764a3ceb101abe03634f0e33192de44cf97128a1f WHIRLPOOL 13c35a69e525d90c6694d068526a2aede76a086427539294e46db67d0fc92759fb9cb0a1169cf88745ae1e121fdd7ba2e46bd2d2fb3fa17dc7fcc65848820941
 DIST selenium-java-2.37.0.zip 24625928 SHA256 0eebba65d8edb01c1f46e462907c58f5d6e1cb0ddf63660a9985c8432bdffbb7 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779 WHIRLPOOL eb6659aae26f3c78b6f998546b23d0636c9d00ed8a7f985db1463ac4bd483ccb3e643d84e2ca0f59e0636a8de79eb552ff1d68eb6f9c06907029f7552d8f7777
 DIST selenium-server-standalone-2.37.0.jar 34730734 SHA256 97bc8c699037fb6e99ba7af570fb60dbb1b7ce30cde2448287a44ef65b13023e SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018 WHIRLPOOL 20640591534f31f24825a9ed139589b182e8b60d86541bf0be104d3cc0280983f6566bd0459f2253ac3875b48a2798b205bac8f815a119fff6db625ce9bbc29e
 DIST shinyapps-0.98.1000.tar.gz 910095 SHA256 b95c512ae0a0fb4335878d9cfcf9073e2cb3ccfed73543abe27ea8878ed36d57 SHA512 3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c WHIRLPOOL ecc2bce78387cb42e9989163d8fca29220e66f085acde3323417058aebb624dafa8c0e1873c7d79e67324cbd5aad250ef9fcdbbc8f659d64482233b95d898a15

diff --git a/sci-mathematics/rstudio/rstudio-0.99.486.ebuild b/sci-mathematics/rstudio/rstudio-0.99.486.ebuild
new file mode 100644
index 0000000..3682c5c
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-0.99.486.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
+
+# TODO
+# * package gin and gwt
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+# update from scripts in dependencies/common
+# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
+GWT_VER=2.7.0
+GIN_VER=1.5
+SELENIUM_VER=2.37.0
+CHROMEDRIVER_VER=2.7
+# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc
+PANDOC_VER=1.13.1
+# ls dependencies/common/*.tar.gz
+PACKRAT_VER=0.98.1000
+RMARKDOWN_VER=0.98.1000
+SHINYAPPS_VER=0.98.1000
+RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
+
+DESCRIPTION="IDE for the R language"
+HOMEPAGE="http://www.rstudio.org
+	https://github.com/rstudio/rstudio/"
+SRC_URI="https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
+	https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
+	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
+	https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dedicated server"
+
+QT_VER=5.4
+QT_SLOT=5
+RDEPEND="
+	app-text/pandoc
+	dev-haskell/pandoc-citeproc
+	>=dev-lang/R-2.11.1
+	>=dev-libs/boost-1.50:=
+	>=dev-libs/mathjax-2.3
+	dev-libs/openssl:0
+	sys-apps/util-linux
+	>=sys-devel/clang-3.5.0
+	sys-libs/zlib
+	|| ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+	x11-libs/pango
+	!dedicated? (
+		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5]
+		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
+		server? ( virtual/pam )
+	)
+	dedicated? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	|| ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
+	virtual/pkgconfig"
+#	test? ( dev-java/junit:4 )
+
+src_unpack() {
+	unpack ${P}.tar.gz gwt-${GWT_VER}.zip
+	cd "${S}" || die
+	mkdir -p src/gwt/lib/{gin,gwt} \
+		dependencies/common/dictionaries \
+		src/gwt/lib/selenium/${SELENIUM_VER} \
+		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
+	mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
+	unzip -qd src/gwt/lib/gin/${GIN_VER} \
+		"${DISTDIR}"/gin-${GIN_VER}.zip || die
+	unzip -qd dependencies/common/dictionaries \
+		"${DISTDIR}"/core-dictionaries.zip || die
+	unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
+		"${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
+	cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
+		src/gwt/lib/selenium/${SELENIUM_VER}/ || 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
+	unpack shinyapps-${SHINYAPPS_VER}.tar.gz
+	unpack rsconnect_${RSCONNECT_VER}.tar.gz
+	cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/rsconnect_${RSCONNECT_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}"/${PN}-0.99.473-paths.patch \
+		"${FILESDIR}"/${PN}-0.99.473-clang-pandoc.patch \
+		"${FILESDIR}"/${PN}-0.98.490-linker_flags.patch \
+		"${FILESDIR}"/${PN}-0.98.1091-boost-1.57.patch \
+		"${FILESDIR}"/${PN}-0.99.473-qtsingleapplication.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-23 || 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
+
+	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
+	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
+		-i src/cpp/server/ServerOptions.cpp \
+		|| die
+
+	# Set the rsession.conf file location for Gentoo prefix
+	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
+		-i src/cpp/session/SessionOptions.cpp \
+		|| die
+
+	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
+	# It provides a library that has its version number appended to the end,
+	# which is difficult to handle in cmake, as find_library does not support
+	# searching for wildcard library names. So I find the library name from the
+	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
+	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
+	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
+				   "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \
+					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
+						   -e 's@LIBS \*= -l@@')
+	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
+		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
+		|| die
+
+	# Avoid some of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	sed -e 's@\(\s*\)\(</classpath>\)@\1\2\n\1\<jvmarg value="-Duser.home=${env.T}"/>@g' \
+		-i "${S}"/src/gwt/build.xml \
+		|| 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")")
+		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_compile
+}
+
+src_install() {
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_install
+	pax-mark m "${ED}usr/bin/rstudio"
+	doconfd "${FILESDIR}"/rstudio-server.conf
+	dodir /etc/rstudio
+	insinto /etc/rstudio
+	doins "${FILESDIR}"/rsession.conf
+	dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf
+	if use dedicated || use server; then
+		dopamd src/cpp/server/extras/pam/rstudio
+		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
+	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 ;}
+}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2016-01-22 21:03 Justin Lecher
  0 siblings, 0 replies; 36+ messages in thread
From: Justin Lecher @ 2016-01-22 21:03 UTC (permalink / raw
  To: gentoo-commits

commit:     4b4456d612fa160bfbd974e2bf026daf733a8853
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 22 19:36:44 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jan 22 21:03:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b4456d6

sci-mathematics/rstudio: Use egit_clean to clean workdir

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sci-mathematics/rstudio/rstudio-0.97.336.ebuild    | 13 ++++++++-----
 sci-mathematics/rstudio/rstudio-0.97.551.ebuild    | 13 ++++++++-----
 sci-mathematics/rstudio/rstudio-0.98.1028.ebuild   | 13 ++++++++-----
 sci-mathematics/rstudio/rstudio-0.98.1091.ebuild   | 13 ++++++++-----
 sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild | 13 ++++++++-----
 sci-mathematics/rstudio/rstudio-0.98.490.ebuild    | 13 ++++++++-----
 sci-mathematics/rstudio/rstudio-0.98.932.ebuild    | 10 ++++++----
 sci-mathematics/rstudio/rstudio-0.98.953.ebuild    | 10 ++++++----
 sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild | 13 ++++++++-----
 sci-mathematics/rstudio/rstudio-0.99.482.ebuild    | 13 ++++++++-----
 sci-mathematics/rstudio/rstudio-0.99.483.ebuild    | 13 ++++++++-----
 sci-mathematics/rstudio/rstudio-0.99.484.ebuild    | 13 ++++++++-----
 sci-mathematics/rstudio/rstudio-0.99.486.ebuild    | 13 ++++++++-----
 13 files changed, 100 insertions(+), 63 deletions(-)

diff --git a/sci-mathematics/rstudio/rstudio-0.97.336.ebuild b/sci-mathematics/rstudio/rstudio-0.97.336.ebuild
index f473f63..9b1726f 100644
--- a/sci-mathematics/rstudio/rstudio-0.97.336.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.97.336.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,8 @@ GINVER=1.5
 
 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
+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-dictionaries/core-dictionaries.zip"
@@ -29,7 +30,8 @@ IUSE="dedicated server"
 
 QTVER=4.8
 QTSLOT=4
-RDEPEND=">=dev-lang/R-2.11.1
+RDEPEND="
+	>=dev-lang/R-2.11.1
 	>=dev-libs/boost-1.50:=
 	dev-libs/mathjax
 	dev-libs/openssl:0
@@ -63,9 +65,10 @@ src_unpack() {
 src_prepare() {
 	java-pkg-2_src_prepare
 
-	find . -name .gitignore -delete || die
+	egit_clean
 
-	epatch "${FILESDIR}"/${P}-prefs.patch \
+	epatch \
+		"${FILESDIR}"/${P}-prefs.patch \
 		"${FILESDIR}"/${P}-paths.patch \
 		"${FILESDIR}"/${P}-linker_flags.patch \
 		"${FILESDIR}"/${P}-boost-1.53.patch

diff --git a/sci-mathematics/rstudio/rstudio-0.97.551.ebuild b/sci-mathematics/rstudio/rstudio-0.97.551.ebuild
index f473f63..9b1726f 100644
--- a/sci-mathematics/rstudio/rstudio-0.97.551.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.97.551.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,8 @@ GINVER=1.5
 
 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
+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-dictionaries/core-dictionaries.zip"
@@ -29,7 +30,8 @@ IUSE="dedicated server"
 
 QTVER=4.8
 QTSLOT=4
-RDEPEND=">=dev-lang/R-2.11.1
+RDEPEND="
+	>=dev-lang/R-2.11.1
 	>=dev-libs/boost-1.50:=
 	dev-libs/mathjax
 	dev-libs/openssl:0
@@ -63,9 +65,10 @@ src_unpack() {
 src_prepare() {
 	java-pkg-2_src_prepare
 
-	find . -name .gitignore -delete || die
+	egit_clean
 
-	epatch "${FILESDIR}"/${P}-prefs.patch \
+	epatch \
+		"${FILESDIR}"/${P}-prefs.patch \
 		"${FILESDIR}"/${P}-paths.patch \
 		"${FILESDIR}"/${P}-linker_flags.patch \
 		"${FILESDIR}"/${P}-boost-1.53.patch

diff --git a/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild b/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild
index 52dc926..2616424 100644
--- a/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -21,9 +21,11 @@ PACKRAT_VER=0.3.0
 RMARKDOWN_VER=0.2.49
 
 DESCRIPTION="IDE for the R language"
-HOMEPAGE="http://www.rstudio.org
+HOMEPAGE="
+	http://www.rstudio.org
 	https://github.com/rstudio/rstudio/"
-SRC_URI="https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+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
@@ -93,9 +95,10 @@ src_unpack() {
 src_prepare() {
 	java-pkg-2_src_prepare
 
-	find . -name .gitignore -delete || die
+	egit_clean
 
-	epatch "${FILESDIR}"/${PN}-0.98.490-prefs.patch \
+	epatch \
+		"${FILESDIR}"/${PN}-0.98.490-prefs.patch \
 		"${FILESDIR}"/${PN}-0.98.932-paths.patch \
 		"${FILESDIR}"/${PN}-0.98.932-pandoc.patch \
 		"${FILESDIR}"/${PN}-0.98.490-linker_flags.patch

diff --git a/sci-mathematics/rstudio/rstudio-0.98.1091.ebuild b/sci-mathematics/rstudio/rstudio-0.98.1091.ebuild
index cdf98d3..906444e 100644
--- a/sci-mathematics/rstudio/rstudio-0.98.1091.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.98.1091.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,9 +22,11 @@ RMARKDOWN_VER=0.98.1000
 SHINYAPPS_VER=0.98.1000
 
 DESCRIPTION="IDE for the R language"
-HOMEPAGE="http://www.rstudio.org
+HOMEPAGE="
+	http://www.rstudio.org
 	https://github.com/rstudio/rstudio/"
-SRC_URI="https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+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
@@ -102,9 +104,10 @@ src_unpack() {
 src_prepare() {
 	java-pkg-2_src_prepare
 
-	find . -name .gitignore -delete || die
+	egit_clean
 
-	epatch "${FILESDIR}"/${PN}-0.98.490-prefs.patch \
+	epatch \
+		"${FILESDIR}"/${PN}-0.98.490-prefs.patch \
 		"${FILESDIR}"/${PN}-0.98.932-paths.patch \
 		"${FILESDIR}"/${PN}-0.98.1091-pandoc.patch \
 		"${FILESDIR}"/${PN}-0.98.490-linker_flags.patch \

diff --git a/sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild b/sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild
index 898d7bf..d7b51f9 100644
--- a/sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,8 @@ GINVER=1.5
 
 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
+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-dictionaries/core-dictionaries.zip"
@@ -28,7 +29,8 @@ IUSE=""
 
 QTVER=4.8
 QTSLOT=4
-RDEPEND=">=dev-lang/R-2.11.1
+RDEPEND="
+	>=dev-lang/R-2.11.1
 	>=dev-libs/boost-1.50:=
 	dev-libs/mathjax
 	dev-libs/openssl:0
@@ -59,9 +61,10 @@ src_unpack() {
 src_prepare() {
 	java-pkg-2_src_prepare
 
-	find . -name .gitignore -delete || die
+	egit_clean
 
-	epatch "${FILESDIR}"/${P}-prefs.patch \
+	epatch \
+		"${FILESDIR}"/${P}-prefs.patch \
 		"${FILESDIR}"/${P}-paths.patch \
 		"${FILESDIR}"/${P}-linker_flags.patch
 

diff --git a/sci-mathematics/rstudio/rstudio-0.98.490.ebuild b/sci-mathematics/rstudio/rstudio-0.98.490.ebuild
index 7614e24..d44e5fd 100644
--- a/sci-mathematics/rstudio/rstudio-0.98.490.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.98.490.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,8 @@ GINVER=1.5
 
 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
+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-dictionaries/core-dictionaries.zip"
@@ -28,7 +29,8 @@ IUSE="dedicated server"
 
 QTVER=4.8
 QTSLOT=4
-RDEPEND=">=dev-lang/R-2.11.1
+RDEPEND="
+	>=dev-lang/R-2.11.1
 	>=dev-libs/boost-1.50:=
 	dev-libs/mathjax
 	dev-libs/openssl:0
@@ -63,9 +65,10 @@ src_unpack() {
 src_prepare() {
 	java-pkg-2_src_prepare
 
-	find . -name .gitignore -delete || die
+	egit_clean
 
-	epatch "${FILESDIR}"/${P}-prefs.patch \
+	epatch \
+		"${FILESDIR}"/${P}-prefs.patch \
 		"${FILESDIR}"/${P}-paths.patch \
 		"${FILESDIR}"/${P}-linker_flags.patch
 

diff --git a/sci-mathematics/rstudio/rstudio-0.98.932.ebuild b/sci-mathematics/rstudio/rstudio-0.98.932.ebuild
index a76aaad..25d85f4 100644
--- a/sci-mathematics/rstudio/rstudio-0.98.932.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.98.932.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -21,7 +21,8 @@ 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
+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
@@ -94,9 +95,10 @@ src_unpack() {
 src_prepare() {
 	java-pkg-2_src_prepare
 
-	find . -name .gitignore -delete || die
+	egit_clean
 
-	epatch "${FILESDIR}"/${PN}-0.98.490-prefs.patch \
+	epatch \
+		"${FILESDIR}"/${PN}-0.98.490-prefs.patch \
 		"${FILESDIR}"/${P}-paths.patch \
 		"${FILESDIR}"/${P}-pandoc.patch \
 		"${FILESDIR}"/${PN}-0.98.490-linker_flags.patch

diff --git a/sci-mathematics/rstudio/rstudio-0.98.953.ebuild b/sci-mathematics/rstudio/rstudio-0.98.953.ebuild
index 996d2f1..f9d1868 100644
--- a/sci-mathematics/rstudio/rstudio-0.98.953.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.98.953.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -21,7 +21,8 @@ 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
+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
@@ -95,9 +96,10 @@ src_unpack() {
 src_prepare() {
 	java-pkg-2_src_prepare
 
-	find . -name .gitignore -delete || die
+	egit_clean
 
-	epatch "${FILESDIR}"/${PN}-0.98.490-prefs.patch \
+	epatch \
+		"${FILESDIR}"/${PN}-0.98.490-prefs.patch \
 		"${FILESDIR}"/${PN}-0.98.932-paths.patch \
 		"${FILESDIR}"/${PN}-0.98.932-pandoc.patch \
 		"${FILESDIR}"/${PN}-0.98.490-linker_flags.patch

diff --git a/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild b/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
index 3682c5c..64818de 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -26,9 +26,11 @@ SHINYAPPS_VER=0.98.1000
 RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
 
 DESCRIPTION="IDE for the R language"
-HOMEPAGE="http://www.rstudio.org
+HOMEPAGE="
+	http://www.rstudio.org
 	https://github.com/rstudio/rstudio/"
-SRC_URI="https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+SRC_URI="
+	https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
 	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
 	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
@@ -123,9 +125,10 @@ src_unpack() {
 src_prepare() {
 	java-pkg-2_src_prepare
 
-	find . -name .gitignore -delete || die
+	egit_clean
 
-	epatch "${FILESDIR}"/${PN}-0.98.490-prefs.patch \
+	epatch \
+		"${FILESDIR}"/${PN}-0.98.490-prefs.patch \
 		"${FILESDIR}"/${PN}-0.99.473-paths.patch \
 		"${FILESDIR}"/${PN}-0.99.473-clang-pandoc.patch \
 		"${FILESDIR}"/${PN}-0.98.490-linker_flags.patch \

diff --git a/sci-mathematics/rstudio/rstudio-0.99.482.ebuild b/sci-mathematics/rstudio/rstudio-0.99.482.ebuild
index 3682c5c..64818de 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.482.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.482.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -26,9 +26,11 @@ SHINYAPPS_VER=0.98.1000
 RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
 
 DESCRIPTION="IDE for the R language"
-HOMEPAGE="http://www.rstudio.org
+HOMEPAGE="
+	http://www.rstudio.org
 	https://github.com/rstudio/rstudio/"
-SRC_URI="https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+SRC_URI="
+	https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
 	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
 	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
@@ -123,9 +125,10 @@ src_unpack() {
 src_prepare() {
 	java-pkg-2_src_prepare
 
-	find . -name .gitignore -delete || die
+	egit_clean
 
-	epatch "${FILESDIR}"/${PN}-0.98.490-prefs.patch \
+	epatch \
+		"${FILESDIR}"/${PN}-0.98.490-prefs.patch \
 		"${FILESDIR}"/${PN}-0.99.473-paths.patch \
 		"${FILESDIR}"/${PN}-0.99.473-clang-pandoc.patch \
 		"${FILESDIR}"/${PN}-0.98.490-linker_flags.patch \

diff --git a/sci-mathematics/rstudio/rstudio-0.99.483.ebuild b/sci-mathematics/rstudio/rstudio-0.99.483.ebuild
index 3682c5c..64818de 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.483.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.483.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -26,9 +26,11 @@ SHINYAPPS_VER=0.98.1000
 RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
 
 DESCRIPTION="IDE for the R language"
-HOMEPAGE="http://www.rstudio.org
+HOMEPAGE="
+	http://www.rstudio.org
 	https://github.com/rstudio/rstudio/"
-SRC_URI="https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+SRC_URI="
+	https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
 	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
 	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
@@ -123,9 +125,10 @@ src_unpack() {
 src_prepare() {
 	java-pkg-2_src_prepare
 
-	find . -name .gitignore -delete || die
+	egit_clean
 
-	epatch "${FILESDIR}"/${PN}-0.98.490-prefs.patch \
+	epatch \
+		"${FILESDIR}"/${PN}-0.98.490-prefs.patch \
 		"${FILESDIR}"/${PN}-0.99.473-paths.patch \
 		"${FILESDIR}"/${PN}-0.99.473-clang-pandoc.patch \
 		"${FILESDIR}"/${PN}-0.98.490-linker_flags.patch \

diff --git a/sci-mathematics/rstudio/rstudio-0.99.484.ebuild b/sci-mathematics/rstudio/rstudio-0.99.484.ebuild
index 3682c5c..64818de 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.484.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.484.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -26,9 +26,11 @@ SHINYAPPS_VER=0.98.1000
 RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
 
 DESCRIPTION="IDE for the R language"
-HOMEPAGE="http://www.rstudio.org
+HOMEPAGE="
+	http://www.rstudio.org
 	https://github.com/rstudio/rstudio/"
-SRC_URI="https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+SRC_URI="
+	https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
 	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
 	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
@@ -123,9 +125,10 @@ src_unpack() {
 src_prepare() {
 	java-pkg-2_src_prepare
 
-	find . -name .gitignore -delete || die
+	egit_clean
 
-	epatch "${FILESDIR}"/${PN}-0.98.490-prefs.patch \
+	epatch \
+		"${FILESDIR}"/${PN}-0.98.490-prefs.patch \
 		"${FILESDIR}"/${PN}-0.99.473-paths.patch \
 		"${FILESDIR}"/${PN}-0.99.473-clang-pandoc.patch \
 		"${FILESDIR}"/${PN}-0.98.490-linker_flags.patch \

diff --git a/sci-mathematics/rstudio/rstudio-0.99.486.ebuild b/sci-mathematics/rstudio/rstudio-0.99.486.ebuild
index 3682c5c..64818de 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.486.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.486.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -26,9 +26,11 @@ SHINYAPPS_VER=0.98.1000
 RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
 
 DESCRIPTION="IDE for the R language"
-HOMEPAGE="http://www.rstudio.org
+HOMEPAGE="
+	http://www.rstudio.org
 	https://github.com/rstudio/rstudio/"
-SRC_URI="https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+SRC_URI="
+	https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
 	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
 	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
@@ -123,9 +125,10 @@ src_unpack() {
 src_prepare() {
 	java-pkg-2_src_prepare
 
-	find . -name .gitignore -delete || die
+	egit_clean
 
-	epatch "${FILESDIR}"/${PN}-0.98.490-prefs.patch \
+	epatch \
+		"${FILESDIR}"/${PN}-0.98.490-prefs.patch \
 		"${FILESDIR}"/${PN}-0.99.473-paths.patch \
 		"${FILESDIR}"/${PN}-0.99.473-clang-pandoc.patch \
 		"${FILESDIR}"/${PN}-0.98.490-linker_flags.patch \


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2016-01-29  4:59 Mark Wright
  0 siblings, 0 replies; 36+ messages in thread
From: Mark Wright @ 2016-01-29  4:59 UTC (permalink / raw
  To: gentoo-commits

commit:     09541034bc6bce8db9f12a12ff351c4ca9baa5d2
Author:     Matthew Brewer <tomboy64 <AT> sina <DOT> cn>
AuthorDate: Fri Jan 29 04:18:36 2016 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Fri Jan 29 04:18:36 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09541034

sci-mathematics/rstudio: cosmetic changes to PATCHES array in 0.99.486-r1

Package-Manager: portage-2.2.26
RepoMan-Options: --ignore-arches

 sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild b/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild
index c5b11ff..4f1c7f3 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -87,6 +87,16 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 #	test? ( dev-java/junit:4 )
 
+PATCHES=(
+		"${FILESDIR}/${PN}-0.98.490-prefs.patch"
+		"${FILESDIR}/${PN}-0.99.473-paths.patch"
+		"${FILESDIR}/${PN}-0.99.473-clang-pandoc.patch"
+		"${FILESDIR}/${PN}-0.98.490-linker_flags.patch"
+		"${FILESDIR}/${PN}-0.98.1091-boost-1.57.patch"
+		"${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch"
+		"${FILESDIR}/${PN}-0.99.486-systemd.patch"
+)
+
 src_unpack() {
 	unpack ${P}.tar.gz gwt-${GWT_VER}.zip
 	cd "${S}" || die
@@ -125,13 +135,7 @@ src_prepare() {
 
 	find . -name .gitignore -delete || die
 
-	epatch "${FILESDIR}"/${PN}-0.98.490-prefs.patch \
-		"${FILESDIR}"/${PN}-0.99.473-paths.patch \
-		"${FILESDIR}"/${PN}-0.99.473-clang-pandoc.patch \
-		"${FILESDIR}"/${PN}-0.98.490-linker_flags.patch \
-		"${FILESDIR}"/${PN}-0.98.1091-boost-1.57.patch \
-		"${FILESDIR}"/${PN}-0.99.473-qtsingleapplication.patch \
-		"${FILESDIR}"/${PN}-0.99.486-systemd.patch
+	epatch "${PATCHES[@]}"
 
 	# Enable CMake to install our .service file for systemd usage
 	mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2016-01-29  6:27 Mark Wright
  0 siblings, 0 replies; 36+ messages in thread
From: Mark Wright @ 2016-01-29  6:27 UTC (permalink / raw
  To: gentoo-commits

commit:     dadef5966a7d346ab10d19bcc3af2f8f060172a3
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 29 06:23:49 2016 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Fri Jan 29 06:24:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dadef596

sci-mathematics/rstudio: Bump to 0.99.491

Package-Manager: portage-2.2.27

 sci-mathematics/rstudio/Manifest                |   1 +
 sci-mathematics/rstudio/rstudio-0.99.491.ebuild | 249 ++++++++++++++++++++++++
 2 files changed, 250 insertions(+)

diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 36cc28c..cc582ca 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -22,6 +22,7 @@ DIST rstudio-0.99.482.tar.gz 16992873 SHA256 1185d6ce5d3872e134f3255668d8f082370
 DIST rstudio-0.99.483.tar.gz 16993049 SHA256 85ce1a2f40690e4ed0338b153a1b3279ce9564396d8c6d6201a0ad39297d4a9a SHA512 7d9cc8b471a4d799f286193da5f6f950f85e82949ede0f1ffe3626a429a49204878fb731250e5f54164a48e1d6e9cbb19a04a38ff83e35fd46c0ba05ef78a9bc WHIRLPOOL 0c5c1d86b0bafe9d5ca02397793f902b4dca7edc3f507a472b8b235f91965d8a769a7873cc87d834fbb121792b52eb6908018ce6579acdf3d285b6ec986abc20
 DIST rstudio-0.99.484.tar.gz 16993033 SHA256 8ca4abccb9b554713077cf1057ac13abadfd7606f22ac3386b2a88a38ae8a427 SHA512 407f50747bca749ef2c512e727cbe062abdd99c1eb76af09761e6bdfb4208f30117e1ee55b485447f64f6cf249bc939ef1fb4f8ce0199595e241a3cc617b4b8b WHIRLPOOL 8cc16553ea2703f005908c69803b64da4172092cb0b3ff9015e7ec354340fcd1cfa82a218ac890adffafe3565ead94bee6f7bd239b1c56ee38cbeb5896f556b0
 DIST rstudio-0.99.486.tar.gz 16992775 SHA256 4057195465e5032625bad0304bfbd9d123a78c3e4d6d5d41abcc6ef6ccd18a6f SHA512 bb88d12f8ae2f79779532371d03a698a2c2897c212c42c8438d5223c14e1033098dbd7c278a929958fa4bbc764a3ceb101abe03634f0e33192de44cf97128a1f WHIRLPOOL 13c35a69e525d90c6694d068526a2aede76a086427539294e46db67d0fc92759fb9cb0a1169cf88745ae1e121fdd7ba2e46bd2d2fb3fa17dc7fcc65848820941
+DIST rstudio-0.99.491.tar.gz 16992702 SHA256 e8c21e2262b610a7ccf39283b97d114bee33c6840a060067b8019404ff44b03f SHA512 2658694d6154f4b91b2dc07a7ec653edb7f593c4d9829a06a5e600e4db465ca6059418be6812d5ba2529fd6202dd136f0f58d74576f856fdcf6f81032d74f3c2 WHIRLPOOL e71650a07cc010ab3c25955c7fa9e90eee68577c1ef78e02a5f81a0160c688908ec5ec4fd89c89e5a9bc49b926623cd5de976fb249aa2d472354d23f5fad76de
 DIST selenium-java-2.37.0.zip 24625928 SHA256 0eebba65d8edb01c1f46e462907c58f5d6e1cb0ddf63660a9985c8432bdffbb7 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779 WHIRLPOOL eb6659aae26f3c78b6f998546b23d0636c9d00ed8a7f985db1463ac4bd483ccb3e643d84e2ca0f59e0636a8de79eb552ff1d68eb6f9c06907029f7552d8f7777
 DIST selenium-server-standalone-2.37.0.jar 34730734 SHA256 97bc8c699037fb6e99ba7af570fb60dbb1b7ce30cde2448287a44ef65b13023e SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018 WHIRLPOOL 20640591534f31f24825a9ed139589b182e8b60d86541bf0be104d3cc0280983f6566bd0459f2253ac3875b48a2798b205bac8f815a119fff6db625ce9bbc29e
 DIST shinyapps-0.98.1000.tar.gz 910095 SHA256 b95c512ae0a0fb4335878d9cfcf9073e2cb3ccfed73543abe27ea8878ed36d57 SHA512 3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c WHIRLPOOL ecc2bce78387cb42e9989163d8fca29220e66f085acde3323417058aebb624dafa8c0e1873c7d79e67324cbd5aad250ef9fcdbbc8f659d64482233b95d898a15

diff --git a/sci-mathematics/rstudio/rstudio-0.99.491.ebuild b/sci-mathematics/rstudio/rstudio-0.99.491.ebuild
new file mode 100644
index 0000000..764c9da
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-0.99.491.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
+
+# TODO
+# * package gin and gwt
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+# update from scripts in dependencies/common
+# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
+GWT_VER=2.7.0
+GIN_VER=1.5
+SELENIUM_VER=2.37.0
+CHROMEDRIVER_VER=2.7
+# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc
+PANDOC_VER=1.13.1
+# ls dependencies/common/*.tar.gz
+PACKRAT_VER=0.98.1000
+RMARKDOWN_VER=0.98.1000
+SHINYAPPS_VER=0.98.1000
+RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
+
+DESCRIPTION="IDE for the R language"
+HOMEPAGE="
+	http://www.rstudio.org
+	https://github.com/rstudio/rstudio/"
+SRC_URI="
+	https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
+	https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
+	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
+	https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dedicated server"
+
+QT_VER=5.4
+QT_SLOT=5
+RDEPEND="
+	app-text/pandoc
+	dev-haskell/pandoc-citeproc
+	>=dev-lang/R-2.11.1
+	>=dev-libs/boost-1.50:=
+	>=dev-libs/mathjax-2.3
+	dev-libs/openssl:0
+	sys-apps/util-linux
+	>=sys-devel/clang-3.5.0
+	sys-libs/zlib
+	|| ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+	x11-libs/pango
+	!dedicated? (
+		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5]
+		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
+		server? ( virtual/pam )
+	)
+	dedicated? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	|| ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
+	virtual/pkgconfig"
+#	test? ( dev-java/junit:4 )
+
+PATCHES=(
+		"${FILESDIR}/${PN}-0.98.490-prefs.patch"
+		"${FILESDIR}/${PN}-0.99.473-paths.patch"
+		"${FILESDIR}/${PN}-0.99.473-clang-pandoc.patch"
+		"${FILESDIR}/${PN}-0.98.490-linker_flags.patch"
+		"${FILESDIR}/${PN}-0.98.1091-boost-1.57.patch"
+		"${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch"
+		"${FILESDIR}/${PN}-0.99.486-systemd.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz gwt-${GWT_VER}.zip
+	cd "${S}" || die
+	mkdir -p src/gwt/lib/{gin,gwt} \
+		dependencies/common/dictionaries \
+		src/gwt/lib/selenium/${SELENIUM_VER} \
+		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
+	mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
+	unzip -qd src/gwt/lib/gin/${GIN_VER} \
+		"${DISTDIR}"/gin-${GIN_VER}.zip || die
+	unzip -qd dependencies/common/dictionaries \
+		"${DISTDIR}"/core-dictionaries.zip || die
+	unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
+		"${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
+	cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
+		src/gwt/lib/selenium/${SELENIUM_VER}/ || 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
+	unpack shinyapps-${SHINYAPPS_VER}.tar.gz
+	unpack rsconnect_${RSCONNECT_VER}.tar.gz
+	cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \
+		. || die
+}
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	egit_clean
+
+	epatch "${PATCHES[@]}"
+
+	# Enable CMake to install our .service file for systemd usage
+	mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
+	cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
+
+	# 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-23 || 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
+
+	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
+	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
+		-i src/cpp/server/ServerOptions.cpp \
+		|| die
+
+	# Set the rsession.conf file location for Gentoo prefix
+	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
+		-i src/cpp/session/SessionOptions.cpp \
+		|| die
+
+	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
+	# It provides a library that has its version number appended to the end,
+	# which is difficult to handle in cmake, as find_library does not support
+	# searching for wildcard library names. So I find the library name from the
+	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
+	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
+	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
+				   "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \
+					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
+						   -e 's@LIBS \*= -l@@')
+	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
+		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
+		|| die
+
+	# Avoid some of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	sed -e 's@\(\s*\)\(</classpath>\)@\1\2\n\1\<jvmarg value="-Duser.home=${env.T}"/>@g' \
+		-i "${S}"/src/gwt/build.xml \
+		|| 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")")
+		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_compile
+}
+
+src_install() {
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_install
+	pax-mark m "${ED}usr/bin/rstudio"
+	doconfd "${FILESDIR}"/rstudio-server.conf
+	dodir /etc/rstudio
+	insinto /etc/rstudio
+	doins "${FILESDIR}"/rsession.conf
+	dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf
+	if use dedicated || use server; then
+		dopamd src/cpp/server/extras/pam/rstudio
+		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
+	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 ;}
+}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2016-04-08 10:18 Mark Wright
  0 siblings, 0 replies; 36+ messages in thread
From: Mark Wright @ 2016-04-08 10:18 UTC (permalink / raw
  To: gentoo-commits

commit:     578fce1cfc71f1128c843d35468904c8e8323a74
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  8 10:17:53 2016 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Fri Apr  8 10:17:53 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=578fce1c

sci-mathematics/rstudio: Bump to 0.99.893

 sci-mathematics/rstudio/Manifest                |   1 +
 sci-mathematics/rstudio/rstudio-0.99.893.ebuild | 250 ++++++++++++++++++++++++
 2 files changed, 251 insertions(+)

diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index d84f721..c98d26b 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -24,6 +24,7 @@ DIST rstudio-0.99.484.tar.gz 16993033 SHA256 8ca4abccb9b554713077cf1057ac13abadf
 DIST rstudio-0.99.486.tar.gz 16992775 SHA256 4057195465e5032625bad0304bfbd9d123a78c3e4d6d5d41abcc6ef6ccd18a6f SHA512 bb88d12f8ae2f79779532371d03a698a2c2897c212c42c8438d5223c14e1033098dbd7c278a929958fa4bbc764a3ceb101abe03634f0e33192de44cf97128a1f WHIRLPOOL 13c35a69e525d90c6694d068526a2aede76a086427539294e46db67d0fc92759fb9cb0a1169cf88745ae1e121fdd7ba2e46bd2d2fb3fa17dc7fcc65848820941
 DIST rstudio-0.99.491.tar.gz 16992702 SHA256 e8c21e2262b610a7ccf39283b97d114bee33c6840a060067b8019404ff44b03f SHA512 2658694d6154f4b91b2dc07a7ec653edb7f593c4d9829a06a5e600e4db465ca6059418be6812d5ba2529fd6202dd136f0f58d74576f856fdcf6f81032d74f3c2 WHIRLPOOL e71650a07cc010ab3c25955c7fa9e90eee68577c1ef78e02a5f81a0160c688908ec5ec4fd89c89e5a9bc49b926623cd5de976fb249aa2d472354d23f5fad76de
 DIST rstudio-0.99.879.tar.gz 17406999 SHA256 73fa59be34eb63d9ed194642a93ad529d2c67cdcbcd2f291952fdef8e999a097 SHA512 c2bbe598a4a9c2abc69e39807af70be5729a06bbcb73bac5249f74f3c3daddb2909bf4a46d988f0d4bfeabe308f0c31d2a75aa28a52f11c1343dfcead07e2c45 WHIRLPOOL 5c9c75a7891ac53eb80a36eff518d77a0c281b16bff383526ac1ede07ee57486d7b00be4e400a0cad48dfea92729becf25c67f18782af7930f9b4218592afe5c
+DIST rstudio-0.99.893.tar.gz 17407634 SHA256 90a657b1fa16cfc575ca884789bac47f17832eb8b92496d044da3c5d79b0b874 SHA512 baa2a8c27e101e74b8a3f3b1cd290c90031881ae11fb44606b9af1efa4114c4c6fe68298f554d8b83f96418159477579414ddb99d49d2942c021aa0697947222 WHIRLPOOL a81ed5ee17a730e9674b2a98b95f87e70c532df95fda15402952901f7def24cc673db724841579e5dbf184a3e9fc16cfada93284b40014edf74863a61e0798a5
 DIST selenium-java-2.37.0.zip 24625928 SHA256 0eebba65d8edb01c1f46e462907c58f5d6e1cb0ddf63660a9985c8432bdffbb7 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779 WHIRLPOOL eb6659aae26f3c78b6f998546b23d0636c9d00ed8a7f985db1463ac4bd483ccb3e643d84e2ca0f59e0636a8de79eb552ff1d68eb6f9c06907029f7552d8f7777
 DIST selenium-server-standalone-2.37.0.jar 34730734 SHA256 97bc8c699037fb6e99ba7af570fb60dbb1b7ce30cde2448287a44ef65b13023e SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018 WHIRLPOOL 20640591534f31f24825a9ed139589b182e8b60d86541bf0be104d3cc0280983f6566bd0459f2253ac3875b48a2798b205bac8f815a119fff6db625ce9bbc29e
 DIST shinyapps-0.98.1000.tar.gz 910095 SHA256 b95c512ae0a0fb4335878d9cfcf9073e2cb3ccfed73543abe27ea8878ed36d57 SHA512 3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c WHIRLPOOL ecc2bce78387cb42e9989163d8fca29220e66f085acde3323417058aebb624dafa8c0e1873c7d79e67324cbd5aad250ef9fcdbbc8f659d64482233b95d898a15

diff --git a/sci-mathematics/rstudio/rstudio-0.99.893.ebuild b/sci-mathematics/rstudio/rstudio-0.99.893.ebuild
new file mode 100644
index 0000000..996a3eb
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-0.99.893.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
+
+# TODO
+# * package gin and gwt
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+# update from scripts in dependencies/common
+# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
+GWT_VER=2.7.0
+GIN_VER=1.5
+SELENIUM_VER=2.37.0
+CHROMEDRIVER_VER=2.7
+# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc
+PANDOC_VER=1.13.1
+# ls dependencies/common/*.tar.gz
+PACKRAT_VER=0.98.1000
+RMARKDOWN_VER=0.98.1000
+SHINYAPPS_VER=0.98.1000
+RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
+
+DESCRIPTION="IDE for the R language"
+HOMEPAGE="
+	http://www.rstudio.org
+	https://github.com/rstudio/rstudio/"
+SRC_URI="
+	https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
+	https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
+	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
+	https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dedicated server"
+
+QT_VER=5.4
+QT_SLOT=5
+RDEPEND="
+	app-text/pandoc
+	dev-haskell/pandoc-citeproc
+	>=dev-lang/R-2.11.1
+	>=dev-libs/boost-1.50:=
+	>=dev-libs/mathjax-2.3
+	dev-libs/openssl:0
+	sys-apps/util-linux
+	>=sys-devel/clang-3.5.0
+	sys-libs/zlib
+	>=virtual/jre-1.7:=
+	x11-libs/pango
+	!dedicated? (
+		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5]
+		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
+		server? ( virtual/pam )
+	)
+	dedicated? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	>=virtual/jdk-1.7:=
+	virtual/pkgconfig"
+#	test? ( dev-java/junit:4 )
+
+PATCHES=(
+		"${FILESDIR}/${PN}-0.99.879-prefs.patch"
+		"${FILESDIR}/${PN}-0.99.879-paths.patch"
+		"${FILESDIR}/${PN}-0.99.879-clang-pandoc.patch"
+		"${FILESDIR}/${PN}-0.98.490-linker_flags.patch"
+		"${FILESDIR}/${PN}-0.98.1091-boost-1.57.patch"
+		"${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch"
+		"${FILESDIR}/${PN}-0.99.486-systemd.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz gwt-${GWT_VER}.zip
+	cd "${S}" || die
+	mkdir -p src/gwt/lib/{gin,gwt} \
+		dependencies/common/dictionaries \
+		src/gwt/lib/selenium/${SELENIUM_VER} \
+		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
+	mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
+	unzip -qd src/gwt/lib/gin/${GIN_VER} \
+		"${DISTDIR}"/gin-${GIN_VER}.zip || die
+	unzip -qd dependencies/common/dictionaries \
+		"${DISTDIR}"/core-dictionaries.zip || die
+	unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
+		"${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
+	cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
+		src/gwt/lib/selenium/${SELENIUM_VER}/ || 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
+	unpack shinyapps-${SHINYAPPS_VER}.tar.gz
+	unpack rsconnect_${RSCONNECT_VER}.tar.gz
+	cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \
+		. || die
+}
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	egit_clean
+
+	epatch "${PATCHES[@]}"
+
+	# Enable CMake to install our .service file for systemd usage
+	mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
+	cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
+
+	# 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-23 || 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
+
+	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
+	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
+		-i src/cpp/server/ServerOptions.cpp \
+		|| die
+
+	# Set the rsession.conf file location for Gentoo prefix
+	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
+		-i src/cpp/session/SessionOptions.cpp \
+		|| die
+
+	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
+	# It provides a library that has its version number appended to the end,
+	# which is difficult to handle in cmake, as find_library does not support
+	# searching for wildcard library names. So I find the library name from the
+	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
+	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
+	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
+				   "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \
+					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
+						   -e 's@LIBS \*= -l@@')
+	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
+		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
+		|| die
+
+	# The git commit for tag v0.99.879
+	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 9ac918338d6f9d6dd25807d6d746b470f1cfcf6d@'\
+		-i "${S}"/CMakeLists.txt \
+		"${S}"/CMakeGlobals.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")")
+		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
+		-DRSTUDIO_VERIFY_R_VERSION=FALSE
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_compile
+}
+
+src_install() {
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_install
+	pax-mark m "${ED}usr/bin/rstudio"
+	doconfd "${FILESDIR}"/rstudio-server.conf
+	dodir /etc/rstudio
+	insinto /etc/rstudio
+	doins "${FILESDIR}"/rsession.conf
+	dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf
+	if use dedicated || use server; then
+		dopamd src/cpp/server/extras/pam/rstudio
+		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
+	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 ;}
+}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2016-04-19  9:22 Mark Wright
  0 siblings, 0 replies; 36+ messages in thread
From: Mark Wright @ 2016-04-19  9:22 UTC (permalink / raw
  To: gentoo-commits

commit:     967303f8f3406d031b7e36c863dc0029d4a5410b
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 09:20:58 2016 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Tue Apr 19 09:21:49 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=967303f8

sci-mathematics/rstudio: Bump to 0.99.896

 sci-mathematics/rstudio/Manifest                                      | 1 +
 sci-mathematics/rstudio/rstudio-0.99.893.ebuild                       | 4 ++--
 .../rstudio/{rstudio-0.99.893.ebuild => rstudio-0.99.896.ebuild}      | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index c98d26b..d793897 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -25,6 +25,7 @@ DIST rstudio-0.99.486.tar.gz 16992775 SHA256 4057195465e5032625bad0304bfbd9d123a
 DIST rstudio-0.99.491.tar.gz 16992702 SHA256 e8c21e2262b610a7ccf39283b97d114bee33c6840a060067b8019404ff44b03f SHA512 2658694d6154f4b91b2dc07a7ec653edb7f593c4d9829a06a5e600e4db465ca6059418be6812d5ba2529fd6202dd136f0f58d74576f856fdcf6f81032d74f3c2 WHIRLPOOL e71650a07cc010ab3c25955c7fa9e90eee68577c1ef78e02a5f81a0160c688908ec5ec4fd89c89e5a9bc49b926623cd5de976fb249aa2d472354d23f5fad76de
 DIST rstudio-0.99.879.tar.gz 17406999 SHA256 73fa59be34eb63d9ed194642a93ad529d2c67cdcbcd2f291952fdef8e999a097 SHA512 c2bbe598a4a9c2abc69e39807af70be5729a06bbcb73bac5249f74f3c3daddb2909bf4a46d988f0d4bfeabe308f0c31d2a75aa28a52f11c1343dfcead07e2c45 WHIRLPOOL 5c9c75a7891ac53eb80a36eff518d77a0c281b16bff383526ac1ede07ee57486d7b00be4e400a0cad48dfea92729becf25c67f18782af7930f9b4218592afe5c
 DIST rstudio-0.99.893.tar.gz 17407634 SHA256 90a657b1fa16cfc575ca884789bac47f17832eb8b92496d044da3c5d79b0b874 SHA512 baa2a8c27e101e74b8a3f3b1cd290c90031881ae11fb44606b9af1efa4114c4c6fe68298f554d8b83f96418159477579414ddb99d49d2942c021aa0697947222 WHIRLPOOL a81ed5ee17a730e9674b2a98b95f87e70c532df95fda15402952901f7def24cc673db724841579e5dbf184a3e9fc16cfada93284b40014edf74863a61e0798a5
+DIST rstudio-0.99.896.tar.gz 17409121 SHA256 05fc7546ad1d21d7e6219538056ec2ee1b86d09b731a588198ce137d3fe25bae SHA512 c62df2a1c54f8c6d14b1239dd746b88693c11c48ec56aa5ae89023e98901793b0e65df44526cbc8c71036c0f73a512767cae086ed3777540b1ceda05e3398e17 WHIRLPOOL 7f4d0ebc8db509f09ccc15da02a4a426de431312f2dc65126bda76e11de0e106671fc7a83e9ea8e66b88f81268d0db8b44014a70744b30641bb58bedda73427d
 DIST selenium-java-2.37.0.zip 24625928 SHA256 0eebba65d8edb01c1f46e462907c58f5d6e1cb0ddf63660a9985c8432bdffbb7 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779 WHIRLPOOL eb6659aae26f3c78b6f998546b23d0636c9d00ed8a7f985db1463ac4bd483ccb3e643d84e2ca0f59e0636a8de79eb552ff1d68eb6f9c06907029f7552d8f7777
 DIST selenium-server-standalone-2.37.0.jar 34730734 SHA256 97bc8c699037fb6e99ba7af570fb60dbb1b7ce30cde2448287a44ef65b13023e SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018 WHIRLPOOL 20640591534f31f24825a9ed139589b182e8b60d86541bf0be104d3cc0280983f6566bd0459f2253ac3875b48a2798b205bac8f815a119fff6db625ce9bbc29e
 DIST shinyapps-0.98.1000.tar.gz 910095 SHA256 b95c512ae0a0fb4335878d9cfcf9073e2cb3ccfed73543abe27ea8878ed36d57 SHA512 3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c WHIRLPOOL ecc2bce78387cb42e9989163d8fca29220e66f085acde3323417058aebb624dafa8c0e1873c7d79e67324cbd5aad250ef9fcdbbc8f659d64482233b95d898a15

diff --git a/sci-mathematics/rstudio/rstudio-0.99.893.ebuild b/sci-mathematics/rstudio/rstudio-0.99.893.ebuild
index 996a3eb..b07260e 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.893.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.893.ebuild
@@ -182,8 +182,8 @@ src_prepare() {
 		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
 		|| die
 
-	# The git commit for tag v0.99.879
-	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 9ac918338d6f9d6dd25807d6d746b470f1cfcf6d@'\
+	# The git commit for tag v0.99.893
+	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 7510856081e5b1b577bcc230fc2c8ac62eafa62e@'\
 		-i "${S}"/CMakeLists.txt \
 		"${S}"/CMakeGlobals.txt \
 		|| die

diff --git a/sci-mathematics/rstudio/rstudio-0.99.893.ebuild b/sci-mathematics/rstudio/rstudio-0.99.896.ebuild
similarity index 98%
copy from sci-mathematics/rstudio/rstudio-0.99.893.ebuild
copy to sci-mathematics/rstudio/rstudio-0.99.896.ebuild
index 996a3eb..8212469 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.893.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.896.ebuild
@@ -182,8 +182,8 @@ src_prepare() {
 		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
 		|| die
 
-	# The git commit for tag v0.99.879
-	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 9ac918338d6f9d6dd25807d6d746b470f1cfcf6d@'\
+	# The git commit for tag v0.99.896
+	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 5dbc604635bb296bc41fb7fa21e56f7195fbe1ca@'\
 		-i "${S}"/CMakeLists.txt \
 		"${S}"/CMakeGlobals.txt \
 		|| die


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2016-05-15 10:53 Mark Wright
  0 siblings, 0 replies; 36+ messages in thread
From: Mark Wright @ 2016-05-15 10:53 UTC (permalink / raw
  To: gentoo-commits

commit:     185c51cf18c10e17a08cd5bc6887eaa2f7860d21
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 10:52:51 2016 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Sun May 15 10:52:51 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=185c51cf

sci-mathematics/rstudio: Bump to 0.99.902

Package-Manager: portage-2.2.28

 sci-mathematics/rstudio/Manifest                |   1 +
 sci-mathematics/rstudio/rstudio-0.99.902.ebuild | 250 ++++++++++++++++++++++++
 2 files changed, 251 insertions(+)

diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index d793897..832ecc3 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -26,6 +26,7 @@ DIST rstudio-0.99.491.tar.gz 16992702 SHA256 e8c21e2262b610a7ccf39283b97d114bee3
 DIST rstudio-0.99.879.tar.gz 17406999 SHA256 73fa59be34eb63d9ed194642a93ad529d2c67cdcbcd2f291952fdef8e999a097 SHA512 c2bbe598a4a9c2abc69e39807af70be5729a06bbcb73bac5249f74f3c3daddb2909bf4a46d988f0d4bfeabe308f0c31d2a75aa28a52f11c1343dfcead07e2c45 WHIRLPOOL 5c9c75a7891ac53eb80a36eff518d77a0c281b16bff383526ac1ede07ee57486d7b00be4e400a0cad48dfea92729becf25c67f18782af7930f9b4218592afe5c
 DIST rstudio-0.99.893.tar.gz 17407634 SHA256 90a657b1fa16cfc575ca884789bac47f17832eb8b92496d044da3c5d79b0b874 SHA512 baa2a8c27e101e74b8a3f3b1cd290c90031881ae11fb44606b9af1efa4114c4c6fe68298f554d8b83f96418159477579414ddb99d49d2942c021aa0697947222 WHIRLPOOL a81ed5ee17a730e9674b2a98b95f87e70c532df95fda15402952901f7def24cc673db724841579e5dbf184a3e9fc16cfada93284b40014edf74863a61e0798a5
 DIST rstudio-0.99.896.tar.gz 17409121 SHA256 05fc7546ad1d21d7e6219538056ec2ee1b86d09b731a588198ce137d3fe25bae SHA512 c62df2a1c54f8c6d14b1239dd746b88693c11c48ec56aa5ae89023e98901793b0e65df44526cbc8c71036c0f73a512767cae086ed3777540b1ceda05e3398e17 WHIRLPOOL 7f4d0ebc8db509f09ccc15da02a4a426de431312f2dc65126bda76e11de0e106671fc7a83e9ea8e66b88f81268d0db8b44014a70744b30641bb58bedda73427d
+DIST rstudio-0.99.902.tar.gz 17408815 SHA256 703a3ebedbb4bb44d2cacffed2615b4f65156fcd4115029931eb5fd99950c689 SHA512 23db68f05900666287901d75f02006f7edacafab057d82a312b4e5aac639ef4b5db702420632f2768e509411bbfc73c32a533aa0f1b33379c10df82e009b974e WHIRLPOOL e7ef3cf0d9a414257c4c0c68809c674721f9513917bd450c9946133ee69dd735374417483c7dc380ee4d387119558c961d4ea815aac5bcd3fa22ee863556e0a4
 DIST selenium-java-2.37.0.zip 24625928 SHA256 0eebba65d8edb01c1f46e462907c58f5d6e1cb0ddf63660a9985c8432bdffbb7 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779 WHIRLPOOL eb6659aae26f3c78b6f998546b23d0636c9d00ed8a7f985db1463ac4bd483ccb3e643d84e2ca0f59e0636a8de79eb552ff1d68eb6f9c06907029f7552d8f7777
 DIST selenium-server-standalone-2.37.0.jar 34730734 SHA256 97bc8c699037fb6e99ba7af570fb60dbb1b7ce30cde2448287a44ef65b13023e SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018 WHIRLPOOL 20640591534f31f24825a9ed139589b182e8b60d86541bf0be104d3cc0280983f6566bd0459f2253ac3875b48a2798b205bac8f815a119fff6db625ce9bbc29e
 DIST shinyapps-0.98.1000.tar.gz 910095 SHA256 b95c512ae0a0fb4335878d9cfcf9073e2cb3ccfed73543abe27ea8878ed36d57 SHA512 3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c WHIRLPOOL ecc2bce78387cb42e9989163d8fca29220e66f085acde3323417058aebb624dafa8c0e1873c7d79e67324cbd5aad250ef9fcdbbc8f659d64482233b95d898a15

diff --git a/sci-mathematics/rstudio/rstudio-0.99.902.ebuild b/sci-mathematics/rstudio/rstudio-0.99.902.ebuild
new file mode 100644
index 0000000..641eabf
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-0.99.902.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
+
+# TODO
+# * package gin and gwt
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+# update from scripts in dependencies/common
+# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
+GWT_VER=2.7.0
+GIN_VER=1.5
+SELENIUM_VER=2.37.0
+CHROMEDRIVER_VER=2.7
+# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc
+PANDOC_VER=1.13.1
+# ls dependencies/common/*.tar.gz
+PACKRAT_VER=0.98.1000
+RMARKDOWN_VER=0.98.1000
+SHINYAPPS_VER=0.98.1000
+RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
+
+DESCRIPTION="IDE for the R language"
+HOMEPAGE="
+	http://www.rstudio.org
+	https://github.com/rstudio/rstudio/"
+SRC_URI="
+	https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
+	https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
+	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
+	https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dedicated server"
+
+QT_VER=5.4
+QT_SLOT=5
+RDEPEND="
+	app-text/pandoc
+	dev-haskell/pandoc-citeproc
+	>=dev-lang/R-2.11.1
+	>=dev-libs/boost-1.50:=
+	>=dev-libs/mathjax-2.3
+	dev-libs/openssl:0
+	sys-apps/util-linux
+	>=sys-devel/clang-3.5.0
+	sys-libs/zlib
+	>=virtual/jre-1.7:=
+	x11-libs/pango
+	!dedicated? (
+		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5]
+		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
+		server? ( virtual/pam )
+	)
+	dedicated? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	>=virtual/jdk-1.7:=
+	virtual/pkgconfig"
+#	test? ( dev-java/junit:4 )
+
+PATCHES=(
+		"${FILESDIR}/${PN}-0.99.879-prefs.patch"
+		"${FILESDIR}/${PN}-0.99.879-paths.patch"
+		"${FILESDIR}/${PN}-0.99.879-clang-pandoc.patch"
+		"${FILESDIR}/${PN}-0.98.490-linker_flags.patch"
+		"${FILESDIR}/${PN}-0.98.1091-boost-1.57.patch"
+		"${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch"
+		"${FILESDIR}/${PN}-0.99.486-systemd.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz gwt-${GWT_VER}.zip
+	cd "${S}" || die
+	mkdir -p src/gwt/lib/{gin,gwt} \
+		dependencies/common/dictionaries \
+		src/gwt/lib/selenium/${SELENIUM_VER} \
+		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
+	mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
+	unzip -qd src/gwt/lib/gin/${GIN_VER} \
+		"${DISTDIR}"/gin-${GIN_VER}.zip || die
+	unzip -qd dependencies/common/dictionaries \
+		"${DISTDIR}"/core-dictionaries.zip || die
+	unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
+		"${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
+	cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
+		src/gwt/lib/selenium/${SELENIUM_VER}/ || 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
+	unpack shinyapps-${SHINYAPPS_VER}.tar.gz
+	unpack rsconnect_${RSCONNECT_VER}.tar.gz
+	cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \
+		. || die
+}
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	egit_clean
+
+	epatch "${PATCHES[@]}"
+
+	# Enable CMake to install our .service file for systemd usage
+	mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
+	cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
+
+	# 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-23 || 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
+
+	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
+	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
+		-i src/cpp/server/ServerOptions.cpp \
+		|| die
+
+	# Set the rsession.conf file location for Gentoo prefix
+	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
+		-i src/cpp/session/SessionOptions.cpp \
+		|| die
+
+	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
+	# It provides a library that has its version number appended to the end,
+	# which is difficult to handle in cmake, as find_library does not support
+	# searching for wildcard library names. So I find the library name from the
+	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
+	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
+	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
+				   "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \
+					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
+						   -e 's@LIBS \*= -l@@')
+	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
+		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
+		|| die
+
+	# The git commit for tag v0.99.902
+	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 4daf125408b86eeba48a39f62df34eb81d934639@'\
+		-i "${S}"/CMakeLists.txt \
+		"${S}"/CMakeGlobals.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")")
+		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
+		-DRSTUDIO_VERIFY_R_VERSION=FALSE
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_compile
+}
+
+src_install() {
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_install
+	pax-mark m "${ED}usr/bin/rstudio"
+	doconfd "${FILESDIR}"/rstudio-server.conf
+	dodir /etc/rstudio
+	insinto /etc/rstudio
+	doins "${FILESDIR}"/rsession.conf
+	dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf
+	if use dedicated || use server; then
+		dopamd src/cpp/server/extras/pam/rstudio
+		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
+	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 ;}
+}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2016-06-21 19:37 Michał Górny
  0 siblings, 0 replies; 36+ messages in thread
From: Michał Górny @ 2016-06-21 19:37 UTC (permalink / raw
  To: gentoo-commits

commit:     af2fbac39c32842ccc588efb3e7cb3bebf09e15f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 19:36:19 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 19:37:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af2fbac3

sci-mathematics/rstudio: Backport JRE/JDK := dep fix, #586322

 sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild | 4 ++--
 sci-mathematics/rstudio/rstudio-0.99.482.ebuild    | 4 ++--
 sci-mathematics/rstudio/rstudio-0.99.483.ebuild    | 4 ++--
 sci-mathematics/rstudio/rstudio-0.99.484.ebuild    | 4 ++--
 sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild | 4 ++--
 sci-mathematics/rstudio/rstudio-0.99.491.ebuild    | 4 ++--
 sci-mathematics/rstudio/rstudio-0.99.879.ebuild    | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild b/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
index 64818de..02ab3b7 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
 	sys-apps/util-linux
 	>=sys-devel/clang-3.5.0
 	sys-libs/zlib
-	|| ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+	>=virtual/jre-1.7:=
 	x11-libs/pango
 	!dedicated? (
 		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
@@ -85,7 +85,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-java/ant-core
-	|| ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
+	>=virtual/jdk-1.7:=
 	virtual/pkgconfig"
 #	test? ( dev-java/junit:4 )
 

diff --git a/sci-mathematics/rstudio/rstudio-0.99.482.ebuild b/sci-mathematics/rstudio/rstudio-0.99.482.ebuild
index 64818de..02ab3b7 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.482.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.482.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
 	sys-apps/util-linux
 	>=sys-devel/clang-3.5.0
 	sys-libs/zlib
-	|| ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+	>=virtual/jre-1.7:=
 	x11-libs/pango
 	!dedicated? (
 		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
@@ -85,7 +85,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-java/ant-core
-	|| ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
+	>=virtual/jdk-1.7:=
 	virtual/pkgconfig"
 #	test? ( dev-java/junit:4 )
 

diff --git a/sci-mathematics/rstudio/rstudio-0.99.483.ebuild b/sci-mathematics/rstudio/rstudio-0.99.483.ebuild
index 64818de..02ab3b7 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.483.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.483.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
 	sys-apps/util-linux
 	>=sys-devel/clang-3.5.0
 	sys-libs/zlib
-	|| ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+	>=virtual/jre-1.7:=
 	x11-libs/pango
 	!dedicated? (
 		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
@@ -85,7 +85,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-java/ant-core
-	|| ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
+	>=virtual/jdk-1.7:=
 	virtual/pkgconfig"
 #	test? ( dev-java/junit:4 )
 

diff --git a/sci-mathematics/rstudio/rstudio-0.99.484.ebuild b/sci-mathematics/rstudio/rstudio-0.99.484.ebuild
index 64818de..02ab3b7 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.484.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.484.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
 	sys-apps/util-linux
 	>=sys-devel/clang-3.5.0
 	sys-libs/zlib
-	|| ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+	>=virtual/jre-1.7:=
 	x11-libs/pango
 	!dedicated? (
 		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
@@ -85,7 +85,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-java/ant-core
-	|| ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
+	>=virtual/jdk-1.7:=
 	virtual/pkgconfig"
 #	test? ( dev-java/junit:4 )
 

diff --git a/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild b/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild
index 764c9da..dda4c96 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
 	sys-apps/util-linux
 	>=sys-devel/clang-3.5.0
 	sys-libs/zlib
-	|| ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+	>=virtual/jre-1.7:=
 	x11-libs/pango
 	!dedicated? (
 		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
@@ -85,7 +85,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-java/ant-core
-	|| ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
+	>=virtual/jdk-1.7:=
 	virtual/pkgconfig"
 #	test? ( dev-java/junit:4 )
 

diff --git a/sci-mathematics/rstudio/rstudio-0.99.491.ebuild b/sci-mathematics/rstudio/rstudio-0.99.491.ebuild
index 764c9da..dda4c96 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.491.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.491.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
 	sys-apps/util-linux
 	>=sys-devel/clang-3.5.0
 	sys-libs/zlib
-	|| ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+	>=virtual/jre-1.7:=
 	x11-libs/pango
 	!dedicated? (
 		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
@@ -85,7 +85,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-java/ant-core
-	|| ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
+	>=virtual/jdk-1.7:=
 	virtual/pkgconfig"
 #	test? ( dev-java/junit:4 )
 

diff --git a/sci-mathematics/rstudio/rstudio-0.99.879.ebuild b/sci-mathematics/rstudio/rstudio-0.99.879.ebuild
index 35a886b..996a3eb 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.879.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.879.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
 	sys-apps/util-linux
 	>=sys-devel/clang-3.5.0
 	sys-libs/zlib
-	|| ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+	>=virtual/jre-1.7:=
 	x11-libs/pango
 	!dedicated? (
 		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
@@ -85,7 +85,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-java/ant-core
-	|| ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
+	>=virtual/jdk-1.7:=
 	virtual/pkgconfig"
 #	test? ( dev-java/junit:4 )
 


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2016-07-20  3:00 Mark Wright
  0 siblings, 0 replies; 36+ messages in thread
From: Mark Wright @ 2016-07-20  3:00 UTC (permalink / raw
  To: gentoo-commits

commit:     2999a3b4fe54989c3c1f95bee7f3489db74558ec
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 03:00:16 2016 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 03:00:16 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2999a3b4

sci-mathematics/rstudio: Bump to 0.99.903

Package-Manager: portage-2.3.0

 sci-mathematics/rstudio/Manifest                |   1 +
 sci-mathematics/rstudio/rstudio-0.99.903.ebuild | 250 ++++++++++++++++++++++++
 2 files changed, 251 insertions(+)

diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 832ecc3..8ff2707 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -27,6 +27,7 @@ DIST rstudio-0.99.879.tar.gz 17406999 SHA256 73fa59be34eb63d9ed194642a93ad529d2c
 DIST rstudio-0.99.893.tar.gz 17407634 SHA256 90a657b1fa16cfc575ca884789bac47f17832eb8b92496d044da3c5d79b0b874 SHA512 baa2a8c27e101e74b8a3f3b1cd290c90031881ae11fb44606b9af1efa4114c4c6fe68298f554d8b83f96418159477579414ddb99d49d2942c021aa0697947222 WHIRLPOOL a81ed5ee17a730e9674b2a98b95f87e70c532df95fda15402952901f7def24cc673db724841579e5dbf184a3e9fc16cfada93284b40014edf74863a61e0798a5
 DIST rstudio-0.99.896.tar.gz 17409121 SHA256 05fc7546ad1d21d7e6219538056ec2ee1b86d09b731a588198ce137d3fe25bae SHA512 c62df2a1c54f8c6d14b1239dd746b88693c11c48ec56aa5ae89023e98901793b0e65df44526cbc8c71036c0f73a512767cae086ed3777540b1ceda05e3398e17 WHIRLPOOL 7f4d0ebc8db509f09ccc15da02a4a426de431312f2dc65126bda76e11de0e106671fc7a83e9ea8e66b88f81268d0db8b44014a70744b30641bb58bedda73427d
 DIST rstudio-0.99.902.tar.gz 17408815 SHA256 703a3ebedbb4bb44d2cacffed2615b4f65156fcd4115029931eb5fd99950c689 SHA512 23db68f05900666287901d75f02006f7edacafab057d82a312b4e5aac639ef4b5db702420632f2768e509411bbfc73c32a533aa0f1b33379c10df82e009b974e WHIRLPOOL e7ef3cf0d9a414257c4c0c68809c674721f9513917bd450c9946133ee69dd735374417483c7dc380ee4d387119558c961d4ea815aac5bcd3fa22ee863556e0a4
+DIST rstudio-0.99.903.tar.gz 17409865 SHA256 8902fe7a6f7f6e0d6e8fae2472e479bb9cbe9cbb2e0747e5f01a093d31993a3c SHA512 9ddcfdab187c907dfa3cbf386ee902b43ba35c242b44a4190c58d1e3bad590ca428209423739768b57f759c4bde61ef2b5958fb3cba366d7740753c3c5dbf739 WHIRLPOOL 82ca64883d02aacc0c1081779f769c3ea2bbac3c370f1e62fba18465547742114df18d431f30c3fe449c0ae2ac212cd7dd98a72bb2e5810eb1fc6cdbb3c82a69
 DIST selenium-java-2.37.0.zip 24625928 SHA256 0eebba65d8edb01c1f46e462907c58f5d6e1cb0ddf63660a9985c8432bdffbb7 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779 WHIRLPOOL eb6659aae26f3c78b6f998546b23d0636c9d00ed8a7f985db1463ac4bd483ccb3e643d84e2ca0f59e0636a8de79eb552ff1d68eb6f9c06907029f7552d8f7777
 DIST selenium-server-standalone-2.37.0.jar 34730734 SHA256 97bc8c699037fb6e99ba7af570fb60dbb1b7ce30cde2448287a44ef65b13023e SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018 WHIRLPOOL 20640591534f31f24825a9ed139589b182e8b60d86541bf0be104d3cc0280983f6566bd0459f2253ac3875b48a2798b205bac8f815a119fff6db625ce9bbc29e
 DIST shinyapps-0.98.1000.tar.gz 910095 SHA256 b95c512ae0a0fb4335878d9cfcf9073e2cb3ccfed73543abe27ea8878ed36d57 SHA512 3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c WHIRLPOOL ecc2bce78387cb42e9989163d8fca29220e66f085acde3323417058aebb624dafa8c0e1873c7d79e67324cbd5aad250ef9fcdbbc8f659d64482233b95d898a15

diff --git a/sci-mathematics/rstudio/rstudio-0.99.903.ebuild b/sci-mathematics/rstudio/rstudio-0.99.903.ebuild
new file mode 100644
index 0000000..daeade7
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-0.99.903.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
+
+# TODO
+# * package gin and gwt
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+# update from scripts in dependencies/common
+# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
+GWT_VER=2.7.0
+GIN_VER=1.5
+SELENIUM_VER=2.37.0
+CHROMEDRIVER_VER=2.7
+# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc
+PANDOC_VER=1.13.1
+# ls dependencies/common/*.tar.gz
+PACKRAT_VER=0.98.1000
+RMARKDOWN_VER=0.98.1000
+SHINYAPPS_VER=0.98.1000
+RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
+
+DESCRIPTION="IDE for the R language"
+HOMEPAGE="
+	http://www.rstudio.org
+	https://github.com/rstudio/rstudio/"
+SRC_URI="
+	https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
+	https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
+	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
+	https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dedicated server"
+
+QT_VER=5.4
+QT_SLOT=5
+RDEPEND="
+	app-text/pandoc
+	dev-haskell/pandoc-citeproc
+	>=dev-lang/R-2.11.1
+	>=dev-libs/boost-1.50:=
+	>=dev-libs/mathjax-2.3
+	dev-libs/openssl:0
+	sys-apps/util-linux
+	>=sys-devel/clang-3.5.0
+	sys-libs/zlib
+	>=virtual/jre-1.7:=
+	x11-libs/pango
+	!dedicated? (
+		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5]
+		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
+		server? ( virtual/pam )
+	)
+	dedicated? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	>=virtual/jdk-1.7:=
+	virtual/pkgconfig"
+#	test? ( dev-java/junit:4 )
+
+PATCHES=(
+		"${FILESDIR}/${PN}-0.99.879-prefs.patch"
+		"${FILESDIR}/${PN}-0.99.879-paths.patch"
+		"${FILESDIR}/${PN}-0.99.879-clang-pandoc.patch"
+		"${FILESDIR}/${PN}-0.98.490-linker_flags.patch"
+		"${FILESDIR}/${PN}-0.98.1091-boost-1.57.patch"
+		"${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch"
+		"${FILESDIR}/${PN}-0.99.486-systemd.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz gwt-${GWT_VER}.zip
+	cd "${S}" || die
+	mkdir -p src/gwt/lib/{gin,gwt} \
+		dependencies/common/dictionaries \
+		src/gwt/lib/selenium/${SELENIUM_VER} \
+		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
+	mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
+	unzip -qd src/gwt/lib/gin/${GIN_VER} \
+		"${DISTDIR}"/gin-${GIN_VER}.zip || die
+	unzip -qd dependencies/common/dictionaries \
+		"${DISTDIR}"/core-dictionaries.zip || die
+	unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
+		"${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
+	cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
+		src/gwt/lib/selenium/${SELENIUM_VER}/ || 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
+	unpack shinyapps-${SHINYAPPS_VER}.tar.gz
+	unpack rsconnect_${RSCONNECT_VER}.tar.gz
+	cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \
+		. || die
+}
+
+src_prepare() {
+	java-pkg-2_src_prepare
+
+	egit_clean
+
+	epatch "${PATCHES[@]}"
+
+	# Enable CMake to install our .service file for systemd usage
+	mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
+	cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
+
+	# 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-23 || 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
+
+	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
+	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
+		-i src/cpp/server/ServerOptions.cpp \
+		|| die
+
+	# Set the rsession.conf file location for Gentoo prefix
+	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
+		-i src/cpp/session/SessionOptions.cpp \
+		|| die
+
+	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
+	# It provides a library that has its version number appended to the end,
+	# which is difficult to handle in cmake, as find_library does not support
+	# searching for wildcard library names. So I find the library name from the
+	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
+	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
+	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
+				   "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \
+					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
+						   -e 's@LIBS \*= -l@@')
+	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
+		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
+		|| die
+
+	# The git commit for tag: git rev-list -n 1 v0.99.903
+	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 0eb2d8ea28ebc1ac6ac327e023becb6133b679c4@'\
+		-i "${S}"/CMakeLists.txt \
+		"${S}"/CMakeGlobals.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")")
+		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
+		-DRSTUDIO_VERIFY_R_VERSION=FALSE
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_compile
+}
+
+src_install() {
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_install
+	pax-mark m "${ED}usr/bin/rstudio"
+	doconfd "${FILESDIR}"/rstudio-server.conf
+	dodir /etc/rstudio
+	insinto /etc/rstudio
+	doins "${FILESDIR}"/rsession.conf
+	dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf
+	if use dedicated || use server; then
+		dopamd src/cpp/server/extras/pam/rstudio
+		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
+	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 ;}
+}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2017-01-03 12:38 Mark Wright
  0 siblings, 0 replies; 36+ messages in thread
From: Mark Wright @ 2017-01-03 12:38 UTC (permalink / raw
  To: gentoo-commits

commit:     d56f26bb09488aaeb54aa04973331e65d686c23d
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  3 12:38:23 2017 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 12:38:23 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d56f26bb

sci-mathematics/rstudio: Bump to 1.0.136

Package-Manager: portage-2.3.3

 sci-mathematics/rstudio/Manifest               |   1 +
 sci-mathematics/rstudio/rstudio-1.0.136.ebuild | 248 +++++++++++++++++++++++++
 2 files changed, 249 insertions(+)

diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 26d0c77..7366ec7 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -28,6 +28,7 @@ DIST rstudio-0.99.893.tar.gz 17407634 SHA256 90a657b1fa16cfc575ca884789bac47f178
 DIST rstudio-0.99.896.tar.gz 17409121 SHA256 05fc7546ad1d21d7e6219538056ec2ee1b86d09b731a588198ce137d3fe25bae SHA512 c62df2a1c54f8c6d14b1239dd746b88693c11c48ec56aa5ae89023e98901793b0e65df44526cbc8c71036c0f73a512767cae086ed3777540b1ceda05e3398e17 WHIRLPOOL 7f4d0ebc8db509f09ccc15da02a4a426de431312f2dc65126bda76e11de0e106671fc7a83e9ea8e66b88f81268d0db8b44014a70744b30641bb58bedda73427d
 DIST rstudio-0.99.902.tar.gz 17408815 SHA256 703a3ebedbb4bb44d2cacffed2615b4f65156fcd4115029931eb5fd99950c689 SHA512 23db68f05900666287901d75f02006f7edacafab057d82a312b4e5aac639ef4b5db702420632f2768e509411bbfc73c32a533aa0f1b33379c10df82e009b974e WHIRLPOOL e7ef3cf0d9a414257c4c0c68809c674721f9513917bd450c9946133ee69dd735374417483c7dc380ee4d387119558c961d4ea815aac5bcd3fa22ee863556e0a4
 DIST rstudio-0.99.903.tar.gz 17409865 SHA256 8902fe7a6f7f6e0d6e8fae2472e479bb9cbe9cbb2e0747e5f01a093d31993a3c SHA512 9ddcfdab187c907dfa3cbf386ee902b43ba35c242b44a4190c58d1e3bad590ca428209423739768b57f759c4bde61ef2b5958fb3cba366d7740753c3c5dbf739 WHIRLPOOL 82ca64883d02aacc0c1081779f769c3ea2bbac3c370f1e62fba18465547742114df18d431f30c3fe449c0ae2ac212cd7dd98a72bb2e5810eb1fc6cdbb3c82a69
+DIST rstudio-1.0.136.tar.gz 17786389 SHA256 bb6a8aa475e09dd090cd2b5ea505f578d270858784120599aee5c10bd8ca58e8 SHA512 cb4f98834f287267925169c8141bd0f95fd23cefdba8f407f76a24617bc40da56430745f112774838345330b9f99b9cac86d5b99517346a019e8e2cb3b01f713 WHIRLPOOL 5932ef2572670951a094f79e8805215fd50c3643b4a4654cb469d7181708a3327763531cb68e968e64ebdb7b44df03da0c18f9a06a12d968e908bedc43dac52f
 DIST rstudio-1.0.44.tar.gz 17774065 SHA256 43ece6cfdd1a13ac0e17f2a50154a30a1a14ad6c1b3cf381cc6007988ce44a0f SHA512 a8b975dc517125a257e5f61db5bb137e133b02d738d55553770aa65e388cd112ce646b53b77dc069d1ca95ccd95979f4a57ad60b99fc3b91543cf61e737e8169 WHIRLPOOL 4ad472aed130451e81d8d8e3251d3bbd701a8b8e2fbddf17dc357f39335e33c75505f9443c2c7208e60a19c2767b9328134433e5d4fd22504813020712c658ef
 DIST selenium-java-2.37.0.zip 24625928 SHA256 0eebba65d8edb01c1f46e462907c58f5d6e1cb0ddf63660a9985c8432bdffbb7 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779 WHIRLPOOL eb6659aae26f3c78b6f998546b23d0636c9d00ed8a7f985db1463ac4bd483ccb3e643d84e2ca0f59e0636a8de79eb552ff1d68eb6f9c06907029f7552d8f7777
 DIST selenium-server-standalone-2.37.0.jar 34730734 SHA256 97bc8c699037fb6e99ba7af570fb60dbb1b7ce30cde2448287a44ef65b13023e SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018 WHIRLPOOL 20640591534f31f24825a9ed139589b182e8b60d86541bf0be104d3cc0280983f6566bd0459f2253ac3875b48a2798b205bac8f815a119fff6db625ce9bbc29e

diff --git a/sci-mathematics/rstudio/rstudio-1.0.136.ebuild b/sci-mathematics/rstudio/rstudio-1.0.136.ebuild
new file mode 100644
index 00000000..7fa5203
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-1.0.136.ebuild
@@ -0,0 +1,248 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
+
+# TODO
+# * package gin and gwt
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+# update from scripts in dependencies/common
+# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
+GWT_VER=2.7.0
+GIN_VER=1.5
+SELENIUM_VER=2.37.0
+CHROMEDRIVER_VER=2.7
+# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc
+PANDOC_VER=1.13.1
+# ls dependencies/common/*.tar.gz
+PACKRAT_VER=0.98.1000
+RMARKDOWN_VER=0.98.1000
+SHINYAPPS_VER=0.98.1000
+RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
+
+DESCRIPTION="IDE for the R language"
+HOMEPAGE="
+	http://www.rstudio.org
+	https://github.com/rstudio/rstudio/"
+SRC_URI="
+	https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
+	https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
+	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
+	https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dedicated server"
+
+QT_VER=5.4
+QT_SLOT=5
+RDEPEND="
+	app-text/pandoc
+	dev-haskell/pandoc-citeproc
+	>=dev-lang/R-2.11.1
+	>=dev-libs/boost-1.50:=
+	>=dev-libs/mathjax-2.7.0
+	dev-libs/openssl:0
+	sys-apps/util-linux
+	>=sys-devel/clang-3.5.0
+	sys-libs/zlib
+	>=virtual/jre-1.8:=
+	x11-libs/pango
+	!dedicated? (
+		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5]
+		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
+		server? ( virtual/pam )
+	)
+	dedicated? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	>=virtual/jdk-1.8:=
+	virtual/pkgconfig"
+#	test? ( dev-java/junit:4 )
+
+PATCHES=(
+		"${FILESDIR}/${PN}-0.99.879-prefs.patch"
+		"${FILESDIR}/${PN}-1.0.44-paths.patch"
+		"${FILESDIR}/${PN}-1.0.44-clang-pandoc.patch"
+		"${FILESDIR}/${PN}-0.98.490-linker_flags.patch"
+		"${FILESDIR}/${PN}-0.98.1091-boost-1.57.patch"
+		"${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch"
+		"${FILESDIR}/${PN}-1.0.44-systemd.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz gwt-${GWT_VER}.zip
+	cd "${S}" || die
+	mkdir -p src/gwt/lib/{gin,gwt} \
+		dependencies/common/dictionaries \
+		src/gwt/lib/selenium/${SELENIUM_VER} \
+		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
+	mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
+	unzip -qd src/gwt/lib/gin/${GIN_VER} \
+		"${DISTDIR}"/gin-${GIN_VER}.zip || die
+	unzip -qd dependencies/common/dictionaries \
+		"${DISTDIR}"/core-dictionaries.zip || die
+	unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
+		"${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
+	cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
+		src/gwt/lib/selenium/${SELENIUM_VER}/ || 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
+	unpack shinyapps-${SHINYAPPS_VER}.tar.gz
+	unpack rsconnect_${RSCONNECT_VER}.tar.gz
+	cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \
+		. || die
+}
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+	egit_clean
+
+	# Enable CMake to install our .service file for systemd usage
+	mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
+	cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
+
+	# 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-26 || 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
+
+	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
+	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
+		-i src/cpp/server/ServerOptions.cpp \
+		|| die
+
+	# Set the rsession.conf file location for Gentoo prefix
+	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
+		-i src/cpp/session/SessionOptions.cpp \
+		|| die
+
+	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
+	# It provides a library that has its version number appended to the end,
+	# which is difficult to handle in cmake, as find_library does not support
+	# searching for wildcard library names. So I find the library name from the
+	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
+	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
+	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
+				   "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \
+					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
+						   -e 's@LIBS \*= -l@@')
+	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
+		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
+		|| die
+
+	# The git commit for tag: git rev-list -n 1 v0.99.903
+	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 0eb2d8ea28ebc1ac6ac327e023becb6133b679c4@'\
+		-i "${S}"/CMakeLists.txt \
+		"${S}"/CMakeGlobals.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}
+		-DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
+		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
+		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
+		-DRSTUDIO_VERIFY_R_VERSION=FALSE
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_compile
+}
+
+src_install() {
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_install
+	pax-mark m "${ED}usr/bin/rstudio"
+	doconfd "${FILESDIR}"/rstudio-server.conf
+	dodir /etc/rstudio
+	insinto /etc/rstudio
+	doins "${FILESDIR}"/rsession.conf
+	dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf
+	if use dedicated || use server; then
+		dopamd src/cpp/server/extras/pam/rstudio
+		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
+	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 ;}
+}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2017-04-26  8:44 Mark Wright
  0 siblings, 0 replies; 36+ messages in thread
From: Mark Wright @ 2017-04-26  8:44 UTC (permalink / raw
  To: gentoo-commits

commit:     01bdf0bb499aa42200b8544622fe706020d7949b
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 26 08:42:42 2017 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Wed Apr 26 08:43:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01bdf0bb

sci-mathematics/rstudio: Bump to 1.0.143, fix 609644 and 606166.

Thanks to Matthias Schwartz for reporting 606166.  Thanks to malices.gossips for
reporting 609644, and kensington for the fix.

Gentoo-Bug: 606166, 609644

Package-Manager: portage-2.3.5

 sci-mathematics/rstudio/Manifest                             |  1 +
 sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild           | 12 ++++++------
 sci-mathematics/rstudio/rstudio-0.99.482.ebuild              | 12 ++++++------
 sci-mathematics/rstudio/rstudio-0.99.483.ebuild              | 12 ++++++------
 sci-mathematics/rstudio/rstudio-0.99.484.ebuild              | 12 ++++++------
 sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild           | 12 ++++++------
 sci-mathematics/rstudio/rstudio-0.99.491.ebuild              | 12 ++++++------
 sci-mathematics/rstudio/rstudio-0.99.879.ebuild              | 12 ++++++------
 sci-mathematics/rstudio/rstudio-0.99.893.ebuild              | 12 ++++++------
 sci-mathematics/rstudio/rstudio-0.99.896.ebuild              | 12 ++++++------
 sci-mathematics/rstudio/rstudio-0.99.902.ebuild              | 12 ++++++------
 sci-mathematics/rstudio/rstudio-0.99.903.ebuild              | 12 ++++++------
 sci-mathematics/rstudio/rstudio-1.0.136.ebuild               | 10 +++++-----
 .../{rstudio-1.0.136.ebuild => rstudio-1.0.143.ebuild}       | 10 +++++-----
 sci-mathematics/rstudio/rstudio-1.0.44.ebuild                | 12 ++++++------
 15 files changed, 83 insertions(+), 82 deletions(-)

diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 7366ec74612..c7992773634 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -29,6 +29,7 @@ DIST rstudio-0.99.896.tar.gz 17409121 SHA256 05fc7546ad1d21d7e6219538056ec2ee1b8
 DIST rstudio-0.99.902.tar.gz 17408815 SHA256 703a3ebedbb4bb44d2cacffed2615b4f65156fcd4115029931eb5fd99950c689 SHA512 23db68f05900666287901d75f02006f7edacafab057d82a312b4e5aac639ef4b5db702420632f2768e509411bbfc73c32a533aa0f1b33379c10df82e009b974e WHIRLPOOL e7ef3cf0d9a414257c4c0c68809c674721f9513917bd450c9946133ee69dd735374417483c7dc380ee4d387119558c961d4ea815aac5bcd3fa22ee863556e0a4
 DIST rstudio-0.99.903.tar.gz 17409865 SHA256 8902fe7a6f7f6e0d6e8fae2472e479bb9cbe9cbb2e0747e5f01a093d31993a3c SHA512 9ddcfdab187c907dfa3cbf386ee902b43ba35c242b44a4190c58d1e3bad590ca428209423739768b57f759c4bde61ef2b5958fb3cba366d7740753c3c5dbf739 WHIRLPOOL 82ca64883d02aacc0c1081779f769c3ea2bbac3c370f1e62fba18465547742114df18d431f30c3fe449c0ae2ac212cd7dd98a72bb2e5810eb1fc6cdbb3c82a69
 DIST rstudio-1.0.136.tar.gz 17786389 SHA256 bb6a8aa475e09dd090cd2b5ea505f578d270858784120599aee5c10bd8ca58e8 SHA512 cb4f98834f287267925169c8141bd0f95fd23cefdba8f407f76a24617bc40da56430745f112774838345330b9f99b9cac86d5b99517346a019e8e2cb3b01f713 WHIRLPOOL 5932ef2572670951a094f79e8805215fd50c3643b4a4654cb469d7181708a3327763531cb68e968e64ebdb7b44df03da0c18f9a06a12d968e908bedc43dac52f
+DIST rstudio-1.0.143.tar.gz 17791067 SHA256 8ae88731b4474e5e2ff9030aa14e168903fe3a7ffc4fa716f497084a86801062 SHA512 46eaa88dd8332f18bb3a43de6e262d8a365860d9add78aea6a2d345784b239972c9c73bf0b56f1736b2981b8f688dbaf5a83c6848d170c0cf61d0e51dd636a82 WHIRLPOOL db1c11be240db3528e46d359c7d40d64068dfe5f7d915c4a6b690444f7f7fbc11f3898a6e262fa625bfab906f0cbfb2a8e3288a4fd20470423a99d992972fcda
 DIST rstudio-1.0.44.tar.gz 17774065 SHA256 43ece6cfdd1a13ac0e17f2a50154a30a1a14ad6c1b3cf381cc6007988ce44a0f SHA512 a8b975dc517125a257e5f61db5bb137e133b02d738d55553770aa65e388cd112ce646b53b77dc069d1ca95ccd95979f4a57ad60b99fc3b91543cf61e737e8169 WHIRLPOOL 4ad472aed130451e81d8d8e3251d3bbd701a8b8e2fbddf17dc357f39335e33c75505f9443c2c7208e60a19c2767b9328134433e5d4fd22504813020712c658ef
 DIST selenium-java-2.37.0.zip 24625928 SHA256 0eebba65d8edb01c1f46e462907c58f5d6e1cb0ddf63660a9985c8432bdffbb7 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779 WHIRLPOOL eb6659aae26f3c78b6f998546b23d0636c9d00ed8a7f985db1463ac4bd483ccb3e643d84e2ca0f59e0636a8de79eb552ff1d68eb6f9c06907029f7552d8f7777
 DIST selenium-server-standalone-2.37.0.jar 34730734 SHA256 97bc8c699037fb6e99ba7af570fb60dbb1b7ce30cde2448287a44ef65b13023e SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018 WHIRLPOOL 20640591534f31f24825a9ed139589b182e8b60d86541bf0be104d3cc0280983f6566bd0459f2253ac3875b48a2798b205bac8f815a119fff6db625ce9bbc29e

diff --git a/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild b/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
index 7c3f04bff0c..cd4815f5d33 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils
 
 # TODO
 # * package gin and gwt
@@ -57,7 +57,7 @@ RDEPEND="
 	>=dev-libs/mathjax-2.3
 	dev-libs/openssl:0
 	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0
+	>=sys-devel/clang-3.5.0:*
 	sys-libs/zlib
 	>=virtual/jre-1.7:=
 	x11-libs/pango
@@ -70,7 +70,7 @@ RDEPEND="
 		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5]
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5]
 		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
@@ -166,7 +166,7 @@ src_prepare() {
 	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
 	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
 	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
-				   "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \
+				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
 					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
 						   -e 's@LIBS \*= -l@@')
 	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
@@ -189,7 +189,7 @@ src_configure() {
 		-DDISTRO_SHARE=share/${PN}
 		$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP)
 		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
+		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
 		)
 
 	cmake-utils_src_configure

diff --git a/sci-mathematics/rstudio/rstudio-0.99.482.ebuild b/sci-mathematics/rstudio/rstudio-0.99.482.ebuild
index 7c3f04bff0c..cd4815f5d33 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.482.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.482.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils
 
 # TODO
 # * package gin and gwt
@@ -57,7 +57,7 @@ RDEPEND="
 	>=dev-libs/mathjax-2.3
 	dev-libs/openssl:0
 	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0
+	>=sys-devel/clang-3.5.0:*
 	sys-libs/zlib
 	>=virtual/jre-1.7:=
 	x11-libs/pango
@@ -70,7 +70,7 @@ RDEPEND="
 		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5]
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5]
 		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
@@ -166,7 +166,7 @@ src_prepare() {
 	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
 	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
 	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
-				   "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \
+				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
 					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
 						   -e 's@LIBS \*= -l@@')
 	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
@@ -189,7 +189,7 @@ src_configure() {
 		-DDISTRO_SHARE=share/${PN}
 		$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP)
 		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
+		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
 		)
 
 	cmake-utils_src_configure

diff --git a/sci-mathematics/rstudio/rstudio-0.99.483.ebuild b/sci-mathematics/rstudio/rstudio-0.99.483.ebuild
index 7c3f04bff0c..cd4815f5d33 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.483.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.483.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils
 
 # TODO
 # * package gin and gwt
@@ -57,7 +57,7 @@ RDEPEND="
 	>=dev-libs/mathjax-2.3
 	dev-libs/openssl:0
 	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0
+	>=sys-devel/clang-3.5.0:*
 	sys-libs/zlib
 	>=virtual/jre-1.7:=
 	x11-libs/pango
@@ -70,7 +70,7 @@ RDEPEND="
 		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5]
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5]
 		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
@@ -166,7 +166,7 @@ src_prepare() {
 	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
 	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
 	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
-				   "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \
+				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
 					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
 						   -e 's@LIBS \*= -l@@')
 	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
@@ -189,7 +189,7 @@ src_configure() {
 		-DDISTRO_SHARE=share/${PN}
 		$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP)
 		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
+		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
 		)
 
 	cmake-utils_src_configure

diff --git a/sci-mathematics/rstudio/rstudio-0.99.484.ebuild b/sci-mathematics/rstudio/rstudio-0.99.484.ebuild
index 7c3f04bff0c..cd4815f5d33 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.484.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.484.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils
 
 # TODO
 # * package gin and gwt
@@ -57,7 +57,7 @@ RDEPEND="
 	>=dev-libs/mathjax-2.3
 	dev-libs/openssl:0
 	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0
+	>=sys-devel/clang-3.5.0:*
 	sys-libs/zlib
 	>=virtual/jre-1.7:=
 	x11-libs/pango
@@ -70,7 +70,7 @@ RDEPEND="
 		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5]
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5]
 		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
@@ -166,7 +166,7 @@ src_prepare() {
 	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
 	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
 	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
-				   "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \
+				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
 					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
 						   -e 's@LIBS \*= -l@@')
 	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
@@ -189,7 +189,7 @@ src_configure() {
 		-DDISTRO_SHARE=share/${PN}
 		$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP)
 		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
+		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
 		)
 
 	cmake-utils_src_configure

diff --git a/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild b/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild
index f87c147094b..a0c4907f68f 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils
 
 # TODO
 # * package gin and gwt
@@ -57,7 +57,7 @@ RDEPEND="
 	>=dev-libs/mathjax-2.3
 	dev-libs/openssl:0
 	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0
+	>=sys-devel/clang-3.5.0:*
 	sys-libs/zlib
 	>=virtual/jre-1.7:=
 	x11-libs/pango
@@ -70,7 +70,7 @@ RDEPEND="
 		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5]
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5]
 		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
@@ -174,7 +174,7 @@ src_prepare() {
 	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
 	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
 	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
-				   "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \
+				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
 					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
 						   -e 's@LIBS \*= -l@@')
 	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
@@ -197,7 +197,7 @@ src_configure() {
 		-DDISTRO_SHARE=share/${PN}
 		$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP)
 		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
+		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
 		)
 
 	cmake-utils_src_configure

diff --git a/sci-mathematics/rstudio/rstudio-0.99.491.ebuild b/sci-mathematics/rstudio/rstudio-0.99.491.ebuild
index f87c147094b..a0c4907f68f 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.491.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.491.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils
 
 # TODO
 # * package gin and gwt
@@ -57,7 +57,7 @@ RDEPEND="
 	>=dev-libs/mathjax-2.3
 	dev-libs/openssl:0
 	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0
+	>=sys-devel/clang-3.5.0:*
 	sys-libs/zlib
 	>=virtual/jre-1.7:=
 	x11-libs/pango
@@ -70,7 +70,7 @@ RDEPEND="
 		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5]
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5]
 		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
@@ -174,7 +174,7 @@ src_prepare() {
 	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
 	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
 	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
-				   "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \
+				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
 					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
 						   -e 's@LIBS \*= -l@@')
 	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
@@ -197,7 +197,7 @@ src_configure() {
 		-DDISTRO_SHARE=share/${PN}
 		$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP)
 		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
+		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
 		)
 
 	cmake-utils_src_configure

diff --git a/sci-mathematics/rstudio/rstudio-0.99.879.ebuild b/sci-mathematics/rstudio/rstudio-0.99.879.ebuild
index 3ebf8d8443b..6adb372e5cd 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.879.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.879.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils
 
 # TODO
 # * package gin and gwt
@@ -57,7 +57,7 @@ RDEPEND="
 	>=dev-libs/mathjax-2.3
 	dev-libs/openssl:0
 	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0
+	>=sys-devel/clang-3.5.0:*
 	sys-libs/zlib
 	>=virtual/jre-1.7:=
 	x11-libs/pango
@@ -70,7 +70,7 @@ RDEPEND="
 		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5]
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5]
 		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
@@ -174,7 +174,7 @@ src_prepare() {
 	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
 	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
 	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
-				   "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \
+				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
 					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
 						   -e 's@LIBS \*= -l@@')
 	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
@@ -197,7 +197,7 @@ src_configure() {
 		-DDISTRO_SHARE=share/${PN}
 		$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP)
 		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
+		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
 		-DRSTUDIO_VERIFY_R_VERSION=FALSE
 		)
 

diff --git a/sci-mathematics/rstudio/rstudio-0.99.893.ebuild b/sci-mathematics/rstudio/rstudio-0.99.893.ebuild
index 98f8def92c7..c3bc93830dd 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.893.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.893.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils
 
 # TODO
 # * package gin and gwt
@@ -57,7 +57,7 @@ RDEPEND="
 	>=dev-libs/mathjax-2.3
 	dev-libs/openssl:0
 	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0
+	>=sys-devel/clang-3.5.0:*
 	sys-libs/zlib
 	>=virtual/jre-1.7:=
 	x11-libs/pango
@@ -70,7 +70,7 @@ RDEPEND="
 		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5]
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5]
 		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
@@ -174,7 +174,7 @@ src_prepare() {
 	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
 	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
 	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
-				   "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \
+				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
 					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
 						   -e 's@LIBS \*= -l@@')
 	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
@@ -197,7 +197,7 @@ src_configure() {
 		-DDISTRO_SHARE=share/${PN}
 		$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP)
 		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
+		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
 		-DRSTUDIO_VERIFY_R_VERSION=FALSE
 		)
 

diff --git a/sci-mathematics/rstudio/rstudio-0.99.896.ebuild b/sci-mathematics/rstudio/rstudio-0.99.896.ebuild
index 559f9b85367..134838bcf65 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.896.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.896.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils
 
 # TODO
 # * package gin and gwt
@@ -57,7 +57,7 @@ RDEPEND="
 	>=dev-libs/mathjax-2.3
 	dev-libs/openssl:0
 	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0
+	>=sys-devel/clang-3.5.0:*
 	sys-libs/zlib
 	>=virtual/jre-1.7:=
 	x11-libs/pango
@@ -70,7 +70,7 @@ RDEPEND="
 		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5]
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5]
 		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
@@ -174,7 +174,7 @@ src_prepare() {
 	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
 	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
 	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
-				   "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \
+				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
 					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
 						   -e 's@LIBS \*= -l@@')
 	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
@@ -197,7 +197,7 @@ src_configure() {
 		-DDISTRO_SHARE=share/${PN}
 		$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP)
 		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
+		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
 		-DRSTUDIO_VERIFY_R_VERSION=FALSE
 		)
 

diff --git a/sci-mathematics/rstudio/rstudio-0.99.902.ebuild b/sci-mathematics/rstudio/rstudio-0.99.902.ebuild
index defc0ba72a2..bd0e219d50f 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.902.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.902.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils
 
 # TODO
 # * package gin and gwt
@@ -57,7 +57,7 @@ RDEPEND="
 	>=dev-libs/mathjax-2.3
 	dev-libs/openssl:0
 	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0
+	>=sys-devel/clang-3.5.0:*
 	sys-libs/zlib
 	>=virtual/jre-1.7:=
 	x11-libs/pango
@@ -70,7 +70,7 @@ RDEPEND="
 		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5]
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5]
 		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
@@ -174,7 +174,7 @@ src_prepare() {
 	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
 	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
 	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
-				   "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \
+				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
 					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
 						   -e 's@LIBS \*= -l@@')
 	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
@@ -197,7 +197,7 @@ src_configure() {
 		-DDISTRO_SHARE=share/${PN}
 		$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP)
 		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
+		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
 		-DRSTUDIO_VERIFY_R_VERSION=FALSE
 		)
 

diff --git a/sci-mathematics/rstudio/rstudio-0.99.903.ebuild b/sci-mathematics/rstudio/rstudio-0.99.903.ebuild
index 141716af12b..60d0858c53c 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.903.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.903.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils
 
 # TODO
 # * package gin and gwt
@@ -57,7 +57,7 @@ RDEPEND="
 	>=dev-libs/mathjax-2.3
 	dev-libs/openssl:0
 	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0
+	>=sys-devel/clang-3.5.0:*
 	sys-libs/zlib
 	>=virtual/jre-1.7:=
 	x11-libs/pango
@@ -70,7 +70,7 @@ RDEPEND="
 		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5]
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5]
 		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
@@ -174,7 +174,7 @@ src_prepare() {
 	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
 	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
 	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
-				   "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \
+				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
 					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
 						   -e 's@LIBS \*= -l@@')
 	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
@@ -197,7 +197,7 @@ src_configure() {
 		-DDISTRO_SHARE=share/${PN}
 		$(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP)
 		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
+		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
 		-DRSTUDIO_VERIFY_R_VERSION=FALSE
 		)
 

diff --git a/sci-mathematics/rstudio/rstudio-1.0.136.ebuild b/sci-mathematics/rstudio/rstudio-1.0.136.ebuild
index fd16cfb0c90..dcb101cac4e 100644
--- a/sci-mathematics/rstudio/rstudio-1.0.136.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.0.136.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils
 
 # TODO
 # * package gin and gwt
@@ -57,7 +57,7 @@ RDEPEND="
 	>=dev-libs/mathjax-2.7.0
 	dev-libs/openssl:0
 	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0
+	>=sys-devel/clang-3.5.0:*
 	sys-libs/zlib
 	>=virtual/jre-1.8:=
 	x11-libs/pango
@@ -70,7 +70,7 @@ RDEPEND="
 		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5]
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5]
 		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
@@ -172,7 +172,7 @@ src_prepare() {
 	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
 	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
 	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
-				   "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \
+				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
 					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
 						   -e 's@LIBS \*= -l@@')
 	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
@@ -195,7 +195,7 @@ src_configure() {
 		-DDISTRO_SHARE=share/${PN}
 		-DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
 		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
+		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
 		-DRSTUDIO_VERIFY_R_VERSION=FALSE
 		)
 

diff --git a/sci-mathematics/rstudio/rstudio-1.0.136.ebuild b/sci-mathematics/rstudio/rstudio-1.0.143.ebuild
similarity index 97%
copy from sci-mathematics/rstudio/rstudio-1.0.136.ebuild
copy to sci-mathematics/rstudio/rstudio-1.0.143.ebuild
index fd16cfb0c90..dcb101cac4e 100644
--- a/sci-mathematics/rstudio/rstudio-1.0.136.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.0.143.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils
 
 # TODO
 # * package gin and gwt
@@ -57,7 +57,7 @@ RDEPEND="
 	>=dev-libs/mathjax-2.7.0
 	dev-libs/openssl:0
 	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0
+	>=sys-devel/clang-3.5.0:*
 	sys-libs/zlib
 	>=virtual/jre-1.8:=
 	x11-libs/pango
@@ -70,7 +70,7 @@ RDEPEND="
 		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5]
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5]
 		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
@@ -172,7 +172,7 @@ src_prepare() {
 	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
 	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
 	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
-				   "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \
+				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
 					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
 						   -e 's@LIBS \*= -l@@')
 	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
@@ -195,7 +195,7 @@ src_configure() {
 		-DDISTRO_SHARE=share/${PN}
 		-DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
 		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
+		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
 		-DRSTUDIO_VERIFY_R_VERSION=FALSE
 		)
 

diff --git a/sci-mathematics/rstudio/rstudio-1.0.44.ebuild b/sci-mathematics/rstudio/rstudio-1.0.44.ebuild
index 4d6d1203e85..dcb101cac4e 100644
--- a/sci-mathematics/rstudio/rstudio-1.0.44.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.0.44.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils
 
 # TODO
 # * package gin and gwt
@@ -57,7 +57,7 @@ RDEPEND="
 	>=dev-libs/mathjax-2.7.0
 	dev-libs/openssl:0
 	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0
+	>=sys-devel/clang-3.5.0:*
 	sys-libs/zlib
 	>=virtual/jre-1.8:=
 	x11-libs/pango
@@ -70,7 +70,7 @@ RDEPEND="
 		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5]
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5]
 		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
@@ -172,7 +172,7 @@ src_prepare() {
 	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
 	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
 	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
-				   "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \
+				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
 					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
 						   -e 's@LIBS \*= -l@@')
 	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
@@ -195,7 +195,7 @@ src_configure() {
 		-DDISTRO_SHARE=share/${PN}
 		-DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
 		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake
+		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
 		-DRSTUDIO_VERIFY_R_VERSION=FALSE
 		)
 


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2017-07-24  4:14 Mark Wright
  0 siblings, 0 replies; 36+ messages in thread
From: Mark Wright @ 2017-07-24  4:14 UTC (permalink / raw
  To: gentoo-commits

commit:     ccc0311e1f6f8af7db788ce97eeba79f1866e83d
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 04:13:56 2017 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 04:13:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccc0311e

sci-mathematics/rstudio: Bump to 1.0.153

Package-Manager: portage-2.3.6

 sci-mathematics/rstudio/Manifest               |   1 +
 sci-mathematics/rstudio/rstudio-1.0.153.ebuild | 247 +++++++++++++++++++++++++
 2 files changed, 248 insertions(+)

diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index c7992773634..f742b19bb98 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -30,6 +30,7 @@ DIST rstudio-0.99.902.tar.gz 17408815 SHA256 703a3ebedbb4bb44d2cacffed2615b4f651
 DIST rstudio-0.99.903.tar.gz 17409865 SHA256 8902fe7a6f7f6e0d6e8fae2472e479bb9cbe9cbb2e0747e5f01a093d31993a3c SHA512 9ddcfdab187c907dfa3cbf386ee902b43ba35c242b44a4190c58d1e3bad590ca428209423739768b57f759c4bde61ef2b5958fb3cba366d7740753c3c5dbf739 WHIRLPOOL 82ca64883d02aacc0c1081779f769c3ea2bbac3c370f1e62fba18465547742114df18d431f30c3fe449c0ae2ac212cd7dd98a72bb2e5810eb1fc6cdbb3c82a69
 DIST rstudio-1.0.136.tar.gz 17786389 SHA256 bb6a8aa475e09dd090cd2b5ea505f578d270858784120599aee5c10bd8ca58e8 SHA512 cb4f98834f287267925169c8141bd0f95fd23cefdba8f407f76a24617bc40da56430745f112774838345330b9f99b9cac86d5b99517346a019e8e2cb3b01f713 WHIRLPOOL 5932ef2572670951a094f79e8805215fd50c3643b4a4654cb469d7181708a3327763531cb68e968e64ebdb7b44df03da0c18f9a06a12d968e908bedc43dac52f
 DIST rstudio-1.0.143.tar.gz 17791067 SHA256 8ae88731b4474e5e2ff9030aa14e168903fe3a7ffc4fa716f497084a86801062 SHA512 46eaa88dd8332f18bb3a43de6e262d8a365860d9add78aea6a2d345784b239972c9c73bf0b56f1736b2981b8f688dbaf5a83c6848d170c0cf61d0e51dd636a82 WHIRLPOOL db1c11be240db3528e46d359c7d40d64068dfe5f7d915c4a6b690444f7f7fbc11f3898a6e262fa625bfab906f0cbfb2a8e3288a4fd20470423a99d992972fcda
+DIST rstudio-1.0.153.tar.gz 17790922 SHA256 79b90e21e56b114e28b03fd8543a208c55bb9d5f47a87fd29143d08b9a06f7a0 SHA512 d970a9bde88845e3fc6cdaff5233ffb65c03939c685c3fca0dd052246e065c7580b3f9bc4e053a79d2ecbb5f8c283d3fce7b97cc69e43176bd49587c736dab86 WHIRLPOOL c1f4c7bdc8e5a85af53411a35d736278b83f4732d2e273378fecc77cb075dff507147d56012682564edd58041c91cc051189eb38a7348d0827b76c7ac37bd54d
 DIST rstudio-1.0.44.tar.gz 17774065 SHA256 43ece6cfdd1a13ac0e17f2a50154a30a1a14ad6c1b3cf381cc6007988ce44a0f SHA512 a8b975dc517125a257e5f61db5bb137e133b02d738d55553770aa65e388cd112ce646b53b77dc069d1ca95ccd95979f4a57ad60b99fc3b91543cf61e737e8169 WHIRLPOOL 4ad472aed130451e81d8d8e3251d3bbd701a8b8e2fbddf17dc357f39335e33c75505f9443c2c7208e60a19c2767b9328134433e5d4fd22504813020712c658ef
 DIST selenium-java-2.37.0.zip 24625928 SHA256 0eebba65d8edb01c1f46e462907c58f5d6e1cb0ddf63660a9985c8432bdffbb7 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779 WHIRLPOOL eb6659aae26f3c78b6f998546b23d0636c9d00ed8a7f985db1463ac4bd483ccb3e643d84e2ca0f59e0636a8de79eb552ff1d68eb6f9c06907029f7552d8f7777
 DIST selenium-server-standalone-2.37.0.jar 34730734 SHA256 97bc8c699037fb6e99ba7af570fb60dbb1b7ce30cde2448287a44ef65b13023e SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018 WHIRLPOOL 20640591534f31f24825a9ed139589b182e8b60d86541bf0be104d3cc0280983f6566bd0459f2253ac3875b48a2798b205bac8f815a119fff6db625ce9bbc29e

diff --git a/sci-mathematics/rstudio/rstudio-1.0.153.ebuild b/sci-mathematics/rstudio/rstudio-1.0.153.ebuild
new file mode 100644
index 00000000000..dcb101cac4e
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-1.0.153.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils qmake-utils
+
+# TODO
+# * package gin and gwt
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+# update from scripts in dependencies/common
+# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
+GWT_VER=2.7.0
+GIN_VER=1.5
+SELENIUM_VER=2.37.0
+CHROMEDRIVER_VER=2.7
+# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc
+PANDOC_VER=1.13.1
+# ls dependencies/common/*.tar.gz
+PACKRAT_VER=0.98.1000
+RMARKDOWN_VER=0.98.1000
+SHINYAPPS_VER=0.98.1000
+RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
+
+DESCRIPTION="IDE for the R language"
+HOMEPAGE="
+	http://www.rstudio.org
+	https://github.com/rstudio/rstudio/"
+SRC_URI="
+	https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
+	https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
+	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
+	https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dedicated server"
+
+QT_VER=5.4
+QT_SLOT=5
+RDEPEND="
+	app-text/pandoc
+	dev-haskell/pandoc-citeproc
+	>=dev-lang/R-2.11.1
+	>=dev-libs/boost-1.50:=
+	>=dev-libs/mathjax-2.7.0
+	dev-libs/openssl:0
+	sys-apps/util-linux
+	>=sys-devel/clang-3.5.0:*
+	sys-libs/zlib
+	>=virtual/jre-1.8:=
+	x11-libs/pango
+	!dedicated? (
+		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5]
+		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
+		server? ( virtual/pam )
+	)
+	dedicated? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	>=virtual/jdk-1.8:=
+	virtual/pkgconfig"
+#	test? ( dev-java/junit:4 )
+
+PATCHES=(
+		"${FILESDIR}/${PN}-0.99.879-prefs.patch"
+		"${FILESDIR}/${PN}-1.0.44-paths.patch"
+		"${FILESDIR}/${PN}-1.0.44-clang-pandoc.patch"
+		"${FILESDIR}/${PN}-0.98.490-linker_flags.patch"
+		"${FILESDIR}/${PN}-0.98.1091-boost-1.57.patch"
+		"${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch"
+		"${FILESDIR}/${PN}-1.0.44-systemd.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz gwt-${GWT_VER}.zip
+	cd "${S}" || die
+	mkdir -p src/gwt/lib/{gin,gwt} \
+		dependencies/common/dictionaries \
+		src/gwt/lib/selenium/${SELENIUM_VER} \
+		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
+	mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
+	unzip -qd src/gwt/lib/gin/${GIN_VER} \
+		"${DISTDIR}"/gin-${GIN_VER}.zip || die
+	unzip -qd dependencies/common/dictionaries \
+		"${DISTDIR}"/core-dictionaries.zip || die
+	unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
+		"${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
+	cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
+		src/gwt/lib/selenium/${SELENIUM_VER}/ || 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
+	unpack shinyapps-${SHINYAPPS_VER}.tar.gz
+	unpack rsconnect_${RSCONNECT_VER}.tar.gz
+	cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \
+		. || die
+}
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+	egit_clean
+
+	# Enable CMake to install our .service file for systemd usage
+	mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
+	cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
+
+	# 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-26 || 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
+
+	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
+	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
+		-i src/cpp/server/ServerOptions.cpp \
+		|| die
+
+	# Set the rsession.conf file location for Gentoo prefix
+	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
+		-i src/cpp/session/SessionOptions.cpp \
+		|| die
+
+	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
+	# It provides a library that has its version number appended to the end,
+	# which is difficult to handle in cmake, as find_library does not support
+	# searching for wildcard library names. So I find the library name from the
+	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
+	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
+	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
+				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
+					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
+						   -e 's@LIBS \*= -l@@')
+	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
+		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
+		|| die
+
+	# The git commit for tag: git rev-list -n 1 v0.99.903
+	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 0eb2d8ea28ebc1ac6ac327e023becb6133b679c4@'\
+		-i "${S}"/CMakeLists.txt \
+		"${S}"/CMakeGlobals.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}
+		-DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
+		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
+		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
+		-DRSTUDIO_VERIFY_R_VERSION=FALSE
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_compile
+}
+
+src_install() {
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_install
+	pax-mark m "${ED}usr/bin/rstudio"
+	doconfd "${FILESDIR}"/rstudio-server.conf
+	dodir /etc/rstudio
+	insinto /etc/rstudio
+	doins "${FILESDIR}"/rsession.conf
+	dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf
+	if use dedicated || use server; then
+		dopamd src/cpp/server/extras/pam/rstudio
+		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
+	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 ;}
+}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2017-11-19 12:52 David Seifert
  0 siblings, 0 replies; 36+ messages in thread
From: David Seifert @ 2017-11-19 12:52 UTC (permalink / raw
  To: gentoo-commits

commit:     0a0a9052913d333a0e8ff5145702563ea3d9b730
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 19 12:51:14 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 19 12:52:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a0a9052

sci-mathematics/rstudio: [QA] Add cmake-utils_src_prepare

Closes: https://bugs.gentoo.org/636660
Package-Manager: Portage-2.3.14, Repoman-2.3.6

 sci-mathematics/rstudio/rstudio-1.1.368.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/rstudio/rstudio-1.1.368.ebuild b/sci-mathematics/rstudio/rstudio-1.1.368.ebuild
index 38ac6d8ddf2..221887f8aa3 100644
--- a/sci-mathematics/rstudio/rstudio-1.1.368.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.1.368.ebuild
@@ -133,7 +133,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
 	java-pkg-2_src_prepare
 	egit_clean
 


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2017-11-25 17:42 David Seifert
  0 siblings, 0 replies; 36+ messages in thread
From: David Seifert @ 2017-11-25 17:42 UTC (permalink / raw
  To: gentoo-commits

commit:     56832aef1ee9a48b6183d97a55b98a4c56381e21
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 25 16:52:38 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 17:40:12 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56832aef

sci-mathematics/rstudio: [QA] Consistent whitespace in metadata.xml

 sci-mathematics/rstudio/metadata.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-mathematics/rstudio/metadata.xml b/sci-mathematics/rstudio/metadata.xml
index 6dc54e48af9..e7bba4aacb8 100644
--- a/sci-mathematics/rstudio/metadata.xml
+++ b/sci-mathematics/rstudio/metadata.xml
@@ -6,9 +6,9 @@
 		<name>Mark Wright</name>
 	</maintainer>
 	<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>
+		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="server">Build and install the RStudio server</flag>
 	</use>


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2017-12-03 15:58 Patrice Clement
  0 siblings, 0 replies; 36+ messages in thread
From: Patrice Clement @ 2017-12-03 15:58 UTC (permalink / raw
  To: gentoo-commits

commit:     3fcb31051b785dc5e617e418073f07eedfcc8a1b
Author:     Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Tue Nov  7 19:54:42 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 15:57:44 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fcb3105

sci-mathematics/rstudio: version bump to 1.1.383

Ebuild is based on https://bugs.gentoo.org/attachment.cgi?id=494772
and the published rstudio-1.1.368.ebuild file.

files/rstudio-0.98.1091-boost-1.57.patch: removed from patches, it's no
longer possible to apply this patch, due to changes	in
src/cpp/desktop/DesktopApplicationLaunch.hpp (see
https://github.com/rstudio/rstudio/commit/585f7244797814d969418d8fe795d1952d84f6df)
which added an #include <QProcess> statement which lets the patch fail.

Thanks to Bernd Feige <Bernd.Feige <AT> gmx.net> for the initial ebuild
and a17r on github for his suggestions on my first try to create a
PR for this.

Bug: https://bugs.gentoo.org/633936
Bug: https://bugs.gentoo.org/622254

Reported-by: Neil <nshephard <AT> gmail.com> (#633936)
Reported-by: Jonas Stein <jstein <AT> gentoo.org> (#622254)

Package Manager: portage-2.3.13 repoman-2.3.4
Closes: https://github.com/gentoo/gentoo/pull/6145

 sci-mathematics/rstudio/Manifest               |   1 +
 sci-mathematics/rstudio/rstudio-1.1.383.ebuild | 247 +++++++++++++++++++++++++
 2 files changed, 248 insertions(+)

diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 76c18739074..b86371e8947 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -6,6 +6,7 @@ DIST packrat-0.98.1000.tar.gz 97677 SHA256 c2da99ea6b62fd460f36b76f6c9b91865c428
 DIST rmarkdown-0.98.1000.tar.gz 1423820 SHA256 56e9f964f805627f6d6face9bf09e6435be4cc48321447ad4041fee86d6f88b4 SHA512 df3540c24c87930fe55bff2ffe67c86c219800cb00ed72ba9451ecd0d0cad411548a78c1a04b9a2e301e853616dcb77e09129c4e48ade6f16d3f14b7ea7e4852 WHIRLPOOL 51098cd48a12a61da312fc1cc96927626db4a19cc069c88f615dd20abe40f52a7b1ac1325b52b1922110ffa76a7f255d9ff2a75cd05d3de01d1b96f0c8286790
 DIST rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz 197051 SHA256 e1e3e1f799eb8be679be9a2ed5aad7e9ce6cd603e3cb43fdc242490f0c311113 SHA512 208dc349f4aa7613ecf94939aba60d22d3a06972344b526c9b6c951015571f5922927bca08db571a7b8a268e42609a4f558f01278c9685f6da2ffc66a1f95ade WHIRLPOOL 4e3d64de00a98190c435d76f12a401d30950fdc7590b6bcc886ae50d4771825d39f93ea2bdcb4a9db026361c522f16f11297ff89dcb15c35f9471c1abf4f4e2c
 DIST rstudio-1.1.368.tar.gz 20197144 SHA256 586573707a488b5f528680b932ba5f8ea6d07667cc5ae6426104e2abf5ddab75 SHA512 39cdf583d7dcd22338916cc0ea4f90681580e41663b2d3e04b2e650759c6b030c85ee111cdfe1f717f931932a9b7ca423a21585d69a785f056f754f6d50399a1 WHIRLPOOL e18ff21823638d458179819e0b0b234b80be2f095f5b7bf5b9ac0190b078f0d7acb51e8896cbfcf1ce33cd203ed4e9fbe097aac6eee62515cace1d2f08c08219
+DIST rstudio-1.1.383.tar.gz 20196702 BLAKE2B 5164230a92618e4252269ad0016b200294d1e7fa502cc49aa694486cda098ee7ffc65e6c74a87d891d0532f5cc15d1552aa86d04047d07b4f275cbc4d2758647 SHA512 3f637f9bce2c1ad1a4ed3e74287da722190a4e12b0cace6ffcca271977d49dcecca9365f2064366aad94e87851593cab83fa9361e9a9222a9f67fe9451f31ed2
 DIST selenium-java-2.37.0.zip 24625928 SHA256 0eebba65d8edb01c1f46e462907c58f5d6e1cb0ddf63660a9985c8432bdffbb7 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779 WHIRLPOOL eb6659aae26f3c78b6f998546b23d0636c9d00ed8a7f985db1463ac4bd483ccb3e643d84e2ca0f59e0636a8de79eb552ff1d68eb6f9c06907029f7552d8f7777
 DIST selenium-server-standalone-2.37.0.jar 34730734 SHA256 97bc8c699037fb6e99ba7af570fb60dbb1b7ce30cde2448287a44ef65b13023e SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018 WHIRLPOOL 20640591534f31f24825a9ed139589b182e8b60d86541bf0be104d3cc0280983f6566bd0459f2253ac3875b48a2798b205bac8f815a119fff6db625ce9bbc29e
 DIST shinyapps-0.98.1000.tar.gz 910095 SHA256 b95c512ae0a0fb4335878d9cfcf9073e2cb3ccfed73543abe27ea8878ed36d57 SHA512 3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c WHIRLPOOL ecc2bce78387cb42e9989163d8fca29220e66f085acde3323417058aebb624dafa8c0e1873c7d79e67324cbd5aad250ef9fcdbbc8f659d64482233b95d898a15

diff --git a/sci-mathematics/rstudio/rstudio-1.1.383.ebuild b/sci-mathematics/rstudio/rstudio-1.1.383.ebuild
new file mode 100644
index 00000000000..7b4808efd4e
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-1.1.383.ebuild
@@ -0,0 +1,247 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils user cmake-utils gnome2-utils pam versionator xdg-utils java-pkg-2 pax-utils qmake-utils
+
+# TODO
+# * package gin and gwt
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+# update from scripts in dependencies/common
+# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
+GWT_VER=2.7.0
+GIN_VER=1.5
+SELENIUM_VER=2.37.0
+CHROMEDRIVER_VER=2.7
+# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc
+PANDOC_VER=1.13.1
+# ls dependencies/common/*.tar.gz
+PACKRAT_VER=0.98.1000
+RMARKDOWN_VER=0.98.1000
+SHINYAPPS_VER=0.98.1000
+RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
+
+DESCRIPTION="IDE for the R language"
+HOMEPAGE="
+	http://www.rstudio.org
+	https://github.com/rstudio/rstudio/"
+SRC_URI="
+	https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
+	https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
+	https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
+	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
+	https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
+	https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dedicated server"
+
+QT_VER=5.4
+QT_SLOT=5
+RDEPEND="
+	app-text/pandoc
+	dev-haskell/pandoc-citeproc
+	>=dev-lang/R-2.11.1
+	>=dev-libs/boost-1.63:=
+	>=dev-libs/mathjax-2.7.0
+	dev-libs/openssl:0
+	sys-apps/util-linux
+	>=sys-devel/clang-3.5.0:*
+	sys-libs/zlib
+	>=virtual/jre-1.8:=
+	x11-libs/pango
+	!dedicated? (
+		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5]
+		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
+		server? ( virtual/pam )
+	)
+	dedicated? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	>=virtual/jdk-1.8:=
+	virtual/pkgconfig"
+#	test? ( dev-java/junit:4 )
+
+PATCHES=(
+		"${FILESDIR}/${PN}-0.99.879-prefs.patch"
+		"${FILESDIR}/${PN}-1.0.44-paths.patch"
+		"${FILESDIR}/${PN}-1.1.357-clang-pandoc.patch"
+		"${FILESDIR}/${PN}-0.98.490-linker_flags.patch"
+		"${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch"
+		"${FILESDIR}/${PN}-1.0.44-systemd.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz gwt-${GWT_VER}.zip
+	cd "${S}" || die
+	mkdir -p src/gwt/lib/{gin,gwt} \
+		dependencies/common/dictionaries \
+		src/gwt/lib/selenium/${SELENIUM_VER} \
+		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
+	mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
+	unzip -qd src/gwt/lib/gin/${GIN_VER} \
+		"${DISTDIR}"/gin-${GIN_VER}.zip || die
+	unzip -qd dependencies/common/dictionaries \
+		"${DISTDIR}"/core-dictionaries.zip || die
+	unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
+		"${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
+	cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
+		src/gwt/lib/selenium/${SELENIUM_VER}/ || 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
+	unpack shinyapps-${SHINYAPPS_VER}.tar.gz
+	unpack rsconnect_${RSCONNECT_VER}.tar.gz
+	cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
+		. || die
+	cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \
+		. || die
+}
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+	egit_clean
+
+	# Enable CMake to install our .service file for systemd usage
+	mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
+	cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
+
+	# 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-26 || 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
+
+	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
+	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
+		-i src/cpp/server/ServerOptions.cpp \
+		|| die
+
+	# Set the rsession.conf file location for Gentoo prefix
+	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
+		-i src/cpp/session/SessionOptions.cpp \
+		|| die
+
+	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
+	# It provides a library that has its version number appended to the end,
+	# which is difficult to handle in cmake, as find_library does not support
+	# searching for wildcard library names. So I find the library name from the
+	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
+	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
+	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
+				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
+					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
+						   -e 's@LIBS \*= -l@@')
+	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
+		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
+		|| die
+
+	# The git commit for tag: git rev-list -n 1 v0.99.903
+	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 0eb2d8ea28ebc1ac6ac327e023becb6133b679c4@'\
+		-i "${S}"/CMakeLists.txt \
+		"${S}"/CMakeGlobals.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}
+		-DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
+		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
+		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
+		-DRSTUDIO_VERIFY_R_VERSION=FALSE
+		)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_compile
+}
+
+src_install() {
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake-utils_src_install
+	pax-mark m "${ED}usr/bin/rstudio"
+	doconfd "${FILESDIR}"/rstudio-server.conf
+	dodir /etc/rstudio
+	insinto /etc/rstudio
+	doins "${FILESDIR}"/rsession.conf
+	dosym "${ROOT}etc/conf.d/rstudio-server.conf" "${ROOT}etc/rstudio/rserver.conf"
+	if use dedicated || use server; then
+		dopamd src/cpp/server/extras/pam/rstudio
+		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
+	fi
+}
+
+pkg_preinst() {
+	use dedicated || gnome2_icon_savelist
+	java-pkg-2_pkg_preinst
+}
+
+pkg_postinst() {
+	use dedicated || { xdg_desktop_database_update
+		xdg_mimeinfo_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 || { xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+		gnome2_icon_cache_update ;}
+}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2017-12-25 10:43 David Seifert
  0 siblings, 0 replies; 36+ messages in thread
From: David Seifert @ 2017-12-25 10:43 UTC (permalink / raw
  To: gentoo-commits

commit:     2b28997fa04bb3af4f1d739f4899efa6c642bddd
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 25 10:28:33 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 10:43:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b28997f

sci-mathematics/rstudio: [QA] Run cmake-utils_src_prepare

Closes: https://bugs.gentoo.org/639814
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sci-mathematics/rstudio/rstudio-1.1.383.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/rstudio/rstudio-1.1.383.ebuild b/sci-mathematics/rstudio/rstudio-1.1.383.ebuild
index 7b4808efd4e..06b9113fb5b 100644
--- a/sci-mathematics/rstudio/rstudio-1.1.383.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.1.383.ebuild
@@ -132,7 +132,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
 	java-pkg-2_src_prepare
 	egit_clean
 


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2018-02-22 10:51 Andreas Sturmlechner
  0 siblings, 0 replies; 36+ messages in thread
From: Andreas Sturmlechner @ 2018-02-22 10:51 UTC (permalink / raw
  To: gentoo-commits

commit:     801382dd87aff62495e8f47e68cd575b09fa20eb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 19 20:03:59 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 10:45:42 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=801382dd

sci-mathematics/rstudio: Prepare for qtsingleapplication dropping qt5

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../rstudio/{rstudio-1.1.383.ebuild => rstudio-1.1.383-r1.ebuild}     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/rstudio/rstudio-1.1.383.ebuild b/sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild
similarity index 98%
rename from sci-mathematics/rstudio/rstudio-1.1.383.ebuild
rename to sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild
index 06b9113fb5b..afaf0c7e2ad 100644
--- a/sci-mathematics/rstudio/rstudio-1.1.383.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -70,7 +70,7 @@ RDEPEND="
 		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5]
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)]
 		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2018-07-03  2:39 Mark Wright
  0 siblings, 0 replies; 36+ messages in thread
From: Mark Wright @ 2018-07-03  2:39 UTC (permalink / raw
  To: gentoo-commits

commit:     d9c2dbc923a64ce929596357f22f9d04c16250ac
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  3 02:37:21 2018 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Tue Jul  3 02:38:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9c2dbc9

sci-mathematics/rstudio: Add USE libressl

Thanks to Fernando Canales for the fix for 655408.
Thanks Harris Landgarten, Volkmar Glauche, sobham and
yuri.from.spb <AT> gmail.com for reporting that 1.0.153 failed to
build with R 3.4.1, this should be fixed in 1.1383 and
later.
Closes: https://bugs.gentoo.org/655408
Closes: https://bugs.gentoo.org/626062
Package-Manager: Portage-2.3.41, Repoman-2.3.9

 sci-mathematics/rstudio/rstudio-1.1.453.ebuild | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sci-mathematics/rstudio/rstudio-1.1.453.ebuild b/sci-mathematics/rstudio/rstudio-1.1.453.ebuild
index 35c991b9bd1..b69961db0c9 100644
--- a/sci-mathematics/rstudio/rstudio-1.1.453.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.1.453.ebuild
@@ -45,7 +45,7 @@ SRC_URI="
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dedicated server"
+IUSE="dedicated libressl server"
 
 QT_VER=5.4
 QT_SLOT=5
@@ -55,7 +55,6 @@ RDEPEND="
 	>=dev-lang/R-2.11.1
 	>=dev-libs/boost-1.63:=
 	>=dev-libs/mathjax-2.7.4
-	dev-libs/openssl:0
 	sys-apps/util-linux
 	>=sys-devel/clang-3.5.0:*
 	sys-libs/zlib
@@ -81,7 +80,9 @@ RDEPEND="
 		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
 		server? ( virtual/pam )
 	)
-	dedicated? ( virtual/pam )"
+	dedicated? ( virtual/pam )
+	!libressl? ( dev-libs/openssl:0 )
+	libressl? ( dev-libs/libressl:0 )"
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-java/ant-core


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2019-06-12 19:14 David Seifert
  0 siblings, 0 replies; 36+ messages in thread
From: David Seifert @ 2019-06-12 19:14 UTC (permalink / raw
  To: gentoo-commits

commit:     09ba01b6ece75971368ea4d630269592403e129d
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 19:14:01 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jun 12 19:14:01 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09ba01b6

sci-mathematics/rstudio: Add upper bound on boost-1.70

Bug: https://bugs.gentoo.org/686186
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild | 2 +-
 sci-mathematics/rstudio/rstudio-1.1.453.ebuild    | 2 +-
 sci-mathematics/rstudio/rstudio-1.1.463.ebuild    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild b/sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild
index 6c795c9d15c..497626b47dc 100644
--- a/sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild
@@ -53,7 +53,7 @@ RDEPEND="
 	app-text/pandoc
 	dev-haskell/pandoc-citeproc
 	>=dev-lang/R-2.11.1
-	>=dev-libs/boost-1.63:=
+	<dev-libs/boost-1.70:=
 	>=dev-libs/mathjax-2.7.0
 	dev-libs/openssl:0=
 	sys-apps/util-linux

diff --git a/sci-mathematics/rstudio/rstudio-1.1.453.ebuild b/sci-mathematics/rstudio/rstudio-1.1.453.ebuild
index 6bba31c28d6..7736e77fe6a 100644
--- a/sci-mathematics/rstudio/rstudio-1.1.453.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.1.453.ebuild
@@ -53,7 +53,7 @@ RDEPEND="
 	>=app-text/pandoc-${PANDOC_VER}
 	dev-haskell/pandoc-citeproc
 	>=dev-lang/R-2.11.1
-	>=dev-libs/boost-1.63:=
+	<dev-libs/boost-1.70:=
 	>=dev-libs/mathjax-2.7.4
 	sys-apps/util-linux
 	>=sys-devel/clang-3.5.0:*

diff --git a/sci-mathematics/rstudio/rstudio-1.1.463.ebuild b/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
index a26a44ec3df..271588e60b8 100644
--- a/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
@@ -53,7 +53,7 @@ RDEPEND="
 	>=app-text/pandoc-${PANDOC_VER}
 	dev-haskell/pandoc-citeproc
 	>=dev-lang/R-2.11.1
-	>=dev-libs/boost-1.63:=
+	<dev-libs/boost-1.70:=
 	>=dev-libs/mathjax-2.7.4
 	sys-apps/util-linux
 	>=sys-devel/clang-3.5.0:*


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2019-06-12 19:14 David Seifert
  0 siblings, 0 replies; 36+ messages in thread
From: David Seifert @ 2019-06-12 19:14 UTC (permalink / raw
  To: gentoo-commits

commit:     66b554ceeab5781c761d22064a929d00dc56f4bd
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 19:13:58 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jun 12 19:13:58 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66b554ce

sci-mathematics/rstudio: [QA] Add slot-dep operator for openssl/libressl

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild | 4 ++--
 sci-mathematics/rstudio/rstudio-1.1.453.ebuild    | 6 +++---
 sci-mathematics/rstudio/rstudio-1.1.463.ebuild    | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild b/sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild
index afaf0c7e2ad..6c795c9d15c 100644
--- a/sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -55,7 +55,7 @@ RDEPEND="
 	>=dev-lang/R-2.11.1
 	>=dev-libs/boost-1.63:=
 	>=dev-libs/mathjax-2.7.0
-	dev-libs/openssl:0
+	dev-libs/openssl:0=
 	sys-apps/util-linux
 	>=sys-devel/clang-3.5.0:*
 	sys-libs/zlib

diff --git a/sci-mathematics/rstudio/rstudio-1.1.453.ebuild b/sci-mathematics/rstudio/rstudio-1.1.453.ebuild
index b69961db0c9..6bba31c28d6 100644
--- a/sci-mathematics/rstudio/rstudio-1.1.453.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.1.453.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -81,8 +81,8 @@ RDEPEND="
 		server? ( virtual/pam )
 	)
 	dedicated? ( virtual/pam )
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl:0 )"
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-java/ant-core

diff --git a/sci-mathematics/rstudio/rstudio-1.1.463.ebuild b/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
index f2d6cf5a20f..a26a44ec3df 100644
--- a/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -81,8 +81,8 @@ RDEPEND="
 		server? ( virtual/pam )
 	)
 	dedicated? ( virtual/pam )
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl:0 )"
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-java/ant-core


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2019-08-22 11:01 Thomas Deutschmann
  0 siblings, 0 replies; 36+ messages in thread
From: Thomas Deutschmann @ 2019-08-22 11:01 UTC (permalink / raw
  To: gentoo-commits

commit:     1f7330384a57b41c8ed4825d5a98a71530a79d36
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 22 10:56:40 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Aug 22 11:01:46 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f733038

sci-mathematics/rstudio: fix missing slashes

Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 sci-mathematics/rstudio/rstudio-1.2.1335.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
index 4ff5da66509..81591d93861 100644
--- a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
@@ -162,12 +162,12 @@ src_prepare() {
 		CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
 
 	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
-	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
+	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}/etc/conf.d/rstudio-server.conf@" \
 		-i src/cpp/server/ServerOptions.cpp \
 		|| die
 
 	# Set the rsession.conf file location for Gentoo prefix
-	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
+	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}/etc/rstudio/rsession.conf@" \
 		-i src/cpp/session/SessionOptions.cpp \
 		|| die
 
@@ -223,7 +223,7 @@ src_install() {
 	dodir /etc/rstudio
 	insinto /etc/rstudio
 	doins "${FILESDIR}"/rsession.conf
-	dosym "${ROOT}etc/conf.d/rstudio-server.conf" "${ROOT}etc/rstudio/rserver.conf"
+	dosym "${ED}/etc/conf.d/rstudio-server.conf" "/etc/rstudio/rserver.conf"
 	if use dedicated || use server; then
 		dopamd src/cpp/server/extras/pam/rstudio
 		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2019-08-22 11:07 Thomas Deutschmann
  0 siblings, 0 replies; 36+ messages in thread
From: Thomas Deutschmann @ 2019-08-22 11:07 UTC (permalink / raw
  To: gentoo-commits

commit:     25f788e190ec53883d125bc2c8323925e67c0361
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 22 11:07:28 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Aug 22 11:07:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25f788e1

sci-mathematics/rstudio: fix slashes

Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild b/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild
index 86b6db8da4b..cc1c95318e3 100644
--- a/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild
@@ -164,12 +164,12 @@ src_prepare() {
 		CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
 
 	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
-	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
+	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}/etc/conf.d/rstudio-server.conf@" \
 		-i src/cpp/server/ServerOptions.cpp \
 		|| die
 
 	# Set the rsession.conf file location for Gentoo prefix
-	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
+	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}/etc/rstudio/rsession.conf@" \
 		-i src/cpp/session/SessionOptions.cpp \
 		|| die
 
@@ -225,7 +225,7 @@ src_install() {
 	dodir /etc/rstudio
 	insinto /etc/rstudio
 	doins "${FILESDIR}"/rsession.conf
-	dosym "${ROOT}etc/conf.d/rstudio-server.conf" "${ROOT}etc/rstudio/rserver.conf"
+	dosym "${EROOT}/etc/conf.d/rstudio-server.conf" "/etc/rstudio/rserver.conf"
 	if use dedicated || use server; then
 		dopamd src/cpp/server/extras/pam/rstudio
 		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2019-08-22 23:15 Mark Wright
  0 siblings, 0 replies; 36+ messages in thread
From: Mark Wright @ 2019-08-22 23:15 UTC (permalink / raw
  To: gentoo-commits

commit:     2d1f619bb53c0dccb12509a94b7fc20d616dfc3c
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 22 23:14:44 2019 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Thu Aug 22 23:14:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d1f619b

sci-mathematics/rstudio: Fix #692728 dep webkit -> webengine

Thanks to Ulenrich for reporting, rstudio changed the dev-qt/webkit
dependency to dev-qt/webengine

Closes: https://bugs.gentoo.org/692728
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Mark Wright <gienah <AT> gentoo.org>

 sci-mathematics/rstudio/rstudio-1.2.1335.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
index 81591d93861..60a61cb90a3 100644
--- a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
@@ -75,7 +75,7 @@ RDEPEND="
 		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebengine-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2019-10-12 19:04 Mikle Kolyada
  0 siblings, 0 replies; 36+ messages in thread
From: Mikle Kolyada @ 2019-10-12 19:04 UTC (permalink / raw
  To: gentoo-commits

commit:     326e535209bd3be261502dd9ba0e0b6444ab1fe7
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 19:03:39 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 19:03:39 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=326e5352

sci-mathematics/rstudio: migrate to sys-libs/pam

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild | 4 ++--
 sci-mathematics/rstudio/rstudio-1.1.453.ebuild    | 4 ++--
 sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild | 4 ++--
 sci-mathematics/rstudio/rstudio-1.1.463.ebuild    | 4 ++--
 sci-mathematics/rstudio/rstudio-1.2.1335.ebuild   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild b/sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild
index 497626b47dc..9dc32b4769c 100644
--- a/sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild
@@ -79,9 +79,9 @@ RDEPEND="
 		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
-		server? ( virtual/pam )
+		server? ( sys-libs/pam )
 	)
-	dedicated? ( virtual/pam )"
+	dedicated? ( sys-libs/pam )"
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-java/ant-core

diff --git a/sci-mathematics/rstudio/rstudio-1.1.453.ebuild b/sci-mathematics/rstudio/rstudio-1.1.453.ebuild
index 7736e77fe6a..9c47ef9b01c 100644
--- a/sci-mathematics/rstudio/rstudio-1.1.453.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.1.453.ebuild
@@ -78,9 +78,9 @@ RDEPEND="
 		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
-		server? ( virtual/pam )
+		server? ( sys-libs/pam )
 	)
-	dedicated? ( virtual/pam )
+	dedicated? ( sys-libs/pam )
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )"
 DEPEND="${RDEPEND}

diff --git a/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild b/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild
index cc1c95318e3..c26f7f5c300 100644
--- a/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild
@@ -78,9 +78,9 @@ RDEPEND="
 		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
-		server? ( virtual/pam )
+		server? ( sys-libs/pam )
 	)
-	dedicated? ( virtual/pam )
+	dedicated? ( sys-libs/pam )
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )"
 DEPEND="${RDEPEND}

diff --git a/sci-mathematics/rstudio/rstudio-1.1.463.ebuild b/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
index 5c0511bb9a5..74ba9b3fb3b 100644
--- a/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
@@ -78,9 +78,9 @@ RDEPEND="
 		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
-		server? ( virtual/pam )
+		server? ( sys-libs/pam )
 	)
-	dedicated? ( virtual/pam )
+	dedicated? ( sys-libs/pam )
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )"
 DEPEND="${RDEPEND}

diff --git a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
index 60a61cb90a3..90a42d77b24 100644
--- a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
@@ -79,9 +79,9 @@ RDEPEND="
 		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
-		server? ( virtual/pam )
+		server? ( sys-libs/pam )
 	)
-	dedicated? ( virtual/pam )
+	dedicated? ( sys-libs/pam )
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )"
 DEPEND="${RDEPEND}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2019-10-20 11:41 David Seifert
  0 siblings, 0 replies; 36+ messages in thread
From: David Seifert @ 2019-10-20 11:41 UTC (permalink / raw
  To: gentoo-commits

commit:     1d8da75364e901d0d0af5c8bfc04dcc055de12cb
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Tue Oct  8 08:34:37 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 11:41:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d8da753

sci-mathematics/rstudio: depend on qtwebengine[widgets]

Closes: https://bugs.gentoo.org/696940
Closes: https://github.com/gentoo/gentoo/pull/13209
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-mathematics/rstudio/rstudio-1.2.1335.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
index 90a42d77b24..2e857a99a3a 100644
--- a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
@@ -75,7 +75,7 @@ RDEPEND="
 		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtwebengine-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebengine-${QT_VER}:${QT_SLOT}[widgets]
 		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
 		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2019-12-07 20:58 David Seifert
  0 siblings, 0 replies; 36+ messages in thread
From: David Seifert @ 2019-12-07 20:58 UTC (permalink / raw
  To: gentoo-commits

commit:     6b780aa14a9f240d8991c418a397913bc1fafd50
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  7 20:58:13 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Dec  7 20:58:13 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b780aa1

sci-mathematics/rstudio: Remove old

* <dev-libs/boost-1.70 is gone from the tree

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-mathematics/rstudio/Manifest                  |   2 -
 sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild | 247 ---------------------
 sci-mathematics/rstudio/rstudio-1.1.453.ebuild    | 250 ---------------------
 sci-mathematics/rstudio/rstudio-1.1.463.ebuild    | 254 ----------------------
 4 files changed, 753 deletions(-)

diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 0b00d0f295a..2c0bab41204 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -7,8 +7,6 @@ DIST gwt-2.8.1.zip 95650299 BLAKE2B 3853d50d1346e313903b6f0c4b8405ce9e896e516524
 DIST packrat-0.98.1000.tar.gz 97677 BLAKE2B 282fe33dc5ba366ceea05a222ae2d018bc3ad8f35fad73c585a3d4901c3287e6902277a9c7ca087854f3944bd85ff1b1d1f02869ece686b10f946e2f1cb1296c SHA512 2290c768ecf27a037e73c3f8336b9fd71c68ff19d071b4a8fbc469550d29007cacacdb75f854f73b5db2139a5104f129b85a3612e2ee47bd6118ee13f7d103a6
 DIST rmarkdown-0.98.1000.tar.gz 1423820 BLAKE2B eac8c9cf438c9b44ddfe954602dd67a83764b0c988b3ba571877c986b0d5d237059ed6643a86bb404428857ec8c346bfecd12f7cd15cde301cb0ce331f842b7f SHA512 df3540c24c87930fe55bff2ffe67c86c219800cb00ed72ba9451ecd0d0cad411548a78c1a04b9a2e301e853616dcb77e09129c4e48ade6f16d3f14b7ea7e4852
 DIST rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz 197051 BLAKE2B 1f3f9fe71d7b50ab5108dfdbd3cc0b882bcc935ee58e8a9145b07a18bb86c39bc45e321a13add24df99492bc30548df716775c339bcbf4efc2bfe158299ae55a SHA512 208dc349f4aa7613ecf94939aba60d22d3a06972344b526c9b6c951015571f5922927bca08db571a7b8a268e42609a4f558f01278c9685f6da2ffc66a1f95ade
-DIST rstudio-1.1.383.tar.gz 20196702 BLAKE2B 5164230a92618e4252269ad0016b200294d1e7fa502cc49aa694486cda098ee7ffc65e6c74a87d891d0532f5cc15d1552aa86d04047d07b4f275cbc4d2758647 SHA512 3f637f9bce2c1ad1a4ed3e74287da722190a4e12b0cace6ffcca271977d49dcecca9365f2064366aad94e87851593cab83fa9361e9a9222a9f67fe9451f31ed2
-DIST rstudio-1.1.453.tar.gz 20200360 BLAKE2B 560b89e53b04356ecf9a02dd8a7e72ad8d6c30bf406fbe7e22a82cc6d33d40e84bececf5ecda9cf086360b2bd2fa64d6b33c2dd675ef5f605f9e825d7ca2dc84 SHA512 f2be0866f645007a6f80959109928820c89480057c3660d23e790591797d4f4c371733f49290dae9c81bfc2715821528e2a105e7a66d4d9ffbfc7ee2a596976c
 DIST rstudio-1.1.463.tar.gz 20203779 BLAKE2B 97f879539cbb7051af362a8469795a47feb42d18ff46dbbdffe36e0685d1cd5704848b3bf5a5611d482a09567722e35288527302cd521b18e2a48b347c919e17 SHA512 987347563a9726363c28d866e1372eae8eb19a5cbd0e33c7ee0e0c8f90471c4b69de0f559c00410523841b6c090b584652e01496f5db33c015a4554d2f4e179b
 DIST rstudio-1.2.1335.tar.gz 20440199 BLAKE2B cdd54a7df5a234bcc6d440f4ba5b45e58ea469f8dac5a17d9088f9d65035495c86b5a308cde28a224648f96a74038299863291f3c516a1d567762ecc5bfb079c SHA512 90657effc55264bf3efa1a8a5d2bbe94a37727f0450202ade99b9fbb71ea75b6dd9fa798d17cd4d1a1a97a16f186de8004d1888b6ea43f36d5252508520d3cde
 DIST selenium-java-2.37.0.zip 24625928 BLAKE2B b369a805ae96f0d0913c4be42888d9c2a1e213ff982f9daefe73fadb705baa80ab0186ab50ed52609e83697cffaf8d617d06d75405cb8e1c3fe8e7c5b81dba25 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779

diff --git a/sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild b/sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild
deleted file mode 100644
index 9dc32b4769c..00000000000
--- a/sci-mathematics/rstudio/rstudio-1.1.383-r1.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils user cmake-utils gnome2-utils pam versionator xdg-utils java-pkg-2 pax-utils qmake-utils
-
-# TODO
-# * package gin and gwt
-# * use dict from tree, linguas
-# * do src_test (use junit from tree?)
-
-# update from scripts in dependencies/common
-# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
-GWT_VER=2.7.0
-GIN_VER=1.5
-SELENIUM_VER=2.37.0
-CHROMEDRIVER_VER=2.7
-# grep 'PANDOC_VERSION=' dependencies/common/update-pandoc
-PANDOC_VER=1.13.1
-# ls dependencies/common/*.tar.gz
-PACKRAT_VER=0.98.1000
-RMARKDOWN_VER=0.98.1000
-SHINYAPPS_VER=0.98.1000
-RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
-
-DESCRIPTION="IDE for the R language"
-HOMEPAGE="
-	http://www.rstudio.org
-	https://github.com/rstudio/rstudio/"
-SRC_URI="
-	https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
-	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
-	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
-	https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
-	https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
-	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
-	https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
-	https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
-	https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
-	https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
-"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dedicated server"
-
-QT_VER=5.4
-QT_SLOT=5
-RDEPEND="
-	app-text/pandoc
-	dev-haskell/pandoc-citeproc
-	>=dev-lang/R-2.11.1
-	<dev-libs/boost-1.70:=
-	>=dev-libs/mathjax-2.7.0
-	dev-libs/openssl:0=
-	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0:*
-	sys-libs/zlib
-	>=virtual/jre-1.8:=
-	x11-libs/pango
-	!dedicated? (
-		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)]
-		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
-		server? ( sys-libs/pam )
-	)
-	dedicated? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-java/ant-core
-	>=virtual/jdk-1.8:=
-	virtual/pkgconfig"
-#	test? ( dev-java/junit:4 )
-
-PATCHES=(
-		"${FILESDIR}/${PN}-0.99.879-prefs.patch"
-		"${FILESDIR}/${PN}-1.0.44-paths.patch"
-		"${FILESDIR}/${PN}-1.1.357-clang-pandoc.patch"
-		"${FILESDIR}/${PN}-0.98.490-linker_flags.patch"
-		"${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch"
-		"${FILESDIR}/${PN}-1.0.44-systemd.patch"
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz gwt-${GWT_VER}.zip
-	cd "${S}" || die
-	mkdir -p src/gwt/lib/{gin,gwt} \
-		dependencies/common/dictionaries \
-		src/gwt/lib/selenium/${SELENIUM_VER} \
-		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
-	mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
-	unzip -qd src/gwt/lib/gin/${GIN_VER} \
-		"${DISTDIR}"/gin-${GIN_VER}.zip || die
-	unzip -qd dependencies/common/dictionaries \
-		"${DISTDIR}"/core-dictionaries.zip || die
-	unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
-		"${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
-	cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
-		src/gwt/lib/selenium/${SELENIUM_VER}/ || 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
-	unpack shinyapps-${SHINYAPPS_VER}.tar.gz
-	unpack rsconnect_${RSCONNECT_VER}.tar.gz
-	cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
-		. || die
-	cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
-		. || die
-	cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
-		. || die
-	cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \
-		. || die
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	java-pkg-2_src_prepare
-	egit_clean
-
-	# Enable CMake to install our .service file for systemd usage
-	mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
-	cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
-
-	# 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-26 || 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
-
-	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
-	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
-		-i src/cpp/server/ServerOptions.cpp \
-		|| die
-
-	# Set the rsession.conf file location for Gentoo prefix
-	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
-		-i src/cpp/session/SessionOptions.cpp \
-		|| die
-
-	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
-	# It provides a library that has its version number appended to the end,
-	# which is difficult to handle in cmake, as find_library does not support
-	# searching for wildcard library names. So I find the library name from the
-	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
-	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
-	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
-				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
-					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
-						   -e 's@LIBS \*= -l@@')
-	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
-		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
-		|| die
-
-	# The git commit for tag: git rev-list -n 1 v0.99.903
-	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 0eb2d8ea28ebc1ac6ac327e023becb6133b679c4@'\
-		-i "${S}"/CMakeLists.txt \
-		"${S}"/CMakeGlobals.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}
-		-DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
-		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
-		-DRSTUDIO_VERIFY_R_VERSION=FALSE
-		)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
-	# P: /root/.oracle_jre_usage.
-	export ANT_OPTS="-Duser.home=${T}"
-	cmake-utils_src_compile
-}
-
-src_install() {
-	export ANT_OPTS="-Duser.home=${T}"
-	cmake-utils_src_install
-	pax-mark m "${ED}usr/bin/rstudio"
-	doconfd "${FILESDIR}"/rstudio-server.conf
-	dodir /etc/rstudio
-	insinto /etc/rstudio
-	doins "${FILESDIR}"/rsession.conf
-	dosym "${ROOT}etc/conf.d/rstudio-server.conf" "${ROOT}etc/rstudio/rserver.conf"
-	if use dedicated || use server; then
-		dopamd src/cpp/server/extras/pam/rstudio
-		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
-	fi
-}
-
-pkg_preinst() {
-	use dedicated || gnome2_icon_savelist
-	java-pkg-2_pkg_preinst
-}
-
-pkg_postinst() {
-	use dedicated || { xdg_desktop_database_update
-		xdg_mimeinfo_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 || { xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-		gnome2_icon_cache_update ;}
-}

diff --git a/sci-mathematics/rstudio/rstudio-1.1.453.ebuild b/sci-mathematics/rstudio/rstudio-1.1.453.ebuild
deleted file mode 100644
index 9c47ef9b01c..00000000000
--- a/sci-mathematics/rstudio/rstudio-1.1.453.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils user cmake-utils gnome2-utils pam versionator xdg-utils java-pkg-2 pax-utils qmake-utils
-
-# TODO
-# * package gin and gwt
-# * use dict from tree, linguas
-# * do src_test (use junit from tree?)
-
-# update from scripts in dependencies/common
-# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
-GWT_VER=2.7.0
-GIN_VER=1.5
-SELENIUM_VER=2.37.0
-CHROMEDRIVER_VER=2.7
-# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc
-PANDOC_VER=1.19.2.1
-# ls dependencies/common/*.tar.gz
-PACKRAT_VER=0.98.1000
-RMARKDOWN_VER=0.98.1000
-SHINYAPPS_VER=0.98.1000
-RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
-
-DESCRIPTION="IDE for the R language"
-HOMEPAGE="
-	http://www.rstudio.org
-	https://github.com/rstudio/rstudio/"
-SRC_URI="
-	https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
-	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
-	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
-	https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
-	https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
-	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
-	https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
-	https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
-	https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
-	https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
-"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dedicated libressl server"
-
-QT_VER=5.4
-QT_SLOT=5
-RDEPEND="
-	>=app-text/pandoc-${PANDOC_VER}
-	dev-haskell/pandoc-citeproc
-	>=dev-lang/R-2.11.1
-	<dev-libs/boost-1.70:=
-	>=dev-libs/mathjax-2.7.4
-	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0:*
-	sys-libs/zlib
-	>=virtual/jre-1.8:=
-	x11-libs/pango
-	!dedicated? (
-		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)]
-		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
-		server? ( sys-libs/pam )
-	)
-	dedicated? ( sys-libs/pam )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-java/ant-core
-	>=virtual/jdk-1.8:=
-	virtual/pkgconfig"
-#	test? ( dev-java/junit:4 )
-
-PATCHES=(
-		"${FILESDIR}/${PN}-0.99.879-prefs.patch"
-		"${FILESDIR}/${PN}-1.0.44-paths.patch"
-		"${FILESDIR}/${PN}-1.1.357-clang-pandoc.patch"
-		"${FILESDIR}/${PN}-0.98.490-linker_flags.patch"
-		"${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch"
-		"${FILESDIR}/${PN}-1.0.44-systemd.patch"
-		"${FILESDIR}/${PN}-1.1.453-boost-1.67.0.patch"
-		"${FILESDIR}/${PN}-1.1.453-core.patch"
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz gwt-${GWT_VER}.zip
-	cd "${S}" || die
-	mkdir -p src/gwt/lib/{gin,gwt} \
-		dependencies/common/dictionaries \
-		src/gwt/lib/selenium/${SELENIUM_VER} \
-		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
-	mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
-	unzip -qd src/gwt/lib/gin/${GIN_VER} \
-		"${DISTDIR}"/gin-${GIN_VER}.zip || die
-	unzip -qd dependencies/common/dictionaries \
-		"${DISTDIR}"/core-dictionaries.zip || die
-	unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
-		"${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
-	cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
-		src/gwt/lib/selenium/${SELENIUM_VER}/ || 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
-	unpack shinyapps-${SHINYAPPS_VER}.tar.gz
-	unpack rsconnect_${RSCONNECT_VER}.tar.gz
-	cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
-		. || die
-	cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
-		. || die
-	cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
-		. || die
-	cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \
-		. || die
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	java-pkg-2_src_prepare
-	egit_clean
-
-	# Enable CMake to install our .service file for systemd usage
-	mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
-	cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
-
-	# 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-26 || 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
-
-	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
-	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
-		-i src/cpp/server/ServerOptions.cpp \
-		|| die
-
-	# Set the rsession.conf file location for Gentoo prefix
-	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
-		-i src/cpp/session/SessionOptions.cpp \
-		|| die
-
-	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
-	# It provides a library that has its version number appended to the end,
-	# which is difficult to handle in cmake, as find_library does not support
-	# searching for wildcard library names. So I find the library name from the
-	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
-	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
-	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
-				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
-					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
-						   -e 's@LIBS \*= -l@@')
-	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
-		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
-		|| die
-
-	# The git commit for tag: git rev-list -n 1 v${PV}
-	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 6871a99b32add885fe6fa3d50fe15f62346142e7@'\
-		-i "${S}"/CMakeLists.txt \
-		"${S}"/CMakeGlobals.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}
-		-DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
-		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
-		-DRSTUDIO_VERIFY_R_VERSION=FALSE
-		)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
-	# P: /root/.oracle_jre_usage.
-	export ANT_OPTS="-Duser.home=${T}"
-	cmake-utils_src_compile
-}
-
-src_install() {
-	export ANT_OPTS="-Duser.home=${T}"
-	cmake-utils_src_install
-	pax-mark m "${ED}usr/bin/rstudio"
-	doconfd "${FILESDIR}"/rstudio-server.conf
-	dodir /etc/rstudio
-	insinto /etc/rstudio
-	doins "${FILESDIR}"/rsession.conf
-	dosym "${ROOT}etc/conf.d/rstudio-server.conf" "${ROOT}etc/rstudio/rserver.conf"
-	if use dedicated || use server; then
-		dopamd src/cpp/server/extras/pam/rstudio
-		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
-	fi
-}
-
-pkg_preinst() {
-	use dedicated || gnome2_icon_savelist
-	java-pkg-2_pkg_preinst
-}
-
-pkg_postinst() {
-	use dedicated || { xdg_desktop_database_update
-		xdg_mimeinfo_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 || { xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-		gnome2_icon_cache_update ;}
-}

diff --git a/sci-mathematics/rstudio/rstudio-1.1.463.ebuild b/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
deleted file mode 100644
index 74ba9b3fb3b..00000000000
--- a/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils user cmake-utils gnome2-utils pam versionator xdg-utils java-pkg-2 pax-utils qmake-utils
-
-# TODO
-# * package gin and gwt
-# * use dict from tree, linguas
-# * do src_test (use junit from tree?)
-
-# update from scripts in dependencies/common
-# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
-GWT_VER=2.7.0
-GIN_VER=1.5
-SELENIUM_VER=2.37.0
-CHROMEDRIVER_VER=2.7
-# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc
-PANDOC_VER=1.19.2.1
-# ls dependencies/common/*.tar.gz
-PACKRAT_VER=0.98.1000
-RMARKDOWN_VER=0.98.1000
-SHINYAPPS_VER=0.98.1000
-RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0
-
-DESCRIPTION="IDE for the R language"
-HOMEPAGE="
-	http://www.rstudio.org
-	https://github.com/rstudio/rstudio/"
-SRC_URI="
-	https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip
-	https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip
-	https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip
-	https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar
-	https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
-	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
-	https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
-	https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
-	https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz
-	https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz
-"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dedicated libressl server"
-
-QT_VER=5.4
-QT_SLOT=5
-RDEPEND="
-	>=app-text/pandoc-${PANDOC_VER}
-	dev-haskell/pandoc-citeproc
-	>=dev-lang/R-2.11.1
-	<dev-libs/boost-1.70:=
-	>=dev-libs/mathjax-2.7.4
-	sys-apps/util-linux
-	>=sys-devel/clang-3.5.0:*
-	sys-libs/zlib
-	>=virtual/jre-1.8:=
-	x11-libs/pango
-	!dedicated? (
-		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)]
-		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
-		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
-		server? ( sys-libs/pam )
-	)
-	dedicated? ( sys-libs/pam )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-java/ant-core
-	>=virtual/jdk-1.8:=
-	virtual/pkgconfig"
-#	test? ( dev-java/junit:4 )
-
-PATCHES=(
-		"${FILESDIR}/${PN}-0.99.879-prefs.patch"
-		"${FILESDIR}/${PN}-1.0.44-paths.patch"
-		"${FILESDIR}/${PN}-1.1.357-clang-pandoc.patch"
-		"${FILESDIR}/${PN}-0.98.490-linker_flags.patch"
-		"${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch"
-		"${FILESDIR}/${PN}-1.0.44-systemd.patch"
-		"${FILESDIR}/${PN}-1.1.453-boost-1.67.0.patch"
-		"${FILESDIR}/${PN}-1.1.453-core.patch"
-		"${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p1.patch"
-		"${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p2.patch"
-		"${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p3.patch"
-		"${FILESDIR}/${PN}-1.1.463-fix-ptr-int-compare.patch"
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz gwt-${GWT_VER}.zip
-	cd "${S}" || die
-	mkdir -p src/gwt/lib/{gin,gwt} \
-		dependencies/common/dictionaries \
-		src/gwt/lib/selenium/${SELENIUM_VER} \
-		src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
-	mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die
-	unzip -qd src/gwt/lib/gin/${GIN_VER} \
-		"${DISTDIR}"/gin-${GIN_VER}.zip || die
-	unzip -qd dependencies/common/dictionaries \
-		"${DISTDIR}"/core-dictionaries.zip || die
-	unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \
-		"${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die
-	cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \
-		src/gwt/lib/selenium/${SELENIUM_VER}/ || 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
-	unpack shinyapps-${SHINYAPPS_VER}.tar.gz
-	unpack rsconnect_${RSCONNECT_VER}.tar.gz
-	cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \
-		. || die
-	cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \
-		. || die
-	cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \
-		. || die
-	cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \
-		. || die
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	java-pkg-2_src_prepare
-	egit_clean
-
-	# Enable CMake to install our .service file for systemd usage
-	mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
-	cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
-
-	# 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-26 || 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
-
-	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
-	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \
-		-i src/cpp/server/ServerOptions.cpp \
-		|| die
-
-	# Set the rsession.conf file location for Gentoo prefix
-	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \
-		-i src/cpp/session/SessionOptions.cpp \
-		|| die
-
-	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
-	# It provides a library that has its version number appended to the end,
-	# which is difficult to handle in cmake, as find_library does not support
-	# searching for wildcard library names. So I find the library name from the
-	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
-	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
-	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
-				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
-					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
-						   -e 's@LIBS \*= -l@@')
-	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
-		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
-		|| die
-
-	# The git commit for tag: git rev-list -n 1 v${PV}
-	sed -e 's@git ARGS rev-parse HEAD@echo ARGS 6871a99b32add885fe6fa3d50fe15f62346142e7@'\
-		-i "${S}"/CMakeLists.txt \
-		"${S}"/CMakeGlobals.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}
-		-DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
-		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
-		-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
-		-DRSTUDIO_VERIFY_R_VERSION=FALSE
-		)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
-	# P: /root/.oracle_jre_usage.
-	export ANT_OPTS="-Duser.home=${T}"
-	cmake-utils_src_compile
-}
-
-src_install() {
-	export ANT_OPTS="-Duser.home=${T}"
-	cmake-utils_src_install
-	pax-mark m "${ED}usr/bin/rstudio"
-	doconfd "${FILESDIR}"/rstudio-server.conf
-	dodir /etc/rstudio
-	insinto /etc/rstudio
-	doins "${FILESDIR}"/rsession.conf
-	dosym "${ROOT}etc/conf.d/rstudio-server.conf" "${ROOT}etc/rstudio/rserver.conf"
-	if use dedicated || use server; then
-		dopamd src/cpp/server/extras/pam/rstudio
-		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
-	fi
-}
-
-pkg_preinst() {
-	use dedicated || gnome2_icon_savelist
-	java-pkg-2_pkg_preinst
-}
-
-pkg_postinst() {
-	use dedicated || { xdg_desktop_database_update
-		xdg_mimeinfo_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 || { xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-		gnome2_icon_cache_update ;}
-}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2019-12-07 21:55 David Seifert
  0 siblings, 0 replies; 36+ messages in thread
From: David Seifert @ 2019-12-07 21:55 UTC (permalink / raw
  To: gentoo-commits

commit:     67ed6069f634a03a21ce4c6f82b75827318756a5
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  7 21:54:58 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Dec  7 21:54:58 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67ed6069

sci-mathematics/rstudio: [QA] Fix AbsoluteSymlink

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild | 2 +-
 sci-mathematics/rstudio/rstudio-1.2.1335.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild b/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild
index c26f7f5c300..09f22605f33 100644
--- a/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild
@@ -225,7 +225,7 @@ src_install() {
 	dodir /etc/rstudio
 	insinto /etc/rstudio
 	doins "${FILESDIR}"/rsession.conf
-	dosym "${EROOT}/etc/conf.d/rstudio-server.conf" "/etc/rstudio/rserver.conf"
+	dosym ../conf.d/rstudio-server.conf /etc/rstudio/rserver.conf
 	if use dedicated || use server; then
 		dopamd src/cpp/server/extras/pam/rstudio
 		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server

diff --git a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
index 2e857a99a3a..9d0dfd64d7d 100644
--- a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
@@ -223,7 +223,7 @@ src_install() {
 	dodir /etc/rstudio
 	insinto /etc/rstudio
 	doins "${FILESDIR}"/rsession.conf
-	dosym "${ED}/etc/conf.d/rstudio-server.conf" "/etc/rstudio/rserver.conf"
+	dosym ../conf.d/rstudio-server.conf /etc/rstudio/rserver.conf
 	if use dedicated || use server; then
 		dopamd src/cpp/server/extras/pam/rstudio
 		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2020-02-12 18:06 David Seifert
  0 siblings, 0 replies; 36+ messages in thread
From: David Seifert @ 2020-02-12 18:06 UTC (permalink / raw
  To: gentoo-commits

commit:     e3c6d5b5c689e2ccb738b9ee08c7240fc98e0795
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 18:03:17 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 18:03:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3c6d5b5

sci-mathematics/rstudio: [QA] inherit vcs-clean.eclass directly

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild b/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild
index 09f22605f33..8b60b2efe5b 100644
--- a/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit eutils user cmake-utils gnome2-utils pam xdg-utils java-pkg-2 pax-utils qmake-utils
+inherit eutils user cmake-utils gnome2-utils pam xdg-utils java-pkg-2 pax-utils qmake-utils vcs-clean
 
 # TODO
 # * package gin and gwt


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2020-05-23 12:43 Mark Wright
  0 siblings, 0 replies; 36+ messages in thread
From: Mark Wright @ 2020-05-23 12:43 UTC (permalink / raw
  To: gentoo-commits

commit:     5cd7d05c21a5c868639e4a46165b738c20358208
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Sat May 23 12:38:30 2020 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Sat May 23 12:42:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cd7d05c

sci-mathematics/rstudio: Patch 1.2.5033 for boost 1.73.0

Remove redundant dodir.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Mark Wright <gienah <AT> gentoo.org>

 sci-mathematics/rstudio/rstudio-1.2.5033.ebuild | 2 +-
 sci-mathematics/rstudio/rstudio-1.2.5042.ebuild | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/sci-mathematics/rstudio/rstudio-1.2.5033.ebuild b/sci-mathematics/rstudio/rstudio-1.2.5033.ebuild
index 88b8f9d905b..77f9349a116 100644
--- a/sci-mathematics/rstudio/rstudio-1.2.5033.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.2.5033.ebuild
@@ -99,6 +99,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.1335-core.patch
 	"${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p1.patch
 	"${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p2.patch
+	"${FILESDIR}"/${PN}-1.2.5042-boost-1.73.0.patch
 )
 
 src_unpack() {
@@ -208,7 +209,6 @@ src_install() {
 	cmake-utils_src_install
 	use dedicated || pax-mark m "${ED}/usr/bin/rstudio"
 	doconfd "${FILESDIR}"/rstudio-server.conf
-	dodir /etc/rstudio
 	insinto /etc/rstudio
 	doins "${FILESDIR}"/rsession.conf
 	dosym ../conf.d/rstudio-server.conf /etc/rstudio/rserver.conf

diff --git a/sci-mathematics/rstudio/rstudio-1.2.5042.ebuild b/sci-mathematics/rstudio/rstudio-1.2.5042.ebuild
index 2de83f6f633..4fadf59d2d1 100644
--- a/sci-mathematics/rstudio/rstudio-1.2.5042.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.2.5042.ebuild
@@ -209,7 +209,6 @@ src_install() {
 	cmake-utils_src_install
 	use dedicated || pax-mark m "${ED}/usr/bin/rstudio"
 	doconfd "${FILESDIR}"/rstudio-server.conf
-	dodir /etc/rstudio
 	insinto /etc/rstudio
 	doins "${FILESDIR}"/rsession.conf
 	dosym ../conf.d/rstudio-server.conf /etc/rstudio/rserver.conf


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2020-09-25  5:07 Mark Wright
  0 siblings, 0 replies; 36+ messages in thread
From: Mark Wright @ 2020-09-25  5:07 UTC (permalink / raw
  To: gentoo-commits

commit:     8330ef96ea039898044479387d4e7b5f54478a15
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 25 05:04:58 2020 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 05:06:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8330ef96

sci-mathematics/rstudio: Bump to 1.3.1093

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Mark Wright <gienah <AT> gentoo.org>

 sci-mathematics/rstudio/Manifest                |   1 +
 sci-mathematics/rstudio/rstudio-1.3.1093.ebuild | 231 ++++++++++++++++++++++++
 2 files changed, 232 insertions(+)

diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 686f27d6dda..0627f2f8eaa 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -2,4 +2,5 @@ DIST core-dictionaries.zip 876339 BLAKE2B f29afcbf5a7f8ec635e5a5b248d978af286d18
 DIST rstudio-1.2.5033.tar.gz 20456976 BLAKE2B 3cbca6a5180690104dddf1456168bd38708d4152ed9b7a167035dd66e270aeb6405169d34461cbd899738be1872607e3f3b6f81ff0b3c9e6a9ed965a889b1393 SHA512 3569d4fed342275a9905c87e4f97be63b6391d2c37f75397e06201a7c31f80d94799214f51ff8e57d458ef18d5e54afe1ec8a7c56ac05ed8b8225ecca72d1daf
 DIST rstudio-1.2.5042.tar.gz 20456999 BLAKE2B 3251ab2511daefefa395256fedb273ecc36dbc8118457474e3647f7616baea91301e597896582ad4b191195fc7baf17645c4c25b9a957a0c17a6251151b1dd87 SHA512 e09f2360abecde0c16e240e6838efb270a355bec3d3982ffde2b01b32b21e9281fef465734edbfeb5e05375529cc7f06d5b5d41304f367982f53ae7ad98e20f9
 DIST rstudio-1.3.1056.tar.gz 89584544 BLAKE2B 0e758ad97f9faa2d3932a49dafd92bc21199a5c0a20e2d8480267ebbb7cd11dc38596b4bb697e04add7bfe6b126f7b2ae6675040a0ac8caca5a5cf737f5ad6eb SHA512 8a9077c2ae021e0cf4cca41b374a50534087b35fd2c1e4b18bdd5ba3672e1ab275046e483ec8a3aba729a8e39f961149fb03a053ea005d8a32873b51201baca2
+DIST rstudio-1.3.1093.tar.gz 89554292 BLAKE2B defd68e65a2cbc570aaf6fb14bd16342946154cda7322549d426281aea48d923803f061c1cd7d74b65b000a67ed62713dd06d311617e54130cb7c08147b34694 SHA512 c8a8d2312353e574dc2fb8ff2e64bd46c8aaf889c86f9c81ce22a7275e4cbec436dadfdaee513c3fc47dd3ad003e07a25baac4d8fcf47cc21df919afa084e92e
 DIST rstudio-1.3.959.tar.gz 89639419 BLAKE2B d45b2c1b0e426ddb5a945e59a8127ddfd47f6230ef0929639c4b525382ae57437a273df6ade85cfbf3a29911cf0158ee2e0808bfa94e783d70d4615f6c228f31 SHA512 e5d8bfe16011790ff4723c731043f44070d8fe48f85c5a9ab8389c9a2b7a1d3813e9362063ec4c6a6ca3b0a0857e2190481cbb74191650a129c0d2e10b342fac

diff --git a/sci-mathematics/rstudio/rstudio-1.3.1093.ebuild b/sci-mathematics/rstudio/rstudio-1.3.1093.ebuild
new file mode 100644
index 00000000000..af87bd08951
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-1.3.1093.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils cmake pam xdg-utils java-pkg-2 java-ant-2 pax-utils prefix qmake-utils vcs-clean
+
+# TODO
+# * use dict from tree, linguas
+# * do src_test (use junit from tree?)
+
+GIN_VER=2.1.2
+# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc
+PANDOC_VER=2.9.2.1
+# grep -5 QT_CANDIDATES src/cpp/desktop/CMakeLists.txt
+QT_VER=5.12.6
+QT_SLOT=5
+
+DESCRIPTION="IDE for the R language"
+HOMEPAGE="
+	http://www.rstudio.org
+	https://github.com/rstudio/rstudio/"
+SRC_URI="
+	https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
+"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dedicated libressl server"
+
+RDEPEND="
+	>=app-text/pandoc-${PANDOC_VER}
+	dev-java/aopalliance:1
+	dev-java/gin:2.1
+	dev-java/javax-inject
+	=dev-java/validation-api-1.0*:1.0[source]
+	dev-haskell/pandoc-citeproc
+	dev-lang/R
+	dev-libs/boost:=
+	>=dev-libs/mathjax-2.7.4
+	sys-apps/util-linux
+	sys-devel/clang:*
+	sys-libs/zlib
+	>=virtual/jre-1.8:=
+	x11-libs/pango
+	!dedicated? (
+		>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtdbus-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtgui-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtopengl-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)]
+		>=dev-qt/qtsensors-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsql-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtsvg-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtwebengine-${QT_VER}:${QT_SLOT}[widgets]
+		>=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxml-${QT_VER}:${QT_SLOT}
+		>=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT}
+		server? ( sys-libs/pam )
+	)
+	dedicated? ( sys-libs/pam )
+	dedicated? (
+		sys-libs/pam
+		acct-user/rstudio-server
+		acct-group/rstudio-server
+	)
+	server? (
+		acct-user/rstudio-server
+		acct-group/rstudio-server
+	)
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-java/ant-core
+	>=virtual/jdk-1.8:=
+	virtual/pkgconfig"
+#	test? ( dev-java/junit:4 )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.959-prefs.patch
+	"${FILESDIR}"/${PN}-1.3.959-paths.patch
+	"${FILESDIR}"/${PN}-1.3.959-pandoc-mathjax.patch
+	"${FILESDIR}"/${PN}-1.2.1335-linker_flags.patch
+	"${FILESDIR}"/${PN}-1.3.959-qtsingleapplication.patch
+	"${FILESDIR}"/${PN}-1.0.44-systemd.patch
+	"${FILESDIR}"/${PN}-1.3.959-core.patch
+	"${FILESDIR}"/${PN}-1.2.5042-boost-1.73.0.patch
+	"${FILESDIR}"/${PN}-1.3.1056-R-4.0.0.patch
+	"${FILESDIR}"/${PN}-1.3.1056-boost-1.74.0.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}" || die
+	mkdir -p dependencies/common/dictionaries
+	unzip -qd dependencies/common/dictionaries \
+		"${DISTDIR}"/core-dictionaries.zip || die
+}
+
+src_prepare() {
+	cmake_src_prepare
+	java-pkg-2_src_prepare
+	egit_clean
+
+	# Enable CMake to install our .service file for systemd usage
+	mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die
+	cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die
+
+	# 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-26 || 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
+
+	# install themes in /etc/rstudio/extra/sthemes instead of /usr/extra/themes
+	sed -i \
+		-e "s@\(DESTINATION \"\)\(extras/themes\"\)@\1${EROOT}/etc/rstudio/\2@" \
+		src/cpp/server/CMakeLists.txt || die
+
+	# On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf
+	sed -e "s@/etc/rstudio/rserver.conf@${EROOT}/etc/conf.d/rstudio-server.conf@" \
+		-i src/cpp/server/ServerOptions.cpp \
+		|| die
+
+	# Set the rsession.conf file location for Gentoo prefix
+	sed -e "s@/etc/rstudio/rsession.conf@${EROOT}/etc/rstudio/rsession.conf@" \
+		-i src/cpp/session/SessionOptions.cpp \
+		|| die
+
+	# dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module.
+	# It provides a library that has its version number appended to the end,
+	# which is difficult to handle in cmake, as find_library does not support
+	# searching for wildcard library names. So I find the library name from the
+	# qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt.
+	rm -rf "${S}"/src/cpp/desktop/3rdparty || die
+	local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \
+				   $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \
+					 | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \
+						   -e 's@LIBS \*= -l@@')
+	sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \
+		-i "${S}"/src/cpp/desktop/CMakeLists.txt \
+		|| die
+
+	# The git commit for tag: git rev-list -n 1 v${PV}
+	sed -e 's@git ARGS rev-parse HEAD@echo ARGS aee44535570639672cf61c0545113e7a62c90b5b@'\
+		-i "${S}"/CMakeLists.txt \
+		"${S}"/CMakeGlobals.txt \
+		|| die
+
+	eprefixify src/gwt/build.xml
+}
+
+src_configure() {
+	export RSTUDIO_VERSION_MAJOR=$(ver_cut 1)
+	export RSTUDIO_VERSION_MINOR=$(ver_cut 2)
+	export RSTUDIO_VERSION_PATCH=$(ver_cut 3)
+
+	local mycmakeargs=(
+		-DDISTRO_SHARE=share/${PN}
+		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
+		-DRSTUDIO_VERIFY_R_VERSION=FALSE
+		-DRSTUDIO_USE_SYSTEM_BOOST=TRUE
+		)
+
+	if use !dedicated; then
+		mycmakeargs+=(
+			-DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")"
+			-DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake
+		)
+	fi
+	cmake_src_configure
+}
+
+src_compile() {
+	local JAVA_ANT_REWRITE_CLASSPATH="yes"
+	local EANT_BUILD_XML="src/gwt/build.xml"
+	local EANT_BUILD_TARGET="clean"
+	java-pkg-2_src_compile
+
+	# Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny
+	# P: /root/.oracle_jre_usage.
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake_src_compile
+}
+
+src_install() {
+	export ANT_OPTS="-Duser.home=${T}"
+	cmake_src_install
+	use dedicated || pax-mark m "${ED}/usr/bin/rstudio"
+	doconfd "${FILESDIR}"/rstudio-server.conf
+	insinto /etc/rstudio
+	doins "${FILESDIR}"/rsession.conf
+	dosym ../conf.d/rstudio-server.conf /etc/rstudio/rserver.conf
+	if use dedicated || use server; then
+		dopamd src/cpp/server/extras/pam/rstudio
+		newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
+	fi
+}
+
+pkg_preinst() {
+	java-pkg-2_pkg_preinst
+}
+
+pkg_postinst() {
+	use dedicated || { xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+		xdg_icon_cache_update ;}
+}
+
+pkg_postrm() {
+	use dedicated || { xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+		xdg_icon_cache_update ;}
+}


^ permalink raw reply related	[flat|nested] 36+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
@ 2021-05-02 20:11 Mikle Kolyada
  0 siblings, 0 replies; 36+ messages in thread
From: Mikle Kolyada @ 2021-05-02 20:11 UTC (permalink / raw
  To: gentoo-commits

commit:     08943b6a61c4bb76f56173785da127aaa9ac0978
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun May  2 20:11:28 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun May  2 20:11:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08943b6a

sci-mathematics/rstudio: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 sci-mathematics/rstudio/rstudio-1.3.1093.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-mathematics/rstudio/rstudio-1.3.1093.ebuild b/sci-mathematics/rstudio/rstudio-1.3.1093.ebuild
index af87bd08951..4fee0074c08 100644
--- a/sci-mathematics/rstudio/rstudio-1.3.1093.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.3.1093.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,7 +28,7 @@ SRC_URI="
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dedicated libressl server"
+IUSE="dedicated server"
 
 RDEPEND="
 	>=app-text/pandoc-${PANDOC_VER}
@@ -75,8 +75,8 @@ RDEPEND="
 		acct-user/rstudio-server
 		acct-group/rstudio-server
 	)
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	dev-libs/openssl:0=
+	"
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-java/ant-core


^ permalink raw reply related	[flat|nested] 36+ messages in thread

end of thread, other threads:[~2021-05-02 20:11 UTC | newest]

Thread overview: 36+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-29  4:59 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/ Mark Wright
  -- strict thread matches above, loose matches on Subject: below --
2021-05-02 20:11 Mikle Kolyada
2020-09-25  5:07 Mark Wright
2020-05-23 12:43 Mark Wright
2020-02-12 18:06 David Seifert
2019-12-07 21:55 David Seifert
2019-12-07 20:58 David Seifert
2019-10-20 11:41 David Seifert
2019-10-12 19:04 Mikle Kolyada
2019-08-22 23:15 Mark Wright
2019-08-22 11:07 Thomas Deutschmann
2019-08-22 11:01 Thomas Deutschmann
2019-06-12 19:14 David Seifert
2019-06-12 19:14 David Seifert
2018-07-03  2:39 Mark Wright
2018-02-22 10:51 Andreas Sturmlechner
2017-12-25 10:43 David Seifert
2017-12-03 15:58 Patrice Clement
2017-11-25 17:42 David Seifert
2017-11-19 12:52 David Seifert
2017-07-24  4:14 Mark Wright
2017-04-26  8:44 Mark Wright
2017-01-03 12:38 Mark Wright
2016-07-20  3:00 Mark Wright
2016-06-21 19:37 Michał Górny
2016-05-15 10:53 Mark Wright
2016-04-19  9:22 Mark Wright
2016-04-08 10:18 Mark Wright
2016-01-29  6:27 Mark Wright
2016-01-22 21:03 Justin Lecher
2015-10-14 10:22 Mark Wright
2015-09-09  2:27 Mark Wright
2015-09-05  4:27 Mark Wright
2015-09-04 11:33 Mark Wright
2015-09-04  3:20 Mark Wright
2015-08-27  2:54 Mark Wright

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox