Add ncurses and xml USE flags.

Package-Manager: portage-2.1.1

5 files changed, 148 insertions, 16 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/Manifest b/dev-lang/mercury-extras/Manifest
index 8d9a0ca243ff..f12739eada16 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -88,18 +88,22 @@ EBUILD mercury-extras-0.12.2-r1.ebuild 2925 RMD160 41a913f2802c9ce9dadc1188cc7df
 MD5 124745e0d3a42531366cfc18fba3f7b9 mercury-extras-0.12.2-r1.ebuild 2925
 RMD160 41a913f2802c9ce9dadc1188cc7df763ffbfd45a mercury-extras-0.12.2-r1.ebuild 2925
 SHA256 ae00eb0a2d28f2ad6606864e0ed92fb0bbaaa35c238a5aacb68668154851463b mercury-extras-0.12.2-r1.ebuild 2925
+EBUILD mercury-extras-0.12.2-r2.ebuild 3083 RMD160 06eb2f2a09d01c557e53d97fd5bf71dd382f42aa SHA1 ad3865c02b784907ad9c38fc8789e3a65928b8c3 SHA256 d195980502d149d612ef51c7fe3965099368431236808c45fa628ecdb49fb544
+MD5 2ff052c0fa42ad94f5d511140acfda85 mercury-extras-0.12.2-r2.ebuild 3083
+RMD160 06eb2f2a09d01c557e53d97fd5bf71dd382f42aa mercury-extras-0.12.2-r2.ebuild 3083
+SHA256 d195980502d149d612ef51c7fe3965099368431236808c45fa628ecdb49fb544 mercury-extras-0.12.2-r2.ebuild 3083
 EBUILD mercury-extras-0.12.2.ebuild 2776 RMD160 89b69551c1a1144b11cd7584c1752cb17640b7fd SHA1 2514361f424d440c01e42394414db0687b401e14 SHA256 ad64576bbef6ccbc08c906aa85b2332ef3796fbd1a334a4d3eb4d1536c9d05a8
 MD5 7b6076b8af4283b1abca548a13015298 mercury-extras-0.12.2.ebuild 2776
 RMD160 89b69551c1a1144b11cd7584c1752cb17640b7fd mercury-extras-0.12.2.ebuild 2776
 SHA256 ad64576bbef6ccbc08c906aa85b2332ef3796fbd1a334a4d3eb4d1536c9d05a8 mercury-extras-0.12.2.ebuild 2776
-EBUILD mercury-extras-0.13.0_beta20060907.ebuild 3677 RMD160 cb7556c18ff25af5020cf03aeca0c655b1922bae SHA1 983bd28fb94967d88687a616fd7303f91166a04a SHA256 27990376e781baaa1c4f10831a9f353c712c738f0147a8fd11e248b2004876ad
-MD5 a14b4ed249e46e9ecbf9f2733e2ed35f mercury-extras-0.13.0_beta20060907.ebuild 3677
-RMD160 cb7556c18ff25af5020cf03aeca0c655b1922bae mercury-extras-0.13.0_beta20060907.ebuild 3677
-SHA256 27990376e781baaa1c4f10831a9f353c712c738f0147a8fd11e248b2004876ad mercury-extras-0.13.0_beta20060907.ebuild 3677
-MISC ChangeLog 10568 RMD160 00085b39ccbb25265cf5dd087d67fce86313e4f0 SHA1 03d6b3f1982aa4dd008eed3278659fde83bd2ddd SHA256 5d4421163a68ab045680fbe230d9b30c23d32068bb01d5f808799d8171261b7b
-MD5 8ccf57892283462bc47becc66b2c0bec ChangeLog 10568
-RMD160 00085b39ccbb25265cf5dd087d67fce86313e4f0 ChangeLog 10568
-SHA256 5d4421163a68ab045680fbe230d9b30c23d32068bb01d5f808799d8171261b7b ChangeLog 10568
+EBUILD mercury-extras-0.13.0_beta20060907.ebuild 3836 RMD160 199cf4f215d3faddf8f33163423fa39cc480ed9a SHA1 9d95dad8f26020250339ce3dc7760cf292eb3ba9 SHA256 2387dfddb10e1a86abdb55a100c54f6942b1d62a821b162923c7ea29c55497d0
+MD5 08beca466cfaeddfee03e3e2b6037352 mercury-extras-0.13.0_beta20060907.ebuild 3836
+RMD160 199cf4f215d3faddf8f33163423fa39cc480ed9a mercury-extras-0.13.0_beta20060907.ebuild 3836
+SHA256 2387dfddb10e1a86abdb55a100c54f6942b1d62a821b162923c7ea29c55497d0 mercury-extras-0.13.0_beta20060907.ebuild 3836
+MISC ChangeLog 10760 RMD160 b59a4a604abfa98c6e22bbf32b4bd73622b336e8 SHA1 3451ca324fb187659ab48f388a7288785673b5c1 SHA256 fc0bad90386a722b60e4f01568d0ce4d08ff7aea4f9ca176bae5afa9f6860b7a
+MD5 2b9e7c5fca9153b334a85829778bdc0e ChangeLog 10760
+RMD160 b59a4a604abfa98c6e22bbf32b4bd73622b336e8 ChangeLog 10760
+SHA256 fc0bad90386a722b60e4f01568d0ce4d08ff7aea4f9ca176bae5afa9f6860b7a ChangeLog 10760
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
 MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247
 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247
@@ -110,6 +114,9 @@ SHA256 087bf13f383826ff1da30ff861cfc48008b7037a9a844f14fee94f51934ec525 files/di
 MD5 04bb3f50c82519cd929f7754557a4124 files/digest-mercury-extras-0.12.2-r1 265
 RMD160 e18050a352bc3f86650cf53244bbb17545ef0817 files/digest-mercury-extras-0.12.2-r1 265
 SHA256 087bf13f383826ff1da30ff861cfc48008b7037a9a844f14fee94f51934ec525 files/digest-mercury-extras-0.12.2-r1 265
+MD5 04bb3f50c82519cd929f7754557a4124 files/digest-mercury-extras-0.12.2-r2 265
+RMD160 e18050a352bc3f86650cf53244bbb17545ef0817 files/digest-mercury-extras-0.12.2-r2 265
+SHA256 087bf13f383826ff1da30ff861cfc48008b7037a9a844f14fee94f51934ec525 files/digest-mercury-extras-0.12.2-r2 265
 MD5 307b72d614fb3de37b23ac01d0d59ed7 files/digest-mercury-extras-0.13.0_beta20060907 340
 RMD160 4eb561d898522ad1561409f4322d6acacdb7b548 files/digest-mercury-extras-0.13.0_beta20060907 340
 SHA256 fbbe2a92a3bfe567e7e9c2a2e4cf8001d12de2096cf64f38ce1056adf2c5463d files/digest-mercury-extras-0.13.0_beta20060907 340
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