Version bump to development release.

Package-Manager: portage-2.1_pre7-r4

20 files changed, 915 insertions, 2 deletions

diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog
index 65c8204c5be5..59978a58dd83 100644
--- a/dev-lang/mercury-extras/ChangeLog
+++ b/dev-lang/mercury-extras/ChangeLog
@@ -1,6 +1,21 @@
 # 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.3 2006/04/01 06:49:18 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.4 2006/04/07 12:15:13 keri Exp $
+
+*mercury-extras-0.13.0_beta (07 Apr 2006)
+
+  07 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-lex.patch,
+  +files/mercury-extras-0.13.0_beta-mercury_glut.patch,
+  +files/mercury-extras-0.13.0_beta-mercury_opengl.patch,
+  +files/mercury-extras-0.13.0_beta-mercury_tcltk.patch,
+  +files/mercury-extras-0.13.0_beta-odbc.patch,
+  +files/mercury-extras-0.13.0_beta-references.patch,
+  +files/mercury-extras-0.13.0_beta-trailed_update.patch,
+  +mercury-extras-0.13.0_beta.ebuild:
+  Version bump to development release.
 
   01 Apr 2006; Keri Harris <keri@gentoo.org>
   +files/mercury-extras-0.12.2-gcc4.patch,
diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index fda9146f8d44..bc3a8e4ab0b6 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -4,6 +4,9 @@ SHA256 4642d5936b19f2c40760479f94740ac265e706564a93e5bac9899b5952d10c24 ChangeLo
 MD5 04bb3f50c82519cd929f7754557a4124 files/digest-mercury-extras-0.12.2 265
 RMD160 e18050a352bc3f86650cf53244bbb17545ef0817 files/digest-mercury-extras-0.12.2 265
 SHA256 087bf13f383826ff1da30ff861cfc48008b7037a9a844f14fee94f51934ec525 files/digest-mercury-extras-0.12.2 265
+MD5 6f8cdcb0dfbbe8dcb288d7d0c2e00bcc files/digest-mercury-extras-0.13.0_beta 340
+RMD160 1b1f65813a3511cec7f0d921e0f5a3db6ae6ce68 files/digest-mercury-extras-0.13.0_beta 340
+SHA256 e1b6085e039b11131e795b518c36f01c18bd5a935262b088277da86cc2e9d1e2 files/digest-mercury-extras-0.13.0_beta 340
 MD5 46b54062fd1dea38e3b6f8724fe51f02 files/mercury-extras-0.12.2-concurrency.patch 316
 RMD160 a9bcbafeaf0ee76782adbe289442bdff1012fa38 files/mercury-extras-0.12.2-concurrency.patch 316
 SHA256 40fd7961b6677cacc80d2460c9f4b11effdabbe00c3b026f0f65ea46c70d7189 files/mercury-extras-0.12.2-concurrency.patch 316
@@ -31,9 +34,39 @@ SHA256 02b567cd088fca260d80ca795d2f303860f87fd4005b7157ba97ef31f448fbe6 files/me
 MD5 69eb84492666aced8984fcf3ac90af06 files/mercury-extras-0.12.2-trailed_update.patch 762
 RMD160 c69b30d1aac449a878a654ae422b7c9cad208faf files/mercury-extras-0.12.2-trailed_update.patch 762
 SHA256 7e79baf412ff2b60966027464ee9a2c3008a619ae2e1107ae3e871b4082673fe files/mercury-extras-0.12.2-trailed_update.patch 762
