New development snapshot.

Package-Manager: portage-2.1_rc1-r2

4 files changed, 139 insertions, 5 deletions

diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog
index 3aafd26dc254..44359b36e6be 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.20 2006/05/13 22:03:25 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.21 2006/05/20 07:07:33 keri Exp $
+
+*mercury-extras-0.13.0_beta20060517 (20 May 2006)
+
+  20 May 2006; Keri Harris <keri@gentoo.org>
+  +mercury-extras-0.13.0_beta20060517.ebuild:
+  New development snapshot.
 
 *mercury-extras-0.13.0_beta20060511 (13 May 2006)
 
diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index a8ca14d42fc2..d8980d6cc691 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -81,6 +81,7 @@ SHA256 47cc0bef68e63e5ac5eb22746c8266991c1af41af06d30d8b014a56a095ca079 files/me
 DIST mercury-extras-0.12.2.tar.gz 759070 RMD160 3e7c4c67590408d2da056135c9560ff4d078eff6 SHA256 3a5be0941fad7ed8f8d2e967138984127510ba388b65b0f3f35f46ae8b6b43a8 size 759070
 DIST mercury-extras-0.13.0-beta-2006-05-01-unstable.tar.gz 873615 RMD160 560d704f77809011a555bed63734df54a0f6727b SHA256 4ca0f60ae3b2863a00bdbf8749d9987916dc17b6879b2659f63ccc278e356c4b size 873615
 DIST mercury-extras-0.13.0-beta-2006-05-11-unstable.tar.gz 873613 RMD160 3da5f396c814f2eaa089cce5798a4b6e655a8d58 SHA256 2b386f150eb2d1d8684ff8c3ef880309d2a92f255ba9d5ac731670aac6080e3b size 873613
+DIST mercury-extras-0.13.0-beta-2006-05-17-unstable.tar.gz 873662 RMD160 b9e2749e40dd05b80463ba5db9aac3b8a6794b45 SHA256 cc4229024738afb87e07fb819fbfddf96eecba1cf3754edafbc845ec46c7ba0c size 873662
 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
@@ -93,10 +94,14 @@ EBUILD mercury-extras-0.13.0_beta20060511.ebuild 3509 RMD160 e018508c141fe1a8a3e
 MD5 e6a5d4170284800ceed4e92bc9167a1b mercury-extras-0.13.0_beta20060511.ebuild 3509
 RMD160 e018508c141fe1a8a3e61ccb3a341686ea1ea211 mercury-extras-0.13.0_beta20060511.ebuild 3509
 SHA256 0014a72a7fd8246a4feb0a551563a638386667176cf9620fff9caaeae45f2fed mercury-extras-0.13.0_beta20060511.ebuild 3509
-MISC ChangeLog 7578 RMD160 6f21599a75c9a9badac97e22f7c72e140fd2b94e SHA1 e047ab38616e3fc029f07332a7f5108f203f864c SHA256 d1acd78e52c75d72496d216c65b7970d15edac0c7df697d7d27ca1aa7da5d2bf size 7578
-MD5 52db4f5d7d605f5a16c3653be96f2823 ChangeLog 7578
-RMD160 6f21599a75c9a9badac97e22f7c72e140fd2b94e ChangeLog 7578
-SHA256 d1acd78e52c75d72496d216c65b7970d15edac0c7df697d7d27ca1aa7da5d2bf ChangeLog 7578
+EBUILD mercury-extras-0.13.0_beta20060517.ebuild 3509 RMD160 3c4732240b4861993b976a5b3fa9a31246425d90 SHA1 8ad2b5ef40ef450df33e0cc9dd97f12040192750 SHA256 99f8c7a75a578769cd41560d49c019ba3972e87f1a6b3c14c1e38862fa4f8ea6 size 3509
+MD5 cc544cdf3135c402ea14bce4d1223163 mercury-extras-0.13.0_beta20060517.ebuild 3509
+RMD160 3c4732240b4861993b976a5b3fa9a31246425d90 mercury-extras-0.13.0_beta20060517.ebuild 3509
+SHA256 99f8c7a75a578769cd41560d49c019ba3972e87f1a6b3c14c1e38862fa4f8ea6 mercury-extras-0.13.0_beta20060517.ebuild 3509
+MISC ChangeLog 7749 RMD160 b92422276f6d3491ab4464e73bacbad811f95e9f SHA1 9625d4179371dba5a9a4e0f87ad712fa24e217f4 SHA256 d38dad27fde15f6b4511784b9fce9e9e8e23f047b548b515d4fbcdbcbda8cf2b size 7749
+MD5 ea9bbe7767caa805352e255f511824d7 ChangeLog 7749
+RMD160 b92422276f6d3491ab4464e73bacbad811f95e9f ChangeLog 7749
+SHA256 d38dad27fde15f6b4511784b9fce9e9e8e23f047b548b515d4fbcdbcbda8cf2b ChangeLog 7749
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa size 247
 MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247
 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247
