diff options
| author |   Alistair Bush <ali_bush@gentoo.org> | 2012-01-31 09:22:41 +0000 |
|---|---|---|
| committer | Alistair Bush <ali_bush@gentoo.org> | 2012-01-31 09:22:41 +0000 |
| commit | 966f85458517c64da73eeb17b1028bcb19337096 (patch) | |
| tree | 3b1b43aa60f9bc00df356bffa9bb647d52ba4f6f /dev-lang/scala | |
| parent | Version bump and URL fix. Bug 394783 (diff) | |
| download | gentoo-2-966f85458517c64da73eeb17b1028bcb19337096.tar.gz gentoo-2-966f85458517c64da73eeb17b1028bcb19337096.tar.bz2 gentoo-2-966f85458517c64da73eeb17b1028bcb19337096.zip | |
Update jdk dependency as errors building with jdk-1.7.
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/scala')
| -rw-r--r-- | dev-lang/scala/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/scala/scala-2.9.1.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-lang/scala/ChangeLog b/dev-lang/scala/ChangeLog index 0ecf90e3091c..7e8d2d1e6d88 100644 --- a/dev-lang/scala/ChangeLog +++ b/dev-lang/scala/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/scala # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.28 2012/01/26 07:14:50 ali_bush Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/ChangeLog,v 1.29 2012/01/31 09:22:41 ali_bush Exp $ + + 31 Jan 2012; Alistair Bush <ali_bush@gentoo.org> scala-2.9.1.ebuild: + Update jdk dependency as errors building with jdk-1.7. 26 Jan 2012; Alistair Bush <ali_bush@gentoo.org> scala-2.9.1.ebuild: Fix qa warning about old check_reqs function diff --git a/dev-lang/scala/scala-2.9.1.ebuild b/dev-lang/scala/scala-2.9.1.ebuild index 6a890ff28bea..929c43311e5c 100644 --- a/dev-lang/scala/scala-2.9.1.ebuild +++ b/dev-lang/scala/scala-2.9.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.9.1.ebuild,v 1.2 2012/01/26 07:14:50 ali_bush Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/scala/scala-2.9.1.ebuild,v 1.3 2012/01/31 09:22:41 ali_bush Exp $ EAPI="3" JAVA_PKG_IUSE="doc examples source" @@ -26,7 +26,7 @@ IUSE="binary emacs" # one fails with 1.7, two with 1.4 (blackdown) #RESTRICT="test" -DEPEND=">=virtual/jdk-1.6 +DEPEND="virtual/jdk:1.6 java-virtuals/jdk-with-com-sun !binary? ( dev-java/ant-contrib:0 |