Older lilypond requires older mftrace, doesn't build with mftrace-1.1*. Run

emake with LC_ALL=C so that mftrace doesn't complain about using iconv
(Portage version: 2.1_pre5-r4)

7 files changed, 21 insertions, 15 deletions

diff --git a/media-sound/lilypond/ChangeLog b/media-sound/lilypond/ChangeLog
index 4550638750e3..9c1b27eb87af 100644
--- a/media-sound/lilypond/ChangeLog
+++ b/media-sound/lilypond/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/lilypond
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.38 2006/03/26 04:41:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.39 2006/03/26 21:51:40 agriffis Exp $
+
+  26 Mar 2006; Aron Griffis <agriffis@gentoo.org> lilypond-2.0.3.ebuild,
+  lilypond-2.2.4.ebuild, lilypond-2.2.6.ebuild, lilypond-2.4.2.ebuild,
+  lilypond-2.5.2.ebuild, lilypond-2.8.0.ebuild:
+  Older lilypond requires older mftrace, doesn't build with mftrace-1.1*. Run
+  emake with LC_ALL=C so that mftrace doesn't complain about using iconv
 
 *lilypond-2.8.0 (26 Mar 2006)
 
diff --git a/media-sound/lilypond/lilypond-2.0.3.ebuild b/media-sound/lilypond/lilypond-2.0.3.ebuild
index 9b76ee2019f0..ea230a4bb14b 100644
--- a/media-sound/lilypond/lilypond-2.0.3.ebuild
+++ b/media-sound/lilypond/lilypond-2.0.3.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/media-sound/lilypond/lilypond-2.0.3.ebuild,v 1.8 2006/02/27 20:30:24 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.0.3.ebuild,v 1.9 2006/03/26 21:51:40 agriffis Exp $
 
 inherit eutils versionator
 
@@ -48,7 +48,7 @@ src_compile() {
 	addwrite /usr/share/texmf/ls-R
 
 	econf --build=${CHOST} || die "econf failed"
-	emake || die "emake failed"
+	LC_ALL=C emake || die "emake failed"
 
 	if use doc; then
 		make web || die "make web failed"
diff --git a/media-sound/lilypond/lilypond-2.2.4.ebuild b/media-sound/lilypond/lilypond-2.2.4.ebuild
index 6c8387694e8e..2dc49719910b 100644
--- a/media-sound/lilypond/lilypond-2.2.4.ebuild
+++ b/media-sound/lilypond/lilypond-2.2.4.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/media-sound/lilypond/lilypond-2.2.4.ebuild,v 1.5 2006/02/27 20:30:24 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.2.4.ebuild,v 1.6 2006/03/26 21:51:40 agriffis Exp $
 
 inherit versionator
 
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4a-r5
 	>=sys-devel/gcc-3.1-r8
 	>=sys-devel/make-3.80
-	>=app-text/mftrace-1.0.27
+	=app-text/mftrace-1.0*
 	sys-devel/bison !=sys-devel/bison-1.75
 	doc? ( media-gfx/imagemagick
 		>=media-libs/netpbm-9.12-r4 )"
@@ -49,7 +49,7 @@ src_compile() {
 	addwrite /usr/share/texmf/ls-R
 
 	econf --build=${CHOST} || die "econf failed"
-	emake || die "emake failed"
+	LC_ALL=C emake || die "emake failed"
 
 	if use doc; then
 		make web || die "make web failed"
diff --git a/media-sound/lilypond/lilypond-2.2.6.ebuild b/media-sound/lilypond/lilypond-2.2.6.ebuild
index d3b5c1588fab..7a23268b1873 100644
--- a/media-sound/lilypond/lilypond-2.2.6.ebuild
+++ b/media-sound/lilypond/lilypond-2.2.6.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/media-sound/lilypond/lilypond-2.2.6.ebuild,v 1.3 2006/02/27 20:30:24 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.2.6.ebuild,v 1.4 2006/03/26 21:51:40 agriffis Exp $
 
 inherit versionator
 
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/flex-2.5.4a-r5
 	>=sys-devel/gcc-3.1-r8
 	>=sys-devel/make-3.80
-	>=app-text/mftrace-1.0.27
+	=app-text/mftrace-1.0*
 	sys-devel/bison !=sys-devel/bison-1.75
 	doc? ( media-gfx/imagemagick
 		>=media-libs/netpbm-9.12-r4 )"
@@ -49,7 +49,7 @@ src_compile() {
 	addwrite /usr/share/texmf/ls-R
 
 	econf --build=${CHOST} || die "econf failed"
-	emake || die "emake failed"
+	LC_ALL=C emake || die "emake failed"
 
 	if use doc; then
 		make web || die "make web failed"
diff --git a/media-sound/lilypond/lilypond-2.4.2.ebuild b/media-sound/lilypond/lilypond-2.4.2.ebuild
index 42a59e900cd4..f6b99804b188 100644
--- a/media-sound/lilypond/lilypond-2.4.2.ebuild
+++ b/media-sound/lilypond/lilypond-2.4.2.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/media-sound/lilypond/lilypond-2.4.2.ebuild,v 1.3 2006/02/27 20:30:24 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.4.2.ebuild,v 1.4 2006/03/26 21:51:40 agriffis Exp $
 
 inherit versionator
 
@@ -50,7 +50,7 @@ src_compile() {
 	addwrite /usr/share/texmf/ls-R
 
 	econf --build=${CHOST} || die "econf failed"
-	emake || die "emake failed"
+	LC_ALL=C emake || die "emake failed"
 
 	if use doc; then
 		make web || die "make web failed"
diff --git a/media-sound/lilypond/lilypond-2.5.2.ebuild b/media-sound/lilypond/lilypond-2.5.2.ebuild
index a6bad6e7ccfa..e0ee619d018f 100644
--- a/media-sound/lilypond/lilypond-2.5.2.ebuild
+++ b/media-sound/lilypond/lilypond-2.5.2.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/media-sound/lilypond/lilypond-2.5.2.ebuild,v 1.5 2006/02/27 20:30:24 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.5.2.ebuild,v 1.6 2006/03/26 21:51:40 agriffis Exp $
 
 inherit versionator
 
@@ -50,7 +50,7 @@ src_compile() {
 	addwrite /usr/share/texmf/ls-R
 
 	econf --build=${CHOST} || die "econf failed"
-	emake || die "emake failed"
+	LC_ALL=C emake || die "emake failed"
 
 	if use doc; then
 		make web || die "make web failed"
diff --git a/media-sound/lilypond/lilypond-2.8.0.ebuild b/media-sound/lilypond/lilypond-2.8.0.ebuild
index 1428d574b592..bdaf2f3b0daf 100644
--- a/media-sound/lilypond/lilypond-2.8.0.ebuild
+++ b/media-sound/lilypond/lilypond-2.8.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/media-sound/lilypond/lilypond-2.8.0.ebuild,v 1.1 2006/03/26 04:41:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.8.0.ebuild,v 1.2 2006/03/26 21:51:40 agriffis Exp $
 
 inherit versionator
 
@@ -44,7 +44,7 @@ src_compile() {
 		$(use_enable profile profiling) \
 		--with-ncsb-dir=/usr/share/fonts/default/ghostscript \
 		|| die "econf failed"
-	emake || die "emake failed"
+	LC_ALL=C emake || die "emake failed"
 }
 
 src_install () {