Remove old beta version

(Portage version: 2.1.8.3/cvs/Linux x86_64)

11 files changed, 13 insertions, 546 deletions

diff --git a/dev-lang/mercury/ChangeLog b/dev-lang/mercury/ChangeLog
index 0c0ede79519f..a8582095b390 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-lang/mercury
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.123 2010/10/31 00:02:59 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.124 2010/11/03 06:54:29 keri Exp $
+
+  03 Nov 2010; <keri@gentoo.org> -mercury-10.04_beta1.ebuild,
+  -files/mercury-10.04_beta1-atomic-ops.patch,
+  -files/mercury-10.04_beta1-boehm_gc.patch,
+  -files/mercury-10.04_beta1-docs.patch,
+  -files/mercury-10.04_beta1-multilib.patch,
+  -files/mercury-10.04_beta1-no-reconf.patch,
+  -files/mercury-10.04_beta1-ppc-lexer.patch,
+  -files/mercury-10.04_beta1-tests-sandbox.patch,
+  -files/mercury-10.04_beta1-tests-subdir.patch,
+  -files/mercury-10.04_beta1-tests-workspace.patch:
+  Remove old beta version
 
   31 Oct 2010; <keri@gentoo.org> mercury-10.04.2-r1.ebuild,
   +files/mercury-10.04.2-prepare-install-dir.patch:
