Version bump.

Package-Manager: portage-2.1.1

14 files changed, 385 insertions, 5 deletions

diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog
index 55505d3a9704..cac9dee7c3f7 100644
--- a/dev-lang/mercury-extras/ChangeLog
+++ b/dev-lang/mercury-extras/ChangeLog
@@ -1,6 +1,22 @@
 # 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.37 2006/09/09 22:12:57 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.38 2006/09/16 21:25:49 keri Exp $
+
+*mercury-extras-0.13.0 (16 Sep 2006)
+
+  16 Sep 2006; keri <keri@gentoo.org>
+  +files/mercury-extras-0.13.0-concurrency.patch,
+  +files/mercury-extras-0.13.0-dynamic_linking.patch,
+  +files/mercury-extras-0.13.0-lex.patch,
+  +files/mercury-extras-0.13.0-mercury_glut.patch,
+  +files/mercury-extras-0.13.0-mercury_opengl.patch,
+  +files/mercury-extras-0.13.0-mercury_tcltk.patch,
+  +files/mercury-extras-0.13.0-odbc.patch,
+  +files/mercury-extras-0.13.0-posix.patch,
+  +files/mercury-extras-0.13.0-references.patch,
+  +files/mercury-extras-0.13.0-trailed_update.patch,
+  +mercury-extras-0.13.0.ebuild:
+  Version bump.
 
 *mercury-extras-0.12.2-r2 (09 Sep 2006)
 
diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index f12739eada16..5e1551d8cb63 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -42,6 +42,46 @@ AUX mercury-extras-0.12.2-trailed_update.patch 762 RMD160 c69b30d1aac449a878a654
 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
