[gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/

[Gilles Dartiguelongue]

commit:     217feb95f8e3cfae4ff1677f5239b2ed6926492b
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  1 14:07:27 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec  1 14:21:49 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=217feb95

x11-libs/gtk+: 3.8.7 → 3.10.5

* Clean up unittests modifications, everything appears to run fine now.
* Use local gsettings files, otherwise gtkfilechooser tests fails.
* Sort dependency like in other ebuilds.
* Make sure immodules cache is owned by ebuild and use eclass function
  to update it.

---
 .../{gtk+-3.7.14.ebuild => gtk+-3.10.5.ebuild}     | 170 ++++++++++-----------
 x11-libs/gtk+/gtk+-9999.ebuild                     | 161 ++++++++++---------
 x11-libs/gtk+/metadata.xml                         |  20 +++
 3 files changed, 186 insertions(+), 165 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.7.14.ebuild b/x11-libs/gtk+/gtk+-3.10.5.ebuild
similarity index 57%
rename from x11-libs/gtk+/gtk+-3.7.14.ebuild
rename to x11-libs/gtk+/gtk+-3.10.5.ebuild
index 0ca6cb2..03a21ed 100644
--- a/x11-libs/gtk+/gtk+-3.7.14.ebuild
+++ b/x11-libs/gtk+/gtk+-3.10.5.ebuild
@@ -1,13 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
 
 inherit eutils flag-o-matic gnome.org gnome2-utils multilib virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/"
@@ -24,22 +21,34 @@ REQUIRED_USE="
 	|| ( aqua wayland X )
 	xinerama? ( X )"
 
-if [[ ${PV} = 9999 ]]; then
-	IUSE="${IUSE} doc"
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # FIXME: introspection data is built against system installation of gtk+:3
 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
 # Use gtk+:2 for gtk-update-icon-cache
-COMMON_DEPEND="X? (
+COMMON_DEPEND="
+	>=dev-libs/atk-2.7.5[introspection?]
+	>=dev-libs/glib-2.37.5:2
+	media-libs/fontconfig
+	>=x11-libs/cairo-1.12[aqua?,glib,svg,X?]
+	>=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?]
+	>=x11-libs/gtk+-2.24:2
+	>=x11-libs/pango-1.32.4[introspection?]
+	x11-misc/shared-mime-info
+
+	colord? ( >=x11-misc/colord-0.1.9 )
+	cups? ( >=net-print/cups-1.2 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32 )
+	wayland? (
+		>=dev-libs/wayland-1.2
+		media-libs/mesa[wayland]
+		>=x11-libs/libxkbcommon-0.2
+	)
+	X? (
 		>=app-accessibility/at-spi2-atk-2.5.3
 		x11-libs/libXrender
 		x11-libs/libX11
 		>=x11-libs/libXi-1.3
-		x11-libs/libXt
 		x11-libs/libXext
 		>=x11-libs/libXrandr-1.3
 		x11-libs/libXcursor
@@ -48,26 +57,13 @@ COMMON_DEPEND="X? (
 		x11-libs/libXdamage
 		xinerama? ( x11-libs/libXinerama )
 	)
-	wayland? (
-		>=dev-libs/wayland-1.0.0
-		media-libs/mesa[wayland]
-		>=x11-libs/libxkbcommon-0.2.0
-	)
-	>=dev-libs/glib-2.35.3
-	>=x11-libs/pango-1.32.4[introspection?]
-	>=dev-libs/atk-2.7.5[introspection?]
-	>=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?]
-	>=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?]
-	>=x11-libs/gtk+-2.24:2
-	media-libs/fontconfig
-	x11-misc/shared-mime-info
-	colord? ( >=x11-misc/colord-0.1.9 )
-	cups? ( >=net-print/cups-1.2 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32 )"
+"
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xsl-stylesheets
 	app-text/docbook-xml-dtd:4.1.2
 	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.11
 	virtual/pkgconfig
 	X? (
 		x11-proto/xextproto
@@ -76,12 +72,10 @@ DEPEND="${COMMON_DEPEND}
 		x11-proto/damageproto
 		xinerama? ( x11-proto/xineramaproto )
 	)
-	>=dev-util/gtk-doc-am-1.11
 	test? (
 		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )"
-[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
-	doc? ( >=dev-util/gtk-doc-1.11 )"
+		media-fonts/font-cursor-misc )
+"
 # gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
 # gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
 # >=xorg-server-1.11.4 needed for
@@ -90,7 +84,8 @@ RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/gail-1000
 	!<x11-libs/vte-0.31.0:2.90
 	packagekit? ( app-admin/packagekit-base )
