Remove old development snapshots from the tree.

(Portage version: 2.1_pre7-r5)

26 files changed, 22 insertions, 1498 deletions

diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog
index eb935cc3a59e..fff70be3ef27 100644
--- a/dev-lang/mercury-extras/ChangeLog
+++ b/dev-lang/mercury-extras/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for dev-lang/mercury-extras
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.12 2006/04/25 01:22:13 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.13 2006/04/25 01:45:34 keri Exp $
+
+  25 Apr 2006; Keri Harris <keri@gentoo.org>
+  -files/mercury-extras-0.13.0_beta-concurrency.patch,
+  -files/mercury-extras-0.13.0_beta-gcc4.patch,
+  -files/mercury-extras-0.13.0_beta-odbc.patch,
+  -files/mercury-extras-0.13.0_beta-r1-gcc4.patch,
+  -files/mercury-extras-0.13.0_beta-r1-odbc.patch,
+  -files/mercury-extras-0.13.0_beta-r1-trailed_update.patch,
+  -files/mercury-extras-0.13.0_beta2-gcc4.patch,
+  -files/mercury-extras-0.13.0_beta2-odbc.patch,
+  -files/mercury-extras-0.13.0_beta2-trailed_update.patch,
+  -files/mercury-extras-0.13.0_beta3-gcc4.patch,
+  -files/mercury-extras-0.13.0_beta3-odbc.patch,
+  -files/mercury-extras-0.13.0_beta3-trailed_update.patch,
+  -files/mercury-extras-0.13.0_beta4-concurrency.patch,
+  -files/mercury-extras-0.13.0_beta4-odbc.patch,
+  -files/mercury-extras-0.13.0_beta4-trailed_update.patch,
+  -mercury-extras-0.13.0_beta.ebuild, -mercury-extras-0.13.0_beta-r1.ebuild,
+  -mercury-extras-0.13.0_beta2.ebuild, -mercury-extras-0.13.0_beta3.ebuild,
+  -mercury-extras-0.13.0_beta4.ebuild:
+  Remove old development snapshots from the tree.
 
 *mercury-extras-0.13.0_beta5 (25 Apr 2006)
 
