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

diff --git a/dev-lang/scala/scala-2.11.1-r2.ebuild b/dev-lang/scala/scala-2.11.1-r2.ebuild
index e2bdb4138ba4cf321d9422970be093c1fe64f0f4..3c4def15b5480701c637bfdf563e2edb1b3e7e48 100644 (file)
--- 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 40bafa3a7db5da2c1d19fd44909fc99310abfbc6..563b35b0521c9a7692f581c5aa02833e070e2642 100644 (file)
--- 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 200cda5accde5a040a41e9ae4e26491deb8b1359..443769b797d3e72d5249128184989dba8f56a76e 100644 (file)
--- 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 5ff29fa215e61de174af46b37bb0ea1279d5d540..eacdf8574254a8ddd30c4dc6b553857243c36e81 100644 (file)
--- 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 6015a9c1b7c58944d3f5abbef32c7e1492470edc..e9dd2fb848f90778a37a4824702496d87b32fe7b 100644 (file)
--- 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 b31e50091cd4a7ba43120ad3eb8f22bd39d0ab0c..50afdf2a1a2244e000ef280080194da73bbe3e0a 100644 (file)
--- 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 25ec70aafff78780b8d5ebb35575a5bff830faf8..1b9b10ab12b86188527f1815e4bc9f2ea7172e1b 100644 (file)
--- 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 ae3518042cf28a354ee1c73cfec6682ebeb4ff57..8ba7923688895a581dae0a3f274523446ff1332f 100644 (file)
--- 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"