diff options
| author | Mark Wright <gienah@gentoo.org> | 2015-08-25 00:15:50 +1000 |
|---|---|---|
| committer | Mark Wright <gienah@gentoo.org> | 2015-08-25 00:16:38 +1000 |
| commit | 1c17497ecb2b701c2c137ba087ced476e7e12086 (patch) | |
| tree | 946fa0df5ed355847b9d3292045581f2f3a38829 /dev-lang/scala/scala-2.11.7.ebuild | |
| parent | 807fb84dcbf4125775a1517dd48752aa7f493108 (diff) | |
| download | gentoo-1c17497ecb2b701c2c137ba087ced476e7e12086.tar.gz gentoo-1c17497ecb2b701c2c137ba087ced476e7e12086.tar.bz2 gentoo-1c17497ecb2b701c2c137ba087ced476e7e12086.zip | |
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
Diffstat (limited to 'dev-lang/scala/scala-2.11.7.ebuild')
| -rw-r--r-- | dev-lang/scala/scala-2.11.7.ebuild | 6 |
1 files changed, 2 insertions, 4 deletions
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" |