From: Matthieu Sozeau <mattam@gentoo.org>
Date: Thu, 3 Nov 2005 16:13:55 +0000 (+0000)
Subject: Update for incoming ocaml-3.09.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1a902e4c897446a8f2b744cd79d359579d50285c;p=gentoo.git

Update for incoming ocaml-3.09.
Package-Manager: portage-2.0.51.22-r1
---

diff --git a/dev-util/omake/ChangeLog b/dev-util/omake/ChangeLog
index cfbeeea063c8..4d63078367dd 100644
--- a/dev-util/omake/ChangeLog
+++ b/dev-util/omake/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/omake
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/omake/ChangeLog,v 1.6 2005/09/21 18:48:01 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/omake/ChangeLog,v 1.7 2005/11/03 16:13:55 mattam Exp $
+
+  03 Nov 2005; Matthieu Sozeau <mattam@gentoo.org> omake-0.9.6.5.ebuild:
+  Compile without errors with new ocaml version.
 
 *omake-0.9.6.5 (21 Sep 2005)
 
diff --git a/dev-util/omake/Manifest b/dev-util/omake/Manifest
index 1af7a88ffb6d..adf167dc21fc 100644
--- a/dev-util/omake/Manifest
+++ b/dev-util/omake/Manifest
@@ -1,5 +1,5 @@
-MD5 324dd4be28ebfc00a0c7ddc2358f3cd6 omake-0.9.6.5.ebuild 1200
-MD5 f4aed727fd2c3cc9e51a927415723c62 ChangeLog 1210
+MD5 622df6180f00c97250b428e487aa1db5 omake-0.9.6.5.ebuild 1321
+MD5 1ff2e50dd720f101999be8510328d01d ChangeLog 1333
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
 MD5 f57838a30c2e28dd3202a3413dc4ba50 files/digest-omake-0.9.6.5 68
 MD5 dec5a22685091ba9a0ca54e269314e48 files/omake-config 161
diff --git a/dev-util/omake/omake-0.9.6.5.ebuild b/dev-util/omake/omake-0.9.6.5.ebuild
index 61f86d2303a3..cc6bd6c6c329 100644
--- a/dev-util/omake/omake-0.9.6.5.ebuild
+++ b/dev-util/omake/omake-0.9.6.5.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/omake/omake-0.9.6.5.ebuild,v 1.1 2005/09/21 18:48:01 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/omake/omake-0.9.6.5.ebuild,v 1.2 2005/11/03 16:13:55 mattam Exp $
+
+inherit eutils
 
 EXTRAPV="-2"
 DESCRIPTION="Make replacement"
@@ -24,6 +26,11 @@ use_boolean() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i -e "s/Ae/Aexyz/g" OMakefile
+}
 
 src_compile() {
 	make boot
@@ -33,7 +40,7 @@ src_compile() {
 	echo "FAM_ENABLED = " $(use_boolean fam) > .config
 	echo "READLINE_ENABLED = " $(use_boolean readline) > .config
 
-	PREFIX=/usr	OMAKEFLAGS= ./omake-boot --dotomake .omake --force-dotomake -j2 -S --progress main
+	PREFIX=/usr	OMAKEFLAGS= ./omake-boot --dotomake .omake --force-dotomake -j2 -S --progress main || die "Bootstrapping failed"
 
 
 	PREFIX=/usr OMAKEFLAGS= src/main/omake --dotomake .omake \