New development snapshot.

Package-Manager: portage-2.1_pre10-r5

7 files changed, 264 insertions, 5 deletions

diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog
index 2c87e379473a..dec2a62f4736 100644
--- a/dev-lang/mercury-extras/ChangeLog
+++ b/dev-lang/mercury-extras/ChangeLog
@@ -1,6 +1,15 @@
 # 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.16 2006/05/02 07:56:19 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.17 2006/05/13 05:11:09 keri Exp $
+
+*mercury-extras-0.13.0_beta20060501 (13 May 2006)
+
+  13 May 2006; Keri Harris <keri@gentoo.org>
+  +files/mercury-extras-0.13.0_beta-concurrency-r1.patch,
+  +files/mercury-extras-0.13.0_beta-odbc-r1.patch,
+  +files/mercury-extras-0.13.0_beta-trailed_update-r1.patch,
+  +mercury-extras-0.13.0_beta20060501.ebuild:
+  New development snapshot.
 
 *mercury-extras-0.13.0_beta8 (02 May 2006)
 
diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index 8e942f5686ca..3d081fb56139 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -38,6 +38,10 @@ 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_beta-concurrency-r1.patch 348 RMD160 ef59a85f37c7eec3dc192c533e0912b35d6470ba SHA1 0f3c33291288991d575b9c372740b7421e09e15b SHA256 7a0395b70a10f0e769657e86a9ec12d1a9b1ad2a830f1abcfa85ffb51b86ca43 size 348
+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
+SHA256 7a0395b70a10f0e769657e86a9ec12d1a9b1ad2a830f1abcfa85ffb51b86ca43 files/mercury-extras-0.13.0_beta-concurrency-r1.patch 348
 AUX mercury-extras-0.13.0_beta-dynamic_linking.patch 408 RMD160 392fd1d24af701fe91a30302c2a23638933fb441 SHA1 7ae4aab1e6f13d49981edaf45eca6eee15f7cc98 SHA256 97df38482ccbbb6c56af8a116c32299a08fe66bae5d7c9c2a2b9b7782a034b00 size 408
 MD5 75b0ca8fe3bb2411f5065cec870b6ac7 files/mercury-extras-0.13.0_beta-dynamic_linking.patch 408
 RMD160 392fd1d24af701fe91a30302c2a23638933fb441 files/mercury-extras-0.13.0_beta-dynamic_linking.patch 408
@@ -58,6 +62,10 @@ AUX mercury-extras-0.13.0_beta-mercury_tcltk.patch 546 RMD160 fc047570a12e649b1d
 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
+AUX mercury-extras-0.13.0_beta-odbc-r1.patch 1339 RMD160 70b23874a3add6dab7b25949faa85260de46c22d SHA1 8cf38cc4dbdda9d42dc036071488e0c919a87296 SHA256 da96e81dd3b52feaebe5bbe2ae16ab85fc3a115d74d961a6b2f8a4d84f1ec64c size 1339
+MD5 2e38d1b72337d73e77704bf9ab05b533 files/mercury-extras-0.13.0_beta-odbc-r1.patch 1339
+RMD160 70b23874a3add6dab7b25949faa85260de46c22d files/mercury-extras-0.13.0_beta-odbc-r1.patch 1339
+SHA256 da96e81dd3b52feaebe5bbe2ae16ab85fc3a115d74d961a6b2f8a4d84f1ec64c files/mercury-extras-0.13.0_beta-odbc-r1.patch 1339
 AUX mercury-extras-0.13.0_beta-posix.patch 351 RMD160 6b52d219d41c441b6bc8c77438aca2993eb65dda SHA1 9b13d806a983ec17491064dfebc4dcfe0d0c33f6 SHA256 80054a1dd5a9a1d0c29fb03d3609bfcaed1f45453ecbbc5c1acfc0093cb2f570 size 351
 MD5 3ae01dd37c7a529cdc16136c016e43fa files/mercury-extras-0.13.0_beta-posix.patch 351
 RMD160 6b52d219d41c441b6bc8c77438aca2993eb65dda files/mercury-extras-0.13.0_beta-posix.patch 351
@@ -66,6 +74,10 @@ AUX mercury-extras-0.13.0_beta-references.patch 545 RMD160 109a113a1f44c3fbd435c
 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
+AUX mercury-extras-0.13.0_beta-trailed_update-r1.patch 1927 RMD160 80643d6cc0b83f415629d7c00fee6fc2a40de3cf SHA1 2adc29c2d23a184af7818b63c9d80869c0f2f807 SHA256 47cc0bef68e63e5ac5eb22746c8266991c1af41af06d30d8b014a56a095ca079 size 1927
+MD5 4b4ff5851a45ae76eb7c7efb53ec770d files/mercury-extras-0.13.0_beta-trailed_update-r1.patch 1927
+RMD160 80643d6cc0b83f415629d7c00fee6fc2a40de3cf files/mercury-extras-0.13.0_beta-trailed_update-r1.patch 1927
+SHA256 47cc0bef68e63e5ac5eb22746c8266991c1af41af06d30d8b014a56a095ca079 files/mercury-extras-0.13.0_beta-trailed_update-r1.patch 1927
 AUX mercury-extras-0.13.0_beta-trailed_update.patch 794 RMD160 c489347887c247d35736f46248f103ea60930dbb SHA1 20339e458f6729f2102779a22839392c85ab0f04 SHA256 8dfa795f9262d5d45661e43d1590ab25978a74154e91626debff48c0d6bfb621 size 794
 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
