Install binaries into Mozart bin dir.

Package-Manager: portage-2.1.4.4

4 files changed, 140 insertions, 3 deletions

diff --git a/dev-lang/mozart-stdlib/ChangeLog b/dev-lang/mozart-stdlib/ChangeLog
index 1a3070490ff3..a9210091d3a4 100644
--- a/dev-lang/mozart-stdlib/ChangeLog
+++ b/dev-lang/mozart-stdlib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/mozart-stdlib
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart-stdlib/ChangeLog,v 1.7 2007/11/16 19:50:38 nixnut Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart-stdlib/ChangeLog,v 1.8 2008/02/23 00:09:23 keri Exp $
+
+*mozart-stdlib-1.3.2-r1 (23 Feb 2008)
+
+  23 Feb 2008; keri <keri@gentoo.org>
+  +files/mozart-stdlib-1.3.2-r1-ozmake.patch,
+  +mozart-stdlib-1.3.2-r1.ebuild:
+  Install binaries into Mozart bin dir.
 
   16 Nov 2007; nixnut <nixnut@gentoo.org> mozart-stdlib-1.3.2.ebuild:
   Stable on ppc wrt bug 199091
diff --git a/dev-lang/mozart-stdlib/Manifest b/dev-lang/mozart-stdlib/Manifest
index 4c166b0b7071..661cd9972546 100644
--- a/dev-lang/mozart-stdlib/Manifest
+++ b/dev-lang/mozart-stdlib/Manifest
@@ -1,6 +1,8 @@
 AUX mozart-stdlib-1.3.2-doc.patch 5894 RMD160 9563f12e64a3db76ab227c519e8b176b5e44f827 SHA1 c7a56b615fb690eb520eb85402f8cc034ff198c5 SHA256 a128c25e1f1a9f7810f1afb64176a3e10e7ea80920c2c0f76bc4a8ae7a86d806
 AUX mozart-stdlib-1.3.2-ozmake.patch 3674 RMD160 15d8b19da6c5107dbeb3dc407f8b0aea84eb2050 SHA1 f6ba3828d7c2a4173741227aa66d6b804792d729 SHA256 69bf462c819a68ecab085f56d7db807b20b456683a512a57ffb5717c23e81d3b
+AUX mozart-stdlib-1.3.2-r1-ozmake.patch 3690 RMD160 9d7c3db8d294822d661dbc5cd10ec4da0b861bf8 SHA1 4d7e58437cb05165899947504907e7c3cee9d8c6 SHA256 61d6c64a8e6e83c47ae64cc2e3098347a190c7bb677b8ad7da09db15ccfcd080
 DIST mozart-1.3.2.20060615-std.tar.gz 1203535 RMD160 e2d5de149ad97f7e5b0cbc87df06893b6b13bd68 SHA1 2d82a1300bd7fc50a0b8f2735fdf425129f24cba SHA256 d1166a95ec71091bf9b8af28d9350269e73b0d55e8b7e2ab619fafafa6f68870
+EBUILD mozart-stdlib-1.3.2-r1.ebuild 1080 RMD160 c3b24814f5c3241a0adba2273620dc974149de30 SHA1 f2b4b15a45cb6f925dd3c4f405e67b55ee16b2dc SHA256 c5bcd62e4acc7e85c706a39054b0b9bb91bfd7de3b8dd2a0debaf588d58da061
 EBUILD mozart-stdlib-1.3.2.ebuild 1050 RMD160 393298c069490a306f6e4480c89f284b6014ec0d SHA1 9c785c6a0ebba627c035907f48205e2250047026 SHA256 1a0e71d04049b45e15e0fc20201f781e97a350829346c2086dd44e80dffcfcd7
