aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2008-09-29 14:43:26 +0000
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2008-09-29 14:43:26 +0000
commit6e39f05f699cee2a219140cce4a55011abbe5f32 (patch)
tree45db47dc5b4843dbe3576b298a52d6e716b3ea31 /virtual
parentVersion bump for swt. Hope to add more Eclipse 3.4.1 stuff this week. (diff)
downloadjava-6e39f05f699cee2a219140cce4a55011abbe5f32.tar.gz
java-6e39f05f699cee2a219140cce4a55011abbe5f32.tar.bz2
java-6e39f05f699cee2a219140cce4a55011abbe5f32.zip
Fix gcj-jdk dependencies.
svn path=/java-overlay/; revision=7027
Diffstat (limited to 'virtual')
-rw-r--r--virtual/jdk/ChangeLog3
-rw-r--r--virtual/jdk/Manifest4
-rw-r--r--virtual/jdk/jdk-1.5.0-r1.ebuild2
3 files changed, 6 insertions, 3 deletions
diff --git a/virtual/jdk/ChangeLog b/virtual/jdk/ChangeLog
index f5252681..263f5091 100644
--- a/virtual/jdk/ChangeLog
+++ b/virtual/jdk/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 29 Sep 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> jdk-1.5.0.ebuild:
+ Fix gcj-jdk dependency.
+
07 Aug 2008; Petteri Räty <betelgeuse@gentoo.org> jdk-1.6.0-r1.ebuild:
Remove gcj-jdk as the env file for it currently has 1.5 as the version.
Fixes bug #234059.
diff --git a/virtual/jdk/Manifest b/virtual/jdk/Manifest
index b83faf5b..227f3c31 100644
--- a/virtual/jdk/Manifest
+++ b/virtual/jdk/Manifest
@@ -1,4 +1,4 @@
EBUILD jdk-1.4.2-r1.ebuild 477 RMD160 7bad27e2b9350a3ae0373f95d20cebfd5ea048af SHA1 23e4d9e9901afd128c66996bd2fbdc99cb5c2c7a SHA256 fc93026823e8683960560df706b98066beab29cfcab966914c0c81e59f025ca8
-EBUILD jdk-1.5.0-r1.ebuild 491 RMD160 3498fd02831754e8b05ae4fc8b3cd0fbe4dac39d SHA1 e052f5c6ff3a2546b35c639336fa370b5ee0c075 SHA256 e0864281735332d472c2de24de6a23111563a81cb3ade709e53e13dab050402b
+EBUILD jdk-1.5.0-r1.ebuild 491 RMD160 0e6f661bf3832bca439d655f300a51c734517ec9 SHA1 56ad0fddad5ffa412af935854aa90258c1204511 SHA256 b4a28067d043bec997936cf47b986ca3b46a7b1ad27cfacf8f50631b3725b2e3
EBUILD jdk-1.6.0-r1.ebuild 503 RMD160 c90aa96e7739f99bb9a1fd2741fdcdd7a49845e8 SHA1 5a280c0e21020fa31002d619aad1d3628fb83d8d SHA256 585b83f494f77279942ca5a24c3fd7e500e7ebfb8d0f72f7c27025c931294631
-MISC ChangeLog 1966 RMD160 d964ac47db464590ba1b37d96c488bfa14da0c5c SHA1 8081f8259e91a1456b801323aa51c8c8e47e7245 SHA256 57d6147e3694aacec540eb4b14bad4daff28869f230078cd88913b032b5a6371
+MISC ChangeLog 2073 RMD160 16e10c5d128a4897ebc12ce28569cb45572aaa7a SHA1 f3a05c1d523f8a2960b02da43682632e300bce50 SHA256 3dffac5597e12604c2a91df7679df0e225dddb91bd98190fd224dbd3345b9430
diff --git a/virtual/jdk/jdk-1.5.0-r1.ebuild b/virtual/jdk/jdk-1.5.0-r1.ebuild
index f781d949..cfb31feb 100644
--- a/virtual/jdk/jdk-1.5.0-r1.ebuild
+++ b/virtual/jdk/jdk-1.5.0-r1.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE=""
RDEPEND="|| (
- =dev-java/gcj-jdk-4.3*
+ >=dev-java/gcj-jdk-4.3
=dev-java/jamvm-1.5*
>=dev-java/cacao-0.99.2
=dev-java/sun-jdk-1.5.0*