New development snapshot.

Package-Manager: portage-2.1_pre9-r5

7 files changed, 263 insertions, 7 deletions

diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog
index fe4093d19f12..478dc308d58e 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.14 2006/04/26 10:48:18 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.15 2006/04/29 01:41:36 keri Exp $
+
+*mercury-extras-0.13.0_beta7 (29 Apr 2006)
+
+  29 Apr 2006; Keri Harris <keri@gentoo.org>
+  +files/mercury-extras-0.13.0_beta7-concurrency.patch,
+  +files/mercury-extras-0.13.0_beta7-odbc.patch,
+  +files/mercury-extras-0.13.0_beta7-trailed_update.patch,
+  +mercury-extras-0.13.0_beta7.ebuild:
+  New development snapshot.
 
 *mercury-extras-0.13.0_beta6 (26 Apr 2006)
 
diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index ead0e70fee02..cfa08116d7d7 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -94,9 +94,22 @@ AUX mercury-extras-0.13.0_beta6-trailed_update.patch 1927 RMD160 80643d6cc0b83f4
 MD5 4b4ff5851a45ae76eb7c7efb53ec770d files/mercury-extras-0.13.0_beta6-trailed_update.patch 1927
 RMD160 80643d6cc0b83f415629d7c00fee6fc2a40de3cf files/mercury-extras-0.13.0_beta6-trailed_update.patch 1927
 SHA256 47cc0bef68e63e5ac5eb22746c8266991c1af41af06d30d8b014a56a095ca079 files/mercury-extras-0.13.0_beta6-trailed_update.patch 1927
+AUX mercury-extras-0.13.0_beta7-concurrency.patch 348 RMD160 ef59a85f37c7eec3dc192c533e0912b35d6470ba SHA1 0f3c33291288991d575b9c372740b7421e09e15b SHA256 7a0395b70a10f0e769657e86a9ec12d1a9b1ad2a830f1abcfa85ffb51b86ca43 size 348
+MD5 0b9db2c291e37973586bef548e6bfbfe files/mercury-extras-0.13.0_beta7-concurrency.patch 348
+RMD160 ef59a85f37c7eec3dc192c533e0912b35d6470ba files/mercury-extras-0.13.0_beta7-concurrency.patch 348
+SHA256 7a0395b70a10f0e769657e86a9ec12d1a9b1ad2a830f1abcfa85ffb51b86ca43 files/mercury-extras-0.13.0_beta7-concurrency.patch 348
+AUX mercury-extras-0.13.0_beta7-odbc.patch 1339 RMD160 70b23874a3add6dab7b25949faa85260de46c22d SHA1 8cf38cc4dbdda9d42dc036071488e0c919a87296 SHA256 da96e81dd3b52feaebe5bbe2ae16ab85fc3a115d74d961a6b2f8a4d84f1ec64c size 1339
+MD5 2e38d1b72337d73e77704bf9ab05b533 files/mercury-extras-0.13.0_beta7-odbc.patch 1339
+RMD160 70b23874a3add6dab7b25949faa85260de46c22d files/mercury-extras-0.13.0_beta7-odbc.patch 1339
+SHA256 da96e81dd3b52feaebe5bbe2ae16ab85fc3a115d74d961a6b2f8a4d84f1ec64c files/mercury-extras-0.13.0_beta7-odbc.patch 1339
+AUX mercury-extras-0.13.0_beta7-trailed_update.patch 1927 RMD160 80643d6cc0b83f415629d7c00fee6fc2a40de3cf SHA1 2adc29c2d23a184af7818b63c9d80869c0f2f807 SHA256 47cc0bef68e63e5ac5eb22746c8266991c1af41af06d30d8b014a56a095ca079 size 1927
+MD5 4b4ff5851a45ae76eb7c7efb53ec770d files/mercury-extras-0.13.0_beta7-trailed_update.patch 1927
+RMD160 80643d6cc0b83f415629d7c00fee6fc2a40de3cf files/mercury-extras-0.13.0_beta7-trailed_update.patch 1927
+SHA256 47cc0bef68e63e5ac5eb22746c8266991c1af41af06d30d8b014a56a095ca079 files/mercury-extras-0.13.0_beta7-trailed_update.patch 1927
 DIST mercury-extras-0.12.2.tar.gz 759070 RMD160 3e7c4c67590408d2da056135c9560ff4d078eff6 SHA256 3a5be0941fad7ed8f8d2e967138984127510ba388b65b0f3f35f46ae8b6b43a8 size 759070
 DIST mercury-extras-0.13.0-beta-2006-04-23-unstable.tar.gz 873614 RMD160 892385e6275de10fef4e2e390109059eadf0d25c SHA256 51914328403cc08b9328afc31355b6e610ee8d306b41f7d096003a30a6bb1bba size 873614
 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
 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
