Respect platform emulator directory in src_install.

Package-Manager: portage-2.1.2-r9

4 files changed, 55 insertions, 10 deletions

diff --git a/dev-lang/mozart/ChangeLog b/dev-lang/mozart/ChangeLog
index 678b8fb0c142..d64e8050e352 100644
--- a/dev-lang/mozart/ChangeLog
+++ b/dev-lang/mozart/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/mozart
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v 1.1 2007/02/14 08:30:49 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v 1.2 2007/02/16 10:01:51 keri Exp $
+
+  16 Feb 2007; keri <keri@gentoo.org> +files/mozart-1.3.2-emubin.patch,
+  mozart-1.3.2.ebuild:
+  Respect platform emulator directory in src_install.
 
 *mozart-1.3.2 (14 Feb 2007)
 
diff --git a/dev-lang/mozart/Manifest b/dev-lang/mozart/Manifest
index 39c06ff51612..bf4b545b14a1 100644
--- a/dev-lang/mozart/Manifest
+++ b/dev-lang/mozart/Manifest
@@ -2,6 +2,10 @@ AUX mozart-1.3.2-contrib.patch 11137 RMD160 37d8909f2ab0472b3a7fa395236a9212beab
 MD5 677df3a8a0994ec5160f23843589d905 files/mozart-1.3.2-contrib.patch 11137
 RMD160 37d8909f2ab0472b3a7fa395236a9212beabb7f5 files/mozart-1.3.2-contrib.patch 11137
 SHA256 2263fe230141bf2396018ec0e0694187b86ac06798dcff69ac840ac72b6cd781 files/mozart-1.3.2-contrib.patch 11137
+AUX mozart-1.3.2-emubin.patch 1471 RMD160 2eddbeaf552856097ced86da21a28d849a74efbd SHA1 4470aec9e2b12aca1fadd56e2de12caefa8aa69d SHA256 6911112a3a0cb62bd63f2e6d7b78e18f5c7dc11215061e0febaae65ef93c87cc
+MD5 46d2e44289992415938c5487a7fa4ec1 files/mozart-1.3.2-emubin.patch 1471
+RMD160 2eddbeaf552856097ced86da21a28d849a74efbd files/mozart-1.3.2-emubin.patch 1471
+SHA256 6911112a3a0cb62bd63f2e6d7b78e18f5c7dc11215061e0febaae65ef93c87cc files/mozart-1.3.2-emubin.patch 1471
 AUX mozart-1.3.2-gcc4.patch 1457 RMD160 750055f1b34152fb26c3487d9b67e97c2e39848a SHA1 60aaef37dff8ac48795d5e83d8a3a80e42972f51 SHA256 8d4c251f55b1d321208293fb5be6547e37c77f23f4e0b38e2d54309706df6e3e
 MD5 12cc228ebdaf14c61b700e888fab08eb files/mozart-1.3.2-gcc4.patch 1457
 RMD160 750055f1b34152fb26c3487d9b67e97c2e39848a files/mozart-1.3.2-gcc4.patch 1457
@@ -20,14 +24,14 @@ RMD160 72c457fe7813fcd6f5c5b97294639f51989851aa files/mozart-1.3.2-portage.patch
 SHA256 64c16e25740b43b6fb7c64496c04c1155dfa98b911e3c132f1e41fae276a5e5f files/mozart-1.3.2-portage.patch 8987
 DIST mozart-1.3.2.20060615-doc.tar.gz 3890265 RMD160 450721bb64cbcc5cefddbaf9c3b0cdfe6261ae5f SHA1 28dfd9f92ba6ee698acb7363146b4a1c0ab4199f SHA256 b169418dd02fb6024d897778908928a6aa800e8ea96b6c76515b064bfac3b84e
 DIST mozart-1.3.2.20060615-src.tar.gz 10798680 RMD160 22dd1f639b6ea525744564b37be009bd599d60ad SHA1 aa980f4de7dcb2b4c2db511a464a5b6497b98109 SHA256 a09acd3365911348fd7b351d73ae1b2ad76ae96ffd335ee08746f5dcca3a55bf
