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

15 files changed, 325 insertions, 77 deletions

diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 7366ec74612f..c7992773634d 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 7c3f04bff0c6..cd4815f5d332 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 7c3f04bff0c6..cd4815f5d332 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 7c3f04bff0c6..cd4815f5d332 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 7c3f04bff0c6..cd4815f5d332 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 f87c147094be..a0c4907f68f8 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 f87c147094be..a0c4907f68f8 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 3ebf8d8443bf..6adb372e5cd4 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 98f8def92c71..c3bc93830dde 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 559f9b85367e..134838bcf653 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 defc0ba72a20..bd0e219d50ff 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 141716af12b0..60d0858c53c8 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 fd16cfb0c906..dcb101cac4e3 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.143.ebuild b/sci-mathematics/rstudio/rstudio-1.0.143.ebuild
new file mode 100644
index 000000000000..dcb101cac4e3
--- /dev/null
+++ b/sci-mathematics/rstudio/rstudio-1.0.143.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 ;}
+}
diff --git a/sci-mathematics/rstudio/rstudio-1.0.44.ebuild b/sci-mathematics/rstudio/rstudio-1.0.44.ebuild
index 4d6d1203e85d..dcb101cac4e3 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
 		)