diff --git a/dev-lang/mercury/files/mercury-10.04_beta1-atomic-ops.patch b/dev-lang/mercury/files/mercury-10.04_beta1-atomic-ops.patch
deleted file mode 100644
index a5e9c0c20bec..000000000000
--- a/dev-lang/mercury/files/mercury-10.04_beta1-atomic-ops.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mercury-compiler-10.04-beta.orig/runtime/mercury_atomic_ops.h	2010-01-10 17:53:39.000000000 +1300
-+++ mercury-compiler-10.04-beta/runtime/mercury_atomic_ops.h	2010-02-14 20:40:45.000000000 +1300
-@@ -310,7 +310,7 @@
- 
-     #define MR_ATOMIC_DEC_INT_AND_IS_ZERO_BODY                              \
-         do {                                                                \
--            is_zero = __sync_sub_and_fetch(addr, 1) == 0;                   \
-+            return (MR_bool)(__sync_sub_and_fetch(addr, 1) == 0);           \
-         } while (0)
- 
- #endif
diff --git a/dev-lang/mercury/files/mercury-10.04_beta1-boehm_gc.patch b/dev-lang/mercury/files/mercury-10.04_beta1-boehm_gc.patch
deleted file mode 100644
index 0a7011700de8..000000000000
--- a/dev-lang/mercury/files/mercury-10.04_beta1-boehm_gc.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-diff -urN mercury-compiler-10.04-beta.orig//boehm_gc/Makefile mercury-compiler-10.04-beta/boehm_gc/Makefile
---- mercury-compiler-10.04-beta.orig//boehm_gc/Makefile	2009-10-10 23:44:13.000000000 +1300
-+++ mercury-compiler-10.04-beta/boehm_gc/Makefile	2010-02-14 18:04:39.000000000 +1300
-@@ -648,6 +648,7 @@
- 	./if_mach SPARC SOLARIS $(CC) -c -o mach_dep2.o $(srcdir)/sparc_mach_dep.S
- 	./if_mach SPARC OPENBSD $(AS) -o mach_dep2.o $(srcdir)/sparc_sunos4_mach_dep.s
- 	./if_mach SPARC NETBSD $(AS) -o mach_dep2.o $(srcdir)/sparc_netbsd_mach_dep.s
-+	./if_mach SPARC LINUX $(CC) -c -o mach_dep2.o $(SPECIALCFLAGS) $(srcdir)/sparc_generic_mach_dep.c
- 	./if_mach SPARC "" $(CC) -c -o mach_dep1.o $(SPECIALCFLAGS) $(srcdir)/mach_dep.c
- 	./if_mach SPARC "" ld -r -o mach_dep.o mach_dep1.o mach_dep2.o
- 	./if_mach IA64 "" as $(AS_ABI_FLAG) -o ia64_save_regs_in_stack.o $(srcdir)/ia64_save_regs_in_stack.s
-diff -urN mercury-compiler-10.04-beta.orig/boehm_gc/sparc_generic_mach_dep.c mercury-compiler-10.04-beta/boehm_gc/sparc_generic_mach_dep.c
---- mercury-compiler-10.04-beta.orig/boehm_gc/sparc_generic_mach_dep.c	1970-01-01 12:00:00.000000000 +1200
-+++ mercury-compiler-10.04-beta/boehm_gc/sparc_generic_mach_dep.c	2010-02-14 19:18:42.000000000 +1300
-@@ -0,0 +1,82 @@
-+# include "private/gc_priv.h"
-+
-+/* On register window machines, we need a way to force registers into 	*/
-+/* the stack.	Return sp.						*/
-+# ifdef SPARC
-+    asm("	.seg 	\"text\"");
-+#   if defined(SVR4) || defined(NETBSD) || defined(FREEBSD)
-+      asm("	.globl	GC_save_regs_in_stack");
-+      asm("GC_save_regs_in_stack:");
-+      asm("	.type GC_save_regs_in_stack,#function");
-+#   else
-+      asm("	.globl	_GC_save_regs_in_stack");
-+      asm("_GC_save_regs_in_stack:");
-+#   endif
-+#   if defined(__arch64__) || defined(__sparcv9)
-+      asm("	save	%sp,-128,%sp");
-+      asm("	flushw");
-+      asm("	ret");
-+      asm("	restore %sp,2047+128,%o0");
-+#   else
-+      asm("	ta	0x3   ! ST_FLUSH_WINDOWS");
-+      asm("	retl");
-+      asm("	mov	%sp,%o0");
-+#   endif
-+#   ifdef SVR4
-+      asm("	.GC_save_regs_in_stack_end:");
-+      asm("	.size GC_save_regs_in_stack,.GC_save_regs_in_stack_end-GC_save_regs_in_stack");
-+#   endif
-+#   ifdef LINT
-+	word GC_save_regs_in_stack() { return(0 /* sp really */);}
-+#   endif
-+# endif
-+
-+/* GC_clear_stack_inner(arg, limit) clears stack area up to limit and	*/
-+/* returns arg.  Stack clearing is crucial on SPARC, so we supply	*/
-+/* an assembly version that's more careful.  Assumes limit is hotter	*/
-+/* than sp, and limit is 8 byte aligned.				*/
-+#if defined(ASM_CLEAR_CODE)
-+# ifdef SUNOS4
-+    asm(".globl _GC_clear_stack_inner");
-+    asm("_GC_clear_stack_inner:");
-+# else
-+    asm(".globl GC_clear_stack_inner");
-+    asm("GC_clear_stack_inner:");
-+    asm(".type GC_save_regs_in_stack,#function");
-+# endif
-+#if defined(__arch64__) || defined(__sparcv9)
-+  asm("mov %sp,%o2");		/* Save sp			*/
-+  asm("add %sp,2047-8,%o3");	/* p = sp+bias-8		*/
-+  asm("add %o1,-2047-192,%sp");	/* Move sp out of the way,	*/
-+  				/* so that traps still work.	*/
-+  				/* Includes some extra words	*/
-+  				/* so we can be sloppy below.	*/
-+  asm("loop:");
-+  asm("stx %g0,[%o3]");		/* *(long *)p = 0		*/
-+  asm("cmp %o3,%o1");
-+  asm("bgu,pt %xcc, loop");	/* if (p > limit) goto loop	*/
-+    asm("add %o3,-8,%o3");	/* p -= 8 (delay slot) */
-+  asm("retl");
-+    asm("mov %o2,%sp");		/* Restore sp., delay slot	*/
-+#else
-+  asm("mov %sp,%o2");		/* Save sp	*/
-+  asm("add %sp,-8,%o3");	/* p = sp-8	*/
-+  asm("clr %g1");		/* [g0,g1] = 0	*/
-+  asm("add %o1,-0x60,%sp");	/* Move sp out of the way,	*/
-+  				/* so that traps still work.	*/
-+  				/* Includes some extra words	*/
-+  				/* so we can be sloppy below.	*/
-+  asm("loop:");
-+  asm("std %g0,[%o3]");		/* *(long long *)p = 0	*/
-+  asm("cmp %o3,%o1");
-+  asm("bgu loop	");		/* if (p > limit) goto loop	*/
-+    asm("add %o3,-8,%o3");	/* p -= 8 (delay slot) */
-+  asm("retl");
-+    asm("mov %o2,%sp");		/* Restore sp., delay slot	*/
-+#endif /* old SPARC */
-+  /* First argument = %o0 = return value */
-+#   ifdef SVR4
-+      asm("	.GC_clear_stack_inner_end:");
-+      asm("	.size GC_clear_stack_inner,.GC_clear_stack_inner_end-GC_clear_stack_inner");
-+#   endif  
-+#endif
diff --git a/dev-lang/mercury/files/mercury-10.04_beta1-docs.patch b/dev-lang/mercury/files/mercury-10.04_beta1-docs.patch
deleted file mode 100644
index 32074b0b3e55..000000000000
--- a/dev-lang/mercury/files/mercury-10.04_beta1-docs.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- mercury-compiler-10.04-beta.orig/doc/Mmakefile	2009-10-02 17:38:22.000000000 +1300
-+++ mercury-compiler-10.04-beta/doc/Mmakefile	2010-02-10 05:45:10.000000000 +1300
-@@ -120,7 +120,7 @@
- 	# formatted versions of the man pages.
- 	# But it might make sense to add them.
- .PHONY: all
--all: $(INFOPAGES) $(DVI) $(HTML) manpages $(MDB_DOC) 
-+all: $(INFOPAGES) $(HTML) manpages $(MDB_DOC) 
- #all: ps pdf text formatted_manpages
- 
- #-----------------------------------------------------------------------------#
-@@ -351,7 +351,7 @@
- 	# versions of the documentation.  If they are added they should
- 	# be installed here.
- .PHONY: install
--install: install_info install_html install_dvi install_manpages \
-+install: install_info install_html install_manpages \
- 	install_mdb_doc
- 	# install_text install_ps
- 
diff --git a/dev-lang/mercury/files/mercury-10.04_beta1-multilib.patch b/dev-lang/mercury/files/mercury-10.04_beta1-multilib.patch
deleted file mode 100644
index a037730f60c1..000000000000
--- a/dev-lang/mercury/files/mercury-10.04_beta1-multilib.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff -u mercury-compiler-10.04-beta.orig/compiler/make.program_target.c mercury-compiler-10.04-beta/compiler/make.program_target.c
---- mercury-compiler-10.04-beta.orig/compiler/make.program_target.c	2010-02-04 12:34:34.000000000 +1300
-+++ mercury-compiler-10.04-beta/compiler/make.program_target.c	2010-02-13 07:43:10.000000000 +1300
-@@ -5449,7 +5449,7 @@
- 		make__program_target__install_grade_init_6_0_i2);
- MR_def_label(make__program_target__install_grade_init_6_0,2)
- 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__install_grade_init_6_0_i3);
- MR_def_label(make__program_target__install_grade_init_6_0,3)
-@@ -5900,7 +5900,7 @@
- 		make__program_target__make_grade_install_dirs_6_0_i2);
- MR_def_label(make__program_target__make_grade_install_dirs_6_0,2)
- 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__make_grade_install_dirs_6_0_i3);
- MR_def_label(make__program_target__make_grade_install_dirs_6_0,3)
-@@ -6336,7 +6336,7 @@
- 	if ((strcmp((char *) (MR_Word *) MR_sv(3), MR_string_const("java", 4)) != 0)) {
- 		MR_GOTO_LAB(make__program_target__install_library_grade_files_10_0_i11);
- 	}
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__install_library_grade_files_10_0_i13);
- MR_def_label(make__program_target__install_library_grade_files_10_0,13)
-@@ -6393,7 +6393,7 @@
- 	if ((strcmp((char *) (MR_Word *) MR_sv(3), MR_string_const("erlang", 6)) != 0)) {
- 		MR_GOTO_LAB(make__program_target__install_library_grade_files_10_0_i19);
- 	}
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__install_library_grade_files_10_0_i21);
- MR_def_label(make__program_target__install_library_grade_files_10_0,21)
-@@ -6458,7 +6458,7 @@
- 		make__program_target__install_library_grade_files_10_0_i41);
- MR_def_label(make__program_target__install_library_grade_files_10_0,19)
- 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__install_library_grade_files_10_0_i28);
- MR_def_label(make__program_target__install_library_grade_files_10_0,28)
-@@ -6595,7 +6595,7 @@
- 		make__program_target__make_install_dirs_5_0_i2);
- MR_def_label(make__program_target__make_install_dirs_5_0,2)
- 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__make_install_dirs_5_0_i3);
- MR_def_label(make__program_target__make_install_dirs_5_0,3)
-@@ -6816,7 +6816,7 @@
- 		make__program_target__install_library_7_0_i11);
- MR_def_label(make__program_target__install_library_7_0,11)
- 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__install_library_7_0_i12);
- MR_def_label(make__program_target__install_library_7_0,12)
-@@ -10604,7 +10604,7 @@
- 		make__program_target__install_ints_and_headers_8_0_i13);
- MR_def_label(make__program_target__install_ints_and_headers_8_0,13)
- 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__install_ints_and_headers_8_0_i14);
- MR_def_label(make__program_target__install_ints_and_headers_8_0,14)
-@@ -11233,7 +11233,7 @@
- 		make__program_target__install_grade_ints_and_headers_9_0_i5);
- MR_def_label(make__program_target__install_grade_ints_and_headers_9_0,5)
- 	MR_MAYBE_INIT_LOCAL_THREAD_ENGINE_BASE
--	MR_r2 = (MR_Word) MR_string_const("lib", 3);
-+	MR_r2 = (MR_Word) MR_string_const("@libdir@", 3);
- 	MR_np_call_localret_ent(fn__f_100_105_114_95_95_47_2_0,
- 		make__program_target__install_grade_ints_and_headers_9_0_i6);
- MR_def_label(make__program_target__install_grade_ints_and_headers_9_0,6)
-diff -u mercury-compiler-10.04-beta.orig/scripts/Mmake.vars.in mercury-compiler-10.04-beta/scripts/Mmake.vars.in
---- mercury-compiler-10.04-beta.orig/scripts/Mmake.vars.in	2009-08-18 17:10:40.000000000 +1200
-+++ mercury-compiler-10.04-beta/scripts/Mmake.vars.in	2010-02-13 07:48:26.000000000 +1300
-@@ -688,18 +688,18 @@
- INSTALL_PREFIX		= @prefix@
- FINAL_INSTALL_PREFIX	= @prefix@
- INSTALL_BINDIR		= $(INSTALL_PREFIX)/bin
--INSTALL_LIBDIR		= $(INSTALL_PREFIX)/lib/mercury
--FINAL_INSTALL_LIBDIR	= $(FINAL_INSTALL_PREFIX)/lib/mercury
--INSTALL_JAVA_LIBRARY_DIR= $(INSTALL_PREFIX)/lib/mercury/lib/java
-+INSTALL_LIBDIR		= $(INSTALL_PREFIX)/@libdir@/mercury
-+FINAL_INSTALL_LIBDIR	= $(FINAL_INSTALL_PREFIX)/@libdir@/mercury
-+INSTALL_JAVA_LIBRARY_DIR= $(INSTALL_PREFIX)/@libdir@/mercury/lib/java
- INSTALL_INFO_DIR	= $(INSTALL_PREFIX)/info
--INSTALL_DVI_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
--INSTALL_TEXT_DIR	= $(INSTALL_PREFIX)/lib/mercury/doc
--INSTALL_PS_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
--INSTALL_PDF_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
-+INSTALL_DVI_DIR		= $(INSTALL_PREFIX)/@libdir@/mercury/doc
-+INSTALL_TEXT_DIR	= $(INSTALL_PREFIX)/@libdir@/mercury/doc
-+INSTALL_PS_DIR		= $(INSTALL_PREFIX)/@libdir@/mercury/doc
-+INSTALL_PDF_DIR		= $(INSTALL_PREFIX)/@libdir@/mercury/doc
- INSTALL_MAN_DIR		= $(INSTALL_PREFIX)/man
--INSTALL_HTML_DIR	= $(INSTALL_PREFIX)/lib/mercury/html
--INSTALL_MDB_DOC_DIR	= $(INSTALL_PREFIX)/lib/mercury/mdb
--INSTALL_ELISP_DIR	= $(INSTALL_PREFIX)/lib/mercury/elisp
-+INSTALL_HTML_DIR	= $(INSTALL_PREFIX)/@libdir@/mercury/html
-+INSTALL_MDB_DOC_DIR	= $(INSTALL_PREFIX)/@libdir@/mercury/mdb
-+INSTALL_ELISP_DIR	= $(INSTALL_PREFIX)/@libdir@/mercury/elisp
- INSTALL_CGI_DIR		= @CGIDIR@
- 
- # You should not need to override anything below here
diff --git a/dev-lang/mercury/files/mercury-10.04_beta1-no-reconf.patch b/dev-lang/mercury/files/mercury-10.04_beta1-no-reconf.patch
deleted file mode 100644
index 5c9601737302..000000000000
--- a/dev-lang/mercury/files/mercury-10.04_beta1-no-reconf.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -ur mercury-compiler-10.04-beta.orig/runtime/Mmakefile mercury-compiler-10.04-beta/runtime/Mmakefile
---- mercury-compiler-10.04-beta.orig/runtime/Mmakefile	2009-12-03 18:28:00.000000000 +1300
-+++ mercury-compiler-10.04-beta/runtime/Mmakefile	2010-02-10 05:47:50.000000000 +1300
-@@ -460,8 +460,6 @@
- 		mkdir -p $(INSTALL_GRADE_MODULE_DIR)
- 	-[ -d $(INSTALL_MERC_LIB_DIR) ] || mkdir -p $(INSTALL_MERC_LIB_DIR)
- 	-[ -d $(INSTALL_CONF_DIR) ] || mkdir -p $(INSTALL_CONF_DIR)
--	-[ -d $(INSTALL_RECONF_DIR)/runtime ] || \
--		mkdir -p $(INSTALL_RECONF_DIR)/runtime
- 
- ifneq "$(filter java% erlang%,$(GRADE))" ""
- 
-@@ -507,7 +505,6 @@
- 	rm -f $(INSTALL_INC_DIR)/mercury_conf.h
- 	cp `vpath_find mercury_conf.h` $(INSTALL_CONF_DIR)
- 	-chmod u+w $(INSTALL_CONF_DIR)/mercury_conf.h
--	cp `vpath_find mercury_conf.h.in` $(INSTALL_RECONF_DIR)/runtime
- 	cp `vpath_find $(MACHHDRS)` $(INSTALL_INC_DIR)/machdeps
- 
- .PHONY: install_init
-diff -ur mercury-compiler-10.04-beta.orig/scripts/Mmakefile mercury-compiler-10.04-beta/scripts/Mmakefile
---- mercury-compiler-10.04-beta.orig/scripts/Mmakefile	2009-09-02 11:54:38.000000000 +1200
-+++ mercury-compiler-10.04-beta/scripts/Mmakefile	2010-02-10 05:50:28.000000000 +1300
-@@ -24,17 +24,13 @@
- 	canonical_grade \
- 	mdb \
- 	mdprof \
--	mercury.bat \
--	mercury_config \
- 	mercury_update_interface \
- 	mgnuc \
--	mkfifo_using_mknod \
- 	ml \
- 	mmake \
- 	mmc \
- 	mprof \
--	mtags \
--	prepare_install_dir
-+	mtags
- 
- SCRIPTS = $(NONCONF_SCRIPTS) $(CONF_SCRIPTS)
- 
-@@ -113,8 +109,6 @@
- 	[ -d $(INSTALL_LIBDIR)/mdb ] || mkdir -p $(INSTALL_LIBDIR)/mdb
- 	[ -d $(INSTALL_CONF_DIR) ] || mkdir -p $(INSTALL_CONF_DIR)
- 	[ -d $(INSTALL_ELISP_DIR) ] || mkdir -p $(INSTALL_ELISP_DIR)
--	[ -d $(INSTALL_RECONF_DIR)/scripts ] || \
--		mkdir -p $(INSTALL_RECONF_DIR)/scripts
- 
- .PHONY: install_mmake
- install_mmake: Mmake.vars Mmake.rules install_dirs
-@@ -132,7 +126,6 @@
- 	-for file in $(SCRIPTS); do \
- 		chmod u+w $(INSTALL_BINDIR)/$$file ;\
- 	done
--	cp *.in *.sh-subr $(SCRIPTS) $(INSTALL_RECONF_DIR)/scripts
- 	-rm -f $(INSTALL_BINDIR)/mmake.old
- 
- .PHONY: install_config
diff --git a/dev-lang/mercury/files/mercury-10.04_beta1-ppc-lexer.patch b/dev-lang/mercury/files/mercury-10.04_beta1-ppc-lexer.patch
deleted file mode 100644
index 15609787af10..000000000000
--- a/dev-lang/mercury/files/mercury-10.04_beta1-ppc-lexer.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- mercury-compiler-10.04-beta.orig/library/Mmakefile	2009-11-05 14:59:45.000000000 +1300
-+++ mercury-compiler-10.04-beta/library/Mmakefile	2010-04-25 19:27:49.000000000 +1200
-@@ -37,6 +37,9 @@
- # Module-specific options should go in Mercury.options so they
- # can be found by `mmc --make'.
- include Mercury.options
-+ifeq ("$(ARCH)","ppc")
-+MGNUCFLAGS-lexer += -O0
-+endif
- 
- MERCURY_MAIN_MODULES = mer_std
- 
diff --git a/dev-lang/mercury/files/mercury-10.04_beta1-tests-sandbox.patch b/dev-lang/mercury/files/mercury-10.04_beta1-tests-sandbox.patch
deleted file mode 100644
index d5bf0deffd45..000000000000
--- a/dev-lang/mercury/files/mercury-10.04_beta1-tests-sandbox.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -urN mercury-tests-10.04-beta.orig/hard_coded/dir_test.exp mercury-tests-10.04-beta/hard_coded/dir_test.exp
---- mercury-tests-10.04-beta.orig/hard_coded/dir_test.exp	2007-09-21 15:21:35.000000000 +1200
-+++ mercury-tests-10.04-beta/hard_coded/dir_test.exp	2010-02-15 20:13:25.000000000 +1300
-@@ -130,7 +130,6 @@
- "foo"/"bar/baz" = "foo\bar\baz".

