Support hlc.gc libgrade

Package-Manager: portage-2.1.4.4

5 files changed, 211 insertions, 5 deletions

diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog
index 07f355dccbf8..c1baa4371a40 100644
--- a/dev-lang/mercury-extras/ChangeLog
+++ b/dev-lang/mercury-extras/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/mercury-extras
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.64 2008/03/12 06:30:58 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.65 2008/08/22 07:51:09 keri Exp $
+
+*mercury-extras-0.13.1-r1 (22 Aug 2008)
+
+  22 Aug 2008; <keri@gentoo.org> +files/mercury-extras-0.13.1-iodbc.patch,
+  files/mercury-extras-0.13.1-odbc.patch, +mercury-extras-0.13.1-r1.ebuild:
+  Support hlc.gc libgrade.
 
   12 Mar 2008; keri <keri@gentoo.org> mercury-extras-0.12.2-r2.ebuild,
   mercury-extras-0.13.1.ebuild:
diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index 4b19297d696d..c28e1541e96c 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -13,17 +13,19 @@ AUX mercury-extras-0.12.2-trailed_update.patch 762 RMD160 c69b30d1aac449a878a654
 AUX mercury-extras-0.13.1-concurrency.patch 316 RMD160 b276785f155cf4fe7c8ba5bd8f984ef709fc4048 SHA1 c676a08c625909bc3944c4d5e8b9e146f3c8813b SHA256 339ed5ac235eff5a7e1c380a80fd80fce7d8d09328c42216b856ea27de0bb1b7
 AUX mercury-extras-0.13.1-curs.patch 18585 RMD160 19a3bb0881aa56554c1f2bc0fe3b8ca595d85b3f SHA1 0565cb3b11539da73063381cf768ccfb1af72a1e SHA256 66a9220fe4fe80cf425a08b148d7651c9762a08f159442e93325a5038319b692
 AUX mercury-extras-0.13.1-dynamic_linking.patch 376 RMD160 b39123b3713bc0e7cd35d1090eda6a404751be0f SHA1 996dbe39f6f229fe1e759ba8e2ce5ba85a8174b6 SHA256 8db33d8438f12f341b8074b13274063841380cedbd42c7468d8b3f125061c9b5
+AUX mercury-extras-0.13.1-iodbc.patch 1563 RMD160 bd21d49a15af2d07f289e3d9d108e34794b0e45e SHA1 0c2bad4cd932244ec77d49c39be362f14a7f6ebd SHA256 e2969924cbec77284162583f4745b98cac05d3e1ce6db0e0bb5c9dbc43c74da0
 AUX mercury-extras-0.13.1-lex.patch 736 RMD160 ae8e9185a7201848cad58d261d98777812a92eed SHA1 b7e7570bcbdef2fa99938115d9e60c75bac8ab25 SHA256 d5eff7470cdcaf6496f2e4250f955f49e2e2e31d13b0904187ac5f6b1f250c14
 AUX mercury-extras-0.13.1-mercury_glut.patch 758 RMD160 d19e1c034d1e1aa2adfa3226e200e67dc8746d2a SHA1 18fe7d93fe7b48c379073ff505fb4b6308d78be9 SHA256 fa5d6cdf06fe333a90834bd65b129d79dcc61b8dc3fc786462b4b11804e1cc70
 AUX mercury-extras-0.13.1-mercury_opengl.patch 4022 RMD160 b066b8e181cf7d0f21d617478f02af9744028e3a SHA1 9e350e38a018d1cc964d4b32195489a6347dc088 SHA256 6b372693d9b6bcdc78cc8e9f02748bfdf5d8561b0d34a65a06806343a076e6c5
 AUX mercury-extras-0.13.1-mercury_tcltk.patch 514 RMD160 017b0645322f622bbac569e8eefb4a58f2ff88e8 SHA1 91c6e32f27c14e07f6894745486fbf150adf3c48 SHA256 ad14d78321d44ecd5a8e36f4e8528c817c8ebf217e5223fcda52c5a01f4d4f6a
