commit: 0f9735dbe9ca9893b130245baa1a5dfeb32eff6c
Author: Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 17 11:55:29 2016 +0000
Commit: Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 11:55:29 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f9735db
dev-lang/scala: Remove DEPEND java-virtuals/jdk-with-com-sun:0
Package-Manager: portage-2.2.27
dev-lang/scala/scala-2.10.2-r3.ebuild | 3 +--
dev-lang/scala/scala-2.10.3-r2.ebuild | 3 +--
dev-lang/scala/scala-2.10.4-r2.ebuild | 3 +--
dev-lang/scala/scala-2.10.6.ebuild | 1 -
dev-lang/scala/scala-2.11.1-r2.ebuild | 3 +--
dev-lang/scala/scala-2.11.2-r2.ebuild | 3 +--
dev-lang/scala/scala-2.11.4-r1.ebuild | 3 +--
dev-lang/scala/scala-2.11.4-r2.ebuild | 3 +--
dev-lang/scala/scala-2.11.6-r1.ebuild | 3 +--
dev-lang/scala/scala-2.11.7-r1.ebuild | 3 +--
dev-lang/scala/scala-2.9.3.ebuild | 3 +--
11 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/dev-lang/scala/scala-2.10.2-r3.ebuild
b/dev-lang/scala/scala-2.10.2-r3.ebuild
index 9ae487c..41067bf 100644
--- a/dev-lang/scala/scala-2.10.2-r3.ebuild
+++ b/dev-lang/scala/scala-2.10.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -73,7 +73,6 @@ COMMON_DEP="dev-java/ant-core:0
DEPEND="${COMMON_DEP}
=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-r2.ebuild
b/dev-lang/scala/scala-2.10.3-r2.ebuild
index 40a9e35..32db056 100644
--- a/dev-lang/scala/scala-2.10.3-r2.ebuild
+++ b/dev-lang/scala/scala-2.10.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -84,7 +84,6 @@ COMMON_DEP="dev-java/ant-core:0
DEPEND="${COMMON_DEP}
=virtual/jdk-1.7*
- java-virtuals/jdk-with-com-sun:0
!binary? (
dev-java/ant-core:0
dev-java/ant-contrib:0
diff --git a/dev-lang/scala/scala-2.10.4-r2.ebuild
b/dev-lang/scala/scala-2.10.4-r2.ebuild
index c3e0af4..ddde117 100644
--- a/dev-lang/scala/scala-2.10.4-r2.ebuild
+++ b/dev-lang/scala/scala-2.10.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -81,7 +81,6 @@ COMMON_DEP="dev-java/ant-core:0
dev-java/hawtjni-runtime:0"
DEPEND="${COMMON_DEP}
- java-virtuals/jdk-with-com-sun:0
!binary? (
=virtual/jdk-1.7*
dev-java/ant-core:0
diff --git a/dev-lang/scala/scala-2.10.6.ebuild
b/dev-lang/scala/scala-2.10.6.ebuild
index 8bf584d..cf4d985 100644
--- a/dev-lang/scala/scala-2.10.6.ebuild
+++ b/dev-lang/scala/scala-2.10.6.ebuild
@@ -81,7 +81,6 @@ COMMON_DEP="dev-java/ant-core:0
dev-java/hawtjni-runtime:0"
DEPEND="${COMMON_DEP}
- java-virtuals/jdk-with-com-sun:0
!binary? (
=virtual/jdk-1.7*
dev-java/ant-core:0
diff --git a/dev-lang/scala/scala-2.11.1-r2.ebuild
b/dev-lang/scala/scala-2.11.1-r2.ebuild
index 6b22204..5549c58 100644
--- a/dev-lang/scala/scala-2.11.1-r2.ebuild
+++ b/dev-lang/scala/scala-2.11.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -71,7 +71,6 @@ COMMON_DEP="dev-java/ant-core:0
dev-java/hawtjni-runtime:0"
DEPEND="${COMMON_DEP}
- java-virtuals/jdk-with-com-sun:0
!binary? (
|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
dev-java/ant-core:0
diff --git a/dev-lang/scala/scala-2.11.2-r2.ebuild
b/dev-lang/scala/scala-2.11.2-r2.ebuild
index 0f3b1ae..f265eab 100644
--- a/dev-lang/scala/scala-2.11.2-r2.ebuild
+++ b/dev-lang/scala/scala-2.11.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -71,7 +71,6 @@ COMMON_DEP="dev-java/ant-core:0
dev-java/hawtjni-runtime:0"
DEPEND="${COMMON_DEP}
- java-virtuals/jdk-with-com-sun:0
!binary? (
|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
dev-java/ant-core:0
diff --git a/dev-lang/scala/scala-2.11.4-r1.ebuild
b/dev-lang/scala/scala-2.11.4-r1.ebuild
index e384d9d..464ddf1 100644
--- a/dev-lang/scala/scala-2.11.4-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -71,7 +71,6 @@ COMMON_DEP="dev-java/ant-core:0
dev-java/hawtjni-runtime:0"
DEPEND="${COMMON_DEP}
- java-virtuals/jdk-with-com-sun:0
!binary? (
|| ( =virtual/jdk-1.6* =virtual/jdk-1.7* =virtual/jdk-1.8* )
dev-java/ant-core:0
diff --git a/dev-lang/scala/scala-2.11.4-r2.ebuild
b/dev-lang/scala/scala-2.11.4-r2.ebuild
index 4d8c9fd..141f851 100644
--- a/dev-lang/scala/scala-2.11.4-r2.ebuild
+++ b/dev-lang/scala/scala-2.11.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -71,7 +71,6 @@ COMMON_DEP="dev-java/ant-core:0
dev-java/hawtjni-runtime:0"
DEPEND="${COMMON_DEP}
- java-virtuals/jdk-with-com-sun:0
!binary? (
|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
dev-java/ant-core:0
diff --git a/dev-lang/scala/scala-2.11.6-r1.ebuild
b/dev-lang/scala/scala-2.11.6-r1.ebuild
index c4bafb0..c28cc61 100644
--- a/dev-lang/scala/scala-2.11.6-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -71,7 +71,6 @@ COMMON_DEP="dev-java/ant-core:0
dev-java/hawtjni-runtime:0"
DEPEND="${COMMON_DEP}
- java-virtuals/jdk-with-com-sun:0
!binary? (
|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
dev-java/ant-core:0
diff --git a/dev-lang/scala/scala-2.11.7-r1.ebuild
b/dev-lang/scala/scala-2.11.7-r1.ebuild
index 0cedfbd..e1ac021 100644
--- a/dev-lang/scala/scala-2.11.7-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -71,7 +71,6 @@ COMMON_DEP="dev-java/ant-core:0
dev-java/hawtjni-runtime:0"
DEPEND="${COMMON_DEP}
- java-virtuals/jdk-with-com-sun:0
!binary? (
|| ( =virtual/jdk-1.7* =virtual/jdk-1.8* )
dev-java/ant-core:0
diff --git a/dev-lang/scala/scala-2.9.3.ebuild
b/dev-lang/scala/scala-2.9.3.ebuild
index fbb26b8..265c450 100644
--- a/dev-lang/scala/scala-2.9.3.ebuild
+++ b/dev-lang/scala/scala-2.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -79,7 +79,6 @@ COMMON_DEP="dev-java/ant-core:0
dev-java/hawtjni-runtime:0"
DEPEND="${COMMON_DEP}
- java-virtuals/jdk-with-com-sun:0
!binary? (
=virtual/jdk-1.7*
dev-java/ant-core:0
