diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/elfutils/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/elfutils/Manifest
index bfe8dca8f1..c932c037a7 100644
--- a/sdk_container/src/third_party/portage-stable/dev-libs/elfutils/Manifest
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/elfutils/Manifest
@@ -1,3 +1,3 @@
-DIST elfutils-0.152-portability.patch 39623 RMD160 13dd6a1f680ff6a682adb79233d326f056afa7aa SHA1 c989fa702fd473f01d4af1261ad39b02b889a305 SHA256 e006639191589caa9327ca7bf9740c83be20af8297b34ef44d1befcd08476160
-DIST elfutils-0.152-robustify.patch 58762 RMD160 45bc0303f505ac0721825f63ab3351f6f5926f85 SHA1 3bd2e25eb3e06f4b274ad7ae663d9764a8626a5a SHA256 f7e352b503dd2d84aca5794a4b6c273d026b64d64154132dbee9db2c89e22b23
-DIST elfutils-0.152.tar.bz2 1876711 RMD160 e8a89a56021b79c43c7bc69a467dcf02c10f63bd SHA1 b22380205ed3ad5145586b4074be190057eb2537 SHA256 78798715adba95528cdf3fce33eca813131ee75b9109693d313b72f67d7fb4a6
+DIST elfutils-0.154-portability.patch 57336 SHA256 156a30541c8d478354c9e42ee5282fe7d0af65be6b10c829f13ec9ce68e5298e SHA512 33ca17d9e01e8112818a762b8066391d31f09bfe7117a22d99bd6820b881512e240e7355efaa3807b5e2faeefcb60c4b4f3d0d13d12585fa71d0d69d9ef26b99 WHIRLPOOL 3c7aac62bde726c7522d37911c1411a014830c8a6ee1ce076f9e98250d9ee0800163f51bef3a0a7ef3d8b20938744914567692beaeab869fcb136c14e61611dc
+DIST elfutils-0.154-robustify.patch 63063 SHA256 a0e0a81b8bdb7d0622715564d6863be2f2208848feb2e529741c3cb7c01cc6d2 SHA512 c07a23756b5f389473d70f70d62221a003c88b637faaa6ed20cf63758dea5ecaed5cedbddd554b372feb3613fd709ba1f0d849a27d6f703165a161f7d3cc1cc8 WHIRLPOOL a098cf5123e75812ec75392063991007b12334b7bd5244d8a38d55020932cc32d5794f27614076dda47e304a3d0e9b9fd646b5dcc45eeefcc787cd952474ce93
+DIST elfutils-0.154.tar.bz2 2205145 SHA256 3ef06dc0b599874bde09a529a05809dac656204ed1181eea9e89d531cea94af1 SHA512 4d8a7fc7062d433d789f5a71d8b4428ae183302ad8049e5a6e7e1a58f83488f0842c0166bf7e19a19d2571ae36c296d8b81306efaa3c78a1de128819ab06df9e WHIRLPOOL 06c9ffa64d9773c585148eb7d631b6494f88032c44422d5a516a3a5b8084c00205bc33a4b6c373bc69d2e3594ccf3d97cd6971b58c361f2d11bb127919bc8468
diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/elfutils/elfutils-0.152-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/elfutils/elfutils-0.154-r1.ebuild
similarity index 57%
rename from sdk_container/src/third_party/portage-stable/dev-libs/elfutils/elfutils-0.152-r1.ebuild
rename to sdk_container/src/third_party/portage-stable/dev-libs/elfutils/elfutils-0.154-r1.ebuild
index 0a03d4d001..97e295b4c1 100644
--- a/sdk_container/src/third_party/portage-stable/dev-libs/elfutils/elfutils-0.152-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-libs/elfutils/elfutils-0.154-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.152-r1.ebuild,v 1.4 2011/10/31 22:23:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/elfutils/elfutils-0.154-r1.ebuild,v 1.1 2012/07/17 14:52:50 vapier Exp $
 
-EAPI="3"
+EAPI="4"
 
-inherit eutils toolchain-funcs
+inherit eutils flag-o-matic
 
 DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
 HOMEPAGE="https://fedorahosted.org/elfutils/"
@@ -14,8 +14,8 @@ SRC_URI="https://fedorahosted.org/releases/e/l/${PN}/${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2-with-exceptions"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 lzma nls zlib"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE="bzip2 lzma nls static-libs test +threads +utils zlib"
 
 # This pkg does not actually seem to compile currently in a uClibc
 # environment (xrealloc errs), but we need to ensure that glibc never
@@ -34,60 +34,33 @@ src_prepare() {
 	epatch "${DISTDIR}"/${P}-{portability,robustify}.patch
 	sed -i -e 's:-Werror::g' $(find -name Makefile.in) || die
 	use test || sed -i -e 's: tests::' Makefile.in #226349
+	use static-libs || sed -i -e '/^lib_LIBRARIES/s:=.*:=:' -e '/^%.os/s:%.o$::' lib{asm,dw,elf}/Makefile.in
 	# some patches touch both configure and configure.ac
 	find -type f -exec touch -r configure {} +
-	mkdir -p ${CBUILD} ${CHOST}
-}
-
-econf_build() {
-	CFLAGS=${BUILD_CFLAGS:--O1 -pipe} \
-	CXXFLAGS=${BUILD_CXXFLAGS:--O1 -pipe} \
-	CPPFLAGS=${BUILD_CPPFLAGS} \
-	LDFLAGS=${BUILD_LDFLAGS} \
-	CC=$(tc-getBUILD_CC) \
-	LD=$(tc-getBUILD_LD) \
-	econf --host=${CBUILD} "$@"
 }
 
 src_configure() {
-	ECONF_SOURCE=${S}
-
-	if tc-is-cross-compiler ; then
-		pushd ${CBUILD} >/dev/null
-		econf_build --disable-nls --without-{zlib,bzlib,lzma}
-		popd >/dev/null
-	fi
-
-	pushd ${CHOST} >/dev/null
+	use test && append-flags -g #407135
 	econf \
+		--disable-werror \
 		$(use_enable nls) \
+		$(use_enable threads thread_safety) \
 		--program-prefix="eu-" \
 		$(use_with zlib) \
 		$(use_with bzip2 bzlib) \
 		$(use_with lzma)
-	popd >/dev/null
-}
-
-src_compile() {
-	if tc-is-cross-compiler ; then
-		pushd ${CBUILD} >/dev/null
-		emake -C lib || die
-		emake -C libcpu || die
-		popd >/dev/null
-		ln ${CBUILD}/libcpu/i386_gendis ${CHOST}/libcpu/ || die
-		sed -i -e '/^%_dis.h: %_defs/s: i386_gendis::' ${CHOST}/libcpu/Makefile || die
-	fi
-
-	emake -C ${CHOST} || die
 }
 
 src_test() {
 	env LD_LIBRARY_PATH="${S}/libelf:${S}/libebl:${S}/libdw:${S}/libasm" \
 		LC_ALL="C" \
-		emake -C ${CHOST} -j1 check || die "test failed"
+		emake check || die
 }
 
 src_install() {
-	emake -C ${CHOST} DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS NOTES README THANKS TODO
+	default
+	dodoc NOTES
+	# These build quick, and are needed for most tests, so don't
+	# disable their building when the USE flag is disabled.
+	use utils || rm -rf "${ED}"/usr/bin
 }