-EBUILD mozart-1.3.2.ebuild 2336 RMD160 54c6a7a82c90f8b11b01e3a90c7db5369a74bf21 SHA1 0df5e2cf4a3b7efd788c712f2a5daea7269fa388 SHA256 fc0b8bb05f67391c0d687024ec9ad89eb3b7614b5a0b6e671141e2a692cf5de5
-MD5 87dd93e2542b68fc8ff455e10cbba60a mozart-1.3.2.ebuild 2336
-RMD160 54c6a7a82c90f8b11b01e3a90c7db5369a74bf21 mozart-1.3.2.ebuild 2336
-SHA256 fc0b8bb05f67391c0d687024ec9ad89eb3b7614b5a0b6e671141e2a692cf5de5 mozart-1.3.2.ebuild 2336
-MISC ChangeLog 505 RMD160 e909b0d53546268f27720f80d6a22efa08b1eb77 SHA1 7fb408646f5f31e0fa65e5e306178d34a37f37c6 SHA256 86d97b29befb2966fed1736d865e9786a61283469e2762ad9700fd4834034a96
-MD5 acc55a6a2c053186de631f244eba20a6 ChangeLog 505
-RMD160 e909b0d53546268f27720f80d6a22efa08b1eb77 ChangeLog 505
-SHA256 86d97b29befb2966fed1736d865e9786a61283469e2762ad9700fd4834034a96 ChangeLog 505
+EBUILD mozart-1.3.2.ebuild 2376 RMD160 c6ed84a3463d9a963a41869c5205b90ca10d06e0 SHA1 dec6128e414054dd22976fdcfb5d8bd079ce25df SHA256 20a44fb2298a5e6ae47c29bef5304037c2d13435b6ec81efebde8bb986f9808f
+MD5 af016a94b4c0ff7c8ebef547a54f4ace mozart-1.3.2.ebuild 2376
+RMD160 c6ed84a3463d9a963a41869c5205b90ca10d06e0 mozart-1.3.2.ebuild 2376
+SHA256 20a44fb2298a5e6ae47c29bef5304037c2d13435b6ec81efebde8bb986f9808f mozart-1.3.2.ebuild 2376
+MISC ChangeLog 655 RMD160 4b556bc89e9ef0783fd0ad3487b763bc7865b3b8 SHA1 43659c8fa664efeb76b1d90d50bb02e29ef590dc SHA256 15c84ee9858b1d8252dc0557304fa3319ae4a6ca097589f5426e9cf96134ac26
+MD5 311c182f692fceeccabd29e0be0cbc32 ChangeLog 655
+RMD160 4b556bc89e9ef0783fd0ad3487b763bc7865b3b8 ChangeLog 655
+SHA256 15c84ee9858b1d8252dc0557304fa3319ae4a6ca097589f5426e9cf96134ac26 ChangeLog 655
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
 MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247
 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247
diff --git a/dev-lang/mozart/files/mozart-1.3.2-emubin.patch b/dev-lang/mozart/files/mozart-1.3.2-emubin.patch
new file mode 100644
index 000000000000..7a18e108c88b
--- /dev/null
+++ b/dev-lang/mozart/files/mozart-1.3.2-emubin.patch
@@ -0,0 +1,36 @@
+diff -ur mozart-1.3.2.20060615.orig/platform/emulator/Makefile.in mozart-1.3.2.20060615/platform/emulator/Makefile.in
+--- mozart-1.3.2.20060615.orig/platform/emulator/Makefile.in	2004-01-12 23:03:44.000000000 +1300
++++ mozart-1.3.2.20060615/platform/emulator/Makefile.in	2007-02-16 22:50:14.000000000 +1300
+@@ -387,9 +387,9 @@
+ 
+ install:: install-bin install-inc install-cache
+ 
+-install-bin: $(TARGETS) $(BINDIR)
++install-bin: $(TARGETS) $(EMUBINDIR)
+ 	for exe in oztool.sh $(TARGETS); do\
+-	  $(INSTALL_BIN) $$exe $(BINDIR) || exit 1;\
++	  $(INSTALL_BIN) $$exe $(EMUBINDIR) || exit 1;\
+ 	done
+ 
+ NEWCACHEDIR = $(PREFIX)/cache/x-oz/boot
+@@ -410,7 +410,7 @@
+ 	if [ -r emulator.def ]; then $(INSTALL_FILE) emulator.def $(INCDIR); fi
+ 	if [ -r emulator.cmd ]; then $(INSTALL_FILE) emulator.cmd $(INCDIR); fi
+ 
+-$(BINDIR) $(INCDIR):
++$(EMUBINDIR) $(INCDIR):
+ 	$(INSTALL_DIR) $@
+ 
+ version.cc: version.sed $(filter-out version.cc,$(ALLSRCS))
+diff -ur mozart-1.3.2.20060615.orig/platform/emulator/Makefile.vars.in mozart-1.3.2.20060615/platform/emulator/Makefile.vars.in
+--- mozart-1.3.2.20060615.orig/platform/emulator/Makefile.vars.in	2003-04-16 20:02:57.000000000 +1200
++++ mozart-1.3.2.20060615/platform/emulator/Makefile.vars.in	2007-02-16 22:50:40.000000000 +1300
+@@ -29,7 +29,7 @@
+ PREFIX=		@prefix@
+ PLATFORM=	@platform@
+ 
+-BINDIR=		$(PREFIX)/platform/$(PLATFORM)
++EMUBINDIR=	$(PREFIX)/platform/$(PLATFORM)
+ INCDIR=		$(PREFIX)/include
+ 
+ EMULATOR_EXE=	@EMULATOR_EXE@
diff --git a/dev-lang/mozart/mozart-1.3.2.ebuild b/dev-lang/mozart/mozart-1.3.2.ebuild
index 4162db63fc88..96cf24946375 100644
--- a/dev-lang/mozart/mozart-1.3.2.ebuild
+++ b/dev-lang/mozart/mozart-1.3.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-lang/mozart/mozart-1.3.2.ebuild,v 1.1 2007/02/14 08:30:49 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/mozart-1.3.2.ebuild,v 1.2 2007/02/16 10:01:51 keri Exp $
 
 inherit eutils
 
@@ -34,6 +34,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-portage.patch
 	epatch "${FILESDIR}"/${P}-contrib.patch
+	epatch "${FILESDIR}"/${P}-emubin.patch
 	epatch "${FILESDIR}"/${P}-gcc4.patch
 	epatch "${FILESDIR}"/${P}-nostrip.patch
 	epatch "${FILESDIR}"/${P}-ozplatform.patch