+AUX mercury-extras-0.13.0-concurrency.patch 316 RMD160 ec6c0327e0f1ec192455f229998807df35a76d6c SHA1 49fef914b18990b2d7a0534cd5529baf0488766e SHA256 95428d034cb55ec8b9cf189fe8e3141bea19e772500ecbb796a27e56cc6dc4f0
+MD5 f1ac230226f69f80e2049a8b55003ae3 files/mercury-extras-0.13.0-concurrency.patch 316
+RMD160 ec6c0327e0f1ec192455f229998807df35a76d6c files/mercury-extras-0.13.0-concurrency.patch 316
+SHA256 95428d034cb55ec8b9cf189fe8e3141bea19e772500ecbb796a27e56cc6dc4f0 files/mercury-extras-0.13.0-concurrency.patch 316
+AUX mercury-extras-0.13.0-dynamic_linking.patch 376 RMD160 7cd32d8de92f2607c8b9bcf1ce9362c4dfac840a SHA1 be3e4e4818f0049f8cbad287133f337e103f2010 SHA256 f8c3a54852f487f0e034e3ed57e986c9001b2bd66854cd4c320385915aaa47ff
+MD5 dbff60394d8726d13a32fbe9e8ce7079 files/mercury-extras-0.13.0-dynamic_linking.patch 376
+RMD160 7cd32d8de92f2607c8b9bcf1ce9362c4dfac840a files/mercury-extras-0.13.0-dynamic_linking.patch 376
+SHA256 f8c3a54852f487f0e034e3ed57e986c9001b2bd66854cd4c320385915aaa47ff files/mercury-extras-0.13.0-dynamic_linking.patch 376
+AUX mercury-extras-0.13.0-lex.patch 503 RMD160 95c12c7bd3516f5c96ec28fe4a3368b3101491a2 SHA1 a964bc655c81030f3f38de8f97c5af5f98b5dc10 SHA256 c3e4997a5fb564b8156227fc610b5a5835e62b2c8c88d1e1f2556ec9cbdc9b4c
+MD5 427bde560a8eb80b3a4c5f76198f4230 files/mercury-extras-0.13.0-lex.patch 503
+RMD160 95c12c7bd3516f5c96ec28fe4a3368b3101491a2 files/mercury-extras-0.13.0-lex.patch 503
+SHA256 c3e4997a5fb564b8156227fc610b5a5835e62b2c8c88d1e1f2556ec9cbdc9b4c files/mercury-extras-0.13.0-lex.patch 503
+AUX mercury-extras-0.13.0-mercury_glut.patch 758 RMD160 fc46c65ad4758d92d3c6bd29980cc3798742f0d9 SHA1 b9916c3fe4070c2cdbedcc0e7ff3c0e6baaa2b5c SHA256 0432122dd6d14cac2115c5df5988ff2719446456da387b2add8de3cd2107a99d
+MD5 f694863b7c5e2946a4d0fa8983da2ab2 files/mercury-extras-0.13.0-mercury_glut.patch 758
+RMD160 fc46c65ad4758d92d3c6bd29980cc3798742f0d9 files/mercury-extras-0.13.0-mercury_glut.patch 758
+SHA256 0432122dd6d14cac2115c5df5988ff2719446456da387b2add8de3cd2107a99d files/mercury-extras-0.13.0-mercury_glut.patch 758
+AUX mercury-extras-0.13.0-mercury_opengl.patch 2599 RMD160 a250dd044af6abf068b310114e4b5801d7658f8f SHA1 2d6a00092f52ebf96be89e0f193f7cb39f42327a SHA256 f7d72114fe25078f7bd549cb0462994f677b450eb5c83482becefd39bec85eb0
+MD5 99144ef34122e1aacfa72c78996457c9 files/mercury-extras-0.13.0-mercury_opengl.patch 2599
+RMD160 a250dd044af6abf068b310114e4b5801d7658f8f files/mercury-extras-0.13.0-mercury_opengl.patch 2599
+SHA256 f7d72114fe25078f7bd549cb0462994f677b450eb5c83482becefd39bec85eb0 files/mercury-extras-0.13.0-mercury_opengl.patch 2599
+AUX mercury-extras-0.13.0-mercury_tcltk.patch 514 RMD160 a882692f4961cb3cb10935adcc2532818a8294f5 SHA1 6ab94266a2b3e82cd02d20620612fa6292c64099 SHA256 e0eb2a07f63fd9fbc301c826a552226c1bf05bfd686cb58a6cc8ef02ee437993
+MD5 1aa72a6dbc6f1f2e7b6c5ace931e6234 files/mercury-extras-0.13.0-mercury_tcltk.patch 514
+RMD160 a882692f4961cb3cb10935adcc2532818a8294f5 files/mercury-extras-0.13.0-mercury_tcltk.patch 514
+SHA256 e0eb2a07f63fd9fbc301c826a552226c1bf05bfd686cb58a6cc8ef02ee437993 files/mercury-extras-0.13.0-mercury_tcltk.patch 514
+AUX mercury-extras-0.13.0-odbc.patch 420 RMD160 660a82a6982454369fbb5bc20646e367cb0c9461 SHA1 92cdc600a80344635b19d980852fa234a525f334 SHA256 7270e6affd9940a58d2e36b8bf95fdc249abdd800b6fb409f9e8b134b872191b
+MD5 3e6969ebec775925949ee7d18a927395 files/mercury-extras-0.13.0-odbc.patch 420
+RMD160 660a82a6982454369fbb5bc20646e367cb0c9461 files/mercury-extras-0.13.0-odbc.patch 420
+SHA256 7270e6affd9940a58d2e36b8bf95fdc249abdd800b6fb409f9e8b134b872191b files/mercury-extras-0.13.0-odbc.patch 420
+AUX mercury-extras-0.13.0-posix.patch 373 RMD160 ed392e6315177d97f49f48f0f703b59ccf0710ab SHA1 c5685cfbe7a9ecfd28cf56d741bba5783ff0b1a8 SHA256 122ad1bfd8a87edad75f8bdce8415576dc6ea17f32cff84bab2c5b9aba48037d
+MD5 3dac8daf96a3528cbc52f5e8e3963651 files/mercury-extras-0.13.0-posix.patch 373
+RMD160 ed392e6315177d97f49f48f0f703b59ccf0710ab files/mercury-extras-0.13.0-posix.patch 373
+SHA256 122ad1bfd8a87edad75f8bdce8415576dc6ea17f32cff84bab2c5b9aba48037d files/mercury-extras-0.13.0-posix.patch 373
+AUX mercury-extras-0.13.0-references.patch 513 RMD160 8e02248d863adde790a776b4f599c9a5ff5749e6 SHA1 bdabd9115bfa6e0666dc9641c616216915024f95 SHA256 5efac09b28ad8f4051506596e9e68d538725e5dc3a9f5db14b4d77fe4ed0f748
+MD5 cbe8b7274317205bb3184e6292a8b4c5 files/mercury-extras-0.13.0-references.patch 513
+RMD160 8e02248d863adde790a776b4f599c9a5ff5749e6 files/mercury-extras-0.13.0-references.patch 513
+SHA256 5efac09b28ad8f4051506596e9e68d538725e5dc3a9f5db14b4d77fe4ed0f748 files/mercury-extras-0.13.0-references.patch 513
+AUX mercury-extras-0.13.0-trailed_update.patch 759 RMD160 d079c3a8d19b74f71bf8d972577f52c492f7d214 SHA1 9e2bbd86254176186799b9325550654ea239be34 SHA256 034c6dfde10f3514646491630eee005bd35365f427cbf236739ff89ed0cc4f33
+MD5 56cd11cec1d931c51b9f366dcdeae204 files/mercury-extras-0.13.0-trailed_update.patch 759
+RMD160 d079c3a8d19b74f71bf8d972577f52c492f7d214 files/mercury-extras-0.13.0-trailed_update.patch 759
+SHA256 034c6dfde10f3514646491630eee005bd35365f427cbf236739ff89ed0cc4f33 files/mercury-extras-0.13.0-trailed_update.patch 759
 AUX mercury-extras-0.13.0_beta-concurrency-r1.patch 348 RMD160 ef59a85f37c7eec3dc192c533e0912b35d6470ba SHA1 0f3c33291288991d575b9c372740b7421e09e15b SHA256 7a0395b70a10f0e769657e86a9ec12d1a9b1ad2a830f1abcfa85ffb51b86ca43
 MD5 0b9db2c291e37973586bef548e6bfbfe files/mercury-extras-0.13.0_beta-concurrency-r1.patch 348
 RMD160 ef59a85f37c7eec3dc192c533e0912b35d6470ba files/mercury-extras-0.13.0_beta-concurrency-r1.patch 348
