Allow Eclipse-3.3 to build with JDK-1.6 too.

Package-Manager: portage-2.1.4.4

diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest
index 5aaf3ec9b7581365b6ff930093f5b227045bf89a..aabca44a1854438b01f5786aefd4d001a38d4946 100644 (file)
--- a/dev-util/eclipse-sdk/Manifest
+++ b/dev-util/eclipse-sdk/Manifest
@@ -16,6 +16,6 @@ DIST eclipse-sdk-3.2.1-r1-patches.tar.bz2 85951 RMD160 55a0f98229feb47d936acbcdc
 DIST eclipse-sourceBuild-srcIncluded-3.2.1.zip 82433420 RMD160 9648176b79adac7217371e5b8dee7aeb4cd458db SHA1 a27bae4ff9f866a1fab995eae2da00ab2be5e840 SHA256 2d6a0628333d068b6ab678c42f925d71df1c003035543830a30e3ee80fb855c7
 DIST eclipse-sourceBuild-srcIncluded-3.3.1.1.zip 94267330 RMD160 78d19b528e99c3f3416de099ab5dcd59430fc9ac SHA1 901f4c66acf4c988fc08f78f3ffcd45b3748b344 SHA256 e4c24d54a2b9bc630f961320c61f8e804255f49b141370d240ce0444eb89a658
 EBUILD eclipse-sdk-3.2.1-r2.ebuild 12774 RMD160 432060d99495abfb5ecdc8bf23820a0968a79e85 SHA1 33e27e840c2fb09318afe82c765e2446c1e50381 SHA256 e6948af605a48f152698a772f3f5f1be388fdb9410a51f9e70b742495cb20cd4
-EBUILD eclipse-sdk-3.3.1.1.ebuild 12192 RMD160 b9c2bc3239497d22f85f9773d8d13ae3958a540a SHA1 826b41e2f78ffc937272523e797dd4a48514f537 SHA256 47eca2d0d4e6c53f522413043a203a10adb4ad8f80231141852f07f910d0dc88
+EBUILD eclipse-sdk-3.3.1.1.ebuild 12040 RMD160 cd47697f034b31ed2293cc3d80ae577f6c5b8cfe SHA1 b7303e4724c2a83be7b7b2752b938af4cae1757e SHA256 16c32b860d3df396f5b6b46acc6bb13c5c21c6cb4ffd9229ce002541f9e58245
 MISC ChangeLog 26931 RMD160 d575002fdb8dfe96aebd69d93da6b6eebd262f94 SHA1 8efe9da39ef35693c2d5e5fd645a28c53528c658 SHA256 e7d30c9f110a5d14bc8d42925243ef61efd357bf463f7289f78e7e3767fe276f
 MISC metadata.xml 800 RMD160 f97cc4ac78898369a7706331bb14bc838519cf21 SHA1 21cd52a15acb6510aa3b955f78fb28a73cf58234 SHA256 76e243573c28c3d705f54745cfbcedd85dae3233b6ed00e2f81a61ac9caeeeaa

diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.3.1.1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.3.1.1.ebuild
index c5fc953c00ffe694b55ca66125354688a5035d85..769ba000c590dd9bdeda0d61420b0d85efab92bd 100644 (file)
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.3.1.1.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.3.1.1.ebuild
@@ -1,9 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.3.1.1.ebuild,v 1.3 2008/02/06 19:58:09 caster Exp $
-
-# Notes: This is a preliminary ebuild of Eclipse-3.3
-# It was based on the initial ebuild in the gcj-overlay, so much of the credit goes out to geki.
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eclipse-sdk/eclipse-sdk-3.3.1.1.ebuild,v 1.4 2008/02/24 18:45:49 elvanor Exp $
 
 # Tomcat is almost no longer needed in 3.3 and removed in 3.4.
 # See bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=173692
@@ -62,7 +59,7 @@ CDEPEND=">=dev-java/ant-eclipse-ecj-3.3
 RDEPEND=">=virtual/jre-1.5
        ${CDEPEND}"
 
-DEPEND="=virtual/jdk-1.5*
+DEPEND=">=virtual/jdk-1.5
        sys-apps/findutils
        dev-java/cldc-api:1.1
        app-arch/unzip
@@ -82,7 +79,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-       unpack "${A}"
+       unpack ${A}
        patch-apply
        remove-bundled-stuff