From e74005ba973f573b0c7ac5050699e8118d3b46b8 Mon Sep 17 00:00:00 2001 From: Keri Harris Date: Wed, 11 Oct 2006 06:51:52 +0000 Subject: [PATCH] Use default MMAKEFLAGS in src_install Package-Manager: portage-2.1.2_pre2-r5 --- dev-lang/mercury-extras/ChangeLog | 5 ++++- dev-lang/mercury-extras/Manifest | 16 ++++++++-------- .../mercury-extras-0.12.2-r2.ebuild | 4 +--- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dev-lang/mercury-extras/ChangeLog b/dev-lang/mercury-extras/ChangeLog index 44967a2724bd..fac86ddd58dd 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.45 2006/10/10 07:48:20 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/ChangeLog,v 1.46 2006/10/11 06:51:52 keri Exp $ + + 11 Oct 2006; keri mercury-extras-0.12.2-r2.ebuild: + Use default MMAKEFLAGS in src_install. 10 Oct 2006; keri +files/mercury-extras-0.12.2-parallel-mmake.patch, diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest index f3d458aadf49..3f926bdfcfe0 100644 --- a/dev-lang/mercury-extras/Manifest +++ b/dev-lang/mercury-extras/Manifest @@ -92,10 +92,10 @@ EBUILD mercury-extras-0.12.2-r1.ebuild 2954 RMD160 b38a16819d30a14bc9733adf5b45c MD5 ac3a157529b1ff7f445ce97b4bc55954 mercury-extras-0.12.2-r1.ebuild 2954 RMD160 b38a16819d30a14bc9733adf5b45c99ccb97844a mercury-extras-0.12.2-r1.ebuild 2954 SHA256 1e9c8b3b62453ce5a460bca0104cab068ef3b4f63184547f72c8bd199f59f06b mercury-extras-0.12.2-r1.ebuild 2954 -EBUILD mercury-extras-0.12.2-r2.ebuild 3431 RMD160 a6aeb88a9bbfe286d94d5f2678aa62dc69d1b5c3 SHA1 2ccb9b74a4141672d765f5e731c1618466c3cdac SHA256 4ff6cb66b355375844be5154c3a2e338d28a2cce6bc16fb109ccbcb326eb217a -MD5 382edc7ce34dd8a314ca40db4a4457da mercury-extras-0.12.2-r2.ebuild 3431 -RMD160 a6aeb88a9bbfe286d94d5f2678aa62dc69d1b5c3 mercury-extras-0.12.2-r2.ebuild 3431 -SHA256 4ff6cb66b355375844be5154c3a2e338d28a2cce6bc16fb109ccbcb326eb217a mercury-extras-0.12.2-r2.ebuild 3431 +EBUILD mercury-extras-0.12.2-r2.ebuild 3372 RMD160 b5159b5070505ea72affa59138dbd6d086da1785 SHA1 5c186a1b6fba3164688eba9256b43af4a7df95ca SHA256 e5cf589b1dc93dff8130cb66ffb4ea4406f14d1a48deb67a4706472270c972f6 +MD5 df75b74c63f0da76833cb962288cd864 mercury-extras-0.12.2-r2.ebuild 3372 +RMD160 b5159b5070505ea72affa59138dbd6d086da1785 mercury-extras-0.12.2-r2.ebuild 3372 +SHA256 e5cf589b1dc93dff8130cb66ffb4ea4406f14d1a48deb67a4706472270c972f6 mercury-extras-0.12.2-r2.ebuild 3372 EBUILD mercury-extras-0.12.2.ebuild 2805 RMD160 dcaf180536a27b4feb26be903eb014665bd0157c SHA1 894b9df7a585ced7b820d410e4b49dce752fc0dc SHA256 1f0698cd40c256629c24220d2519e5df26da7eaa7fb0964bfd9c1da19d6cb32f MD5 98557ba05682185a9127512b0e0d053d mercury-extras-0.12.2.ebuild 2805 RMD160 dcaf180536a27b4feb26be903eb014665bd0157c mercury-extras-0.12.2.ebuild 2805 @@ -104,10 +104,10 @@ EBUILD mercury-extras-0.13.0.ebuild 3445 RMD160 20c946c554c01efa4549604cc42aed23 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 13149 RMD160 85c6f6b5ba30cfb6489761a0f71d31cba1cbf3ee SHA1 7c51b21c43b0b86be3906123e46c303d5551c15e SHA256 da79559b822918fd55d64a7ee9e572045a850bf011c5e937cb074031a857787b -MD5 275290bfd63eba88a8924d9cb13afb85 ChangeLog 13149 -RMD160 85c6f6b5ba30cfb6489761a0f71d31cba1cbf3ee ChangeLog 13149 -SHA256 da79559b822918fd55d64a7ee9e572045a850bf011c5e937cb074031a857787b ChangeLog 13149 +MISC ChangeLog 13262 RMD160 f8d308822239495d0f3f7415937d166fe4f85df2 SHA1 4b9918bbc38a987fda6db9c3ed185c7641244099 SHA256 57192514b161b8f44649a81e84d847e05f07b4f2d8aadc1a02ef74344d83b090 +MD5 5be7202bd10d3a9c4c08f38d153117ee ChangeLog 13262 +RMD160 f8d308822239495d0f3f7415937d166fe4f85df2 ChangeLog 13262 +SHA256 57192514b161b8f44649a81e84d847e05f07b4f2d8aadc1a02ef74344d83b090 ChangeLog 13262 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.12.2-r2.ebuild b/dev-lang/mercury-extras/mercury-extras-0.12.2-r2.ebuild index d78dd3e0a5f5..bb14e3ecb9c6 100644 --- a/dev-lang/mercury-extras/mercury-extras-0.12.2-r2.ebuild +++ b/dev-lang/mercury-extras/mercury-extras-0.12.2-r2.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.12.2-r2.ebuild,v 1.8 2006/10/10 07:48:20 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/mercury-extras/mercury-extras-0.12.2-r2.ebuild,v 1.9 2006/10/11 06:51:52 keri Exp $ inherit eutils @@ -82,7 +82,6 @@ src_compile() { src_install() { cd "${S}" mmake \ - MMAKEFLAGS="${MAKEOPTS}" \ INSTALL_PREFIX="${D}"/usr install \ || die "mmake install failed" @@ -91,7 +90,6 @@ src_install() { mv Mmakefile Mmakefile.opengl mv Mmakefile.mtogl Mmakefile mmake \ - MMAKEFLAGS="${MAKEOPTS}" \ INSTALL_PREFIX="${D}"/usr install \ || die "mmake install mtogl failed" fi -- 2.26.2