Revision bump to disable AOT compilation. AOT only works on x86, and is still experimental with mono.

(Portage version: 2.0.51.16)

6 files changed, 28 insertions, 38 deletions

diff --git a/dev-dotnet/nemerle/ChangeLog b/dev-dotnet/nemerle/ChangeLog
index 21ae2eec79b7..214ea80d548c 100644
--- a/dev-dotnet/nemerle/ChangeLog
+++ b/dev-dotnet/nemerle/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-dotnet/nemerle
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/nemerle/ChangeLog,v 1.4 2005/01/01 17:49:29 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/nemerle/ChangeLog,v 1.5 2005/02/09 00:58:58 latexer Exp $
+
+*nemerle-0.2.1-r2 (08 Feb 2005)
+
+  08 Feb 2005; Peter Johanson <latexer@gentoo.org> -nemerle-0.1.4.ebuild,
+  +nemerle-0.2.1-r2.ebuild, -nemerle-0.2.1.ebuild:
+  Revision bump to disable AOT compilation. AOT only works on x86, and is still
+  experimental with mono. Remove some older versions as well.
 
 *nemerle-0.2.1-r1 (10 Oct 2004)
 
diff --git a/dev-dotnet/nemerle/Manifest b/dev-dotnet/nemerle/Manifest
index a92e88eb2d08..330bce84b6a8 100644
--- a/dev-dotnet/nemerle/Manifest
+++ b/dev-dotnet/nemerle/Manifest
@@ -1,9 +1,11 @@
-MD5 56383798cc6cecb3cb7cde9ca7ff5597 ChangeLog 805
-MD5 a60fdfbce7c7cfc52187ff86a7f8bbf8 metadata.xml 222
+MD5 db150f986bca784017eafbf81ccd11f9 nemerle-0.2.1-r2.ebuild 1056
 MD5 c14ae04788790d8670a3dd0b0ea7eb12 nemerle-0.1.4.ebuild 796
-MD5 7d41c20aa0bcb0a843180447beee2fce nemerle-0.2.1.ebuild 795
 MD5 2d8911a60dbb70bcaba5bfbf65d7cf70 nemerle-0.2.1-r1.ebuild 883
-MD5 22cdd4d0fb55eaf9c00f70ddc8b54b73 files/digest-nemerle-0.1.4 66
-MD5 4274209a3c36a732036a5d15656c1e57 files/digest-nemerle-0.2.1 66
+MD5 7d41c20aa0bcb0a843180447beee2fce nemerle-0.2.1.ebuild 795
+MD5 56383798cc6cecb3cb7cde9ca7ff5597 ChangeLog 805
+MD5 a60fdfbce7c7cfc52187ff86a7f8bbf8 metadata.xml 222
 MD5 4274209a3c36a732036a5d15656c1e57 files/digest-nemerle-0.2.1-r1 66
+MD5 4274209a3c36a732036a5d15656c1e57 files/digest-nemerle-0.2.1-r2 66
 MD5 4ec77da51ae7d4412fcdb9f276f45b94 files/nemerle-0.2.1-ncc-fix.diff 1172
+MD5 22cdd4d0fb55eaf9c00f70ddc8b54b73 files/digest-nemerle-0.1.4 66
+MD5 4274209a3c36a732036a5d15656c1e57 files/digest-nemerle-0.2.1 66
diff --git a/dev-dotnet/nemerle/files/digest-nemerle-0.1.4 b/dev-dotnet/nemerle/files/digest-nemerle-0.1.4
deleted file mode 100644
index 754c02eaf854..000000000000
--- a/dev-dotnet/nemerle/files/digest-nemerle-0.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 82b12ffa18cb1df327afe1af850d6b3d nemerle-0.1.4.tar.gz 1002393
diff --git a/dev-dotnet/nemerle/files/digest-nemerle-0.2.1 b/dev-dotnet/nemerle/files/digest-nemerle-0.2.1-r2
index 667fea83c7c5..667fea83c7c5 100644
--- a/dev-dotnet/nemerle/files/digest-nemerle-0.2.1
+++ b/dev-dotnet/nemerle/files/digest-nemerle-0.2.1-r2
diff --git a/dev-dotnet/nemerle/nemerle-0.1.4.ebuild b/dev-dotnet/nemerle/nemerle-0.1.4.ebuild
deleted file mode 100644
index 81f60ddcb2af..000000000000
--- a/dev-dotnet/nemerle/nemerle-0.1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/nemerle/nemerle-0.1.4.ebuild,v 1.2 2005/01/01 17:49:29 eradicator Exp $
-
-inherit mono
-
-DESCRIPTION="A hybrid programming language for the .NET platform"
-HOMEPAGE="http://www.nemerle.org/"
-SRC_URI="http://www.nemerle.org/download/${P}.tar.gz"
-
-LICENSE="nemerle"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND=">=dev-dotnet/mono-0.31
-		>=dev-lang/python-2.3
-		>=dev-libs/libxml2-2.6.4"
-
-src_compile() {
-	./configure --net-engine=/usr/bin/mono \
-			--prefix=/usr \
-			--mandir=/usr/share/man/man1 || die "configure failed!"
-	make || die "make failed!"
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
-}
diff --git a/dev-dotnet/nemerle/nemerle-0.2.1.ebuild b/dev-dotnet/nemerle/nemerle-0.2.1-r2.ebuild
index 66cdc8d36879..01684a694e3b 100644
--- a/dev-dotnet/nemerle/nemerle-0.2.1.ebuild
+++ b/dev-dotnet/nemerle/nemerle-0.2.1-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/nemerle/nemerle-0.2.1.ebuild,v 1.2 2005/01/01 17:49:29 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/nemerle/nemerle-0.2.1-r2.ebuild,v 1.1 2005/02/09 00:58:58 latexer Exp $
 
-inherit mono
+inherit mono eutils
 
 DESCRIPTION="A hybrid programming language for the .NET platform"
 HOMEPAGE="http://www.nemerle.org/"
@@ -16,6 +16,17 @@ DEPEND=">=dev-dotnet/mono-1.0
 		>=dev-lang/python-2.3
 		>=dev-libs/libxml2-2.6.4"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-ncc-fix.diff
+
+	# Fixes to not do AOT stuff. Mono's AOT is still in
+	# testing, and only works on x86
+	sed -i "s:\(.*\)(NGEN\(.*\):#\1(NGEN\2:" \
+		${S}/ncc/Makefile || die "sed failed"
+}
+
 src_compile() {
 	./configure --net-engine=/usr/bin/mono \
 			--prefix=/usr \