--- jasper-1.900.1-r5.ebuild	2013-02-18 23:01:20.000000000 +0100
+++ jasper-1.900.1-r5.ebuild	2013-02-20 11:14:55.278196727 +0100
@@ -1,10 +1,10 @@ 
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jasper/jasper-1.900.1-r5.ebuild,v 1.9 2013/02/18 22:00:55 zmedico Exp $
+# $Header: $
 
-EAPI=3
+EAPI=5
 
-inherit libtool eutils
+inherit libtool eutils autotools-multilib
 
 DESCRIPTION="software-based implementation of the codec specified in the JPEG-2000 Part-1 standard"
 HOMEPAGE="http://www.ece.uvic.ca/~mdadams/jasper/"
@@ -16,26 +16,33 @@ 
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="jpeg opengl static-libs"
 
-RDEPEND="jpeg? ( virtual/jpeg )
-	opengl? ( virtual/opengl media-libs/freeglut )"
+RDEPEND="jpeg? (
+		virtual/jpeg
+		amd64? ( 
+			abi_x86_32? ( app-emulation/emul-linux-x86-baselibs )
+			)
+		)
+	opengl? (
+		amd64? (
+                        abi_x86_32? ( app-emulation/emul-linux-x86-opengl )
+                        )
+		virtual/opengl media-libs/freeglut
+		)"
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
-src_prepare() {
-	epatch "${WORKDIR}"/${P}-fixes-20120611.patch
-	elibtoolize
-}
+PATCHES=(
+	"${WORKDIR}/${P}-fixes-20120611.patch"
+	)
+
+DOCS=( NEWS README doc/. )
 
 src_configure() {
-	econf \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable opengl) \
-		$(use_enable static-libs static) \
+	local myeconfargs=(
+		$(use_enable jpeg libjpeg)
+		$(use_enable opengl)
+		$(use_enable static-libs static)
 		--enable-shared
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc NEWS README doc/*
-	find "${ED}" -name '*.la' -delete
+		)
+	autotools-multilib_src_configure
 }