From: "Mark Wright" <gienah@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/scala/
Date: Mon, 24 Aug 2015 14:17:14 +0000 (UTC) [thread overview]
Message-ID: <1440425798.1c17497ecb2b701c2c137ba087ced476e7e12086.gienah@gentoo> (raw)
commit: 1c17497ecb2b701c2c137ba087ced476e7e12086
Author: Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 24 14:15:50 2015 +0000
Commit: Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 14:16:38 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c17497e
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
dev-lang/scala/metadata.xml | 2 +-
dev-lang/scala/scala-2.10.2-r2.ebuild | 3 +--
dev-lang/scala/scala-2.10.3-r1.ebuild | 3 +--
dev-lang/scala/scala-2.10.4-r1.ebuild | 6 ++----
dev-lang/scala/scala-2.11.1-r1.ebuild | 6 ++----
dev-lang/scala/scala-2.11.2-r1.ebuild | 6 ++----
dev-lang/scala/scala-2.11.4-r1.ebuild | 6 ++----
dev-lang/scala/scala-2.11.6.ebuild | 6 ++----
dev-lang/scala/scala-2.11.7.ebuild | 6 ++----
9 files changed, 15 insertions(+), 29 deletions(-)
diff --git a/dev-lang/scala/metadata.xml b/dev-lang/scala/metadata.xml
index 3965f8e..a860186 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 df8cba9..8881028 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 a6cb26c..7310d51 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 f2bd1c6..2dfa0a8 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 4b4fc5f..5fd5e5b 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 fd94c43..0e2edfd 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 1727cdc..e384d9d 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 f5202ac..5ad91d1 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 10a66b4..a3e310f 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"
next reply other threads:[~2015-08-24 14:17 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-24 14:17 Mark Wright [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-08-24 14:58 [gentoo-commits] repo/gentoo:master commit in: dev-lang/scala/ Mark Wright
2016-02-16 10:44 Mark Wright
2016-02-17 11:56 Mark Wright
2018-06-25 23:20 Thomas Deutschmann
2018-06-26 1:28 Aaron Bauman
2018-08-26 9:39 Michał Górny
2019-12-29 6:17 Mark Wright
2020-01-14 22:46 Thomas Deutschmann
2020-05-17 16:55 Aaron Bauman
2021-12-26 12:14 Benda XU
2022-06-23 5:49 Sam James
2022-08-05 8:17 Arthur Zamarin
2022-10-15 23:40 Sam James
2024-04-30 8:15 Florian Schmaus
2024-05-09 10:52 Florian Schmaus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1440425798.1c17497ecb2b701c2c137ba087ced476e7e12086.gienah@gentoo \
--to=gienah@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox