--- clang-3.3.ebuild.orig	2013-06-21 21:27:29.721254000 +0900
+++ clang-3.3.ebuild	2013-06-22 19:40:43.000000000 +0900
@@ -80,14 +80,14 @@
 	# Automatically select active system GCC's libraries, bugs #406163 and #417913
 	epatch "${FILESDIR}"/${PN}-3.1-gentoo-runtime-gcc-detection-v3.patch
 
-	# Fix search paths on FreeBSD, bug #409269
-	# This patch causes problem for multilib on fbsd, see comments in the patch
-	# (aballier@g.o)
-	#epatch "${FILESDIR}"/${PN}-3.1-gentoo-freebsd-fix-lib-path.patch
+	# Fix search paths on FreeBSD, bug #409269, #474042
+	epatch "${FILESDIR}"/${PN}-3.3-gentoo-freebsd-fix-lib-path.patch
 
-	# Fix regression caused by removal of USE=system-cxx-headers, bug #417541
-	# Needs to be updated for 3.2
-	#epatch "${FILESDIR}"/${PN}-3.1-gentoo-freebsd-fix-cxx-paths-v2.patch
+	# Fix regression caused by removal of USE=system-cxx-headers, bug #417541, #474042
+	epatch "${FILESDIR}"/${PN}-3.3-gentoo-freebsd-fix-cxx-paths.patch
+
+	# Add X86Triples for x86-fbsd, bug #474042
+	epatch "${FILESDIR}"/${PN}-3.3-gentoo-freebsd-add-x86triples.patch
 
 	# User patches
 	epatch_user