8 files changed, 315 insertions, 1 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 60dae7f276cf..fd533eb48a92 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index 22a0d16beb24..58141fc9a129 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,5 +1,7 @@
 DIST goffice-0.10.53.tar.xz 2442336 BLAKE2B 8fda50c5d9f8223c082ea9f03334313b051bce47d18b3879c2d8a7c2bbce753f468b5135f0a3c49c54b8a695ee6f1dc355dc806c92e77f41f2d0c64b2bc30bf0 SHA512 cd2d0f49f803cb2f01b3a690bfbe3ea4be5c09e00e8ef643055f56c16549529b7c2c098b87286062d3a5048c1f64d600f74082f53710d8ed8cbb34cb6829dafd
 DIST goffice-0.10.54.tar.xz 2443132 BLAKE2B 83ded093730e214b0d20563789ce13aa959d14fd0911068898afcfe7eaa61f1d42a9aa0e97124a7df585474a290414f077d0fbcfc916e7b41726c56215f16fa6 SHA512 d2c23b211bf5d7148a72e6f76629590418e776f789b763fd234f9008e7e8138e6e4077e2c5ecaf6893b944ee1725899aa89544342b0a8bdf3efde4833ca53304
+DIST goffice-0.10.55.tar.xz 2455576 BLAKE2B 6a1a4670293e0d91c456b3ec162f92f373eeea218d4b4268ae4809b8157cefa4f3d89f3f8555ee2fd3db84fb5adcd0e4119f0e2f6c79cbd4e86d27a46c9ea726 SHA512 c49eec867e4147102b54b70847b495cad0e55fcb069c78a8374760121219b9097c1dfb5601b240e92ed68a6fb785ab5e771f7c579dd138e106ee25a1b9ddfe99
 EBUILD goffice-0.10.53-r1.ebuild 1428 BLAKE2B 25a9851a86248219966c86c39b6b781868879fc79386b3d126d56162cfeeb72accf14dfcbfc32f5e278e01c6be0f29d57ba33f974e5f07f66cf925084316b051 SHA512 99f9bd0341288b95362beb57a0e11af51b5a0eab68e633f3f93e822c42025d9b80d9a307084439002a5e7fed3850a82b21498444c4bcf96164495b76d70aadce
 EBUILD goffice-0.10.54.ebuild 1430 BLAKE2B 8521930d2d1baa96b9751429f37bc70d8bb840c178b75746343405e9ad2e44413af528afabcaf37b794e060209e0a74581d30c4f5f95a23c6f8cca0b7a98a4dd SHA512 54035db69e6cc2cae4ea57aa1415cfde89e4933350ecf7cc3a10e56b369116111be6c462e9dd629f732af308ef62c46be03282a902ec8ada83471ad7895d6525
+EBUILD goffice-0.10.55.ebuild 1430 BLAKE2B 8521930d2d1baa96b9751429f37bc70d8bb840c178b75746343405e9ad2e44413af528afabcaf37b794e060209e0a74581d30c4f5f95a23c6f8cca0b7a98a4dd SHA512 54035db69e6cc2cae4ea57aa1415cfde89e4933350ecf7cc3a10e56b369116111be6c462e9dd629f732af308ef62c46be03282a902ec8ada83471ad7895d6525
 MISC metadata.xml 653 BLAKE2B 5dcfe5914dc4466682862c4171d1d54f8547a8bab5794bf1e95c709e84d52e4aced8c7376674d85937d424766205f317de0de199595fbca15c817b6c3c4a3b25 SHA512 49d62e1f37f3d50f9e3d9ad50c69da19289cf1aac03afdfaa2f472c77e9277c76d81f59b26f2a84ce42e690341a3a26854814f0ca125b4f05a55670cc260e715
