Fix build w/ glibc-2.10. (bug #270718)

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 46 insertions, 4 deletions

diff --git a/media-sound/lilypond/ChangeLog b/media-sound/lilypond/ChangeLog
index 2280fe5e3a90..f0ff00ae7752 100644
--- a/media-sound/lilypond/ChangeLog
+++ b/media-sound/lilypond/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/lilypond
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.97 2009/05/26 05:56:51 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.98 2009/07/29 20:49:39 dirtyepic Exp $
+
+  29 Jul 2009; Ryan Hill <dirtyepic@gentoo.org> lilypond-2.12.2.ebuild,
+  +files/lilypond-2.12.2-glibc-2.10.patch:
+  Fix build w/ glibc-2.10. (bug #270718)
 
   26 May 2009; Peter Volkov <pva@gentoo.org> lilypond-2.10.33.ebuild,
   lilypond-2.11.50.ebuild, lilypond-2.11.51.ebuild, lilypond-2.11.52.ebuild,
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 226f31679b6d..db1708ea1700 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50lilypond-gentoo.el 258 RMD160 9534b97f1f41cbabd0bfe066a183eb93cad48a58 SHA1 e9fa3b4ae260183cd2f290fcf84b9991dbcd7875 SHA256 4d8d78c7f08103d0708b0f00638a66496db4b8d2e7d1243794a28ed38dd9b5a7
 AUX lilypond-2.0.0-coreutils-compat.patch 5638 RMD160 0f6620c39939013ec2460728881bbe0d2edc60f2 SHA1 cfed6d9d5a6a6c65767e1fd8deded90e61649354 SHA256 b40f47a164a9f29ed0d98a4ddac91293ec3347044c97042726f96b361417749c
 AUX lilypond-2.10.25-fontforge.patch 348 RMD160 6cee1df8234804a0aab0b79c152e06b69f4af6f6 SHA1 609976acfe43af319329ab7909a80f616990adfc SHA256 41e1875003836fd8a252e9e641ab19fbd9cc82f723ea14c44a4fde8178033d5a
+AUX lilypond-2.12.2-glibc-2.10.patch 753 RMD160 be7184866038c9a163af48642f5039eff73a4bd9 SHA1 2086995d5fdd97cf9c2f3acaec394f7d9d58136c SHA256 039306f5487bec7dcb03848aaff36034eb798363e7eed8085069e338b5831255
 DIST lilypond-2.10.33.tar.gz 2660315 RMD160 589f9ab572b0a628141681424edebb1608528b86 SHA1 22717aa67723067f43208e7e771d6909f8db045f SHA256 9472199e82410097bae9aa67df422538588e850b847d544c5b651c49d6404701
 DIST lilypond-2.11.50.tar.gz 3853529 RMD160 5fa3869089db8d8b4319338968d6a4d652b6e104 SHA1 7dd80cd11df141a83db7d8996d2c0ffbb85e0a7b SHA256 4913ca12af8af383c25cd4b0d38cab504757435b853201953f092661ab860501
 DIST lilypond-2.11.51.tar.gz 3879780 RMD160 4908aeacc4bf84575bec20831757fe7f05fde1bc SHA1 6985c332f8ec2fd4420f59cfd88abbf89229d9c9 SHA256 f87158bd9d0c9f6a662e4e8cdd26dd410766356d3a3b10f1061495f6eb29aecd
@@ -22,6 +26,13 @@ EBUILD lilypond-2.11.63.ebuild 3307 RMD160 d8e7e5314fe020f646ca4541d4fd21dc6c4ba
 EBUILD lilypond-2.11.64.ebuild 3307 RMD160 fc042d4a54c7b8d128089c3f9b165c95389ebe3c SHA1 a6da589cee3747f8ae8a1742fa137cf13e91d76a SHA256 01d614efb1dd7d3ffeee33ff7efbd8d9c803f4fed5c3d9b4c0fc98e957dea088
 EBUILD lilypond-2.11.65.ebuild 3307 RMD160 9958accc7d3f92aa49f53bb34410d57092b82151 SHA1 5cdb05c1952ca6ffff223af0acd3596a4bce365c SHA256 5df9a0bf4f1dd133e5d358cff6fb25b5a6e3689228fa3b21dd7f26c50f0e0cc2
 EBUILD lilypond-2.12.1.ebuild 3302 RMD160 71d02e3416af81a98ea8d4334bc8580691fa1603 SHA1 bc450fdd5dfcf13cc4484ce671dc027030a2c7d8 SHA256 12e1849375b4fe361fce431ff36ef216ddb487ce03cd163ea681baa855d369a2
-EBUILD lilypond-2.12.2.ebuild 3306 RMD160 09eb7be69a6c4a94e8fea06d28f42b0c9f8ea733 SHA1 5c1cad3180c66b18a77aeb051f3760ee44c2581c SHA256 2a9ceaa80cb1750f994b303961e1e68947aa4a03449da4d3f8c39e5fefbe1cd8
-MISC ChangeLog 16355 RMD160 4397442c009d1d9d257cae10a03a451c013346da SHA1 ffc520041f2565c10684fe1104f5025db1203cf8 SHA256 cfd2357577acc337e380cf4c74ba703f2a782446cd59972336eef2ab02ba410a
+EBUILD lilypond-2.12.2.ebuild 3398 RMD160 de391d40b1c4aa3baf84967921ac94aa080701dc SHA1 64261f0e1f70e37eda2824562d366c157d7ec017 SHA256 84589278d9c96fb85b217fcfb6d506c21fab0199553439ac9cf7eeb0957ce36e
+MISC ChangeLog 16518 RMD160 2766b2db4875ffa4ffcf279207da842835e606d7 SHA1 8989b275f2bdd2495c8035540b9ef9e5066f8d4f SHA256 fe1e9a57e8b5469de0e5bdd7237d8c54a20dcdd6d8b344ffa636b99bb438a0db
 MISC metadata.xml 441 RMD160 6b16ceb3995fa6133a001bd5220fccd0f316887b SHA1 6eb000095d6970bb4de6159af1700728a3f3c192 SHA256 cb8b3f74232f032ba5ff263de2c2eba57349a8c40f47b2a791b3cedaf8400bf2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpwtgcACgkQiqiDRvmkBmLtnwCaA3sf59Q++YsoZlceJwXuRlt6
+gnEAoNvq9dbrXGEZkmZjfgXBFDOKz/MV
+=IW0j
+-----END PGP SIGNATURE-----
diff --git a/media-sound/lilypond/files/lilypond-2.12.2-glibc-2.10.patch b/media-sound/lilypond/files/lilypond-2.12.2-glibc-2.10.patch
new file mode 100644
index 000000000000..d1e34087881d
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-2.12.2-glibc-2.10.patch
@@ -0,0 +1,21 @@
+diff -Naurp lilypond-2.12.2-orig/lily/relocate.cc lilypond-2.12.2/lily/relocate.cc
+--- lilypond-2.12.2-orig/lily/relocate.cc	2009-01-18 18:04:57.000000000 -0600
++++ lilypond-2.12.2/lily/relocate.cc	2009-07-29 14:31:12.908541341 -0600
+@@ -276,13 +276,13 @@ expand_environment_variables (string ori
+   string out;
+   while (ptr < start_ptr + len)
+     {
+-      char *dollar = strchr (ptr, '$');
++      const char *dollar = strchr (ptr, '$');
+       
+       if (dollar != NULL)
+ 	{
+-	  char *start_var = dollar + 1;
+-	  char *end_var = start_var;
+-	  char *start_next = end_var;
++	  const char *start_var = dollar + 1;
++	  const char *end_var = start_var;
++	  const char *start_next = end_var;
+ 	  
+ 	  out += string (ptr, dollar - ptr);
+ 	  ptr = dollar;
diff --git a/media-sound/lilypond/lilypond-2.12.2.ebuild b/media-sound/lilypond/lilypond-2.12.2.ebuild
index 41612c7130f3..b4547bc1e90f 100644
--- a/media-sound/lilypond/lilypond-2.12.2.ebuild
+++ b/media-sound/lilypond/lilypond-2.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.12.2.ebuild,v 1.2 2009/05/26 05:56:51 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.12.2.ebuild,v 1.3 2009/07/29 20:49:39 dirtyepic Exp $
 
 inherit eutils versionator toolchain-funcs elisp-common
 
@@ -53,6 +53,12 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+}
+
 src_compile() {
 	if [[ $(gcc-major-version) -lt 4 ]]; then
 		eerror "You need GCC 4.x to build this software."