Fix gcc-4.5 building problem wrt bug 317163, and python cflags problem wrt bug 324929

Package-Manager: portage-2.2_rc67/cvs/Linux i686

5 files changed, 61 insertions, 6 deletions

diff --git a/media-sound/lilypond/ChangeLog b/media-sound/lilypond/ChangeLog
index 9f2b1c99e4d3..81a417f6f8db 100644
--- a/media-sound/lilypond/ChangeLog
+++ b/media-sound/lilypond/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/lilypond
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.107 2010/06/12 22:59:05 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/ChangeLog,v 1.108 2010/06/29 01:31:44 chiiph Exp $
+
+  29 Jun 2010; Tomas Touceda <chiiph@gentoo.org> lilypond-2.12.3.ebuild,
+  +files/lilypond-2.12.3-gcc45.patch,
+  +files/lilypond-2.12.3-python-cflags.patch:
+  Fix gcc-4.5 building problem wrt bug 317163, and python cflags problem wrt
+  bug 324929
 
   13 Jun 2010; Tomas Touceda <chiiph@gentoo.org> lilypond-2.12.3.ebuild:
   Remove hardcoded font path. fc-list works it out, wrt 323603
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 4657fcb2305a..bb44947bde27 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -1,11 +1,13 @@
 AUX 50lilypond-gentoo.el 258 RMD160 9534b97f1f41cbabd0bfe066a183eb93cad48a58 SHA1 e9fa3b4ae260183cd2f290fcf84b9991dbcd7875 SHA256 4d8d78c7f08103d0708b0f00638a66496db4b8d2e7d1243794a28ed38dd9b5a7
 AUX lilypond-2.12.2-dont-install-pyc.patch 434 RMD160 94e03b0cb144812f02153980d0492e1cc6ff7548 SHA1 4619bd8c6d5090a12f214b4fafa4a333dd78e7a0 SHA256 28927d79f3026a8b483a04d1a595b20e3ebc90f10ad754b28df76c24c30b31f6
 AUX lilypond-2.12.2-glibc-2.10.patch 753 RMD160 be7184866038c9a163af48642f5039eff73a4bd9 SHA1 2086995d5fdd97cf9c2f3acaec394f7d9d58136c SHA256 039306f5487bec7dcb03848aaff36034eb798363e7eed8085069e338b5831255
+AUX lilypond-2.12.3-gcc45.patch 537 RMD160 d5d52cb5ca5ba90248284822c81024f43a48e389 SHA1 27df9c027d4f76744635b4e516782c55284b3818 SHA256 e5d07e6bbc20899835377ea0c6f61eaf576063bb1e7b8b692805dd7b907eeee3
+AUX lilypond-2.12.3-python-cflags.patch 1340 RMD160 b2dded9a65e4461795394e73b4222a6973d5da5b SHA1 d57ae47d22f38c6499ac26e7cef58f4f2b925d3f SHA256 ab96770d9900cd4d1cd92f5aa7abc75c441be24cc7f8b2e9c9a345e40812376a
 AUX lilypond-2.12.3-qa_pyc_fix.patch 520 RMD160 c65aa83819e15f73f21dbba46e136ca2f8e9eb5c SHA1 52a939cdb2770f7c0f138e13dcc3d528d60552d1 SHA256 99da4e42dcbb1c3e2fbc5558f7f7b2c97a6f25b49f17a3cb2171aa44abc407cb
 DIST lilypond-2.12.2.tar.gz 4575983 RMD160 0ef1e1cbceb4fbf69a31b00a030ee40c4280091d SHA1 92afe4ef926d966e7855f64ae93ee762f1fa5178 SHA256 d03df733a2199d32082b9e60f823a9ea1e4274daaccb8cc1cab0eef87f8f140c
 DIST lilypond-2.12.3.tar.gz 4614614 RMD160 275b34b2517780a8c94d9c0a38c3f42b22d49703 SHA1 f36072d5f57b2a3d3877e82879be375d548aa951 SHA256 4e946f263bde49e94e9154446e1bbf74b9005e92c287fd5ed5fe99217e9eacc1
 EBUILD lilypond-2.12.2-r1.ebuild 3445 RMD160 937702b929147b929e9083088495e9a565403276 SHA1 94fb4b7fc7f3b2557fafd5fcbc68286b7ba3f037 SHA256 226542797211d5c072a5b81bee86ead6ce31b30a7acfe2dec5d3e5fb2dd4dfe8
 EBUILD lilypond-2.12.2.ebuild 3392 RMD160 5fad532dceb7182e830b916174e3f4425d3a0f8d SHA1 0c95351480fb9d23dc0cd763db07185d177480a3 SHA256 b93c4b0eba6613f275ab74eac91527ec5a343744d26b06239e3c83cacc57e48c
