--- media-libs/libass/libass-0.11.2.ebuild	2014-04-30 06:54:02.000000000 +0200
+++ media-libs/libass/libass-0.11.2.ebuild	2014-05-03 16:57:47.000000000 +0200
@@ -24,8 +24,9 @@
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-X86_CPU_OPTS="abi_x86_32 abi_x86_64"
-for i in ${X86_CPU_OPTS} ; do
+ASM_MULTILIB_ABIS="x86 amd64"
+ASM_MULTILIB_IUSE_ABIS="abi_x86_32 abi_x86_64"
+for i in ${ASM_MULTILIB_IUSE_ABIS} ; do
 	DEPEND="${DEPEND}
 		${i}? ( dev-lang/yasm )"
 done
@@ -33,7 +34,16 @@
 DOCS="Changelog"
 
 multilib_src_configure() {
+	local myconf
+
+	if has ${ABI} ${ASM_MULTILIB_ABIS} ; then
+		myconf="--enable-asm"
+	else
+		myconf="--disable-asm"
+	fi
+
 	ECONF_SOURCE="${S}" econf \
+		${myconf} \
 		$(use_enable enca) \
 		$(use_enable fontconfig) \
 		$(use_enable harfbuzz) \