-AUX mercury-extras-0.13.1-odbc.patch 420 RMD160 0ca91b65a8a3b7907abe793940b59756bb913fa1 SHA1 c66d99db6d2682c97312dea00d89d7dfe4239093 SHA256 39425688328508864a4335c116891c9cd8e1bd7bd0a51dc7e8bcf916eebe9cea
+AUX mercury-extras-0.13.1-odbc.patch 1253 RMD160 13fd607b42c4527ad7d05dcfeb3c59de9a7bf7c8 SHA1 0803073755587f993eea05c3276efe3c20589b73 SHA256 b9220a5f1774110ae2f4862448c246ec8728b43a19bd05e01cf01556232c549e
 AUX mercury-extras-0.13.1-posix.patch 354 RMD160 3d8b68c5efabda81ad117c6282f09b25741366ac SHA1 d66442038b7d93a5b4cdc6a0ab9cb666cdef9c07 SHA256 d47871298f94007173f6aee19e1597f57400654d9ece94ae94cf14fa0118efdf
 AUX mercury-extras-0.13.1-references.patch 513 RMD160 e9e24c95c60ac0eb5b7145d9c345ab604f0bbe93 SHA1 a07a8217d22a1f8fbdc5da804b074e6bc70cd29b SHA256 02e4142693f792af9457f68b90ee39560b62b4041e86a3099f7f9c49f07f30a6
 AUX mercury-extras-0.13.1-trailed_update.patch 759 RMD160 f8bfff3e44e0cce647f523c0685ab9e35a31ef8b SHA1 6a1b232464a5f484cea259913eff730eef91ac46 SHA256 5d3aba19d04b7cee5ae6345d325def9406a95dcf58d3abcacc3ad2d708fb63a9
 DIST mercury-extras-0.12.2.tar.gz 759070 RMD160 3e7c4c67590408d2da056135c9560ff4d078eff6 SHA1 fc0f446f8b7f448c27f61bfe226a33fbaa007e0a SHA256 3a5be0941fad7ed8f8d2e967138984127510ba388b65b0f3f35f46ae8b6b43a8
 DIST mercury-extras-0.13.1.tar.gz 688974 RMD160 d14aeeefe29a2bc6ae59d174043a18808e2a6875 SHA1 3871d523400e0c0ac0396918b6ba74a378269b15 SHA256 33580108aed30359facde24645b23d5ca559fe0c9c50f448199d3d7b751b7c4c
 EBUILD mercury-extras-0.12.2-r2.ebuild 3462 RMD160 5d902deab0335a92953c2aeae32f6d6fbd9a6901 SHA1 20ef31a31892f5e8766a0cdd81153795bd6f8131 SHA256 5082810a9afdd79ac4cf33e8317e9c4aaa0566b265e04e062dce453478d7d0b8
+EBUILD mercury-extras-0.13.1-r1.ebuild 3342 RMD160 ded6c97b674c9f7d94d98c2cb05a1bbbe0612279 SHA1 c54f1f28375917a2b75105ec3b2959492db82505 SHA256 b9c5e53f3fc17bf46442dbb5e8ae95968fb2bcd351e6856a9cb305de825019f4
 EBUILD mercury-extras-0.13.1.ebuild 3614 RMD160 7826221408db19672fd2411e7facf895fa116d4a SHA1 e63282c8a99b582715b98e7980b24e4bf2a13a89 SHA256 c57314a5ea6098995dffb4f0c4cb46beaed8b93bb12e32faebed6ab0510623ab