+MD5 eda3e0c842452c9a4b3d4f68d7ad2cf8 files/mercury-extras-0.13.0_beta-concurrency.patch 780
+RMD160 7a7c58384a2ffe1831b94c4215b51a29adc98c6e files/mercury-extras-0.13.0_beta-concurrency.patch 780
+SHA256 08a43e185cd9af9f6aade653d9aeaa1682bf0953ace3a5ca3c10f359f7f79ecb files/mercury-extras-0.13.0_beta-concurrency.patch 780
+MD5 8dc71bb5b13105acdaa31df2bd5fa72b files/mercury-extras-0.13.0_beta-gcc4.patch 10598
+RMD160 9f06f946f9bce9ace3af2d519f7e5e8cea6c4218 files/mercury-extras-0.13.0_beta-gcc4.patch 10598
+SHA256 1afcf17035e48087ec3a9127ce9dd3304b522e5f57204ee9983a4e353e416e73 files/mercury-extras-0.13.0_beta-gcc4.patch 10598
+MD5 da7ddc1456d77e6a68bb17d213625a55 files/mercury-extras-0.13.0_beta-lex.patch 668
+RMD160 edd76175572180acb237eb4a99c7704c37cebfc6 files/mercury-extras-0.13.0_beta-lex.patch 668
+SHA256 a0fb563a6fef06f3b342739beb7e1d9a9cfbd3c49fda636188c4bc3ebebaea33 files/mercury-extras-0.13.0_beta-lex.patch 668
+MD5 a4ebb99eb5d1e74717fa48f15e9fb877 files/mercury-extras-0.13.0_beta-mercury_glut.patch 792
+RMD160 3b12b79b17c1d25767465e490b7510f8692c3228 files/mercury-extras-0.13.0_beta-mercury_glut.patch 792
+SHA256 bfb438dd288d49cc03906d8dd89d70c0cfa7de5177ed3d2f8ff014e7f77d8e8e files/mercury-extras-0.13.0_beta-mercury_glut.patch 792
+MD5 76a55490c96c784b8bed9995d76d45ab files/mercury-extras-0.13.0_beta-mercury_opengl.patch 3366
+RMD160 4c1462c58d3833cfb449783a232b2b128f92a1d1 files/mercury-extras-0.13.0_beta-mercury_opengl.patch 3366
+SHA256 f514291e0d2bf4223f4b2e730e6e2197609791e84338f05846eaf71ce77462cd files/mercury-extras-0.13.0_beta-mercury_opengl.patch 3366
+MD5 bb9d31838770be5115eb3073b1a996a1 files/mercury-extras-0.13.0_beta-mercury_tcltk.patch 546
+RMD160 fc047570a12e649b1d2f1ae4908a0be49452a84d files/mercury-extras-0.13.0_beta-mercury_tcltk.patch 546
+SHA256 a5476c68d3165277db1d9ef3d583cd7df83efc34ab0049e4e610daf9a50c1b6a files/mercury-extras-0.13.0_beta-mercury_tcltk.patch 546
+MD5 3ba7d87efa5fc0d52b05398c49147796 files/mercury-extras-0.13.0_beta-odbc.patch 1252
+RMD160 d64f31845e5333d03ad9bba617fb98faad433179 files/mercury-extras-0.13.0_beta-odbc.patch 1252
+SHA256 7dfeae7242db7df183368d30f4e78abb16d074aacc4b986edbf0647ff3cc7e92 files/mercury-extras-0.13.0_beta-odbc.patch 1252
+MD5 8bb53e1d1cb817c2e86d542f42358df3 files/mercury-extras-0.13.0_beta-references.patch 545
+RMD160 109a113a1f44c3fbd435c8da2af3cec21a79b427 files/mercury-extras-0.13.0_beta-references.patch 545
+SHA256 bada13e7a67e99fbcc0d8e4c0f941dd5ccb7447bb6dc2481977c7bd86c639700 files/mercury-extras-0.13.0_beta-references.patch 545
+MD5 620e3e128fcc5715f0bbc55b9d01431b files/mercury-extras-0.13.0_beta-trailed_update.patch 794
+RMD160 c489347887c247d35736f46248f103ea60930dbb files/mercury-extras-0.13.0_beta-trailed_update.patch 794
+SHA256 8dfa795f9262d5d45661e43d1590ab25978a74154e91626debff48c0d6bfb621 files/mercury-extras-0.13.0_beta-trailed_update.patch 794
 MD5 a0b740456e04a360edc59e40c97b86ee mercury-extras-0.12.2.ebuild 2690
 RMD160 2c945112c44d2b87730d0f80c4985b72d3da5dad mercury-extras-0.12.2.ebuild 2690
 SHA256 6a6f8742178abceaec1bea20d868ed0e03539c08b98ac520d02a2e6ebc490f49 mercury-extras-0.12.2.ebuild 2690
