commit: af2fbac39c32842ccc588efb3e7cb3bebf09e15f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 19:36:19 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 19:37:06 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af2fbac3
sci-mathematics/rstudio: Backport JRE/JDK := dep fix, #586322
sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild | 4 ++--
sci-mathematics/rstudio/rstudio-0.99.482.ebuild | 4 ++--
sci-mathematics/rstudio/rstudio-0.99.483.ebuild | 4 ++--
sci-mathematics/rstudio/rstudio-0.99.484.ebuild | 4 ++--
sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild | 4 ++--
sci-mathematics/rstudio/rstudio-0.99.491.ebuild | 4 ++--
sci-mathematics/rstudio/rstudio-0.99.879.ebuild | 4 ++--
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
b/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
index 64818de..02ab3b7 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
sys-apps/util-linux
>=sys-devel/clang-3.5.0
sys-libs/zlib
- || ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+ >=virtual/jre-1.7:=
x11-libs/pango
!dedicated? (
>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
@@ -85,7 +85,7 @@ RDEPEND="
DEPEND="${RDEPEND}
app-arch/unzip
dev-java/ant-core
- || ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
+ >=virtual/jdk-1.7:=
virtual/pkgconfig"
# test? ( dev-java/junit:4 )
diff --git a/sci-mathematics/rstudio/rstudio-0.99.482.ebuild
b/sci-mathematics/rstudio/rstudio-0.99.482.ebuild
index 64818de..02ab3b7 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.482.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.482.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
sys-apps/util-linux
>=sys-devel/clang-3.5.0
sys-libs/zlib
- || ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+ >=virtual/jre-1.7:=
x11-libs/pango
!dedicated? (
>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
@@ -85,7 +85,7 @@ RDEPEND="
DEPEND="${RDEPEND}
app-arch/unzip
dev-java/ant-core
- || ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
+ >=virtual/jdk-1.7:=
virtual/pkgconfig"
# test? ( dev-java/junit:4 )
diff --git a/sci-mathematics/rstudio/rstudio-0.99.483.ebuild
b/sci-mathematics/rstudio/rstudio-0.99.483.ebuild
index 64818de..02ab3b7 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.483.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.483.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
sys-apps/util-linux
>=sys-devel/clang-3.5.0
sys-libs/zlib
- || ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+ >=virtual/jre-1.7:=
x11-libs/pango
!dedicated? (
>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
@@ -85,7 +85,7 @@ RDEPEND="
DEPEND="${RDEPEND}
app-arch/unzip
dev-java/ant-core
- || ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
+ >=virtual/jdk-1.7:=
virtual/pkgconfig"
# test? ( dev-java/junit:4 )
diff --git a/sci-mathematics/rstudio/rstudio-0.99.484.ebuild
b/sci-mathematics/rstudio/rstudio-0.99.484.ebuild
index 64818de..02ab3b7 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.484.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.484.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
sys-apps/util-linux
>=sys-devel/clang-3.5.0
sys-libs/zlib
- || ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+ >=virtual/jre-1.7:=
x11-libs/pango
!dedicated? (
>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
@@ -85,7 +85,7 @@ RDEPEND="
DEPEND="${RDEPEND}
app-arch/unzip
dev-java/ant-core
- || ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
+ >=virtual/jdk-1.7:=
virtual/pkgconfig"
# test? ( dev-java/junit:4 )
diff --git a/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild
b/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild
index 764c9da..dda4c96 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.486-r1.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
sys-apps/util-linux
>=sys-devel/clang-3.5.0
sys-libs/zlib
- || ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+ >=virtual/jre-1.7:=
x11-libs/pango
!dedicated? (
>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
@@ -85,7 +85,7 @@ RDEPEND="
DEPEND="${RDEPEND}
app-arch/unzip
dev-java/ant-core
- || ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
+ >=virtual/jdk-1.7:=
virtual/pkgconfig"
# test? ( dev-java/junit:4 )
diff --git a/sci-mathematics/rstudio/rstudio-0.99.491.ebuild
b/sci-mathematics/rstudio/rstudio-0.99.491.ebuild
index 764c9da..dda4c96 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.491.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.491.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
sys-apps/util-linux
>=sys-devel/clang-3.5.0
sys-libs/zlib
- || ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+ >=virtual/jre-1.7:=
x11-libs/pango
!dedicated? (
>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
@@ -85,7 +85,7 @@ RDEPEND="
DEPEND="${RDEPEND}
app-arch/unzip
dev-java/ant-core
- || ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
+ >=virtual/jdk-1.7:=
virtual/pkgconfig"
# test? ( dev-java/junit:4 )
diff --git a/sci-mathematics/rstudio/rstudio-0.99.879.ebuild
b/sci-mathematics/rstudio/rstudio-0.99.879.ebuild
index 35a886b..996a3eb 100644
--- a/sci-mathematics/rstudio/rstudio-0.99.879.ebuild
+++ b/sci-mathematics/rstudio/rstudio-0.99.879.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
sys-apps/util-linux
>=sys-devel/clang-3.5.0
sys-libs/zlib
- || ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= )
+ >=virtual/jre-1.7:=
x11-libs/pango
!dedicated? (
>=dev-qt/qtcore-${QT_VER}:${QT_SLOT}
@@ -85,7 +85,7 @@ RDEPEND="
DEPEND="${RDEPEND}
app-arch/unzip
dev-java/ant-core
- || ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= )
+ >=virtual/jdk-1.7:=
virtual/pkgconfig"
# test? ( dev-java/junit:4 )
