gentoo resync : 15.12.2019

6 files changed, 4 insertions, 760 deletions

diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
index 95ca00b41ff9..c8d7b950219c 100644
--- a/sci-mathematics/rstudio/Manifest
+++ b/sci-mathematics/rstudio/Manifest
@@ -33,16 +33,11 @@ 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
 DIST selenium-server-standalone-2.37.0.jar 34730734 BLAKE2B 3899b1d4c5f9153c1f9f13bec66f7c1456ea2e0f34db7d8e54a1ce9063c33a05b3cf95216c2ae06bb40504f72f343a4b9ba6c8553fbbc340e7c18a5b612dde5c SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018
 DIST shinyapps-0.98.1000.tar.gz 910095 BLAKE2B 4f9364692348bb52cbd12cc6ee447841cb0c805327f2518b2a9545920b602b954a98dea68ccb3daf32d2c3bab6464fb15402844d93277193315f1ae7b3ca5190 SHA512 3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c
-EBUILD rstudio-1.1.383-r1.ebuild 8338 BLAKE2B 8e31b308cd394d0e38f9cb861dd88b0259dc14655f6833cf39df717a00dfc7837f9c37715808d1a8ceefdfe74381956d6101121bef66f69cd7898e8b0edca35b SHA512 69d88552c40c0050d3e818c430682dbb50cda2b78acd081e6f211674cdff142211c8c809d5eca63eeacfa3f3d62a146f1b846a59138a52e9d8086830f62b4be1
-EBUILD rstudio-1.1.453.ebuild 8504 BLAKE2B 2932ca066ac46b127a02f34e43e2bc09f85a56b1c497e7f58230b012229900f64deb6a51c980fe71c33d7932f819529b80967e44c9c5d9fd53662b11b67b2c38 SHA512 1b86f33053e63de45d9b5f90a3f1fba7337dcabceb0410e72bdd6dde45b962a3ef3ed15149e5c89fe1ed386d600b19995ea23d07774f6319d510ba5a7d1f2fed
-EBUILD rstudio-1.1.463-r1.ebuild 8693 BLAKE2B 12234dd1c9093bfe4d09cc1f53fd051791372399c8bb84a6fc2f2f8e35739ccf1abb4ee40d977f9020842aed29a6bf2ae404fd48778261163f4313a85b8bcad9 SHA512 fc7cc0a2eea34b020ea9b6abc577bf4d86f2b1cf65564f1d4544cfea64875d7ceaface2a12bf6d995d0465dbabc8ccebc8c901a7a429b69e9814f4ceb68e6772
-EBUILD rstudio-1.1.463.ebuild 8716 BLAKE2B eb7f45aad1543f845788c251b65842b46963412d11e65e483fc613936337bb6f4c86bee4ea8807d4736527d56258c87930d0ab94e50750a86589c28267779d97 SHA512 6a350230f7930430a54f4d39ba7e5e89273775b4dec7a8a27068a04243481c672473ab66eba7febd135626b6bb27c347f2f4a36f027d3844058275082757bdbd
-EBUILD rstudio-1.2.1335.ebuild 8641 BLAKE2B fc0440ac6b289b32885898c2d17fa2292c43d918ac6a2706046bba93e3f90f90d37a10ee6b152f80e50bdfca4538a7b861ce1888254626068eb362ad4c84c0ab SHA512 3fddbf958ea7d1a020941731fb6069b8bedbf02113a336738039df97c5679fbb857892a53f9f76470bf60144c185a334ee8d72f62207664c2b467f4b3ebbdaf2
+EBUILD rstudio-1.1.463-r1.ebuild 8679 BLAKE2B 2341733acb0bad21b48da77842bfff75f9b18860ec039282662609b312788d8d1dfd8ce7dd5b13ede6030167eb399554a68dced9dcbce4aa6c7e31f758cf9c30 SHA512 5003e147cf81e9e65aba48c8143623e3d0f5f2e1ae75fe8ac6300261962c93ba2132b2a41c961ae6cbaf5fb0e1ae5262e27702e3d2c6bd6d6cfd52f54a329ea7
+EBUILD rstudio-1.2.1335.ebuild 8630 BLAKE2B 5fb25a1c374b336a44ad91652fda367abeec3f5e9da0eb682eb2224ea81a0ac24bc8d801f0e0733118cb1f872d61507951778c3c16d7b1ea74abade932a0e542 SHA512 3f409a721d2f20e4c558bd6b2b40e6c06293162a5c92f06509cef13e356f2279554807a755bfd28cff0ab11b170f3fb53aa88b10a3984e92f9a2d8b9d0655ac9
 MISC metadata.xml 590 BLAKE2B 53dc62775e118c9c26ee05e20ee1da1ac31b6a6b74cf7dac410856fe4e0cce40fbb800c7a03e60f59e14442baf3aad866ad42616ad5fbb5724f7f6d8c1636eea SHA512 7111442aaa52da1e554c34f824113ec0e227798dd11b0ea9148b81e7a31c08b2a527b9995e3adb9363c7a4f2a8594f30cbd4a179545bf31d69f07d5558c20f52
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 9dc32b4769c4..000000000000
--- 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 9c47ef9b01c2..000000000000
--- 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-r1.ebuild b/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild
index c26f7f5c3001..09f22605f334 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.1.463.ebuild b/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
deleted file mode 100644
index 74ba9b3fb3b2..000000000000
--- 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 ;}
-}
diff --git a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
index 2e857a99a3a5..9d0dfd64d7d1 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