Patch rstudio-0.98.1091 to build with boost 1.57

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

10 files changed, 106 insertions, 38 deletions

diff --git a/sci-mathematics/rstudio/ChangeLog b/sci-mathematics/rstudio/ChangeLog
index 9a7872ac23a3..ecc387f07d7c 100644
--- a/sci-mathematics/rstudio/ChangeLog
+++ b/sci-mathematics/rstudio/ChangeLog
@@ -1,6 +1,13 @@
 # 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.18 2014/12/06 12:32:01 gienah Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/ChangeLog,v 1.19 2015/02/28 04:39:43 gienah Exp $
+
+  28 Feb 2015; Mark Wright <gienah@gentoo.org>
+  +files/rstudio-0.98.1091-boost-1.57.patch, rstudio-0.97.336.ebuild,
+  rstudio-0.97.551.ebuild, rstudio-0.98.1028.ebuild, rstudio-0.98.1091.ebuild,
+  rstudio-0.98.490-r1.ebuild, rstudio-0.98.490.ebuild, rstudio-0.98.932.ebuild,
+  rstudio-0.98.953.ebuild:
+  Patch rstudio-0.98.1091 to build with boost 1.57
 
 *rstudio-0.98.1091 (06 Dec 2014)
 
diff --git a/sci-mathematics/rstudio/files/rstudio-0.98.1091-boost-1.57.patch b/sci-mathematics/rstudio/files/rstudio-0.98.1091-boost-1.57.patch
new file mode 100644
index 000000000000..3a157183c22c
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-0.98.1091-boost-1.57.patch
@@ -0,0 +1,60 @@
+--- rstudio-0.98.1091-orig/src/cpp/desktop/DesktopApplicationLaunch.hpp	2014-11-06 23:15:47.000000000 +1100
++++ rstudio-0.98.1091/src/cpp/desktop/DesktopApplicationLaunch.hpp	2015-02-28 14:01:51.970672316 +1100
+@@ -19,7 +19,10 @@
+ #include <QObject>
+ #include <QWidget>
+ #include <QApplication>
++// see https://bugreports.qt-project.org/browse/QTBUG-22829
++#ifndef Q_MOC_RUN
+ #include <boost/scoped_ptr.hpp>
++#endif
+ 
+ namespace desktop {
+ 
+--- rstudio-0.98.1091-orig/src/cpp/desktop/DesktopSessionLauncher.hpp	2014-11-06 23:15:47.000000000 +1100
++++ rstudio-0.98.1091/src/cpp/desktop/DesktopSessionLauncher.hpp	2015-02-28 14:01:51.972672316 +1100
+@@ -18,7 +18,10 @@
+ 
+ #include <string>
+ 
++// see https://bugreports.qt-project.org/browse/QTBUG-22829
++#ifndef Q_MOC_RUN
+ #include <boost/utility.hpp>
++#endif
+ 
+ #include <core/Error.hpp>
+ #include <core/FilePath.hpp>
+--- rstudio-0.98.1091-orig/src/cpp/core/include/core/FilePath.hpp	2014-11-06 23:15:47.000000000 +1100
++++ rstudio-0.98.1091/src/cpp/core/include/core/FilePath.hpp	2015-02-28 14:01:51.984672314 +1100
+@@ -23,11 +23,14 @@
+ #include <vector>
+ #include <iosfwd>
+ 
++// see https://bugreports.qt-project.org/browse/QTBUG-22829
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
+ #include <boost/scoped_ptr.hpp>
+ #include <boost/function.hpp>
+ 
+ #include <boost/utility.hpp>
++#endif
+ 
+ #include <core/Error.hpp>
+ #include <core/Log.hpp>
+--- rstudio-0.98.1091-orig/src/cpp/core/include/core/Error.hpp	2014-11-06 23:15:47.000000000 +1100
++++ rstudio-0.98.1091/src/cpp/core/include/core/Error.hpp	2015-02-28 14:01:51.977672315 +1100
+@@ -20,11 +20,14 @@
+ #include <string>
+ #include <vector>
+ 
++// see https://bugreports.qt-project.org/browse/QTBUG-22829
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
+ 
+ #include <boost/system/error_code.hpp>
+ 
+ #include <boost/current_function.hpp>
++#endif
+ 
+ namespace core {
+ 
diff --git a/sci-mathematics/rstudio/rstudio-0.97.336.ebuild b/sci-mathematics/rstudio/rstudio-0.97.336.ebuild
index b49cb580cf9b..2ba127cb2f0c 100644
--- a/sci-mathematics/rstudio/rstudio-0.97.336.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.97.336.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.3 2014/12/06 12:32:01 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.97.336.ebuild,v 1.4 2015/02/28 04:39:43 gienah Exp $
 
 EAPI=5
 
@@ -30,10 +30,10 @@ IUSE="dedicated server"
 QTVER=4.8
 QTSLOT=4
 RDEPEND=">=dev-lang/R-2.11.1
-	>=dev-libs/boost-1.50
+	>=dev-libs/boost-1.50:=
 	dev-libs/mathjax
-	dev-libs/openssl
-	>=virtual/jre-1.5
+	dev-libs/openssl:0
+	>=virtual/jre-1.5:=
 	x11-libs/pango
 	!dedicated? (
 		>=dev-qt/qtcore-${QTVER}:${QTSLOT}
diff --git a/sci-mathematics/rstudio/rstudio-0.97.551.ebuild b/sci-mathematics/rstudio/rstudio-0.97.551.ebuild
index 79d871e7889d..313adf9d44b6 100644
--- a/sci-mathematics/rstudio/rstudio-0.97.551.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.97.551.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.2 2014/12/06 12:32:01 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.97.551.ebuild,v 1.3 2015/02/28 04:39:43 gienah Exp $
 
 EAPI=5
 
@@ -30,10 +30,10 @@ IUSE="dedicated server"
 QTVER=4.8
 QTSLOT=4
 RDEPEND=">=dev-lang/R-2.11.1
-	>=dev-libs/boost-1.50
+	>=dev-libs/boost-1.50:=
 	dev-libs/mathjax
-	dev-libs/openssl
-	>=virtual/jre-1.5
+	dev-libs/openssl:0
+	>=virtual/jre-1.5:=
 	x11-libs/pango
 	!dedicated? (
 		>=dev-qt/qtcore-${QTVER}:${QTSLOT}
diff --git a/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild b/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild
index f21ff18c4864..f1514d48d5a6 100644
--- a/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.2 2014/12/06 12:32:01 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.1028.ebuild,v 1.3 2015/02/28 04:39:43 gienah Exp $
 
 EAPI=5
 
@@ -49,7 +49,7 @@ RDEPEND="
 	dev-libs/openssl:0
 	sys-apps/util-linux
 	sys-libs/zlib
-	>=virtual/jre-1.5
+	>=virtual/jre-1.5:=
 	x11-libs/pango
 	>=dev-qt/qtcore-${QTVER}:${QTSLOT}
 	>=dev-qt/qtdbus-${QTVER}:${QTSLOT}
diff --git a/sci-mathematics/rstudio/rstudio-0.98.1091.ebuild b/sci-mathematics/rstudio/rstudio-0.98.1091.ebuild
index a59098b1adbc..c118ae30032a 100644
--- a/sci-mathematics/rstudio/rstudio-0.98.1091.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.98.1091.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.1091.ebuild,v 1.2 2015/02/28 04:39:43 gienah Exp $
 
 EAPI=5
 
@@ -51,7 +51,7 @@ RDEPEND="
 	dev-libs/openssl:0
 	sys-apps/util-linux
 	sys-libs/zlib
-	>=virtual/jre-1.5
+	>=virtual/jre-1.5:=
 	x11-libs/pango
 	!dedicated? (
 		>=dev-qt/qtcore-${QTVER}:${QTSLOT}
@@ -107,7 +107,8 @@ src_prepare() {
 	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
+		"${FILESDIR}"/${PN}-0.98.490-linker_flags.patch \
+		"${FILESDIR}"/${PN}-0.98.1091-boost-1.57.patch
 
 	# Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using
 	# this sed hack for now. ~RMH
diff --git a/sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild b/sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild
index f2624bad47e1..fa793830beee 100644
--- a/sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.3 2014/12/06 12:32:01 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.490-r1.ebuild,v 1.4 2015/02/28 04:39:43 gienah Exp $
 
 EAPI=5
 
@@ -29,11 +29,11 @@ IUSE=""
 QTVER=4.8
 QTSLOT=4
 RDEPEND=">=dev-lang/R-2.11.1
-	>=dev-libs/boost-1.50
+	>=dev-libs/boost-1.50:=
 	dev-libs/mathjax
-	dev-libs/openssl
+	dev-libs/openssl:0
 	sys-libs/zlib
-	>=virtual/jre-1.5
+	>=virtual/jre-1.5:=
 	x11-libs/pango
 	>=dev-qt/qtcore-${QTVER}:${QTSLOT}
 	>=dev-qt/qtdbus-${QTVER}:${QTSLOT}
diff --git a/sci-mathematics/rstudio/rstudio-0.98.490.ebuild b/sci-mathematics/rstudio/rstudio-0.98.490.ebuild
index 43ef5c39a7e9..aea24d5ee353 100644
--- a/sci-mathematics/rstudio/rstudio-0.98.490.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.98.490.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.4 2014/12/06 12:32:01 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.490.ebuild,v 1.5 2015/02/28 04:39:43 gienah Exp $
 
 EAPI=5
 
@@ -29,11 +29,11 @@ IUSE="dedicated server"
 QTVER=4.8
 QTSLOT=4
 RDEPEND=">=dev-lang/R-2.11.1
-	>=dev-libs/boost-1.50
+	>=dev-libs/boost-1.50:=
 	dev-libs/mathjax
-	dev-libs/openssl
+	dev-libs/openssl:0
 	sys-libs/zlib
-	>=virtual/jre-1.5
+	>=virtual/jre-1.5:=
 	x11-libs/pango
 	!dedicated? (
 		>=dev-qt/qtcore-${QTVER}:${QTSLOT}
diff --git a/sci-mathematics/rstudio/rstudio-0.98.932.ebuild b/sci-mathematics/rstudio/rstudio-0.98.932.ebuild
index 5ab66202c31f..d850375b7463 100644
--- a/sci-mathematics/rstudio/rstudio-0.98.932.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.98.932.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.2 2014/12/06 12:32:01 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.932.ebuild,v 1.3 2015/02/28 04:39:43 gienah Exp $
 
 EAPI=5
 
@@ -42,11 +42,11 @@ RDEPEND="
 	app-text/pandoc
 	dev-haskell/pandoc-citeproc
 	>=dev-lang/R-2.11.1
-	>=dev-libs/boost-1.50
+	>=dev-libs/boost-1.50:=
 	dev-libs/mathjax
-	dev-libs/openssl
+	dev-libs/openssl:0
 	sys-libs/zlib
-	>=virtual/jre-1.5
+	>=virtual/jre-1.5:=
 	x11-libs/pango
 	!dedicated? (
 		>=dev-qt/qtcore-${QTVER}:${QTSLOT}
diff --git a/sci-mathematics/rstudio/rstudio-0.98.953.ebuild b/sci-mathematics/rstudio/rstudio-0.98.953.ebuild
index 8e87354cb264..999f07b9864d 100644
--- a/sci-mathematics/rstudio/rstudio-0.98.953.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.98.953.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.2 2014/12/06 12:32:01 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/rstudio/rstudio-0.98.953.ebuild,v 1.3 2015/02/28 04:39:43 gienah Exp $
 
 EAPI=5
 
@@ -42,12 +42,12 @@ RDEPEND="
 	app-text/pandoc
 	dev-haskell/pandoc-citeproc
 	>=dev-lang/R-2.11.1
-	>=dev-libs/boost-1.50
+	>=dev-libs/boost-1.50:=
 	dev-libs/mathjax
 	dev-libs/openssl:0
 	sys-apps/util-linux
 	sys-libs/zlib
-	>=virtual/jre-1.5
+	>=virtual/jre-1.5:=
 	x11-libs/pango
 	!dedicated? (
 		>=dev-qt/qtcore-${QTVER}:${QTSLOT}