@@ -110,3 +115,6 @@ SHA256 159d1cacfa713a24667394334956381d5a62940bc3a6fd960ceb3d13f089d49e files/di
 MD5 22b67cb53a2ce253e44d7756c6f7ec2f files/digest-mercury-extras-0.13.0_beta20060511 340
 RMD160 7fb42d45a196ec22307fcac88470c5d201fe83e3 files/digest-mercury-extras-0.13.0_beta20060511 340
 SHA256 e873af63aa054de9128e9041083c46801409e07b73e20184a960026cdd6e7857 files/digest-mercury-extras-0.13.0_beta20060511 340
+MD5 e21448a02d71ca709d4f1357118f9e9a files/digest-mercury-extras-0.13.0_beta20060517 340
+RMD160 505ad4ec95503a629dd533b13cd6b6d54ed93817 files/digest-mercury-extras-0.13.0_beta20060517 340
+SHA256 20ca19546f428766f0978ac94e2131334943af3efb2d957eeac50c80238d8575 files/digest-mercury-extras-0.13.0_beta20060517 340
diff --git a/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta20060517 b/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta20060517
new file mode 100644
index 000000000000..0643c77659c9
--- /dev/null
+++ b/dev-lang/mercury-extras/files/digest-mercury-extras-0.13.0_beta20060517
@@ -0,0 +1,3 @@
+MD5 3cb27ad2f17fa3601018e46ed1ed9d3b mercury-extras-0.13.0-beta-2006-05-17-unstable.tar.gz 873662
+RMD160 b9e2749e40dd05b80463ba5db9aac3b8a6794b45 mercury-extras-0.13.0-beta-2006-05-17-unstable.tar.gz 873662
+SHA256 cc4229024738afb87e07fb819fbfddf96eecba1cf3754edafbc845ec46c7ba0c mercury-extras-0.13.0-beta-2006-05-17-unstable.tar.gz 873662
diff --git a/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060517.ebuild b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060517.ebuild
new file mode 100644
index 000000000000..dd15fa31a699
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060517.ebuild
@@ -0,0 +1,117 @@
+# 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_beta20060517.ebuild,v 1.1 2006/05/20 07:07:33 keri Exp $
+
+inherit eutils versionator
+
+BETA_V=$(get_version_component_range 4 $PV)
+BETA_V_YYYY=${BETA_V:4:4}
+BETA_V_MM=${BETA_V:8:2}
+BETA_V_DD=${BETA_V:10:2}
+MY_PV=$(get_version_component_range 1-3 $PV)-beta-${BETA_V_YYYY}-${BETA_V_MM}-${BETA_V_DD}
+MY_P=${PN}-${MY_PV}
+
+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/0.13.0-beta/${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/${BETA_V}/beta}-concurrency-r1.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/${BETA_V}/beta}-odbc-r1.patch
+	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-posix.patch
+	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-references.patch
+	epatch "${FILESDIR}"/${P/${BETA_V}/beta}-trailed_update-r1.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
+}