--- /usr/portage/media-libs/giflib/giflib-4.2.3.ebuild	2013-10-19 08:01:21.000000000 +0200
+++ /usr/portage/media-libs/giflib/giflib-4.2.3.ebuild	2013-12-30 21:52:59.390765737 +0100
@@ -4,7 +4,7 @@ 
 
 EAPI=5
 
-inherit eutils autotools
+inherit autotools-multilib eutils
 
 DESCRIPTION="Library to handle, display and manipulate GIF images"
 HOMEPAGE="http://sourceforge.net/projects/giflib/"
@@ -16,10 +16,7 @@ 
 IUSE="static-libs X"
 
 DEPEND="X? (
-		x11-libs/libXt
-		x11-libs/libX11
-		x11-libs/libICE
-		x11-libs/libSM
+		x11-libs/libX11[${MULTILIB_USEDEP}]
 	)"
 RDEPEND="${DEPEND}"
 
@@ -30,23 +27,27 @@ 
 	epatch "${FILESDIR}"/${PN}-4.1.6-giffix-null-Extension-fix.patch
 	sed -i \
 		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		configure.ac || die #486542
+		-e 's:${X_PRE_LIBS}::' \
+		configure.ac || die #486542,#483258
 	eautoreconf
+	autotools-utils_src_prepare
 }
 
 src_configure() {
-	econf \
-		$(use_enable static-libs static) \
+	local myeconfargs=(
+		$(use_enable static-libs static)
 		$(use_enable X x11)
+		)
+	autotools-multilib_src_configure
 }
 
 src_test() {
-	cd tests || die
-	emake
+	autotools-multilib_src_test -C tests
 }
 
 src_install() {
-	default
+	autotools-multilib_src_install	
+
 	# for static libs the .la file is required if built with +X
 	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
 	doman doc/*.1