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
Package-Manager: portage-2.1_pre5-r4

8 files changed, 45 insertions, 39 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/Manifest b/media-sound/lilypond/Manifest
index 17b18cfcba77..257a541bcdac 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 62f04904f48426efb04820212c5a8fb2 ChangeLog 6277
-RMD160 eeaa009e571e9e9d72e6f13705c6883aa54afc94 ChangeLog 6277
-SHA256 480d07c9df15418ca25f785838b7a5f01d5bde3f470bb21520bc06bec962ab51 ChangeLog 6277
+MD5 37f2771e99c22f9180101978b8f4a23c ChangeLog 6621
+RMD160 bdc9abf26183be0fbe0c9a05ae1b2131faf775b1 ChangeLog 6621
+SHA256 60bc7ca13884b54797b7003f45baa073105cc0c4e9f623cfec6d44ff1a36a636 ChangeLog 6621
 MD5 0c696acd218d39a22a32db326ac9d5b0 files/digest-lilypond-2.0.3 67
 RMD160 8908bebb00cb94d82ff136164804e09f46466a96 files/digest-lilypond-2.0.3 67
 SHA256 3bb477acdffe3703ffefba9d7e27b0d59061b4bd19847bb1ab55152584b2d621 files/digest-lilypond-2.0.3 67
@@ -25,31 +25,31 @@ SHA256 b816c1638e7d39363f3be6dcf0d74ad81b06024b23f2a76ff67e8d0a2274c7d8 files/di
 MD5 d3708d2873d08b1272e434098fd1ad85 files/lilypond-2.0.0-coreutils-compat.patch 5638
 RMD160 0f6620c39939013ec2460728881bbe0d2edc60f2 files/lilypond-2.0.0-coreutils-compat.patch 5638
 SHA256 b40f47a164a9f29ed0d98a4ddac91293ec3347044c97042726f96b361417749c files/lilypond-2.0.0-coreutils-compat.patch 5638