-	X? ( !<x11-base/xorg-server-1.11.4 )"
+	X? ( !<x11-base/xorg-server-1.11.4 )
+"
 PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
 
 strip_builddir() {
@@ -103,68 +98,50 @@ strip_builddir() {
 }
 
 src_prepare() {
+	gnome2_environment_reset
+
 	# -O3 and company cause random crashes in applications. Bug #133469
 	replace-flags -O3 -O2
 	strip-flags
 
-	# FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=654108
-	# epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.patch"
-
-	# Non-working test in gentoo's env
-	sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
-		-i gtk/tests/testing.c || die "sed 1 failed"
-	sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
-		-i gtk/tests/recentmanager.c || die "sed 2 failed"
-
-	# FIXME: multiple reftests fail when run from portage (but succeed when
-	# run from a manual compile in a temp directory)
-	sed -e 's:\(SUBDIRS.*\)reftests:\1:' \
-		-i tests/Makefile.* || die "sed 3 failed"
-
-	# Test results depend on the list of mounted filesystems!
-	rm -v tests/a11y/pickers.{ui,txt} || die "rm failed"
-
-	if ! use test; then
+	if ! use test ; then
 		# don't waste time building tests
 		strip_builddir SRC_SUBDIRS tests Makefile.am
-		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS tests Makefile.in
+		strip_builddir SRC_SUBDIRS tests Makefile.in
 	fi
 
 	if ! use examples; then
 		# don't waste time building demos
 		strip_builddir SRC_SUBDIRS demos Makefile.am
-		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in
+		strip_builddir SRC_SUBDIRS demos Makefile.in
 	fi
-
-	[[ ${PV} = 9999 ]] && gnome2_src_prepare
 }
 
 src_configure() {
-	local myconf="$(use_enable aqua quartz-backend)
-		$(use_enable colord)
-		$(use_enable cups cups auto)
-		$(use_enable introspection)
-		$(use_enable packagekit)
-		$(use_enable wayland wayland-backend)
-		$(use_enable X x11-backend)
-		$(use_enable X xcomposite)
-		$(use_enable X xdamage)
-		$(use_enable X xfixes)
-		$(use_enable X xkb)
-		$(use_enable X xrandr)
-		$(use_enable xinerama)
-		--disable-papi
-		--enable-man
-		--enable-gtk2-dependency"
-
-	[[ ${PV} = 9999 ]] && myconf="${myconf} $(use_enable doc gtk-doc)"
-
 	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
 	# need libdir here to avoid a double slash in a path that libtool doesn't
 	# grok so well during install (// between $EPREFIX and usr ...)
-	econf --libdir="${EPREFIX}/usr/$(get_libdir)" ${myconf}
+	econf \
+		$(use_enable aqua quartz-backend) \
+		$(use_enable colord) \
+		$(use_enable cups cups auto) \
+		$(usex debug --enable-debug=yes "") \
+		$(use_enable introspection) \
+		$(use_enable packagekit) \
+		$(use_enable wayland wayland-backend) \
+		$(use_enable X x11-backend) \
+		$(use_enable X xcomposite) \
+		$(use_enable X xdamage) \
+		$(use_enable X xfixes) \
+		$(use_enable X xkb) \
+		$(use_enable X xrandr) \
+		$(use_enable xinerama) \
+		--disable-gtk-doc \
+		--disable-papi \
+		--enable-man \
+		--enable-gtk2-dependency \
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
 }
 
 src_test() {
@@ -177,11 +154,12 @@ src_test() {
 		ewarn "required version of gnome-themes-standard."
 		return 0
 	fi
+
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+
 	unset DBUS_SESSION_BUS_ADDRESS
-	# Exporting HOME fixes tests using XDG directories spec since all defaults
-	# are based on $HOME. It is also backward compatible with functions not
-	# yet ported to this spec.
-	XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed"
+	GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
 }
 
 src_install() {
@@ -192,25 +170,33 @@ src_install() {
 
 	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
 
-	# Remove unneeded *.la files
-	prune_libtool_files --all
+	prune_libtool_files --modules
 
 	# add -framework Carbon to the .pc files
-	use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
-		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
-	done
+	if use aqua ; then
+		for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
+			sed -e "s:Libs\: :Libs\: -framework Carbon :" \
+				-i "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
+		done
+	fi
 }
 
 pkg_preinst() {
 	gnome2_schemas_savelist
+
+	# Make sure loaders.cache belongs to gdk-pixbuf alone
+	local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+	if [[ -e ${EROOT}${cache} ]]; then
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"/${cache} || die
+	fi
 }
 
 pkg_postinst() {
 	gnome2_schemas_update
-
-	local GTK3_MODDIR="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0"
-	gtk-query-immodules-3.0  > "${GTK3_MODDIR}/immodules.cache" \
-		|| ewarn "Failed to run gtk-query-immodules-3.0"
+	gnome2_query_immodules_gtk3
 
 	if ! has_version "app-text/evince"; then
 		elog "Please install app-text/evince for print preview functionality."
@@ -221,4 +207,8 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_schemas_update
+
+	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+		rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+	fi
 }

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 0ca6cb2..3797f40 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -28,18 +28,35 @@ if [[ ${PV} = 9999 ]]; then
 	IUSE="${IUSE} doc"
 	KEYWORDS=""
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 # FIXME: introspection data is built against system installation of gtk+:3
 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
 # Use gtk+:2 for gtk-update-icon-cache
-COMMON_DEPEND="X? (
+COMMON_DEPEND="
+	>=dev-libs/atk-2.7.5[introspection?]
+	>=dev-libs/glib-2.37.5:2
+	media-libs/fontconfig
+	>=x11-libs/cairo-1.12[aqua?,glib,svg,X?]
+	>=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?]
+	>=x11-libs/gtk+-2.24:2
+	>=x11-libs/pango-1.32.4[introspection?]
+	x11-misc/shared-mime-info
+
+	colord? ( >=x11-misc/colord-0.1.9 )
+	cups? ( >=net-print/cups-1.2 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32 )
+	wayland? (
+		>=dev-libs/wayland-1.2
+		media-libs/mesa[wayland]
+		>=x11-libs/libxkbcommon-0.2
+	)
+	X? (
 		>=app-accessibility/at-spi2-atk-2.5.3
 		x11-libs/libXrender
 		x11-libs/libX11
 		>=x11-libs/libXi-1.3
-		x11-libs/libXt
 		x11-libs/libXext
 		>=x11-libs/libXrandr-1.3
 		x11-libs/libXcursor
@@ -48,26 +65,13 @@ COMMON_DEPEND="X? (
 		x11-libs/libXdamage
 		xinerama? ( x11-libs/libXinerama )
 	)
-	wayland? (
-		>=dev-libs/wayland-1.0.0
-		media-libs/mesa[wayland]
-		>=x11-libs/libxkbcommon-0.2.0
-	)
-	>=dev-libs/glib-2.35.3
-	>=x11-libs/pango-1.32.4[introspection?]
-	>=dev-libs/atk-2.7.5[introspection?]
-	>=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?]
-	>=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?]
-	>=x11-libs/gtk+-2.24:2
-	media-libs/fontconfig
-	x11-misc/shared-mime-info
-	colord? ( >=x11-misc/colord-0.1.9 )
-	cups? ( >=net-print/cups-1.2 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32 )"
+"
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xsl-stylesheets
 	app-text/docbook-xml-dtd:4.1.2
 	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.11
 	virtual/pkgconfig
 	X? (
 		x11-proto/xextproto
@@ -76,12 +80,16 @@ DEPEND="${COMMON_DEPEND}
 		x11-proto/damageproto
 		xinerama? ( x11-proto/xineramaproto )
 	)
