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: dev-lang/scala/
Date: Sun, 26 Aug 2018 09:39:43 +0000 (UTC)	[thread overview]
Message-ID: <1535274313.7ab2aa6670197fcd97244b359ca98d8ab847e3ba.mgorny@gentoo> (raw)

commit:     7ab2aa6670197fcd97244b359ca98d8ab847e3ba
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 26 09:05:13 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 26 09:05:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ab2aa66

dev-lang/scala: Remove support for non-existent deps

 dev-lang/scala/scala-2.11.1-r2.ebuild | 4 ++--
 dev-lang/scala/scala-2.11.11.ebuild   | 4 ++--
 dev-lang/scala/scala-2.11.2-r2.ebuild | 4 ++--
 dev-lang/scala/scala-2.11.4-r1.ebuild | 4 ++--
 dev-lang/scala/scala-2.11.4-r2.ebuild | 4 ++--
 dev-lang/scala/scala-2.11.6-r1.ebuild | 4 ++--
 dev-lang/scala/scala-2.11.7-r1.ebuild | 4 ++--
 dev-lang/scala/scala-2.11.8.ebuild    | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/dev-lang/scala/scala-2.11.1-r2.ebuild b/dev-lang/scala/scala-2.11.1-r2.ebuild
index e2bdb4138ba..3c4def15b54 100644
--- a/dev-lang/scala/scala-2.11.1-r2.ebuild
+++ b/dev-lang/scala/scala-2.11.1-r2.ebuild
@@ -71,14 +71,14 @@ COMMON_DEP="dev-java/ant-core:0
 
 DEPEND="${COMMON_DEP}
 	!binary? (
-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+		=virtual/jdk-1.8*
 		dev-java/ant-core:0
 		dev-java/ant-contrib:0
 		dev-java/ant-nodeps:0
 		media-gfx/graphviz
 	)
 	binary? (
-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+		=virtual/jdk-1.8*
 	)
 	app-arch/xz-utils:0"
 

diff --git a/dev-lang/scala/scala-2.11.11.ebuild b/dev-lang/scala/scala-2.11.11.ebuild
index 40bafa3a7db..563b35b0521 100644
--- a/dev-lang/scala/scala-2.11.11.ebuild
+++ b/dev-lang/scala/scala-2.11.11.ebuild
@@ -73,14 +73,14 @@ COMMON_DEP="dev-java/ant-core:0
 
 DEPEND="${COMMON_DEP}
 	!binary? (
-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+		=virtual/jdk-1.8*
 		dev-java/ant-core:0
 		dev-java/ant-contrib:0
 		dev-java/ant-nodeps:0
 		media-gfx/graphviz
 	)
 	binary? (
-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+		=virtual/jdk-1.8*
 	)
 	app-arch/xz-utils:0"
 

diff --git a/dev-lang/scala/scala-2.11.2-r2.ebuild b/dev-lang/scala/scala-2.11.2-r2.ebuild
index 200cda5accd..443769b797d 100644
--- a/dev-lang/scala/scala-2.11.2-r2.ebuild
+++ b/dev-lang/scala/scala-2.11.2-r2.ebuild
@@ -71,14 +71,14 @@ COMMON_DEP="dev-java/ant-core:0
 
 DEPEND="${COMMON_DEP}
 	!binary? (
-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+		=virtual/jdk-1.8*
 		dev-java/ant-core:0
 		dev-java/ant-contrib:0
 		dev-java/ant-nodeps:0
 		media-gfx/graphviz
 	)
 	binary? (
-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+		=virtual/jdk-1.8*
 	)
 	app-arch/xz-utils:0"
 

diff --git a/dev-lang/scala/scala-2.11.4-r1.ebuild b/dev-lang/scala/scala-2.11.4-r1.ebuild
index 5ff29fa215e..eacdf857425 100644
--- a/dev-lang/scala/scala-2.11.4-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.4-r1.ebuild
@@ -71,14 +71,14 @@ COMMON_DEP="dev-java/ant-core:0
 
 DEPEND="${COMMON_DEP}
 	!binary? (
-		|| ( =virtual/jdk-1.6* =virtual/jdk-1.7* =virtual/jdk-1.8* )
+		=virtual/jdk-1.8*
 		dev-java/ant-core:0
 		dev-java/ant-contrib:0
 		dev-java/ant-nodeps:0
 		media-gfx/graphviz
 	)
 	binary? (
-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+		=virtual/jdk-1.8*
 	)
 	app-arch/xz-utils:0"
 