+MD5 eaa2370a3ce053d96500f85a73d197f7 mercury-extras-0.13.0_beta.ebuild 2729
+RMD160 6b8d5fa6a473e5138f37a49364ac310cfce7f1f8 mercury-extras-0.13.0_beta.ebuild 2729
+SHA256 971e15576dd2d6f07c72b808b1de2d020825fdbf5ad3947649b3d750d48791a9 mercury-extras-0.13.0_beta.ebuild 2729
 MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247
 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247
 SHA256 be2c02607bd8d5bf707b178d925fa94c6c705014aa488156323589ca4eaac380 metadata.xml 247
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
new file mode 100644
index 000000000000..5fc87d918351
--- /dev/null
+++ b/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta
@@ -0,0 +1,3 @@
+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/mercury-extras-0.13.0_beta-concurrency.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-concurrency.patch
new file mode 100644
index 000000000000..163c10f9a351
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-concurrency.patch
@@ -0,0 +1,21 @@
+--- 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
new file mode 100644
index 000000000000..ab8d0f851f6d
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-gcc4.patch
@@ -0,0 +1,361 @@
+--- 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-lex.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-lex.patch
new file mode 100644
index 000000000000..09b21cd27db6
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-lex.patch
@@ -0,0 +1,17 @@
+--- mercury-extras-0.13.0-beta-2006-04-03.orig/lex/Mmakefile	2002-12-03 17:48:31.000000000 +1300
++++ mercury-extras-0.13.0-beta-2006-04-03/lex/Mmakefile	2006-04-01 15:14:41.000000000 +1200
+@@ -20,12 +20,12 @@
+ # necessary, and everything put there.
+ #
+ #INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
+-INSTALL_PREFIX = .
++#INSTALL_PREFIX = .
+ 
+ # Omit this line if you want to install the default grades.
+ # Edit this line if you want to install with different grades.
+ #
+-LIBGRADES = asm_fast.gc hlc.gc asm_fast.gc.tr.debug
++#LIBGRADES = asm_fast.gc hlc.gc asm_fast.gc.tr.debug
+ 
+ # Any application using these libraries will also need the following
+ # in its Mmakefile:
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-mercury_glut.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-mercury_glut.patch
new file mode 100644
index 000000000000..9e0ce8650c85
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-mercury_glut.patch
@@ -0,0 +1,24 @@
+--- mercury-extras-0.13.0-beta-2006-04-03.orig/graphics/mercury_glut/Mmakefile	2006-03-30 14:52:44.000000000 +1200
++++ mercury-extras-0.13.0-beta-2006-04-03/graphics/mercury_glut/Mmakefile	2006-04-06 07:22:46.000000000 +1200
+@@ -13,10 +13,10 @@
+ # The following libraries are for X on Linux (Debian) using Mesa.
+ 	
+ # Libaries required by X windows.
+-X_LIBS = -lX11 -lXext -lXt -lXi -lSM -lICE -L/usr/X11R6/lib
++# X_LIBS = -lX11 -lXext -lXt -lXi -lSM -lICE -L/usr/X11R6/lib
+ 
+ # Libraries required by OpenGL.
+-GL_LIBS = -lGL -LGL
++# GL_LIBS = -lGL -LGL
+ 
+ MCFLAGS-mercury_glut+=--no-warn-nothing-exported --no-warn-interface-imports
+ 
+@@ -26,7 +26,7 @@
+ MGNUCFLAGS = --pic-reg
+ EXTRA_MLFLAGS = -shared
+ 
+-MLLIBS = -lglut $(X_LIBS) $(GL_LIBS)
++MLLIBS = -lglut
+ 
+ depend: mercury_glut.depend
+ 
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-mercury_opengl.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-mercury_opengl.patch
new file mode 100644
index 000000000000..71d99c74dbcf
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-mercury_opengl.patch
@@ -0,0 +1,79 @@
+--- mercury-extras-0.13.0-beta-2006-04-03.orig/graphics/mercury_opengl/Mmakefile	2006-03-30 14:52:44.000000000 +1200
++++ mercury-extras-0.13.0-beta-2006-04-03/graphics/mercury_opengl/Mmakefile	2006-04-06 20:17:20.000000000 +1200
+@@ -11,7 +11,7 @@
+ 
+ # Specify what libraries we need to link against for OpenGL on this system.
+ # (The following works on Debian with mesa as the OpenGL implementation).
+-GL_LIBS = -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXi -lXt -lICE -lXext -lSM
++GL_LIBS = -lGL -lGLU
+ 
+ # Don't issue a warning because mercury_opengl doesn't export anything.
+ MCFLAGS-mercury_opengl = --no-warn-nothing-exported
+--- mercury-extras-0.13.0-beta-2006-04-03.orig/graphics/mercury_opengl/Mmakefile.mtogl	2004-12-01 14:45:30.000000000 +1300
++++ mercury-extras-0.13.0-beta-2006-04-03/graphics/mercury_opengl/Mmakefile.mtogl	2006-04-06 20:22:36.000000000 +1200
+@@ -11,29 +11,30 @@
+ MLOBJS-mtogl = togl.o 
+ 
+ # Specify the location of the `mercury_tcltk' package.
+-MERCURY_TCLTK_DIR 	= ../mercury_tcltk
++# MERCURY_TCLTK_DIR 	= ../mercury_tcltk
+ 
+ # Specify the version of Tcl/Tk.
+-TCLTK_VERSION = 8.0
++TCLTK_VERSION = 8.4
+ 
+ # Specify what libraries we need to link against for Tcl/Tk on this system.
+-TCLTK_LIBS = -ltcl$(TCLTK_VERSION) -ltk$(TCLTK_VERSION) -ldl
++TCLTK_LIBS = -ltcl -ltk -ldl
++GL_LIBS = -lGl -lGLU -lX11 -lXmu
+ 
+ # Tell mmake to use the `mercury_tcltk' library.
+-VPATH 		= $(MERCURY_TCLTK_DIR):$(MMAKE_VPATH)
+-MCFLAGS 	= -I$(MERCURY_TCLTK_DIR) $(EXTRA_MCFLAGS)
+-MLFLAGS 	= -R$(MERCURY_TCLTK_DIR) $(EXTRA_MLFLAGS) \
++# VPATH 		= $(MERCURY_TCLTK_DIR):$(MMAKE_VPATH)
++# MCFLAGS 	= -I$(MERCURY_TCLTK_DIR) $(EXTRA_MCFLAGS)
++# MLFLAGS 	= -R$(MERCURY_TCLTK_DIR) $(EXTRA_MLFLAGS) \
+           	  -L$(MERCURY_TCLTK_DIR) 
+-MLLIBS 		= $(TCLTK_LIBS) $(EXTRA_MLLIBS)
+-C2INITARGS 	= $(MERCURY_TCLTK_DIR)/mercury_tcltk.init 
++MLLIBS 		= $(TCLTK_LIBS) $(GL_LIBS) $(EXTRA_MLLIBS)
++# C2INITARGS 	= $(MERCURY_TCLTK_DIR)/mercury_tcltk.init 
+ 
+ # We may need to tell mmake where tcl.h and tk.h are.
+ # If we are using Tcl/Tk version 8.0 on Debian the include directory
+ # we need is `/usr/include/tcl8.0/generic'.
+-CFLAGS = -I/usr/include/tcl$(TCLTK_VERSION)
++# CFLAGS = -I/usr/include/tcl$(TCLTK_VERSION)
+ 
+ # We need to also access mtcltk.mh
+-MGNUCFLAGS	= -I$(MERCURY_TCLTK_DIR)
++MGNUCFLAGS	= -I/usr/lib/tk$(TCLTK_VERSION)/include/generic
+ 
+ depend: mtogl.depend
+ 
+--- mercury-extras-0.13.0-beta-2006-04-03.orig/graphics/mercury_opengl/togl.c	2003-08-13 17:49:46.000000000 +1200
++++ mercury-extras-0.13.0-beta-2006-04-03/graphics/mercury_opengl/togl.c	2006-04-06 20:26:23.000000000 +1200
+@@ -274,21 +274,7 @@
+ #include <tcl.h>
+ #include <tk.h>
+ #if defined(X11)
+-#if TK_MAJOR_VERSION==4 && TK_MINOR_VERSION==0
+-#  include "tkInt4.0.h"
+-#  define NO_TK_CURSOR
+-#elif TK_MAJOR_VERSION==4 && TK_MINOR_VERSION==1
+-#  include "tkInt4.1.h"
+-#elif TK_MAJOR_VERSION==4 && TK_MINOR_VERSION==2
+-#  include "tkInt4.2.h"
+-#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==0 && TK_RELEASE_SERIAL==0
+-#  include "tkInt8.0.h"
+-#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==0 && TK_RELEASE_SERIAL==2
+-#  include "tkInt8.0p2.h"
+-#elif TK_MAJOR_VERSION==8 && TK_MINOR_VERSION==0 && TK_RELEASE_SERIAL==5
+-#  include "tkInt8.0p5.h"
+-#else
+-   Sorry, you will have to edit togl.c to include the right tkInt.h file
++#include <tkInt.h>
+ #endif
+ #elif defined(WIN32)
+ #if TK_MAJOR_VERSION<8
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-mercury_tcltk.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-mercury_tcltk.patch
new file mode 100644
index 000000000000..9f197bfbb669
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-mercury_tcltk.patch
@@ -0,0 +1,14 @@
+--- mercury-extras-0.13.0-beta-2006-04-03.orig/graphics/mercury_tcltk/Mmakefile	2005-08-15 16:11:42.000000000 +1200
++++ mercury-extras-0.13.0-beta-2006-04-03/graphics/mercury_tcltk/Mmakefile	2006-04-06 07:25:40.000000000 +1200
+@@ -8,10 +8,7 @@
+ 
+ # You may need to modify the line below
+ 
+-MLLIBS    = -ltk8.4 -ltcl8.4 -L/usr/X11R6/lib -lX11 -lXmu -lXext -lm -ldl \
+-   	    -lXt -lICE -lSM
+-
+-MLFLAGS	  = -R/usr/X11R6/lib
++MLLIBS    = -ltk -ltcl
+ 
+ # On some Linux machines you may need to let mgnuc know where the 
+ # tcl/tk header files are. 
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
new file mode 100644
index 000000000000..6dc22b3eeb73
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-odbc.patch
@@ -0,0 +1,35 @@
+--- 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-references.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-references.patch
new file mode 100644
index 000000000000..cf66cf651359
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-references.patch
@@ -0,0 +1,13 @@
+--- mercury-extras-0.13.0-beta-2006-04-03.orig/references/Mmakefile	2004-02-17 13:00:24.000000000 +1300
++++ mercury-extras-0.13.0-beta-2006-04-03/references/Mmakefile	2006-04-01 16:15:40.000000000 +1200
+@@ -10,7 +10,9 @@
+ 
+ # Install in an "extras" subdirectory of the main installation tree
+ INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
+-LIBGRADES = asm_fast.gc.tr asm_fast.gc.tr.debug
++LIBGRADES := 	$(foreach grade,$(LIBGRADES), \
++		$(subst .tr.,$(grade),$(findstring .tr.,$(grade))) \
++		$(filter %.tr,$(grade)))
+ 
+ MAIN_TARGET = libglobal
+ 
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-trailed_update.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-trailed_update.patch
new file mode 100644
index 000000000000..3afc252a4327
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-trailed_update.patch
@@ -0,0 +1,22 @@
+--- 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
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
new file mode 100644
index 000000000000..9edf832ce9ce
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta.ebuild
@@ -0,0 +1,103 @@
+# 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/ChangeLog b/dev-lang/mercury/ChangeLog
index 54ec8888761d..ab28aafc8b3b 100644
--- a/dev-lang/mercury/ChangeLog
+++ b/dev-lang/mercury/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/mercury
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.4 2006/03/27 07:14:22 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/ChangeLog,v 1.5 2006/04/07 12:11:44 keri Exp $
+
+*mercury-0.13.0_beta (07 Apr 2006)
+
+  07 Apr 2006; Keri Harris <keri@gentoo.org>
+  +files/mercury-0.13.0_beta-CFLAGS.patch,
+  +files/mercury-0.13.0_beta-docs.patch,
+  +files/mercury-0.13.0_beta-portage.patch, +mercury-0.13.0_beta.ebuild:
+  Version bump to development release.
 
   27 Mar 2006; Keri Harris <keri@gentoo.org> mercury-0.12.2.ebuild:
   Explicitly disable building dotnet grades. Thanks to Brian Danilko
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index 8feb50a17913..81e5ecbd1f97 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -4,6 +4,9 @@ SHA256 c8eb9480b8c5cdeadea304b61f90ac8b5f3ba93f5f38246b8d3aedc586fff2ee ChangeLo
 MD5 1de216638d19d62bd270bcc2ec55d75d files/digest-mercury-0.12.2 277
 RMD160 56137f9a814f0f6f0d1d4b7200dfda77320ecc48 files/digest-mercury-0.12.2 277
 SHA256 b9767d0d39801d79c2c6fad1bb77b2f7327bc0f5e70c8e9adcc4126352c8ddf9 files/digest-mercury-0.12.2 277
