Restrict older lilyponds to tetex-2 which provides /usr/bin/inimf #92040.

sed makefiles so that mftrace-1.1.x can be used in place of mftrace-1.0.x
#90334
Package-Manager: portage-2.1_pre5-r4

8 files changed, 89 insertions, 46 deletions

diff --git a/media-sound/lilypond/ChangeLog b/media-sound/lilypond/ChangeLog
index 606fe7cebe8c..869b56609b83 100644
--- a/media-sound/lilypond/ChangeLog
+++ b/media-sound/lilypond/ChangeLog
@@ -1,6 +1,13 @@
 # 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.41 2006/03/27 17:29:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.42 2006/03/28 00:11:12 agriffis Exp $
+
+  28 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-r1.ebuild:
+  Restrict older lilyponds to tetex-2 which provides /usr/bin/inimf #92040.
+  sed makefiles so that mftrace-1.1.x can be used in place of mftrace-1.0.x
+  #90334
 
   27 Mar 2006; Aron Griffis <agriffis@gentoo.org> lilypond-2.8.0-r1.ebuild:
   addwrite /root/.PfaEdit workaround #127723
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 9fc0a2e73c2e..447f9b1ca6e9 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7dac42b8be20c576509641a4a33098c3 ChangeLog 6979
-RMD160 4607b667f8881d23920854ae2edf6569d1a1aab3 ChangeLog 6979
-SHA256 fd04d29a06f0ba537009fbbe0542a72e5b1ddd51be13d41064f8e4d70ad699ec ChangeLog 6979
+MD5 46ee35396c31e36442e168aa92074b3a ChangeLog 7336
+RMD160 e1d8377746abb068d3d7c8775ee02a515fd11991 ChangeLog 7336
+SHA256 6968aa96aed1fd3663ff49915adb19897d8b8e2926d7aa5ad2d4b983b1debc65 ChangeLog 7336
 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 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 4eadba01770f5f83dab9d543d95f3e30 lilypond-2.8.0-r1.ebuild 2415
-RMD160 958b2874fc79d5595f4bffeb9f1ed977cb76fdc9 lilypond-2.8.0-r1.ebuild 2415
-SHA256 c0a7069ef5ff3224eafbeb06b39255fc622189b329c230ef104001fc2f0d7706 lilypond-2.8.0-r1.ebuild 2415
+MD5 1f2b1f361f0a3610844dd71d520478bf lilypond-2.0.3.ebuild 3099
+RMD160 a41adbe897ea7e01a55dd1a082a8c9853486ef8f lilypond-2.0.3.ebuild 3099
+SHA256 202d2303bbb6dce2222f8f634592025fde7b4616de490d2a9fbfeada3a3ed0f9 lilypond-2.0.3.ebuild 3099
+MD5 271b43b0c64aa9c3d324b074ab2b119f lilypond-2.2.4.ebuild 3334
+RMD160 9ca5a2c4b0ea245d21d9779a0ab94ae61cd8ca79 lilypond-2.2.4.ebuild 3334
+SHA256 1fe88ba052607d23c0a9b63a958ddbcc86877879810196d928b50327b328f1f0 lilypond-2.2.4.ebuild 3334
+MD5 867e277c91ea8d569b39419c53fda2d3 lilypond-2.2.6.ebuild 3334
+RMD160 b87621c3e8fa1988ad184f50d9c0dc48e92cf0cf lilypond-2.2.6.ebuild 3334
+SHA256 e6d6d512759a1ba38689fae2137e48993ae485e1bf92a11560b0c2aa33bc4961 lilypond-2.2.6.ebuild 3334
+MD5 f593d240f567fd22614c80302241e3f4 lilypond-2.4.2.ebuild 3498
+RMD160 6757d969184502e215213832a0370b50b0fefd96 lilypond-2.4.2.ebuild 3498
+SHA256 b06dca314d8f9a2263add7c73ce5adddd5472d0d974f4f881933325ae2b782ef lilypond-2.4.2.ebuild 3498
+MD5 80b5677019a44111debf3f40da6a800b lilypond-2.5.2.ebuild 3505
+RMD160 1efa3d69e97e4470f740916f1db7d03e53e3ae7e lilypond-2.5.2.ebuild 3505
+SHA256 dfd7ad82cb9cf9aade27208b481ebc4341a9cb0d9fc318ceb0ea26e27af841ad lilypond-2.5.2.ebuild 3505
+MD5 b6274b849aa09f99ee6a02bf5c19560e lilypond-2.8.0-r1.ebuild 2419
+RMD160 d64b2438ce39dc41c629c0bfafc76934398a6df8 lilypond-2.8.0-r1.ebuild 2419
+SHA256 49575adbcb128c916d8393e9614a368b6155b83b5b0d0bff789b6e9f68670c8c lilypond-2.8.0-r1.ebuild 2419
 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)
 
