--- pango-1.18.4.ebuild.old	2008-02-20 00:05:15.000000000 +0000
+++ pango-1.18.4.ebuild	2008-02-21 23:26:15.000000000 +0000
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/x11-libs/pango/pango-1.18.4.ebuild,v 1.7 2008/02/04 04:18:44 jer Exp $
 
-inherit eutils gnome2 multilib
+inherit eutils gnome2 pango-module
 
 DESCRIPTION="Text rendering and layout library"
 HOMEPAGE="http://www.pango.org/"
@@ -29,17 +29,13 @@
 
 DOCS="AUTHORS ChangeLog* HACKING NEWS README"
 
-function multilib_enabled() {
-	has_multilib_profile || ( use x86 && [ "$(get_libdir)" == "lib32" ] )
-}
-
 src_unpack() {
 	gnome2_src_unpack
 
 	# make config file location host specific so that a 32bit and 64bit pango
 	# wont fight with each other on a multilib system.  Fix building for
 	# emul-linux-x86-gtklibs
-	if multilib_enabled ; then
+	if pango-module_multilib_enabled ; then
 		epatch "${FILESDIR}/${PN}-1.2.5-lib64.patch"
 	fi
 
@@ -49,22 +45,5 @@
 src_install() {
 	gnome2_src_install
 	rm "${D}/etc/pango/pango.modules"
-}
-
-pkg_postinst() {
-	if [[ "${ROOT}" == "/" ]] ; then
-		einfo "Generating modules listing..."
-
-		local PANGO_CONFDIR=
-
-		if multilib_enabled ; then
-			PANGO_CONFDIR="/etc/pango/${CHOST}"
-		else
-			PANGO_CONFDIR="/etc/pango"
-		fi
-
-		mkdir -p ${PANGO_CONFDIR}
-
-		pango-querymodules > ${PANGO_CONFDIR}/pango.modules
-	fi
+	pango-module_add_path 00pango $(pango-module_standard_path)
 }