gienah      14/12/06 12:32:01

  Modified:             rstudio-0.98.490.ebuild rstudio-0.98.490-r1.ebuild
                        rstudio-0.97.336.ebuild rstudio-0.97.551.ebuild
                        rstudio-0.98.953.ebuild rstudio-0.98.1028.ebuild
                        rstudio-0.98.932.ebuild ChangeLog
  Added:                rstudio-0.98.1091.ebuild
  Removed:              rstudio-0.97.318.ebuild
  Log:
  Bump rstudio to 0.98.1091. Fix Bug 519290 sci-mathematics/rstudio-0.98.490 - 
rstudio-server start: /usr/bin/rstudio-server: 1: eval: 
/etc/init.d/rstudio-server: not found, thanks to Franz Fellner for reporting, 
Adam Tygart and Franz Fellner for suggesting the fix, Silvio for testing. Fix 
Bug 522196 - sci-mathematics/rstudio lack of server part and two more conf 
files, thanks to Silvio for reporting and providing the conf files. Fix Bug 
523296 - sci-mathematics/rstudio-0.98-1028 with dev-libs/boost-1.56.0 - 
.../work/rstudio-0.98.1028/src/cpp/core/Assert.cpp:40:10: error: 
boost::core::log has not been declared. paxmark m rstudio for Gentoo Hardened. 
Add missing dependencies app-text/pandoc and dev-haskell/pandoc-citeproc to 
rstudio-0.98.1028.ebuild. Remove obsolete rstudio-0.97.318.ebuild, as the this 
failed to build in my tests.
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 
618E971F)

Revision  Changes    Path
1.4                  sci-mathematics/rstudio/rstudio-0.98.490.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.490.ebuild?rev=1.4&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.490.ebuild?rev=1.4&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.490.ebuild?r1=1.3&r2=1.4

Index: rstudio-0.98.490.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.490.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rstudio-0.98.490.ebuild     27 Jul 2014 11:33:09 -0000      1.3
+++ rstudio-0.98.490.ebuild     6 Dec 2014 12:32:01 -0000       1.4
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.490.ebuild,v 1.3 
2014/07/27 11:33:09 phajdan.jr Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.490.ebuild,v 1.4 
2014/12/06 12:32:01 gienah Exp $
 
 EAPI=5
 
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime 
java-pkg-2
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime 
java-pkg-2 pax-utils
 
 # TODO
 # * package gin and gwt
@@ -83,6 +83,11 @@
        sed -i \
                -e "s:/usr:${EPREFIX}/usr:g" \
                CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
