diff --git a/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-0.20.2.ebuild b/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-0.22.2.ebuild
similarity index 58%
rename from sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-0.20.2.ebuild
rename to sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-0.22.2.ebuild
index 8637397954..42362b7eee 100644
--- a/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-0.20.2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-libs/pixman/pixman-0.22.2.ebuild
@@ -1,22 +1,18 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.20.2.ebuild,v 1.9 2011/03/20 19:16:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.22.2.ebuild,v 1.5 2011/09/21 00:39:10 jer Exp $
 
-EAPI=3
+EAPI=4
 inherit xorg-2 toolchain-funcs versionator
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman"
 DESCRIPTION="Low-level pixel manipulation routines"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~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"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~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 mmx neon sse2"
 
 pkg_setup() {
 	xorg-2_pkg_setup
-	CONFIGURE_OPTIONS="
-		$(use_enable altivec vmx)
-		$(use_enable neon arm-neon)
-		--disable-gtk"
 
 	local enable_mmx="$(use mmx && echo 1 || echo 0)"
 	local enable_sse2="$(use sse2 && echo 1 || echo 0)"
@@ -30,17 +26,25 @@ pkg_setup() {
 		fi
 	fi
 
+	local confadd
 	# this block fixes bug #236558
 	case "$enable_mmx,$enable_sse2" in
 	'1,1')
-		CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --enable-mmx --enable-sse2" ;;
+		confadd=(--enable-mmx --enable-sse2) ;;
 	'1,0')
-		CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --enable-mmx --disable-sse2" ;;
+		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."
-		CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --disable-mmx --disable-sse2" ;;
+		confadd=(--disable-mmx --disable-sse2) ;;
 	'0,0')
-		CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} --disable-mmx --disable-sse2" ;;
+		confadd=(--disable-mmx --disable-sse2) ;;
 	esac
+
+	XORG_CONFIGURE_OPTIONS=(
+		"${confadd[@]}"
+		$(use_enable altivec vmx)
+		$(use_enable neon arm-neon)
+		--disable-gtk
+	)
 }