@@ -109,14 +122,18 @@ EBUILD mercury-extras-0.13.0_beta6.ebuild 3340 RMD160 31ae804a69611ae38250a1471a
 MD5 a7f6f229b7497ab055bb56e75e6a278a mercury-extras-0.13.0_beta6.ebuild 3340
 RMD160 31ae804a69611ae38250a1471ab090a4ef414704 mercury-extras-0.13.0_beta6.ebuild 3340
 SHA256 c70b225996d48856ef355f5b9edd686f61d46b831c710f25ed898085c8abdb5d mercury-extras-0.13.0_beta6.ebuild 3340
-MISC ChangeLog 5344 RMD160 7adacfbd28ad4d2aa2f2a1cf36729efbbbfe7669 SHA1 0eee5ceb58426666b9e62f5f7244c2963e4c772e SHA256 9e887c50d6e4c221684c58b12222132650f5e7e25a5581041b422b3e3a48e736 size 5344
-MD5 008941250c4457bed30ccdb28f73011e ChangeLog 5344
-RMD160 7adacfbd28ad4d2aa2f2a1cf36729efbbbfe7669 ChangeLog 5344
-SHA256 9e887c50d6e4c221684c58b12222132650f5e7e25a5581041b422b3e3a48e736 ChangeLog 5344
-MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 be2c02607bd8d5bf707b178d925fa94c6c705014aa488156323589ca4eaac380 size 247
+EBUILD mercury-extras-0.13.0_beta7.ebuild 3340 RMD160 a2ef7cd419f080068f112954225880f70a39ca5d SHA1 ee37bb95bed02cb88300eb081a9ad5876679852a SHA256 1f0eee51510568f137d33ca22f009ffcf7b521bc7dad7f5fb6969431d7b2e584 size 3340
+MD5 8f01d7c434919985c8d6d049cee03ee0 mercury-extras-0.13.0_beta7.ebuild 3340
+RMD160 a2ef7cd419f080068f112954225880f70a39ca5d mercury-extras-0.13.0_beta7.ebuild 3340
+SHA256 1f0eee51510568f137d33ca22f009ffcf7b521bc7dad7f5fb6969431d7b2e584 mercury-extras-0.13.0_beta7.ebuild 3340
+MISC ChangeLog 5665 RMD160 20bffd361e47bcddea6dfd51942b75531e7f4dde SHA1 1decc7bb57425bf3abf0ef096c82f54620854111 SHA256 3e52631e8c901a5764e4529ed4a38115a1a9c9c5feb8da82677397abb3e5d596 size 5665
+MD5 3ada7e6c2ff5c0c79d4366294e9f9c9b ChangeLog 5665
+RMD160 20bffd361e47bcddea6dfd51942b75531e7f4dde ChangeLog 5665
+SHA256 3e52631e8c901a5764e4529ed4a38115a1a9c9c5feb8da82677397abb3e5d596 ChangeLog 5665
+MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa size 247
 MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247
 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247
-SHA256 be2c02607bd8d5bf707b178d925fa94c6c705014aa488156323589ca4eaac380 metadata.xml 247
+SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa metadata.xml 247
 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
@@ -126,3 +143,6 @@ SHA256 c76794f4296d168c3548eae5348f5a7b1a988dfefb98bbd7d37ae312ab42847b files/di
 MD5 d91b4de5a560dc125e411241d1aea508 files/digest-mercury-extras-0.13.0_beta6 340
 RMD160 22a01a2ffdb12c844a6a803b46af2e7bb460720f files/digest-mercury-extras-0.13.0_beta6 340
 SHA256 49e6a100a056d909984722a6991aa01ed12fde260b578c62c8b55c82f7fbd334 files/digest-mercury-extras-0.13.0_beta6 340
