--- glib-2.40.0-r1.ebuild	2014-07-23 19:31:11.000000000 +0400
+++ glib-2.40.0-r2.ebuild	2014-07-29 00:21:00.246910496 +0400
@@ -65,6 +65,10 @@
 
 DOCS="AUTHORS ChangeLog* NEWS* README"
 
+gio_modules_cache_update() {
+	gio-querymodules-${ABI} "${ROOT}/usr/$(get_libdir)/gio/modules"
+}
+
 pkg_setup() {
 	if use kernel_linux ; then
 		CONFIG_CHECK="~INOTIFY_USER"
@@ -224,6 +228,12 @@
 	fi
 }
 
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	mv "${ED}/usr/bin/gio-querymodules" "${ED}/usr/bin/gio-querymodules-${ABI}"
+}
+
 multilib_src_install_all() {
 	einstalldocs
 
@@ -271,6 +281,8 @@
 }
 
 pkg_postinst() {
+	multilib_foreach_abi gio_modules_cache_update
+
 	if has_version '<x11-libs/gtk+-3.0.12:3'; then
 		# To have a clear upgrade path for gtk+-3.0.x users, have to resort to
 		# a warning instead of a blocker