Fix Bug 554842 - dev-lang/scala-2.10.4-r1 fails to emerge: JDK 1.8 is not supported...

Package-Manager: portage-2.2.20.1

diff --git a/dev-lang/scala/metadata.xml b/dev-lang/scala/metadata.xml
index 3965f8ed4f61a8d64295f8d88f8fb42b48daa60c..a860186ee83f6262fab7b075068882e51b7cb8f8 100644 (file)
--- a/dev-lang/scala/metadata.xml
+++ b/dev-lang/scala/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>java</herd>
 <use><flag name='binary'>Install from (Gentoo-compiled) binary instead of building from sources. Set this when you run out of memory during build.</flag></use>

diff --git a/dev-lang/scala/scala-2.10.2-r2.ebuild b/dev-lang/scala/scala-2.10.2-r2.ebuild
index df8cba92696dac13818e87a67d3f748764bc8710..88810283ed8eff40cbead889cf512d55f425f935 100644 (file)
--- a/dev-lang/scala/scala-2.10.2-r2.ebuild
+++ b/dev-lang/scala/scala-2.10.2-r2.ebuild
@@ -72,8 +72,7 @@ COMMON_DEP="dev-java/ant-core:0
        dev-java/junit:4"
 
 DEPEND="${COMMON_DEP}
