--- libelf-0.8.13-r1.ebuild	2012-11-29 23:08:47.280098557 -0300
+++ libelf-0.8.13-r2.ebuild	2013-07-31 15:20:32.916885757 -0400
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/libelf/libelf-0.8.13-r1.ebuild,v 1.13 2012/11/29 13:42:25 blueness Exp $
 
-EAPI="3"
+EAPI="5"
 
-inherit eutils multilib autotools
+inherit eutils multilib autotools multilib-minimal
 
 DESCRIPTION="A ELF object file access library"
 HOMEPAGE="http://www.mr511.de/software/"
@@ -12,31 +12,35 @@
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug nls elibc_FreeBSD"
 
 RDEPEND="!dev-libs/elfutils"
 DEPEND="nls? ( sys-devel/gettext )"
 
+DOCS=( ChangeLog README )
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libelf/sys_elf.h
+		)
+
 src_prepare() {
 	epatch "${FILESDIR}/${P}-build.patch"
 	eautoreconf
-
 }
 
-src_configure() {
+multilib_src_configure() {
 	# prefix might want to play with this; unfortunately the stupid
 	# macro used to detect whether we're building ELF is so screwed up
 	# that trying to fix it is just a waste of time.
 	export mr_cv_target_elf=yes
 
-	econf \
+	ECONF_SOURCE="${S}" econf \
 		$(use_enable nls) \
 		--enable-shared \
 		$(use_enable debug)
 }
 
-src_install() {
+multilib_src_install() {
 	emake \
 		prefix="${ED}usr" \
 		libdir="${ED}usr/$(get_libdir)" \
@@ -44,8 +48,6 @@
 		install-compat \
 		-j1 || die
 
-	dodoc ChangeLog README || die
-
 	# Stop libelf from stamping on the system nlist.h
 	use elibc_FreeBSD && rm "${ED}"/usr/include/nlist.h
 }