diff --git a/dev-lang/scala/scala-2.11.4-r2.ebuild b/dev-lang/scala/scala-2.11.4-r2.ebuild
index 6015a9c1b7c..e9dd2fb848f 100644
--- a/dev-lang/scala/scala-2.11.4-r2.ebuild
+++ b/dev-lang/scala/scala-2.11.4-r2.ebuild
@@ -71,14 +71,14 @@ COMMON_DEP="dev-java/ant-core:0
 
 DEPEND="${COMMON_DEP}
 	!binary? (
-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+		=virtual/jdk-1.8*
 		dev-java/ant-core:0
 		dev-java/ant-contrib:0
 		dev-java/ant-nodeps:0
 		media-gfx/graphviz
 	)
 	binary? (
-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+		=virtual/jdk-1.8*
 	)
 	app-arch/xz-utils:0"
 

diff --git a/dev-lang/scala/scala-2.11.6-r1.ebuild b/dev-lang/scala/scala-2.11.6-r1.ebuild
index b31e50091cd..50afdf2a1a2 100644
--- a/dev-lang/scala/scala-2.11.6-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.6-r1.ebuild
@@ -71,14 +71,14 @@ COMMON_DEP="dev-java/ant-core:0
 
 DEPEND="${COMMON_DEP}
 	!binary? (
-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+		=virtual/jdk-1.8*
 		dev-java/ant-core:0
 		dev-java/ant-contrib:0
 		dev-java/ant-nodeps:0
 		media-gfx/graphviz
 	)
 	binary? (
-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+		=virtual/jdk-1.8*
 	)
 	app-arch/xz-utils:0"
 

diff --git a/dev-lang/scala/scala-2.11.7-r1.ebuild b/dev-lang/scala/scala-2.11.7-r1.ebuild
index 25ec70aafff..1b9b10ab12b 100644
--- a/dev-lang/scala/scala-2.11.7-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.7-r1.ebuild
@@ -71,14 +71,14 @@ COMMON_DEP="dev-java/ant-core:0
 
 DEPEND="${COMMON_DEP}
 	!binary? (
-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+		=virtual/jdk-1.8*
 		dev-java/ant-core:0
 		dev-java/ant-contrib:0
 		dev-java/ant-nodeps:0
 		media-gfx/graphviz
 	)
 	binary? (
-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+		=virtual/jdk-1.8*
 	)
 	app-arch/xz-utils:0"
 

diff --git a/dev-lang/scala/scala-2.11.8.ebuild b/dev-lang/scala/scala-2.11.8.ebuild
index ae3518042cf..8ba79236888 100644
--- a/dev-lang/scala/scala-2.11.8.ebuild
+++ b/dev-lang/scala/scala-2.11.8.ebuild
@@ -71,14 +71,14 @@ COMMON_DEP="dev-java/ant-core:0
 
 DEPEND="${COMMON_DEP}
 	!binary? (
-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+		=virtual/jdk-1.8*
 		dev-java/ant-core:0
 		dev-java/ant-contrib:0
 		dev-java/ant-nodeps:0
 		media-gfx/graphviz
 	)
 	binary? (
-		|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
+		=virtual/jdk-1.8*
 	)
 	app-arch/xz-utils:0"
 


             reply	other threads:[~2018-08-26  9:39 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-26  9:39 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-05-09 10:52 [gentoo-commits] repo/gentoo:master commit in: dev-lang/scala/ Florian Schmaus
2024-04-30  8:15 Florian Schmaus
2022-10-15 23:40 Sam James
2022-08-05  8:17 Arthur Zamarin
2022-06-23  5:49 Sam James
2021-12-26 12:14 Benda XU
2020-05-17 16:55 Aaron Bauman
2020-01-14 22:46 Thomas Deutschmann
2019-12-29  6:17 Mark Wright
2018-06-26  1:28 Aaron Bauman
2018-06-25 23:20 Thomas Deutschmann
2016-02-17 11:56 Mark Wright
2016-02-16 10:44 Mark Wright
2015-08-24 14:58 Mark Wright
2015-08-24 14:17 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=1535274313.7ab2aa6670197fcd97244b359ca98d8ab847e3ba.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