-       >=virtual/jdk-1.7.0
-       <virtual/jdk-1.8.0
+       || ( =virtual/jdk-1.6* =virtual/jdk-1.7* )
        java-virtuals/jdk-with-com-sun:0
        !binary? (
                dev-java/ant-contrib:0

diff --git a/dev-lang/scala/scala-2.10.3-r1.ebuild b/dev-lang/scala/scala-2.10.3-r1.ebuild
index a6cb26c7452eea8d7032256837b470a264b3ea1f..7310d51adcfab5102a896226117368ea57e87790 100644 (file)
--- a/dev-lang/scala/scala-2.10.3-r1.ebuild
+++ b/dev-lang/scala/scala-2.10.3-r1.ebuild
@@ -83,8 +83,7 @@ COMMON_DEP="dev-java/ant-core:0
        dev-java/hawtjni-runtime:0"
 
 DEPEND="${COMMON_DEP}
-       >=virtual/jdk-1.6.0
-       <virtual/jdk-1.8.0
+       || ( =virtual/jdk-1.6* =virtual/jdk-1.7* )
        java-virtuals/jdk-with-com-sun:0
        !binary? (
                dev-java/ant-core:0

diff --git a/dev-lang/scala/scala-2.10.4-r1.ebuild b/dev-lang/scala/scala-2.10.4-r1.ebuild
index f2bd1c6e804d29020a2b71eec1108cca00f2a0ce..2dfa0a80b000eceab1e6dab760b34428196d713c 100644 (file)
--- a/dev-lang/scala/scala-2.10.4-r1.ebuild
+++ b/dev-lang/scala/scala-2.10.4-r1.ebuild
@@ -83,16 +83,14 @@ COMMON_DEP="dev-java/ant-core:0
 DEPEND="${COMMON_DEP}
        java-virtuals/jdk-with-com-sun:0
        !binary? (
-               >=virtual/jdk-1.6.0
-               <virtual/jdk-1.8.0
+               || ( =virtual/jdk-1.6* =virtual/jdk-1.7* )
                dev-java/ant-core:0
                dev-java/ant-contrib:0
                dev-java/ant-nodeps:0
                media-gfx/graphviz
        )
        binary? (
-               >=virtual/jdk-1.7.0
-               <virtual/jdk-1.8.0
+               =virtual/jdk-1.7*
        )
        app-arch/xz-utils:0"
 

diff --git a/dev-lang/scala/scala-2.11.1-r1.ebuild b/dev-lang/scala/scala-2.11.1-r1.ebuild
index 4b4fc5f37ed98a9a22a5fc73c372f8486603b376..5fd5e5b4836fd2ae0b186a5df9629a9653ee3963 100644 (file)
--- a/dev-lang/scala/scala-2.11.1-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.1-r1.ebuild
@@ -73,16 +73,14 @@ COMMON_DEP="dev-java/ant-core:0
 DEPEND="${COMMON_DEP}
        java-virtuals/jdk-with-com-sun:0
        !binary? (
-               >=virtual/jdk-1.6.0
-               <virtual/jdk-1.9.0
+               || ( =virtual/jdk-1.6* =virtual/jdk-1.7* =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.0
-               <virtual/jdk-1.9.0
+               || ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
        )
        app-arch/xz-utils:0"
 

diff --git a/dev-lang/scala/scala-2.11.2-r1.ebuild b/dev-lang/scala/scala-2.11.2-r1.ebuild
index fd94c438161775a51862585f7b466b5eaeb067b4..0e2edfdc95bcb19e02043bc80f544465c188750b 100644 (file)
--- a/dev-lang/scala/scala-2.11.2-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.2-r1.ebuild
@@ -73,16 +73,14 @@ COMMON_DEP="dev-java/ant-core:0
 DEPEND="${COMMON_DEP}
        java-virtuals/jdk-with-com-sun:0
        !binary? (
-               >=virtual/jdk-1.6.0
-               <virtual/jdk-1.9.0
+               || ( =virtual/jdk-1.6* =virtual/jdk-1.7* =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.0
-               <virtual/jdk-1.9.0
+               || ( =virtual/jdk-1.7* =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 1727cdcd48896f8477649f16a0882482520b3e5a..e384d9d5c77ec8ac5ecc229c50a3d35c4ffc5602 100644 (file)
--- a/dev-lang/scala/scala-2.11.4-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.4-r1.ebuild
@@ -73,16 +73,14 @@ COMMON_DEP="dev-java/ant-core:0
 DEPEND="${COMMON_DEP}
        java-virtuals/jdk-with-com-sun:0
        !binary? (
-               >=virtual/jdk-1.6.0
-               <virtual/jdk-1.9.0
+               || ( =virtual/jdk-1.6* =virtual/jdk-1.7* =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.0
-               <virtual/jdk-1.9.0
+               || ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
        )
        app-arch/xz-utils:0"
 

diff --git a/dev-lang/scala/scala-2.11.6.ebuild b/dev-lang/scala/scala-2.11.6.ebuild
index f5202acea75ca65cfbd3e4fb494530aa643cc478..5ad91d16558b602ce04a19ca115ab65a39e9ce08 100644 (file)
--- a/dev-lang/scala/scala-2.11.6.ebuild
+++ b/dev-lang/scala/scala-2.11.6.ebuild
@@ -73,16 +73,14 @@ COMMON_DEP="dev-java/ant-core:0
 DEPEND="${COMMON_DEP}
        java-virtuals/jdk-with-com-sun:0
        !binary? (
-               >=virtual/jdk-1.6.0
-               <virtual/jdk-1.9.0
+               || ( =virtual/jdk-1.6* =virtual/jdk-1.7* =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.0
-               <virtual/jdk-1.9.0
+               || ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
        )
        app-arch/xz-utils:0"
 

diff --git a/dev-lang/scala/scala-2.11.7.ebuild b/dev-lang/scala/scala-2.11.7.ebuild
index 10a66b47bf7b6308066ec4a11e692cbd2b225c51..a3e310fac689ced4eba419957e0b48ae1f6ff017 100644 (file)
--- a/dev-lang/scala/scala-2.11.7.ebuild
+++ b/dev-lang/scala/scala-2.11.7.ebuild
@@ -73,16 +73,14 @@ COMMON_DEP="dev-java/ant-core:0
 DEPEND="${COMMON_DEP}
        java-virtuals/jdk-with-com-sun:0
        !binary? (
-               >=virtual/jdk-1.6.0
-               <virtual/jdk-1.9.0
+               || ( =virtual/jdk-1.6* =virtual/jdk-1.7* =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.0
-               <virtual/jdk-1.9.0
+               || ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
        )
        app-arch/xz-utils:0"