--- /usr/portage/x11-libs/pixman/pixman-0.32.6.ebuild	2015-02-24 10:01:19.000000000 +0100
+++ pixman-0.32.6.ebuild	2015-02-28 16:49:49.744575764 +0100
@@ -10,21 +10,53 @@
 DESCRIPTION="Low-level pixel manipulation routines"
 
 KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
+IUSE="altivec iwmmxt armv6 loongson2f cpudetection cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
 RDEPEND="abi_x86_32? (
 	!<=app-emulation/emul-linux-x86-gtklibs-20131008
 	!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
 	)"
 
 src_configure() {
+	local myconf=""
+	if use x86 || use amd64; then
+		filter-flags -mmmx -msse
+	fi
+
+	if use cpudetection; then
+		if use mips; then
+			myconf="
+				--enable-loongson-mmi"
+		fi
+		if use ppc; then
+			myconf="
+				--enable-vmx"
+		fi
+		if use arm; then
+			myconf="
+				--enable-arm-neon
+				--enable-arm-iwmmxt
+				--enable-arm-simd"
+		fi
+		if use x86 || use amd64; then
+			myconf="
+				--enable-mmx
+				--enable-sse2
+				--enable-ssse3"
+		fi
+	else
+		myconf="
+			$(use_enable cpu_flags_x86_mmxext mmx)
+			$(use_enable cpu_flags_x86_sse2 sse2)
+			$(use_enable cpu_flags_x86_ssse3 ssse3)
+			$(use_enable altivec vmx)
+			$(use_enable armv6 arm-simd)
+			$(use_enable neon arm-neon)
+			$(use_enable iwmmxt arm-iwmmxt)
+			$(use_enable loongson2f loongson-mmi)"
+	fi
+
 	XORG_CONFIGURE_OPTIONS=(
-		$(use_enable cpu_flags_x86_mmxext mmx)
-		$(use_enable cpu_flags_x86_sse2 sse2)
-		$(use_enable cpu_flags_x86_ssse3 ssse3)
-		$(use_enable altivec vmx)
-		$(use_enable neon arm-neon)
-		$(use_enable iwmmxt arm-iwmmxt)
-		$(use_enable loongson2f loongson-mmi)
+		$myconf
 		--disable-gtk
 		--disable-libpng
 	)