- "foo/"/"bar/baz" = "foo\bar\baz".

- checking whether `unwritable' is readable...ok

--unwritable file found to be unwritable

- current_directory succeeded: hard_coded

- make_directory succeeded

- make_directory succeeded

-diff -u mercury-tests-10.04-beta.orig/hard_coded/dir_test.exp2 mercury-tests-10.04-beta/hard_coded/dir_test.exp2
---- mercury-tests-10.04-beta.orig/hard_coded/dir_test.exp2	2007-10-01 18:40:43.000000000 +1300
-+++ mercury-tests-10.04-beta/hard_coded/dir_test.exp2	2010-02-15 19:38:42.000000000 +1300
-@@ -127,7 +127,6 @@
- "foo"/"bar/baz" = "foo/bar/baz".
- "foo/"/"bar/baz" = "foo/bar/baz".
- checking whether `unwritable' is readable...ok
--unwritable file found to be unwritable
- current_directory succeeded: hard_coded
- make_directory succeeded
- make_directory succeeded
-diff -u mercury-tests-10.04-beta.orig/hard_coded/dir_test.exp3 mercury-tests-10.04-beta/hard_coded/dir_test.exp3
---- mercury-tests-10.04-beta.orig/hard_coded/dir_test.exp3	2007-10-01 18:40:43.000000000 +1300
-+++ mercury-tests-10.04-beta/hard_coded/dir_test.exp3	2010-02-15 19:38:57.000000000 +1300
-@@ -130,7 +130,6 @@
- "foo"/"bar/baz" = "foo/bar/baz".
- "foo/"/"bar/baz" = "foo/bar/baz".
- checking whether `unwritable' is readable...ok
--unwritable file found to be unwritable
- current_directory succeeded: hard_coded
- make_directory succeeded
- make_directory succeeded
-diff -u mercury-tests-10.04-beta.orig/hard_coded/dir_test.m mercury-tests-10.04-beta/hard_coded/dir_test.m
---- mercury-tests-10.04-beta.orig/hard_coded/dir_test.m	2007-09-21 15:21:36.000000000 +1200
-+++ mercury-tests-10.04-beta/hard_coded/dir_test.m	2010-02-15 19:39:25.000000000 +1300
-@@ -50,16 +50,6 @@
- 	io__write(ReadResult),
- 	io__nl,
- 
--	io__check_file_accessibility("unwritable",
--		[read, write], WriteResult),
--	( { WriteResult = ok } ->
--		io__write_string(
--		"Error: unwritable file found to be writable\n")
--	;
--		io__write_string(
--		"unwritable file found to be unwritable\n")
--	),
--
- 	dir__current_directory(CwdResult),
- 	(
- 	    { CwdResult = ok(Cwd) },
diff --git a/dev-lang/mercury/files/mercury-10.04_beta1-tests-subdir.patch b/dev-lang/mercury/files/mercury-10.04_beta1-tests-subdir.patch
deleted file mode 100644
index 930c1a1bfb3a..000000000000
--- a/dev-lang/mercury/files/mercury-10.04_beta1-tests-subdir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- mercury-tests-10.04-beta.orig/Mmake.common	2009-08-14 15:21:53.000000000 +1200
-+++ mercury-tests-10.04-beta/Mmake.common	2010-02-15 19:09:51.000000000 +1300
-@@ -379,12 +379,7 @@
- 
- .PHONY: $(RUNTESTS_IN_SUBDIRS)
- $(RUNTESTS_IN_SUBDIRS): runtests_in_%:
--	+if (cd $* && mmake runtests) ; then \
--		true ; \
--	else \
--		echo Could not run tests in directory $* ; \
--		echo Could not run tests in directory $* >> NOMAKE_DIRS ; \
--	fi
-+	+cd $* && mmake runtests
- 
- realclean_subdirs:
- 	+succeeded=true; \
diff --git a/dev-lang/mercury/files/mercury-10.04_beta1-tests-workspace.patch b/dev-lang/mercury/files/mercury-10.04_beta1-tests-workspace.patch
deleted file mode 100644
index 04999eb3fefc..000000000000
--- a/dev-lang/mercury/files/mercury-10.04_beta1-tests-workspace.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- mercury-tests-10.04-beta.orig/Mmake.common	2009-08-14 15:21:53.000000000 +1200
-+++ mercury-tests-10.04-beta/Mmake.common	2010-02-11 18:43:14.000000000 +1300
-@@ -79,8 +79,8 @@
- -include $(TESTS_DIR)/Mmake.params
- 
- MCFLAGS += --flags $(TESTS_DIR)/TESTS_FLAGS
--ifdef WORKSPACE_FLAGS
--MCFLAGS += --flags $(TESTS_DIR)/WS_FLAGS
-+ifdef WORKSPACE
-+MCFLAGS += --flags $(TESTS_DIR)/WS_FLAGS.ws
- endif
- 
- # Avoid trying to make this file with `mmc --make' if it doesn't exist.
---- mercury-compiler-10.04-beta.orig/configure	2010-02-03 18:50:14.000000000 +1300
-+++ mercury-compiler-10.04-beta/configure	2010-02-11 18:46:48.000000000 +1300
-@@ -14688,10 +14688,10 @@
-     test_flags="tests/TESTS_FLAGS"
-     test_mdbrc="tests/mdbrc"
- else
--    if test -e ../tests/TESTS_FLAGS.in
-+    if test -e ../mercury-tests-10.04-beta/TESTS_FLAGS.in
-     then
--        test_flags="../tests/TESTS_FLAGS"
--        test_mdbrc="../tests/mdbrc"
-+        test_flags="../mercury-tests-10.04-beta/TESTS_FLAGS"
-+        test_mdbrc="../mercury-tests-10.04-beta/mdbrc"
-     else
-         test_flags=""
-         test_mdbrc=""
diff --git a/dev-lang/mercury/mercury-10.04_beta1.ebuild b/dev-lang/mercury/mercury-10.04_beta1.ebuild
deleted file mode 100644
index c929d55383ee..000000000000
--- a/dev-lang/mercury/mercury-10.04_beta1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-10.04_beta1.ebuild,v 1.6 2010/04/11 00:21:19 keri Exp $
-
-inherit elisp-common eutils flag-o-matic java-pkg-opt-2 multilib
-
-MY_PV=${PV/%?/}
-MY_P=${PN}-compiler-${MY_PV/_/-}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
-SRC_URI="http://www.mercury.cs.mu.oz.au/download/files/beta-releases/10.04-beta/mercury-compiler-10.04-beta.tar.gz
-	test? ( http://www.mercury.cs.mu.oz.au/download/files/beta-releases/10.04-beta/mercury-tests-10.04-beta.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-IUSE="debug emacs java minimal readline test threads"
-
-DEPEND="!dev-libs/mpatrol
-	!dev-util/mono-debugger
-	readline? ( sys-libs/readline )
-	java? ( >=virtual/jdk-1.5 )"
-
-RDEPEND="${DEPEND}
-	emacs? ( virtual/emacs )"
-
-S="${WORKDIR}"/${MY_P}
-TESTDIR="${WORKDIR}"/${PN}-tests-${MY_PV/_/-}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}"/${P}-multilib.patch
-	epatch "${FILESDIR}"/${P}-boehm_gc.patch
-	epatch "${FILESDIR}"/${P}-atomic-ops.patch
-	epatch "${FILESDIR}"/${P}-docs.patch
-	epatch "${FILESDIR}"/${P}-no-reconf.patch
-	epatch "${FILESDIR}"/${P}-ppc-lexer.patch
-
-	sed -i -e "s/@libdir@/$(get_libdir)/" \
-		"${S}"/compiler/make.program_target.c \
-		"${S}"/scripts/Mmake.vars.in
-
-	if use test; then
-		epatch "${FILESDIR}"/${P}-tests-workspace.patch
-		epatch "${FILESDIR}"/${P}-tests-subdir.patch
-		epatch "${FILESDIR}"/${P}-tests-sandbox.patch
-	fi
-}
-
-src_compile() {
-	strip-flags
-
-	local myconf
-	myconf="--libdir=/usr/$(get_libdir) \
-		--disable-gcc-back-end \
-		--disable-aditi-back-end \
-		--disable-deep-profiler \
-		--disable-dotnet-grades \
-		$(use_enable java java-grade) \
-		$(use_enable debug debug-grades) \
-		$(use_enable threads par-grades) \
-		$(use_enable !minimal most-grades) \
-		$(use_with readline)"
-
-	econf \
-		${myconf} \
-		|| die "econf failed"
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		EXTRA_MLFLAGS=--no-strip \
-		|| die "emake failed"
-}
-
-src_test() {
-	TEST_GRADE=`scripts/ml --print-grade`
-	TWS="${S}"
-
-	cd "${TESTDIR}"
-	sed -i -e "s:@WORKSPACE@:${TWS}:" WS_FLAGS.ws
-
-	PATH="${TWS}"/scripts:"${TWS}"/util:"${TWS}"/slice:"${PATH}" \
-	TERM="" \
-	WORKSPACE="${TWS}" \
-	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-	MERCURY_CONFIG_DIR="${TWS}" \
-	MMAKE_DIR="${TWS}"/scripts \
-	MERCURY_SUPPRESS_STACK_TRACE=yes \
-	GRADE=${TEST_GRADE} \
-	MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc \
-					-I${TWS}/boehm_gc/include \
-					-I${TWS}/runtime \
-					-I${TWS}/library \
-					-I${TWS}/mdbcomp \
-					-I${TWS}/browser \
-					-I${TWS}/trace" \
-		mmake || die "mmake test failed"
-}
-
-src_install() {
-	emake \
-		PARALLEL=${MAKEOPTS} \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		INSTALL_PREFIX="${D}"/usr \
-		INSTALL_MAN_DIR="${D}"/usr/share/man \
-		INSTALL_INFO_DIR="${D}"/usr/share/info \
-		INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \
-		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-		install || die "make install failed"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-
-	dodoc \
-		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-		RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}