--- gdk-pixbuf-2.28.2.ebuild.orig	2013-09-04 07:01:36 +0900
+++ gdk-pixbuf-2.28.2.ebuild	2014-01-18 04:29:36 +0900
@@ -4,7 +4,7 @@
 
 EAPI="5"
 
-inherit gnome.org gnome2-utils multilib libtool
+inherit gnome.org gnome2-utils multilib libtool multilib-minimal
 
 DESCRIPTION="Image loading library for GTK+"
 HOMEPAGE="http://www.gtk.org/"
@@ -15,13 +15,13 @@
 IUSE="+X debug +introspection jpeg jpeg2k tiff test"
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.34.0:2
-	>=media-libs/libpng-1.4:0=
+	>=dev-libs/glib-2.34.0:2[${MULTILIB_USEDEP}]
+	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
 	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
-	jpeg? ( virtual/jpeg:0= )
-	jpeg2k? ( media-libs/jasper:= )
-	tiff? ( >=media-libs/tiff-3.9.2:0= )
-	X? ( x11-libs/libX11 )
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
+	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.11
@@ -36,6 +36,10 @@
 	!<x11-libs/gtk+-2.90.4:3
 "
 
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gdk-pixbuf-query-loaders
+)
+
 src_prepare() {
 	# This will avoid polluting the pkg-config file with versioned libpng,
 	# which is causing problems with libpng14 -> libpng15 upgrade
@@ -48,20 +52,22 @@
 	elibtoolize # for Darwin modules, bug #????
 }
 
-src_configure() {
+multilib_src_configure() {
 	# png always on to display icons
+	ECONF_SOURCE="${S}" \
 	econf \
 		$(usex debug --enable-debug=yes "") \
 		$(use_with jpeg libjpeg) \
 		$(use_with jpeg2k libjasper) \
 		$(use_with tiff libtiff) \
-		$(use_enable introspection) \
+		$(multilib_build_binaries \
+			&& use_enable introspection \
+			|| echo --disable-introspection) \
 		$(use_with X x11) \
 		--with-libpng
 }
 
-src_install() {
-	default
+multilib_src_install_all() {
 	prune_libtool_files --modules
 }
 
@@ -69,11 +75,16 @@
 	gnome2_gdk_pixbuf_savelist
 }
 
+do_update() {
+	local GDK_PIXBUF_UPDATE_BIN=/usr/bin/${CHOST}-gdk-pixbuf-query-loaders
+	gnome2_gdk_pixbuf_update
+}
+
 pkg_postinst() {
 	# causes segfault if set, see bug 375615
 	unset __GL_NO_DSO_FINALIZER
 
-	gnome2_gdk_pixbuf_update
+	multilib_foreach_abi do_update
 
 	# Migration snippet for when this was handled by gtk+
 	if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then