Fix building with GCC 4.4 wrt #276956.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

1 files changed, 14 insertions, 9 deletions

diff --git a/media-plugins/vamp-libxtract-plugins/vamp-libxtract-plugins-0.4.2.20071019.ebuild b/media-plugins/vamp-libxtract-plugins/vamp-libxtract-plugins-0.4.2.20071019.ebuild
index 38b81928f41f..3bae9b0ea319 100644
--- a/media-plugins/vamp-libxtract-plugins/vamp-libxtract-plugins-0.4.2.20071019.ebuild
+++ b/media-plugins/vamp-libxtract-plugins/vamp-libxtract-plugins-0.4.2.20071019.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vamp-libxtract-plugins/vamp-libxtract-plugins-0.4.2.20071019.ebuild,v 1.6 2008/02/11 00:09:18 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vamp-libxtract-plugins/vamp-libxtract-plugins-0.4.2.20071019.ebuild,v 1.7 2009/07/24 17:57:14 ssuominen Exp $
 
-inherit multilib toolchain-funcs
+EAPI=2
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="Low-level feature extraction plugins using Jamie Bullock's libxtract library to provide around 50 spectral and other features"
 HOMEPAGE="http://www.vamp-plugins.org/"
@@ -13,20 +14,24 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ppc64 x86"
 IUSE=""
 
-DEPEND="=sci-libs/fftw-3*
+RDEPEND="=sci-libs/fftw-3*
 	media-libs/libxtract
 	media-libs/vamp-plugin-sdk"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+	sed -e "s/-O2 -march=pentium3 -mfpmath=sse/-fPIC -DPIC/" \
+		-e "s/ -Wl,-Bstatic//" -i Makefile
+}
 
 src_compile() {
 	tc-export CXX
-	sed -i -e "s/-O2 -march=pentium3 -mfpmath=sse/-fPIC -DPIC/" Makefile
-	sed -i -e "s/ -Wl,-Bstatic//" Makefile
-	emake || die "make failed"
+	emake || die "emake failed"
 }
 
 src_install() {
 	insinto /usr/$(get_libdir)/vamp
-	doins vamp-libxtract.{so,cat}
+	doins vamp-libxtract.{so,cat} || die "doins failed"
 	dodoc README STATUS
 }