+MD5 3834ccecda2b3021976d7059ddaa5b24 files/digest-mercury-0.13.0_beta 352
+RMD160 275171fc80243f6f0d3fe09dfbd472fe901aaa93 files/digest-mercury-0.13.0_beta 352
+SHA256 60c11e495a36f4607b8aea2d1b332f11a556f09e340845655f0631f82cfdef24 files/digest-mercury-0.13.0_beta 352
 MD5 f9d8db42316ea25a27a1bbc6806f60d7 files/mercury-0.12.2-CFLAGS.patch 1267
 RMD160 70cbaa9b85c8ac23cd17c41c3d834c69af5bff1a files/mercury-0.12.2-CFLAGS.patch 1267
 SHA256 b27660a29a71b56071daa5e7fc6c62c697c53c55bf8b9068c1bc42002cdb00f1 files/mercury-0.12.2-CFLAGS.patch 1267
@@ -13,9 +16,21 @@ SHA256 78be9f8ef2960ce9ea99b33734d9143a998d87056efa84bafb618cab74fcd514 files/me
 MD5 8ba4f9e032e6b3d148dcb3dc80cc9938 files/mercury-0.12.2-portage.patch 1606
 RMD160 485229c1485e0acade8df39dca0da1ae2ade9a7f files/mercury-0.12.2-portage.patch 1606
 SHA256 5b56cdfc254d7e20b0fba5c3bb8187fd9883e7ea2063930de5f6c4fb8da25be1 files/mercury-0.12.2-portage.patch 1606
