--- libvpx-1.4.0.ebuild	2015-04-07 23:34:20.000000000 +0300
+++ libvpx-1.4.0-r1.ebuild	2015-05-19 20:21:45.288426028 +0300
@@ -3,7 +3,7 @@
 # $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-1.4.0.ebuild,v 1.1 2015/04/07 20:34:20 phajdan.jr Exp $
 
 EAPI=5
-inherit eutils multilib toolchain-funcs multilib-minimal
+inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
 
 LIBVPX_TESTDATA_VER=1.4.0
 
@@ -27,7 +27,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 static-libs test +threads"
+IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 neon static-libs test +threads"
 
 RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
 DEPEND="abi_x86_32? ( dev-lang/yasm )
@@ -52,6 +52,8 @@
 multilib_src_configure() {
 	unset CODECS #357487
 
+	use neon && filter-flags "-mfpu=*" #547194
+
 	# let the build system decide which AS to use (it honours $AS but
 	# then feeds it with yasm flags without checking...) #345161
 	tc-export AS
@@ -99,6 +101,8 @@
 		$(use_enable cpu_flags_x86_sse3 sse3) \
 		$(use_enable cpu_flags_x86_sse4_1 sse4_1) \
 		$(use_enable cpu_flags_x86_ssse3 ssse3) \
+		$(use_enable neon) \
+		$(use_enable neon neon_asm) \
 		$(use_enable static-libs static) \
 		$(use_enable test unit-tests) \
 		$(use_enable threads multithread) \