Fix Bug 554842 - dev-lang/scala-2.10.4-r1 fails to emerge: JDK 1.8 is not supported by this build! Thanks to Florian Schmaus for reporting, genstorm and Chewi for helping with the fix.

Package-Manager: portage-2.2.20.1

9 files changed, 15 insertions, 29 deletions

diff --git a/dev-lang/scala/metadata.xml b/dev-lang/scala/metadata.xml
index 3965f8ed4f61..a860186ee83f 100644
--- 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 df8cba92696d..88810283ed8e 100644
--- 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 a6cb26c7452e..7310d51adcfa 100644
--- 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 f2bd1c6e804d..2dfa0a80b000 100644
--- 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 4b4fc5f37ed9..5fd5e5b4836f 100644
--- 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 fd94c4381617..0e2edfdc95bc 100644
--- 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 1727cdcd4889..e384d9d5c77e 100644
--- 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 f5202acea75c..5ad91d16558b 100644
--- 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 10a66b47bf7b..a3e310fac689 100644
--- 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"