Version bump and fix for #84296.

Package-Manager: portage-2.0.51.22-r1

7 files changed, 67 insertions, 39 deletions

diff --git a/dev-util/omake/ChangeLog b/dev-util/omake/ChangeLog
index 36a0c79af008..cfbeeea063c8 100644
--- a/dev-util/omake/ChangeLog
+++ b/dev-util/omake/ChangeLog
@@ -1,6 +1,12 @@
 # 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.5 2005/02/17 20:05:20 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/omake/ChangeLog,v 1.6 2005/09/21 18:48:01 mattam Exp $
+
+*omake-0.9.6.5 (21 Sep 2005)
+
+  21 Sep 2005; Matthieu Sozeau <mattam@gentoo.org> +files/omake-config,
+  -omake-0.9.4.ebuild, +omake-0.9.6.5.ebuild:
+  Version bump, also fix bug #84296.
 
   17 Feb 2005; Matthieu Sozeau <mattam@gentoo.org> :
   Stable on x86, ppc, with downgraded readline dependency.
diff --git a/dev-util/omake/Manifest b/dev-util/omake/Manifest
index e824de4e1d0a..1af7a88ffb6d 100644
--- a/dev-util/omake/Manifest
+++ b/dev-util/omake/Manifest
@@ -1,4 +1,5 @@
-MD5 b9dc05167ed5e780f61dc6961e8b73be omake-0.9.4.ebuild 902
-MD5 c66bac1c5fe3867e04669d414527276e ChangeLog 1024
+MD5 324dd4be28ebfc00a0c7ddc2358f3cd6 omake-0.9.6.5.ebuild 1200
+MD5 f4aed727fd2c3cc9e51a927415723c62 ChangeLog 1210
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
-MD5 b1d686463a3d31d6d3804f7423b030c0 files/digest-omake-0.9.4 66
+MD5 f57838a30c2e28dd3202a3413dc4ba50 files/digest-omake-0.9.6.5 68
+MD5 dec5a22685091ba9a0ca54e269314e48 files/omake-config 161
diff --git a/dev-util/omake/files/digest-omake-0.9.4 b/dev-util/omake/files/digest-omake-0.9.4
deleted file mode 100644
index 55f64befc66d..000000000000
--- a/dev-util/omake/files/digest-omake-0.9.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a12913d04184bcf88b0e13e08bbb1ed1 omake-0.9.4-2.tar.gz 1360631
diff --git a/dev-util/omake/files/digest-omake-0.9.6.5 b/dev-util/omake/files/digest-omake-0.9.6.5
new file mode 100644
index 000000000000..8c8d822715f4
--- /dev/null
+++ b/dev-util/omake/files/digest-omake-0.9.6.5
@@ -0,0 +1 @@
+MD5 3750e2d6a02817d3684b94aa70db5363 omake-0.9.6.5-2.tar.gz 1904570
diff --git a/dev-util/omake/files/omake-config b/dev-util/omake/files/omake-config
new file mode 100644
index 000000000000..82b1a646c920
--- /dev/null
+++ b/dev-util/omake/files/omake-config
@@ -0,0 +1,8 @@
+PREFIX = $'/usr'
+BINDIR = $(PREFIX)/bin
+LIBDIR = $(PREFIX)/lib
+MANDIR = $(PREFIX)/man
+CC = gcc
+NATIVE_ENABLED = true
+BYTE_ENABLED = false
+NATIVE_PROFILE = false
diff --git a/dev-util/omake/omake-0.9.4.ebuild b/dev-util/omake/omake-0.9.4.ebuild
deleted file mode 100644
index 1c92ade84100..000000000000
--- a/dev-util/omake/omake-0.9.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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.4.ebuild,v 1.2 2005/02/17 20:05:20 mattam Exp $
-
-EXTRAPV="-2"
-DESCRIPTION="Make replacement"
-HOMEPAGE="http://omake.metaprl.org/"
-SRC_URI="http://omake.metaprl.org/downloads/${P}${EXTRAPV}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="x86 ppc ~amd64"
-IUSE="fam ncurses readline"
-DEPEND=">=dev-lang/ocaml-3.0.8
-	fam? ( >=app-admin/fam-2.7.0 )
-	ncurses? ( >=sys-libs/ncurses-5.3 )
-	readline? ( >=sys-libs/readline-4.3 )"
-
-src_compile() {
-	./configure \
-		`use_with ncurses` \
-		`use_with readline` \
-		`use_with fam` \
-		--prefix=/usr \
-		--mandir=/usr/share/man || die "./configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	make libdir=${D}/usr/lib \
-		mandir=${D}/usr/share/man \
-		bindir=${D}/usr/bin \
-		install || die
-}
diff --git a/dev-util/omake/omake-0.9.6.5.ebuild b/dev-util/omake/omake-0.9.6.5.ebuild
new file mode 100644
index 000000000000..61f86d2303a3
--- /dev/null
+++ b/dev-util/omake/omake-0.9.6.5.ebuild
@@ -0,0 +1,47 @@
+# 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 $
+
+EXTRAPV="-2"
+DESCRIPTION="Make replacement"
+HOMEPAGE="http://omake.metaprl.org/"
+SRC_URI="http://omake.metaprl.org/downloads/${P}${EXTRAPV}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="x86 ppc ~amd64"
+IUSE="fam readline"
+DEPEND=">=dev-lang/ocaml-3.0.8
+	>=sys-libs/ncurses-5.3
+	fam? ( virtual/fam )
+	readline? ( >=sys-libs/readline-4.3 )"
+
+use_boolean() {
+	if use $1; then
+		echo "true"
+	else
+		echo "false"
+	fi
+}
+
+
+src_compile() {
+	make boot
+
+	cat ${FILESDIR}/omake-config > .config
+	echo "CFLAGS = " ${CFLAGS} > .config
+	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= src/main/omake --dotomake .omake \
+		--force-dotomake -j2 -S --progress all doc \
+		|| die "omake failed"
+}
+
+src_install() {
+	INSTALL_ROOT=${D} OMAKEFLAGS= src/main/omake \
+		--dotomake .omake --force-dotomake -j2 install
+}