--- x264-0.0.20120707.ebuild.orig	2012-08-25 21:49:41.000000000 -0600
+++ x264-0.0.20120707.ebuild	2012-08-25 21:45:15.000000000 -0600
@@ -29,14 +29,18 @@
 if [ "${PV#9999}" != "${PV}" ]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 IUSE="10bit custom-cflags debug +interlaced pic static-libs +threads"
 
 RDEPEND=""
 DEPEND="amd64? ( >=dev-lang/yasm-1 )
 	x86? ( >=dev-lang/yasm-1 )
-	x86-fbsd? ( >=dev-lang/yasm-1 )"
+	x86-fbsd? ( >=dev-lang/yasm-1 )
+	x86-macos? ( >=dev-lang/yasm-1 )
+	x64-macos? ( >=dev-lang/yasm-1 )
+	x86-solaris? ( >=dev-lang/yasm-1 )
+	x64-solaris? ( >=dev-lang/yasm-1 )"
 
 if [ "${PV#9999}" = "${PV}" ]; then
 	S="${WORKDIR}/${MY_P}"
@@ -44,6 +48,17 @@
 
 DOCS="AUTHORS doc/*.txt"
 
+src_prepare() {
+	# Solaris' /bin/sh doesn't grok the syntax in these files
+	sed -i -e '1c\#!/usr/bin/env sh' configure version.sh || die
+	# for sparc-solaris
+	if [[ ${CHOST} == sparc*-solaris* ]] ; then
+		sed -i -e 's:-DPIC::g' configure || die
+	fi
+	# for OSX
+	sed -i -e "s|-arch x86_64||g" configure || die
+}
+
 src_configure() {
 	tc-export CC