--- exiv2-0.23-r1.ebuild	2013-04-04 13:44:21.532180695 +0200
+++ exiv2-0.23-r2.ebuild	2013-06-25 03:54:55.241583161 +0200
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.23-r1.ebuild,v 1.6 2013/04/02 20:56:24 ago Exp $
 
-EAPI=4
-AUTOTOOLS_IN_SOURCE_BUILD=1
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
 
-inherit eutils autotools-utils multilib toolchain-funcs python
+inherit eutils multilib toolchain-funcs python-single-r1 autotools-multilib
 
 DESCRIPTION="EXIF and IPTC metadata C++ library and command line utility"
 HOMEPAGE="http://www.exiv2.org/"
@@ -13,7 +13,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE_LINGUAS="de es fi fr pl ru sk"
 IUSE="contrib doc examples nls xmp zlib static-libs $(printf 'linguas_%s ' ${IUSE_LINGUAS})"
 
@@ -31,7 +31,7 @@
 		dev-libs/libxslt
 		virtual/pkgconfig
 		media-gfx/graphviz
-		=dev-lang/python-2*
+		${PYTHON_DEPEND}
 	)
 	nls? ( sys-devel/gettext )
 "
@@ -64,6 +64,8 @@
 
 	# set locale to safe value for the sed commands (bug #382731)
 	sed -i -r "s,(\s+)sed\s,\1LC_ALL="C" sed ,g" src/Makefile
+
+	multilib_copy_sources
 }
 
 src_configure() {
@@ -81,33 +83,31 @@
 		use amd64 && myeconfargs+=("${myconf} --disable-visibility")
 	fi
 
-	autotools-utils_src_configure
+	autotools-multilib_src_configure
 }
 
 src_compile() {
-	autotools-utils_src_compile
+	autotools-multilib_src_compile
 
 	if use contrib; then
-		emake -C contrib/organize \
+		autotools-multilib_src_compile -C contrib/organize \
 			LDFLAGS="\$(BOOST_LIBS) -L../../src -lexiv2 ${LDFLAGS}" \
-			CPPFLAGS="${CPPFLAGS} -I\$(BOOST_INC_DIR) -I. -DEXV_HAVE_STDINT_H" \
-		|| die "emake organize failed"
+			CPPFLAGS="${CPPFLAGS} -I\$(BOOST_INC_DIR) -I. -DEXV_HAVE_STDINT_H"
 	fi
 
-	if use doc; then
-		emake doc || die "emake doc failed"
-	fi
+	use doc && multilib_for_best_abi emake doc
 }
 
 src_install() {
-	autotools-utils_src_install
+	autotools-multilib_src_install
 
 	if use contrib; then
-		emake DESTDIR="${D}" -C contrib/organize install || die "emake install organize failed"
+		autotools-multilib_src_install -C contrib/organize \
+			DESTDIR="${D}" -C install
 	fi
 
 	use xmp && dodoc doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt}
-	use doc && dohtml -r doc/html/.
+	use doc && multilib_for_best_abi dohtml -r doc/html/.
 	if use examples; then
 		insinto /usr/share/doc/${PF}/examples
 		docompress -x /usr/share/doc/${PF}/examples