+MD5 978c7b688fa22fbf08bbd85f052cc603 files/mercury-0.13.0_beta-CFLAGS.patch 1387
+RMD160 50beda679059cfa2f1c4c0868c34d7fcad147336 files/mercury-0.13.0_beta-CFLAGS.patch 1387
+SHA256 aa3e882f2590d2962b2421495f92d1ae24030799e829f72caf5a55b17fcdea58 files/mercury-0.13.0_beta-CFLAGS.patch 1387
+MD5 825e199f587b2ceb1521e68ac78ec58a files/mercury-0.13.0_beta-docs.patch 828
+RMD160 451ce70dc6f2121f6585d3633693c289b584db47 files/mercury-0.13.0_beta-docs.patch 828
+SHA256 0dd010fa6acdef885b2bca5d79c4bb7b2b3aba2b2569e17035de1fbd0d32cbf7 files/mercury-0.13.0_beta-docs.patch 828
+MD5 7b1cd28fdc808a7c8cdfadb8722013ea files/mercury-0.13.0_beta-portage.patch 1608
+RMD160 30c59012a80aebac452d6ec7d24e7af193e8ab7d files/mercury-0.13.0_beta-portage.patch 1608
+SHA256 00fee4b44e779fd4cc79be60b95309a98999ae2fedfe602195fa1855e62d2da9 files/mercury-0.13.0_beta-portage.patch 1608
 MD5 d78f860592f44275fa723f1e945204f1 mercury-0.12.2.ebuild 1420
 RMD160 0f54075c4025dd99f6f60b6dabd5d761a92ba38c mercury-0.12.2.ebuild 1420
 SHA256 295e09a313b2f6129eadf492b3d9d266a3a1ba8cb933e7cac74eb4a386a5a45b mercury-0.12.2.ebuild 1420
