public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/
Date: Tue, 21 Jun 2016 19:37:14 +0000 (UTC)	[thread overview]
Message-ID: <1466537826.af2fbac39c32842ccc588efb3e7cb3bebf09e15f.mgorny@gentoo> (raw)

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 )
 


             reply	other threads:[~2016-06-21 19:37 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-21 19:37 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-05-02 20:11 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/ Mikle Kolyada
2020-09-25  5:07 Mark Wright
2020-05-23 12:43 Mark Wright
2020-02-12 18:06 David Seifert
2019-12-07 21:55 David Seifert
2019-12-07 20:58 David Seifert
2019-10-20 11:41 David Seifert
2019-10-12 19:04 Mikle Kolyada
2019-08-22 23:15 Mark Wright
2019-08-22 11:07 Thomas Deutschmann
2019-08-22 11:01 Thomas Deutschmann
2019-06-12 19:14 David Seifert
2019-06-12 19:14 David Seifert
2018-07-03  2:39 Mark Wright
2018-02-22 10:51 Andreas Sturmlechner
2017-12-25 10:43 David Seifert
2017-12-03 15:58 Patrice Clement
2017-11-25 17:42 David Seifert
2017-11-19 12:52 David Seifert
2017-07-24  4:14 Mark Wright
2017-04-26  8:44 Mark Wright
2017-01-03 12:38 Mark Wright
2016-07-20  3:00 Mark Wright
2016-05-15 10:53 Mark Wright
2016-04-19  9:22 Mark Wright
2016-04-08 10:18 Mark Wright
2016-01-29  6:27 Mark Wright
2016-01-29  4:59 Mark Wright
2016-01-22 21:03 Justin Lecher
2015-10-14 10:22 Mark Wright
2015-09-09  2:27 Mark Wright
2015-09-05  4:27 Mark Wright
2015-09-04 11:33 Mark Wright
2015-09-04  3:20 Mark Wright
2015-08-27  2:54 Mark Wright

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1466537826.af2fbac39c32842ccc588efb3e7cb3bebf09e15f.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox