--- tiff-4.0.3-r1.ebuild	2013-02-18 23:41:23.000000000 +0100
+++ tiff-4.0.3-r2.ebuild	2013-04-01 12:24:53.608333641 +0200
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.3-r1.ebuild,v 1.3 2013/02/18 22:41:23 zmedico Exp $
 
-EAPI=4
-inherit eutils libtool
+EAPI=5
+inherit autotools-multilib
 
 DESCRIPTION="Tag Image File Format (TIFF) library"
 HOMEPAGE="http://www.remotesensing.org/libtiff/"
@@ -15,31 +15,38 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx jbig jpeg lzma static-libs zlib"
 
-RDEPEND="jpeg? ( virtual/jpeg )
+RDEPEND="amd64? ( abi_x86_32? ( app-emulation/emul-linux-x86-baselibs ) )
+	jpeg? ( virtual/jpeg )
 	jbig? ( media-libs/jbigkit )
 	lzma? ( app-arch/xz-utils )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.0.3-tiff2pdf-colors.patch #145055
-	elibtoolize
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.3-tiff2pdf-colors.patch #145055
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/tiffconf.h
+)
+
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
 
 src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable zlib) \
-		$(use_enable jpeg) \
-		$(use_enable jbig) \
-		$(use_enable lzma) \
-		$(use_enable cxx) \
-		--without-x \
+	local myeconfargs=(
+		$(use_enable zlib)
+		$(use_enable jpeg)
+		$(use_enable jbig)
+		$(use_enable lzma)
+		$(use_enable cxx)
+		--without-x
 		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
+	)
+
+	autotools-multilib_src_configure
 }
 
 src_install() {
-	default
-	prune_libtool_files --all
+	autotools-multilib_src_install
 	rm -f "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION}
 }