diff --git a/x11-libs/goffice/goffice-0.10.55.ebuild b/x11-libs/goffice/goffice-0.10.55.ebuild
new file mode 100644
index 000000000000..9e1f7c7809f9
--- /dev/null
+++ b/x11-libs/goffice/goffice-0.10.55.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome.org libtool
+
+DESCRIPTION="A library of document-centric objects and utilities"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/goffice/"
+
+LICENSE="GPL-2"
+SLOT="0.10"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="+introspection"
+
+# FIXME: add lasem to tree
+RDEPEND="
+	>=app-text/libspectre-0.2.6:=
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/libxml2-2.4.12:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.22:2
+	>=gnome-extra/libgsf-1.14.24:=[introspection?]
+	>=x11-libs/cairo-1.10:=[svg(+)]
+	>=x11-libs/gdk-pixbuf-2.22:2
+	>=x11-libs/gtk+-3.20:3
+	>=x11-libs/pango-1.24:=
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	introspection? (
+		>=dev-libs/gobject-introspection-1:=
+		>=gnome-extra/libgsf-1.14.23:=
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.12
+	>=dev-util/intltool-0.35
+	virtual/perl-Compress-Raw-Zlib
+	virtual/perl-Getopt-Long
+	virtual/perl-IO-Compress
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--disable-gtk-doc \
+		--disable-maintainer-mode \
+		--without-lasem \
+		--with-gtk \
+		--with-config-backend=gsettings \
+		$(use_enable introspection)
+}
+
+src_install() {
+	default
+	dodoc MAINTAINERS
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index fe441b0767c6..90d8ff8b4948 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -3,10 +3,14 @@ AUX gtk+-2.24.31-update-icon-cache.patch 2504 BLAKE2B 29a8874e81e287356f230e3551
 AUX gtk+-2.24.33-respect-NM.patch 273 BLAKE2B e7636db1e4a8a0de67ebeaf98a04d5dbc99d06da9dc0edee3f60a747cdd4ec1ec42ec2d3552d6c29566dbe9a744ad816bfac0d0e798ac60e8a0664b8a94e37e5 SHA512 b9e5f876f35f8f7f1fa07b82d2bd8ebbb4a4e6973e61ac9d9c678b76a8c653ca5b90504407b927e0023f504208a198d790f52cda9601eadff669d62e7db1dd1d
 AUX gtk+-3.22.20-libcloudproviders-automagic.patch 1904 BLAKE2B ed4e774a5641a8e857ae63b83cd481479f3562de3471b5c662eb5b110e583a0a84e7defe272c2fdc6fba58649763b3e97a7e453f83e4693f40a051c8565de7b5 SHA512 3981e3d0dd9a7422b41918a6e426fe36715c6a80c7a46a241edbd1ea364381ac34fa0ae6240bc59980dd56bb816cead55dd4d29437ff288d78b90c139cb5807f
 AUX gtk+-3.24.25-update-icon-cache.patch 4770 BLAKE2B 57d80da1fdb365130dd18ea4f2752d42dde343228c92144fa6194d19474735dc597818933433b1a33029f03d1cc42576621d381d8993d9d1da48e924a3eb154e SHA512 25ba99662299cbd9fb2427b3361dff9ae72c65d49aa14e90c367410908b8dd365f62c971f17cb24b2742d152d22b9d80789d707ba3841b21781c69207ea70f10
+AUX gtk+-3.24.36-introspection.patch 679 BLAKE2B 40189e7b16b4a10304a26f94eea2146bbaafd6a16134d5d7f3c1d957f609ccba558e946009cb691a52c3d5e94ebb6b519490fcecf29325e7bf085d3a4fbdeabe SHA512 f88b8974adfb8dd8f1517831703980e688be9fc6c218620b7c7e2747c7cbbe1d0831ffc5c5a0f4d873738c81f8fbe0eab79d06741c513afa8d66004cf94c64fa
+AUX gtk+-3.24.36-update-icon-cache.patch 774 BLAKE2B 0e7a5b3612147906c91772f496de25175314b601d7ff91c855902f19cb0081e932cc96a90752ae8aa147c4c80868e8d7b01c5e5044695b7710aecaedbd92d5ec SHA512 b8049f77063ac994a0f2222d9e776dd1038636a0920624b027e891f72dd393b825304190118dafc97c733f56554a41e9ceed4f1069980b2913b7b3f4ace23d83
 AUX gtkrc 627 BLAKE2B 57af25dcadfa09ea784ac485db383753deda23c42ce22582f03041abf7a061e70eced09592ab0750786bea3555d760febc913762b8369b50b327fbd03d918279 SHA512 9fb246b8e483cfb5f8d3666397d50547ad0cdaa8bdf5737e67e14dd100952438ac93396f0d752306c02aa4934453a43eb360093c4e323e99bbe0706c40171dc4
 AUX settings.ini 96 BLAKE2B dd0ffe58f3c702d0518e1ad59930a511f98fd1b6e7139b2b2293a3dc8b0419a63a14260ba75b30dc9197f0423a375c675b4f3b34d593ce12828192d18e539fbb SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418
 DIST gtk+-2.24.33.tar.xz 12661828 BLAKE2B f3488b220aaee54bf36fa77e2112d060152e57938845d240014a7d43a5743b1d4de19cc09c683d9d238fd1967cd67cc3c493f2475e4e481f6709f5cdc652c65c SHA512 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5
 DIST gtk+-3.24.35.tar.xz 17913328 BLAKE2B 3beea3cbda7247357238ad133c951e69d5670d68e06efb4de09fae7141b141f4eb17a8c79661cab928a3db427f7b32b518875d0951254941e76b1a7aab60e34f SHA512 3a1ec35756fe12f5be3cfe33ef332d583690458327572e69bffad8b4095059d2a744a4a53b2fd31bab5da2ca7b41a2a38fbbd8ba541a45fa8cc0d00eae005ade
+DIST gtk+-3.24.36.tar.xz 12540184 BLAKE2B 3d9346a3fbc78420eb8edcbad42d9885bed69ce46505bc15819691d884f31aa72386fcd38837e042ba9be3cda6cf5203f921c7f6054a7350c46dee6b77fc4cc4 SHA512 76280e847653576e6fd0586d6044ab315f04c3548c211b37612c4ac77f7bbccfcff17459b9d1d3cbddeb74a62a0bcac05f850b89a20d4abc3893c6c387ecb03a
 EBUILD gtk+-2.24.33-r2.ebuild 9818 BLAKE2B 5a631aa842e0651ad920e7e759af97d08083e39c167697b25fbaa72fb52cad031befc60922734aef5f2eaf7b7ab3d17bc7d2330e9029d4672126d466f4800a9b SHA512 878d48c0009433cb5d15eba3f26d5c137f79b718238b4920ac34fe7c61276ab2bd15dd5f76383fca2febad56fff3f8a7f99f9ce72ff5044a83885f1176da4d0c
 EBUILD gtk+-3.24.35.ebuild 7018 BLAKE2B ca017af92b058f58b51f6bf49f751188cf97702b0b7eba11626a024a5aeace8c4ac6b9bd16cdd3ca200a0bdc84ffd7f06caf7971ac9b194efba6fc1ef3f78e3c SHA512 084deed3cd289cb2b35163bb7aec97b7ee98ced90c136581e3fed6d04c2674059bb4ef7e6adc2632b133e73a5c860764c877de2d5036a96b2c304a3a1645d2c9
-MISC metadata.xml 953 BLAKE2B 29defa50a776f75e114697ad02f4ff22ecd813dd6f67ed6674f6edad57cb1db8e3bc548a98497d4c1f6133c98318e95901c9b602026e225d8dd1350e2dd5858f SHA512 00669a6a0befecca4766adf61de1e0986754ecef00af45d6d3a33724e06ffb86476e4523cf06a214d2add354ee08065dea55f31b6173e27ec3f58fc39b53570a
+EBUILD gtk+-3.24.36.ebuild 5370 BLAKE2B e12365147d0c315723aa876b3810db65b45be7359dea6d985290ccf323af30248a9f848bd267e9f343cfc046b4d44a455a4e9133be0915894ee36ac34fd68f52 SHA512 c17d72ff7f6fba6cf0a8cb807c0b157313928dbf49642d664f9fd491ac31ad3a4a511d40fc4cd04e0f94478cb34459fe05b4830488010ad0b359a2cfb2a07852
+MISC metadata.xml 1041 BLAKE2B 00e12e2caeeb34f9b79de3340f677ee56569fdd977169e5d7c28678936646170b8e5c51c697385453eae323e6dd8948b074caa5928298afb46717589def22a6f SHA512 82401f5bdd721846511ce9364b672a0dfb47c434ac9187bdb361265c7c83698f0777f99ce563f65daddeb03e4abf3741721de3a4589980779d3a7417f64f427e
diff --git a/x11-libs/gtk+/files/gtk+-3.24.36-introspection.patch b/x11-libs/gtk+/files/gtk+-3.24.36-introspection.patch
new file mode 100644
index 000000000000..8b80205b8b17
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.24.36-introspection.patch
@@ -0,0 +1,25 @@
+From 7e4a2a5724a184c418314f4fdbd7a065ba9e203d Mon Sep 17 00:00:00 2001
+From: Staudey <staudi.kaos@gmail.com>
+Date: Tue, 27 Dec 2022 04:54:52 +0000
+Subject: [PATCH] Fix build_gir logic
+
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index aed48fc3f6..6c711e9e9a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -849,7 +849,7 @@ endif
+ 
+ # Introspection
+ gir = find_program('g-ir-scanner', required : get_option('introspection'))
+-build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection'))
++build_gir = gir.found() and get_option('introspection')
+ 
+ subdir('gdk')
+ subdir('gtk')
+-- 
+GitLab
+
diff --git a/x11-libs/gtk+/files/gtk+-3.24.36-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.24.36-update-icon-cache.patch
new file mode 100644
index 000000000000..19af75c398a5
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.24.36-update-icon-cache.patch
@@ -0,0 +1,29 @@
+--- a/docs/reference/gtk/meson.build
++++ b/docs/reference/gtk/meson.build
+@@ -500,7 +500,6 @@
+ 
+   man_files = [
+     [ 'gtk-query-immodules-3.0', '1', ],
+-    [ 'gtk-update-icon-cache', '1', ],
+     [ 'gtk-encode-symbolic-svg', '1', ],
+     [ 'gtk-launch', '1', ],
+     [ 'gtk-builder-tool', '1', ],
+--- a/gtk/meson.build
++++ b/gtk/meson.build
+@@ -1109,16 +1109,6 @@
+   extra_update_icon_cache_objs = import('windows').compile_resources(uac_rc)
+ endif
+ 
+-gtk_update_icon_cache = executable(
+-  'gtk-update-icon-cache',
+-  'updateiconcache.c',
+-  extra_update_icon_cache_objs,
+-  c_args: gtk_cargs,
+-  dependencies: libgtk_dep,
+-  install: true
+-)
+-gtk_tools += gtk_update_icon_cache
+-
+ gtk_query_immodules = executable(
+   'gtk-query-immodules-3.0',
+   'queryimmodules.c',
diff --git a/x11-libs/gtk+/gtk+-3.24.36.ebuild b/x11-libs/gtk+/gtk+-3.24.36.ebuild
new file mode 100644
index 000000000000..f184d909fff3
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.24.36.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2 meson-multilib multilib
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+IUSE="aqua broadway cloudproviders colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	xinerama? ( X )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Upstream wants us to do their job:
+# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}]
+	media-libs/fontconfig[${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-2.2.0:=
+	>=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
+	virtual/libintl[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.14[aqua?,glib,svg(+),X?,${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.44.0[introspection?,${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+
+	cloudproviders? ( net-libs/libcloudproviders )
+	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
+	cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+	sysprof? ( >=dev-util/sysprof-capture-3.33.2:3[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.21
+		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
+	)
+	X? (
+		media-libs/libglvnd[X(+),${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXdamage[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	test? (
+		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
+	)
+	X? ( x11-base/xorg-proto )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-update-icon-cache-3
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+	gnome-base/librsvg[${MULTILIB_USEDEP}]
+	>=x11-themes/adwaita-icon-theme-3.14
+	vim-syntax? ( app-vim/gtk-syntax )
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/gobject-introspection-common
+	dev-libs/libxslt
+	>=dev-util/gdbus-codegen-2.48
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.20
+	wayland? ( dev-util/wayland-scanner )
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+	x11-libs/gdk-pixbuf:2
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.3
+		>=dev-util/gtk-doc-1.20
+	)
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
+)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-introspection.patch
+	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
+	"${FILESDIR}"/${PN}-3.24.36-update-icon-cache.patch
+)
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_use aqua quartz_backend)
+		$(meson_use broadway broadway_backend)
+		$(meson_use cloudproviders)
+		$(meson_use examples demos)
+		$(meson_use examples)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_native_use_bool introspection)
+		$(meson_use sysprof profiler)
+		$(meson_use wayland wayland_backend)
+		$(meson_use X x11_backend)
+		-Dcolord=$(usex colord yes no)
+		-Dprint_backends=$(usex cups cups,file,lpr file,lpr)
+		-Dxinerama=$(usex xinerama yes no)
+		# Include backend immodules into gtk itself, to avoid problems like
+		# https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a
+		# user overridden GTK_IM_MODULE envvar
+		-Dbuiltin_immodules=backend
+		-Dman=true
+		-Dtests=false
+		-Dtracker3=false
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+multilib_src_install_all() {
+	insinto /etc/gtk-3.0
+	doins "${FILESDIR}"/settings.ini
+	# Skip README.win32.md that would get installed by default
+	DOCS=( NEWS README.md )
+	einstalldocs
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make immodules.cache belongs to gtk+ 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
+	}
+	multilib_parallel_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	multilib_pkg_postinst() {
+		gnome2_query_immodules_gtk3 \
+			|| die "Update immodules cache failed (for ${ABI})"
+	}
+	multilib_parallel_foreach_abi multilib_pkg_postinst
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+	fi
+}
diff --git a/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml
index d2f389d5ce2a..7692b1145ef4 100644
--- a/x11-libs/gtk+/metadata.xml
+++ b/x11-libs/gtk+/metadata.xml
@@ -13,6 +13,7 @@
   </longdescription>
   <use>
     <flag name="broadway">Enable the GDK Broadway backend</flag>
+    <flag name="cloudproviders">Enable GtkPlacesSidebar to access cloud services</flag>
     <flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management in printing</flag>
     <flag name="sysprof">Enable profiling data capture support using <pkg>dev-util/sysprof-capture</pkg></flag>
   </use>