-	>=dev-util/gtk-doc-am-1.11
 	test? (
 		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )"
-[[ ${PV} = 9999 ]] && DEPEND="${DEPEND}
-	doc? ( >=dev-util/gtk-doc-1.11 )"
+		media-fonts/font-cursor-misc )
+"
+
+if [[ ${PV} = 9999 ]]; then
+	DEPEND="${DEPEND}
+		doc? ( >=dev-util/gtk-doc-1.11 )"
+fi
+
 # gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
 # gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
 # >=xorg-server-1.11.4 needed for
@@ -90,7 +98,8 @@ RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/gail-1000
 	!<x11-libs/vte-0.31.0:2.90
 	packagekit? ( app-admin/packagekit-base )
-	X? ( !<x11-base/xorg-server-1.11.4 )"
+	X? ( !<x11-base/xorg-server-1.11.4 )
+"
 PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
 
 strip_builddir() {
@@ -103,28 +112,13 @@ strip_builddir() {
 }
 
 src_prepare() {
+	gnome2_environment_reset
+
 	# -O3 and company cause random crashes in applications. Bug #133469
 	replace-flags -O3 -O2
 	strip-flags
 
-	# FIXME: https://bugzilla.gnome.org/show_bug.cgi?id=654108
-	# epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.patch"
-
-	# Non-working test in gentoo's env
-	sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
-		-i gtk/tests/testing.c || die "sed 1 failed"
-	sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
-		-i gtk/tests/recentmanager.c || die "sed 2 failed"
-
-	# FIXME: multiple reftests fail when run from portage (but succeed when
-	# run from a manual compile in a temp directory)
-	sed -e 's:\(SUBDIRS.*\)reftests:\1:' \
-		-i tests/Makefile.* || die "sed 3 failed"
-
-	# Test results depend on the list of mounted filesystems!
-	rm -v tests/a11y/pickers.{ui,txt} || die "rm failed"
-
-	if ! use test; then
+	if ! use test ; then
 		# don't waste time building tests
 		strip_builddir SRC_SUBDIRS tests Makefile.am
 		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS tests Makefile.in
@@ -140,31 +134,35 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf="$(use_enable aqua quartz-backend)
-		$(use_enable colord)
-		$(use_enable cups cups auto)
-		$(use_enable introspection)
-		$(use_enable packagekit)
-		$(use_enable wayland wayland-backend)
-		$(use_enable X x11-backend)
-		$(use_enable X xcomposite)
-		$(use_enable X xdamage)
-		$(use_enable X xfixes)
-		$(use_enable X xkb)
-		$(use_enable X xrandr)
-		$(use_enable xinerama)
-		--disable-papi
-		--enable-man
-		--enable-gtk2-dependency"
+	local myconf=""
 
 	[[ ${PV} = 9999 ]] && myconf="${myconf} $(use_enable doc gtk-doc)"
 
 	# Passing --disable-debug is not recommended for production use
-	use debug && myconf="${myconf} --enable-debug=yes"
-
 	# need libdir here to avoid a double slash in a path that libtool doesn't
 	# grok so well during install (// between $EPREFIX and usr ...)
-	econf --libdir="${EPREFIX}/usr/$(get_libdir)" ${myconf}
+	econf \
+		$(use_enable aqua quartz-backend) \
+		$(use_enable colord) \
+		$(use_enable cups cups auto) \
+		$(usex debug --enable-debug=yes "") \
+		$(use_enable introspection) \
+		$(use_enable packagekit) \
+		$(use_enable wayland wayland-backend) \
+		$(use_enable X x11-backend) \
+		$(use_enable X xcomposite) \
+		$(use_enable X xdamage) \
+		$(use_enable X xfixes) \
+		$(use_enable X xkb) \
+		$(use_enable X xrandr) \
+		$(use_enable xinerama) \
+		--disable-gtk-doc \
+		--disable-papi \
+		--enable-man \
+		--enable-gtk2-dependency \
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		${myconf}
 }
 
 src_test() {
@@ -177,11 +175,12 @@ src_test() {
 		ewarn "required version of gnome-themes-standard."
 		return 0
 	fi
+
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+
 	unset DBUS_SESSION_BUS_ADDRESS
-	# Exporting HOME fixes tests using XDG directories spec since all defaults
-	# are based on $HOME. It is also backward compatible with functions not
-	# yet ported to this spec.
-	XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed"
+	GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
 }
 
 src_install() {
@@ -192,25 +191,33 @@ src_install() {
 
 	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
 
-	# Remove unneeded *.la files
-	prune_libtool_files --all
+	prune_libtool_files --modules
 
 	# add -framework Carbon to the .pc files
-	use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
-		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
-	done
+	if use aqua ; then
+		for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
+			sed -e "s:Libs\: :Libs\: -framework Carbon :" \
+				-i "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
+		done
+	fi
 }
 
 pkg_preinst() {
 	gnome2_schemas_savelist
+
+	# Make sure loaders.cache belongs to gdk-pixbuf alone
+	local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+	if [[ -e ${EROOT}${cache} ]]; then
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"/${cache} || die
+	fi
 }
 
 pkg_postinst() {
 	gnome2_schemas_update
-
-	local GTK3_MODDIR="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0"
-	gtk-query-immodules-3.0  > "${GTK3_MODDIR}/immodules.cache" \
-		|| ewarn "Failed to run gtk-query-immodules-3.0"
+	gnome2_query_immodules_gtk3
 
 	if ! has_version "app-text/evince"; then
 		elog "Please install app-text/evince for print preview functionality."
@@ -221,4 +228,8 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_schemas_update
+
+	if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+		rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+	fi
 }

diff --git a/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml
new file mode 100644
index 0000000..dde3aef
--- /dev/null
+++ b/x11-libs/gtk+/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+  <longdescription>
+    GTK+ is a multi-platform toolkit for creating graphical user
+    interfaces. Offering a complete set of widgets, GTK+ is suitable
+    for projects ranging from small one-off projects to complete
+    application suites.
+  </longdescription>
+  <use>
+    <flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management
+	  in printing</flag>
+    <flag name="packagekit">Enable support for the distro-neutral package
+	  manager GUI <pkg>app-admin/packagekit</pkg> in application chooser</flag>
+  </use>
+  <upstream>
+    <remote-id type="cpe">cpe:/a:gtk:gtk%2B</remote-id>
+  </upstream>
+</pkgmetadata>