From 7ab2aa6670197fcd97244b359ca98d8ab847e3ba Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 26 Aug 2018 11:05:13 +0200 Subject: [PATCH] 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 e2bdb4138ba4..3c4def15b548 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 40bafa3a7db5..563b35b0521c 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 200cda5accde..443769b797d3 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 5ff29fa215e6..eacdf8574254 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 6015a9c1b7c5..e9dd2fb848f9 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 b31e50091cd4..50afdf2a1a22 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 25ec70aafff7..1b9b10ab12b8 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 ae3518042cf2..8ba792368889 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" -- 2.26.2