Fixes #54723.

5 files changed, 25 insertions, 18 deletions

diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog
index 6ca1825b05b1..a59ca59d43ce 100644
--- a/dev-util/eclipse-sdk/ChangeLog
+++ b/dev-util/eclipse-sdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/eclipse-sdk
 # Copyright 2003-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.42 2004/06/22 14:18:47 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/ChangeLog,v 1.43 2004/06/22 18:57:04 karltk Exp $
+
+  22 Jun 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+  eclipse-sdk-3.0.0_rc1.ebuild, eclipse-sdk-3.0.0_rc2.ebuild,
+  eclipse-sdk-3.0.0_rc3.ebuild: Fixes #54723, thanks to Bert Geens
+  <theblackdragon@linux.be>.
 
   22 Jun 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
   eclipse-sdk-3.0.0_pre8-r3.ebuild: Removed.
diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest
index 57a124b2b312..eb6784271c9c 100644
--- a/dev-util/eclipse-sdk/Manifest
+++ b/dev-util/eclipse-sdk/Manifest
@@ -1,21 +1,21 @@
-MD5 72dc90434236600909343965e0c4c444 ChangeLog 9342
-MD5 f8e7f5d72cc0ec31ee8e4e0391c4dbf8 eclipse-sdk-3.0.0_rc1.ebuild 10729
-MD5 3959ba64064f4fdf9dd03c294ca0a4a4 eclipse-sdk-3.0.0_pre9.ebuild 10598
+MD5 36d6beaffe625bddde6cc526152faf42 ChangeLog 9558
 MD5 d167d2919e2f37ca5e7fb750b05d29fd eclipse-sdk-2.1.3-r3.ebuild 8826
-MD5 b3101db2b768c062edab50d2760d0f3c eclipse-sdk-3.0.0_rc2.ebuild 10617
-MD5 e0b43c939a6283fc0fe5e6b8e3f8a5f9 eclipse-sdk-3.0.0_rc3.ebuild 10617
+MD5 3959ba64064f4fdf9dd03c294ca0a4a4 eclipse-sdk-3.0.0_pre9.ebuild 10598
+MD5 bdbc36f1e9a10141ceb5ae5329fba8b5 eclipse-sdk-3.0.0_rc1.ebuild 10873
+MD5 5931e9de9cdaa970a7a0dd1114e6db0d eclipse-sdk-3.0.0_rc2.ebuild 10619
+MD5 7a7015e30dcdece7aa0a944211663fc9 eclipse-sdk-3.0.0_rc3.ebuild 10619
 MD5 9cc8d5162e981d7b7fc1ef9fa1ac0e65 metadata.xml 919
+MD5 06d244ce5f95763470623f0e023314c8 files/eclipse-3 958
+MD5 053cb6bc468bfe44ceafc173b4a42b83 files/digest-eclipse-sdk-3.0.0_rc3 89
 MD5 6c2995197ef0a038015ffff1dee7ac72 files/00-refactor_rename.patch 59577
 MD5 4359f5dff0419b45859cb8293690174a files/digest-eclipse-sdk-3.0.0_rc1 89
 MD5 37706eb7efb04f7734c9c296e1d802dd files/digest-eclipse-sdk-3.0.0_rc2 89
-MD5 053cb6bc468bfe44ceafc173b4a42b83 files/digest-eclipse-sdk-3.0.0_rc3 89
+MD5 429b757eb766856a6b29094b06402576 files/eclipse-3.desktop 222
+MD5 bfc0f8c0e74a36e0eeebf31cf6a7616c files/digest-eclipse-sdk-2.1.3-r3 88
 MD5 a906ea8f3ba53fe4ea766495c8f991c8 files/digest-eclipse-sdk-3.0.0_pre9 88
 MD5 b8ba4f69b9ab21292d05e00b1a854f32 files/eclipse-2 964
 MD5 6ac05b530442f845b10b830e624ffe04 files/eclipse-2.desktop 222
-MD5 06d244ce5f95763470623f0e023314c8 files/eclipse-3 958
-MD5 429b757eb766856a6b29094b06402576 files/eclipse-3.desktop 222
-MD5 bfc0f8c0e74a36e0eeebf31cf6a7616c files/digest-eclipse-sdk-2.1.3-r3 88
-MD5 ed33fd609db26b85ef9b0c2a82a06b22 files/01-distribute_ant_target-3.0.patch 726
 MD5 ab0f6620b4767e065bd533b06245b0fc files/01-distribute_ant_target-2.1.patch 1103