-MISC ChangeLog 1033 RMD160 d310a73b278c20f194f63a942bbd61857681d305 SHA1 fd827f9f3334b8f0eb5a71c48c5c50ae6c00aec4 SHA256 9995d1f3dc1c2a2329d730905521bb62ab17b8c90fcc58a8077b9c7bbe80861c
+MISC ChangeLog 1229 RMD160 26d3f0f103172bdbbe467572f58aded47a36fa9a SHA1 e3f3e2bd9c9dfb84bbe80546436f04a5043b2c0d SHA256 ee521f29999b1e8712ae6519159d3d27f9049fa70c76d79077824f86f5365428
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
diff --git a/dev-lang/mozart-stdlib/files/mozart-stdlib-1.3.2-r1-ozmake.patch b/dev-lang/mozart-stdlib/files/mozart-stdlib-1.3.2-r1-ozmake.patch
new file mode 100644
index 000000000000..12a621390ebd
--- /dev/null
+++ b/dev-lang/mozart-stdlib/files/mozart-stdlib-1.3.2-r1-ozmake.patch
@@ -0,0 +1,78 @@
+diff -ur mozart-1.3.2.20060615-std.orig/Makefile.in mozart-1.3.2.20060615-std/Makefile.in
+--- mozart-1.3.2.20060615-std.orig/Makefile.in	2004-05-19 02:22:05.000000000 +1200
++++ mozart-1.3.2.20060615-std/Makefile.in	2007-02-17 11:12:09.000000000 +1300
+@@ -12,6 +12,7 @@
+ NOTDIRSRCDIR	= $(notdir $(SRCDIR))
+ BUILDDATE       = $(shell date '+%Y%m%d')
+ VERSION         = $(shell $(OZTOOL) version)
++BINDIR		= $(PREFIX)/bin
+ 
+ ifeq ($(PLATFORM),win32-i486)
+ OZEMULATOR	= $(shell $(CYGPATH) $(PREFIX)/platform/win32-i486/emulator.dll)
+@@ -22,11 +23,14 @@
+ 	$(OZENGINE) ozmake/ozmake.ozf --prefix=$(CYG_PREFIX) --srcdir=$(CYG_SRCDIR)
+ 
+ build.ozmake:
+-	cd ozmake && $(MAKE) ozmake.ozf
++	cd ozmake && $(MAKE) ozmake
+ 
+ install: all
+ 	$(OZENGINE) ozmake/ozmake.ozf --prefix=$(CYG_PREFIX) --srcdir=$(CYG_SRCDIR) --install --nosavedb
+ 	$(OZENGINE) ozmake/ozmake.ozf --prefix=$(CYG_PREFIX) --srcdir=$(CYG_SRCDIR)/ozmake --builddir=$(CYG_BUILDDIR_OZMAKE) --install --nosavedb
++	mkdir -p $(BINDIR)
++	cp ozmake/ozmake $(BINDIR)
++	chmod +x $(BINDIR)/ozmake
+ 
+ export CLEANDIR
+ 
+diff -ur mozart-1.3.2.20060615-std.orig/ozmake/Attribs.oz mozart-1.3.2.20060615-std/ozmake/Attribs.oz
+--- mozart-1.3.2.20060615-std.orig/ozmake/Attribs.oz	2004-05-15 03:21:43.000000000 +1200
++++ mozart-1.3.2.20060615-std/ozmake/Attribs.oz	2007-02-17 09:29:47.000000000 +1300
+@@ -458,7 +458,7 @@
+       end
+ 
+       meth get_oz_home($) {Path.expand {Property.get 'oz.home'}} end
+-      meth get_oz_bindir($) {Path.resolve Attribs,get_oz_home($) 'bin'} end
++      meth get_oz_bindir($) {Path.resolve '/usr/lib/mozart' 'bin'} end
+       meth get_oz_engine($)
+ 	 if @OzEngine==unit then
+ 	    P={Path.resolveAtom Attribs,get_oz_bindir($) 'ozengine.exe'}
+diff -ur mozart-1.3.2.20060615-std.orig/ozmake/Makefile.in mozart-1.3.2.20060615-std/ozmake/Makefile.in
+--- mozart-1.3.2.20060615-std.orig/ozmake/Makefile.in	2004-04-01 00:52:55.000000000 +1200
++++ mozart-1.3.2.20060615-std/ozmake/Makefile.in	2007-02-17 10:55:26.000000000 +1300
+@@ -37,8 +37,8 @@
+ 
+ # these additional 2 lines makes it possible to build in a directory
+ # different from the source directory
+-OZLOAD = prefix=$(CYGSRCDIR)=$(CYGBUILDDIR)$(OZLOADSEP)root=$(CYGBUILDDIR)$(OZLOADSEP)root=$(CYGSRCDIR)$(OZLOADSEP)cache=~/.oz/cache$(OZLOADSEP)cache=$(OZHOME)/cache
+-export OZLOAD
++# OZLOAD = prefix=$(CYGSRCDIR)=$(CYGBUILDDIR)$(OZLOADSEP)root=$(CYGBUILDDIR)$(OZLOADSEP)root=$(CYGSRCDIR)$(OZLOADSEP)cache=~/.oz/cache$(OZLOADSEP)cache=$(OZHOME)/cache
++# export OZLOAD
+ 
+ XSLTPROC	= @VAR_XSLTPROC@
+ LYNX		= @VAR_LYNX@
+diff -ur mozart-1.3.2.20060615-std.orig/ozmake/Makefile.vars mozart-1.3.2.20060615-std/ozmake/Makefile.vars
+--- mozart-1.3.2.20060615-std.orig/ozmake/Makefile.vars	2005-06-05 01:47:45.000000000 +1200
++++ mozart-1.3.2.20060615-std/ozmake/Makefile.vars	2007-02-17 08:42:20.000000000 +1300
+@@ -13,6 +13,6 @@
+ 	MakeGUI.oz Fixes.oz DatabaseLib.oz CHANGES Config.oz Mogul.oz \
+ 	Pickler.oz ExecutorFast.oz Depends.oz Requires.oz
+ PKG_INSTALLS	= ozmake.ozf
+-PKG_INSTALLS_BIN= ozmake ozmake.win
++PKG_INSTALLS_BIN= ozmake
+ PKG_UPDATE	= tgz tarz
+ PKG_INSTALLS_DOC= index.html CHANGES
+diff -ur mozart-1.3.2.20060615-std.orig/ozmake/makefile.oz mozart-1.3.2.20060615-std/ozmake/makefile.oz
+--- mozart-1.3.2.20060615-std.orig/ozmake/makefile.oz	2004-05-22 09:37:24.000000000 +1200
++++ mozart-1.3.2.20060615-std/ozmake/makefile.oz	2007-02-17 12:15:46.000000000 +1300
+@@ -4,8 +4,8 @@
+    mogul  : 'mogul:/mozart/ozmake'
+    author: 'mogul:/duchier/denys'
+    lib   : ['ozmake.ozf']
+-   bin   : ['ozmake.exe']
+-   doc   : ['index.html' 'CHANGES']
++%   bin   : ['ozmake.exe']
++%   doc   : ['index.html' 'CHANGES']
+    rules :
+       o(
+ 	 'ozmake.ozf' : ozl('Main.ozf')
diff --git a/dev-lang/mozart-stdlib/mozart-stdlib-1.3.2-r1.ebuild b/dev-lang/mozart-stdlib/mozart-stdlib-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..c1372b45fe84
--- /dev/null
+++ b/dev-lang/mozart-stdlib/mozart-stdlib-1.3.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart-stdlib/mozart-stdlib-1.3.2-r1.ebuild,v 1.1 2008/02/23 00:09:23 keri Exp $
+
+inherit eutils
+
+MY_P="mozart-${PV}.20060615-std"
+
+DESCRIPTION="The Mozart Standard Library"
+HOMEPAGE="http://www.mozart-oz.org/"
+SRC_URI="http://www.mozart-oz.org/download/mozart-ftp/store/1.3.2-2006-06-15-tar/mozart-1.3.2.20060615-std.tar.gz"
+LICENSE="Mozart"
+
+SLOT="0"
+KEYWORDS="~ppc ~sparc ~x86"
+IUSE="doc"
+
+DEPEND="dev-lang/mozart"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PF}-ozmake.patch
+	epatch "${FILESDIR}"/${P}-doc.patch
+}
+
+src_compile() {
+	cd "${S}"
+
+	econf || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake \
+		PREFIX="${D}"/usr/lib/mozart \
+		install || die "emake install failed"
+
+	dosym /usr/lib/mozart/bin/ozmake /usr/bin/ozmake
+
+	if use doc ; then
+		dohtml -r *
+	fi
+
+	doman ozmake/ozmake.1
+	dodoc ozmake/{CHANGES,DESIGN,NOTES,README}
+}