@@ -84,6 +124,7 @@ RMD160 80643d6cc0b83f415629d7c00fee6fc2a40de3cf files/mercury-extras-0.13.0_beta
 SHA256 47cc0bef68e63e5ac5eb22746c8266991c1af41af06d30d8b014a56a095ca079 files/mercury-extras-0.13.0_beta-trailed_update-r1.patch 1927
 DIST mercury-extras-0.12.2.tar.gz 759070 RMD160 3e7c4c67590408d2da056135c9560ff4d078eff6 SHA1 fc0f446f8b7f448c27f61bfe226a33fbaa007e0a SHA256 3a5be0941fad7ed8f8d2e967138984127510ba388b65b0f3f35f46ae8b6b43a8
 DIST mercury-extras-0.13.0-beta-2006-09-07-unstable.tar.gz 873920 RMD160 ec57cbb7f06212efc17290c7def2f418ab988964 SHA1 ee709be0e6452b8fa9382144e9b63d06f579da28 SHA256 1956469324fc15f9f0ca2cdf9fe4eabb578a4d9cd092d14c98c7fc5a623e4a45
+DIST mercury-extras-0.13.0.tar.gz 876713 RMD160 a310a51b050647ec49e797a6469ce11145368c6d SHA1 4e12415003488eac13991c55164f42e10d827fcc SHA256 0e4238a9b891067f75c9f792e9dc970005d66a3248be6e8a4adc24e5291b1f24
 EBUILD mercury-extras-0.12.2-r1.ebuild 2925 RMD160 41a913f2802c9ce9dadc1188cc7df763ffbfd45a SHA1 7d6bb912018a41c4dd77d0d8549f79dabe9136df SHA256 ae00eb0a2d28f2ad6606864e0ed92fb0bbaaa35c238a5aacb68668154851463b
 MD5 124745e0d3a42531366cfc18fba3f7b9 mercury-extras-0.12.2-r1.ebuild 2925
 RMD160 41a913f2802c9ce9dadc1188cc7df763ffbfd45a mercury-extras-0.12.2-r1.ebuild 2925
@@ -96,14 +137,18 @@ EBUILD mercury-extras-0.12.2.ebuild 2776 RMD160 89b69551c1a1144b11cd7584c1752cb1
 MD5 7b6076b8af4283b1abca548a13015298 mercury-extras-0.12.2.ebuild 2776
 RMD160 89b69551c1a1144b11cd7584c1752cb17640b7fd mercury-extras-0.12.2.ebuild 2776
 SHA256 ad64576bbef6ccbc08c906aa85b2332ef3796fbd1a334a4d3eb4d1536c9d05a8 mercury-extras-0.12.2.ebuild 2776