-iD8DBQFEKCDyJrHF4yAQTrARAn5nAKCTxy4JyOYaTQslCBpC4wYjr3DApACgrWvc
-dpIVrIj/v2d993V1d5ziQPQ=
-=CKBT
+iD8DBQFEKH8vJrHF4yAQTrARAk7qAKCtDIZYXN3YLM+JNmxh8YBIZ8N7ugCcDPo7
+MB45tuR7eixbVfovd6Aitqk=
+=0Cbc
 -----END PGP SIGNATURE-----
diff --git a/media-sound/lilypond/lilypond-2.0.3.ebuild b/media-sound/lilypond/lilypond-2.0.3.ebuild
index ea230a4bb14b..6fe594169c6c 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.9 2006/03/26 21:51:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.0.3.ebuild,v 1.10 2006/03/28 00:11:13 agriffis Exp $
 
 inherit eutils versionator
 
@@ -26,15 +26,23 @@ 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.19
+	>=app-text/mftrace-1.1.16
 	sys-devel/bison !=sys-devel/bison-1.75
 	doc? ( media-gfx/imagemagick
 		>=media-libs/netpbm-9.12-r4 )"
 
 src_unpack() {
 	unpack ${A} || die "unpack failed"
-	cd ${S}; epatch ${FILESDIR}/${PN}-2.0.0-coreutils-compat.patch
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-2.0.0-coreutils-compat.patch
 	NOCONFIGURE=1 ./autogen.sh >/dev/null
+
+	# Fix makefiles to work with recent mftrace #90334
+	grep -rlZ 'MFTRACE.*--pf[ab]' --include=GNUmakefile --include=\*.make ${S} | \
+		xargs -0r sed -i '
+			s/--pfa --pfb/--formats=PFA,PFB/;
+			s/--pfa/--formats=PFA/;
+			s/--pfa/--formats=PFA/'
 }
 
 src_compile() {
diff --git a/media-sound/lilypond/lilypond-2.2.4.ebuild b/media-sound/lilypond/lilypond-2.2.4.ebuild
index 2dc49719910b..ecb2fadb1505 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.6 2006/03/26 21:51:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.2.4.ebuild,v 1.7 2006/03/28 00:11:13 agriffis Exp $
 
 inherit versionator
 
@@ -19,7 +19,7 @@ KEYWORDS="~alpha ~x86 ~ppc ~sparc -amd64"
 
 RDEPEND=">=dev-util/guile-1.6.4
 	virtual/ghostscript
-	virtual/tetex
+	=virtual/tetex-2*
 	>=dev-lang/python-2.2.3-r1"
 
 DEPEND="${RDEPEND}
@@ -29,13 +29,19 @@ 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*
+	>=app-text/mftrace-1.1.16
 	sys-devel/bison !=sys-devel/bison-1.75
 	doc? ( media-gfx/imagemagick
 		>=media-libs/netpbm-9.12-r4 )"
 
 src_unpack() {
-	unpack ${A} || die "unpack failed"
+	unpack ${A}
+	# Fix makefiles to work with recent mftrace #90334
+	grep -rlZ 'MFTRACE.*--pf[ab]' --include=GNUmakefile --include=\*.make ${S} | \
+		xargs -0r sed -i '
+			s/--pfa --pfb/--formats=PFA,PFB/;
+			s/--pfa/--formats=PFA/;
+			s/--pfa/--formats=PFA/'
 }
 
 src_compile() {
@@ -43,6 +49,7 @@ src_compile() {
 	# this package.  See bug 21305
 	PATH="$(echo ":${PATH}:" | sed 's/:[^:]*ccache[^:]*:/:/;s/^://;s/:$//;')"
 
+	addwrite /root/.PfaEdit  # fontforge, see bug 127723
 	addwrite /dev/stderr
 	addwrite /var/cache/fonts
 	addwrite /usr/share/texmf/fonts
diff --git a/media-sound/lilypond/lilypond-2.2.6.ebuild b/media-sound/lilypond/lilypond-2.2.6.ebuild
index 7a23268b1873..2fa6188a91bf 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.4 2006/03/26 21:51:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.2.6.ebuild,v 1.5 2006/03/28 00:11:13 agriffis Exp $
 
 inherit versionator
 
@@ -19,7 +19,7 @@ KEYWORDS="~alpha ~x86 ~ppc ~sparc -amd64"
 
 RDEPEND=">=dev-util/guile-1.6.4
 	virtual/ghostscript
-	virtual/tetex
+	=virtual/tetex-2*
 	>=dev-lang/python-2.2.3-r1"
 
 DEPEND="${RDEPEND}
@@ -29,13 +29,19 @@ 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*
+	>=app-text/mftrace-1.1.16
 	sys-devel/bison !=sys-devel/bison-1.75
 	doc? ( media-gfx/imagemagick
 		>=media-libs/netpbm-9.12-r4 )"
 
 src_unpack() {
-	unpack ${A} || die "unpack failed"
+	unpack ${A}
+	# Fix makefiles to work with recent mftrace #90334
+	grep -rlZ 'MFTRACE.*--pf[ab]' --include=GNUmakefile --include=\*.make ${S} | \
+		xargs -0r sed -i '
+			s/--pfa --pfb/--formats=PFA,PFB/;
+			s/--pfa/--formats=PFA/;
+			s/--pfa/--formats=PFA/'
 }
 
 src_compile() {
@@ -43,6 +49,7 @@ src_compile() {
 	# this package.  See bug 21305
 	PATH="$(echo ":${PATH}:" | sed 's/:[^:]*ccache[^:]*:/:/;s/^://;s/:$//;')"
 
+	addwrite /root/.PfaEdit  # fontforge, see bug 127723
 	addwrite /dev/stderr
 	addwrite /var/cache/fonts
 	addwrite /usr/share/texmf/fonts
diff --git a/media-sound/lilypond/lilypond-2.4.2.ebuild b/media-sound/lilypond/lilypond-2.4.2.ebuild
index f6b99804b188..4ef8074b5329 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.4 2006/03/26 21:51:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.4.2.ebuild,v 1.5 2006/03/28 00:11:13 agriffis Exp $
 
 inherit versionator
 
@@ -19,7 +19,7 @@ KEYWORDS="~x86 -amd64"
 
 RDEPEND=">=dev-util/guile-1.6.4
 	virtual/ghostscript
-	virtual/tetex
+	=virtual/tetex-2*
 	>=dev-lang/python-2.2.3-r1
 	media-fonts/ec-fonts-mftraced"
 
@@ -30,13 +30,19 @@ 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.1.16
 	sys-devel/bison !=sys-devel/bison-1.75
 	doc? ( media-gfx/imagemagick
 		>=media-libs/netpbm-9.12-r4 )"
 
 src_unpack() {
-	unpack ${A} || die "unpack failed"
+	unpack ${A}
+	# Fix makefiles to work with recent mftrace #90334
+	grep -rlZ 'MFTRACE.*--pf[ab]' --include=GNUmakefile --include=\*.make ${S} | \
+		xargs -0r sed -i '
+			s/--pfa --pfb/--formats=PFA,PFB/;
+			s/--pfa/--formats=PFA/;
+			s/--pfa/--formats=PFA/'
 }
 
 src_compile() {
@@ -44,6 +50,7 @@ src_compile() {
 	# this package.  See bug 21305
 	PATH="$(echo ":${PATH}:" | sed 's/:[^:]*ccache[^:]*:/:/;s/^://;s/:$//;')"
 
+	addwrite /root/.PfaEdit  # fontforge, see bug 127723
 	addwrite /dev/stderr
 	addwrite /var/cache/fonts
 	addwrite /usr/share/texmf/fonts
diff --git a/media-sound/lilypond/lilypond-2.5.2.ebuild b/media-sound/lilypond/lilypond-2.5.2.ebuild
index e0ee619d018f..7ad99cb594ea 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.6 2006/03/26 21:51:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.5.2.ebuild,v 1.7 2006/03/28 00:11:13 agriffis Exp $
 
 inherit versionator
 
@@ -19,7 +19,7 @@ KEYWORDS="~x86 ~amd64 ~sparc"
 
 RDEPEND=">=dev-util/guile-1.6.5
 	virtual/ghostscript
-	virtual/tetex
+	=virtual/tetex-2*
 	>=dev-lang/python-2.2.3-r1
 	media-fonts/ec-fonts-mftraced"
 
@@ -30,13 +30,19 @@ 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.1.16
 	sys-devel/bison !=sys-devel/bison-1.75
 	doc? ( media-gfx/imagemagick
 		>=media-libs/netpbm-9.12-r4 )"
 
 src_unpack() {
-	unpack ${A} || die "unpack failed"
+	unpack ${A}
+	# Fix makefiles to work with recent mftrace #90334
+	grep -rlZ 'MFTRACE.*--pf[ab]' --include=GNUmakefile --include=\*.make ${S} | \
+		xargs -0r sed -i '
+			s/--pfa --pfb/--formats=PFA,PFB/;
+			s/--pfa/--formats=PFA/;
+			s/--pfa/--formats=PFA/'
 }
 
 src_compile() {
@@ -44,6 +50,7 @@ src_compile() {
 	# this package.  See bug 21305
 	PATH="$(echo ":${PATH}:" | sed 's/:[^:]*ccache[^:]*:/:/;s/^://;s/:$//;')"
 
+	addwrite /root/.PfaEdit  # fontforge, see bug 127723
 	addwrite /dev/stderr
 	addwrite /var/cache/fonts
 	addwrite /usr/share/texmf/fonts
diff --git a/media-sound/lilypond/lilypond-2.8.0-r1.ebuild b/media-sound/lilypond/lilypond-2.8.0-r1.ebuild
index 13bb0f14c70d..fa2926fe647c 100644
--- a/media-sound/lilypond/lilypond-2.8.0-r1.ebuild
+++ b/media-sound/lilypond/lilypond-2.8.0-r1.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-r1.ebuild,v 1.2 2006/03/27 17:29:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.8.0-r1.ebuild,v 1.3 2006/03/28 00:11:13 agriffis Exp $
 
 inherit versionator
 
@@ -17,7 +17,7 @@ KEYWORDS="~x86 ~amd64"
 
 RDEPEND=">=dev-util/guile-1.6.5
 	>=virtual/ghostscript-8.15
-	virtual/tetex
+	=virtual/tetex-2*
 	>=dev-lang/python-2.2.3-r1
 	>=media-libs/freetype-2
 	>=media-libs/fontconfig-2.2