+MD5 ed33fd609db26b85ef9b0c2a82a06b22 files/01-distribute_ant_target-3.0.patch 726
 MD5 59c18169fdf20b43544bb4891592dce4 files/02-konqueror_help_browser-2.1.patch 1013
 MD5 a8bdecb6304c91da92a3b153e154f544 files/02-konqueror_help_browser-3.0.patch 1560
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.0.0_rc1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.0.0_rc1.ebuild
index a74e7ab2d205..f10c5abf6954 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.0.0_rc1.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.0.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.0_rc1.ebuild,v 1.3 2004/06/17 15:24:32 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.0_rc1.ebuild,v 1.4 2004/06/22 18:55:37 karltk Exp $
 
 inherit eutils
 
@@ -44,10 +44,12 @@ pkg_setup() {
 	local patch=$(echo ${version} | sed -r "s/${ver_rx}/\3/")
 	local extra=$(echo ${version} | sed -r "s/${ver_rx}/\4/")
 
-	if [ ${major} -ge 1 ]  && [ ${minor} -ge 4 ] && [ ${patch} -ge 2 ] ; then
+	if [ ${major} -ge 1 ] && [ ${minor} -gt 4 ] ; then
+		einfo "Detected JDK is sufficient to compile Eclipse (${version} >= 1.4.2)"
+	elif [ ${major} -ge 1 ] && [ ${minor} -ge 4 ] && [ ${patch} -ge 2 ] ; then
 		einfo "Detected JDK is sufficient to compile Eclipse (${version} >= 1.4.2)"
 	else
-		die "Detected JDK is too old to compile Eclipse, need at least 1.4.2!"
+		die "Detected JDK (${version}) is too old to compile Eclipse, need at least 1.4.2!"
 	fi
 }
 
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.0.0_rc2.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.0.0_rc2.ebuild
index e6edf8a37f57..41b4d2a196e4 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.0.0_rc2.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.0.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.0_rc2.ebuild,v 1.2 2004/06/22 14:17:26 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.0_rc2.ebuild,v 1.3 2004/06/22 18:55:37 karltk Exp $
 
 inherit eutils
 
@@ -45,7 +45,7 @@ pkg_setup() {
 
 	if [ ${major} -ge 1 ] && [ ${minor} -gt 4 ] ; then
 		einfo "Detected JDK is sufficient to compile Eclipse (${version} >= 1.4.2)"
-	elif [ ${major} -ge ] && [ ${minor} -ge 4 ] && [ ${patch} -ge 2 ] ; then
+	elif [ ${major} -ge 1 ] && [ ${minor} -ge 4 ] && [ ${patch} -ge 2 ] ; then
 		einfo "Detected JDK is sufficient to compile Eclipse (${version} >= 1.4.2)"
 	else
 		die "Detected JDK (${version}) is too old to compile Eclipse, need at least 1.4.2!"
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.0.0_rc3.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.0.0_rc3.ebuild
index 572322840adc..92c0a86aa91b 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.0.0_rc3.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.0.0_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.0_rc3.ebuild,v 1.1 2004/06/22 14:17:26 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.0.0_rc3.ebuild,v 1.2 2004/06/22 18:55:37 karltk Exp $
 
 inherit eutils
 
@@ -45,7 +45,7 @@ pkg_setup() {
 
 	if [ ${major} -ge 1 ] && [ ${minor} -gt 4 ] ; then
 		einfo "Detected JDK is sufficient to compile Eclipse (${version} >= 1.4.2)"
-	elif [ ${major} -ge ] && [ ${minor} -ge 4 ] && [ ${patch} -ge 2 ] ; then
+	elif [ ${major} -ge 1 ] && [ ${minor} -ge 4 ] && [ ${patch} -ge 2 ] ; then
 		einfo "Detected JDK is sufficient to compile Eclipse (${version} >= 1.4.2)"
 	else
 		die "Detected JDK (${version}) is too old to compile Eclipse, need at least 1.4.2!"