sci-mathematics/rstudio: Backport JRE/JDK := dep fix, #586322

diff --git a/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild b/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild
index 64818de5367ecef296e951e6e31af465aaa312c3..02ab3b708cccca68de43a08ba682ccd8f0176665 100644 (file)
--- 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 64818de5367ecef296e951e6e31af465aaa312c3..02ab3b708cccca68de43a08ba682ccd8f0176665 100644 (file)
--- 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 64818de5367ecef296e951e6e31af465aaa312c3..02ab3b708cccca68de43a08ba682ccd8f0176665 100644 (file)
--- 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 64818de5367ecef296e951e6e31af465aaa312c3..02ab3b708cccca68de43a08ba682ccd8f0176665 100644 (file)
--- 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 764c9da06e4608d83dbd5d6d69e00c313439b193..dda4c9618206b51a990daceafc534eb6602221f8 100644 (file)
--- 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 764c9da06e4608d83dbd5d6d69e00c313439b193..dda4c9618206b51a990daceafc534eb6602221f8 100644 (file)
--- 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 35a886baa234b2b65ab1dadcc7b47680699a9255..996a3eb204d62be10b10f40cb19ef5e8087b3e02 100644 (file)
--- 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 )