--- elfutils-0.155.ebuild	2013-02-19 07:35:31.158659169 -0300
+++ elfutils-0.155-r1.ebuild	2013-08-08 09:41:58.600830173 -0400
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic multilib-minimal
 
 DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
 HOMEPAGE="https://fedorahosted.org/elfutils/"
@@ -20,9 +20,9 @@
 # This pkg does not actually seem to compile currently in a uClibc
 # environment (xrealloc errs), but we need to ensure that glibc never
 # gets pulled in as a dep since this package does not respect virtual/libc
-RDEPEND="zlib? ( >=sys-libs/zlib-1.2.2.3 )
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
+RDEPEND="zlib? ( >=sys-libs/zlib-1.2.2.3[${MULTILIB_USEDEP}] )
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
 	!dev-libs/libelf"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
@@ -41,7 +41,11 @@
 
 src_configure() {
 	use test && append-flags -g #407135
-	econf \
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}"	econf \
 		--disable-werror \
 		$(use_enable nls) \
 		$(use_enable threads thread-safety) \
@@ -51,14 +55,13 @@
 		$(use_with lzma)
 }
 
-src_test() {
+multilib_src_test() {
 	env LD_LIBRARY_PATH="${S}/libelf:${S}/libebl:${S}/libdw:${S}/libasm" \
 		LC_ALL="C" \
 		emake check || die
 }
 
-src_install() {
-	default
+multilib_src_install_all() {
 	dodoc NOTES
 	# These build quick, and are needed for most tests, so don't
 	# disable their building when the USE flag is disabled.