diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2016-06-21 21:36:19 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2016-06-21 21:37:06 +0200 |
| commit | af2fbac39c32842ccc588efb3e7cb3bebf09e15f (patch) | |
| tree | e20c265fb21d858932225ff8b59185b5936ac28b | |
| parent | www-servers/ocsigenserver: Remove := inside ||, #586328 (diff) | |
| download | gentoo-af2fbac39c32842ccc588efb3e7cb3bebf09e15f.tar.gz gentoo-af2fbac39c32842ccc588efb3e7cb3bebf09e15f.tar.bz2 gentoo-af2fbac39c32842ccc588efb3e7cb3bebf09e15f.zip | |
sci-mathematics/rstudio: Backport JRE/JDK := dep fix, #586322
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 64818de5367e..02ab3b708ccc 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 64818de5367e..02ab3b708ccc 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 64818de5367e..02ab3b708ccc 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 64818de5367e..02ab3b708ccc 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 764c9da06e46..dda4c9618206 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 764c9da06e46..dda4c9618206 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 35a886baa234..996a3eb204d6 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 ) |