+MD5 c7cd5233dab9f40d08c0c3bb0930865b mercury-0.13.0_beta.ebuild 1500
+RMD160 83a9c22127e3b7829887a455d442f2365b5300c5 mercury-0.13.0_beta.ebuild 1500
+SHA256 f479cbb8ff77408127502933cf23a945b530ffdb163da9288757393c5c8c1bdf mercury-0.13.0_beta.ebuild 1500
 MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247
 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247
 SHA256 be2c02607bd8d5bf707b178d925fa94c6c705014aa488156323589ca4eaac380 metadata.xml 247
diff --git a/dev-lang/mercury/files/digest-mercury-0.13.0_beta b/dev-lang/mercury/files/digest-mercury-0.13.0_beta
new file mode 100644
index 000000000000..02279fbfa41c
--- /dev/null
+++ b/dev-lang/mercury/files/digest-mercury-0.13.0_beta
@@ -0,0 +1,3 @@
+MD5 6ff38a4e1db247dfb80ec4151adc936e mercury-compiler-0.13.0-beta-2006-04-03-unstable.tar.gz 15829295
+RMD160 17eef81d33fa9250a68099ddb279f0a840a4cc8b mercury-compiler-0.13.0-beta-2006-04-03-unstable.tar.gz 15829295
+SHA256 82a9be9b1f5140559b165d8263de108363f2fe9439f8f60e1768e6405d683af6 mercury-compiler-0.13.0-beta-2006-04-03-unstable.tar.gz 15829295
diff --git a/dev-lang/mercury/files/mercury-0.13.0_beta-CFLAGS.patch b/dev-lang/mercury/files/mercury-0.13.0_beta-CFLAGS.patch
new file mode 100644
index 000000000000..cac785ea102f
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.13.0_beta-CFLAGS.patch
@@ -0,0 +1,31 @@
+--- mercury-compiler-0.13.0-beta-2006-04-03.orig/scripts/mgnuc.in	2006-01-25 17:57:48.000000000 +1300
++++ mercury-compiler-0.13.0-beta-2006-04-03/scripts/mgnuc.in	2006-04-04 22:39:40.000000000 +1200
+@@ -53,7 +53,7 @@
+ # -Wenum-clash          is for C++ only
+ # -Wunused              causes various spurious warnings
+ 
+-        OPT_OPTS="-O2 $CFLAGS_FOR_NO_STRICT_ALIASING -fomit-frame-pointer"
++        OPT_OPTS="@CFLAGS_FOR_OPT@"
+         DEBUG_OPT="-g"
+         COMPILER=gcc
+         ;;
+--- mercury-compiler-0.13.0-beta-2006-04-03.orig/configure	2006-04-03 22:37:02.000000000 +1200
++++ mercury-compiler-0.13.0-beta-2006-04-03/configure	2006-04-04 22:42:25.000000000 +1200
+@@ -3739,7 +3739,7 @@
+ # the `-lc' and `-lg' libraries have different contents; specifically,
+ # only the latter contains memalign().  We need to make sure that the
+ # test for memalign() doesn't use `-g', since `ml' doesn't use `-g'.
+-CFLAGS="-O"
++# CFLAGS="-O"
+ 
+ # we also need to add the appropriate `-I' options so that the test programs
+ # can #include various Mercury runtime headers.
+@@ -10005,7 +10005,7 @@
+ 		# enable, and why, see scripts/mgnuc.in.
+ 		CFLAGS_FOR_WARNINGS="-Wall -Wwrite-strings -Wshadow -Wmissing-prototypes -Wno-unused -Wno-uninitialized -Wstrict-prototypes"
+ 
+-		CFLAGS_FOR_OPT="-O2 -fomit-frame-pointer"
++		CFLAGS_FOR_OPT="$CFLAGS"
+ 		CFLAGS_FOR_DEBUG="-g"
+ 		MCFLAGS_FOR_CC=
+ 		;;
diff --git a/dev-lang/mercury/files/mercury-0.13.0_beta-docs.patch b/dev-lang/mercury/files/mercury-0.13.0_beta-docs.patch
new file mode 100644
index 000000000000..7f998b6a9159
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.13.0_beta-docs.patch
@@ -0,0 +1,20 @@
+--- mercury-compiler-0.13.0-beta-2006-04-03.orig/doc/Mmakefile	2006-03-29 13:35:18.000000000 +1200
++++ mercury-compiler-0.13.0-beta-2006-04-03/doc/Mmakefile	2006-04-04 22:45:41.000000000 +1200
+@@ -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
+ 
+ #-----------------------------------------------------------------------------#
+@@ -331,7 +331,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-0.13.0_beta-portage.patch b/dev-lang/mercury/files/mercury-0.13.0_beta-portage.patch
new file mode 100644
index 000000000000..6727c51c0b56
--- /dev/null
+++ b/dev-lang/mercury/files/mercury-0.13.0_beta-portage.patch
@@ -0,0 +1,44 @@
+--- mercury-compiler-0.13.0-beta-2006-04-03.orig/Makefile	2005-08-22 15:38:34.000000000 +1200
++++ mercury-compiler-0.13.0-beta-2006-04-03/Makefile	2006-04-04 22:34:14.000000000 +1200
+@@ -26,7 +26,7 @@
+ 
+ .PHONY: all
+ all:
+-	$(MMAKE) MMAKEFLAGS=$(PARALLEL) all
++	$(MMAKE) MMAKEFLAGS=$(PARALLEL) all || exit 1
+ 
+ .PHONY: libmmc
+ libmmc:
+@@ -34,7 +34,7 @@
+ 
+ .PHONY: install
+ install:
+-	$(MMAKE) MMAKEFLAGS=$(PARALLEL) install
++	$(MMAKE) MMAKEFLAGS=$(PARALLEL) install || exit 1
+ 
+ # `mmake clean' has a different meaning to the usual GNU standard `make clean':
+ # it removes the .c files, which makes bootstrapping impossible unless you
+--- mercury-compiler-0.13.0-beta-2006-04-03.orig/Mmakefile	2005-08-12 03:56:57.000000000 +1200
++++ mercury-compiler-0.13.0-beta-2006-04-03/Mmakefile	2006-04-04 22:34:34.000000000 +1200
+@@ -483,21 +483,6 @@
+ 	@echo
+ 	@echo "-- Installation complete."
+ 	@echo
+-	@echo "-- Don't forget to add $(INSTALL_BINDIR) to your PATH,"
+-	@echo "-- $(INSTALL_MAN_DIR) to your MANPATH,"
+-	@echo "-- and $(INSTALL_INFO_DIR) to your INFOPATH,"
+-	@if test $(ENABLE_DEEP_PROFILER) != yes || \
+-		cmp -s deep_profiler/mdprof_cgi \
+-			$(INSTALL_CGI_DIR)/mdprof_cgi; \
+-	then true ; else \
+-		echo "-- to copy deep_profiler/mdprof_cgi" \
+-			"to $(INSTALL_CGI_DIR),"; \
+-	fi
+-	@echo "-- and to add the following lines to the \`.emacs' file"
+-	@echo "-- in your home directory:"
+-	@echo "	(setq load-path (cons (expand-file-name "
+-	@echo "		\"$(INSTALL_ELISP_DIR)\") load-path))"
+-	@echo "	(autoload 'mdb \"gud\" \"Invoke the Mercury debugger\" t)"
+ 
+ .PHONY: install_main
+ install_main: all \
diff --git a/dev-lang/mercury/mercury-0.13.0_beta.ebuild b/dev-lang/mercury/mercury-0.13.0_beta.ebuild
new file mode 100644
index 000000000000..f87b5de6ad7e
--- /dev/null
+++ b/dev-lang/mercury/mercury-0.13.0_beta.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury/mercury-0.13.0_beta.ebuild,v 1.1 2006/04/07 12:11:44 keri Exp $
+
+inherit eutils versionator
+
+MY_PV=$(replace_version_separator 3 '-')
+MY_P=${PN}-compiler-${MY_PV}-2006-04-03
+
+DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
+HOMEPAGE="http://www.cs.mu.oz.au/research/mercury/index.html"
+SRC_URI="ftp://ftp.mercury.cs.mu.oz.au/pub/${PN}/beta-releases/${MY_PV}/${MY_P}-unstable.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+
+IUSE="minimal readline"
+
+DEPEND="readline? ( sys-libs/readline )"
+
+S="${WORKDIR}"/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-portage.patch
+	epatch "${FILESDIR}"/${P}-CFLAGS.patch
+	epatch "${FILESDIR}"/${P}-docs.patch
+}
+
+src_compile() {
+	econf \
+		--disable-dotnet-grades \
+		$(use_enable !minimal most-grades) \
+		$(use_with readline) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make \
+		MERCURY_COMPILER="${D}"/usr/bin/${PN}_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 || die "make install failed"
+
+	dodoc BUGS HISTORY LIMITATIONS NEWS README README.Java README.Linux README.Linux-Alpha README.Linux-m68k README.Linux-PPC RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS
+}