--- portage/media-libs/imlib/imlib-1.9.15-r3.ebuild	2011-10-11 13:19:49.000000000 -0700
+++ portage/media-libs/imlib/imlib-1.9.15-r3.ebuild	2014-01-25 20:51:18.193601173 -0800
@@ -1,9 +1,9 @@ 
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/imlib-1.9.15-r3.ebuild,v 1.7 2011/10/11 20:19:49 ssuominen Exp $
+# $Header: $
 
-EAPI=2
-inherit autotools eutils
+EAPI=4
+inherit autotools eutils multilib-minimal
 
 PVP=(${PV//[-\._]/ })
 DESCRIPTION="Image loading and rendering library"
@@ -13,16 +13,16 @@ SRC_URI="mirror://gnome/sources/${PN}/${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~amd64"
 IUSE="doc static-libs"
 
-RDEPEND=">=media-libs/tiff-3.5.5
-	>=media-libs/giflib-4.1.0
-	>=media-libs/libpng-1.2.1
-	virtual/jpeg
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext"
+RDEPEND=">=media-libs/tiff-3.5.5[${MULTILIB_USEDEP}]
+	>=media-libs/giflib-4.1.0[${MULTILIB_USEDEP}]
+	>=media-libs/libpng-1.2.1[${MULTILIB_USEDEP}]
+	virtual/jpeg[${MULTILIB_USEDEP}]
+	x11-libs/libICE[${MULTILIB_USEDEP}]
+	x11-libs/libSM[${MULTILIB_USEDEP}]
+	x11-libs/libXext[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
@@ -36,22 +36,32 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-asneeded.patch #207638
 	epatch "${FILESDIR}"/${P}-libpng15.patch #357167
 
+	# 499268
+	epatch "${FILESDIR}"/${P}-giflib5support.patch
+	epatch "${FILESDIR}"/${P}-t-load-requries-libx11.patch
+	epatch "${FILESDIR}"/${P}-myPrintGifError.patch
+
 	mkdir m4 && cp "${WORKDIR}"/gtk-1-for-imlib.m4 m4
 
 	AT_M4DIR="m4" eautoreconf
 }
 
-src_configure() {
-	econf \
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
 		--sysconfdir=/etc/imlib \
 		$(use_enable static-libs static) \
 		--disable-gdk \
 		--disable-gtktest
 }
 
-src_install() {
+multilib_src_install() {
 	emake DESTDIR="${D}" install || die
+	# fix ldflags leaking into pkgconifg
+	sed -e 's/-L\${libdir}.*-lImlib/-L${libdir} -lImlib/' \
+		-i "${ED}"/usr/$(get_libdir)/pkgconfig/imlib.pc || die
+}
 
+multilib_src_install_all() {
 	dodoc AUTHORS ChangeLog README
 	use doc && dohtml doc/*