--- libexif-0.6.21.ebuild	2012-11-07 20:31:19.000000000 +0100
+++ libexif-0.6.21-r1.ebuild	2013-02-21 21:30:45.165734741 +0100
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # 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 $
+# $Header:  $
 
-EAPI=4
-inherit eutils libtool
+EAPI=5
+inherit autotools-multilib
 
 DESCRIPTION="Library for parsing, editing, and saving EXIF data"
 HOMEPAGE="http://libexif.sourceforge.net/"
@@ -11,10 +11,15 @@
 
 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="~amd64"
 IUSE="doc nls static-libs"
 
-RDEPEND="nls? ( virtual/libintl )"
+RDEPEND="
+		nls? ( virtual/libintl )
+		amd64? (
+				abi_x86_32? ( app-emulation/emul-linux-x86-baselibs )
+				)"
+
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
@@ -23,19 +28,22 @@
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.6.13-pkgconfig.patch
 	sed -i -e '/FLAGS=/s:-g::' configure || die #390249
-	elibtoolize # For *-bsd
+	
+	autotools-utils_src_prepare
 }
 
 src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable nls) \
-		$(use_enable doc docs) \
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable nls)
+		$(use_enable doc docs)
 		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF}
+		)
+	autotools-multilib_src_configure
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	prune_libtool_files
+	autotools-multilib_src_install
+	
 	rm -f "${ED}"/usr/share/doc/${PF}/{ABOUT-NLS,COPYING}
 }