+EBUILD mercury-extras-0.13.0.ebuild 3359 RMD160 1a77d77258ea5878d5f62aba3c90d682c3b59e09 SHA1 9b7ea52d570cedd7ec388bf16e265911cd287406 SHA256 532456c6489a0be114176f6faf8face13b5e09dcbe10489e7231dfb53741dbef
+MD5 f34f3fbd5f105e982e712f77413d4b84 mercury-extras-0.13.0.ebuild 3359
+RMD160 1a77d77258ea5878d5f62aba3c90d682c3b59e09 mercury-extras-0.13.0.ebuild 3359
+SHA256 532456c6489a0be114176f6faf8face13b5e09dcbe10489e7231dfb53741dbef mercury-extras-0.13.0.ebuild 3359
 EBUILD mercury-extras-0.13.0_beta20060907.ebuild 3836 RMD160 199cf4f215d3faddf8f33163423fa39cc480ed9a SHA1 9d95dad8f26020250339ce3dc7760cf292eb3ba9 SHA256 2387dfddb10e1a86abdb55a100c54f6942b1d62a821b162923c7ea29c55497d0
 MD5 08beca466cfaeddfee03e3e2b6037352 mercury-extras-0.13.0_beta20060907.ebuild 3836
 RMD160 199cf4f215d3faddf8f33163423fa39cc480ed9a mercury-extras-0.13.0_beta20060907.ebuild 3836
 SHA256 2387dfddb10e1a86abdb55a100c54f6942b1d62a821b162923c7ea29c55497d0 mercury-extras-0.13.0_beta20060907.ebuild 3836
-MISC ChangeLog 10760 RMD160 b59a4a604abfa98c6e22bbf32b4bd73622b336e8 SHA1 3451ca324fb187659ab48f388a7288785673b5c1 SHA256 fc0bad90386a722b60e4f01568d0ce4d08ff7aea4f9ca176bae5afa9f6860b7a
-MD5 2b9e7c5fca9153b334a85829778bdc0e ChangeLog 10760
-RMD160 b59a4a604abfa98c6e22bbf32b4bd73622b336e8 ChangeLog 10760
-SHA256 fc0bad90386a722b60e4f01568d0ce4d08ff7aea4f9ca176bae5afa9f6860b7a ChangeLog 10760
+MISC ChangeLog 11377 RMD160 ea480823653e055ab238b0196ef9fc611eab585b SHA1 e41ccc614d5a1c3b61398a128d36ea05ffaa0fc0 SHA256 2d9f1187306c26e5549d9da751db5fbfe3d373a014faa205dfb4962a45e8a8f8
+MD5 7fa49e59c89e8226ff175c041bd7e7d9 ChangeLog 11377
+RMD160 ea480823653e055ab238b0196ef9fc611eab585b ChangeLog 11377
+SHA256 2d9f1187306c26e5549d9da751db5fbfe3d373a014faa205dfb4962a45e8a8f8 ChangeLog 11377
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
 MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247
 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247
@@ -117,6 +162,9 @@ SHA256 087bf13f383826ff1da30ff861cfc48008b7037a9a844f14fee94f51934ec525 files/di
 MD5 04bb3f50c82519cd929f7754557a4124 files/digest-mercury-extras-0.12.2-r2 265
 RMD160 e18050a352bc3f86650cf53244bbb17545ef0817 files/digest-mercury-extras-0.12.2-r2 265
 SHA256 087bf13f383826ff1da30ff861cfc48008b7037a9a844f14fee94f51934ec525 files/digest-mercury-extras-0.12.2-r2 265
+MD5 0df6fdfa0b711ce32f82e6661f9ac4a1 files/digest-mercury-extras-0.13.0 265
+RMD160 083abb2da996e9c79af8b8d6a733cbb25bb8e657 files/digest-mercury-extras-0.13.0 265
+SHA256 c0f9ca9a8d69c1b6ee73c253c883466c77ab8ef199e217603293df430241f827 files/digest-mercury-extras-0.13.0 265
 MD5 307b72d614fb3de37b23ac01d0d59ed7 files/digest-mercury-extras-0.13.0_beta20060907 340
 RMD160 4eb561d898522ad1561409f4322d6acacdb7b548 files/digest-mercury-extras-0.13.0_beta20060907 340
 SHA256 fbbe2a92a3bfe567e7e9c2a2e4cf8001d12de2096cf64f38ce1056adf2c5463d files/digest-mercury-extras-0.13.0_beta20060907 340
