--- vigra-1.6.0.ebuild.orig	2010-07-28 16:00:41.676065547 +0200
+++ vigra-1.6.0.ebuild	2010-07-28 16:00:18.523057755 +0200
@@ -4,7 +4,7 @@
 
 EAPI=2
 
-inherit eutils multilib
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="C++ computer vision library with emphasize on customizable algorithms and data structures"
 HOMEPAGE="http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/"
@@ -27,6 +27,7 @@
 MY_DOCDIR="usr/share/doc/${PF}"
 
 pkg_setup() {
+	tc-export CC CXX
 	local flag
 	export usefail=""
 	if use test
@@ -46,7 +47,8 @@
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc44.patch"
+	epatch "${FILESDIR}/${P}-gcc44.patch" \
+		"${FILESDIR}"/${P}-ldflags.patch
 	sed -i \
 		-e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:g' \
 		src/impex/png.cxx || die