New development snapshot.

Package-Manager: portage-2.1_pre7-r5

7 files changed, 252 insertions, 4 deletions

diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog
index bc04cd853de4..1c3f3f6ff26d 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.8 2006/04/20 10:16:49 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.9 2006/04/22 21:51:37 keri Exp $
+
+*mercury-extras-0.13.0_beta4 (22 Apr 2006)
+
+  22 Apr 2006; Keri Harris <keri@gentoo.org>
+  +files/mercury-extras-0.13.0_beta4-concurrency.patch,
+  +files/mercury-extras-0.13.0_beta4-odbc.patch,
+  +files/mercury-extras-0.13.0_beta4-trailed_update.patch,
+  +mercury-extras-0.13.0_beta4.ebuild:
+  New development snapshot.
 
 *mercury-extras-0.13.0_beta3 (20 Apr 2006)
 
diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index 87449f3d37fc..8cf4adc95677 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,6 +1,6 @@
-MD5 fcfbd6a04c586e31f437dcca3863ae21 ChangeLog 2859
-RMD160 3c3fc4f051359177159f261ac63bb81d3f620c89 ChangeLog 2859
-SHA256 8b80fc992422fa8fc581a864d6695d763b2f36f9f670d79dfe3f10434ed8c2c1 ChangeLog 2859
+MD5 f26afc129ad36250fbc6e901f92065a6 ChangeLog 3180
+RMD160 df6d5e4016715ffa15b1cc604a2d471e945c0767 ChangeLog 3180
+SHA256 a430206623cb48edc9b390cebceeb521a9ae8b649d72d695d49831425ddbeb05 ChangeLog 3180
 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
@@ -16,6 +16,9 @@ SHA256 a121a1d526fcc00e9dd372ed4af709b7c1540533f9be3b2927911612dd4ec268 files/di
 MD5 76736dbb7218801108ec509f1425cb0f files/digest-mercury-extras-0.13.0_beta3 340
 RMD160 26835a9071da724fbc424c67ad84c0704b7e6354 files/digest-mercury-extras-0.13.0_beta3 340
 SHA256 d4850211a8d81e5bc78d7df7dc103f102a7e15caf820ab477553291115df02ff files/digest-mercury-extras-0.13.0_beta3 340
+MD5 7f1704e7cafebc8566bada52836bbf0b files/digest-mercury-extras-0.13.0_beta4 340
+RMD160 10874625e6f87743215bc1e4e4d460a807b4e24a files/digest-mercury-extras-0.13.0_beta4 340
+SHA256 21248ae520b8bd0e646e80b5715af17dc0d81d85866b8d74fb8988f12cf48a11 files/digest-mercury-extras-0.13.0_beta4 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
@@ -100,6 +103,15 @@ SHA256 f1b30d77068b72c36638687aec1b060c1adea528341e3252297319971b934334 files/me
 MD5 4b4ff5851a45ae76eb7c7efb53ec770d files/mercury-extras-0.13.0_beta3-trailed_update.patch 1927
 RMD160 80643d6cc0b83f415629d7c00fee6fc2a40de3cf files/mercury-extras-0.13.0_beta3-trailed_update.patch 1927
 SHA256 47cc0bef68e63e5ac5eb22746c8266991c1af41af06d30d8b014a56a095ca079 files/mercury-extras-0.13.0_beta3-trailed_update.patch 1927