-MD5 3bcfd9b5f27bc227ab70fcebc25071a4 lilypond-2.0.3.ebuild 2843
-RMD160 5fecb314b8099e4b9ae3d54d62c1367d750a2c1b lilypond-2.0.3.ebuild 2843
-SHA256 4c98ae92d523baeae0dedddaed2e2d800f84a1f838c15c19daea0a69dd0fccfd lilypond-2.0.3.ebuild 2843
-MD5 be910704e5c627c4d7952f8588f09e49 lilypond-2.2.4.ebuild 3045
-RMD160 697acf5434d59b9a987b0f675b069852e88b75a2 lilypond-2.2.4.ebuild 3045
-SHA256 997df62680e1244863896c27f340a4a56080f2f07b6c3ec31d5ce7147e11753e lilypond-2.2.4.ebuild 3045
-MD5 68f98095a8293840fc889d585462db35 lilypond-2.2.6.ebuild 3045
-RMD160 b96770e14c5cbf52087e540ebf7ad01c8a8bdec2 lilypond-2.2.6.ebuild 3045
-SHA256 9e3f176e5b3231ee1cdf462996f21e40c50eafd5b0ff617bc11fad97ab62a34f lilypond-2.2.6.ebuild 3045
-MD5 2efa2fcf0573e5b0e7a970fc4271f415 lilypond-2.4.2.ebuild 3209
-RMD160 53e8312387c35746e17b2f231eba30e9561bdd6e lilypond-2.4.2.ebuild 3209
-SHA256 aedffb79bbb44f585b8a5eba20e7dfaca3bab8e2eef5d1f0b10ef663c0865ef1 lilypond-2.4.2.ebuild 3209
-MD5 93f973a74f023966bbbb3fdbf0c63713 lilypond-2.5.2.ebuild 3216
-RMD160 2e6f98a4afb30f83fb0e0ed154b01ae6ac09c65d lilypond-2.5.2.ebuild 3216
-SHA256 ee3ac7b2484f9d9fd9dbf73f1576ac7564c3173c8776202345ad6ebb053d77b3 lilypond-2.5.2.ebuild 3216
-MD5 5c21d32b5b3519745ccf7b632fd0c23d lilypond-2.8.0.ebuild 2064
-RMD160 ac124e82eec082e2560206a50c2077f1ed18d8fb lilypond-2.8.0.ebuild 2064
-SHA256 a425aba6155f30fb34faebf2a43e07593ae167d7bf85c88da18ff76198aee75e lilypond-2.8.0.ebuild 2064
+MD5 45761ed09ba927ff35b421abd793d645 lilypond-2.0.3.ebuild 2853
+RMD160 15c6dd9bfc3972ee2410ff5f0d84dd24ac196f26 lilypond-2.0.3.ebuild 2853
+SHA256 d32c528182b90e0e02a300527ebbe68f9f34cd0e2eae0392b75c126ac941506d lilypond-2.0.3.ebuild 2853
+MD5 68ab309fb7a4d7a91bc89037413a0d6c lilypond-2.2.4.ebuild 3052
+RMD160 8018153667c840c44266db87581de12e901bd6cf lilypond-2.2.4.ebuild 3052
+SHA256 270aaf4c47e6c088ebf2d9194d6eab2976c7c354d75688e608d57f7f5a8200d6 lilypond-2.2.4.ebuild 3052
+MD5 f8a55a8dfb7d2f9a6fa71af8a2d51c7f lilypond-2.2.6.ebuild 3052
+RMD160 633075df7b4eff770848e63eeca21e17147ac313 lilypond-2.2.6.ebuild 3052
+SHA256 36e2498547e926d006800b7ae504e1500319cb2e925288b4d155139418764057 lilypond-2.2.6.ebuild 3052
+MD5 261c8b96b432be801cba46fb5a574268 lilypond-2.4.2.ebuild 3219
+RMD160 d41d70cf7857a0eba0552ba1abd68753bc134e8f lilypond-2.4.2.ebuild 3219
+SHA256 f593562abc216a1a001c20171a5b605b04f61357a9f090c9bf60c134b454b886 lilypond-2.4.2.ebuild 3219
+MD5 925f65dc4d22d6aaec43c13f8190d6e4 lilypond-2.5.2.ebuild 3226
+RMD160 bfce4c1e62b4995c2d2c1778145047c620b3da7a lilypond-2.5.2.ebuild 3226
+SHA256 c16ff7cb1823490feb989969ee3634c2e6a3bad02de6a013f8d39eed2f553570 lilypond-2.5.2.ebuild 3226
+MD5 0786ea75df93aef83ffb2899aaee6654 lilypond-2.8.0.ebuild 2073
+RMD160 c3d4c40e7413059136ab1fcb26bb6afc909d9ab4 lilypond-2.8.0.ebuild 2073
+SHA256 1d6f49a2a16632846be8461f3011eafacf09837a2134140bad6555fd18a3dcee lilypond-2.8.0.ebuild 2073
 MD5 50117cfdeb267d9181cf9cacac87d8a6 metadata.xml 256
 RMD160 f564038fc21efdd3b5ee03d1de546221990ef183 metadata.xml 256
 SHA256 4c0605b0c821709464eafa37874903cd8181aae4503efa5b9d14f6a3974dfd1c metadata.xml 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFEJhtuJrHF4yAQTrARAuHrAKCdQWapRk23CNx1kVNmkcqp3xyVcQCghCDJ
-S6p2ycmDVVHLU4X5xLNI9KU=
-=4eWQ
+iD8DBQFEJwz2JrHF4yAQTrARAi8FAJ9bCe3NjjeXJ7+QvsVSr/gTiZ62/ACgoizR
+G4p7I/3q1qzt+Uxln3Eb4Z4=
+=NHq+
 -----END PGP SIGNATURE-----
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 () {