dev-dotnet/ikvm: switching from ecj to javac (bug #183526)

Package-Manager: portage-2.1.2.7

3 files changed, 23 insertions, 14 deletions

diff --git a/dev-dotnet/ikvm/ChangeLog b/dev-dotnet/ikvm/ChangeLog
index 532024118d80..4902059fa15b 100644
--- a/dev-dotnet/ikvm/ChangeLog
+++ b/dev-dotnet/ikvm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-dotnet/ikvm
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ChangeLog,v 1.14 2007/06/26 23:53:10 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ChangeLog,v 1.15 2007/06/29 02:48:17 jurek Exp $
+
+  29 Jun 2007; Jurek Bartuszek <jurek@gentoo.org> ikvm-0.34.0.2.ebuild:
+  Switching from ecj to javac (bug #183526)
 
 *ikvm-0.34.0.2 (26 Jun 2007)
 
diff --git a/dev-dotnet/ikvm/Manifest b/dev-dotnet/ikvm/Manifest
index d0719d357804..e4c5e9a1f714 100644
--- a/dev-dotnet/ikvm/Manifest
+++ b/dev-dotnet/ikvm/Manifest
@@ -29,18 +29,18 @@ EBUILD ikvm-0.20.0.0.ebuild 1185 RMD160 750e57d4c60781f02494e5c290bef71d64508019
 MD5 9d038faa5f63c84a158c4a8159352f5a ikvm-0.20.0.0.ebuild 1185
 RMD160 750e57d4c60781f02494e5c290bef71d64508019 ikvm-0.20.0.0.ebuild 1185
 SHA256 02674491792a2abd7dc4e8f73456db2846690d40921159d07b49c9d64cdbd4d1 ikvm-0.20.0.0.ebuild 1185
-EBUILD ikvm-0.34.0.2.ebuild 1207 RMD160 48768b0130b1430a48ce263b58e50cea345612e8 SHA1 3e50247fb4fdd909661af9be15ce9c6b4a99d5c7 SHA256 64bcbe8697c7b73d192d6048d7bf5f3ed6c103d61d4ae6163f9b29eeb979d3d9
-MD5 0db409bdcb49fc5949244c80fa096053 ikvm-0.34.0.2.ebuild 1207
-RMD160 48768b0130b1430a48ce263b58e50cea345612e8 ikvm-0.34.0.2.ebuild 1207
-SHA256 64bcbe8697c7b73d192d6048d7bf5f3ed6c103d61d4ae6163f9b29eeb979d3d9 ikvm-0.34.0.2.ebuild 1207
+EBUILD ikvm-0.34.0.2.ebuild 1363 RMD160 b6efb36715876507b4d292a440e3f82f610c404e SHA1 44468190290d2114f692fefa176fbed9dc0cc923 SHA256 4d62b62a5588eeab4f29fa2f400384e6c59462b2592f828797524c87ed54d319
+MD5 983717f253cfe2c4d6b84f08b72edf9a ikvm-0.34.0.2.ebuild 1363
+RMD160 b6efb36715876507b4d292a440e3f82f610c404e ikvm-0.34.0.2.ebuild 1363
+SHA256 4d62b62a5588eeab4f29fa2f400384e6c59462b2592f828797524c87ed54d319 ikvm-0.34.0.2.ebuild 1363
 EBUILD ikvm-0.8.0.0.ebuild 680 RMD160 158394ede2a9213966c0b7ca70ec06463411e4a5 SHA1 fb909456a74920aac6c31fb22ea2a5ceffd044a1 SHA256 913db4af4df2fa250127dbbb56580d018d76aa8d539878b92dbf45e682fc10b0
 MD5 bfa566a91fbc602704e628d53e9ad512 ikvm-0.8.0.0.ebuild 680
 RMD160 158394ede2a9213966c0b7ca70ec06463411e4a5 ikvm-0.8.0.0.ebuild 680
 SHA256 913db4af4df2fa250127dbbb56580d018d76aa8d539878b92dbf45e682fc10b0 ikvm-0.8.0.0.ebuild 680
-MISC ChangeLog 2326 RMD160 1b8c280e2152d9093a4efd278b91cc5ae2bb4ad4 SHA1 8ece28c4870c70c1a8612bdf8a75da211189345a SHA256 10f91f9362d7b607603babe74a729667958b6f4b51c0f11f77522812df3a87d7
-MD5 161b0cb144edef4b9020679a24b951d8 ChangeLog 2326
-RMD160 1b8c280e2152d9093a4efd278b91cc5ae2bb4ad4 ChangeLog 2326
-SHA256 10f91f9362d7b607603babe74a729667958b6f4b51c0f11f77522812df3a87d7 ChangeLog 2326
+MISC ChangeLog 2443 RMD160 8a6850bd68e0b0a7b80899eef3c635533769ed0c SHA1 520163659f89b17ea7fda169ab25aa62af580f84 SHA256 8e8c65dd0e6a29acf3e1775cb1dced75c21add44eb02842d7d23b98167839f1a
+MD5 93f82fcf3f15035c034f790d922a8d39 ChangeLog 2443
+RMD160 8a6850bd68e0b0a7b80899eef3c635533769ed0c ChangeLog 2443
+SHA256 8e8c65dd0e6a29acf3e1775cb1dced75c21add44eb02842d7d23b98167839f1a ChangeLog 2443
 MISC metadata.xml 222 RMD160 aafa4baf96cfa37bca8b5af9961b253e8d54deeb SHA1 0adada1945fd52cf6649dbafddd2e4ebd84e3543 SHA256 2291d7f74fb8845472f5527edd49d2004d0626025dfc6622cbe6a8fe22dc846d
 MD5 a60fdfbce7c7cfc52187ff86a7f8bbf8 metadata.xml 222
 RMD160 aafa4baf96cfa37bca8b5af9961b253e8d54deeb metadata.xml 222
diff --git a/dev-dotnet/ikvm/ikvm-0.34.0.2.ebuild b/dev-dotnet/ikvm/ikvm-0.34.0.2.ebuild
index c76e0f18226f..14794b70a33d 100644
--- a/dev-dotnet/ikvm/ikvm-0.34.0.2.ebuild
+++ b/dev-dotnet/ikvm/ikvm-0.34.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ikvm-0.34.0.2.ebuild,v 1.1 2007/06/26 23:53:10 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ikvm-0.34.0.2.ebuild,v 1.2 2007/06/29 02:48:17 jurek Exp $
 
 inherit eutils mono multilib
 
@@ -23,15 +23,20 @@ RDEPEND=">=dev-lang/mono-1.1"
 DEPEND="${RDEPEND}
 		!dev-dotnet/ikvm-bin
 		>=dev-dotnet/nant-0.85
-		=dev-java/eclipse-ecj-3.2*
+		>=virtual/jdk-1.5
 		app-arch/unzip"
 
 src_compile() {
 	# Remove unneccesary binaries
 	rm bin/*.exe
 
-	sed -i -e 's#ecj#/usr/bin/ecj-3.2#' \
-		classpath/classpath.build
+	# We use javac instead of ecj because of
+	# memory related problems (see bug #183526)
+	sed -i \
+		-e 's#ecj#javac#' \
+		-e 's#-1.5#-J-mx160M -source 1.5#' \
+		classpath/classpath.build \
+	|| die "sed failed"
 
 	nant -t:mono-1.0 || die "ikvm build failed"
 }
@@ -48,5 +53,6 @@ src_install() {
 	dodir /usr/$(get_libdir)/pkgconfig
 	sed -e "s:@VERSION@:${PV}:" \
 		-e "s:@LIBDIR@:$(get_libdir):" \
-		${FILESDIR}/${PN}.pc.in > ${D}/usr/$(get_libdir)/pkgconfig/${PN}.pc
+		${FILESDIR}/${PN}.pc.in > ${D}/usr/$(get_libdir)/pkgconfig/${PN}.pc \
+	|| die "sed failed"
 }