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

8 files changed, 45 insertions, 37 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/Manifest b/media-sound/lilypond/Manifest
index 447f9b1ca6e9..f658b6e2ec7c 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 46ee35396c31e36442e168aa92074b3a ChangeLog 7336
-RMD160 e1d8377746abb068d3d7c8775ee02a515fd11991 ChangeLog 7336
-SHA256 6968aa96aed1fd3663ff49915adb19897d8b8e2926d7aa5ad2d4b983b1debc65 ChangeLog 7336
+MD5 f03f6d60c1bf3f469485ba3992a0fb89 ChangeLog 7779
+RMD160 a1c6c09692c22995fc378c77942fc045b7720174 ChangeLog 7779
+SHA256 44784778818de928bc533a70113563dbf146c6ea2cbc34894c5ba3687967a5b1 ChangeLog 7779
 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 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 5cacb0d411a8a1e98f42235ed8144572 lilypond-2.0.3.ebuild 3099
+RMD160 85b1e8277f64b374c63232faaee19e46d450453a lilypond-2.0.3.ebuild 3099
+SHA256 b9b9d44142b943cc9cf6b174c5e3a191eee29f8e0ec00ccc3b6ae7dd4ea824b7 lilypond-2.0.3.ebuild 3099
+MD5 e4a183a745770d024dbb68d5efead11d lilypond-2.2.4.ebuild 3334
+RMD160 d0784062dc477ed6008c6c3d3e4da9c42ddbb407 lilypond-2.2.4.ebuild 3334
+SHA256 ec3b69912978f3b3d97febffc5ac0562c66163ffe07405b1cc7040625c6f5857 lilypond-2.2.4.ebuild 3334
+MD5 106ffa27521fb19b6f45fa412ee86d40 lilypond-2.2.6.ebuild 3334
+RMD160 c26b83f411e01d0e8ef54e3ff0a8fd435619c898 lilypond-2.2.6.ebuild 3334
+SHA256 eac8664036cf8788aa18d1f8b64c30beac5cb1446be43968e410c4d2f395e32b lilypond-2.2.6.ebuild 3334
+MD5 0ea8498ab2050e1bfcb049105facb0f6 lilypond-2.4.2.ebuild 3498
+RMD160 bde05788fcd5a4e2c03083a8b075fb9bc9126ae1 lilypond-2.4.2.ebuild 3498
+SHA256 0ab1116ee40a5910bbe6a4b35db6ca866ef79c3e12635c46d1f06be8291ab857 lilypond-2.4.2.ebuild 3498
+MD5 488f2553ef6c6195c33192fd4d83fb8d lilypond-2.5.2.ebuild 3505
+RMD160 15c4029bcf394868efb975fccc26db963b935a55 lilypond-2.5.2.ebuild 3505
+SHA256 d76ddfc671b5a53f0b2db60015783b2d0cddf6aaa37d9173225b091241f8f716 lilypond-2.5.2.ebuild 3505
+MD5 669ca6acdf6395f3ac1b310f94c8a382 lilypond-2.8.0-r1.ebuild 2415
+RMD160 1041a1877899449ab76571b6f48c117e1f679387 lilypond-2.8.0-r1.ebuild 2415
+SHA256 79493026d2968f19563d1ff7a929438d1e30fd8d3bcbdaa51ce323b4cbfc55cf lilypond-2.8.0-r1.ebuild 2415
 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)
 
-iD8DBQFEKH8vJrHF4yAQTrARAk7qAKCtDIZYXN3YLM+JNmxh8YBIZ8N7ugCcDPo7
-MB45tuR7eixbVfovd6Aitqk=
-=0Cbc
+iD8DBQFEKsTrJrHF4yAQTrARAtiNAKDAyIkURrYFkuMZdpVQ4cEpR/b7fwCePY0w
+t4dxn4GTJQ4eDpwYsA2KsVI=
+=OOHC
 -----END PGP SIGNATURE-----
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