--- media-libs/libexif/libexif-0.6.21.ebuild
+++ media-libs/libexif/libexif-0.6.21-r1.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/libexif-0.6.21.ebuild,v 1.8 2012/11/07 19:03:58 grobian Exp $
 
-EAPI=4
-inherit eutils libtool
+EAPI=5
+inherit multilib-build eutils libtool
 
 DESCRIPTION="Library for parsing, editing, and saving EXIF data"
 HOMEPAGE="http://libexif.sourceforge.net/"
@@ -11,7 +11,7 @@
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="doc nls static-libs"
 
 RDEPEND="nls? ( virtual/libintl )"
@@ -24,18 +24,45 @@
 	epatch "${FILESDIR}"/${PN}-0.6.13-pkgconfig.patch
 	sed -i -e '/FLAGS=/s:-g::' configure || die #390249
 	elibtoolize # For *-bsd
+
+	# copy after patching etc
+	my_abi_prepare() {
+		cp -pR "${S}" "${BUILD_DIR}"/ || die "failed to copy sources"
+	}
+	multilib_foreach_abi my_abi_prepare
 }
 
 src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable nls) \
-		$(use_enable doc docs) \
-		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF}
+	my_abi_configure() {
+		pushd "${BUILD_DIR}" >/dev/null || die
+		ECONF_SOURCE=. econf \
+			$(use_enable static-libs static) \
+			$(use_enable nls) \
+			$(use_enable doc docs) \
+			--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF}
+		popd >/dev/null || die
+	}
+	multilib_foreach_abi my_abi_configure
+}
+
+src_compile() {
+	my_abi_compile() {
+		pushd "${BUILD_DIR}" >/dev/null || die
+		default
+		popd >/dev/null || die
+	}
+	multilib_foreach_abi my_abi_compile
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	my_abi_install() {
+		pushd "${BUILD_DIR}" >/dev/null || die
+		emake DESTDIR="${D}" install
+		popd >/dev/null || die
+		multilib_check_headers
+	}
+	multilib_foreach_abi my_abi_install
+
 	prune_libtool_files
 	rm -f "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING}
 }