summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Trygve Kalleberg <karltk@gentoo.org>2004-06-22 18:57:04 +0000
committerKarl Trygve Kalleberg <karltk@gentoo.org>2004-06-22 18:57:04 +0000
commitb79bed05110ba381597f924b386e8c148c4f1d68 (patch)
tree620348c0342207a8d0a595613cb76e8d9dcd523a /dev-util
parentsomeone forgot to add thunderbird (diff)
downloadgentoo-2-b79bed05110ba381597f924b386e8c148c4f1d68.tar.gz
gentoo-2-b79bed05110ba381597f924b386e8c148c4f1d68.tar.bz2
gentoo-2-b79bed05110ba381597f924b386e8c148c4f1d68.zip
Fixes #54723.
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/eclipse-sdk/ChangeLog7
-rw-r--r--dev-util/eclipse-sdk/eclipse-sdk-3.0.0_rc1.ebuild8
-rw-r--r--dev-util/eclipse-sdk/eclipse-sdk-3.0.0_rc2.ebuild4
-rw-r--r--dev-util/eclipse-sdk/eclipse-sdk-3.0.0_rc3.ebuild4
4 files changed, 15 insertions, 8 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/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!"