Add ncurses and xml USE flags.

(Portage version: 2.1.1)

4 files changed, 133 insertions, 8 deletions

diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog
index a5d300453c3e..55505d3a9704 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.36 2006/09/09 06:35:07 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.37 2006/09/09 22:12:57 keri Exp $
+
+*mercury-extras-0.12.2-r2 (09 Sep 2006)
+
+  09 Sep 2006; keri <keri@gentoo.org> +mercury-extras-0.12.2-r2.ebuild,
+  mercury-extras-0.13.0_beta20060907.ebuild:
+  Add ncurses and xml USE flags.
 
 *mercury-extras-0.13.0_beta20060907 (09 Sep 2006)
 
diff --git a/dev-lang/mercury-extras/files/digest-mercury-extras-0.12.2-r2 b/dev-lang/mercury-extras/files/digest-mercury-extras-0.12.2-r2
new file mode 100644
index 000000000000..13cdfec9edd6
--- /dev/null
+++ b/dev-lang/mercury-extras/files/digest-mercury-extras-0.12.2-r2
@@ -0,0 +1,3 @@
+MD5 31101288778657de8bf063abe970bb70 mercury-extras-0.12.2.tar.gz 759070
+RMD160 3e7c4c67590408d2da056135c9560ff4d078eff6 mercury-extras-0.12.2.tar.gz 759070
+SHA256 3a5be0941fad7ed8f8d2e967138984127510ba388b65b0f3f35f46ae8b6b43a8 mercury-extras-0.12.2.tar.gz 759070
diff --git a/dev-lang/mercury-extras/mercury-extras-0.12.2-r2.ebuild b/dev-lang/mercury-extras/mercury-extras-0.12.2-r2.ebuild
new file mode 100644
index 000000000000..9d68ecd9cd8f
--- /dev/null
+++ b/dev-lang/mercury-extras/mercury-extras-0.12.2-r2.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.12.2-r2.ebuild,v 1.1 2006/09/09 22:12:57 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/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+
+IUSE="doc glut iodbc opengl ncurses tcltk xml"
+
+DEPEND="~dev-lang/mercury-0.12.2
+	glut? ( virtual/glut )
+	iodbc? ( 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}-gcc4.patch
+	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:" 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 iodbc && sed -i -e "s:moose:moose odbc:" 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
+	! 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
+}
diff --git a/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060907.ebuild b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060907.ebuild
index 3d8d81dfe0d0..cd359d17ef57 100644
--- a/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060907.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060907.ebuild
@@ -1,6 +1,6 @@
 # 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_beta20060907.ebuild,v 1.1 2006/09/09 06:35:07 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060907.ebuild,v 1.2 2006/09/09 22:12:57 keri Exp $
 
 inherit eutils versionator
 
@@ -19,13 +19,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
 
-IUSE="doc glut iodbc odbc opengl tcltk"
+IUSE="doc glut iodbc ncurses odbc opengl tcltk xml"
 
 DEPEND="~dev-lang/mercury-${PV}
-	sys-libs/ncurses
 	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*
 		|| ( (
@@ -70,6 +70,9 @@ src_unpack() {
 		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() {
@@ -101,11 +104,13 @@ src_install() {
 		docinto samples/complex_numbers
 		dodoc complex_numbers/samples/*.m
 
-		docinto samples/curs
-		dodoc curs/samples/*.m
+		if use ncurses ; then
+			docinto samples/curs
+			dodoc curs/samples/*.m
 
-		docinto samples/curses
-		dodoc curses/sample/*.m
+			docinto samples/curses
+			dodoc curses/sample/*.m
+		fi
 
 		docinto samples/dynamic_linking
 		dodoc dynamic_linking/hello.m