@@ -123,10 +135,15 @@ DIST mercury-extras-0.13.0-beta-2006-04-23-unstable.tar.gz 873614 RMD160 892385e
 DIST mercury-extras-0.13.0-beta-2006-04-25-unstable.tar.gz 873682 RMD160 73dde7a4aab6ec81d034f11e6da795878029cc30 SHA256 5043da889ae47d834e32e4508ba88082c473ac55fbb6df3f938290e0a38cdd39 size 873682
 DIST mercury-extras-0.13.0-beta-2006-04-27-unstable.tar.gz 873616 RMD160 8e00039f16141240613c615ecee92bd8352cdb59 SHA256 88f778f67f166e21cc9b6a7637bd2bc15c3c69f42e669986fc105f62632035a7 size 873616
 DIST mercury-extras-0.13.0-beta-2006-04-29-unstable.tar.gz 873624 RMD160 766133aed9f8d83333572fbe9da906c034f183fc SHA256 2091442e85a657506f396951106e0f02499526619f66b60d67ae532a11952160 size 873624
+DIST mercury-extras-0.13.0-beta-2006-05-01-unstable.tar.gz 873615 RMD160 560d704f77809011a555bed63734df54a0f6727b SHA256 4ca0f60ae3b2863a00bdbf8749d9987916dc17b6879b2659f63ccc278e356c4b size 873615
 EBUILD mercury-extras-0.12.2.ebuild 2739 RMD160 200a8c5d3557610f9100a084d5585d2499cca4cf SHA1 45e2971253bc733b3e75cff12beea4505e52f549 SHA256 79b9daa376a3794f279e67d77800b6ee620ebddc038eeb9b0b41fd315bee5501 size 2739
 MD5 4fa62b5f6c818eb9a723e3d0df18534a mercury-extras-0.12.2.ebuild 2739
 RMD160 200a8c5d3557610f9100a084d5585d2499cca4cf mercury-extras-0.12.2.ebuild 2739
 SHA256 79b9daa376a3794f279e67d77800b6ee620ebddc038eeb9b0b41fd315bee5501 mercury-extras-0.12.2.ebuild 2739
+EBUILD mercury-extras-0.13.0_beta20060501.ebuild 3506 RMD160 ea1b86e5f1aaa139b37e94d8a3a41b410bd688fc SHA1 66dcce5222bb6339a624066c74e77afd526bfb6c SHA256 7e8d3a2f19305e85e256516da171bee7f8e4b2bff9c094e26266ad9a0045a0eb size 3506
+MD5 52a2146febb4b1df1b46e728521093f3 mercury-extras-0.13.0_beta20060501.ebuild 3506
+RMD160 ea1b86e5f1aaa139b37e94d8a3a41b410bd688fc mercury-extras-0.13.0_beta20060501.ebuild 3506
+SHA256 7e8d3a2f19305e85e256516da171bee7f8e4b2bff9c094e26266ad9a0045a0eb mercury-extras-0.13.0_beta20060501.ebuild 3506
 EBUILD mercury-extras-0.13.0_beta5.ebuild 3340 RMD160 b5ed66824351946eda15e2015c5694003a048946 SHA1 a4cbea76263d99dd3d0de9f9639dc298210d0842 SHA256 ccdec38279080659dd89de68cbbee2dcd3c5964e01d2084602eedee41e5aa535 size 3340
 MD5 1934a6baaa719fef10812bab095e6854 mercury-extras-0.13.0_beta5.ebuild 3340
 RMD160 b5ed66824351946eda15e2015c5694003a048946 mercury-extras-0.13.0_beta5.ebuild 3340
@@ -143,10 +160,10 @@ EBUILD mercury-extras-0.13.0_beta8.ebuild 3340 RMD160 69d05bbc21c1a56e99954cbf03
 MD5 f4cc1346572286d7d6d39cc65933c694 mercury-extras-0.13.0_beta8.ebuild 3340
 RMD160 69d05bbc21c1a56e99954cbf03224a22af4ac89b mercury-extras-0.13.0_beta8.ebuild 3340
 SHA256 58eea411f312b74c2fcb5c3886f9afd88a0b9d1f5da51b73c1c498b590555272 mercury-extras-0.13.0_beta8.ebuild 3340
