Add patch from Ed Catmur in bug #178629 to allow building with newer fontforge versions.

Package-Manager: portage-2.1.3_rc5

4 files changed, 47 insertions, 11 deletions

diff --git a/media-sound/lilypond/ChangeLog b/media-sound/lilypond/ChangeLog
index 1d056a0d5ad5..3dd180d2e4b2 100644
--- a/media-sound/lilypond/ChangeLog
+++ b/media-sound/lilypond/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/lilypond
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.57 2007/06/22 11:17:11 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.58 2007/06/23 16:23:28 flameeyes Exp $
+
+  23 Jun 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/lilypond-2.10.25-fontforge.patch, lilypond-2.10.25-r1.ebuild:
+  Add patch from Ed Catmur in bug #178629 to allow building with newer
+  fontforge versions.
 
 *lilypond-2.11.27 (22 Jun 2007)
 
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 1865dcf7b79f..d830495093c5 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50lilypond-gentoo.el 258 RMD160 9534b97f1f41cbabd0bfe066a183eb93cad48a58 SHA1 e9fa3b4ae260183cd2f290fcf84b9991dbcd7875 SHA256 4d8d78c7f08103d0708b0f00638a66496db4b8d2e7d1243794a28ed38dd9b5a7
 MD5 2f035ac60c8fe7a5aba52abffb88a950 files/50lilypond-gentoo.el 258
 RMD160 9534b97f1f41cbabd0bfe066a183eb93cad48a58 files/50lilypond-gentoo.el 258
@@ -6,6 +9,10 @@ AUX lilypond-2.0.0-coreutils-compat.patch 5638 RMD160 0f6620c39939013ec246072888
 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
+AUX lilypond-2.10.25-fontforge.patch 348 RMD160 6cee1df8234804a0aab0b79c152e06b69f4af6f6 SHA1 609976acfe43af319329ab7909a80f616990adfc SHA256 41e1875003836fd8a252e9e641ab19fbd9cc82f723ea14c44a4fde8178033d5a
+MD5 838e7475d6f72280e6339e30e6970c0e files/lilypond-2.10.25-fontforge.patch 348
+RMD160 6cee1df8234804a0aab0b79c152e06b69f4af6f6 files/lilypond-2.10.25-fontforge.patch 348
+SHA256 41e1875003836fd8a252e9e641ab19fbd9cc82f723ea14c44a4fde8178033d5a files/lilypond-2.10.25-fontforge.patch 348
 DIST lilypond-2.0.3.tar.gz 1771835 RMD160 dc1fcd058033f6b727b1eea276552fc226fb2104 SHA1 8f643d6e1a1d3e87b115dca0f8c52face57cae83 SHA256 acaf62102730f4672a43b83e0e2bf238f9a674f12c1c5c6b982bf67d0295aefa
 DIST lilypond-2.10.23.tar.gz 2610035 RMD160 6c37c4134d73c7e295d8e030ba49f9c1414a6eb8 SHA1 0dc5bcd8d6fcacce72c849d1439677733ba20411 SHA256 6fb55b6fe4c6e41a11adf64389c53e19b6c8166ff96e519c0804a3ad127b696d
 DIST lilypond-2.10.25.tar.gz 2660089 RMD160 34f9d78dc44859016b02e0ec0a33267e7989986b SHA1 f2726f808d98477c37ed31fd47ca76d111bdd335 SHA256 ddcbeb54475718b7cd6c3c85d98490d4597fcce5612cd4e5aaf1370d877d4cdf
@@ -26,10 +33,10 @@ EBUILD lilypond-2.10.23.ebuild 2782 RMD160 855506349fa6e96d1b0c84cba9a88bc4f74d1
 MD5 5f82abb82e42c28b3f68eacf96b68a08 lilypond-2.10.23.ebuild 2782
 RMD160 855506349fa6e96d1b0c84cba9a88bc4f74d11e6 lilypond-2.10.23.ebuild 2782
 SHA256 d1ed8e7938a1ee4d5d228550c17d5b6d58865d37fa539fc5079f595bfa344459 lilypond-2.10.23.ebuild 2782
-EBUILD lilypond-2.10.25-r1.ebuild 3245 RMD160 681296f422c1115b09d9eb1b1d2dd74aec354cf9 SHA1 129affbfcf28b1f0805ee6e68856c9e6769eb785 SHA256 c31e9d53051a75216df500a773daf9cb3bb7ddebd0bcd601433e8afe14ad7745
-MD5 c026719905236a2d877ed92d64bc2cce lilypond-2.10.25-r1.ebuild 3245
-RMD160 681296f422c1115b09d9eb1b1d2dd74aec354cf9 lilypond-2.10.25-r1.ebuild 3245
-SHA256 c31e9d53051a75216df500a773daf9cb3bb7ddebd0bcd601433e8afe14ad7745 lilypond-2.10.25-r1.ebuild 3245
+EBUILD lilypond-2.10.25-r1.ebuild 3300 RMD160 cc8c24ba44717c0e3e34c2b93817d8fa1cc2b5a7 SHA1 c876a322ad0a048e7e9e63892d385539174ebdc6 SHA256 3d9ef1ad49458757486c9a19a4b51e58265ae3136a98901594874fe9798f1874
+MD5 7e724eae52b68a57452c31e4e6bbf614 lilypond-2.10.25-r1.ebuild 3300
+RMD160 cc8c24ba44717c0e3e34c2b93817d8fa1cc2b5a7 lilypond-2.10.25-r1.ebuild 3300
+SHA256 3d9ef1ad49458757486c9a19a4b51e58265ae3136a98901594874fe9798f1874 lilypond-2.10.25-r1.ebuild 3300
 EBUILD lilypond-2.10.25.ebuild 2748 RMD160 9a77c506d8a6417abf666ff1dff1dd837d551397 SHA1 1a4642ce2ad4007cf53b1dc92413be2986198e49 SHA256 54d83765d0a5f97d5340f57748fb7ca4b4a1c75d2f8fe1c4d71476d95ea04cab
 MD5 2dc57267f1cdcd77a3c588cb2f4a7678 lilypond-2.10.25.ebuild 2748
 RMD160 9a77c506d8a6417abf666ff1dff1dd837d551397 lilypond-2.10.25.ebuild 2748
@@ -66,10 +73,10 @@ EBUILD lilypond-2.8.0-r1.ebuild 2415 RMD160 ab0134b3d928fe7c871311f0c06413e71de8
 MD5 a780c82186918eb0d9e245f425684a45 lilypond-2.8.0-r1.ebuild 2415
 RMD160 ab0134b3d928fe7c871311f0c06413e71de886af lilypond-2.8.0-r1.ebuild 2415
 SHA256 25f7654f24d1f400f5ae8f62c832f1e5018a28a898bde92d222919227e8024a3 lilypond-2.8.0-r1.ebuild 2415
-MISC ChangeLog 10164 RMD160 70fda71f5b50bbb71d4c12b5c258203eb889719a SHA1 cbe5b282346337d3adb45154bf8a768149994221 SHA256 3ffa1c98c5f4fa5e47dd3313e8f1c344bd2ac4f08e8085ff58d93cf13429958e
-MD5 547c88a3cc43519a9f55cf325fd63860 ChangeLog 10164
-RMD160 70fda71f5b50bbb71d4c12b5c258203eb889719a ChangeLog 10164
-SHA256 3ffa1c98c5f4fa5e47dd3313e8f1c344bd2ac4f08e8085ff58d93cf13429958e ChangeLog 10164
+MISC ChangeLog 10386 RMD160 b77eeb1a59e406b33c86742956c783b293d3b9e6 SHA1 ee56bdd72a28d963ab531941b9a77494da88c292 SHA256 b3416ac54db7a5d1d4ecdc5c7cf9ccdcd6f4e6db1c99001ea048717fa020814e
+MD5 4dd99bbd202b9641b06e1cec165b8ec1 ChangeLog 10386
+RMD160 b77eeb1a59e406b33c86742956c783b293d3b9e6 ChangeLog 10386
+SHA256 b3416ac54db7a5d1d4ecdc5c7cf9ccdcd6f4e6db1c99001ea048717fa020814e ChangeLog 10386
 MISC metadata.xml 440 RMD160 303266342eda535b9947139b2ff53c00228d9ccf SHA1 f294fb6ef478508f521240bb9d6492f5341e9193 SHA256 036d6305ad38764d6c362c74949cc7241fbc685220c34409fc4a793ff93f214f
 MD5 34cdf713d981b1ce7015fddcfa1edcd3 metadata.xml 440
 RMD160 303266342eda535b9947139b2ff53c00228d9ccf metadata.xml 440
@@ -110,3 +117,10 @@ SHA256 f286b47ee3eca311b4e1a44f493084835c212274e4c03a7f2171c83c296e50a5 files/di
 MD5 a0fdbded6e8885f4420394065b04ded4 files/digest-lilypond-2.8.0-r1 548
 RMD160 05d7b40c3401a9406cd582b11f9b73fe19b1f259 files/digest-lilypond-2.8.0-r1 548
 SHA256 b816c1638e7d39363f3be6dcf0d74ad81b06024b23f2a76ff67e8d0a2274c7d8 files/digest-lilypond-2.8.0-r1 548
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGfUklAiZjviIA2XgRAkw/AJ9mRPCN5Xefjx6X2HQASrZNs2KHmQCfSv8j
+GPnJ8O1OYNWD1zqtuEmLC2k=
+=4odR
+-----END PGP SIGNATURE-----
diff --git a/media-sound/lilypond/files/lilypond-2.10.25-fontforge.patch b/media-sound/lilypond/files/lilypond-2.10.25-fontforge.patch
new file mode 100644
index 000000000000..f8a77709e6b1
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-2.10.25-fontforge.patch
@@ -0,0 +1,11 @@
+--- buildscripts/pfx2ttf.fontforge	2007/05/15 21:18:30	1.1
++++ buildscripts/pfx2ttf.fontforge	2007/05/15 21:27:34
+@@ -21,7 +21,7 @@ SelectIf("trademark", "trademark", \
+          "afii61352", "afii61352", \
+          "ij", "ij", \
+          "IJ", "IJ");
+-RemoveATT("Ligature", "*", "*");
++RemovePosSub("*");
+ 
+ Generate($3 + $fontname + ".otf");
+ 
diff --git a/media-sound/lilypond/lilypond-2.10.25-r1.ebuild b/media-sound/lilypond/lilypond-2.10.25-r1.ebuild
index 7a0685f6f786..2548b28befb3 100644
--- a/media-sound/lilypond/lilypond-2.10.25-r1.ebuild
+++ b/media-sound/lilypond/lilypond-2.10.25-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.10.25-r1.ebuild,v 1.3 2007/06/17 13:36:58 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.10.25-r1.ebuild,v 1.4 2007/06/23 16:23:28 flameeyes Exp $
 
 inherit eutils autotools versionator toolchain-funcs elisp-common
 
@@ -37,7 +37,6 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	>=media-gfx/fontforge-20060406
-	<=media-gfx/fontforge-20070312
 	>=app-text/mftrace-1.2.9
 	>=sys-apps/texinfo-4.8
 	sys-devel/make
@@ -55,6 +54,13 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-fontforge.patch"
+}
+
 src_compile() {
 	if [[ $(gcc-major-version) -lt 4 ]]; then
 		eerror "You need GCC 4.x to build this software."