From: Keri Harris <keri@gentoo.org>
Date: Fri, 9 Jun 2006 09:37:15 +0000 (+0000)
Subject: Do not build trailed grades with a minimal mercury compiler.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5b582ac09f664d3796afb71a4ee771d36fb07140;p=gentoo.git

Do not build trailed grades with a minimal mercury compiler.
Package-Manager: portage-2.1_rc4-r3
---

diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog
index 11f763ec1719..22e35600bb9d 100644
--- a/dev-lang/mercury-extras/ChangeLog
+++ b/dev-lang/mercury-extras/ChangeLog
@@ -1,6 +1,10 @@
 # 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.29 2006/06/09 09:05:40 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.30 2006/06/09 09:37:15 keri Exp $
+
+  09 Jun 2006; Keri Harris <keri@gentoo.org>
+  mercury-extras-0.13.0_beta20060601.ebuild:
+  Do not build trailed grades with a minimal mercury compiler.
 
 *mercury-extras-0.12.2-r1 (09 Jun 2006)
 
diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index 1aea7ae59509..b4037b9aff0b 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -92,14 +92,14 @@ EBUILD mercury-extras-0.12.2.ebuild 2777 RMD160 a11653067245453e30d16bbc705cb92b
 MD5 c402d3623e15c6a4adfdd487dbcaff09 mercury-extras-0.12.2.ebuild 2777
 RMD160 a11653067245453e30d16bbc705cb92bb9bda3e1 mercury-extras-0.12.2.ebuild 2777
 SHA256 f47d31c83312916d483a24d5ceb7dd6a1fdc4c11e00b13846460773cfa531d6a mercury-extras-0.12.2.ebuild 2777
-EBUILD mercury-extras-0.13.0_beta20060601.ebuild 3538 RMD160 f06e2e28c2a9c0806036e9b779886248a9ab88af SHA1 ae05611708f1916b5ba791232cba5861e40b17f7 SHA256 f8e162124ae394447366aefe12f8366df6dc51ff4f0a0f244fecfac7a966888f
-MD5 cf948aaeb0d357c3d67a85fc89f6a507 mercury-extras-0.13.0_beta20060601.ebuild 3538
-RMD160 f06e2e28c2a9c0806036e9b779886248a9ab88af mercury-extras-0.13.0_beta20060601.ebuild 3538
-SHA256 f8e162124ae394447366aefe12f8366df6dc51ff4f0a0f244fecfac7a966888f mercury-extras-0.13.0_beta20060601.ebuild 3538
-MISC ChangeLog 9145 RMD160 db975ad1a8d4bba5eabb3c3a6388abd2862eceac SHA1 66d18bbcf40b452ff90dee2ba31c2af04135ce3f SHA256 ee2a12176f58e7b392871ffb1973c8aec917262f2e9192eec7f6bfbbb006da8b
-MD5 cd1383b9603fe0ec3d798e15d2a41dae ChangeLog 9145
-RMD160 db975ad1a8d4bba5eabb3c3a6388abd2862eceac ChangeLog 9145
-SHA256 ee2a12176f58e7b392871ffb1973c8aec917262f2e9192eec7f6bfbbb006da8b ChangeLog 9145
+EBUILD mercury-extras-0.13.0_beta20060601.ebuild 3677 RMD160 2ba3003616a6079325ac6a20d9f5228870108875 SHA1 92d19193bf3d8de5c1da51b4eeceaae507300486 SHA256 a779e77107b40bf5d03fd960099ec220419aa869a0adcb8dcc1dbc347afebe47
+MD5 1b152482b384feae14d5fe2d795846a2 mercury-extras-0.13.0_beta20060601.ebuild 3677
+RMD160 2ba3003616a6079325ac6a20d9f5228870108875 mercury-extras-0.13.0_beta20060601.ebuild 3677
+SHA256 a779e77107b40bf5d03fd960099ec220419aa869a0adcb8dcc1dbc347afebe47 mercury-extras-0.13.0_beta20060601.ebuild 3677
+MISC ChangeLog 9299 RMD160 a66cef018a666239aba13a3621fa60cd196ad059 SHA1 86e5fdd7e35613e07334037ed768e86802974d3b SHA256 754cc97701ac655ead636cfeb48f1b784cdbd625f9cf307eb6073bd252ad5990
+MD5 88c025dbeaf692df1b79ff358332bcff ChangeLog 9299
+RMD160 a66cef018a666239aba13a3621fa60cd196ad059 ChangeLog 9299
+SHA256 754cc97701ac655ead636cfeb48f1b784cdbd625f9cf307eb6073bd252ad5990 ChangeLog 9299
 MISC metadata.xml 247 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 SHA1 7b705a8a3368abab6ad31ea2fcb5e5db865d92b1 SHA256 2768d0688d443184194068497dcafb2e5d67521980cb46b7e8efc07d3900bcaa
 MD5 6fca20d17d6d55a28537204aa9bb626f metadata.xml 247
 RMD160 1b3df3c501d9a3b2e2651668be405677e8416397 metadata.xml 247
diff --git a/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060601.ebuild b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060601.ebuild
index 1e2862eaa697..613a2e512a0a 100644
--- a/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060601.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060601.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_beta20060601.ebuild,v 1.2 2006/06/08 18:52:38 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-0.13.0_beta20060601.ebuild,v 1.3 2006/06/09 09:37:15 keri Exp $
 
 inherit eutils versionator
 
@@ -22,13 +22,12 @@ 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 )
-	tcltk? ( =dev-lang/tk-8.4*
+	tcktk? ( =dev-lang/tk-8.4*
 		|| ( (
 			x11-libs/libX11
 			x11-libs/libXmu )
@@ -52,8 +51,14 @@ src_unpack() {
 
 	sed -i	-e "s:curs:concurrency curs:" \
 		-e "s:posix:posix quickcheck:" \
-		-e "s:windows_installer_generator ::" \
-		-e "s:xml:trailed_update xml:" Mmakefile
+		-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