More testing shows that lilypond-2.8.0 will build with tetex-3, so don't

restrict to tetex-2 for that version.  Repair my broken sed expression in the
other ebuilds (was subbing pfa->PFA twice instead of doing pfb->PFB in the
second case)
(Portage version: 2.1_pre5-r4)

7 files changed, 21 insertions, 13 deletions

diff --git a/media-sound/lilypond/ChangeLog b/media-sound/lilypond/ChangeLog
index 869b56609b83..358ce58bada4 100644
--- a/media-sound/lilypond/ChangeLog
+++ b/media-sound/lilypond/ChangeLog
@@ -1,6 +1,14 @@
 # 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.42 2006/03/28 00:11:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.43 2006/03/29 17:31:00 agriffis Exp $
+
+  29 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:
+  More testing shows that lilypond-2.8.0 will build with tetex-3, so don't
+  restrict to tetex-2 for that version.  Repair my broken sed expression in the
+  other ebuilds (was subbing pfa->PFA twice instead of doing pfb->PFB in the
+  second case)
 
   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,
diff --git a/media-sound/lilypond/lilypond-2.0.3.ebuild b/media-sound/lilypond/lilypond-2.0.3.ebuild
index 6fe594169c6c..397118e5559d 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.10 2006/03/28 00:11:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.0.3.ebuild,v 1.11 2006/03/29 17:31:00 agriffis Exp $
 
 inherit eutils versionator
 
@@ -42,7 +42,7 @@ src_unpack() {
 		xargs -0r sed -i '
 			s/--pfa --pfb/--formats=PFA,PFB/;
 			s/--pfa/--formats=PFA/;
-			s/--pfa/--formats=PFA/'
+			s/--pfb/--formats=PFB/'
 }
 
 src_compile() {
diff --git a/media-sound/lilypond/lilypond-2.2.4.ebuild b/media-sound/lilypond/lilypond-2.2.4.ebuild
index ecb2fadb1505..9c13337656e7 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.7 2006/03/28 00:11:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.2.4.ebuild,v 1.8 2006/03/29 17:31:00 agriffis Exp $
 
 inherit versionator
 
@@ -41,7 +41,7 @@ src_unpack() {
 		xargs -0r sed -i '
 			s/--pfa --pfb/--formats=PFA,PFB/;
 			s/--pfa/--formats=PFA/;
-			s/--pfa/--formats=PFA/'
+			s/--pfb/--formats=PFB/'
 }
 
 src_compile() {
diff --git a/media-sound/lilypond/lilypond-2.2.6.ebuild b/media-sound/lilypond/lilypond-2.2.6.ebuild
index 2fa6188a91bf..4af16b52158c 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.5 2006/03/28 00:11:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.2.6.ebuild,v 1.6 2006/03/29 17:31:00 agriffis Exp $
 
 inherit versionator
 
@@ -41,7 +41,7 @@ src_unpack() {
 		xargs -0r sed -i '
 			s/--pfa --pfb/--formats=PFA,PFB/;
 			s/--pfa/--formats=PFA/;
-			s/--pfa/--formats=PFA/'
+			s/--pfb/--formats=PFB/'
 }
 
 src_compile() {
diff --git a/media-sound/lilypond/lilypond-2.4.2.ebuild b/media-sound/lilypond/lilypond-2.4.2.ebuild
index 4ef8074b5329..8bbb17745219 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.5 2006/03/28 00:11:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.4.2.ebuild,v 1.6 2006/03/29 17:31:00 agriffis Exp $
 
 inherit versionator
 
@@ -42,7 +42,7 @@ src_unpack() {
 		xargs -0r sed -i '
 			s/--pfa --pfb/--formats=PFA,PFB/;
 			s/--pfa/--formats=PFA/;
-			s/--pfa/--formats=PFA/'
+			s/--pfb/--formats=PFB/'
 }
 
 src_compile() {
diff --git a/media-sound/lilypond/lilypond-2.5.2.ebuild b/media-sound/lilypond/lilypond-2.5.2.ebuild
index 7ad99cb594ea..1257335e4478 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.7 2006/03/28 00:11:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.5.2.ebuild,v 1.8 2006/03/29 17:31:00 agriffis Exp $
 
 inherit versionator
 
@@ -42,7 +42,7 @@ src_unpack() {
 		xargs -0r sed -i '
 			s/--pfa --pfb/--formats=PFA,PFB/;
 			s/--pfa/--formats=PFA/;
-			s/--pfa/--formats=PFA/'
+			s/--pfb/--formats=PFB/'
 }
 
 src_compile() {
diff --git a/media-sound/lilypond/lilypond-2.8.0-r1.ebuild b/media-sound/lilypond/lilypond-2.8.0-r1.ebuild
index fa2926fe647c..85aea6cb475b 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.3 2006/03/28 00:11:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.8.0-r1.ebuild,v 1.4 2006/03/29 17:31:00 agriffis Exp $
 
 inherit versionator
 
@@ -17,7 +17,7 @@ KEYWORDS="~x86 ~amd64"
 
 RDEPEND=">=dev-util/guile-1.6.5
 	>=virtual/ghostscript-8.15
-	=virtual/tetex-2*
+	virtual/tetex
 	>=dev-lang/python-2.2.3-r1
 	>=media-libs/freetype-2
 	>=media-libs/fontconfig-2.2