diff --git a/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0 b/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0
new file mode 100644
index 000000000000..363f432323d2
--- /dev/null
+++ b/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0
@@ -0,0 +1,3 @@
+MD5 9921e1e2f2c2930e8322540dbd722286 mercury-extras-0.13.0.tar.gz 876713
+RMD160 a310a51b050647ec49e797a6469ce11145368c6d mercury-extras-0.13.0.tar.gz 876713
+SHA256 0e4238a9b891067f75c9f792e9dc970005d66a3248be6e8a4adc24e5291b1f24 mercury-extras-0.13.0.tar.gz 876713
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0-concurrency.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0-concurrency.patch
new file mode 100644
index 000000000000..6fab621b5a37
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0-concurrency.patch
@@ -0,0 +1,11 @@
+--- mercury-extras-0.13.0.orig/concurrency/Mmakefile	2006-04-20 19:43:31.000000000 +1200
++++ mercury-extras-0.13.0/concurrency/Mmakefile	2006-09-17 08:58:34.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-dynamic_linking.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0-dynamic_linking.patch
new file mode 100644
index 000000000000..6c99cec5aaf6
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0-dynamic_linking.patch
@@ -0,0 +1,11 @@
+--- mercury-extras-0.13.0.orig/dynamic_linking/Mmakefile	2005-01-25 20:49:05.000000000 +1300
++++ mercury-extras-0.13.0/dynamic_linking/Mmakefile	2006-09-17 09:02:49.000000000 +1200
+@@ -11,7 +11,7 @@
+ MLFLAGS = --shared
+ 
+ # Link in the `-ldl' library (this may not be needed on some systems)
+-MLLIBS = -ldl
++MLLIBS = -L/usr/lib -ldl
+ 
+ # enable C-level debugging
+ CFLAGS = -g
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0-lex.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0-lex.patch
new file mode 100644
index 000000000000..f71cef6cda9b
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0-lex.patch
@@ -0,0 +1,11 @@
+--- mercury-extras-0.13.0.orig/lex/Mmakefile	2002-12-03 17:48:31.000000000 +1300
++++ mercury-extras-0.13.0/lex/Mmakefile	2006-09-17 09:05:13.000000000 +1200
+@@ -25,7 +25,7 @@
+ # 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-mercury_glut.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0-mercury_glut.patch
new file mode 100644
index 000000000000..230aba95f164
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0-mercury_glut.patch
@@ -0,0 +1,24 @@
+--- mercury-extras-0.13.0.orig/graphics/mercury_glut/Mmakefile	2006-03-30 14:52:44.000000000 +1200
++++ mercury-extras-0.13.0/graphics/mercury_glut/Mmakefile	2006-09-17 09:07:50.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-mercury_opengl.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0-mercury_opengl.patch
new file mode 100644
index 000000000000..59c49f9ee315
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0-mercury_opengl.patch
@@ -0,0 +1,57 @@
+diff -ur mercury-extras-0.13.0.orig/graphics/mercury_opengl/Mmakefile mercury-extras-0.13.0/graphics/mercury_opengl/Mmakefile
+--- mercury-extras-0.13.0.orig/graphics/mercury_opengl/Mmakefile	2006-03-30 14:52:44.000000000 +1200
++++ mercury-extras-0.13.0/graphics/mercury_opengl/Mmakefile	2006-09-17 09:11:53.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
+diff -ur mercury-extras-0.13.0.orig/graphics/mercury_opengl/Mmakefile.mtogl mercury-extras-0.13.0/graphics/mercury_opengl/Mmakefile.mtogl
+--- mercury-extras-0.13.0.orig/graphics/mercury_opengl/Mmakefile.mtogl	2004-12-01 14:45:30.000000000 +1300
++++ mercury-extras-0.13.0/graphics/mercury_opengl/Mmakefile.mtogl	2006-09-17 09:13:55.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) \
+-          	  -L$(MERCURY_TCLTK_DIR) 
+-MLLIBS 		= $(TCLTK_LIBS) $(EXTRA_MLLIBS)
+-C2INITARGS 	= $(MERCURY_TCLTK_DIR)/mercury_tcltk.init 
++#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) $(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
+ 
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0-mercury_tcltk.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0-mercury_tcltk.patch
new file mode 100644
index 000000000000..35d1902c1ef0
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0-mercury_tcltk.patch
@@ -0,0 +1,14 @@
+--- mercury-extras-0.13.0.orig/graphics/mercury_tcltk/Mmakefile	2005-08-15 16:11:42.000000000 +1200
++++ mercury-extras-0.13.0/graphics/mercury_tcltk/Mmakefile	2006-09-17 09:09:51.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-odbc.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0-odbc.patch
new file mode 100644
index 000000000000..84ef1889de5e
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0-odbc.patch
@@ -0,0 +1,18 @@
+--- mercury-extras-0.13.0.orig/odbc/Mmakefile	2006-04-04 13:49:14.000000000 +1200
++++ mercury-extras-0.13.0/odbc/Mmakefile	2006-09-17 09:22:47.000000000 +1200
+@@ -48,10 +48,13 @@
+ 	# note: on a DEC Alpha using OSF1 remove the -ldl.
+ endif
+ 
+-MAIN_TARGET=odbc_test
++MAIN_TARGET=libodbc
+ 
+ .PHONY: depend
+-depend: odbc_test.depend
++depend: odbc.depend
++
++.PHONY: install
++install: libodbc.install
+ 
+ .PHONY: check
+ check:
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0-posix.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0-posix.patch
new file mode 100644
index 000000000000..007e5f4d479c
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0-posix.patch
@@ -0,0 +1,11 @@
+--- mercury-extras-0.13.0.orig/posix/Mmakefile	2004-02-11 17:35:14.000000000 +1300
++++ mercury-extras-0.13.0/posix/Mmakefile	2006-09-17 09:17:51.000000000 +1200
+@@ -34,7 +34,7 @@
+ 
+ .PHONY: install
+ install: libposix.install
+-	cp $(ADDITIONAL_HDRS) $(INSTALL_PREFIX)/lib/mercury/inc
++	cp $(ADDITIONAL_HDRS) $(INSTALL_PREFIX)/lib/mercury-0.13.0/inc
+ 
+ .PHONY: clean
+ clean:
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0-references.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0-references.patch
new file mode 100644
index 000000000000..e37d9567b6b3
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0-references.patch
@@ -0,0 +1,13 @@
+--- mercury-extras-0.13.0.orig/references/Mmakefile	2006-04-21 17:01:39.000000000 +1200
++++ mercury-extras-0.13.0/references/Mmakefile	2006-09-17 09:19:11.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-trailed_update.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0-trailed_update.patch
new file mode 100644
index 000000000000..9d944d52d6e3
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0-trailed_update.patch
@@ -0,0 +1,23 @@
+--- mercury-extras-0.13.0.orig/trailed_update/Mmakefile	2004-07-30 19:03:46.000000000 +1200
++++ mercury-extras-0.13.0/trailed_update/Mmakefile	2006-09-17 09:21:08.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
+@@ -30,6 +34,9 @@
+ 	cd samples && mmake $(MMAKEFLAGS) check
+ 	cd tests && mmake $(MMAKEFLAGS) check
+ 
++.PHONY: install
++install: libtrailed_update.install
++
+ .PHONY: clean
+ clean:
+ 	cd samples && mmake $(MMAKEFLAGS) clean
diff --git a/dev-lang/mercury-extras/mercury-extras-0.13.0.ebuild b/dev-lang/mercury-extras/mercury-extras-0.13.0.ebuild
new file mode 100644
index 000000000000..0725971e180e
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-0.13.0.ebuild
@@ -0,0 +1,120 @@
+# 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.ebuild,v 1.1 2006/09/16 21:25:49 keri Exp $
+
+inherit eutils
+
+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/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+
+IUSE="doc glut iodbc ncurses odbc opengl tcltk xml"
+
+DEPEND="~dev-lang/mercury-${PV}
+	glut? ( virtual/glut )
+	odbc? ( dev-db/unixODBC )
+	iodbc? ( !odbc? ( dev-db/libiodbc ) )
+	ncurses? ( sys-libs/ncurses )
+	opengl? ( virtual/opengl )
+	tcltk? ( =dev-lang/tk-8.4*
+		|| ( (
+			x11-libs/libX11
+			x11-libs/libXmu )
+		virtual/x11 ) )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-concurrency.patch
+	epatch "${FILESDIR}"/${P}-dynamic_linking.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}-posix.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:windows_installer_generator ::" Mmakefile
+	sed -i  -e "s:lib/mercury:lib/mercury-${PV}:" posix/Mmakefile
+
+	if built_with_use dev-lang/mercury minimal; then
+		sed -i -e "s:references::" Mmakefile
+	else
+		sed -i -e "s:xml:trailed_update xml:" Mmakefile
+	fi
+
+	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
+
+	! use ncurses && sed -i -e "s:curs curses::" Mmakefile
+	! use xml && sed -i -e "s:xml::" 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
+
+		if use ncurses ; then
+			docinto samples/curs
+			dodoc curs/samples/*.m
+
+			docinto samples/curses
+			dodoc curses/sample/*.m
+		fi
+
+		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
+}