New development snapshot.

Package-Manager: portage-2.1_pre9-r5

4 files changed, 113 insertions, 0 deletions

diff --git a/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta8 b/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta8
new file mode 100644
index 000000000000..ff6de7fcadf5
--- /dev/null
+++ b/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta8
@@ -0,0 +1,3 @@
+MD5 131cca3fbbfd273f2e0ca808168fcb1f mercury-extras-0.13.0-beta-2006-04-29-unstable.tar.gz 873624
+RMD160 766133aed9f8d83333572fbe9da906c034f183fc mercury-extras-0.13.0-beta-2006-04-29-unstable.tar.gz 873624
+SHA256 2091442e85a657506f396951106e0f02499526619f66b60d67ae532a11952160 mercury-extras-0.13.0-beta-2006-04-29-unstable.tar.gz 873624
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta8-concurrency.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta8-concurrency.patch
new file mode 100644
index 000000000000..793e088bfeb0
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta8-concurrency.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_beta8-odbc.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta8-odbc.patch
new file mode 100644
index 000000000000..b4b686a68215
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta8-odbc.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_beta8-trailed_update.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta8-trailed_update.patch
new file mode 100644
index 000000000000..c36106b5c7e4
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta8-trailed_update.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)
+ 	;