-MISC ChangeLog 5986 RMD160 daf87d9c6f38fe2ad665dd130e7a1e9a5bf33646 SHA1 f2a8852bf5596eb5e6397b7c240d8b3e17cc5b80 SHA256 a216a8658c6e9dde3685ac2d638d6e31591c284007c5c30147922da4cd1d4bd2 size 5986
-MD5 8f1f39a4056422bc9a7874af8584cde8 ChangeLog 5986
-RMD160 daf87d9c6f38fe2ad665dd130e7a1e9a5bf33646 ChangeLog 5986
-SHA256 a216a8658c6e9dde3685ac2d638d6e31591c284007c5c30147922da4cd1d4bd2 ChangeLog 5986
+MISC ChangeLog 6327 RMD160 38e76f5df3828596c57e572dac1c2d1e36987d74 SHA1 9bd1b78bdab934e9b295cc00d751012eb628cc86 SHA256 b44ae65898f60e34430a8f2c50f6820c24d4fa2bdad56390c717f6ca93a77aa9 size 6327
+MD5 7118d617a6764e5bc9947a8929f44836 ChangeLog 6327
+RMD160 38e76f5df3828596c57e572dac1c2d1e36987d74 ChangeLog 6327
+SHA256 b44ae65898f60e34430a8f2c50f6820c24d4fa2bdad56390c717f6ca93a77aa9 ChangeLog 6327
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa size 247
 MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247
 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247
@@ -154,6 +171,9 @@ SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa metadata
 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 da87b13a3823edb612a2410528fe44f2 files/digest-mercury-extras-0.13.0_beta20060501 340
+RMD160 c426e03f82c669e012e8d6beb2196314a8167e15 files/digest-mercury-extras-0.13.0_beta20060501 340
+SHA256 159d1cacfa713a24667394334956381d5a62940bc3a6fd960ceb3d13f089d49e files/digest-mercury-extras-0.13.0_beta20060501 340
 MD5 ff0539b77cd64a3be2d6d2505d419d4a files/digest-mercury-extras-0.13.0_beta5 340
 RMD160 1a1a0a897e73e2f02daf73ee4a4ad24af3a3d460 files/digest-mercury-extras-0.13.0_beta5 340
 SHA256 c76794f4296d168c3548eae5348f5a7b1a988dfefb98bbd7d37ae312ab42847b files/digest-mercury-extras-0.13.0_beta5 340
diff --git a/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta20060501 b/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta20060501
new file mode 100644
index 000000000000..54eb77a7016e
--- /dev/null
+++ b/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta20060501
@@ -0,0 +1,3 @@
+MD5 b93d841d6b55b9241ccb7d763a053ee4 mercury-extras-0.13.0-beta-2006-05-01-unstable.tar.gz 873615
+RMD160 560d704f77809011a555bed63734df54a0f6727b mercury-extras-0.13.0-beta-2006-05-01-unstable.tar.gz 873615
+SHA256 4ca0f60ae3b2863a00bdbf8749d9987916dc17b6879b2659f63ccc278e356c4b mercury-extras-0.13.0-beta-2006-05-01-unstable.tar.gz 873615
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-concurrency-r1.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-concurrency-r1.patch
new file mode 100644
index 000000000000..793e088bfeb0
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-concurrency-r1.patch
@@ -0,0 +1,11 @@
+--- 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_beta-odbc-r1.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-odbc-r1.patch
new file mode 100644
index 000000000000..b4b686a68215
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-odbc-r1.patch
@@ -0,0 +1,43 @@
+--- 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_beta-trailed_update-r1.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-trailed_update-r1.patch
new file mode 100644
index 000000000000..c36106b5c7e4
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta-trailed_update-r1.patch
@@ -0,0 +1,56 @@
+--- 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_beta20060501.ebuild b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060501.ebuild
new file mode 100644
index 000000000000..f38f8a677874
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060501.ebuild
@@ -0,0 +1,117 @@
+# 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_beta20060501.ebuild,v 1.1 2006/05/13 05:11:10 keri Exp $
+
+inherit eutils versionator
+
+BETA_V=$(get_version_component_range 4 $PV)
+BETA_V_YYYY=${BETA_V:4:4}
+BETA_V_MM=${BETA_V:8:2}
+BETA_V_DD=${BETA_V:10:2}
+MY_PV=$(get_version_component_range 1-3 $PV)-beta-${BETA_V_YYYY}-${BETA_V_MM}-${BETA_V_DD}
+MY_P=${PN}-${MY_PV}
+
+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}
+	!<dev-lang/mercury-extras-0.13.0_beta
+	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/${BETA_V}/beta}-concurrency-r1.patch
+	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-dynamic_linking.patch
+	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-lex.patch
+	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-mercury_glut.patch
+	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-mercury_tcltk.patch
+	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-mercury_opengl.patch
+	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-odbc-r1.patch
+	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-posix.patch
+	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-references.patch
+	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-trailed_update-r1.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
+}