Remove old patch files

(Portage version: 2.1.11.9/cvs/Linux x86_64)

9 files changed, 8 insertions, 914 deletions

diff --git a/dev-lang/mozart/ChangeLog b/dev-lang/mozart/ChangeLog
index 8605cb7f9f66..32f78104bce4 100644
--- a/dev-lang/mozart/ChangeLog
+++ b/dev-lang/mozart/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/mozart
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v 1.39 2012/08/26 19:57:31 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mozart/ChangeLog,v 1.40 2012/08/27 08:05:52 keri Exp $
+
+  27 Aug 2012; <keri@gentoo.org> -files/mozart-1.3.2-const-cast.patch,
+  -files/mozart-1.3.2-contrib.patch, -files/mozart-1.3.2-emubin.patch,
+  -files/mozart-1.3.2-gcc4.patch, -files/mozart-1.3.2-nostrip.patch,
+  -files/mozart-1.3.2-ozplatform.patch, -files/mozart-1.3.2-portage.patch,
+  -files/mozart-1.3.2-ri-fpe.patch:
+  Remove old patch files
 
   26 Aug 2012; <keri@gentoo.org> -mozart-1.3.2.ebuild, -mozart-1.3.2-r1.ebuild,
   -mozart-1.4.0.ebuild, -mozart-1.4.0-r1.ebuild:
diff --git a/dev-lang/mozart/files/mozart-1.3.2-const-cast.patch b/dev-lang/mozart/files/mozart-1.3.2-const-cast.patch
deleted file mode 100644
index 2ac12d888149..000000000000
--- a/dev-lang/mozart/files/mozart-1.3.2-const-cast.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- mozart-1.3.2.20060615.orig/platform/emulator/urlc.cc	2005-05-19 17:48:45.000000000 +0000
-+++ mozart-1.3.2.20060615/platform/emulator/urlc.cc	2009-08-10 20:32:43.000000000 +0000
-@@ -625,13 +625,13 @@
-     }
-     port = 21;
- 
--    p_collon = strchr(line, ':');
--    p_at = strchr(line, '@');
-+    p_collon = strchr(const_cast<char*>(line), ':');
-+    p_at = strchr(const_cast<char*>(line), '@');
-     if(NULL != p_at) // we have a pass
- 	p_slash = strchr(p_at + 1, '/');
-     else
--	p_slash = strchr(line, '/'); 
--    p_semi = strchr(line, ';'); // to avoid masking by pass
-+	p_slash = strchr(const_cast<char*>(line), '/'); 
-+    p_semi = strchr(const_cast<char*>(line), ';'); // to avoid masking by pass
-     
-     // sanity checks
-     if((NULL != p_collon) && (0 == p_collon[1]))
-@@ -1140,8 +1140,8 @@
- 
-     if((NULL == line) || (0 == *line)) // emtpy line?
- 	return (URLC_EEMPTY);
--    p_collon = strchr(line, ':');
--    p_slash = strchr(line, '/');
-+    p_collon = strchr(const_cast<char*>(line), ':');
-+    p_slash = strchr(const_cast<char*>(line), '/');
-     
-     // sanity checks
-     if((NULL != p_collon) && (0 == p_collon[1])) // nothing after :
diff --git a/dev-lang/mozart/files/mozart-1.3.2-contrib.patch b/dev-lang/mozart/files/mozart-1.3.2-contrib.patch
deleted file mode 100644
index b09e44b865e9..000000000000
--- a/dev-lang/mozart/files/mozart-1.3.2-contrib.patch
+++ /dev/null
@@ -1,333 +0,0 @@
-diff -ur mozart-1.3.2.20060615.orig/contrib/ap/Makefile.in mozart-1.3.2.20060615/contrib/ap/Makefile.in
---- mozart-1.3.2.20060615.orig/contrib/ap/Makefile.in	2001-08-05 10:24:30.000000000 +1200
-+++ mozart-1.3.2.20060615/contrib/ap/Makefile.in	2007-02-18 09:39:31.000000000 +1300
-@@ -21,9 +21,9 @@
- install: $(NEWCACHEDIR) $(addprefix $(NEWCACHEDIR)/,$(FUNCTORS))
- $(LIB_DIR) $(NEWCACHEDIR):
- 	$(INSTALL_DIR) $@
--$(LIB_DIR)/%.ozf: %.ozf
-+$(LIB_DIR)/%.ozf: %.ozf $(LIB_DIR)
- 	$(INSTALL_LIB) $< $@
--$(NEWCACHEDIR)/% : %
-+$(NEWCACHEDIR)/% : % $(NEWCACHEDIR)
- 	$(INSTALL_LIB) $< $@
- 
- clean veryclean:
-diff -ur mozart-1.3.2.20060615.orig/contrib/compat/Makefile.in mozart-1.3.2.20060615/contrib/compat/Makefile.in
---- mozart-1.3.2.20060615.orig/contrib/compat/Makefile.in	2003-11-26 03:53:51.000000000 +1300
-+++ mozart-1.3.2.20060615/contrib/compat/Makefile.in	2007-02-18 09:39:31.000000000 +1300
-@@ -5,7 +5,7 @@
- VPATH		= @srcdir@
- PREFIX		= @prefix@
- PLATFORM	= @PLATFORM@
--BIN_DIR		= $(PREFIX)/bin
-+BINDIR		= $(PREFIX)/bin
- CACHEDIR	= $(PREFIX)/cache/x-oz/contrib/compat
- HOMEURL         = @HOMEURL@
- 
-@@ -24,7 +24,7 @@
- CYGPATH		= $(SRCTOP)/share/lib/cygpath.sh
- 
- TARGETS		= TextPickle.ozf convertTextPickle$(EXE_EXT)
--BIN_TARGETS	= $(BIN_DIR)/convertTextPickle$(EXE_EXT)
-+BIN_TARGETS	= $(BINDIR)/convertTextPickle$(EXE_EXT)
- CACHE_TARGETS	= $(CACHEDIR)/TextPickle.ozf \
- 		  $(CACHEDIR)/TextPickleScanner.so-$(PLATFORM)
- 
-@@ -36,18 +36,18 @@
- 
- all: $(TARGETS)
- 
--install: $(BIN_DIR) $(BIN_TARGETS) $(CACHEDIR) $(CACHE_TARGETS)
-+install: $(BINDIR) $(BIN_TARGETS) $(CACHEDIR) $(CACHE_TARGETS)
- 
--$(BIN_DIR) $(CACHEDIR):
-+$(BINDIR) $(CACHEDIR):
- 	$(INSTALL_DIR) $@
- 
--$(BIN_DIR)/%: %
-+$(BINDIR)/%: % $(BINDIR)
- 	$(INSTALL_BIN) $< $@
- 
--$(CACHEDIR)/%.ozf: %.ozf
-+$(CACHEDIR)/%.ozf: %.ozf $(CACHEDIR)
- 	$(INSTALL_FILE) $< $@
- 
--$(CACHEDIR)/%.so-$(PLATFORM): %.so-$(PLATFORM)
-+$(CACHEDIR)/%.so-$(PLATFORM): %.so-$(PLATFORM) $(CACHEDIR)
- 	$(INSTALL_DLL) $< $@
- 
- TextPickle.so-$(PLATFORM): TextPickle.ozf
-diff -ur mozart-1.3.2.20060615.orig/contrib/davinci/Makefile.in mozart-1.3.2.20060615/contrib/davinci/Makefile.in
---- mozart-1.3.2.20060615.orig/contrib/davinci/Makefile.in	2001-08-05 10:24:30.000000000 +1200
-+++ mozart-1.3.2.20060615/contrib/davinci/Makefile.in	2007-02-18 09:39:31.000000000 +1300
-@@ -59,7 +59,7 @@
- DaVinci.ozf: $(OZFNCTS)
- 	$(OZL) -z 9 DaVinciObject.ozf -o $@
- 
--$(LIB_DIR)/DaVinci.ozf: DaVinci.ozf
-+$(LIB_DIR)/DaVinci.ozf: DaVinci.ozf $(LIB_DIR)
- 	$(INSTALL_LIB) $< $@
- 	for f in *.so-$(PLATFORM) ; do \
- 	$(INSTALL_DLL) $$f $(LIB_DIR)/$$f ; \
-diff -ur mozart-1.3.2.20060615.orig/contrib/directory/Makefile.in mozart-1.3.2.20060615/contrib/directory/Makefile.in
---- mozart-1.3.2.20060615.orig/contrib/directory/Makefile.in	2001-08-05 10:24:31.000000000 +1200
-+++ mozart-1.3.2.20060615/contrib/directory/Makefile.in	2007-02-18 09:39:31.000000000 +1300
-@@ -59,13 +59,13 @@
- $(LIB_DIR) $(NEWCACHEDIR):
- 	$(INSTALL_DIR) $@
- 
--$(LIB_DIR)/%.ozf: %.ozf
-+$(LIB_DIR)/%.ozf: %.ozf $(LIB_DIR)
- 	$(INSTALL_LIB) $< $@
- 
--$(LIB_DIR)/%.oz: %.oz
-+$(LIB_DIR)/%.oz: %.oz $(LIB_DIR)
- 	$(INSTALL_LIB) $< $@
- 
--$(NEWCACHEDIR)/%: %
-+$(NEWCACHEDIR)/%: % $(NEWCACHEDIR)
- 	$(INSTALL_LIB) $< $@
- 
- #----------------------------------------------------------------------
-diff -ur mozart-1.3.2.20060615.orig/contrib/doc/code/Makefile.in mozart-1.3.2.20060615/contrib/doc/code/Makefile.in
---- mozart-1.3.2.20060615.orig/contrib/doc/code/Makefile.in	2002-04-02 00:28:57.000000000 +1200
-+++ mozart-1.3.2.20060615/contrib/doc/code/Makefile.in	2007-02-18 09:39:31.000000000 +1300
-@@ -57,13 +57,13 @@
- $(LIB_DIR) $(ELIB_DIR) $(NEWCACHEDIR):
- 	$(INSTALL_DIR) $@
- 
--$(LIB_TARGETS): $(LIB_DIR)/% : %
-+$(LIB_TARGETS): $(LIB_DIR)/% : % $(LIB_DIR)
- 	$(INSTALL_LIB) $< $@
- 
--$(NEW_TARGETS): $(NEWCACHEDIR)/% : %
-+$(NEW_TARGETS): $(NEWCACHEDIR)/% : % $(NEWCACHEDIR)
- 	$(INSTALL_LIB) $< $@
- 
--$(ELIB_TARGETS): $(ELIB_DIR)/% : %
-+$(ELIB_TARGETS): $(ELIB_DIR)/% : % $(ELIB_DIR)
- 	$(INSTALL_LIB) $< $@
- 
- %.ozf: %.oz
-diff -ur mozart-1.3.2.20060615.orig/contrib/doc/sgml/Makefile.in mozart-1.3.2.20060615/contrib/doc/sgml/Makefile.in
---- mozart-1.3.2.20060615.orig/contrib/doc/sgml/Makefile.in	2001-08-05 10:24:31.000000000 +1200
-+++ mozart-1.3.2.20060615/contrib/doc/sgml/Makefile.in	2007-02-18 09:39:31.000000000 +1300
-@@ -25,10 +25,10 @@
- $(LIB_DIR) $(NEWCACHEDIR):
- 	$(INSTALL_DIR) $@
- 
--$(LIB_TARGETS): $(LIB_DIR)/% : %
-+$(LIB_TARGETS): $(LIB_DIR)/% : % $(LIB_DIR)
- 	$(INSTALL_LIB) $< $@
- 
--$(NEW_TARGETS): $(NEWCACHEDIR)/% : %
-+$(NEW_TARGETS): $(NEWCACHEDIR)/% : % $(NEWCACHEDIR)
- 	$(INSTALL_LIB) $< $@
- 
- %.ozf: %.oz
-diff -ur mozart-1.3.2.20060615.orig/contrib/fcp/Makefile.in mozart-1.3.2.20060615/contrib/fcp/Makefile.in
---- mozart-1.3.2.20060615.orig/contrib/fcp/Makefile.in	2001-08-05 10:24:32.000000000 +1200
-+++ mozart-1.3.2.20060615/contrib/fcp/Makefile.in	2007-02-18 09:39:31.000000000 +1300
-@@ -77,10 +77,10 @@
- $(LIB_DIR):
- 	$(INSTALL_DIR) $@
- 
--$(LIB_DIR)/%.ozf: %.ozf
-+$(LIB_DIR)/%.ozf: %.ozf $(LIB_DIR)
- 	$(INSTALL_LIB) $< $@
- 
--$(LIB_DIR)/%.so-$(PLATFORM): %.so-$(PLATFORM)
-+$(LIB_DIR)/%.so-$(PLATFORM): %.so-$(PLATFORM) $(LIB_DIR)
- 	$(INSTALL_DLL) $< $@
- 
- #----------------------------------------------------------------------
-diff -ur mozart-1.3.2.20060615.orig/contrib/gdbm/Makefile.in mozart-1.3.2.20060615/contrib/gdbm/Makefile.in
---- mozart-1.3.2.20060615.orig/contrib/gdbm/Makefile.in	2003-01-08 02:40:09.000000000 +1300
-+++ mozart-1.3.2.20060615/contrib/gdbm/Makefile.in	2007-02-18 09:39:31.000000000 +1300
-@@ -39,16 +39,16 @@
- $(LIB_DIR) $(NEWCACHEDIR):
- 	$(INSTALL_DIR) $@
- 
--$(LIB_DIR)/gdbm.ozf: gdbm.ozf
-+$(LIB_DIR)/gdbm.ozf: gdbm.ozf $(LIB_DIR)
- 	$(INSTALL_LIB) $< $@
- 
--$(LIB_DIR)/gdbm.so-$(PLATFORM): gdbm.so-$(PLATFORM)
-+$(LIB_DIR)/gdbm.so-$(PLATFORM): gdbm.so-$(PLATFORM) $(LIB_DIR)
- 	$(INSTALL_DLL) $< $@
- 
--$(NEWCACHEDIR)/gdbm.ozf: gdbm.ozf
-+$(NEWCACHEDIR)/gdbm.ozf: gdbm.ozf $(NEWCACHEDIR)
- 	$(INSTALL_LIB) $< $@
- 
--$(NEWCACHEDIR)/gdbm.so-$(PLATFORM): gdbm.so-$(PLATFORM)
-+$(NEWCACHEDIR)/gdbm.so-$(PLATFORM): gdbm.so-$(PLATFORM) $(NEWCACHEDIR)
- 	$(INSTALL_DLL) $< $@
- 
- gdbm.ozf: gdbm.oz
-diff -ur mozart-1.3.2.20060615.orig/contrib/investigator/Makefile.in mozart-1.3.2.20060615/contrib/investigator/Makefile.in
---- mozart-1.3.2.20060615.orig/contrib/investigator/Makefile.in	2001-08-05 10:24:33.000000000 +1200
-+++ mozart-1.3.2.20060615/contrib/investigator/Makefile.in	2007-02-18 09:39:31.000000000 +1300
-@@ -70,7 +70,7 @@
- Investigator.ozf: $(OZFNCTS)
- 	$(OZL) -z 9 Main.ozf -o $@
- 
--$(LIB_DIR)/Investigator.ozf: Investigator.ozf
-+$(LIB_DIR)/Investigator.ozf: Investigator.ozf $(LIB_DIR)
- 	$(INSTALL_LIB) $< $@
- 
- #----------------------------------------------------------------------
-diff -ur mozart-1.3.2.20060615.orig/contrib/micq/Makefile.in mozart-1.3.2.20060615/contrib/micq/Makefile.in
---- mozart-1.3.2.20060615.orig/contrib/micq/Makefile.in	2001-08-05 10:24:34.000000000 +1200
-+++ mozart-1.3.2.20060615/contrib/micq/Makefile.in	2007-02-18 09:41:59.000000000 +1300
-@@ -28,14 +28,14 @@
- install:: $(DEMO_DIR) $(DEMO_DIR)/MIM.oza \
- 	$(NEWCACHEDIR) $(addprefix $(NEWCACHEDIR)/,$(APPLETS))
- 
--$(NEWCACHEDIR)/% : %
-+$(NEWCACHEDIR)/% : % $(NEWCACHEDIR)
- 	$(INSTALL_LIB) $< $@
- 
- $(LIB_DIR) $(DEMO_DIR) $(NEWCACHEDIR):
- 	$(INSTALL_DIR) $@
--$(LIB_DIR)/%.oza: %.oza
-+$(LIB_DIR)/%.oza: %.oza $(LIB_DIR)
- 	$(INSTALL_LIB) $< $@
--$(DEMO_DIR)/MIM.oza: client.oza
-+$(DEMO_DIR)/MIM.oza: client.oza $(DEMO_DIR)
- 	$(INSTALL_LIB) $< $@
- BMETH = $(BUILDTOP)/contrib/micq/methods.ozf
- SMETH = $(SRCDIR)/methods.oz
-@@ -43,28 +43,28 @@
- 
- include $(BUILDTOP)/share/Makefile.boot
- 
--$(GIFCONV): Gif2Functor.oz GifToBase64.ozf
-+$(GIFCONV): Gif2Functor.oz GifToBase64.ozf $(GIFCONV)
- 	$(COMPILE) -c $(shell $(CYGPATH) "$<") -o $@
- 
--Logo_gif.ozf : $(ICONDIR)/logo.gif
-+Logo_gif.ozf : $(ICONDIR)/logo.gif $(GIFCONV)
- 	$(MAKEGIF) $(shell $(CYGPATH) "$<") -o Logo_gif.ozf
- 
--Letter_gif.ozf : $(ICONDIR)/letter.gif
-+Letter_gif.ozf : $(ICONDIR)/letter.gif $(GIFCONV)
- 	$(MAKEGIF) $(shell $(CYGPATH) "$<") -o Letter_gif.ozf
- 
--Away_gif.ozf : $(ICONDIR)/away_t.gif
-+Away_gif.ozf : $(ICONDIR)/away_t.gif $(GIFCONV)
- 	$(MAKEGIF) $(shell $(CYGPATH) "$<") -o Away_gif.ozf
- 
--Online_gif.ozf : $(ICONDIR)/online_t.gif
-+Online_gif.ozf : $(ICONDIR)/online_t.gif $(GIFCONV)
- 	$(MAKEGIF) $(shell $(CYGPATH) "$<") -o Online_gif.ozf
- 
--Offline_gif.ozf : $(ICONDIR)/offline_t.gif
-+Offline_gif.ozf : $(ICONDIR)/offline_t.gif $(GIFCONV)
- 	$(MAKEGIF) $(shell $(CYGPATH) "$<") -o Offline_gif.ozf
- 
--Eyes_gif.ozf : $(ICONDIR)/eyes_t.gif
-+Eyes_gif.ozf : $(ICONDIR)/eyes_t.gif $(GIFCONV)
- 	$(MAKEGIF) $(shell $(CYGPATH) "$<") -o Eyes_gif.ozf
- 
--Powered_by_oz_gif.ozf : $(ICONDIR)/powered-by-oz-100.gif
-+Powered_by_oz_gif.ozf : $(ICONDIR)/powered-by-oz-100.gif $(GIFCONV)
- 	$(MAKEGIF) $(shell $(CYGPATH) "$<") -o Powered_by_oz_gif.ozf
- 
- SERVER_FUNCTORS = \
-diff -ur mozart-1.3.2.20060615.orig/contrib/os/Makefile.in mozart-1.3.2.20060615/contrib/os/Makefile.in
---- mozart-1.3.2.20060615.orig/contrib/os/Makefile.in	2001-09-29 01:45:43.000000000 +1200
-+++ mozart-1.3.2.20060615/contrib/os/Makefile.in	2007-02-18 09:39:31.000000000 +1300
-@@ -52,16 +52,16 @@
- $(LIB_DIR) $(NEWCACHEDIR):
- 	$(INSTALL_DIR) $@
- 
--$(LIB_FUNCTORS): $(LIB_DIR)/% : %
-+$(LIB_FUNCTORS): $(LIB_DIR)/% : % $(LIB_DIR)
- 	$(INSTALL_LIB) $< $@
- 
--$(LIB_NATIVES): $(LIB_DIR)/%.so-$(PLATFORM): %.so-$(PLATFORM)
-+$(LIB_NATIVES): $(LIB_DIR)/%.so-$(PLATFORM): %.so-$(PLATFORM) $(LIB_DIR)
- 	$(INSTALL_DLL) $< $@
- 
--$(NEW_FUNCTORS): $(NEWCACHEDIR)/% : %
-+$(NEW_FUNCTORS): $(NEWCACHEDIR)/% : % $(NEWCACHEDIR)
- 	$(INSTALL_LIB) $< $@
- 
--$(NEW_NATIVES): $(NEWCACHEDIR)/%.so-$(PLATFORM): %.so-$(PLATFORM)
-+$(NEW_NATIVES): $(NEWCACHEDIR)/%.so-$(PLATFORM): %.so-$(PLATFORM) $(NEWCACHEDIR)
- 	$(INSTALL_DLL) $< $@
- 
- %.ozf: %.oz
-diff -ur mozart-1.3.2.20060615.orig/contrib/reflect/Makefile.in mozart-1.3.2.20060615/contrib/reflect/Makefile.in
---- mozart-1.3.2.20060615.orig/contrib/reflect/Makefile.in	2001-08-05 10:24:34.000000000 +1200
-+++ mozart-1.3.2.20060615/contrib/reflect/Makefile.in	2007-02-18 09:39:31.000000000 +1300
-@@ -67,10 +67,10 @@
- $(LIB_DIR):
- 	$(INSTALL_DIR) $@
- 
--$(LIB_DIR)/%.ozf: %.ozf
-+$(LIB_DIR)/%.ozf: %.ozf $(LIB_DIR)
- 	$(INSTALL_LIB) $< $@
- 
--$(LIB_DIR)/%.so-$(PLATFORM): %.so-$(PLATFORM)
-+$(LIB_DIR)/%.so-$(PLATFORM): %.so-$(PLATFORM) $(LIB_DIR)
- 	$(INSTALL_DLL) $< $@
- 
- #----------------------------------------------------------------------
-diff -ur mozart-1.3.2.20060615.orig/contrib/regex/Makefile.in mozart-1.3.2.20060615/contrib/regex/Makefile.in
---- mozart-1.3.2.20060615.orig/contrib/regex/Makefile.in	2003-01-08 02:40:10.000000000 +1300
-+++ mozart-1.3.2.20060615/contrib/regex/Makefile.in	2007-02-18 09:39:31.000000000 +1300
-@@ -38,16 +38,16 @@
- $(LIB_DIR):
- 	$(INSTALL_DIR) $@
- 
--$(LIB_DIR)/regex.ozf: regex.ozf
-+$(LIB_DIR)/regex.ozf: regex.ozf $(LIB_DIR)
- 	$(INSTALL_LIB) $< $@
- 
--$(LIB_DIR)/regex.so-$(PLATFORM): regex.so-$(PLATFORM)
-+$(LIB_DIR)/regex.so-$(PLATFORM): regex.so-$(PLATFORM) $(LIB_DIR)
- 	$(INSTALL_DLL) $< $@
- 
--$(NEWCACHEDIR)/regex.ozf: regex.ozf
-+$(NEWCACHEDIR)/regex.ozf: regex.ozf $(NEWCACHEDIR)
- 	$(INSTALL_LIB) $< $@
- 
--$(NEWCACHEDIR)/regex.so-$(PLATFORM): regex.so-$(PLATFORM)
-+$(NEWCACHEDIR)/regex.so-$(PLATFORM): regex.so-$(PLATFORM) $(NEWCACHEDIR)
- 	$(INSTALL_DLL) $< $@
- 
- regex.ozf: regex.oz
-diff -ur mozart-1.3.2.20060615.orig/contrib/ri/Makefile.in mozart-1.3.2.20060615/contrib/ri/Makefile.in
---- mozart-1.3.2.20060615.orig/contrib/ri/Makefile.in	2002-07-07 01:05:36.000000000 +1200
-+++ mozart-1.3.2.20060615/contrib/ri/Makefile.in	2007-02-18 09:39:31.000000000 +1300
-@@ -81,10 +81,10 @@
- $(LIB_DIR):
- 	$(INSTALL_DIR) $@
- 
--$(LIB_DIR)/%.ozf: %.ozf
-+$(LIB_DIR)/%.ozf: %.ozf $(LIB_DIR)
- 	$(INSTALL_LIB) $< $@
- 
--$(LIB_DIR)/%.so-$(PLATFORM): %.so-$(PLATFORM)
-+$(LIB_DIR)/%.so-$(PLATFORM): %.so-$(PLATFORM) $(LIB_DIR)
- 	$(INSTALL_DLL) $< $@
- 
- 
-diff -ur mozart-1.3.2.20060615.orig/contrib/tk/Makefile.in mozart-1.3.2.20060615/contrib/tk/Makefile.in
---- mozart-1.3.2.20060615.orig/contrib/tk/Makefile.in	2001-08-05 10:24:35.000000000 +1200
-+++ mozart-1.3.2.20060615/contrib/tk/Makefile.in	2007-02-18 09:39:31.000000000 +1300
-@@ -21,9 +21,9 @@
- install:	$(NEWCACHEDIR) $(addprefix $(NEWCACHEDIR)/,$(FUNCTORS))
- $(LIB_DIR) $(NEWCACHEDIR):
- 	$(INSTALL_DIR) $@
--$(LIB_DIR)/%.ozf: %.ozf
-+$(LIB_DIR)/%.ozf: %.ozf $(LIB_DIR)
- 	$(INSTALL_LIB) $< $@
--$(NEWCACHEDIR)/%.ozf: %.ozf
-+$(NEWCACHEDIR)/%.ozf: %.ozf $(NEWCACHEDIR)
- 	$(INSTALL_LIB) $< $@
- 
- clean veryclean:
diff --git a/dev-lang/mozart/files/mozart-1.3.2-emubin.patch b/dev-lang/mozart/files/mozart-1.3.2-emubin.patch
deleted file mode 100644
index 7a18e108c88b..000000000000
--- a/dev-lang/mozart/files/mozart-1.3.2-emubin.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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/files/mozart-1.3.2-gcc4.patch b/dev-lang/mozart/files/mozart-1.3.2-gcc4.patch
deleted file mode 100644
index c769845341bd..000000000000
--- a/dev-lang/mozart/files/mozart-1.3.2-gcc4.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -ur mozart-1.3.2.20060615.orig/contrib/ri/sigfpe.c mozart-1.3.2.20060615/contrib/ri/sigfpe.c
---- mozart-1.3.2.20060615.orig/contrib/ri/sigfpe.c	2006-03-21 20:36:08.000000000 +1200
-+++ mozart-1.3.2.20060615/contrib/ri/sigfpe.c	2007-02-17 12:46:25.000000000 +1300
-@@ -1,6 +1,7 @@
- #include "sigfpe.h"
- #include "ieeefp.h"
- #include <stdio.h>
-+#include <stdlib.h>
- 
- static void sigfpe_abort(int i, siginfo_t *info, ucontext_mozart_t *fpu_state)
- {
-diff -ur mozart-1.3.2.20060615.orig/platform/tools/gump/ozbison/conflicts.c mozart-1.3.2.20060615/platform/tools/gump/ozbison/conflicts.c
---- mozart-1.3.2.20060615.orig/platform/tools/gump/ozbison/conflicts.c	1998-12-17 02:55:09.000000000 +1300
-+++ mozart-1.3.2.20060615/platform/tools/gump/ozbison/conflicts.c	2007-02-11 20:51:52.000000000 +1300
-@@ -18,6 +18,7 @@
- the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
- 
- #include <stdio.h>
-+#include <string.h>
- #include "system.h"
- #include "machine.h"
- #include "new.h"
-diff -ur mozart-1.3.2.20060615.orig/platform/tools/gump/ozbison/print.c mozart-1.3.2.20060615/platform/tools/gump/ozbison/print.c
---- mozart-1.3.2.20060615.orig/platform/tools/gump/ozbison/print.c	1998-02-07 00:30:27.000000000 +1300
-+++ mozart-1.3.2.20060615/platform/tools/gump/ozbison/print.c	2007-02-11 20:51:20.000000000 +1300
-@@ -19,6 +19,7 @@
- 
- 
- #include <stdio.h>
-+#include <string.h>
- #include "system.h"
- #include "machine.h"
- #include "new.h"
-diff -ur mozart-1.3.2.20060615.orig/platform/tools/gump/ozbison/symtab.c mozart-1.3.2.20060615/platform/tools/gump/ozbison/symtab.c
---- mozart-1.3.2.20060615.orig/platform/tools/gump/ozbison/symtab.c	1998-02-07 00:30:29.000000000 +1300
-+++ mozart-1.3.2.20060615/platform/tools/gump/ozbison/symtab.c	2007-02-11 20:50:03.000000000 +1300
-@@ -19,6 +19,7 @@
- 
- 
- #include <stdio.h>
-+#include <string.h>
- #include "system.h"
- #include "new.h"
- #include "symtab.h"
diff --git a/dev-lang/mozart/files/mozart-1.3.2-nostrip.patch b/dev-lang/mozart/files/mozart-1.3.2-nostrip.patch
deleted file mode 100644
index ec36500572a1..000000000000
--- a/dev-lang/mozart/files/mozart-1.3.2-nostrip.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozart-1.3.2.20060615.orig/platform/tools/gump/ozflex/Makefile.in	2001-08-05 10:24:39.000000000 +1200
-+++ mozart-1.3.2.20060615/platform/tools/gump/ozflex/Makefile.in	2007-02-11 20:30:41.000000000 +1300
-@@ -65,7 +65,7 @@
- 
- 
- all: $(FLEX)
--	$(STRIP) $(FLEX)
-+
- include $(BUILDTOP)/share/Makefile.boot
- bootstrap: cboot-all
- 
diff --git a/dev-lang/mozart/files/mozart-1.3.2-ozplatform.patch b/dev-lang/mozart/files/mozart-1.3.2-ozplatform.patch
deleted file mode 100644
index 186853fd3bb7..000000000000
--- a/dev-lang/mozart/files/mozart-1.3.2-ozplatform.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -ur mozart-1.3.2.20060615.orig/share/bin/Makefile.in mozart-1.3.2.20060615/share/bin/Makefile.in
---- mozart-1.3.2.20060615.orig/share/bin/Makefile.in	2001-08-04 22:24:41.000000000 +0000
-+++ mozart-1.3.2.20060615/share/bin/Makefile.in	2009-08-10 21:24:55.000000000 +0000
-@@ -35,7 +35,7 @@
- INSTALL_BIN=	$(INSTALL) -m 555
- INSTALL_FILE=	$(INSTALL) -m 444
- 
--SCRIPTS=	oz ozplatform
-+SCRIPTS=	oz
- LINKS=		ozengine text2pickle pickle2text oldpickle2text oztool
- LIB_SCRIPTS=	$(addprefix $(BINDIR)/,$(SCRIPTS))
- LIB_LINKS=	$(addprefix $(BINDIR)/,$(LINKS))
-diff -ur mozart-1.3.2.20060615.orig/share/bin/oz.in mozart-1.3.2.20060615/share/bin/oz.in
---- mozart-1.3.2.20060615.orig/share/bin/oz.in	2006-06-13 22:25:01.000000000 +0000
-+++ mozart-1.3.2.20060615/share/bin/oz.in	2009-08-10 21:24:55.000000000 +0000
-@@ -4,7 +4,7 @@
- # to draw links from say /usr/local/bin to OZHOME/bin
- # see chapter "installation" in the users manual for more information
- 
--# OZHOME=/usr/local/mozart
-+OZHOME=@prefix@/lib/mozart
- 
- 
- 
-@@ -24,7 +24,7 @@
- fi
- export OZHOME
- 
--: ${OZPLATFORM=`"$OZHOME/bin/ozplatform"`}
-+: ${OZPLATFORM="@PLATFORM@"}
- : ${OZEMULATOR="$OZHOME/platform/$OZPLATFORM/emulator.exe"}
- : ${OZVERSION="@OZVERSION@"}
- : ${OZ_DOTOZ="$HOME/.oz/$OZVERSION"}
-diff -ur mozart-1.3.2.20060615.orig/share/bin/ozplatform mozart-1.3.2.20060615/share/bin/ozplatform
---- mozart-1.3.2.20060615.orig/share/bin/ozplatform	2006-05-03 12:17:13.000000000 +0000
-+++ mozart-1.3.2.20060615/share/bin/ozplatform	2009-08-10 21:26:08.000000000 +0000
-@@ -40,7 +40,7 @@
-    ;;
-    m68k\ Linux\ *)      OZARCH=linux-m68k
-    ;;
--   sparc\ Linux\ *)     OZARCH=linux-sparc
-+   sparc*\ Linux\ *)     OZARCH=linux-sparc
-    ;;
-    9000/7*HP-UX*)	OZARCH=hpux-700
-    ;;
-@@ -78,6 +78,8 @@
-    ;;
-    *i*86*Darwin*)       OZARCH=i486-darwin
-    ;;
-+   x86_64\ Linux*)	OZARCH=linux-x86_64_32
-+   ;;
-    *)  	                OZARCH=unknown-unknown
-    ;;
- esac
diff --git a/dev-lang/mozart/files/mozart-1.3.2-portage.patch b/dev-lang/mozart/files/mozart-1.3.2-portage.patch
deleted file mode 100644
index 546bf597cce0..000000000000
--- a/dev-lang/mozart/files/mozart-1.3.2-portage.patch
+++ /dev/null
@@ -1,370 +0,0 @@
-diff -ur mozart-1.3.2.20060615.orig/Makefile.in mozart-1.3.2.20060615/Makefile.in
---- mozart-1.3.2.20060615.orig/Makefile.in	2004-05-19 10:56:54.000000000 +1200
-+++ mozart-1.3.2.20060615/Makefile.in	2008-06-02 10:04:05.000000000 +1200
-@@ -111,7 +111,7 @@
- ./config.status: ./configure
- 	./config.status --recheck
- 
--install:: $(ALLFILES)
-+install::
- 
- $(ALLFILES): $(PREFIX)/% : % $(PREFIX)
- 	$(INSTALL_FILE) $< $@
-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	2008-06-02 10:04:05.000000000 +1200
-@@ -226,10 +226,15 @@
- .PHONY:	all first install install-bin install-inc \
- 	install-dir depend tags clean cleaner distclean veryclean
- 
--all: $(TARGETS) $(DYNAMIC_MODULETARGETS)
-+all: $(TARGETS) dynamic_modules
- 
- bootstrap:: all
- 
-+dynamic_modules: $(TARGETS)
-+	for dynamic_module in $(DYNAMIC_MODULETARGETS); do \
-+	  $(MAKE) $$dynamic_module; \
-+	done
-+
- $(MODINTERS): bidecl.perl
- 
- .PHONY: libDPB.a DPB.so-$(PLATFORM)
-@@ -400,7 +405,7 @@
- $(NEWCACHEDIR):
- 	$(INSTALL_DIR) $@
- 
--$(NEWCACHEDIR)/% : %
-+$(NEWCACHEDIR)/% : % $(NEWCACHEDIR)
- 	$(INSTALL_FILE) $< $@
- 
- install-inc: $(INCDIR)
-diff -ur mozart-1.3.2.20060615.orig/platform/emulator/libdp/Makefile.in mozart-1.3.2.20060615/platform/emulator/libdp/Makefile.in
---- mozart-1.3.2.20060615.orig/platform/emulator/libdp/Makefile.in	2002-08-03 08:20:44.000000000 +1200
-+++ mozart-1.3.2.20060615/platform/emulator/libdp/Makefile.in	2008-06-02 10:04:05.000000000 +1200
-@@ -88,7 +88,7 @@
- 	$(AR) -rc $@ $< && $(RANLIB) $@
- 
- #
--dpMiscModule.lo: ../modDPMisc-if.cc
-+dpMiscModule.lo: ../modDPMisc-if.cc $(CREATEDFILES)
- 
- ../DPMisc.so-$(PLATFORM): dpMiscModule.lo 
- 	$(DYNLD) -o $@ $<
-@@ -146,6 +146,8 @@
- msgContainer_marshal.cc: msgContainer_marshal.m4cc msgFormat.m4
- msgContainer.o: msgContainer_marshal.m4cc msgFormat.m4
- 
-+$(REALCORESRCS): $(CREATEDCOREFILES)
-+
- BUILDDIR=$(shell pwd)
- tags:	$(CREATEDFILES)
- 	etags \
-diff -ur mozart-1.3.2.20060615.orig/platform/tools/gump/Makefile.in mozart-1.3.2.20060615/platform/tools/gump/Makefile.in
---- mozart-1.3.2.20060615.orig/platform/tools/gump/Makefile.in	2003-01-08 02:40:10.000000000 +1300
-+++ mozart-1.3.2.20060615/platform/tools/gump/Makefile.in	2008-06-02 10:04:05.000000000 +1200
-@@ -66,15 +66,15 @@
- $(SHAREDIR) $(PLATFORMDIR) $(INCDIR) $(NEWCACHEDIR):
- 	$(MKINSTALLDIRS) $@
- 
--$(NEWCACHEDIR)/GumpScanner.so-$(PLATFORM): GumpScanner.so-$(PLATFORM)
-+$(NEWCACHEDIR)/GumpScanner.so-$(PLATFORM): GumpScanner.so-$(PLATFORM) $(NEWCACHEDIR)
- 	$(INSTALLDLL) $< $@
--$(NEWCACHEDIR)/Bison.so-$(PLATFORM): ozbison/Bison.so-$(PLATFORM)
-+$(NEWCACHEDIR)/Bison.so-$(PLATFORM): ozbison/Bison.so-$(PLATFORM) $(NEWCACHEDIR)
- 	$(INSTALLDLL) $< $@
- 
--$(PLATFORMDIR)/flex.exe: ozflex/flex.exe
-+$(PLATFORMDIR)/flex.exe: ozflex/flex.exe $(PLATFORMDIR)
- 	$(INSTALLPRG) $< $@
- 
--$(INCDIR)/%: %
-+$(INCDIR)/%: % $(INCDIR)
- 	$(INSTALLFILE) $< $@
- 
- clean veryclean:
-diff -ur mozart-1.3.2.20060615.orig/share/bin/Makefile.in mozart-1.3.2.20060615/share/bin/Makefile.in
---- mozart-1.3.2.20060615.orig/share/bin/Makefile.in	2001-08-05 10:24:41.000000000 +1200
-+++ mozart-1.3.2.20060615/share/bin/Makefile.in	2008-06-02 10:04:05.000000000 +1200
-@@ -55,13 +55,13 @@
- install: $(BINDIR) $(LIB_SCRIPTS) $(LIB_LINKS) $(WRAPPERS)
- 
- 
--$(LIB_SCRIPTS): $(BINDIR)/% : %
-+$(LIB_SCRIPTS): $(BINDIR)/% : % $(BINDIR)
- 	$(INSTALL_BIN) $< $(BINDIR)
- 
--$(LIB_LINKS): $(BINDIR)/oz
-+$(LIB_LINKS): $(BINDIR)/oz $(BINDIR)
- 	cd $(BINDIR); rm -f $@; $(LN_S) oz $@
- 
--$(WRAPPERS): $(BINDIR)/%: $(SRCTOP)/platform/mswindows/%
-+$(WRAPPERS): $(BINDIR)/%: $(SRCTOP)/platform/mswindows/% $(BINDIR)
- 	$(INSTALL_FILE) $< $@
- 
- $(BINDIR):
-diff -ur mozart-1.3.2.20060615.orig/share/demo/Makefile.in mozart-1.3.2.20060615/share/demo/Makefile.in
---- mozart-1.3.2.20060615.orig/share/demo/Makefile.in	2001-10-16 23:10:03.000000000 +1300
-+++ mozart-1.3.2.20060615/share/demo/Makefile.in	2008-06-02 10:04:05.000000000 +1200
-@@ -83,16 +83,19 @@
- install:: $(OZDEMO) $(DEMOAPPLETS) \
- 	$(SYSTEMDOC) $(SYSTEMOZF) $(SYSTEMOZF)/MT10.ozf $(SYSTEMDOC)/MT10.oz
- 
--$(OZDEMO) $(SYSTEMDOC) $(SYSTEMOZF):
-+$(OZDEMO) $(SYSTEMOZF):
- 	$(INSTALL_DIR) $@
- 
--$(OZDEMO)/%.oza: %.oza
-+$(SYSTEMDOC): $(OZDEMO)
-+	$(INSTALL_DIR) $@
-+
-+$(OZDEMO)/%.oza: %.oza $(OZDEMO)
- 	$(INSTALL_FILE) $< $@
- 
--$(SYSTEMOZF)/%: %
-+$(SYSTEMOZF)/%: % $(SYSTEMOZF)
- 	$(INSTALL_FILE) $< $@
- 
--$(SYSTEMDOC)/%: %
-+$(SYSTEMDOC)/%: % $(SYSTEMDOC)
- 	$(INSTALL_FILE) $< $@
- 
- #
-@@ -279,19 +282,21 @@
- 
- install:: $(OZIMGDIRS) $(OZIMAGES)
- 
--$(OZIMGDIRS):
-+$(OZIMG): $(SYSTEMOZF)
-+	$(INSTALL_DIR) $@
-+$(OZIMGDIRS): $(OZIMG)
- 	$(INSTALL_DIR) $@
--$(OZIMG)/animated-queens/%.xbm: images/animated-queens/%.xbm
-+$(OZIMG)/animated-queens/%.xbm: images/animated-queens/%.xbm $(OZIMGDIRS)
- 	$(INSTALL_FILE) $< $@
--$(OZIMG)/lift/%.xbm: images/lift/%.xbm
-+$(OZIMG)/lift/%.xbm: images/lift/%.xbm $(OZIMGDIRS)
- 	$(INSTALL_FILE) $< $@
--$(OZIMG)/transport/%.xbm: images/transport/%.xbm
-+$(OZIMG)/transport/%.xbm: images/transport/%.xbm $(OZIMGDIRS)
- 	$(INSTALL_FILE) $< $@
--$(OZIMG)/trucks/%.ppm: images/trucks/%.ppm
-+$(OZIMG)/trucks/%.ppm: images/trucks/%.ppm $(OZIMGDIRS)
- 	$(INSTALL_FILE) $< $@
--$(OZIMG)/college/%.xbm: images/college/%.xbm
-+$(OZIMG)/college/%.xbm: images/college/%.xbm $(OZIMGDIRS)
- 	$(INSTALL_FILE) $< $@
--$(OZIMG)/dict-client/%: images/dict-client/%
-+$(OZIMG)/dict-client/%: images/dict-client/% $(OZIMGDIRS)
- 	$(INSTALL_FILE) $< $@
- 
- 
-diff -ur mozart-1.3.2.20060615.orig/share/elisp/Makefile.in mozart-1.3.2.20060615/share/elisp/Makefile.in
---- mozart-1.3.2.20060615.orig/share/elisp/Makefile.in	2002-04-02 00:31:22.000000000 +1200
-+++ mozart-1.3.2.20060615/share/elisp/Makefile.in	2008-06-02 10:04:05.000000000 +1200
-@@ -75,10 +75,10 @@
- $(ELISPDIR):
- 	$(INSTALL_DIR) $@
- 
--$(ELISPDIR)/%.el: %.el
-+$(ELISPDIR)/%.el: %.el $(ELISPDIR)
- 	$(INSTALL_FILE) $< $@
- 
--$(ELISPDIR)/%.elc: %.elc
-+$(ELISPDIR)/%.elc: %.elc $(ELISPDIR)
- 	$(INSTALL_FILE) $< $@
- 
- clean:
-diff -ur mozart-1.3.2.20060615.orig/share/examples/Makefile.in mozart-1.3.2.20060615/share/examples/Makefile.in
---- mozart-1.3.2.20060615.orig/share/examples/Makefile.in	2003-04-23 21:49:55.000000000 +1200
-+++ mozart-1.3.2.20060615/share/examples/Makefile.in	2008-06-02 10:04:05.000000000 +1200
-@@ -63,15 +63,17 @@
- 	$(FUNCTORS:%=$(OZEX)/fd/graphics/%)
- 
- EXDIRS = \
--	sampler sampler/constraints \
--	fd grammar grammar/shieber \
-+	sampler/constraints \
-+	grammar/shieber \
- 	fd/graphics
- 
- 
- OZEXDIRS = $(EXDIRS:%=$(OZEX)/%)
- 
- 
--$(OZEX) $(OZEXDIRS):
-+$(OZEX):
-+	$(INSTALL_DIR) $@
-+$(OZEXDIRS): $(OZEX)
- 	$(INSTALL_DIR) $@
- 
- FD = \
-@@ -96,19 +98,19 @@
- 	constraints/scheduling-compiler constraints oz
- SAMPLER = $(SAMPLER0:%=$(OZEX)/sampler/%.oz)
- 
--$(OZEX)/fd/%.oz: fd/%.oz
-+$(OZEX)/fd/%.oz: fd/%.oz $(OZEXDIRS)
- 	$(INSTALL_FILE) $< $@
--$(OZEX)/fd/graphics/%.ozf: %.ozf
-+$(OZEX)/fd/graphics/%.ozf: %.ozf $(OZEXDIRS)
- 	$(INSTALL_FILE) $< $@
--$(OZEX)/fd/graphics/%.oz: fd/graphics/%.oz
-+$(OZEX)/fd/graphics/%.oz: fd/graphics/%.oz $(OZEXDIRS)
- 	$(INSTALL_FILE) $< $@
--$(OZEX)/grammar/%.oz: grammar/%.oz
-+$(OZEX)/grammar/%.oz: grammar/%.oz $(OZEXDIRS)
- 	$(INSTALL_FILE) $< $@
--$(OZEX)/grammar/shieber/%.oz: grammar/shieber/%.oz
-+$(OZEX)/grammar/shieber/%.oz: grammar/shieber/%.oz $(OZEXDIRS)
- 	$(INSTALL_FILE) $< $@
--$(OZEX)/sampler/%.oz: sampler/%.oz
-+$(OZEX)/sampler/%.oz: sampler/%.oz $(OZEXDIRS)
- 	$(INSTALL_FILE) $< $@
--$(OZEX)/sampler/constraints/%.oz: sampler/constraints/%.oz
-+$(OZEX)/sampler/constraints/%.oz: sampler/constraints/%.oz $(OZEXDIRS)
- 	$(INSTALL_FILE) $< $@
- 
- 
-diff -ur mozart-1.3.2.20060615.orig/share/lib/Makefile.in mozart-1.3.2.20060615/share/lib/Makefile.in
---- mozart-1.3.2.20060615.orig/share/lib/Makefile.in	2003-12-05 10:55:34.000000000 +1300
-+++ mozart-1.3.2.20060615/share/lib/Makefile.in	2008-06-02 10:04:05.000000000 +1200
-@@ -11,7 +11,7 @@
- PREFIX		= @prefix@
- OZPREFIX	= @prefix@
- 
--OZBIN		= $(PREFIX)/bin
-+BINDIR		= $(PREFIX)/bin
- OZLIB		= $(PREFIX)/share
- IMAGESDIR	= $(OZLIB)/images
- SHELL		= /bin/sh
-@@ -290,7 +290,7 @@
- Builtins.ozf: compiler/Builtins.oz GroundZip.ozf compiler-Builtins.oz
- 
- Unnester.ozf: compiler/Unnester.oz compiler/TupleSyntax.oz \
--	compiler/BindingAnalysis.oz compiler/UnnestFD.oz
-+	compiler/BindingAnalysis.oz compiler/UnnestFD.oz Builtins.ozf
- 
- Annotate.ozf: compiler/Annotate.oz
- 
-@@ -343,14 +343,14 @@
- 	$(FUNCTORS:%=$(OZLIB)/%)
- 
- BINFILES = \
--	$(SYSLETS:%=$(OZBIN)/%)
-+	$(SYSLETS:%=$(BINDIR)/%)
- 
- BOOTINITTXT	= boot-init.ozt
- BOOTOZCTXT	= boot-ozc.ozt
- 
- install: install-main install-images install-cache
- 
--install-main: all $(OZBIN) $(BINFILES)
-+install-main: all $(BINDIR) $(BINFILES)
- 
- NEWCACHEDIR = $(PREFIX)/cache/x-oz/system
- IMAGES1 = mini-dec.xbm mini-inc.xbm
-@@ -376,7 +376,7 @@
- $(NEWCACHEDIR) $(NEWIMAGESDIR):
- 	$(INSTALL_DIR) $@
- 
--$(NEWCACHEDIR)/%: %
-+$(NEWCACHEDIR)/%: % $(NEWCACHEDIR)
- 	$(INSTALL_FILE) $< $@
- 
- $(CACHEDIR):
-@@ -384,19 +384,19 @@
- 	-rm -rf $(CACHEDIR)
- 	$(LN_S) ../../.. $(CACHEDIR)
- 
--$(OZLIB) $(IMAGESDIR) $(OZBIN):
-+$(OZLIB) $(IMAGESDIR) $(BINDIR):
- 	$(INSTALL_DIR) $@
- 
--$(OZLIB)/%.ozf: %.ozf
-+$(OZLIB)/%.ozf: %.ozf $(OZLIB)
- 	$(INSTALL_FILE) $< $@
- 
--$(IMAGESDIR)/%: images/%
-+$(IMAGESDIR)/%: images/% $(IMAGESDIR)
- 	$(INSTALL_FILE) $< $@
- 
--$(OZBIN)/%: %
-+$(BINDIR)/%: % $(BINDIR)
- 	$(INSTALL_BIN) $< $@
- 
--$(OZLIB)/boot-%: boot-%
-+$(OZLIB)/boot-%: boot-% $(OZLIB)
- 	$(INSTALL_FILE) $< $@
- 
- #---------------------------------------------------------------------
-@@ -426,10 +426,10 @@
- .PHONY: bootstrap check
- 
- # use the boot compiler to create the functors
--bootstrap:
--	$(MAKE) boot-unzip boot-init boot-ozc boot-all
-+bootstrap: boot-unzip
-+	$(MAKE) boot-init boot-ozc boot-all
- 
--boot-all:
-+boot-all: boot-init boot-ozc
- 	$(MAKE) all \
- 		OZC=$(SRCDIR)/boot-ozc.sh \
- 		OZENGINE=$(SRCDIR)/oze.sh \
-diff -ur mozart-1.3.2.20060615.orig/share/tools/Makefile.in mozart-1.3.2.20060615/share/tools/Makefile.in
---- mozart-1.3.2.20060615.orig/share/tools/Makefile.in	2002-01-30 01:39:23.000000000 +1300
-+++ mozart-1.3.2.20060615/share/tools/Makefile.in	2008-06-02 10:04:05.000000000 +1200
-@@ -7,7 +7,7 @@
- PREFIX		= @prefix@
- PLATFORM	= @PLATFORM@
- 
--OZBIN		= $(PREFIX)/bin
-+BINDIR		= $(PREFIX)/bin
- OZEX		= $(PREFIX)/examples
- OZEXGUMP	= $(OZEX)/gump
- OZLOADSEP	= @OZLOADSEP@
-@@ -262,21 +262,21 @@
- #---------------------------------------------------------------------
- 
- BINFILES = \
--	$(SYSLETS:%=$(OZBIN)/%)
-+	$(SYSLETS:%=$(BINDIR)/%)
- 
- install: install-main install-cache
- 
- install-main: all \
--	$(OZBIN) $(BINFILES) \
-+	$(BINDIR) $(BINFILES) \
- 	$(OZEX) $(OZEXGUMP) $(EXAMPLEFILES)
- 
--$(OZBIN) $(OZEX) $(OZEXGUMP):
-+$(BINDIR) $(OZEX) $(OZEXGUMP):
- 	$(INSTALL_DIR) $@
- 
--$(OZBIN)/%: %
-+$(BINDIR)/%: % $(BINDIR)
- 	$(INSTALL_BIN) $< $@
- 
--$(OZEXGUMP)/%: gump/examples/%
-+$(OZEXGUMP)/%: gump/examples/% $(OZEXGUMP)
- 	$(INSTALL_FILE) $< $@
- 
- install-cache: \
-@@ -288,13 +288,13 @@
- $(CACHEDIR) $(IMAGESDIR) $(OZCARIMAGESDIR) $(INSPECTORIMAGESDIR):
- 	$(INSTALL_DIR) $@
- 
--$(CACHEDIR)/%: %
-+$(CACHEDIR)/%: % $(CACHEDIR)
- 	$(INSTALL_FILE) $< $@
- 
--$(OZCARIMAGESDIR)/%: ozcar/images/%
-+$(OZCARIMAGESDIR)/%: ozcar/images/% $(OZCARIMAGESDIR)
- 	$(INSTALL_FILE) $< $@
- 
--$(INSPECTORIMAGESDIR)/%: inspector/images/%
-+$(INSPECTORIMAGESDIR)/%: inspector/images/% $(INSPECTORIMAGESDIR)
- 	$(INSTALL_FILE) $< $@
- 
- #---------------------------------------------------------------------
diff --git a/dev-lang/mozart/files/mozart-1.3.2-ri-fpe.patch b/dev-lang/mozart/files/mozart-1.3.2-ri-fpe.patch
deleted file mode 100644
index 0080caf8dd81..000000000000
--- a/dev-lang/mozart/files/mozart-1.3.2-ri-fpe.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ur mozart-1.3.2.20060615.orig/contrib/ri/Makefile.in mozart-1.3.2.20060615/contrib/ri/Makefile.in
---- mozart-1.3.2.20060615.orig/contrib/ri/Makefile.in	2002-07-07 01:05:36.000000000 +1200
-+++ mozart-1.3.2.20060615/contrib/ri/Makefile.in	2007-09-29 17:41:45.000000000 +1200
-@@ -60,8 +60,8 @@
- 		modRI.spec
- 
- ifeq ($(PLATFORM), linux-i486)
--CSRCS    	= fpgetset.c sigfpe.c
--CFLAGS   	+= -DLINUX_IEEE
-+CSRCS    	= 
-+CFLAGS   	+=
- endif
- 
- OZSRCS  	= RI.oz
-diff -ur mozart-1.3.2.20060615.orig/contrib/ri/sigfpe.h mozart-1.3.2.20060615/contrib/ri/sigfpe.h
---- mozart-1.3.2.20060615.orig/contrib/ri/sigfpe.h	2006-03-21 20:36:08.000000000 +1200
-+++ mozart-1.3.2.20060615/contrib/ri/sigfpe.h	2007-09-29 17:33:04.000000000 +1200
-@@ -6,7 +6,6 @@
- #include <fpu_control.h>
- #include <signal.h>
- #include <unistd.h>
--#include <linux/user.h> /* for user_i387_struct */
- 
- #ifdef __cplusplus
- extern "C" {
-@@ -19,7 +18,7 @@
- };
- typedef struct siginfo siginfo_t;
-   */
--typedef struct user_i387_struct ucontext_mozart_t;
-+typedef void ucontext_mozart_t;
- typedef int sigfpe_code_type;
- typedef void (*sigfpe_handler_type)(int, siginfo_t * , ucontext_mozart_t *);
-