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"
