--- dev-libs/libcss/libcss-0.1.2.ebuild.orig	2012-07-23 07:31:08.000000000 +0100
+++ dev-libs/libcss/libcss-0.1.2.ebuild	2012-08-18 15:20:08.093148063 +0100
@@ -26,6 +26,8 @@
 		-i Makefile || die
 	sed -e "/^libdir/s:/lib:/$(get_libdir):g" \
 		-i ${PN}.pc.in || die
+	sed -e "s/\$\$(HOST_CC)/$(tc-getBUILD_CC)/g" \
+		-i src/parse/properties/Makefile || die
 	echo "Q := " >> Makefile.config.override
 	echo "CC := $(tc-getCC)" >> Makefile.config.override
 	echo "AR := $(tc-getAR)" >> Makefile.config.override
--- dev-libs/libnsfb/libnsfb-0.0.2.ebuild.orig	2012-07-18 17:00:36.000000000 +0100
+++ dev-libs/libnsfb/libnsfb-0.0.2.ebuild	2012-08-18 15:23:35.017374458 +0100
@@ -41,9 +41,9 @@
 		-i Makefile || die
 	sed -e "/^libdir/s:/lib:/$(get_libdir):g" \
 		-i ${PN}.pc.in || die
-	echo "Q := " >> Makefile.config.override
-	echo "CC := $(tc-getCC)" >> Makefile.config.override
-	echo "AR := $(tc-getAR)" >> Makefile.config.override
+	echo "Q := " >> Makefile.config
+	echo "CC := $(tc-getCC)" >> Makefile.config
+	echo "AR := $(tc-getAR)" >> Makefile.config
 }
 
 src_compile() {
--- dev-libs/libwapcaplet/libwapcaplet-0.1.1.ebuild.orig	2012-08-18 15:05:41.239740056 +0100
+++ dev-libs/libwapcaplet/libwapcaplet-0.1.1.ebuild	2012-08-18 15:05:07.367192104 +0100
@@ -25,9 +25,9 @@
 		-i Makefile || die
 	sed -e "/^libdir/s:/lib:/$(get_libdir):g" \
 		-i ${PN}.pc.in || die
-	echo "Q := " >> Makefile.config.override
-	echo "CC := $(tc-getCC)" >> Makefile.config.override
-	echo "AR := $(tc-getAR)" >> Makefile.config.override
+	echo "Q := " >> Makefile.config
+	echo "CC := $(tc-getCC)" >> Makefile.config
+	echo "AR := $(tc-getAR)" >> Makefile.config
 }
 
 src_compile() {
--- media-libs/libnsbmp/libnsbmp-0.0.3.ebuild.orig	2012-07-18 00:29:19.000000000 +0100
+++ media-libs/libnsbmp/libnsbmp-0.0.3.ebuild	2012-08-18 18:20:03.928951812 +0100
@@ -24,9 +24,9 @@
 		-i Makefile || die
 	sed -e "/^libdir/s:/lib:/$(get_libdir):g" \
 		-i ${PN}.pc.in || die
-	echo "Q := " >> Makefile.config.override
-	echo "CC := $(tc-getCC)" >> Makefile.config.override
-	echo "AR := $(tc-getAR)" >> Makefile.config.override
+	echo "Q := " >> Makefile.config
+	echo "CC := $(tc-getCC)" >> Makefile.config
+	echo "AR := $(tc-getAR)" >> Makefile.config
 }
 
 src_compile() {
--- media-libs/libnsgif/libnsgif-0.0.3.ebuild.orig	2012-07-18 00:25:46.000000000 +0100
+++ media-libs/libnsgif/libnsgif-0.0.3.ebuild	2012-08-18 15:03:57.384125618 +0100
@@ -24,9 +24,9 @@
 		-i Makefile || die
 	sed -e "/^libdir/s:/lib:/$(get_libdir):g" \
 		-i ${PN}.pc.in || die
-	echo "Q := " >> Makefile.config.override
-	echo "CC := $(tc-getCC)" >> Makefile.config.override
-	echo "AR := $(tc-getAR)" >> Makefile.config.override
+	echo "Q := " >> Makefile.config
+	echo "CC := $(tc-getCC)" >> Makefile.config
+	echo "AR := $(tc-getAR)" >> Makefile.config
 }
 
 src_compile() {
--- www-client/netsurf/netsurf-2.9.ebuild.orig	2012-08-18 15:32:29.506200240 +0100
+++ www-client/netsurf/netsurf-2.9.ebuild	2012-08-18 18:17:02.364478884 +0100
@@ -17,6 +17,7 @@
 IUSE="bmp fbcon freetype gif gstreamer gtk javascript jpeg mng pdf-writer png rosprite svg svgtiny webp"
 
 RDEPEND="dev-libs/libcss
+	dev-libs/libxml2
 	net-libs/hubbub
 	net-misc/curl
 	bmp? ( media-libs/libnsbmp )
@@ -55,6 +56,8 @@
 		-i Makefile.defaults || die
 	sed -e '/^#define NSFB_TOOLBAR_DEFAULT_LAYOUT/s:blfsrut:blfsrutc:' \
 		-i framebuffer/gui.c || die
+	sed -e 's/xml2-config/${PKG_CONFIG} libxml-2.0/g' \
+		-i */Makefile.target || die
 
 	epatch "${FILESDIR}"/${P}-buildsystem.patch
 	epatch "${FILESDIR}"/${P}-includes.patch
@@ -83,6 +86,7 @@
 	netsurf_set Q
 	netsurf_set CC $(tc-getCC)
 	netsurf_set LD $(tc-getCC)
+	netsurf_set PKG_CONFIG $(tc-getPKG_CONFIG)
 
 	if use svg ; then
 		if use svgtiny ; then