Respect MAKEOPTS.

Package-Manager: portage-2.1.2_pre2-r9

3 files changed, 39 insertions, 25 deletions

diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog
index fac86ddd58dd..cb7f0b9d3e05 100644
--- a/dev-lang/mercury-extras/ChangeLog
+++ b/dev-lang/mercury-extras/ChangeLog
@@ -1,6 +1,9 @@
 # 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.46 2006/10/11 06:51:52 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.47 2006/10/15 07:47:45 keri Exp $
+
+  15 Oct 2006; keri <keri@gentoo.org> mercury-extras-0.13.0.ebuild:
+  Respect MAKEOPTS.
 
   11 Oct 2006; keri <keri@gentoo.org> mercury-extras-0.12.2-r2.ebuild:
   Use default MMAKEFLAGS in src_install.
diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index 3f926bdfcfe0..c916b02effb8 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -100,14 +100,14 @@ EBUILD mercury-extras-0.12.2.ebuild 2805 RMD160 dcaf180536a27b4feb26be903eb01466
 MD5 98557ba05682185a9127512b0e0d053d mercury-extras-0.12.2.ebuild 2805
 RMD160 dcaf180536a27b4feb26be903eb014665bd0157c mercury-extras-0.12.2.ebuild 2805
 SHA256 1f0698cd40c256629c24220d2519e5df26da7eaa7fb0964bfd9c1da19d6cb32f mercury-extras-0.12.2.ebuild 2805
-EBUILD mercury-extras-0.13.0.ebuild 3445 RMD160 20c946c554c01efa4549604cc42aed23300d019a SHA1 1ec00cde0c7f76c17636b2b5d13d3fa3c133d581 SHA256 5d637d4dac411c9df5ca6d513dc4a6daa3815ff604731a2f9760e5ae1d5fc1c4
-MD5 4c9c7def9fc5306aac63328f6906ee35 mercury-extras-0.13.0.ebuild 3445
-RMD160 20c946c554c01efa4549604cc42aed23300d019a mercury-extras-0.13.0.ebuild 3445
-SHA256 5d637d4dac411c9df5ca6d513dc4a6daa3815ff604731a2f9760e5ae1d5fc1c4 mercury-extras-0.13.0.ebuild 3445
-MISC ChangeLog 13262 RMD160 f8d308822239495d0f3f7415937d166fe4f85df2 SHA1 4b9918bbc38a987fda6db9c3ed185c7641244099 SHA256 57192514b161b8f44649a81e84d847e05f07b4f2d8aadc1a02ef74344d83b090
-MD5 5be7202bd10d3a9c4c08f38d153117ee ChangeLog 13262
-RMD160 f8d308822239495d0f3f7415937d166fe4f85df2 ChangeLog 13262
-SHA256 57192514b161b8f44649a81e84d847e05f07b4f2d8aadc1a02ef74344d83b090 ChangeLog 13262
+EBUILD mercury-extras-0.13.0.ebuild 3594 RMD160 b619dcf866e5076dc523c722f39b0e83b88160eb SHA1 41bbf8af523fc15155d820bbdb032fa68ab4234b SHA256 6b8ff04b4121be1d2784c19f69c5a5a8d120cc5a64109ef8b250e6e4f616bdb0
+MD5 e2eda7b6ac2a4f797e7872cceca38660 mercury-extras-0.13.0.ebuild 3594
+RMD160 b619dcf866e5076dc523c722f39b0e83b88160eb mercury-extras-0.13.0.ebuild 3594
+SHA256 6b8ff04b4121be1d2784c19f69c5a5a8d120cc5a64109ef8b250e6e4f616bdb0 mercury-extras-0.13.0.ebuild 3594
+MISC ChangeLog 13351 RMD160 6c4e29724328495004ec492a36b902a1d5724760 SHA1 2ad663bace2aed585a231aba7a9b40aec64124e9 SHA256 c5166f575191d291538e5607d73909a144b5cecd9cfc50e933d79e925eb279a7
+MD5 e72b42324b44a7611d49600028637370 ChangeLog 13351
+RMD160 6c4e29724328495004ec492a36b902a1d5724760 ChangeLog 13351
+SHA256 c5166f575191d291538e5607d73909a144b5cecd9cfc50e933d79e925eb279a7 ChangeLog 13351
 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.ebuild b/dev-lang/mercury-extras/mercury-extras-0.13.0.ebuild
index a42c4567bdda..38c65f99cb9c 100644
--- a/dev-lang/mercury-extras/mercury-extras-0.13.0.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-0.13.0.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.ebuild,v 1.3 2006/10/05 09:06:10 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-0.13.0.ebuild,v 1.4 2006/10/15 07:47:45 keri Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
 
-IUSE="doc glut iodbc ncurses odbc opengl tcltk xml"
+IUSE="doc glut iodbc ncurses odbc opengl tcl tk xml"
 
 DEPEND="~dev-lang/mercury-${PV}
 	glut? ( virtual/glut )
@@ -20,11 +20,11 @@ DEPEND="~dev-lang/mercury-${PV}
 	iodbc? ( !odbc? ( dev-db/libiodbc ) )
 	ncurses? ( sys-libs/ncurses )
 	opengl? ( virtual/opengl )
-	tcltk? ( =dev-lang/tk-8.4*
-		|| ( (
+	tcl? ( tk? (
+			=dev-lang/tcl-8.4*
+			=dev-lang/tk-8.4*
 			x11-libs/libX11
-			x11-libs/libXmu )
-		virtual/x11 ) )"
+			x11-libs/libXmu ) )"
 
 src_unpack() {
 	unpack ${A}
@@ -53,7 +53,7 @@ src_unpack() {
 	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
+	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 ; then
@@ -69,29 +69,40 @@ src_unpack() {
 
 src_compile() {
 	mmake depend || die "mmake depend failed"
-	mmake || die "mmake failed"
+	mmake \
+		MMAKEFLAGS="${MAKEOPTS}" \
+		EXTRA_MLFLAGS=--no-strip \
+		|| die "mmake failed"
 
-	if use opengl && use tcltk ; then
+	if use opengl && use tcl && use tk ; 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"
+		mmake \
+			-f Mmakefile.mtogl depend \
+			|| die "mmake depend mtogl failed"
+		mmake \
+			MMAKEFLAGS="${MAKEOPTS}" \
+			-f Mmakefile.mtogl \
+			|| die "mmake mtogl failed"
 	fi
 }
 
 src_install() {
 	cd "${S}"
-	mmake INSTALL_PREFIX="${D}"/usr install || die "mmake install failed"
+	mmake \
+		INSTALL_PREFIX="${D}"/usr install \
+		|| die "mmake install failed"
 
-	if use opengl && use tcltk ; then
+	if use opengl && use tcl && use tk ; 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"
+		mmake \
+			INSTALL_PREFIX="${D}"/usr install \
+			|| die "mmake install mtogl failed"
 	fi
 
-	find "${D}"/usr/lib/mercury-${PV}/ints -type l | xargs rm
+	find "${D}"/usr/lib/mercury-${PV} -type l | xargs rm
 
 	cd "${S}"
 	if use doc ; then