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 | c115b55294de43d305ef123b08691203d71a620d (patch) | |
tree | cba0e6d4867a141c130fbcf14e0b26ae21978d73 /dev-lang | |
parent | Version bump and URL fix. Bug 394783 (diff) | |
download | historical-c115b55294de43d305ef123b08691203d71a620d.tar.gz historical-c115b55294de43d305ef123b08691203d71a620d.tar.bz2 historical-c115b55294de43d305ef123b08691203d71a620d.zip |
Update jdk dependency as errors building with jdk-1.7.
Package-Manager: portage-2.1.10.44/cvs/Linux x86_64
Diffstat (limited to 'dev-lang')
-rw-r--r-- | dev-lang/scala/ChangeLog | 5 | ||||
-rw-r--r-- | dev-lang/scala/Manifest | 4 | ||||
-rw-r--r-- | dev-lang/scala/scala-2.9.1.ebuild | 4 |
3 files changed, 8 insertions, 5 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/Manifest b/dev-lang/scala/Manifest index ffc2e79b987e..b81eab4374e5 100644 --- a/dev-lang/scala/Manifest +++ b/dev-lang/scala/Manifest @@ -4,6 +4,6 @@ DIST scala-2.9.0.1.tar.xz 29707920 RMD160 eb7fa1cc9dc4b006bbcbd3b420a98069158abc DIST scala-2.9.1-gentoo-binary.tar.bz2 33266793 RMD160 cb5b2ed3e595a41d291eb5ff6d3352ed71c16f4c SHA1 02835cf1aee091576698cfa0645ac588f42c0bcc SHA256 b118c285ba6655974a647a5a82e3e655487e55aff6a5b89ddf5295595d6c822a DIST scala-2.9.1.tar.xz 29728644 RMD160 e81a4a2f6997be79c7181bf16cf7529198e39aa2 SHA1 e2997a257801ea7ac666d8f90e7105713d3856d9 SHA256 4bbb439b2830560cd034eaf143357cb195b8bcd986e38749341ce541cbfa8e6a EBUILD scala-2.9.0.1.ebuild 3889 RMD160 6ae28f695efc48217742f944c0f37ee71db58056 SHA1 e37a2e464798c3637afbc155315eb471ef0f29cd SHA256 4193799a5ee6b63411c20a99c4d7422d5a596d795236a508fe536a316ac2013d -EBUILD scala-2.9.1.ebuild 3904 RMD160 6087f53cac3f3bfbf7a6dcc998f5fb652744fc4d SHA1 613a2bb1ddc1e3be3418b0a714d1a71d22e6a335 SHA256 b35422ab23cd1431a7c9073afc8a8f5273f218ad463af892ed988b73437ce2c5 -MISC ChangeLog 4963 RMD160 54e81b9e2b8552a234c8f006257682c85db9eec4 SHA1 9e6671997e92fe11e39d1ad4ccdc72fc8a953042 SHA256 d4f5ac45d3567bf3681158aeefd07777e24aeac0b6489d3af3569a4a3457ab08 +EBUILD scala-2.9.1.ebuild 3902 RMD160 3e592fddb7c0a1e8c58283cabe8a792cf854744d SHA1 7b0ca2f925994b263f2540cc585c1a6f2dc7d598 SHA256 5850b0694255b672412d830f6bcabda4eb3506ad78a5cd6fc58c974606024fcb +MISC ChangeLog 5092 RMD160 0f506471e4985460b2739a7b0f4ada69f2c2be60 SHA1 5ce950b234016123a35af10ee4746694a43171bb SHA256 16962a1b6cbb2b670526d2401b55d4bba604281b4e2f67c25d88c238e6ebfa71 MISC metadata.xml 317 RMD160 c068d6e3d0806587dc6262bd8162709fbd18b25e SHA1 d68298cc52c736cb3a300197daa86cf6d4618656 SHA256 9ec2b0918811b14be0850dabea428b6b976e7eae70e97f281f85533d4e66bc94 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 |