+
+       # specify that namespace core the is in the global namespace and not
+       # relative to some other namespace (like its ::core not ::boost::core)
+       find . \( -name *.cpp -or -name *.hpp \) -exec sed \
+               -e 's@<core::@< ::core::@g' -e 's@\([^:]\)core::@\1::core::@g' 
-i {} \;
 }
 
 src_configure() {
@@ -105,9 +110,10 @@
 
 src_install() {
        cmake-utils_src_install
+       pax-mark m "${ED}usr/bin/rstudio"
        if use dedicated || use server; then
                dopamd src/cpp/server/extras/pam/rstudio
-               newinitd "${FILESDIR}"/rstudio-rserver.initd rstudio-rserver
+               newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
        fi
 }
 



1.3                  sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild?rev=1.3&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild?rev=1.3&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild?r1=1.2&r2=1.3

Index: rstudio-0.98.490-r1.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rstudio-0.98.490-r1.ebuild  30 Aug 2014 15:46:38 -0000      1.2
+++ rstudio-0.98.490-r1.ebuild  6 Dec 2014 12:32:01 -0000       1.3
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild,v 
1.2 2014/08/30 15:46:38 nimiux Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild,v 
1.3 2014/12/06 12:32:01 gienah Exp $
 
 EAPI=5
 
-inherit eutils cmake-utils gnome2-utils versionator fdo-mime java-pkg-2
+inherit eutils cmake-utils gnome2-utils versionator fdo-mime java-pkg-2 
pax-utils
 
 # TODO
 # * package gin and gwt
@@ -79,6 +79,11 @@
        sed -i \
                -e "s:/usr:${EPREFIX}/usr:g" \
                CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
+
+       # specify that namespace core the is in the global namespace and not
+       # relative to some other namespace (like its ::core not ::boost::core)
+       find . \( -name *.cpp -or -name *.hpp \) -exec sed \
+               -e 's@<core::@< ::core::@g' -e 's@\([^:]\)core::@\1::core::@g' 
-i {} \;
 }
 
 src_configure() {
@@ -101,6 +106,7 @@
 
 src_install() {
        cmake-utils_src_install
+       pax-mark m "${ED}usr/bin/rstudio"
 }
 
 pkg_preinst() {



1.3                  sci-mathematics/rstudio/rstudio-0.97.336.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/rstudio-0.97.336.ebuild?rev=1.3&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/rstudio-0.97.336.ebuild?rev=1.3&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/rstudio-0.97.336.ebuild?r1=1.2&r2=1.3

Index: rstudio-0.97.336.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.97.336.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rstudio-0.97.336.ebuild     15 Jul 2013 15:21:58 -0000      1.2
+++ rstudio-0.97.336.ebuild     6 Dec 2014 12:32:01 -0000       1.3
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.97.336.ebuild,v 1.2 
2013/07/15 15:21:58 hasufell Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.97.336.ebuild,v 1.3 
2014/12/06 12:32:01 gienah Exp $
 
 EAPI=5
 
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime 
java-pkg-2
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime 
java-pkg-2 pax-utils
 
 # TODO
 # * package gin and gwt
@@ -84,6 +84,11 @@
        sed -i \
                -e "s:/usr:${EPREFIX}/usr:g" \
                CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
+
+       # specify that namespace core the is in the global namespace and not
+       # relative to some other namespace (like its ::core not ::boost::core)
+       find . \( -name *.cpp -or -name *.hpp \) -exec sed \
+               -e 's@<core::@< ::core::@g' -e 's@\([^:]\)core::@\1::core::@g' 
-i {} \;
 }
 
 src_configure() {
@@ -106,9 +111,10 @@
 
 src_install() {
        cmake-utils_src_install
+       pax-mark m "${ED}usr/bin/rstudio"
        if use dedicated || use server; then
                dopamd src/cpp/server/extras/pam/rstudio
-               newinitd "${FILESDIR}"/rstudio-rserver.initd rstudio-rserver
+               newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
        fi
 }
 



1.2                  sci-mathematics/rstudio/rstudio-0.97.551.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/rstudio-0.97.551.ebuild?rev=1.2&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/rstudio-0.97.551.ebuild?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/rstudio-0.97.551.ebuild?r1=1.1&r2=1.2

Index: rstudio-0.97.551.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.97.551.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rstudio-0.97.551.ebuild     16 Jul 2013 11:39:28 -0000      1.1
+++ rstudio-0.97.551.ebuild     6 Dec 2014 12:32:01 -0000       1.2
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.97.551.ebuild,v 1.1 
2013/07/16 11:39:28 hasufell Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.97.551.ebuild,v 1.2 
2014/12/06 12:32:01 gienah Exp $
 
 EAPI=5
 
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime 
java-pkg-2
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime 
java-pkg-2 pax-utils
 
 # TODO
 # * package gin and gwt
@@ -84,6 +84,11 @@
        sed -i \
                -e "s:/usr:${EPREFIX}/usr:g" \
                CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
+
+       # specify that namespace core the is in the global namespace and not
+       # relative to some other namespace (like its ::core not ::boost::core)
+       find . \( -name *.cpp -or -name *.hpp \) -exec sed \
+               -e 's@<core::@< ::core::@g' -e 's@\([^:]\)core::@\1::core::@g' 
-i {} \;
 }
 
 src_configure() {
@@ -106,9 +111,10 @@
 
 src_install() {
        cmake-utils_src_install
+       pax-mark m "${ED}usr/bin/rstudio"
        if use dedicated || use server; then
                dopamd src/cpp/server/extras/pam/rstudio
-               newinitd "${FILESDIR}"/rstudio-rserver.initd rstudio-rserver
+               newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
        fi
 }
 



1.2                  sci-mathematics/rstudio/rstudio-0.98.953.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.953.ebuild?rev=1.2&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.953.ebuild?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.953.ebuild?r1=1.1&r2=1.2

Index: rstudio-0.98.953.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.953.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rstudio-0.98.953.ebuild     4 Jul 2014 14:08:16 -0000       1.1
+++ rstudio-0.98.953.ebuild     6 Dec 2014 12:32:01 -0000       1.2
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.953.ebuild,v 1.1 
2014/07/04 14:08:16 hasufell Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.953.ebuild,v 1.2 
2014/12/06 12:32:01 gienah Exp $
 
 EAPI=5
 
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime 
java-pkg-2
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime 
java-pkg-2 pax-utils
 
 # TODO
 # * package gin and gwt
@@ -116,6 +116,11 @@
        sed -i \
                -e "s:/usr:${EPREFIX}/usr:g" \
                CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
+
+       # specify that namespace core the is in the global namespace and not
+       # relative to some other namespace (like its ::core not ::boost::core)
+       find . \( -name *.cpp -or -name *.hpp \) -exec sed \
+               -e 's@<core::@< ::core::@g' -e 's@\([^:]\)core::@\1::core::@g' 
-i {} \;
 }
 
 src_configure() {
@@ -138,9 +143,10 @@
 
 src_install() {
        cmake-utils_src_install
+       pax-mark m "${ED}usr/bin/rstudio"
        if use dedicated || use server; then
                dopamd src/cpp/server/extras/pam/rstudio
-               newinitd "${FILESDIR}"/rstudio-rserver.initd rstudio-rserver
+               newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
        fi
 }
 



1.2                  sci-mathematics/rstudio/rstudio-0.98.1028.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild?rev=1.2&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild?r1=1.1&r2=1.2

Index: rstudio-0.98.1028.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rstudio-0.98.1028.ebuild    27 Aug 2014 15:51:02 -0000      1.1
+++ rstudio-0.98.1028.ebuild    6 Dec 2014 12:32:01 -0000       1.2
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild,v 1.1 
2014/08/27 15:51:02 hasufell Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild,v 1.2 
2014/12/06 12:32:01 gienah Exp $
 
 EAPI=5
 
-inherit eutils cmake-utils gnome2-utils versionator fdo-mime java-pkg-2
+inherit eutils cmake-utils gnome2-utils versionator fdo-mime java-pkg-2 
pax-utils
 
 # TODO
 # * package gin and gwt
@@ -41,6 +41,8 @@
 QTVER=4.8
 QTSLOT=4
 RDEPEND="
+       app-text/pandoc
+       dev-haskell/pandoc-citeproc
        >=dev-lang/R-2.11.1
        >=dev-libs/boost-1.50
        dev-libs/mathjax
@@ -112,6 +114,11 @@
        sed -i \
                -e "s:/usr:${EPREFIX}/usr:g" \
                CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
+
+       # specify that namespace core the is in the global namespace and not
+       # relative to some other namespace (like its ::core not ::boost::core)
+       find . \( -name *.cpp -or -name *.hpp \) -exec sed \
+               -e 's@<core::@< ::core::@g' -e 's@\([^:]\)core::@\1::core::@g' 
-i {} \;
 }
 
 src_configure() {
@@ -134,6 +141,7 @@
 
 src_install() {
        cmake-utils_src_install
+       pax-mark m "${ED}usr/bin/rstudio"
 }
 
 pkg_preinst() {



1.2                  sci-mathematics/rstudio/rstudio-0.98.932.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.932.ebuild?rev=1.2&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.932.ebuild?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.932.ebuild?r1=1.1&r2=1.2

Index: rstudio-0.98.932.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.932.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rstudio-0.98.932.ebuild     4 Jul 2014 13:53:22 -0000       1.1
+++ rstudio-0.98.932.ebuild     6 Dec 2014 12:32:01 -0000       1.2
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.932.ebuild,v 1.1 
2014/07/04 13:53:22 hasufell Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.932.ebuild,v 1.2 
2014/12/06 12:32:01 gienah Exp $
 
 EAPI=5
 
-inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime 
java-pkg-2
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime 
java-pkg-2 pax-utils
 
 # TODO
 # * package gin and gwt
@@ -115,6 +115,11 @@
        sed -i \
                -e "s:/usr:${EPREFIX}/usr:g" \
                CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die
+
+       # specify that namespace core the is in the global namespace and not
+       # relative to some other namespace (like its ::core not ::boost::core)
+       find . \( -name *.cpp -or -name *.hpp \) -exec sed \
+               -e 's@<core::@< ::core::@g' -e 's@\([^:]\)core::@\1::core::@g' 
-i {} \;
 }
 
 src_configure() {
@@ -137,9 +142,10 @@
 
 src_install() {
        cmake-utils_src_install
+       pax-mark m "${ED}usr/bin/rstudio"
        if use dedicated || use server; then
                dopamd src/cpp/server/extras/pam/rstudio
-               newinitd "${FILESDIR}"/rstudio-rserver.initd rstudio-rserver
+               newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server
        fi
 }
 



1.18                 sci-mathematics/rstudio/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/ChangeLog?rev=1.18&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/ChangeLog?rev=1.18&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/ChangeLog?r1=1.17&r2=1.18

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ChangeLog   29 Nov 2014 11:31:36 -0000      1.17
+++ ChangeLog   6 Dec 2014 12:32:01 -0000       1.18
@@ -1,6 +1,28 @@
 # ChangeLog for sci-mathematics/rstudio
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/ChangeLog,v 1.17 
2014/11/29 11:31:36 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/ChangeLog,v 1.18 
2014/12/06 12:32:01 gienah Exp $
+
+*rstudio-0.98.1091 (06 Dec 2014)
+
+  06 Dec 2014; Mark Wright <[email protected]> +files/rsession.conf,
+  +files/rstudio-0.98.1091-pandoc.patch, +files/rstudio-server.conf,
+  +files/rstudio-server.initd, +rstudio-0.98.1091.ebuild,
+  -files/rstudio-rserver.initd, -rstudio-0.97.318.ebuild,
+  rstudio-0.97.336.ebuild, rstudio-0.97.551.ebuild, rstudio-0.98.1028.ebuild,
+  rstudio-0.98.490-r1.ebuild, rstudio-0.98.490.ebuild, rstudio-0.98.932.ebuild,
+  rstudio-0.98.953.ebuild:
+  Bump rstudio to 0.98.1091. Fix Bug 519290 sci-mathematics/rstudio-0.98.490 -
+  rstudio-server start: /usr/bin/rstudio-server: 1: eval: /etc/init.d/rstudio-
+  server: not found, thanks to Franz Fellner for reporting, Adam Tygart and
+  Franz Fellner for suggesting the fix, Silvio for testing. Fix Bug 522196 -
+  sci-mathematics/rstudio lack of server part and two more conf files, thanks 
to
+  Silvio for reporting and providing the conf files. Fix Bug 523296 - sci-
+  mathematics/rstudio-0.98-1028 with dev-libs/boost-1.56.0 -
+  .../work/rstudio-0.98.1028/src/cpp/core/Assert.cpp:40:10: error:
+  boost::core::log has not been declared. paxmark m rstudio for Gentoo 
Hardened.
+  Add missing dependencies app-text/pandoc and dev-haskell/pandoc-citeproc to
+  rstudio-0.98.1028.ebuild. Remove obsolete rstudio-0.97.318.ebuild, as the 
this
+  failed to build in my tests.
 
   29 Nov 2014; Mark Wright <[email protected]> metadata.xml:
   Set the maintainer.



1.1                  sci-mathematics/rstudio/rstudio-0.98.1091.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.1091.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.1091.ebuild?rev=1.1&content-type=text/plain

Index: rstudio-0.98.1091.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.1091.ebuild,v 1.1 
2014/12/06 12:32:01 gienah Exp $

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
GWTVER=2.6.0
GINVER=1.5
SELENIUMVER=2.37.0
CHROMEDRIVER_VER=2.7
PANDOC_VER=1.12.4.2
PACKRAT_VER=0.98.1000
RMARKDOWN_VER=0.98.1000
SHINYAPPS_VER=0.98.1000

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-${GINVER}.zip
        https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWTVER}.zip
        
https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUMVER}.zip
        
https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUMVER}.jar
        https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux
        https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
        http://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz
        
