Version bump.

(Portage version: 2.1.1)

13 files changed, 333 insertions, 1 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/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
+}