+MD5 0b9db2c291e37973586bef548e6bfbfe files/mercury-extras-0.13.0_beta4-concurrency.patch 348
+RMD160 ef59a85f37c7eec3dc192c533e0912b35d6470ba files/mercury-extras-0.13.0_beta4-concurrency.patch 348
+SHA256 7a0395b70a10f0e769657e86a9ec12d1a9b1ad2a830f1abcfa85ffb51b86ca43 files/mercury-extras-0.13.0_beta4-concurrency.patch 348
+MD5 a953d57835d38421007a1b867f2df223 files/mercury-extras-0.13.0_beta4-odbc.patch 1328
+RMD160 67ce8cbcce6f6f2e9d04d714df967981a162dda7 files/mercury-extras-0.13.0_beta4-odbc.patch 1328
+SHA256 f1b30d77068b72c36638687aec1b060c1adea528341e3252297319971b934334 files/mercury-extras-0.13.0_beta4-odbc.patch 1328
+MD5 4b4ff5851a45ae76eb7c7efb53ec770d files/mercury-extras-0.13.0_beta4-trailed_update.patch 1927
+RMD160 80643d6cc0b83f415629d7c00fee6fc2a40de3cf files/mercury-extras-0.13.0_beta4-trailed_update.patch 1927
+SHA256 47cc0bef68e63e5ac5eb22746c8266991c1af41af06d30d8b014a56a095ca079 files/mercury-extras-0.13.0_beta4-trailed_update.patch 1927
 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
@@ -115,6 +127,9 @@ SHA256 46f05ec8f2c031777d5e8549a329483f58bf6c0b88e1f4f3eaee4a3517e8a41a mercury-
 MD5 da9b58811ad99d10ab8daa39409170d9 mercury-extras-0.13.0_beta3.ebuild 3218
 RMD160 266aee50f73e394d76e76695e77193a2d98c9c3f mercury-extras-0.13.0_beta3.ebuild 3218
 SHA256 092bb94c0071a272b69f9b02e03f8064eeb2c2e9a1f0a4a0bc59b738c90712cc mercury-extras-0.13.0_beta3.ebuild 3218
+MD5 2066010afc115af712cd3942e8db61b3 mercury-extras-0.13.0_beta4.ebuild 3169
+RMD160 a7dcac6b1d76e27f7d52233bfd48d10b04ce3886 mercury-extras-0.13.0_beta4.ebuild 3169
+SHA256 a6ca93f9ec1ca76a8c475bf2f6bd57520a4dad619edf0652a615e835c7587d58 mercury-extras-0.13.0_beta4.ebuild 3169
 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_beta4 b/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta4
new file mode 100644
index 000000000000..b8117980fe6d
--- /dev/null
+++ b/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta4
@@ -0,0 +1,3 @@
+MD5 022e64f667d140c0fb1ce9a31b3ae62c mercury-extras-0.13.0-beta-2006-04-21-unstable.tar.gz 873600
+RMD160 79c04bc0ae4e3de2f2d77a8cd6fd0614c9e9ac8d mercury-extras-0.13.0-beta-2006-04-21-unstable.tar.gz 873600
+SHA256 2acd97f8e4a994e09488da4b2fde51ffb568852d62863cc6a71abf160a757422 mercury-extras-0.13.0-beta-2006-04-21-unstable.tar.gz 873600
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta4-concurrency.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta4-concurrency.patch
new file mode 100644
index 000000000000..793e088bfeb0
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta4-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_beta4-odbc.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta4-odbc.patch
new file mode 100644
index 000000000000..e099021c0f93
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta4-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=-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_beta4-trailed_update.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta4-trailed_update.patch
new file mode 100644
index 000000000000..c36106b5c7e4
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.0_beta4-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_beta4.ebuild b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta4.ebuild
new file mode 100644
index 000000000000..90703a1c3349
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta4.ebuild
@@ -0,0 +1,111 @@
+# 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_beta4.ebuild,v 1.1 2006/04/22 21:51:37 keri Exp $
+
+inherit eutils versionator
+
+MY_PV=$(get_version_component_range 1-3 $PV)-beta
+MY_P=${PN}-${MY_PV}-2006-04-21
+
+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}
+	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/beta4/beta}-lex.patch
+	epatch "${FILESDIR}"/${P/beta4/beta}-mercury_glut.patch
+	epatch "${FILESDIR}"/${P/beta4/beta}-mercury_tcltk.patch
+	epatch "${FILESDIR}"/${P/beta4/beta}-mercury_opengl.patch
+	epatch "${FILESDIR}"/${P}-odbc.patch
+	epatch "${FILESDIR}"/${P/beta4/beta}-posix.patch
+	epatch "${FILESDIR}"/${P/beta4/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
+}