-MISC ChangeLog 17046 RMD160 c9f1b4a3a11f07eaedcbe152ecfb5557a2ac342f SHA1 4837fafbe9ff384c75ef4e5a453075d4d4e0629e SHA256 9c9eb153b3df2f4c7083822fe6976429a350af8ab4c2bc6b82b436e13b7a55cf
+MISC ChangeLog 17266 RMD160 a61e51177d9620e723545a00410f1299096b443a SHA1 46cf87d4fe68e9e39970187245529046805d9a91 SHA256 410afa705ade353ab42710a52100da26cb7e067b1ba9b6f941f4b887cf96c0aa
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.1-iodbc.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.1-iodbc.patch
new file mode 100644
index 000000000000..0bfaea27f6f7
--- /dev/null
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.1-iodbc.patch
@@ -0,0 +1,50 @@
+--- mercury-extras-0.13.1.orig/odbc/Mmakefile	2006-04-04 13:49:14.000000000 +1200
++++ mercury-extras-0.13.1/odbc/Mmakefile	2008-08-22 19:26:52.000000000 +1200
+@@ -12,7 +12,7 @@
+ # The driver manager.
+ # Legal values for MODBC_DRIVER are MODBC_IODBC, MODBC_UNIX, and MODBC_MS.
+ # Feel free to add more (and handle them in odbc.m).
+-MODBC_DRIVER=MODBC_UNIX
++MODBC_DRIVER=MODBC_IODBC
+ 
+ # The database.
+ # Legal values for MODBC_DB are MODBC_MYSQL and MODBC_SQL_SERVER.
+@@ -36,22 +36,25 @@
+ 	MLLIBS=-lodbc32
+ else 
+ 	#ODBC_LIB_DIR=$(IODBC_DIR)/lib
+-	#ODBC_INCL_DIR=$(IODBC_DIR)/include
++	ODBC_CFLAGS=`iodbc-config --cflags`
+ 
+ 	# The following are for Debian.
+ 
+ 	# for unixODBC
+-	MLLIBS=-lodbc -lpthread -lltdl -ldl
++	MLLIBS=`iodbc-config --libs`
+ 
+ 	# for iODBC
+ 	# MLLIBS=-liodbc l-pthread -ldl
+ 	# 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:
+@@ -62,7 +65,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=--no-ansi -D$(MODBC_DRIVER) -D$(MODBC_DB) $(ODBC_CFLAGS)
+ 
+ #-----------------------------------------------------------------------------#
+ #-----------------------------------------------------------------------------#
diff --git a/dev-lang/mercury-extras/files/mercury-extras-0.13.1-odbc.patch b/dev-lang/mercury-extras/files/mercury-extras-0.13.1-odbc.patch
index 0acf03d28bd9..d8b8cc8205b0 100644
--- a/dev-lang/mercury-extras/files/mercury-extras-0.13.1-odbc.patch
+++ b/dev-lang/mercury-extras/files/mercury-extras-0.13.1-odbc.patch
@@ -1,6 +1,20 @@
 --- mercury-extras-0.13.1.orig/odbc/Mmakefile	2006-04-04 13:49:14.000000000 +1200
-+++ mercury-extras-0.13.1/odbc/Mmakefile	2006-12-04 22:05:56.000000000 +1300
-@@ -48,10 +48,13 @@
++++ mercury-extras-0.13.1/odbc/Mmakefile	2008-08-22 19:27:49.000000000 +1200
+@@ -36,22 +36,25 @@
+ 	MLLIBS=-lodbc32
+ else 
+ 	#ODBC_LIB_DIR=$(IODBC_DIR)/lib
+-	#ODBC_INCL_DIR=$(IODBC_DIR)/include
++	ODBC_CFLAGS=`odbc_config --cflags`
+ 
+ 	# The following are for Debian.
+ 
+ 	# for unixODBC
+-	MLLIBS=-lodbc -lpthread -lltdl -ldl
++	MLLIBS=`odbc_config --libs`
+ 
+ 	# for iODBC
+ 	# MLLIBS=-liodbc l-pthread -ldl
  	# note: on a DEC Alpha using OSF1 remove the -ldl.
  endif
  
@@ -16,3 +30,12 @@
  
  .PHONY: check
  check:
+@@ -62,7 +65,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=--no-ansi -D$(MODBC_DRIVER) -D$(MODBC_DB) $(ODBC_CFLAGS)
+ 
+ #-----------------------------------------------------------------------------#
+ #-----------------------------------------------------------------------------#
diff --git a/dev-lang/mercury-extras/mercury-extras-0.13.1-r1.ebuild b/dev-lang/mercury-extras/mercury-extras-0.13.1-r1.ebuild
new file mode 100644
index 000000000000..fc7462da2da0
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-0.13.1-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2008 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.1-r1.ebuild,v 1.1 2008/08/22 07:51:09 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/mercury-extras-0.13.1.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+IUSE="examples glut iodbc ncurses odbc opengl tcl tk 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 )
+	tcl? ( tk? (
+			dev-lang/tcl
+			dev-lang/tk
+			x11-libs/libX11
+			x11-libs/libXmu ) )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-curs.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}-posix.patch
+
+	if use odbc; then
+		epatch "${FILESDIR}"/${P}-odbc.patch
+	elif use iodbc; then
+		epatch "${FILESDIR}"/${P}-iodbc.patch
+	fi
+
+	sed -i	-e "s:posix:posix quickcheck:" \
+		-e "s:references::" \
+		-e "s:windows_installer_generator ::" Mmakefile
+
+	use glut && sed -i -e "s: lex : graphics/mercury_glut lex :" Mmakefile
+	use tcl && use tk && 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 || use iodbc; then
+		sed -i -e "s:moose:moose odbc:" Mmakefile
+	fi
+
+	! use ncurses && sed -i -e "s:curs curses::" Mmakefile
+	! use xml && sed -i -e "s:xml::" Mmakefile
+}
+
+src_compile() {
+	mmake \
+		-j1 depend || die "mmake depend failed"
+	mmake \
+		MMAKEFLAGS="${MAKEOPTS}" \
+		EXTRA_MLFLAGS=--no-strip \
+		|| die "mmake failed"
+
+	if use opengl && use tcl && use tk; then
+		cd "${S}"/graphics/mercury_opengl
+		cp ../mercury_tcltk/mtcltk.m ./
+		mmake \
+			-f Mmakefile.mtogl \
+			-j1 depend || die "mmake depend mtogl failed"
+		mmake \
+			MMAKEFLAGS="${MAKEOPTS}" \
+			-f Mmakefile.mtogl \
+			|| die "mmake mtogl failed"
+	fi
+}
+
+src_install() {
+	mmake \
+		MMAKEFLAGS="${MAKEOPTS}" \
+		INSTALL_PREFIX="${D}" \
+		install || die "mmake install failed"
+
+	if use opengl && use tcl && use tk; then
+		cd "${S}"/graphics/mercury_opengl
+		mv Mmakefile Mmakefile.opengl
+		mv Mmakefile.mtogl Mmakefile
+		mmake \
+			MMAKEFLAGS="${MAKEOPTS}" \
+			INSTALL_PREFIX="${D}" \
+			install || die "mmake install mtogl failed"
+	fi
+
+	find "${D}"/usr/lib/mercury-${PV} -type l | xargs rm
+
+	cd "${S}"
+	if use examples; then
+		insinto /usr/share/doc/${PF}/samples/complex_numbers
+		doins complex_numbers/samples/*.m
+
+		if use ncurses; then
+			insinto /usr/share/doc/${PF}/samples/curs
+			doins curs/samples/*.m
+
+			insinto /usr/share/doc/${PF}/samples/curses
+			doins curses/sample/*.m
+		fi
+
+		insinto /usr/share/doc/${PF}/samples/dynamic_linking
+		doins dynamic_linking/hello.m
+
+		insinto /usr/share/doc/${PF}/samples/lex
+		doins lex/samples/*.m
+
+		insinto /usr/share/doc/${PF}/samples/moose
+		doins moose/samples/*.m moose/samples/*.moo
+	fi
+
+	dodoc README
+}