+MD5 f659f352775f376ff0b1f7beba69875b files/digest-mercury-extras-0.13.0_beta7 340
+RMD160 aacc562e929afce5089e3ade73036ade84e49bf4 files/digest-mercury-extras-0.13.0_beta7 340
+SHA256 1db55e9994671ef311bfbc232ca8562710b99387fd71f8a9e9ad64955ea94ca1 files/digest-mercury-extras-0.13.0_beta7 340
diff --git a/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta7 b/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta7
new file mode 100644
index 000000000000..ef9af4e1f551
--- /dev/null
+++ b/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta7
@@ -0,0 +1,3 @@
+MD5 558e747642f3d981606a3a7beb9655ee mercury-extras-0.13.0-beta-2006-04-27-unstable.tar.gz 873616
+RMD160 8e00039f16141240613c615ecee92bd8352cdb59 mercury-extras-0.13.0-beta-2006-04-27-unstable.tar.gz 873616
+SHA256 88f778f67f166e21cc9b6a7637bd2bc15c3c69f42e669986fc105f62632035a7 mercury-extras-0.13.0-beta-2006-04-27-unstable.tar.gz 873616
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta7-concurrency.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta7-concurrency.patch
new file mode 100644
index 000000000000..793e088bfeb0
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta7-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_beta7-odbc.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta7-odbc.patch
new file mode 100644
index 000000000000..b4b686a68215
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta7-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_beta7-trailed_update.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta7-trailed_update.patch
new file mode 100644
index 000000000000..c36106b5c7e4
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta7-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)
+ 	;
diff --git a/dev-lang/mercury-extras/mercury-extras-0.13.0_beta7.ebuild b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta7.ebuild
new file mode 100644
index 000000000000..1060f3b85ac3
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta7.ebuild
@@ -0,0 +1,114 @@
+# 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_beta7.ebuild,v 1.1 2006/04/29 01:41:36 keri Exp $
+
+inherit eutils versionator
+
+BETA_V=$(get_version_component_range 4 $PV)
+MY_PV=$(get_version_component_range 1-3 $PV)-beta
+MY_P=${PN}-${MY_PV}-2006-04-27
+
+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}-concurrency.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}-odbc.patch
+	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-posix.patch
+	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-references.patch
+	epatch "${FILESDIR}"/${P}-trailed_update.patch
+
+	sed -i	-e "s:curs:concurrency curs:" \
+		-e "s:posix:posix quickcheck:" \
+		-e "s:windows_installer_generator ::" \
+		-e "s:xml:trailed_update xml:" Mmakefile
+
+	use glut && sed -i -e "s: lex : graphics/mercury_glut lex :" Mmakefile
+	use tcltk && sed -i -e "s: lex : graphics/mercury_tcltk lex :" Mmakefile
+	use opengl && sed -i -e "s: lex : graphics/mercury_opengl lex :" Mmakefile
+
+	if use odbc ; then
+		sed -i -e "s:moose:moose odbc:" Mmakefile
+	elif use iodbc ; then
+		sed -i -e "s:moose:moose odbc:" Mmakefile
+		sed -i -e "s:MODBC_DRIVER=MODBC_UNIX:MODBC_DRIVER=MODBC_IODBC:" odbc/Mmakefile
+	fi
+}
+
+src_compile() {
+	mmake depend || die "mmake depend failed"
+	mmake || die "mmake failed"
+
+	if use opengl && use tcltk ; then
+		cd "${S}"/graphics/mercury_opengl
+		cp ../mercury_tcltk/mtcltk.m ./
+		mmake -f Mmakefile.mtogl depend || die "mmake depend mtogl failed"
+		mmake -f Mmakefile.mtogl || die "mmake mtogl failed"
+	fi
+}
+
+src_install() {
+	cd "${S}"
+	mmake INSTALL_PREFIX="${D}"/usr install || die "mmake install failed"
+
+	if use opengl && use tcltk ; then
+		cd "${S}"/graphics/mercury_opengl
+		mv Mmakefile Mmakefile.opengl
+		mv Mmakefile.mtogl Mmakefile
+		mmake INSTALL_PREFIX="${D}"/usr \
+			install || die "mmake install mtogl failed"
+	fi
+
+	cd "${S}"
+	if use doc ; then
+		docinto samples/complex_numbers
+		dodoc complex_numbers/samples/*.m
+
+		docinto samples/curs
+		dodoc curs/samples/*.m
+
+		docinto samples/curses
+		dodoc curses/sample/*.m
+
+		docinto samples/dynamic_linking
+		dodoc dynamic_linking/hello.m
+
+		docinto samples/lex
+		dodoc lex/samples/*.m
+
+		docinto samples/moose
+		dodoc moose/samples/*.m moose/samples/*.moo
+
+		docinto samples/references
+		dodoc references/samples/*.m
+	fi
+
+	dodoc README
+}