dev-util/eclipse-sdk: Fixed an issue where the preparation stage could fail if

no slot (2) version of sat4j-* was installed ; The ebuilds did not correctly
link in slot (2.3), which they now do.

4 files changed, 19 insertions, 9 deletions

diff --git a/dev-util/eclipse-sdk/ChangeLog b/dev-util/eclipse-sdk/ChangeLog
index 99dfccd..d98b41b 100644
--- a/dev-util/eclipse-sdk/ChangeLog
+++ b/dev-util/eclipse-sdk/ChangeLog
@@ -2,6 +2,16 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*eclipse-sdk-3.7.0-r5.ebuild (05 Jan 2012)
+*eclipse-sdk-3.7.1-r2.ebuild (05 Jan 2012)
+  02.Jan.2012 Sven Eden <sven.eden@gmx.de> +eclipse-sdk-3.7.0-r5.ebuild,
+  +eclise-sdk-3.7.1-r2.ebuild : The previous ebuilds did not specify the
+  correct versions for sat4j, the prepare stage still searched for slot
+  2 instead of 2.3. Thanks again to Robin Kauffman <robink@creosotehill.org>
+  and Jānis Iraids <jiraids@inbox.lv> for reporting this issue.
+  -eclipse-sdk-3.7.0-r4.ebuild, -eclipse-sdk-3.7.1-r1.ebuild: Remove faulty
+  ebuilds.
+
 *eclipse-sdk-3.7.0-r4.ebuild (02 Jan 2012)
 *eclipse-sdk-3.7.1-r1.ebuild (02 Jan 2012)
   02.Jan.2012 Sven Eden <sven.eden@gmx.de> +eclipse-sdk-3.7.0-r4.ebuild,
diff --git a/dev-util/eclipse-sdk/Manifest b/dev-util/eclipse-sdk/Manifest
index 8df4d31..c071110 100644
--- a/dev-util/eclipse-sdk/Manifest
+++ b/dev-util/eclipse-sdk/Manifest
@@ -7,6 +7,6 @@ DIST eclipse-3.7.0-src.tar.bz2 67181722 RMD160 2863a0130c5b75c08cf0c1f1977be894a
 DIST eclipse-3.7.1-src.tar.bz2 69243059 RMD160 a9213a5a9577722e22c82296228230c9a5c0ebbc SHA1 1c3d20ed4dab43a741606f4785bea895e52dc6cf SHA256 f3a87ff4408aeadc6823eb849330527df07d5706d6456af282170bb9bbbd31d6
 DIST eclipse-build-5791c48513b4207ab1eec1e00bed4b2186f9aad5.tar.xz 276668 RMD160 346bcdd9e8d44ae865ae80380c54b7fd05a7dd04 SHA1 cb806a93b3f237aec2913d6f8b9068aeb1f9320b SHA256 1703ae2b9062e8692a2ab8aa589c91dc42fe90f6e3ba09ea2f69caf91d9b4865
 DIST eclipse-build-9e028fbc74e844e96a6fd944d7d4f68909283a5d.tar.bz2 267292 RMD160 67bb33d75570a066e0c0af22b2e2b6228f2daea5 SHA1 44ff5cacf9b8a955bca74b5c32d0dc4f7017fcce SHA256 38fbf55a846ab5be2215e67c5a8855aacc1cf26a7d66d0307dd01c26ea56333c
-EBUILD eclipse-sdk-3.7.0-r4.ebuild 14353 RMD160 17da0981da5ab88885a3df9fdc79351339508a57 SHA1 925e5f18a50784e1aa62cfca04c492bb00995217 SHA256 aaf860aace179b2612a74483e22456f71a001522f7a4dedb2bb9dd225558c7d1
-EBUILD eclipse-sdk-3.7.1-r1.ebuild 14688 RMD160 1584410fbcafeef0316932064f3613805e68235b SHA1 9020322da1e09833147b3b0f463632b91cda63e3 SHA256 84656d1b91a187e33875cb3586d83208ed580304c4577d9a018a78835a267656
-MISC ChangeLog 1958 RMD160 ec9b07929372b31f6898c50df3dab49b770838cc SHA1 5c946bbdb7dcb9112e221d76ff030c60bea5d284 SHA256 aba9b47d5a453236dcd192476a778c7664c51cd2cbfcf91b00bf2d609ac08d5c
+EBUILD eclipse-sdk-3.7.0-r5.ebuild 14357 RMD160 59bccb0d80a254cb4a5524076367371b800fda06 SHA1 b8fe266985930c934cae9e298218ed3978991738 SHA256 8c1ec7b53b001a8886f0480eccfccfc47d8eaecb8049e827e7d6a7320428afa9
+EBUILD eclipse-sdk-3.7.1-r2.ebuild 14696 RMD160 b661cef037719748df71283808166f4eb5ab0210 SHA1 c4b01006e10a654592514eead2aeb360272df815 SHA256 abd1ad324b42386880d97102f4bf1940c1ddcfc1a90dd0acdb4a1bc159b024ef
+MISC ChangeLog 2492 RMD160 85be23f4ff4edf6bae0d4265043df08ffed911b9 SHA1 e4762616fa5c5ce1bd3e84f6b97a2f2258221667 SHA256 bcef4e03f876bb43f885e9cbc37f387800f1c22749c1dec39385448489462ad5
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.7.0-r4.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.7.0-r5.ebuild
index 6945d78..56377be 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.7.0-r4.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.7.0-r5.ebuild
@@ -96,8 +96,8 @@ OSGI_DEPENDENCIES=(
 	'org.mortbay.jetty.server jetty-6.1.26 jetty-6 jetty'
 	'org.mortbay.jetty.util jetty-util-6.1.26 jetty-6 jetty-util'
 	'org.objectweb.asm - asm-3'
-	'org.sat4j.core org.sat4j.core sat4j-core-2'
-	'org.sat4j.pb org.sat4j.pb sat4j-pseudo-2'
+	'org.sat4j.core org.sat4j.core sat4j-core-2.3'
+	'org.sat4j.pb org.sat4j.pb sat4j-pseudo-2.3'
 )
 NONOSGI_DEPENDENCIES=(
 	'org.apache.ant ant-antlr'
diff --git a/dev-util/eclipse-sdk/eclipse-sdk-3.7.1-r1.ebuild b/dev-util/eclipse-sdk/eclipse-sdk-3.7.1-r2.ebuild
index e1419f0..8a812bc 100644
--- a/dev-util/eclipse-sdk/eclipse-sdk-3.7.1-r1.ebuild
+++ b/dev-util/eclipse-sdk/eclipse-sdk-3.7.1-r2.ebuild
@@ -104,10 +104,10 @@ OSGI_DEPENDENCIES=(
 	'org.mortbay.jetty.util - jetty-6 jetty-util'
 #	'org.mortbay.jetty.util jetty-util-6.1.26 jetty-6 jetty-util'
 	'org.objectweb.asm - asm-3'
-	'org.sat4j.core - sat4j-core-2'
-#	'org.sat4j.core org.sat4j.core sat4j-core-2'
-	'org.sat4j.pb - sat4j-pseudo-2'
-#	'org.sat4j.pb org.sat4j.pb sat4j-pseudo-2'
+	'org.sat4j.core - sat4j-core-2.3'
+#	'org.sat4j.core org.sat4j.core sat4j-core-2.3'
+	'org.sat4j.pb - sat4j-pseudo-2.3'
+#	'org.sat4j.pb org.sat4j.pb sat4j-pseudo-2.3'
 )
 NONOSGI_DEPENDENCIES=(
 	'org.apache.ant ant-antlr'