[gentoo-commits] repo/gentoo:master commit in: /

[Mark Wright]

commit:     c812d14ee2c817bc63175175b93de6c98c544019
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 29 04:59:09 2016 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Fri Jan 29 04:59:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c812d14e

sci-mathematics/rstudio: Thanks to tomboy-64 for fixing bug Bug 534152 - sci-mathematics/rstudio - add systemd support

 .../rstudio/files/rstudio-0.99.486-systemd.patch   | 22 ++++++++++++++++++++++
 sci-mathematics/rstudio/files/rstudio-server.conf  |  2 +-
 .../rstudio/files/rstudio-server.service.in        | 10 ++++++++++
 ...-0.99.486.ebuild => rstudio-0.99.486-r1.ebuild} | 22 +++++++++++++++-------
 4 files changed, 48 insertions(+), 8 deletions(-)

diff --cc sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild
index 64818de,4f1c7f3..764c9da
--- a/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild
@@@ -125,15 -133,13 +135,13 @@@ src_unpack() 
  src_prepare() {
  	java-pkg-2_src_prepare
  
 -	find . -name .gitignore -delete || die
 +	egit_clean
  
- 	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
+ 	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