-EBUILD lilypond-2.12.3.ebuild 2714 RMD160 b5e630bb703f028832a5f976766f7f257bca1bce SHA1 ca9fc629b7940b72645ce532a2424754f7d0caa9 SHA256 9975f8acc2306042c47341fdea1130d7ad6fc564b0f8cef9de82d0504c894177
-MISC ChangeLog 18127 RMD160 05d5dad549e78a2001eb61298fc84ce4d222c15b SHA1 2bc1662cf0b73717ad21fbc62eda09eb073dcca0 SHA256 b32bd629a405e3436b551aa9170e928e925166ba6985cbcc27e061b949f1d25a
+EBUILD lilypond-2.12.3.ebuild 2823 RMD160 925b2b061894a1cce28697f77dd6cf73510c4bce SHA1 19a3fcced366378a8a310e10f636de950ae3f443 SHA256 bef165e0928d38e68244c78e362830625b76e12f81c3fa0780c686103b91dace
+MISC ChangeLog 18375 RMD160 0ed158f38dafd3f518b3895a43705d6e81675d9a SHA1 2223f062376ab4d172feb7334ecd07d34abe2911 SHA256 11234d67b8dcc3fbf52c2ef2299eca2ae84bf85d273622d655244e994c18234f
 MISC metadata.xml 441 RMD160 6b16ceb3995fa6133a001bd5220fccd0f316887b SHA1 6eb000095d6970bb4de6159af1700728a3f3c192 SHA256 cb8b3f74232f032ba5ff263de2c2eba57349a8c40f47b2a791b3cedaf8400bf2
diff --git a/media-sound/lilypond/files/lilypond-2.12.3-gcc45.patch b/media-sound/lilypond/files/lilypond-2.12.3-gcc45.patch
new file mode 100644
index 000000000000..bd1886c0b563
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-2.12.3-gcc45.patch
@@ -0,0 +1,20 @@
+Fixing build with gcc-4.5
+
+http://bugs.gentoo.org/show_bug.cgi?id=317163
+
+Following patch was applied in 2.13 branch
+Thanks Patrick McCarty for information
+
+--- lily/spacing-spanner.cc
++++ lily/spacing-spanner.cc
+@@ -38,8 +38,8 @@
+   vsize end = binary_search (all, (Grob*) me->get_bound (RIGHT),
+ 			     &Paper_column::less_than);  
+   
+-  all = vector<Grob*>::vector<Grob*> (all.begin () + start,
+-				      all.begin () + end + 1);
++  all = vector<Grob*> (all.begin () + start,
++		       all.begin () + end + 1);
+   return all;
+ }
+ 
diff --git a/media-sound/lilypond/files/lilypond-2.12.3-python-cflags.patch b/media-sound/lilypond/files/lilypond-2.12.3-python-cflags.patch
new file mode 100644
index 000000000000..869a6f3c234c
--- /dev/null
+++ b/media-sound/lilypond/files/lilypond-2.12.3-python-cflags.patch
@@ -0,0 +1,24 @@
+diff -ruN lilypond-2.12.3~/aclocal.m4 lilypond-2.12.3/aclocal.m4
+--- lilypond-2.12.3~/aclocal.m4	2010-01-12 18:20:49.000000000 +0200
++++ lilypond-2.12.3/aclocal.m4	2010-06-28 18:31:01.000000000 +0300
+@@ -985,7 +985,7 @@
+     if test -z "$PYTHON_CFLAGS" -a "$PYTHON_CONFIG" != "no"; then
+         # Clean out junk: http://bugs.python.org/issue3290
+ 	# Python headers may need some -f* flags, leave them in.
+-	PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags | sed -e 's/ -\(W\|D\|O\|m\)\(\w\|-\|=\|,\)\+//g'`
++	PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags | sed -e 's/ -\(W\|D\|O\|m\)\(\w\|-\|=\|,\|\.\)\+//g'`
+ 	PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
+     fi
+     
+diff -ruN lilypond-2.12.3~/stepmake/aclocal.m4 lilypond-2.12.3/stepmake/aclocal.m4
+--- lilypond-2.12.3~/stepmake/aclocal.m4	2010-01-12 18:20:49.000000000 +0200
++++ lilypond-2.12.3/stepmake/aclocal.m4	2010-06-28 18:31:01.000000000 +0300
+@@ -985,7 +985,7 @@
+     if test -z "$PYTHON_CFLAGS" -a "$PYTHON_CONFIG" != "no"; then
+         # Clean out junk: http://bugs.python.org/issue3290
+ 	# Python headers may need some -f* flags, leave them in.
+-	PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags | sed -e 's/ -\(W\|D\|O\|m\)\(\w\|-\|=\|,\)\+//g'`
++	PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags | sed -e 's/ -\(W\|D\|O\|m\)\(\w\|-\|=\|,\|\.\)\+//g'`
+ 	PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
+     fi
+     
diff --git a/media-sound/lilypond/lilypond-2.12.3.ebuild b/media-sound/lilypond/lilypond-2.12.3.ebuild
index 50702101baf6..a9ec391fa9e6 100644
--- a/media-sound/lilypond/lilypond-2.12.3.ebuild
+++ b/media-sound/lilypond/lilypond-2.12.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.12.3.ebuild,v 1.4 2010/06/12 22:59:05 chiiph Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-2.12.3.ebuild,v 1.5 2010/06/29 01:31:44 chiiph Exp $
 
 EAPI="3"
 
 PYTHON_DEPEND="2"
 
-inherit eutils versionator toolchain-funcs elisp-common flag-o-matic python
+inherit eutils versionator toolchain-funcs elisp-common flag-o-matic python autotools
 
 DESCRIPTION="GNU Music Typesetter"
 SRC_URI="http://download.linuxaudio.org/lilypond/sources/v$(get_version_component_range 1-2)/${P}.tar.gz"
@@ -44,7 +44,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-qa_pyc_fix.patch
+	epatch "${FILESDIR}/${P}-qa_pyc_fix.patch"
+	epatch "${FILESDIR}/${P}-python-cflags.patch"
+	epatch "${FILESDIR}/${P}-gcc45.patch"
+	eautoreconf
 }
 
 src_configure() {