[gentoo-commits] proj/x11:master commit in: x11-libs/pixman/

["Matt Turner" <mattst88@gmail.com>]

commit:     f273b3a3f0e3c0db2ead245f7240f80d9f3968a8
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Wed Mar 14 18:08:11 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Wed Mar 14 18:08:11 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=f273b3a3

x11-libs/pixman: drop code to disable sse2 if <gcc-4.2 or MMX is disabled

---
 x11-libs/pixman/pixman-9999.ebuild |   30 ++----------------------------
 1 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
index e20b812..b7f75f1 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -14,35 +14,9 @@ IUSE="altivec iwmmxt mmx neon sse2"
 pkg_setup() {
 	xorg-2_pkg_setup
 
-	local enable_mmx="$(use mmx && echo 1 || echo 0)"
-	local enable_sse2="$(use sse2 && echo 1 || echo 0)"
-
-	# this block fixes bug #260287
-	if use x86; then
-		if use sse2 && ! $(version_is_at_least "4.2" "$(gcc-version)"); then
-			ewarn "SSE2 instructions require GCC 4.2 or higher."
-			ewarn "pixman will be built *without* SSE2 support"
-			enable_sse2="0"
-		fi
-	fi
-
-	local confadd
-	# this block fixes bug #236558
-	case "$enable_mmx,$enable_sse2" in
-	'1,1')
-		confadd=(--enable-mmx --enable-sse2) ;;
-	'1,0')
-		confadd=(--enable-mmx --disable-sse2) ;;
-	'0,1')
-		ewarn "You enabled SSE2 but have MMX disabled. This is an invalid."
-		ewarn "pixman will be built *without* MMX/SSE2 support."
-		confadd=(--disable-mmx --disable-sse2) ;;
-	'0,0')
-		confadd=(--disable-mmx --disable-sse2) ;;
-	esac
-
 	XORG_CONFIGURE_OPTIONS=(
-		"${confadd[@]}"
+		$(use_enable mmx)
+		$(use_enable sse2)
 		$(use_enable altivec vmx)
 		$(use_enable neon arm-neon)
 		$(use_enable iwmmxt arm-iwmmxt)