--- emul-linux-x86-gtklibs-20071214.ebuild.old	2008-02-20 00:07:29.000000000 +0000
+++ emul-linux-x86-gtklibs-20071214.ebuild	2008-02-20 00:08:07.000000000 +0000
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-gtklibs/emul-linux-x86-gtklibs-20071214.ebuild,v 1.2 2007/12/15 14:39:07 welp Exp $
 
-inherit emul-linux-x86
+inherit emul-linux-x86 pango-module
 
 LICENSE="GPL-2 LGPL-2 LGPL-2.1 FTL || ( LGPL-2.1 MPL-1.1 )"
 KEYWORDS="-* amd64"
@@ -24,6 +24,11 @@
 	mv -f "${S}/usr/bin/gdk-pixbuf-query-loaders"{,32}
 }
 
+src_install() {
+	emul-linux-x86_src_install
+	CHOST=${CHOST_x86} pango-module-add-modules-path 00emul-linux-x86-gtklibs /usr/lib32/pango/1.6.0/modules
+}
+
 pkg_preinst() {
 	#bug 169058
 	for l in "${ROOT}/usr/lib32/{pango,gtk-2.0}" ; do
@@ -32,12 +37,7 @@
 }
 
 pkg_postinst() {
-	PANGO_CONFDIR="/etc/pango/i686-pc-linux-gnu"
-	if [[ ${ROOT} == "/" ]] ; then
-		einfo "Generating pango modules listing..."
-		mkdir -p ${PANGO_CONFDIR}
-		pango-querymodules32 > ${PANGO_CONFDIR}/pango.modules
-	fi
+	pango-module_pkg_postinst
 
 	GTK2_CONFDIR="/etc/gtk-2.0/i686-pc-linux-gnu"
 	einfo "Generating gtk+ immodules/gdk-pixbuf loaders listing..."