http://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz
        
http://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz";

LICENSE="AGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="dedicated server"

QTVER=4.8
QTSLOT=4
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-libs/zlib
        >=virtual/jre-1.5
        x11-libs/pango
        !dedicated? (
                >=dev-qt/qtcore-${QTVER}:${QTSLOT}
                >=dev-qt/qtdbus-${QTVER}:${QTSLOT}
                >=dev-qt/qtgui-${QTVER}:${QTSLOT}
                >=dev-qt/qtwebkit-${QTVER}:${QTSLOT}
                >=dev-qt/qtxmlpatterns-${QTVER}:${QTSLOT}
                server? ( virtual/pam )
        )
        dedicated? ( virtual/pam )"
DEPEND="${RDEPEND}
        app-arch/unzip
        dev-java/ant-core
        >=virtual/jdk-1.5
        virtual/pkgconfig"
#       test? ( dev-java/junit:4 )

src_unpack() {
        unpack ${P}.tar.gz gwt-${GWTVER}.zip
        cd "${S}" || die
        mkdir -p src/gwt/lib/{gin,gwt} \
                dependencies/common/dictionaries \
                src/gwt/lib/selenium/${SELENIUMVER} \
                src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die
        mv ../gwt-${GWTVER} src/gwt/lib/gwt/${GWTVER} || die
        unzip -qd src/gwt/lib/gin/${GINVER} \
                "${DISTDIR}"/gin-${GINVER}.zip || die
        unzip -qd dependencies/common/dictionaries \
                "${DISTDIR}"/core-dictionaries.zip || die
        unzip -qd src/gwt/lib/selenium/${SELENIUMVER} \
                "${DISTDIR}"/selenium-java-${SELENIUMVER}.zip || die
        cp "${DISTDIR}"/selenium-server-standalone-${SELENIUMVER}.jar \
                src/gwt/lib/selenium/${SELENIUMVER}/ || 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-${RMARKDOWN_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
}

src_prepare() {
        java-pkg-2_src_prepare

        find . -name .gitignore -delete || die

        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

        # 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

        # specify that namespace core the is in the global namespace and not
        # relative to some other namespace (like its ::core not ::boost::core)
        find . \( -name *.cpp -or -name *.hpp \) -exec sed \
                 -e 's@<core::@< ::core::@g' -e 's@\([^:]\)core::@\1::core::@g' 
-i {} \;

        # 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")")
                )

        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 ;}
}




Reply via email to