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
(Portage version: 2.1_pre5-r4)

7 files changed, 65 insertions, 22 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/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