diff --git a/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta b/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta
deleted file mode 100644
index 5fc87d918351..000000000000
--- a/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1f1797225580e4ec109506e972235212 mercury-extras-0.13.0-beta-2006-04-03-unstable.tar.gz 873234
-RMD160 2a3e0a802b67ff8c5d32b2eb7dcffb8fafed87d5 mercury-extras-0.13.0-beta-2006-04-03-unstable.tar.gz 873234
-SHA256 b59464b9339ab33e6258fea8ba40a776453d79d2072255c5720c3c650b06c5c3 mercury-extras-0.13.0-beta-2006-04-03-unstable.tar.gz 873234
diff --git a/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta-r1 b/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta-r1
deleted file mode 100644
index a76e82b3e47f..000000000000
--- a/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 10954407aba82451b8bacfe8f6bbc8c3 mercury-extras-0.13.0-beta-2006-04-09-unstable.tar.gz 873234
-RMD160 8512f4325d783aebc9704d36adc1cab706351dde mercury-extras-0.13.0-beta-2006-04-09-unstable.tar.gz 873234
-SHA256 bb9210cf60179d5442dcf708fadc43bf8b371765021c3f6ef2d1e4fe107e4ac2 mercury-extras-0.13.0-beta-2006-04-09-unstable.tar.gz 873234
diff --git a/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta2 b/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta2
deleted file mode 100644
index a9eca221f90d..000000000000
--- a/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1655058401b950484c1c2a8aa34d41b3 mercury-extras-0.13.0-beta-2006-04-11-unstable.tar.gz 873407
-RMD160 3380a889d81801be0250ebcc989df5317f8674a1 mercury-extras-0.13.0-beta-2006-04-11-unstable.tar.gz 873407
-SHA256 0505b5826e52b4fdced4c55a11305eb190ad788197a64f727b0bd86bd12864b7 mercury-extras-0.13.0-beta-2006-04-11-unstable.tar.gz 873407
diff --git a/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta3 b/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta3
deleted file mode 100644
index 201ea38db996..000000000000
--- a/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4f966ffb2afe4df1a5aa3f69bba50c0c mercury-extras-0.13.0-beta-2006-04-19-unstable.tar.gz 873443
-RMD160 526ebdd20471ef4e4acdd8d5deff24e99a209ad0 mercury-extras-0.13.0-beta-2006-04-19-unstable.tar.gz 873443
-SHA256 2ac21ce83e917c6ad9b68e6fc647cf0e67cb5c31180c89195217d8089a4b066f mercury-extras-0.13.0-beta-2006-04-19-unstable.tar.gz 873443
diff --git a/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta4 b/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta4
deleted file mode 100644
index b8117980fe6d..000000000000
--- a/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 022e64f667d140c0fb1ce9a31b3ae62c mercury-extras-0.13.0-beta-2006-04-21-unstable.tar.gz 873600
-RMD160 79c04bc0ae4e3de2f2d77a8cd6fd0614c9e9ac8d mercury-extras-0.13.0-beta-2006-04-21-unstable.tar.gz 873600
-SHA256 2acd97f8e4a994e09488da4b2fde51ffb568852d62863cc6a71abf160a757422 mercury-extras-0.13.0-beta-2006-04-21-unstable.tar.gz 873600
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-concurrency.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-concurrency.patch
deleted file mode 100644
index 163c10f9a351..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-concurrency.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- mercury-extras-0.13.0-beta-2006-04-03.orig/concurrency/Mmakefile	2003-01-16 23:44:13.000000000 +1300
-+++ mercury-extras-0.13.0-beta-2006-04-03/concurrency/Mmakefile	2006-03-26 18:45:21.000000000 +1200
-@@ -8,6 +8,8 @@
- 
- TESTS = philo philo2 philo3 midimon
- 
-+LIBGRADES := $(LIBGRADES:hlc.gc=)
-+
- -include ../Mmake.params
- 
- default_target: all
---- mercury-extras-0.13.0-beta-2006-04-03.orig/concurrency/midimon.m	2004-07-30 19:03:45.000000000 +1200
-+++ mercury-extras-0.13.0-beta-2006-04-03/concurrency/midimon.m	2006-04-07 23:33:19.000000000 +1200
-@@ -12,6 +12,7 @@
- :- import_module midi.
- :- import_module global, stream, spawn.
- :- import_module bool, getopt, int, list, require, std_util, string.
-+:- import_module maybe.
- 
- main -->
- 	io__command_line_arguments(Args0),
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-gcc4.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-gcc4.patch
deleted file mode 100644
index ab8d0f851f6d..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-gcc4.patch
+++ /dev/null
@@ -1,361 +0,0 @@
---- mercury-extras-0.13.0-beta-2006-04-03.orig/concurrency/global.m	2003-03-01 04:20:33.000000000 +1300
-+++ mercury-extras-0.13.0-beta-2006-04-03/concurrency/global.m	2006-04-06 07:13:50.000000000 +1200
-@@ -54,7 +54,7 @@
- :- pragma c_code(global__new(Thing::in, Glob::out, IO0::di, IO::uo),
- 		will_not_call_mercury, "{
- 	MR_Word *tmp;
--	MR_incr_hp((MR_Word) tmp, 1);
-+	MR_incr_hp((*(MR_Word*)&(tmp)), 1);
- 	*tmp = Thing;
- 	Glob = (MR_Word) tmp;
- 	IO = IO0;
---- mercury-extras-0.13.0-beta-2006-04-03.orig/curs/curs.m	2005-10-26 18:04:14.000000000 +1300
-+++ mercury-extras-0.13.0-beta-2006-04-03/curs/curs.m	2006-04-06 06:57:00.000000000 +1200
-@@ -965,7 +965,7 @@
-         wattrset(w, Attr);
-         wcolor_set(w, Attr, NULL);
-         wclear(w);
--        (PANEL *)Panel = new_panel(w);
-+        (*(PANEL**)&(Panel)) = new_panel(w);
- 
-         IO = IO0;
-     
---- mercury-extras-0.13.0-beta-2006-04-03.orig/graphics/mercury_tcltk/mtcltk.m	2005-08-15 16:11:42.000000000 +1200
-+++ mercury-extras-0.13.0-beta-2006-04-03/graphics/mercury_tcltk/mtcltk.m	2006-04-06 06:56:32.000000000 +1200
-@@ -141,7 +141,7 @@
- 		argc++;
- 	}
- 
--	MR_incr_hp(MR_LVALUE_CAST(MR_Word, argv), argc + 1);
-+	MR_incr_hp((*(MR_Word*)&(argv)), argc + 1);
- 
- 	for (i = 0, l = Args; l != list_empty(); l = list_tail(l), i++) {
- 		argv[i] = (char *) MR_list_head(l);
---- mercury-extras-0.13.0-beta-2006-04-03.orig/odbc/odbc.m	2006-03-30 13:21:18.000000000 +1200
-+++ mercury-extras-0.13.0-beta-2006-04-03/odbc/odbc.m	2006-04-06 07:10:14.000000000 +1200
-@@ -1051,15 +1051,15 @@
- 						*/
- } MODBC_Statement;
- 
--static SQLRETURN odbc_do_cleanup_statement(MODBC_Statement *stat);
-+static SQLRETURN odbc_do_cleanup_statement(MODBC_Statement *statement);
- static size_t sql_type_to_size(SWORD sql_type, UDWORD cbColDef, 
- 		SWORD ibScale, SWORD fNullable);
- static MODBC_AttrType sql_type_to_attribute_type(SWORD sql_type);
- static SWORD attribute_type_to_sql_c_type(MODBC_AttrType AttrType);
- static MR_bool is_variable_length_sql_type(SWORD);
--void odbc_do_get_data(MODBC_Statement *stat, int column_id);
--void odbc_get_data_in_chunks(MODBC_Statement *stat, int column_id);
--void odbc_get_data_in_one_go(MODBC_Statement *stat, int column_id);
-+void odbc_do_get_data(MODBC_Statement *statement, int column_id);
-+void odbc_get_data_in_chunks(MODBC_Statement *statement, int column_id);
-+void odbc_get_data_in_one_go(MODBC_Statement *statement, int column_id);
- ").
- 
- %-----------------------------------------------------------------------------%
-@@ -1322,38 +1322,38 @@
- 		Status::out, DB0::di, DB::uo),
- 		may_call_mercury,
- "{
--	MODBC_Statement *stat;
-+	MODBC_Statement *statement;
- 
--	stat = (MODBC_Statement *) Statement0;
-+	statement = (MODBC_Statement *) Statement0;
- 
--	MR_assert(stat != NULL);
-+	MR_assert(statement != NULL);
- 
--	if (stat->num_rows == 0 ) {
-+	if (statement->num_rows == 0 ) {
- 		MR_DEBUG(printf(""Fetching rows...\\n""));
- 	}
- 
- 	/* Fetching new row */
--	Status = SQLFetch(stat->stat_handle);
-+	Status = SQLFetch(statement->stat_handle);
- 
- 	if (Status != SQL_NO_DATA_FOUND && 
- 			! odbc_check(odbc_env_handle, odbc_connection, 
--				stat->stat_handle, Status))
-+				statement->stat_handle, Status))
- 	{
--		odbc_do_cleanup_statement(stat);
-+		odbc_do_cleanup_statement(statement);
- 		odbc_throw();
- 		/* not reached */
- 	}
- 
- 	/* Update number of rows fetched */
- 	if (Status == SQL_SUCCESS) {
--		stat->num_rows++;
-+		statement->num_rows++;
- 	}
- 
- 	if (Status == SQL_NO_DATA_FOUND) {
--		MR_DEBUG(printf(""Fetched %d rows\\n"", stat->num_rows));
-+		MR_DEBUG(printf(""Fetched %d rows\\n"", statement->num_rows));
- 	}
- 
--	Statement = (MR_Word) stat;
-+	Statement = (MR_Word) statement;
- 	DB = DB0;
- 
- }").
-@@ -1368,13 +1368,13 @@
- 		Statement::uo, DB0::di, DB::uo), 
- 		will_not_call_mercury,
- "{
--	MODBC_Statement * stat;
-+	MODBC_Statement * statement;
- 
--	stat = (MODBC_Statement *) Statement0;
-+	statement = (MODBC_Statement *) Statement0;
- 
--	MR_assert(stat != NULL);
-+	MR_assert(statement != NULL);
- 		
--	NumColumns = stat->num_columns;
-+	NumColumns = statement->num_columns;
- 	DB = DB0;
- 	Statement = Statement0;
- }").
-@@ -1390,25 +1390,25 @@
- 		may_call_mercury,
- "{
- 
--	MODBC_Statement *stat;
-+	MODBC_Statement *statement;
- 	MODBC_Column 	*col;
- 	SQLRETURN 	rc;
- 	SDWORD		column_info;
- 
--	stat = (MODBC_Statement *) Statement0;
-+	statement = (MODBC_Statement *) Statement0;
- 
--	MR_assert(stat != NULL);
--	MR_assert(stat->row != NULL);
-+	MR_assert(statement != NULL);
-+	MR_assert(statement->row != NULL);
- 
--	MR_DEBUG(printf(""Getting column %i\n"", (int) Column));
-+	MR_DEBUG(printf(""Getting column %i\\n"", (int) Column));
- 
--	if (stat->binding_type == MODBC_GET_DATA) {
-+	if (statement->binding_type == MODBC_GET_DATA) {
- 
- 		/* Slurp up the data for this column. */ 
--		odbc_do_get_data(stat, Column);
-+		odbc_do_get_data(statement, Column);
- 	}
- 
--	col = &(stat->row[Column]);
-+	col = &(statement->row[Column]);
- 
- 	if (col->value_info == SQL_NULL_DATA) {
- 		Type = MODBC_NULL;
-@@ -1436,7 +1436,7 @@
- 			odbc_message_list =
- 				MR_list_cons(overflow_message,
- 					odbc_message_list);
--			odbc_do_cleanup_statement(stat);
-+			odbc_do_cleanup_statement(statement);
- 			odbc_throw();
- 		}
- 		break;
-@@ -1481,7 +1481,7 @@
- 		break;
- 	} /* end switch (Type) */
- 
--	Statement = (MR_Word) stat;
-+	Statement = (MR_Word) statement;
- 	DB = DB0;
- 
- } /* end odbc__get_data() */
-@@ -1490,7 +1490,7 @@
- :- pragma c_code("
- 
- void
--odbc_do_get_data(MODBC_Statement *stat, int column_id)
-+odbc_do_get_data(MODBC_Statement *statement, int column_id)
- {
- 	MODBC_Column 	*column;
- 	SQLRETURN 	rc;
-@@ -1500,11 +1500,11 @@
- 					 ** byte and nothing else.
- 					 */
- 
--	column = &(stat->row[column_id]);
-+	column = &(statement->row[column_id]);
- 	if (column->attr_type == MODBC_VAR_STRING) {
- 
- 		/* Just get the length first time through. */
--		rc = SQLGetData(stat->stat_handle, column_id,
-+		rc = SQLGetData(statement->stat_handle, column_id,
- 				column->conversion_type, dummy_buffer, 
- 				1, &(column->value_info));
- 
-@@ -1516,9 +1516,9 @@
- 		if (rc != SQL_SUCCESS_WITH_INFO &&
- 				! odbc_check(odbc_env_handle, 
- 					odbc_connection, 
--					stat->stat_handle, rc)) 
-+					statement->stat_handle, rc)) 
- 		{
--			odbc_do_cleanup_statement(stat);	
-+			odbc_do_cleanup_statement(statement);	
- 			odbc_throw();
- 		}
- 
-@@ -1541,7 +1541,7 @@
- 			** length of the available data, rather than the 
- 			** total length of data available.
- 			*/
--			odbc_get_data_in_chunks(stat, column_id);
-+			odbc_get_data_in_chunks(statement, column_id);
- 		} else { 
- 			MR_Word data;
- 
-@@ -1549,42 +1549,42 @@
- 			** column->value_info == length of data 
- 			*/
- 			column->size = column->value_info + 1;
--			MR_incr_hp_atomic(MR_LVALUE_CAST(MR_Word, column->data), 
-+			MR_incr_hp_atomic((*(MR_Word*)&(column->data)), 
- 				(column->size + sizeof(MR_Word)) / sizeof(MR_Word));
--			odbc_get_data_in_one_go(stat, column_id);
-+			odbc_get_data_in_one_go(statement, column_id);
- 		}
- 	} else {
- 		/* 
- 		** It's a fixed length column, so we can 
- 		** get the lot in one go.
- 		*/
--		odbc_get_data_in_one_go(stat, column_id);
-+		odbc_get_data_in_one_go(statement, column_id);
- 	}
- }
- 
- void 
--odbc_get_data_in_one_go(MODBC_Statement *stat, int column_id)
-+odbc_get_data_in_one_go(MODBC_Statement *statement, int column_id)
- {
- 	MODBC_Column 	*col;
- 	SQLRETURN 	rc;
- 
--	MR_DEBUG(printf(""getting column %i in one go\n"", column_id));
-+	MR_DEBUG(printf(""getting column %i in one go\\n"", column_id));
- 
--	col = &(stat->row[column_id]);
-+	col = &(statement->row[column_id]);
- 
--	rc = SQLGetData(stat->stat_handle, column_id, col->conversion_type, 
-+	rc = SQLGetData(statement->stat_handle, column_id, col->conversion_type, 
- 			(SQLPOINTER) col->data, col->size, &(col->value_info));
- 
- 	if (! odbc_check(odbc_env_handle, odbc_connection, 
--			stat->stat_handle, rc)) 
-+			statement->stat_handle, rc)) 
- 	{
--		odbc_do_cleanup_statement(stat);	
-+		odbc_do_cleanup_statement(statement);	
- 		odbc_throw();
- 	}
- }
- 
- void 
--odbc_get_data_in_chunks(MODBC_Statement *stat, int column_id)
-+odbc_get_data_in_chunks(MODBC_Statement *statement, int column_id)
- {
- 	MODBC_Column 	*col;
- 	SQLRETURN 	rc;
-@@ -1592,11 +1592,11 @@
- 	MR_Word 		chunk_list;
- 	String		result;
- 
--	MR_DEBUG(printf(""getting column %i in chunks\n"", column_id));
-+	MR_DEBUG(printf(""getting column %i in chunks\\n"", column_id));
- 
- 	chunk_list = MR_list_empty();
- 
--	col = &(stat->row[column_id]);
-+	col = &(statement->row[column_id]);
- 
- 	rc = SQL_SUCCESS_WITH_INFO;
- 
-@@ -1607,7 +1607,7 @@
- 		*/
- 	while (rc == SQL_SUCCESS_WITH_INFO) {
- 
--		rc = SQLGetData(stat->stat_handle, column_id, 
-+		rc = SQLGetData(statement->stat_handle, column_id, 
- 				col->conversion_type, (SQLPOINTER) this_bit,
- 				MODBC_CHUNK_SIZE - 1, &(col->value_info));
- 	
-@@ -1617,9 +1617,9 @@
- 
- 		if (rc != SQL_SUCCESS_WITH_INFO &&
- 				! odbc_check(odbc_env_handle, odbc_connection, 
--					stat->stat_handle, rc)) 
-+					statement->stat_handle, rc)) 
- 		{
--			odbc_do_cleanup_statement(stat);	
-+			odbc_do_cleanup_statement(statement);	
- 			odbc_throw();
- 		}
- 
-@@ -1661,12 +1661,12 @@
- 	odbc__cleanup_statement_check_error(Statement::di, DB0::di, DB::uo),
- 	may_call_mercury,
- "{
--	MODBC_Statement *stat;
-+	MODBC_Statement *statement;
- 	SQLRETURN rc;
- 
--	stat = (MODBC_Statement *) Statement;
-+	statement = (MODBC_Statement *) Statement;
- 
--	rc = odbc_do_cleanup_statement(stat);
-+	rc = odbc_do_cleanup_statement(statement);
- 	if (! odbc_check(odbc_env_handle, odbc_connection, 
- 			SQL_NULL_HSTMT, rc)) 
- 	{
-@@ -1678,29 +1678,29 @@
- :- pragma c_code("
- 
- static SQLRETURN
--odbc_do_cleanup_statement(MODBC_Statement *stat)
-+odbc_do_cleanup_statement(MODBC_Statement *statement)
- {
- 	int i;
- 	SQLRETURN rc;
- 
--	if (stat != NULL) {
-+	if (statement != NULL) {
- 		MR_DEBUG(printf(""cleaning up statement\\n""));
--		if (stat->row != NULL) {
--		    for (i = 1; i <= stat->num_columns; i++) {
-+		if (statement->row != NULL) {
-+		    for (i = 1; i <= statement->num_columns; i++) {
- 			    /*
- 			    ** Variable length types are allocated directly
- 			    ** onto the Mercury heap, so don't free them here. 
- 			    */
- 			if (! is_variable_length_sql_type(
--				    	stat->row[i].sql_type)) 
-+				    	statement->row[i].sql_type)) 
- 			{
--				MR_GC_free(stat->row[i].data);
-+				MR_GC_free(statement->row[i].data);
- 			}
- 		    }
--		    MR_GC_free(stat->row);
-+		    MR_GC_free(statement->row);
- 		}
--		rc = SQLFreeStmt(stat->stat_handle, SQL_DROP);
--		MR_GC_free(stat);
-+		rc = SQLFreeStmt(statement->stat_handle, SQL_DROP);
-+		MR_GC_free(statement);
- 		return rc;
- 	} else {
- 		return SQL_SUCCESS;
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-odbc.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-odbc.patch
deleted file mode 100644
index 6dc22b3eeb73..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-odbc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- mercury-extras-0.13.0-beta-2006-04-03.orig/odbc/Mmakefile	2003-01-16 23:44:21.000000000 +1300
-+++ mercury-extras-0.13.0-beta-2006-04-03/odbc/Mmakefile	2006-04-06 20:41:31.000000000 +1200
-@@ -37,16 +37,18 @@
- 	ODBC_INCL_DIR=$(ODBC_SDK_DIR)/include
- 	MLLIBS=-lodbc32
- else 
--	ODBC_LIB_DIR=$(IODBC_DIR)/lib
--	ODBC_INCL_DIR=$(IODBC_DIR)/include
-+	ODBC_LIBS=`iodbc-config --libs`
-+	ODBC_INCLS=`iodbc-config --cflags`
- 	# note: on a DEC Alpha using OSF1 remove the -ldl.
--	MLLIBS=-L$(ODBC_LIB_DIR) -R$(ODBC_LIB_DIR) -liodbc -ldl
-+	MLLIBS=-$(ODBC_LIBS) -lpthread -ldl
- endif
- 
--MAIN_TARGET=odbc_test
-+MAIN_TARGET=libodbc
- 
- .PHONY: depend
--depend: odbc_test.depend
-+depend: odbc.depend
-+
-+install: libodbc.install
- 
- .PHONY: check
- check:
-@@ -57,7 +59,7 @@
- # `--no-ansi' is needed because the ODBC header files include C++-style
- # "//" comments.  `--no-ansi' allows recognition of C++-style "//" comments,
- # presuming you have gcc version 2.7.1 or greater.
--MGNUCFLAGS=--no-ansi -D$(MODBC_DRIVER) -D$(MODBC_DB) -I$(ODBC_INCL_DIR)
-+MGNUCFLAGS=-D$(MODBC_DRIVER) -D$(MODBC_DB) $(ODBC_INCLS)
- 
- #-----------------------------------------------------------------------------#
- #-----------------------------------------------------------------------------#
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-r1-gcc4.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-r1-gcc4.patch
deleted file mode 100644
index f06c08ebd27f..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-r1-gcc4.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur mercury-extras-0.13.0-beta-2006-04-09.orig/concurrency/global.m mercury-extras-0.13.0-beta-2006-04-09/concurrency/global.m
---- mercury-extras-0.13.0-beta-2006-04-09.orig/concurrency/global.m	2003-03-01 04:20:33.000000000 +1300
-+++ mercury-extras-0.13.0-beta-2006-04-09/concurrency/global.m	2006-04-11 19:42:21.000000000 +1200
-@@ -54,7 +54,7 @@
- :- pragma c_code(global__new(Thing::in, Glob::out, IO0::di, IO::uo),
- 		will_not_call_mercury, "{
- 	MR_Word *tmp;
--	MR_incr_hp((MR_Word) tmp, 1);
-+	MR_incr_hp((*(MR_Word*) &(tmp)), 1);
- 	*tmp = Thing;
- 	Glob = (MR_Word) tmp;
- 	IO = IO0;
-diff -ur mercury-extras-0.13.0-beta-2006-04-09.orig/curs/curs.m mercury-extras-0.13.0-beta-2006-04-09/curs/curs.m
---- mercury-extras-0.13.0-beta-2006-04-09.orig/curs/curs.m	2005-10-26 18:04:14.000000000 +1300
-+++ mercury-extras-0.13.0-beta-2006-04-09/curs/curs.m	2006-04-11 19:43:19.000000000 +1200
-@@ -965,7 +965,7 @@
-         wattrset(w, Attr);
-         wcolor_set(w, Attr, NULL);
-         wclear(w);
--        (PANEL *)Panel = new_panel(w);
-+        (*(PANEL**)&(Panel)) = new_panel(w);
- 
-         IO = IO0;
-     
-diff -ur mercury-extras-0.13.0-beta-2006-04-09.orig/graphics/mercury_tcltk/mtcltk.m mercury-extras-0.13.0-beta-2006-04-09/graphics/mercury_tcltk/mtcltk.m
---- mercury-extras-0.13.0-beta-2006-04-09.orig/graphics/mercury_tcltk/mtcltk.m	2005-08-15 16:11:42.000000000 +1200
-+++ mercury-extras-0.13.0-beta-2006-04-09/graphics/mercury_tcltk/mtcltk.m	2006-04-11 19:44:26.000000000 +1200
-@@ -141,7 +141,7 @@
- 		argc++;
- 	}
- 
--	MR_incr_hp(MR_LVALUE_CAST(MR_Word, argv), argc + 1);
-+	MR_incr_hp((*(MR_Word*)&( argv)), argc + 1);
- 
- 	for (i = 0, l = Args; l != list_empty(); l = list_tail(l), i++) {
- 		argv[i] = (char *) MR_list_head(l);
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-r1-odbc.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-r1-odbc.patch
deleted file mode 100644
index e099021c0f93..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-r1-odbc.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- mercury-extras-0.13.0-beta-2006-04-09.orig/odbc/Mmakefile	2006-04-04 13:49:14.000000000 +1200
-+++ mercury-extras-0.13.0-beta-2006-04-09/odbc/Mmakefile	2006-04-11 22:52:58.000000000 +1200
-@@ -40,18 +40,23 @@
- 
- 	# The following are for Debian.
- 
--	# for unixODBC
--	MLLIBS=-lodbc -lpthread -lltdl -ldl
--
--	# for iODBC
--	# MLLIBS=-liodbc l-pthread -ldl
--	# note: on a DEC Alpha using OSF1 remove the -ldl.
-+	ifeq ($(MODBC_DRIVER),MODBC_UNIX)
-+		# for unixODBC
-+		MLLIBS=-lodbc -lpthread -lltdl -ldl
-+	else
-+		# for iODBC
-+		ODBC_LIBS=`iodbc-config --libs`
-+		ODBC_INCLS=`iodbc-config --cflags`
-+		MLLIBS=$(ODBC_LIBS) -lpthread -ldl
-+	endif
- endif
- 
--MAIN_TARGET=odbc_test
-+MAIN_TARGET=libodbc
- 
- .PHONY: depend
--depend: odbc_test.depend
-+depend: odbc.depend
-+
-+install: libodbc.install
- 
- .PHONY: check
- check:
-@@ -62,7 +67,7 @@
- # `--no-ansi' is needed because the ODBC header files include C++-style
- # "//" comments.  `--no-ansi' allows recognition of C++-style "//" comments,
- # presuming you have gcc version 2.7.1 or greater.
--MGNUCFLAGS=--no-ansi -D$(MODBC_DRIVER) -D$(MODBC_DB) -I$(ODBC_INCL_DIR)
-+MGNUCFLAGS=-D$(MODBC_DRIVER) -D$(MODBC_DB) $(ODBC_INCLS)
- 
- #-----------------------------------------------------------------------------#
- #-----------------------------------------------------------------------------#
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-r1-trailed_update.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-r1-trailed_update.patch
deleted file mode 100644
index c36106b5c7e4..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-r1-trailed_update.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- mercury-extras-0.13.0-beta-2006-04-03.orig/trailed_update/Mmakefile	2004-07-30 19:03:46.000000000 +1200
-+++ mercury-extras-0.13.0-beta-2006-04-03/trailed_update/Mmakefile	2006-03-26 22:00:13.000000000 +1200
-@@ -4,6 +4,10 @@
- # Public License - see the file COPYING.LIB in the Mercury distribution.
- #-----------------------------------------------------------------------------#
- 
-+LIBGRADES := 	$(foreach grade,$(LIBGRADES), \
-+		$(subst .tr.,$(grade),$(findstring .tr.,$(grade))) \
-+		$(filter %.tr,$(grade)))
-+
- GRADEFLAGS += --use-trail
- 
- # enable C debugging
-@@ -25,6 +29,8 @@
- 	cd samples && mmake $(MMAKEFLAGS) depend
- 	cd tests && mmake $(MMAKEFLAGS) depend
- 
-+install: libtrailed_update.install
-+
- .PHONY: check
- check: libtrailed_update
- 	cd samples && mmake $(MMAKEFLAGS) check
---- mercury-extras-0.13.0-beta-2006-04-09.orig/trailed_update/var.m	2006-03-30 13:21:19.000000000 +1200
-+++ mercury-extras-0.13.0-beta-2006-04-09/trailed_update/var.m	2006-04-12 21:16:27.000000000 +1200
-@@ -831,12 +831,12 @@
- 
- :- pragma export(var.rep_unify(in(ptr(var_rep_any)), in(ptr(var_rep_any))),
- 	"ML_var_unify").
--:- impure pred var.rep_unify(var_rep(T), var_rep(T)).
-+:- pred var.rep_unify(var_rep(T), var_rep(T)).
- :- mode var.rep_unify(in(ptr(var_rep_any)), in(ptr(var_rep_any))) is semidet.
- 
- var.rep_unify(XPtr, YPtr) :-
- 	XPtr = alias(X),
--	(
-+	promise_pure (
- 		X = alias(_),
- 		impure var.rep_unify(X, YPtr)
- 	;
-@@ -880,14 +880,14 @@
- 
- 	% This is the case when the first var is free(DelayedGoals).
- 	%
--:- impure pred var.rep_unify_fr(var_rep(T), var_rep(T), var_rep(T)).
-+:- pred var.rep_unify_fr(var_rep(T), var_rep(T), var_rep(T)).
- :- mode var.rep_unify_fr(in(ptr(var_rep_any)), % really deref_delayed
- 			in(ptr(var_rep_any)),
- 			in(var_rep_deref_delayed)) is semidet.
- 
- var.rep_unify_fr(XPtr, YPtr, X) :-
- 	YPtr = alias(Y),
--	(
-+	promise_pure (
- 		Y = alias(_),
- 		impure var.rep_unify_fr(XPtr, Y, X)
- 	;
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta2-gcc4.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta2-gcc4.patch
deleted file mode 100644
index f06c08ebd27f..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta2-gcc4.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur mercury-extras-0.13.0-beta-2006-04-09.orig/concurrency/global.m mercury-extras-0.13.0-beta-2006-04-09/concurrency/global.m
---- mercury-extras-0.13.0-beta-2006-04-09.orig/concurrency/global.m	2003-03-01 04:20:33.000000000 +1300
-+++ mercury-extras-0.13.0-beta-2006-04-09/concurrency/global.m	2006-04-11 19:42:21.000000000 +1200
-@@ -54,7 +54,7 @@
- :- pragma c_code(global__new(Thing::in, Glob::out, IO0::di, IO::uo),
- 		will_not_call_mercury, "{
- 	MR_Word *tmp;
--	MR_incr_hp((MR_Word) tmp, 1);
-+	MR_incr_hp((*(MR_Word*) &(tmp)), 1);
- 	*tmp = Thing;
- 	Glob = (MR_Word) tmp;
- 	IO = IO0;
-diff -ur mercury-extras-0.13.0-beta-2006-04-09.orig/curs/curs.m mercury-extras-0.13.0-beta-2006-04-09/curs/curs.m
---- mercury-extras-0.13.0-beta-2006-04-09.orig/curs/curs.m	2005-10-26 18:04:14.000000000 +1300
-+++ mercury-extras-0.13.0-beta-2006-04-09/curs/curs.m	2006-04-11 19:43:19.000000000 +1200
-@@ -965,7 +965,7 @@
-         wattrset(w, Attr);
-         wcolor_set(w, Attr, NULL);
-         wclear(w);
--        (PANEL *)Panel = new_panel(w);
-+        (*(PANEL**)&(Panel)) = new_panel(w);
- 
-         IO = IO0;
-     
-diff -ur mercury-extras-0.13.0-beta-2006-04-09.orig/graphics/mercury_tcltk/mtcltk.m mercury-extras-0.13.0-beta-2006-04-09/graphics/mercury_tcltk/mtcltk.m
---- mercury-extras-0.13.0-beta-2006-04-09.orig/graphics/mercury_tcltk/mtcltk.m	2005-08-15 16:11:42.000000000 +1200
-+++ mercury-extras-0.13.0-beta-2006-04-09/graphics/mercury_tcltk/mtcltk.m	2006-04-11 19:44:26.000000000 +1200
-@@ -141,7 +141,7 @@
- 		argc++;
- 	}
- 
--	MR_incr_hp(MR_LVALUE_CAST(MR_Word, argv), argc + 1);
-+	MR_incr_hp((*(MR_Word*)&( argv)), argc + 1);
- 
- 	for (i = 0, l = Args; l != list_empty(); l = list_tail(l), i++) {
- 		argv[i] = (char *) MR_list_head(l);
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta2-odbc.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta2-odbc.patch
deleted file mode 100644
index e099021c0f93..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta2-odbc.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- mercury-extras-0.13.0-beta-2006-04-09.orig/odbc/Mmakefile	2006-04-04 13:49:14.000000000 +1200
-+++ mercury-extras-0.13.0-beta-2006-04-09/odbc/Mmakefile	2006-04-11 22:52:58.000000000 +1200
-@@ -40,18 +40,23 @@
- 
- 	# The following are for Debian.
- 
--	# for unixODBC
--	MLLIBS=-lodbc -lpthread -lltdl -ldl
--
--	# for iODBC
--	# MLLIBS=-liodbc l-pthread -ldl
--	# note: on a DEC Alpha using OSF1 remove the -ldl.
-+	ifeq ($(MODBC_DRIVER),MODBC_UNIX)
-+		# for unixODBC
-+		MLLIBS=-lodbc -lpthread -lltdl -ldl
-+	else
-+		# for iODBC
-+		ODBC_LIBS=`iodbc-config --libs`
-+		ODBC_INCLS=`iodbc-config --cflags`
-+		MLLIBS=$(ODBC_LIBS) -lpthread -ldl
-+	endif
- endif
- 
--MAIN_TARGET=odbc_test
-+MAIN_TARGET=libodbc
- 
- .PHONY: depend
--depend: odbc_test.depend
-+depend: odbc.depend
-+
-+install: libodbc.install
- 
- .PHONY: check
- check:
-@@ -62,7 +67,7 @@
- # `--no-ansi' is needed because the ODBC header files include C++-style
- # "//" comments.  `--no-ansi' allows recognition of C++-style "//" comments,
- # presuming you have gcc version 2.7.1 or greater.
--MGNUCFLAGS=--no-ansi -D$(MODBC_DRIVER) -D$(MODBC_DB) -I$(ODBC_INCL_DIR)
-+MGNUCFLAGS=-D$(MODBC_DRIVER) -D$(MODBC_DB) $(ODBC_INCLS)
- 
- #-----------------------------------------------------------------------------#
- #-----------------------------------------------------------------------------#
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta2-trailed_update.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta2-trailed_update.patch
deleted file mode 100644
index c36106b5c7e4..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta2-trailed_update.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- mercury-extras-0.13.0-beta-2006-04-03.orig/trailed_update/Mmakefile	2004-07-30 19:03:46.000000000 +1200
-+++ mercury-extras-0.13.0-beta-2006-04-03/trailed_update/Mmakefile	2006-03-26 22:00:13.000000000 +1200
-@@ -4,6 +4,10 @@
- # Public License - see the file COPYING.LIB in the Mercury distribution.
- #-----------------------------------------------------------------------------#
- 
-+LIBGRADES := 	$(foreach grade,$(LIBGRADES), \
-+		$(subst .tr.,$(grade),$(findstring .tr.,$(grade))) \
-+		$(filter %.tr,$(grade)))
-+
- GRADEFLAGS += --use-trail
- 
- # enable C debugging
-@@ -25,6 +29,8 @@
- 	cd samples && mmake $(MMAKEFLAGS) depend
- 	cd tests && mmake $(MMAKEFLAGS) depend
- 
-+install: libtrailed_update.install
-+
- .PHONY: check
- check: libtrailed_update
- 	cd samples && mmake $(MMAKEFLAGS) check
---- mercury-extras-0.13.0-beta-2006-04-09.orig/trailed_update/var.m	2006-03-30 13:21:19.000000000 +1200
-+++ mercury-extras-0.13.0-beta-2006-04-09/trailed_update/var.m	2006-04-12 21:16:27.000000000 +1200
-@@ -831,12 +831,12 @@
- 
- :- pragma export(var.rep_unify(in(ptr(var_rep_any)), in(ptr(var_rep_any))),
- 	"ML_var_unify").
--:- impure pred var.rep_unify(var_rep(T), var_rep(T)).
-+:- pred var.rep_unify(var_rep(T), var_rep(T)).
- :- mode var.rep_unify(in(ptr(var_rep_any)), in(ptr(var_rep_any))) is semidet.
- 
- var.rep_unify(XPtr, YPtr) :-
- 	XPtr = alias(X),
--	(
-+	promise_pure (
- 		X = alias(_),
- 		impure var.rep_unify(X, YPtr)
- 	;
-@@ -880,14 +880,14 @@
- 
- 	% This is the case when the first var is free(DelayedGoals).
- 	%
--:- impure pred var.rep_unify_fr(var_rep(T), var_rep(T), var_rep(T)).
-+:- pred var.rep_unify_fr(var_rep(T), var_rep(T), var_rep(T)).
- :- mode var.rep_unify_fr(in(ptr(var_rep_any)), % really deref_delayed
- 			in(ptr(var_rep_any)),
- 			in(var_rep_deref_delayed)) is semidet.
- 
- var.rep_unify_fr(XPtr, YPtr, X) :-
- 	YPtr = alias(Y),
--	(
-+	promise_pure (
- 		Y = alias(_),
- 		impure var.rep_unify_fr(XPtr, Y, X)
- 	;
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta3-gcc4.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta3-gcc4.patch
deleted file mode 100644
index f06c08ebd27f..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta3-gcc4.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur mercury-extras-0.13.0-beta-2006-04-09.orig/concurrency/global.m mercury-extras-0.13.0-beta-2006-04-09/concurrency/global.m
---- mercury-extras-0.13.0-beta-2006-04-09.orig/concurrency/global.m	2003-03-01 04:20:33.000000000 +1300
-+++ mercury-extras-0.13.0-beta-2006-04-09/concurrency/global.m	2006-04-11 19:42:21.000000000 +1200
-@@ -54,7 +54,7 @@
- :- pragma c_code(global__new(Thing::in, Glob::out, IO0::di, IO::uo),
- 		will_not_call_mercury, "{
- 	MR_Word *tmp;
--	MR_incr_hp((MR_Word) tmp, 1);
-+	MR_incr_hp((*(MR_Word*) &(tmp)), 1);
- 	*tmp = Thing;
- 	Glob = (MR_Word) tmp;
- 	IO = IO0;
-diff -ur mercury-extras-0.13.0-beta-2006-04-09.orig/curs/curs.m mercury-extras-0.13.0-beta-2006-04-09/curs/curs.m
---- mercury-extras-0.13.0-beta-2006-04-09.orig/curs/curs.m	2005-10-26 18:04:14.000000000 +1300
-+++ mercury-extras-0.13.0-beta-2006-04-09/curs/curs.m	2006-04-11 19:43:19.000000000 +1200
-@@ -965,7 +965,7 @@
-         wattrset(w, Attr);
-         wcolor_set(w, Attr, NULL);
-         wclear(w);
--        (PANEL *)Panel = new_panel(w);
-+        (*(PANEL**)&(Panel)) = new_panel(w);
- 
-         IO = IO0;
-     
-diff -ur mercury-extras-0.13.0-beta-2006-04-09.orig/graphics/mercury_tcltk/mtcltk.m mercury-extras-0.13.0-beta-2006-04-09/graphics/mercury_tcltk/mtcltk.m
---- mercury-extras-0.13.0-beta-2006-04-09.orig/graphics/mercury_tcltk/mtcltk.m	2005-08-15 16:11:42.000000000 +1200
-+++ mercury-extras-0.13.0-beta-2006-04-09/graphics/mercury_tcltk/mtcltk.m	2006-04-11 19:44:26.000000000 +1200
-@@ -141,7 +141,7 @@
- 		argc++;
- 	}
- 
--	MR_incr_hp(MR_LVALUE_CAST(MR_Word, argv), argc + 1);
-+	MR_incr_hp((*(MR_Word*)&( argv)), argc + 1);
- 
- 	for (i = 0, l = Args; l != list_empty(); l = list_tail(l), i++) {
- 		argv[i] = (char *) MR_list_head(l);
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta3-odbc.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta3-odbc.patch
deleted file mode 100644
index e099021c0f93..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta3-odbc.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- mercury-extras-0.13.0-beta-2006-04-09.orig/odbc/Mmakefile	2006-04-04 13:49:14.000000000 +1200
-+++ mercury-extras-0.13.0-beta-2006-04-09/odbc/Mmakefile	2006-04-11 22:52:58.000000000 +1200
-@@ -40,18 +40,23 @@
- 
- 	# The following are for Debian.
- 
--	# for unixODBC
--	MLLIBS=-lodbc -lpthread -lltdl -ldl
--
--	# for iODBC
--	# MLLIBS=-liodbc l-pthread -ldl
--	# note: on a DEC Alpha using OSF1 remove the -ldl.
-+	ifeq ($(MODBC_DRIVER),MODBC_UNIX)
-+		# for unixODBC
-+		MLLIBS=-lodbc -lpthread -lltdl -ldl
-+	else
-+		# for iODBC
-+		ODBC_LIBS=`iodbc-config --libs`
-+		ODBC_INCLS=`iodbc-config --cflags`
-+		MLLIBS=$(ODBC_LIBS) -lpthread -ldl
-+	endif
- endif
- 
--MAIN_TARGET=odbc_test
-+MAIN_TARGET=libodbc
- 
- .PHONY: depend
--depend: odbc_test.depend
-+depend: odbc.depend
-+
-+install: libodbc.install
- 
- .PHONY: check
- check:
-@@ -62,7 +67,7 @@
- # `--no-ansi' is needed because the ODBC header files include C++-style
- # "//" comments.  `--no-ansi' allows recognition of C++-style "//" comments,
- # presuming you have gcc version 2.7.1 or greater.
--MGNUCFLAGS=--no-ansi -D$(MODBC_DRIVER) -D$(MODBC_DB) -I$(ODBC_INCL_DIR)
-+MGNUCFLAGS=-D$(MODBC_DRIVER) -D$(MODBC_DB) $(ODBC_INCLS)
- 
- #-----------------------------------------------------------------------------#
- #-----------------------------------------------------------------------------#
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta3-trailed_update.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta3-trailed_update.patch
deleted file mode 100644
index c36106b5c7e4..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta3-trailed_update.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- mercury-extras-0.13.0-beta-2006-04-03.orig/trailed_update/Mmakefile	2004-07-30 19:03:46.000000000 +1200
-+++ mercury-extras-0.13.0-beta-2006-04-03/trailed_update/Mmakefile	2006-03-26 22:00:13.000000000 +1200
-@@ -4,6 +4,10 @@
- # Public License - see the file COPYING.LIB in the Mercury distribution.
- #-----------------------------------------------------------------------------#
- 
-+LIBGRADES := 	$(foreach grade,$(LIBGRADES), \
-+		$(subst .tr.,$(grade),$(findstring .tr.,$(grade))) \
-+		$(filter %.tr,$(grade)))
-+
- GRADEFLAGS += --use-trail
- 
- # enable C debugging
-@@ -25,6 +29,8 @@
- 	cd samples && mmake $(MMAKEFLAGS) depend
- 	cd tests && mmake $(MMAKEFLAGS) depend
- 
-+install: libtrailed_update.install
-+
- .PHONY: check
- check: libtrailed_update
- 	cd samples && mmake $(MMAKEFLAGS) check
---- mercury-extras-0.13.0-beta-2006-04-09.orig/trailed_update/var.m	2006-03-30 13:21:19.000000000 +1200
-+++ mercury-extras-0.13.0-beta-2006-04-09/trailed_update/var.m	2006-04-12 21:16:27.000000000 +1200
-@@ -831,12 +831,12 @@
- 
- :- pragma export(var.rep_unify(in(ptr(var_rep_any)), in(ptr(var_rep_any))),
- 	"ML_var_unify").
--:- impure pred var.rep_unify(var_rep(T), var_rep(T)).
-+:- pred var.rep_unify(var_rep(T), var_rep(T)).
- :- mode var.rep_unify(in(ptr(var_rep_any)), in(ptr(var_rep_any))) is semidet.
- 
- var.rep_unify(XPtr, YPtr) :-
- 	XPtr = alias(X),
--	(
-+	promise_pure (
- 		X = alias(_),
- 		impure var.rep_unify(X, YPtr)
- 	;
-@@ -880,14 +880,14 @@
- 
- 	% This is the case when the first var is free(DelayedGoals).
- 	%
--:- impure pred var.rep_unify_fr(var_rep(T), var_rep(T), var_rep(T)).
-+:- pred var.rep_unify_fr(var_rep(T), var_rep(T), var_rep(T)).
- :- mode var.rep_unify_fr(in(ptr(var_rep_any)), % really deref_delayed
- 			in(ptr(var_rep_any)),
- 			in(var_rep_deref_delayed)) is semidet.
- 
- var.rep_unify_fr(XPtr, YPtr, X) :-
- 	YPtr = alias(Y),
--	(
-+	promise_pure (
- 		Y = alias(_),
- 		impure var.rep_unify_fr(XPtr, Y, X)
- 	;
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta4-concurrency.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta4-concurrency.patch
deleted file mode 100644
index 793e088bfeb0..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta4-concurrency.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mercury-extras-0.13.0-beta-2006-04-03.orig/concurrency/Mmakefile	2003-01-16 23:44:13.000000000 +1300
-+++ mercury-extras-0.13.0-beta-2006-04-03/concurrency/Mmakefile	2006-03-26 18:45:21.000000000 +1200
-@@ -8,6 +8,8 @@
- 
- TESTS = philo philo2 philo3 midimon
- 
-+LIBGRADES := $(LIBGRADES:hlc.gc=)
-+
- -include ../Mmake.params
- 
- default_target: all
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta4-odbc.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta4-odbc.patch
deleted file mode 100644
index b4b686a68215..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta4-odbc.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- mercury-extras-0.13.0-beta-2006-04-09.orig/odbc/Mmakefile	2006-04-04 13:49:14.000000000 +1200
-+++ mercury-extras-0.13.0-beta-2006-04-09/odbc/Mmakefile	2006-04-11 22:52:58.000000000 +1200
-@@ -40,18 +40,23 @@
- 
- 	# The following are for Debian.
- 
--	# for unixODBC
--	MLLIBS=-lodbc -lpthread -lltdl -ldl
--
--	# for iODBC
--	# MLLIBS=-liodbc l-pthread -ldl
--	# note: on a DEC Alpha using OSF1 remove the -ldl.
-+	ifeq ($(MODBC_DRIVER),MODBC_UNIX)
-+		# for unixODBC
-+		MLLIBS=-L/usr/lib -lodbc -lpthread -lltdl -ldl
-+	else
-+		# for iODBC
-+		ODBC_LIBS=`iodbc-config --libs`
-+		ODBC_INCLS=`iodbc-config --cflags`
-+		MLLIBS=$(ODBC_LIBS) -lpthread -ldl
-+	endif
- endif
- 
--MAIN_TARGET=odbc_test
-+MAIN_TARGET=libodbc
- 
- .PHONY: depend
--depend: odbc_test.depend
-+depend: odbc.depend
-+
-+install: libodbc.install
- 
- .PHONY: check
- check:
-@@ -62,7 +67,7 @@
- # `--no-ansi' is needed because the ODBC header files include C++-style
- # "//" comments.  `--no-ansi' allows recognition of C++-style "//" comments,
- # presuming you have gcc version 2.7.1 or greater.
--MGNUCFLAGS=--no-ansi -D$(MODBC_DRIVER) -D$(MODBC_DB) -I$(ODBC_INCL_DIR)
-+MGNUCFLAGS=-D$(MODBC_DRIVER) -D$(MODBC_DB) $(ODBC_INCLS)
- 
- #-----------------------------------------------------------------------------#
- #-----------------------------------------------------------------------------#
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta4-trailed_update.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta4-trailed_update.patch
deleted file mode 100644
index c36106b5c7e4..000000000000
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta4-trailed_update.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- mercury-extras-0.13.0-beta-2006-04-03.orig/trailed_update/Mmakefile	2004-07-30 19:03:46.000000000 +1200
-+++ mercury-extras-0.13.0-beta-2006-04-03/trailed_update/Mmakefile	2006-03-26 22:00:13.000000000 +1200
-@@ -4,6 +4,10 @@
- # Public License - see the file COPYING.LIB in the Mercury distribution.
- #-----------------------------------------------------------------------------#
- 
-+LIBGRADES := 	$(foreach grade,$(LIBGRADES), \
-+		$(subst .tr.,$(grade),$(findstring .tr.,$(grade))) \
-+		$(filter %.tr,$(grade)))
-+
- GRADEFLAGS += --use-trail
- 
- # enable C debugging
-@@ -25,6 +29,8 @@
- 	cd samples && mmake $(MMAKEFLAGS) depend
- 	cd tests && mmake $(MMAKEFLAGS) depend
- 
-+install: libtrailed_update.install
-+
- .PHONY: check
- check: libtrailed_update
- 	cd samples && mmake $(MMAKEFLAGS) check
---- mercury-extras-0.13.0-beta-2006-04-09.orig/trailed_update/var.m	2006-03-30 13:21:19.000000000 +1200
-+++ mercury-extras-0.13.0-beta-2006-04-09/trailed_update/var.m	2006-04-12 21:16:27.000000000 +1200
-@@ -831,12 +831,12 @@
- 
- :- pragma export(var.rep_unify(in(ptr(var_rep_any)), in(ptr(var_rep_any))),
- 	"ML_var_unify").
--:- impure pred var.rep_unify(var_rep(T), var_rep(T)).
-+:- pred var.rep_unify(var_rep(T), var_rep(T)).
- :- mode var.rep_unify(in(ptr(var_rep_any)), in(ptr(var_rep_any))) is semidet.
- 
- var.rep_unify(XPtr, YPtr) :-
- 	XPtr = alias(X),
--	(
-+	promise_pure (
- 		X = alias(_),
- 		impure var.rep_unify(X, YPtr)
- 	;
-@@ -880,14 +880,14 @@
- 
- 	% This is the case when the first var is free(DelayedGoals).
- 	%
--:- impure pred var.rep_unify_fr(var_rep(T), var_rep(T), var_rep(T)).
-+:- pred var.rep_unify_fr(var_rep(T), var_rep(T), var_rep(T)).
- :- mode var.rep_unify_fr(in(ptr(var_rep_any)), % really deref_delayed
- 			in(ptr(var_rep_any)),
- 			in(var_rep_deref_delayed)) is semidet.
- 
- var.rep_unify_fr(XPtr, YPtr, X) :-
- 	YPtr = alias(Y),
--	(
-+	promise_pure (
- 		Y = alias(_),
- 		impure var.rep_unify_fr(XPtr, Y, X)
- 	;
diff --git a/dev-lang/mercury-extras/mercury-extras-0.13.0_beta-r1.ebuild b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta-r1.ebuild
deleted file mode 100644
index cdf4ae93031c..000000000000
--- a/dev-lang/mercury-extras/mercury-extras-0.13.0_beta-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-0.13.0_beta-r1.ebuild,v 1.1 2006/04/13 22:21:35 keri Exp $
-
-inherit eutils versionator
-
-MY_PV=$(replace_version_separator 3 '-')
-MY_P=${PN}-${MY_PV}-2006-04-09
-
-DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
-HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
-SRC_URI="ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/beta-releases/${MY_PV}/${MY_P}-unstable.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-
-IUSE="doc glut iodbc odbc opengl tcltk"
-
-DEPEND="~dev-lang/mercury-${PV}
-	sys-libs/ncurses
-	glut? ( virtual/glut )
-	odbc? ( dev-db/unixODBC )
-	iodbc? ( !odbc? ( dev-db/libiodbc ) )
-	opengl? ( virtual/opengl )
-	tcktk? ( =dev-lang/tk-8.4*
-		x11-libs/libX11
-		x11-libs/libXmu )"
-
-S="${WORKDIR}"/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PF}-gcc4.patch
-	epatch "${FILESDIR}"/${P}-concurrency.patch
-	epatch "${FILESDIR}"/${P}-lex.patch
-	epatch "${FILESDIR}"/${P}-mercury_glut.patch
-	epatch "${FILESDIR}"/${P}-mercury_tcltk.patch
-	epatch "${FILESDIR}"/${P}-mercury_opengl.patch
-	epatch "${FILESDIR}"/${PF}-odbc.patch
-	epatch "${FILESDIR}"/${P}-posix.patch
-	epatch "${FILESDIR}"/${P}-references.patch
-	epatch "${FILESDIR}"/${PF}-trailed_update.patch
-
-	sed -i	-e "s:curs:concurrency curs:" \
-		-e "s:posix:posix quickcheck:" \
-		-e "s:xml:trailed_update xml:" Mmakefile
-
-	use glut && sed -i -e "s: lex : graphics/mercury_glut lex :" Mmakefile
-	use tcltk && sed -i -e "s: lex : graphics/mercury_tcltk lex :" Mmakefile
-	use opengl && sed -i -e "s: lex : graphics/mercury_opengl lex :" Mmakefile
-
-	if use odbc ; then
-		sed -i -e "s:moose:moose odbc:" Mmakefile
-	elif use iodbc ; then
-		sed -i -e "s:moose:moose odbc:" Mmakefile
-		sed -i -e "s:MODBC_DRIVER=MODBC_UNIX:MODBC_DRIVER=MODBC_IODBC:" odbc/Mmakefile
-	fi
-}
-
-src_compile() {
-	mmake depend || die "mmake depend failed"
-	mmake || die "mmake failed"
-
-	if use opengl && use tcltk ; then
-		cd "${S}"/graphics/mercury_opengl
-		cp ../mercury_tcltk/mtcltk.m ./
-		mmake -f Mmakefile.mtogl depend || die "mmake depend mtogl failed"
-		mmake -f Mmakefile.mtogl || die "mmake mtogl failed"
-	fi
-}
-
-src_install() {
-	cd "${S}"
-	mmake INSTALL_PREFIX="${D}"/usr install || die "mmake install failed"
-
-	if use opengl && use tcltk ; then
-		cd "${S}"/graphics/mercury_opengl
-		mv Mmakefile Mmakefile.opengl
-		mv Mmakefile.mtogl Mmakefile
-		mmake INSTALL_PREFIX="${D}"/usr \
-			install || die "mmake install mtogl failed"
-	fi
-
-	cd "${S}"
-	if use doc ; then
-		docinto samples/complex_numbers
-		dodoc complex_numbers/samples/*.m
-
-		docinto samples/curs
-		dodoc curs/samples/*.m
-
-		docinto samples/curses
-		dodoc curses/sample/*.m
-
-		docinto samples/dynamic_linking
-		dodoc dynamic_linking/hello.m
-
-		docinto samples/lex
-		dodoc lex/samples/*.m
-
-		docinto samples/moose
-		dodoc moose/samples/*.m moose/samples/*.moo
-
-		docinto samples/references
-		dodoc references/samples/*.m
-	fi
-
-	dodoc README
-}
diff --git a/dev-lang/mercury-extras/mercury-extras-0.13.0_beta.ebuild b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta.ebuild
deleted file mode 100644
index 9edf832ce9ce..000000000000
--- a/dev-lang/mercury-extras/mercury-extras-0.13.0_beta.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-0.13.0_beta.ebuild,v 1.1 2006/04/07 12:15:13 keri Exp $
-
-inherit eutils versionator
-
-MY_PV=$(replace_version_separator 3 '-')
-MY_P=${PN}-${MY_PV}-2006-04-03
-
-DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
-HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
-SRC_URI="ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/beta-releases/${MY_PV}/${MY_P}-unstable.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-
-IUSE="doc glut iodbc opengl tcltk"
-
-DEPEND="~dev-lang/mercury-${PV}
-	sys-libs/ncurses
-	glut? ( virtual/glut )
-	iodbc? ( dev-db/libiodbc )
-	opengl? ( virtual/opengl )
-	tcktk? ( =dev-lang/tk-8.4*
-		x11-libs/libX11
-		x11-libs/libXmu )"
-
-S="${WORKDIR}"/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc4.patch
-	epatch "${FILESDIR}"/${P}-concurrency.patch
-	epatch "${FILESDIR}"/${P}-lex.patch
-	epatch "${FILESDIR}"/${P}-mercury_glut.patch
-	epatch "${FILESDIR}"/${P}-mercury_tcltk.patch
-	epatch "${FILESDIR}"/${P}-mercury_opengl.patch
-	epatch "${FILESDIR}"/${P}-odbc.patch
-	epatch "${FILESDIR}"/${P}-references.patch
-	epatch "${FILESDIR}"/${P}-trailed_update.patch
-
-	sed -i	-e "s:curs:concurrency curs:" \
-		-e "s:posix:posix quickcheck:" \
-		-e "s:xml:trailed_update xml:" Mmakefile
-
-	use iodbc && sed -i -e "s:moose:moose odbc:" Mmakefile
-	use glut && sed -i -e "s: lex : graphics/mercury_glut lex :" Mmakefile
-	use tcltk && sed -i -e "s: lex : graphics/mercury_tcltk lex :" Mmakefile
-	use opengl && sed -i -e "s: lex : graphics/mercury_opengl lex :" Mmakefile
-}
-
-src_compile() {
-	mmake depend || die "mmake depend failed"
-	mmake || die "mmake failed"
-
-	if use opengl && use tcltk ; then
-		cd "${S}"/graphics/mercury_opengl
-		cp ../mercury_tcltk/mtcltk.m ./
-		mmake -f Mmakefile.mtogl depend || die "mmake depend mtogl failed"
-		mmake -f Mmakefile.mtogl || die "mmake mtogl failed"
-	fi
-}
-
-src_install() {
-	cd "${S}"
-	mmake INSTALL_PREFIX="${D}"/usr install || die "mmake install failed"
-
-	if use opengl && use tcltk ; then
-		cd "${S}"/graphics/mercury_opengl
-		mv Mmakefile Mmakefile.opengl
-		mv Mmakefile.mtogl Mmakefile
-		mmake INSTALL_PREFIX="${D}"/usr \
-			install || die "mmake install mtogl failed"
-	fi
-
-	cd "${S}"
-	if use doc ; then
-		docinto samples/complex_numbers
-		dodoc complex_numbers/samples/*.m
-
-		docinto samples/curs
-		dodoc curs/samples/*.m
-
-		docinto samples/curses
-		dodoc curses/sample/*.m
-
-		docinto samples/dynamic_linking
-		dodoc dynamic_linking/hello.m
-
-		docinto samples/lex
-		dodoc lex/samples/*.m
-
-		docinto samples/moose
-		dodoc moose/samples/*.m moose/samples/*.moo
-
-		docinto samples/references
-		dodoc references/samples/*.m
-	fi
-
-	dodoc README
-}
diff --git a/dev-lang/mercury-extras/mercury-extras-0.13.0_beta2.ebuild b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta2.ebuild
deleted file mode 100644
index da18c94412fa..000000000000
--- a/dev-lang/mercury-extras/mercury-extras-0.13.0_beta2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-0.13.0_beta2.ebuild,v 1.1 2006/04/19 08:37:15 keri Exp $
-
-inherit eutils versionator
-
-MY_PV=$(get_version_component_range 1-3 $PV)-beta
-MY_P=${PN}-${MY_PV}-2006-04-11
-
-DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
-HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
-SRC_URI="ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/beta-releases/${MY_PV}/${MY_P}-unstable.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-
-IUSE="doc glut iodbc odbc opengl tcltk"
-
-DEPEND="~dev-lang/mercury-${PV}
-	sys-libs/ncurses
-	glut? ( virtual/glut )
-	odbc? ( dev-db/unixODBC )
-	iodbc? ( !odbc? ( dev-db/libiodbc ) )
-	opengl? ( virtual/opengl )
-	tcktk? ( =dev-lang/tk-8.4*
-		x11-libs/libX11
-		x11-libs/libXmu )"
-
-S="${WORKDIR}"/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc4.patch
-	epatch "${FILESDIR}"/${P/beta2/beta}-concurrency.patch
-	epatch "${FILESDIR}"/${P/beta2/beta}-lex.patch
-	epatch "${FILESDIR}"/${P/beta2/beta}-mercury_glut.patch
-	epatch "${FILESDIR}"/${P/beta2/beta}-mercury_tcltk.patch
-	epatch "${FILESDIR}"/${P/beta2/beta}-mercury_opengl.patch
-	epatch "${FILESDIR}"/${P}-odbc.patch
-	epatch "${FILESDIR}"/${P/beta2/beta}-posix.patch
-	epatch "${FILESDIR}"/${P/beta2/beta}-references.patch
-	epatch "${FILESDIR}"/${P}-trailed_update.patch
-
-	sed -i	-e "s:curs:concurrency curs:" \
-		-e "s:posix:posix quickcheck:" \
-		-e "s:windows_installer_generator ::" \
-		-e "s:xml:trailed_update xml:" Mmakefile
-
-	use glut && sed -i -e "s: lex : graphics/mercury_glut lex :" Mmakefile
-	use tcltk && sed -i -e "s: lex : graphics/mercury_tcltk lex :" Mmakefile
-	use opengl && sed -i -e "s: lex : graphics/mercury_opengl lex :" Mmakefile
-
-	if use odbc ; then
-		sed -i -e "s:moose:moose odbc:" Mmakefile
-	elif use iodbc ; then
-		sed -i -e "s:moose:moose odbc:" Mmakefile
-		sed -i -e "s:MODBC_DRIVER=MODBC_UNIX:MODBC_DRIVER=MODBC_IODBC:" odbc/Mmakefile
-	fi
-}
-
-src_compile() {
-	mmake depend || die "mmake depend failed"
-	mmake || die "mmake failed"
-
-	if use opengl && use tcltk ; then
-		cd "${S}"/graphics/mercury_opengl
-		cp ../mercury_tcltk/mtcltk.m ./
-		mmake -f Mmakefile.mtogl depend || die "mmake depend mtogl failed"
-		mmake -f Mmakefile.mtogl || die "mmake mtogl failed"
-	fi
-}
-
-src_install() {
-	cd "${S}"
-	mmake INSTALL_PREFIX="${D}"/usr install || die "mmake install failed"
-
-	if use opengl && use tcltk ; then
-		cd "${S}"/graphics/mercury_opengl
-		mv Mmakefile Mmakefile.opengl
-		mv Mmakefile.mtogl Mmakefile
-		mmake INSTALL_PREFIX="${D}"/usr \
-			install || die "mmake install mtogl failed"
-	fi
-
-	cd "${S}"
-	if use doc ; then
-		docinto samples/complex_numbers
-		dodoc complex_numbers/samples/*.m
-
-		docinto samples/curs
-		dodoc curs/samples/*.m
-
-		docinto samples/curses
-		dodoc curses/sample/*.m
-
-		docinto samples/dynamic_linking
-		dodoc dynamic_linking/hello.m
-
-		docinto samples/lex
-		dodoc lex/samples/*.m
-
-		docinto samples/moose
-		dodoc moose/samples/*.m moose/samples/*.moo
-
-		docinto samples/references
-		dodoc references/samples/*.m
-	fi
-
-	dodoc README
-}
diff --git a/dev-lang/mercury-extras/mercury-extras-0.13.0_beta3.ebuild b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta3.ebuild
deleted file mode 100644
index 03ddad5cd0b0..000000000000
--- a/dev-lang/mercury-extras/mercury-extras-0.13.0_beta3.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-0.13.0_beta3.ebuild,v 1.1 2006/04/20 10:16:49 keri Exp $
-
-inherit eutils versionator
-
-MY_PV=$(get_version_component_range 1-3 $PV)-beta
-MY_P=${PN}-${MY_PV}-2006-04-19
-
-DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
-HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
-SRC_URI="ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/beta-releases/${MY_PV}/${MY_P}-unstable.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-
-IUSE="doc glut iodbc odbc opengl tcltk"
-
-DEPEND="~dev-lang/mercury-${PV}
-	sys-libs/ncurses
-	glut? ( virtual/glut )
-	odbc? ( dev-db/unixODBC )
-	iodbc? ( !odbc? ( dev-db/libiodbc ) )
-	opengl? ( virtual/opengl )
-	tcktk? ( =dev-lang/tk-8.4*
-		x11-libs/libX11
-		x11-libs/libXmu )"
-
-S="${WORKDIR}"/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc4.patch
-	epatch "${FILESDIR}"/${P/beta3/beta}-concurrency.patch
-	epatch "${FILESDIR}"/${P/beta3/beta}-lex.patch
-	epatch "${FILESDIR}"/${P/beta3/beta}-mercury_glut.patch
-	epatch "${FILESDIR}"/${P/beta3/beta}-mercury_tcltk.patch
-	epatch "${FILESDIR}"/${P/beta3/beta}-mercury_opengl.patch
-	epatch "${FILESDIR}"/${P}-odbc.patch
-	epatch "${FILESDIR}"/${P/beta3/beta}-posix.patch
-	epatch "${FILESDIR}"/${P/beta3/beta}-references.patch
-	epatch "${FILESDIR}"/${P}-trailed_update.patch
-
-	sed -i	-e "s:curs:concurrency curs:" \
-		-e "s:posix:posix quickcheck:" \
-		-e "s:windows_installer_generator ::" \
-		-e "s:xml:trailed_update xml:" Mmakefile
-
-	use glut && sed -i -e "s: lex : graphics/mercury_glut lex :" Mmakefile
-	use tcltk && sed -i -e "s: lex : graphics/mercury_tcltk lex :" Mmakefile
-	use opengl && sed -i -e "s: lex : graphics/mercury_opengl lex :" Mmakefile
-
-	if use odbc ; then
-		sed -i -e "s:moose:moose odbc:" Mmakefile
-	elif use iodbc ; then
-		sed -i -e "s:moose:moose odbc:" Mmakefile
-		sed -i -e "s:MODBC_DRIVER=MODBC_UNIX:MODBC_DRIVER=MODBC_IODBC:" odbc/Mmakefile
-	fi
-}
-
-src_compile() {
-	mmake depend || die "mmake depend failed"
-	mmake || die "mmake failed"
-
-	if use opengl && use tcltk ; then
-		cd "${S}"/graphics/mercury_opengl
-		cp ../mercury_tcltk/mtcltk.m ./
-		mmake -f Mmakefile.mtogl depend || die "mmake depend mtogl failed"
-		mmake -f Mmakefile.mtogl || die "mmake mtogl failed"
-	fi
-}
-
-src_install() {
-	cd "${S}"
-	mmake INSTALL_PREFIX="${D}"/usr install || die "mmake install failed"
-
-	if use opengl && use tcltk ; then
-		cd "${S}"/graphics/mercury_opengl
-		mv Mmakefile Mmakefile.opengl
-		mv Mmakefile.mtogl Mmakefile
-		mmake INSTALL_PREFIX="${D}"/usr \
-			install || die "mmake install mtogl failed"
-	fi
-
-	cd "${S}"
-	if use doc ; then
-		docinto samples/complex_numbers
-		dodoc complex_numbers/samples/*.m
-
-		docinto samples/curs
-		dodoc curs/samples/*.m
-
-		docinto samples/curses
-		dodoc curses/sample/*.m
-
-		docinto samples/dynamic_linking
-		dodoc dynamic_linking/hello.m
-
-		docinto samples/lex
-		dodoc lex/samples/*.m
-
-		docinto samples/moose
-		dodoc moose/samples/*.m moose/samples/*.moo
-
-		docinto samples/references
-		dodoc references/samples/*.m
-	fi
-
-	dodoc README
-}
diff --git a/dev-lang/mercury-extras/mercury-extras-0.13.0_beta4.ebuild b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta4.ebuild
deleted file mode 100644
index e72df76e3b4f..000000000000
--- a/dev-lang/mercury-extras/mercury-extras-0.13.0_beta4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-0.13.0_beta4.ebuild,v 1.2 2006/04/23 03:44:04 keri Exp $
-
-inherit eutils versionator
-
-MY_PV=$(get_version_component_range 1-3 $PV)-beta
-MY_P=${PN}-${MY_PV}-2006-04-21
-
-DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
-HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
-SRC_URI="ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/beta-releases/${MY_PV}/${MY_P}-unstable.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-
-IUSE="doc glut iodbc odbc opengl tcltk"
-
-DEPEND="~dev-lang/mercury-${PV}
-	sys-libs/ncurses
-	glut? ( virtual/glut )
-	odbc? ( dev-db/unixODBC )
-	iodbc? ( !odbc? ( dev-db/libiodbc ) )
-	opengl? ( virtual/opengl )
-	tcktk? ( =dev-lang/tk-8.4*
-		x11-libs/libX11
-		x11-libs/libXmu )"
-
-S="${WORKDIR}"/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-concurrency.patch
-	epatch "${FILESDIR}"/${P/beta4/beta}-dynamic_linking.patch
-	epatch "${FILESDIR}"/${P/beta4/beta}-lex.patch
-	epatch "${FILESDIR}"/${P/beta4/beta}-mercury_glut.patch
-	epatch "${FILESDIR}"/${P/beta4/beta}-mercury_tcltk.patch
-	epatch "${FILESDIR}"/${P/beta4/beta}-mercury_opengl.patch
-	epatch "${FILESDIR}"/${P}-odbc.patch
-	epatch "${FILESDIR}"/${P/beta4/beta}-posix.patch
-	epatch "${FILESDIR}"/${P/beta4/beta}-references.patch
-	epatch "${FILESDIR}"/${P}-trailed_update.patch
-
-	sed -i	-e "s:curs:concurrency curs:" \
-		-e "s:posix:posix quickcheck:" \
-		-e "s:windows_installer_generator ::" \
-		-e "s:xml:trailed_update xml:" Mmakefile
-
-	use glut && sed -i -e "s: lex : graphics/mercury_glut lex :" Mmakefile
-	use tcltk && sed -i -e "s: lex : graphics/mercury_tcltk lex :" Mmakefile
-	use opengl && sed -i -e "s: lex : graphics/mercury_opengl lex :" Mmakefile
-
-	if use odbc ; then
-		sed -i -e "s:moose:moose odbc:" Mmakefile
-	elif use iodbc ; then
-		sed -i -e "s:moose:moose odbc:" Mmakefile
-		sed -i -e "s:MODBC_DRIVER=MODBC_UNIX:MODBC_DRIVER=MODBC_IODBC:" odbc/Mmakefile
-	fi
-}
-
-src_compile() {
-	mmake depend || die "mmake depend failed"
-	mmake || die "mmake failed"
-
-	if use opengl && use tcltk ; then
-		cd "${S}"/graphics/mercury_opengl
-		cp ../mercury_tcltk/mtcltk.m ./
-		mmake -f Mmakefile.mtogl depend || die "mmake depend mtogl failed"
-		mmake -f Mmakefile.mtogl || die "mmake mtogl failed"
-	fi
-}
-
-src_install() {
-	cd "${S}"
-	mmake INSTALL_PREFIX="${D}"/usr install || die "mmake install failed"
-
-	if use opengl && use tcltk ; then
-		cd "${S}"/graphics/mercury_opengl
-		mv Mmakefile Mmakefile.opengl
-		mv Mmakefile.mtogl Mmakefile
-		mmake INSTALL_PREFIX="${D}"/usr \
-			install || die "mmake install mtogl failed"
-	fi
-
-	cd "${S}"
-	if use doc ; then
-		docinto samples/complex_numbers
-		dodoc complex_numbers/samples/*.m
-
-		docinto samples/curs
-		dodoc curs/samples/*.m
-
-		docinto samples/curses
-		dodoc curses/sample/*.m
-
-		docinto samples/dynamic_linking
-		dodoc dynamic_linking/hello.m
-
-		docinto samples/lex
-		dodoc lex/samples/*.m
-
-		docinto samples/moose
-		dodoc moose/samples/*.m moose/samples/*.moo
-
-		docinto samples/references
-		dodoc references/samples/*.m
-	fi
-
-	dodoc README
-}