--- libgdiplus-1.9.ebuild	2008-05-31 14:22:19.000000000 +0200
+++ libgdiplus-1.9-r1.ebuild	2008-06-01 00:50:42.000000000 +0200
@@ -18,10 +18,11 @@
 		 >=media-libs/fontconfig-2
 		   media-libs/libpng
 		x11-libs/libXrender
 		x11-libs/libX11
 		x11-libs/libXt
+		x11-libs/cairo
 		 exif? ( media-libs/libexif )
 		 gif? ( >=media-libs/giflib-4.1.3 )
 		 jpeg? ( media-libs/jpeg )
 		 tiff? ( media-libs/tiff )"
 DEPEND="${RDEPEND}
@@ -33,10 +34,14 @@
 	unpack ${A}
 	cd "${S}"
 
 	epatch "${FILESDIR}/${PN}-1.2.5-imglibs.patch"
 
+	sed -i \
+		-e 's/FONTCONFIG-CONFIG/FONTCONFIG_CONFIG/' \
+		-e 's/FREETYPE-CONFIG/FREETYPE_CONFIG/' \
+		configure.in || die 'configure.in not found'
 	eautoreconf
 }
 
 src_compile() {
 	if [[ "$(gcc-major-version)" -gt "3" ]] || \
@@ -45,10 +50,12 @@
 		append-flags -fno-inline-functions
 	fi
 
 	# Disable glitz support as libgdiplus does not use it, and it causes errors
 	econf --disable-glitz          \
+		--disable-dependency-tracking \
+		--with-cairo=system \
 		  $(use_with exif libexif) \
 		  $(use_with gif libgif)   \
 		  $(use_with jpeg libjpeg) \
 		  $(use_with tiff libtiff) || die "configure failed"