Don't include headers from /usr/src/linux wrt #316759.

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

diff --git a/media-sound/solfege/ChangeLog b/media-sound/solfege/ChangeLog
index 82de8009d078d580f567418017b94db2ec4222e4..f877ba7d8162dee1ce669a5e582d579081080809 100644 (file)
--- a/media-sound/solfege/ChangeLog
+++ b/media-sound/solfege/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/solfege
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/ChangeLog,v 1.35 2010/04/22 10:38:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/ChangeLog,v 1.36 2010/04/23 09:42:15 ssuominen Exp $
+
+  23 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> solfege-3.16.1.ebuild:
+  Don't include headers from /usr/src/linux wrt #316759.
 
 *solfege-3.16.1 (22 Apr 2010)
 

diff --git a/media-sound/solfege/Manifest b/media-sound/solfege/Manifest
index 5b8011583c7985e09c4c4d5c72ae028b92c3c244..5fbdbc5178260d8922fff1cdc6a1d887968fcf86 100644 (file)
--- a/media-sound/solfege/Manifest
+++ b/media-sound/solfege/Manifest
@@ -1,6 +1,6 @@
 DIST solfege-3.14.2.tar.gz 3907723 RMD160 309fce8d2996228c8f14779b59b0629040a882b0 SHA1 e7991122b7f0d68dfd023b675b997717ab7f5bcf SHA256 ffc21ad2a3a704209d33acb5f43eca15a9203dda2f987a94c9049f92002dd153
 DIST solfege-3.16.1.tar.gz 4797579 RMD160 e5b8f61adcb993a03ca2671d11558612e4ba998b SHA1 0dac7d44b791b9ca6a56eec2f0bc5c7722204e81 SHA256 952e882281e2f52c2c9747d8c1153245bab98bfb79141980301912d09049060e
 EBUILD solfege-3.14.2.ebuild 1140 RMD160 291f1b5dabe3c38f8b909d9454053b05650d964d SHA1 4126a98f827833162ea981db20a94774d50b1991 SHA256 bbe4f19a0ba64cfd1e0719c974103cea4d70750b1b57f66beae9426e26f7abf6
-EBUILD solfege-3.16.1.ebuild 1168 RMD160 f10a724f685c9a2a598f19936d13a923f5ed176b SHA1 87aa1d8b28409b307ba6d158b983ebf341450c0a SHA256 bc9a34a62e009026b524e00292f5e4e562184255e5074994e98c6fb8c8a34f75
-MISC ChangeLog 5082 RMD160 17fa1f32ae2752eee00009e12cc283fd5d9aa7ee SHA1 e22b32777e9f7ff7f360f6162c9e77074bc3c7f7 SHA256 4cba8e30d6a1b9ce90acf4ea1568487a6367c1984986e2a9cd82b832160f25e4
+EBUILD solfege-3.16.1.ebuild 1281 RMD160 b55871160ff073e060c696edce499caba61c7f26 SHA1 92e51aeff5885c5a91e776402910ffb532ef4933 SHA256 98f04e3a213ad3535add6b8bb312cd5fb99d3f703b1fd818ba9c29edffe2cc55
+MISC ChangeLog 5217 RMD160 0c8f253d29765a63589dff46e9e7c1935ed1bc74 SHA1 97d249f48da2e106e8be28adc19b0d6cce6d7aab SHA256 22d5c02470169cec1833f43dfdd3b8b47783b1862bb74138e82bf8c26f36fe01
 MISC metadata.xml 159 RMD160 568344dc99ebe68c2e2d43d268d186757532144d SHA1 3f9589301dbaa4363c56de0f309cf792d8c38b63 SHA256 eb5b8cfa9aed067cd72d6439beac2dd0abdba30248f27e4b337012b493a18369

diff --git a/media-sound/solfege/solfege-3.16.1.ebuild b/media-sound/solfege/solfege-3.16.1.ebuild
index d2b58a8c1840c5e8a189f24b35ec3281eb7fdd8c..866da66bf32acc124304bcf8ad8419efbdd87d03 100644 (file)
--- a/media-sound/solfege/solfege-3.16.1.ebuild
+++ b/media-sound/solfege/solfege-3.16.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-3.16.1.ebuild,v 1.2 2010/04/22 23:22:11 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/solfege/solfege-3.16.1.ebuild,v 1.3 2010/04/23 09:42:15 ssuominen Exp $
 
 EAPI=2
 PYTHON_DEPEND="2:2.6"
@@ -33,6 +33,12 @@ pkg_setup() {
        python_pkg_setup
 }
 
+src_prepare() {
+       sed -i \
+               -e '/^CFLAGS/s:-I/usr/src/linux/include::' \
+               solfege/soundcard/Makefile || die
+}
+
 src_configure() {
        local xslloc=$( xmlcatalog /etc/xml/catalog     http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl | sed 's@file://@@' )