x11-libs/gtk+: Add atk-bridge USE flag.

13 files changed, 1006 insertions, 0 deletions

diff --git a/metadata/layout.conf b/metadata/layout.conf
new file mode 100644
index 0000000..d43e61c
--- /dev/null
+++ b/metadata/layout.conf
@@ -0,0 +1 @@
+masters = gentoo
diff --git a/profiles/repo_name b/profiles/repo_name
new file mode 100644
index 0000000..061d9ca
--- /dev/null
+++ b/profiles/repo_name
@@ -0,0 +1 @@
+optdeps
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
new file mode 100644
index 0000000..ee4362c
--- /dev/null
+++ b/x11-libs/gtk+/Manifest
@@ -0,0 +1,13 @@
+AUX gtk+-2.24.24-out-of-source.patch 1487 BLAKE2B f322f3872c8e1f02f6d1d52cdfdb4b42dad26d44bda2f1a9b36ee7dae0f8e7c072f5a8e492d01429bb4ae679f886b3ef0fb9952bef5a08e75720908f2e8d616d SHA512 794903f8254a49f7d0e24f9730658dc69184969bb450419bd34bc2a9e7065d99931df4ae5ecd93abc0a18bff546aeb6816aae47531e8a79dc5aef5beaf9b6aa2
+AUX gtk+-2.24.31-update-icon-cache.patch 2504 BLAKE2B 29a8874e81e287356f230e355117aabd9c3e9dfd1a810eaa8dc7e60dbe3fb65a73719c272dc1ba2058dae95b3988d86f09fa8587963df34a7486b50e68e79732 SHA512 c2a55a410019502b0af3fa5152fc372ce8a555bd63b5cf7f9574ebe5058f3b95e21dc5f14b5b8867d52105e4f6ebca3336a59935c3a7269bfd41aa91edadab48
+AUX gtk+-3.22.20-libcloudproviders-automagic.patch 1904 BLAKE2B ed4e774a5641a8e857ae63b83cd481479f3562de3471b5c662eb5b110e583a0a84e7defe272c2fdc6fba58649763b3e97a7e453f83e4693f40a051c8565de7b5 SHA512 3981e3d0dd9a7422b41918a6e426fe36715c6a80c7a46a241edbd1ea364381ac34fa0ae6240bc59980dd56bb816cead55dd4d29437ff288d78b90c139cb5807f
+AUX gtk+-3.22.30.atk-bridge.patch 1866 BLAKE2B d67ed5b3d904f1ddb36d1e57c83009bab7d6d89e674f65147a7c73ae8aa2b9be6f7e5268a2a5df3472b39391c64d4c25d1cf81c0195c143932da46c4794b0d51 SHA512 8b6bd2ee29a55dce20d10226a3f58e7b8cba82cd0ec8bc259d644469183c18f7917691d27b151c59d9ab24192feb0ba21ab711046eb8b4a50f3ce7129425fd37
+AUX gtk+-3.24.8-update-icon-cache.patch 5523 BLAKE2B 648018f807cb1f3d057e986a1422e3fbeb0cf1c050f19569f4a93a9d7e71577370b79f01133e0be048282259af8218f03511c39c8e73b3b912c2c86e91ab935b SHA512 70fa68b08dd140eea1dfa80f2b67d4c6d3d5bd1b5374eda57bd827f9727e89bbd0e2d775676da2dc5d852d3c2f55cbb07d9d791a99a6d90f5f63864a0479fe13
+AUX gtkrc 627 BLAKE2B 57af25dcadfa09ea784ac485db383753deda23c42ce22582f03041abf7a061e70eced09592ab0750786bea3555d760febc913762b8369b50b327fbd03d918279 SHA512 9fb246b8e483cfb5f8d3666397d50547ad0cdaa8bdf5737e67e14dd100952438ac93396f0d752306c02aa4934453a43eb360093c4e323e99bbe0706c40171dc4
+AUX settings.ini 96 BLAKE2B dd0ffe58f3c702d0518e1ad59930a511f98fd1b6e7139b2b2293a3dc8b0419a63a14260ba75b30dc9197f0423a375c675b4f3b34d593ce12828192d18e539fbb SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418
+DIST gtk+-2.24.32-patchset-r1.tar.xz 13364 BLAKE2B 15e5429b11cc4ccef1bf44105c790b5325e833ab12f393fe718c06470b90f3e4004bea4b51076a725f4bb10bcfd0c48b7063d9b9b021919ad0367d1b981be980 SHA512 1a15dce7578a914585981426d2e5d1cc45866866a70c3f443d1867ab1c0c28fb279bde6c3117b28eec2758a62c1b54bb6fb1b382ad6e9a7cf0114b13f2afd858
+DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
+DIST gtk+-3.24.22.tar.xz 21349784 BLAKE2B 03dac82b3928a77beab1b4fcfcb9fdeb5e458fae13f7ff5459c2c65c7acdd6b255e62cbeaace02ec19ab4a41ff3ba2003dc004bcbaa4ee8206986e35fd7d1084 SHA512 ac653438a0a818885f2aa46a131b1ab0038a57b438406724a674313d8bf4325b1d2e87e4e8c77a92d0cfa8f8d6eaac46ba6890830290e9a9e598c978144861a2
+EBUILD gtk+-2.24.32-r1.ebuild 9957 BLAKE2B 9f5b89755fa452b5b2ca075093f703b1ca0e904de6848a24644a5662bbfe0edd1dad0d1a4732e268d7878a2702b4432a39ed22f33b6c45f44e4fffd0e7dc648f SHA512 e8f2dc31fa4ba63128bad6f2b7130a872344d86562d38675011661baff8cf16c56efe375933b5ef67d33555dca2ea963b54d66827a179132cd56532b77974a89
+EBUILD gtk+-3.24.22.ebuild 7452 BLAKE2B 56ea06a545f5b88957778d027a46d33d5bf6c750cb24e062a7628740307f5d83956baef14f1b5e935932734b3a3503d13d40b0d67f0d5530e9a580559fc03d73 SHA512 f7e53a8e4357441b1ea2425e957fd0a6a42f02a8a5093b376d601075dd74c60f2ed41fcc74055b91b04dc5f2fe73d23eb382904f9ed8812d23a93ca15ac7649f
+MISC metadata.xml 871 BLAKE2B 4575365c3fe1d9d728472891e6dffb12794284c886d833740c83130b14d590132394ffb1a664c672b374ce29ff331fafc315e3e2c13b50bc5bdc70494a10101d SHA512 44513e083db6e5d4b0ac8578d5af6d0ef40fe760b68701133fc1131431dca90a854a905e9a3d1f43f772f2da199e72b1eb5e80ec0217605e663a426172461fa9
diff --git a/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch b/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch
new file mode 100644
index 0000000..451233c
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch
@@ -0,0 +1,33 @@
+From 9e0f33144aff8d792ab105927cf686eda0afd25e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 18 May 2014 10:50:05 +0200
+Subject: [PATCH] aliasfilecheck: check for sources both in builddir & srcdir.
+
+The $gtk_all_c_sources variable contains both supplied and generated
+sources. The former reside in $srcdir, the latter in the build directory
+(cwd).
+
+In order to handle both kinds properly, first try to find each source
+file in cwd, and then fallback to $srcdir. This makes it possible to use
+out-of-source builds, and guarantees that fresh-built source files will
+be used rather than pre-generated copies included in the distribution
+tarball.
+---
+ gtk/aliasfilescheck.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gtk/aliasfilescheck.sh b/gtk/aliasfilescheck.sh
+index 31b49d4..3636a82 100755
+--- a/gtk/aliasfilescheck.sh
++++ b/gtk/aliasfilescheck.sh
+@@ -6,6 +6,6 @@ if test "x$gtk_all_c_sources" = x; then
+ fi
+ 
+ grep 'IN_FILE' ${srcdir-.}/gtk.symbols | sed 's/.*(//;s/).*//' | grep __ | sort -u > expected-files
+-{ cd ${srcdir-.}; grep '^ *# *define __' $gtk_all_c_sources; } | sed 's/.*define //;s/ *$//' | sort > actual-files
++{ for f in $gtk_all_c_sources; do if test -f ${f}; then grep '^ *# *define __' ${f}; else grep '^ *# *define __' "${srcdir-.}"/${f}; fi; done } | sed 's/.*define //;s/ *$//' | sort > actual-files
+ 
+ diff expected-files actual-files && rm -f expected-files actual-files
+-- 
+1.9.3
+
diff --git a/x11-libs/gtk+/files/gtk+-2.24.31-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-2.24.31-update-icon-cache.patch
new file mode 100644
index 0000000..11dbb5e
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.24.31-update-icon-cache.patch
@@ -0,0 +1,78 @@
+From 260f94f3914ba18a256e6f1c222f643a57854e80 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sat, 9 May 2015 23:30:58 +0200
+Subject: [PATCH] Always use external gtk-update-icon-cache
+
+---
+ configure.ac                   |  8 +++-----
+ docs/reference/gtk/Makefile.am |  2 +-
+ gtk/Makefile.am                | 13 ++-----------
+ 3 files changed, 6 insertions(+), 17 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4e11b40..7ef8cb6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -913,11 +913,9 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
+ 
+ AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
+ 
+-if test $cross_compiling = yes; then
+-  AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
+-  if test x$GTK_UPDATE_ICON_CACHE = xno; then
+-    REBUILD_PNGS=#
+-  fi
++AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
++if test x$GTK_UPDATE_ICON_CACHE = xno; then
++  REBUILD_PNGS=#
+ fi
+ 
+ AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
+diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
+index c239445..60b5265 100644
+--- a/docs/reference/gtk/Makefile.am
++++ b/docs/reference/gtk/Makefile.am
+@@ -368,7 +368,7 @@ EXTRA_DIST += version.xml.in
+ 
+ if ENABLE_MAN
+ 
+-man_MANS = gtk-query-immodules-2.0.1 gtk-update-icon-cache.1 gtk-builder-convert.1
++man_MANS = gtk-query-immodules-2.0.1 gtk-builder-convert.1
+ 
+ %.1 : %.xml 
+ 	@XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index 8cc4536..a7afbf3 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -1087,8 +1087,7 @@ endif
+ # Installed tools
+ #
+ bin_PROGRAMS = \
+-	gtk-query-immodules-2.0 \
+-	gtk-update-icon-cache
++	gtk-query-immodules-2.0
+ 
+ bin_SCRIPTS = gtk-builder-convert
+ 
+@@ -1438,16 +1437,8 @@ stamp-icons: $(STOCK_ICONS)
+ 	) done 								\
+ 	&& touch stamp-icons
+ 
+-if CROSS_COMPILING
+-gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
+-else
+-gtk_update_icon_cache_program =							\
+-	   ./gtk-update-icon-cache
+-endif
+-
+ gtkbuiltincache.h: @REBUILD@ stamp-icons
+-	$(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
+-	$(gtk_update_icon_cache_program) --force --ignore-theme-index		\
++	$(GTK_UPDATE_ICON_CACHE) --force --ignore-theme-index		\
+ 	   --include-image-data							\
+ 	   --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
+ 	mv gtkbuiltincache.h.tmp gtkbuiltincache.h
+-- 
+2.10.0
+
diff --git a/x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch b/x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch
new file mode 100644
index 0000000..8913bc8
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch
@@ -0,0 +1,57 @@
+From 4588c9c6463d8958d8305caafa58ea5c263fd352 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Tue, 16 Jan 2018 09:07:38 +0100
+Subject: [PATCH] Fix libcloudproviders check
+
+Use autotools managed variables and make use of pkgconfig macros.
+---
+ configure.ac | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 24110386b4..cebe66c2e5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -349,8 +349,10 @@ AC_ARG_ENABLE(mir-backend,
+ 
+ AC_ARG_ENABLE(cloudproviders,
+               [AS_HELP_STRING([--enable-cloudproviders],
+-                              [enable libcloudproviders integration])],
+-                              [cloudproviders_set=yes])
++                              [enable libcloudproviders integration])
++              ],
++              [],
++              [enable_cloudproviders=yes])
+ 
+ if test -z "$backend_set"; then
+   if test "$platform_win32" = yes; then
+@@ -1350,17 +1352,15 @@ fi
+ # Check for libcloudproviders
+ 
+ CLOUDPROVIDER_PACKAGES=""
+-if test "x$cloudproviders_set" = "xyes"; then
+-  CLOUDPROVIDER_PACKAGES="cloudproviders >= cloudproviders_required_version"
+-  if $PKG_CONFIG --exists $CLOUDPROVIDER_PACKAGES ; then
+-    AC_DEFINE(HAVE_CLOUDPROVIDERS, [1],
+-              [Define if libcloudproviders is available]
+-              )
+-  else
+-    AC_MSG_ERROR([
+-*** libcloudproviders not found.])
+-  fi
+-fi
++AS_IF([test "$enable_cloudproviders" = "yes"],
++      [
++          CLOUDPROVIDER_PACKAGES="cloudproviders >= cloudproviders_required_version"
++          PKG_CHECK_EXISTS(
++              [$CLOUDPROVIDER_PACKAGES],
++              [AC_DEFINE(HAVE_CLOUDPROVIDERS, [1], [Define if libcloudproviders is available])],
++              [AC_MSG_ERROR([*** libcloudproviders not found])]
++          )
++      ])
+ 
+ CFLAGS="$saved_cflags"
+ LDFLAGS="$saved_ldflags"
+-- 
+2.15.1
+
diff --git a/x11-libs/gtk+/files/gtk+-3.22.30.atk-bridge.patch b/x11-libs/gtk+/files/gtk+-3.22.30.atk-bridge.patch
new file mode 100644
index 0000000..363eac1
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.22.30.atk-bridge.patch
@@ -0,0 +1,62 @@
+$NetBSD: patch-configure.ac,v 1.2 2014/09/08 12:06:48 wiz Exp $
+
+Make gtk3-atk-bridge an option to avoid unwanted dbus dependency.
+
+--- 1/configure.ac
++++ 2/configure.ac
+@@ -1393,8 +1393,13 @@ AC_SUBST(GDK_DEP_CFLAGS)
+ # Check for Accessibility Toolkit flags
+ ########################################
+ 
+-if test x$enable_x11_backend = xyes; then
++AC_ARG_WITH(atk-bridge,
++           AS_HELP_STRING([--without-atk-bridge], [Do not use atk-bridge-2.0]),
++           :, with_atk_bridge=yes)
++
++if test x$enable_x11_backend = xyes -a x$with_atk_bridge = xyes; then
+    ATK_PACKAGES="atk atk-bridge-2.0"
++   AC_DEFINE([HAVE_ATK_BRIDGE], [1], [Define if we're using atk-bridge-2.0])
+ else
+    ATK_PACKAGES="atk"
+ fi
+$NetBSD: patch-config.h.in,v 1.2 2014/09/08 12:06:48 wiz Exp $
+
+Make gtk3-atk-bridge an option to avoid unwanted dbus dependency.
+
+--- 1/config.h.in
++++ 1/config.h.in
+@@ -10,6 +10,9 @@
+ /* Disable deprecation warnings from glib */
+ #undef GLIB_DISABLE_DEPRECATION_WARNINGS
+ 
++/* Define if we're using atk-bridge-2.0 */
++#undef HAVE_ATK_BRIDGE
++
+ /* Define to 1 if you have the `bind_textdomain_codeset' function. */
+ #undef HAVE_BIND_TEXTDOMAIN_CODESET
+ 
+Make gtk3-atk-bridge an option to avoid unwanted dbus dependency.
+--- 1/gtk/a11y/gtkaccessibility.c
++++ 1/gtk/a11y/gtkaccessibility.c
+@@ -38,8 +38,10 @@
+ #include <gtk/gtkaccessible.h>
+ 
+ #ifdef GDK_WINDOWING_X11
++#ifdef HAVE_ATK_BRIDGE
+ #include <atk-bridge.h>
+ #endif
++#endif
+ 
+ static gboolean gail_focus_watcher      (GSignalInvocationHint *ihint,
+                                          guint                  n_param_values,
+@@ -989,8 +991,10 @@ _gtk_accessibility_init (void)
+   do_window_event_initialization ();
+ 
+ #ifdef GDK_WINDOWING_X11
++#ifdef HAVE_ATK_BRIDGE
+   atk_bridge_adaptor_init (NULL, NULL);
+ #endif
++#endif
+ 
+   atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL);
+ }
diff --git a/x11-libs/gtk+/files/gtk+-3.24.8-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.24.8-update-icon-cache.patch
new file mode 100644
index 0000000..6fcbb5c
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.24.8-update-icon-cache.patch
@@ -0,0 +1,138 @@
+From 87693de873b15194b122e98438b3bc1bf37f6d0b Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Tue, 1 Nov 2016 15:24:22 +0100
+Subject: [PATCH] Always use external gtk-update-icon-cache
+
+Check for gtk-update-icon-cache to install demos, otherwise it is not
+used when building.
+---
+ configure.ac                     |  2 ++
+ demos/gtk-demo/Makefile.am       |  2 +-
+ demos/widget-factory/Makefile.am |  2 +-
+ docs/reference/gtk/Makefile.am   |  1 -
+ gtk/Makefile.am                  | 44 --------------------------------
+ 5 files changed, 4 insertions(+), 47 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f700616649..e3604fef05 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1003,6 +1003,8 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
+ 
+ AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
+ 
++AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, [gtk-update-icon-cache], [no])
++
+ ########################################
+ # Windowing system checks
+ ########################################
+diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
+index c8529e5bf7..b2924fc081 100644
+--- a/demos/gtk-demo/Makefile.am
++++ b/demos/gtk-demo/Makefile.am
+@@ -171,7 +171,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-demo.png data/32x32/gtk3-demo-symbolic.sy
+ dist_appsicon48_DATA = data/48x48/gtk3-demo.png data/48x48/gtk3-demo-symbolic.symbolic.png
+ dist_appsicon256_DATA = data/256x256/gtk3-demo.png data/256x256/gtk3-demo-symbolic.symbolic.png
+ 
+-update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
++update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force
+ 
+ install-data-hook: install-update-icon-cache
+ uninstall-hook: uninstall-update-icon-cache
+diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am
+index 62c156aa09..7aad079dcd 100644
+--- a/demos/widget-factory/Makefile.am
++++ b/demos/widget-factory/Makefile.am
+@@ -47,7 +47,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png data/32x32/gtk3-widget
+ dist_appsicon48_DATA = data/48x48/gtk3-widget-factory.png data/48x48/gtk3-widget-factory-symbolic.symbolic.png
+ dist_appsicon256_DATA = data/256x256/gtk3-widget-factory.png data/256x256/gtk3-widget-factory-symbolic.symbolic.png
+ 
+-update_icon_cache = $(top_builddir)/gtk/gtk-update-icon-cache$(EXEEXT) --ignore-theme-index --force
++update_icon_cache = $(GTK_UPDATE_ICON_CACHE) --ignore-theme-index --force
+ 
+ install-data-hook: install-update-icon-cache
+ uninstall-hook: uninstall-update-icon-cache
+diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
+index abdea7fb59..0ee826c31e 100644
+--- a/docs/reference/gtk/Makefile.am
++++ b/docs/reference/gtk/Makefile.am
+@@ -502,7 +502,6 @@ EXTRA_DIST += version.xml.in gtk3.types.in
+ 
+ man_MANS = 				\
+ 	gtk-query-immodules-3.0.1	\
+-	gtk-update-icon-cache.1		\
+ 	gtk-encode-symbolic-svg.1	\
+ 	gtk-launch.1			\
+ 	gtk3-demo.1			\
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index e556e9d3af..4d7973f3b1 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -1653,7 +1653,6 @@ endif
+ #
+ bin_PROGRAMS = \
+ 	gtk-query-immodules-3.0	\
+-	gtk-update-icon-cache \
+ 	gtk-encode-symbolic-svg \
+ 	gtk-builder-tool \
+ 	gtk-query-settings \
+@@ -1666,9 +1665,6 @@ gtk_query_immodules_3_0_LDADD = 		\
+ 	$(GMODULE_LIBS)				\
+ 	$(GTK_DEP_LIBS)
+ 
+-gtk_update_icon_cache_SOURCES = updateiconcache.c
+-gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
+-
+ gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c
+ gtk_encode_symbolic_svg_LDADD =			\
+ 	$(GDK_PIXBUF_LIBS)			\
+@@ -1693,46 +1689,6 @@ gtk_launch_LDADD =				\
+ 	$(top_builddir)/gdk/libgdk-3.la		\
+ 	$(GTK_DEP_LIBS)
+ 
+-if OS_WIN32
+-
+-# Workaround for UAC silliness: programs with "update" in their name
+-# are believed to be installers and require elevated privileges to be
+-# used... Embed a manifest file into executable to tell Windows that
+-# gtk-update-icon-cache.exe doesn't require any special privileges.
+-
+-GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
+-GTK_UPDATE_ICON_CACHE_RC = gtk-update-icon-cache.rc
+-GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT = gtk-update-icon-cache_manifest.o
+-
+-$(GTK_UPDATE_ICON_CACHE_MANIFEST):
+-	(echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' ; \
+-	 echo '<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">' ; \
+-	 echo '  <assemblyIdentity version="1.0.0.0"' ; \
+-	 echo '     processorArchitecture="'$(EXE_MANIFEST_ARCHITECTURE)'"' ; \
+-	 echo '     name="gtk-update-icon-cache.exe"' ; \
+-	 echo '     type="win32"/>' ; \
+-	 echo '  <!-- Identify the application security requirements. -->' ; \
+-	 echo '  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">' ; \
+-	 echo '    <security>' ; \
+-	 echo '      <requestedPrivileges>' ; \
+-	 echo '        <requestedExecutionLevel' ; \
+-	 echo '          level="asInvoker"' ; \
+-	 echo '          uiAccess="false"/>' ; \
+-	 echo '        </requestedPrivileges>' ; \
+-	 echo '       </security>' ; \
+-	 echo '  </trustInfo>' ; \
+-	 echo '</assembly>' ) >$@
+-
+-$(GTK_UPDATE_ICON_CACHE_RC):
+-	(echo -e '#include <winuser.h>\nCREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST '$(GTK_UPDATE_ICON_CACHE_MANIFEST)) >$@
+-
+-$(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT): $(GTK_UPDATE_ICON_CACHE_RC) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
+-	$(WINDRES) --input $< --output $@ --output-format=coff
+-
+-gtk_update_icon_cache_LDADD += $(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT)
+-
+-endif
+-
+ .PHONY: files
+ 
+ files:
+-- 
+2.17.0
+
diff --git a/x11-libs/gtk+/files/gtkrc b/x11-libs/gtk+/files/gtkrc
new file mode 100644
index 0000000..8d17834
--- /dev/null
+++ b/x11-libs/gtk+/files/gtkrc
@@ -0,0 +1,39 @@
+style "default"
+
+{
+ font = "-*-lucida-medium-r-normal-*-*-100-*-*-*-*-*-*"
+}
+
+style "button" = "default"
+
+{ 
+ bg[PRELIGHT] = { 0.7, 0.7, 0.9 }
+}
+
+style "treeitem"
+{
+bg[ACTIVE] = { 0.7, 0.7, 0.9 }
+}
+
+style "scrollbar" = "button" 
+{
+ bg[ACTIVE] = {0.6, 0.6, 0.6 }
+}
+
+style "status" {
+ bg[PRELIGHT] = { 0.3, 1.0, 0.3 }
+}
+
+style "gtk-tooltips" {
+ bg[NORMAL] = "#ffff60"
+}
+
+class "GtkWidget" style "default" 
+class "GtkButton" style "button"
+class "GtkItem" style "button"
+class "GtkProgressBar" style "status"
+class "GtkScrollbar" style "scrollbar"
+class "GtkTreeItem" style "treeitem"
+widget "gtk-tooltips" style "gtk-tooltips"
+
+
diff --git a/x11-libs/gtk+/files/settings.ini b/x11-libs/gtk+/files/settings.ini
new file mode 100644
index 0000000..a65c0a8
--- /dev/null
+++ b/x11-libs/gtk+/files/settings.ini
@@ -0,0 +1,4 @@
+[Settings]
+gtk-theme-name = Adwaita
+gtk-icon-theme-name = gnome
+gtk-cursor-theme-name = Adwaita
diff --git a/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
new file mode 100644
index 0000000..d409d78
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.24.32-r1.ebuild
@@ -0,0 +1,306 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit eutils flag-o-matic gnome2 multilib multilib-minimal readme.gentoo-r1 virtualx
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="https://www.gtk.org/"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset-r1.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+IUSE="aqua cups examples +introspection test vim-syntax xinerama"
+REQUIRED_USE="
+	xinerama? ( !aqua )
+"
+
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# Upstream wants us to do their job:
+# https://bugzilla.gnome.org/show_bug.cgi?id=768663#c1
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-libs/atk-2.10.0[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+	>=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,${MULTILIB_USEDEP}]
+	>=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
+	>=x11-libs/pango-1.36.3[introspection?,${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+
+	cups? ( >=net-print/cups-1.7.1-r2:=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	!aqua? (
+		>=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,X,${MULTILIB_USEDEP}]
+		>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
+		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
+		xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
+	)
+"
+# docbook-4.1.2 and xsl required for man pages
+# docbook-4.3 required for gtk-doc
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/libxslt
+	dev-libs/gobject-introspection-common
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.20
+	>=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+	!aqua? ( x11-base/xorg-proto )
+	test? (
+		x11-themes/hicolor-icon-theme
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )
+"
+
+# gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0
+# Add blocker against old gtk-builder-convert to be sure we maintain both
+# in sync.
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-update-icon-cache-2
+	!<gnome-base/gail-1000
+	!<dev-util/gtk-builder-convert-${PV}
+	!<x11-libs/vte-0.28.2-r201:0
+	>=x11-themes/adwaita-icon-theme-3.14
+	x11-themes/gnome-themes-standard
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+	x11-themes/gtk-engines-adwaita
+	gnome-base/librsvg[${MULTILIB_USEDEP}]
+	vim-syntax? ( app-vim/gtk-syntax )
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To make the gtk2 file chooser use 'current directory' mode by default,
+edit ~/.config/gtk-2.0/gtkfilechooser.ini to contain the following:
+[Filechooser Settings]
+StartupMode=cwd"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gtk-query-immodules-2.0$(get_exeext)
+)
+
+PATCHES=(
+	# Fix tests running when building out of sources, bug #510596, upstream bug #730319
+	"${FILESDIR}"/${PN}-2.24.24-out-of-source.patch
+	# Rely on split gtk-update-icon-cache package, bug #528810
+	"${FILESDIR}"/${PN}-2.24.31-update-icon-cache.patch # requires eautoreconf
+	# Upstream gtk-2-24 branch up to 2018-09-08 state, bug #650536 safety
+	"${WORKDIR}"/patches/ # requires eautoreconf
+)
+
+strip_builddir() {
+	local rule=$1
+	shift
+	local directory=$1
+	shift
+	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+		|| die "Could not strip director ${directory} from build."
+}
+
+set_gtk2_confdir() {
+	# An arch specific config directory is used on multilib systems
+	GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+}
+
+src_prepare() {
+	# Various glib marshaller churn could break build against a different glib version, force regeneration
+	rm -v gdk/gdkmarshalers.{c,h} gtk/gtkmarshal.{c,h} gtk/gtkmarshalers.{c,h} \
+		perf/marshalers.{c,h} gtk/gtkaliasdef.c gtk/gtkalias.h || die
+
+	# Stop trying to build unmaintained docs, bug #349754, upstream bug #623150
+	strip_builddir SUBDIRS tutorial docs/Makefile.{am,in}
+	strip_builddir SUBDIRS faq docs/Makefile.{am,in}
+
+	# -O3 and company cause random crashes in applications, bug #133469
+	replace-flags -O3 -O2
+	strip-flags
+
+	if ! use test ; then
+		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+		strip_builddir SUBDIRS tests gdk/Makefile.{am,in} gtk/Makefile.{am,in}
+	else
+		# 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"
+
+		# Cannot work because glib is too clever to find real user's home
+		# gentoo bug #285687, upstream bug #639832
+		# XXX: /!\ Pay extra attention to second sed when bumping /!\
+		sed '/TEST_PROGS.*recentmanager/d' -i gtk/tests/Makefile.am \
+			|| die "failed to disable recentmanager test (1)"
+		sed '/^TEST_PROGS =/,+3 s/recentmanager//' -i gtk/tests/Makefile.in \
+			|| die "failed to disable recentmanager test (2)"
+		sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \
+			|| die "failed to disable recentmanager test (3)"
+
+		# https://bugzilla.gnome.org/show_bug.cgi?id=617473
+		sed -i -e 's:pltcheck.sh:$(NULL):g' \
+			gtk/Makefile.am || die
+
+		# UI tests require immodules already installed; bug #413185
+		if ! has_version 'x11-libs/gtk+:2'; then
+			ewarn "Disabling UI tests because this is the first install of"
+			ewarn "gtk+:2 on this machine. Please re-run the tests after $P"
+			ewarn "has been installed."
+			sed '/g_test_add_func.*ui-tests/ d' \
+				-i gtk/tests/testing.c || die "sed 2 failed"
+		fi
+	fi
+
+	if ! use examples; then
+		# don't waste time building demos
+		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+	fi
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	[[ ${ABI} == ppc64 ]] && append-flags -mminimal-toc
+
+	ECONF_SOURCE=${S} \
+	gnome2_src_configure \
+		$(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \
+		$(usex aqua "" --with-xinput) \
+		$(use_enable cups cups auto) \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable xinerama) \
+		--disable-papi \
+		--enable-man \
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		local d
+		for d in gdk gtk libgail-util; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	virtx emake check
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	# see bug #133241
+	# Also set more default variables in sync with gtk3 and other distributions
+	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
+	echo 'gtk-theme-name = "Adwaita"' >> "${T}/gtkrc"
+	echo 'gtk-icon-theme-name = "Adwaita"' >> "${T}/gtkrc"
+	echo 'gtk-cursor-theme-name = "Adwaita"' >> "${T}/gtkrc"
+
+	insinto /usr/share/gtk-2.0
+	doins "${T}"/gtkrc
+
+	einstalldocs
+
+	# dev-util/gtk-builder-convert split off into a separate package, #402905
+	rm "${ED}"usr/bin/gtk-builder-convert || die
+	rm "${ED}"usr/share/man/man1/gtk-builder-convert.* || die
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make immodules.cache belongs to gtk+ alone
+		local cache="usr/$(get_libdir)/gtk-2.0/2.10.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_gtk2 \
+			|| die "Update immodules cache failed (for ${ABI})"
+	}
+	multilib_parallel_foreach_abi multilib_pkg_postinst
+
+	set_gtk2_confdir
+
+	if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
+		elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
+		elog "aware location. Removing deprecated file."
+		rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules
+	fi
+
+	if [ -e "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" ]; then
+		elog "File /etc/gtk-2.0/gtk.immodules has been moved to"
+		elog "${EROOT%/}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
+		elog "Removing deprecated file."
+		rm -f ${EROOT%/}${GTK2_CONFDIR}/gtk.immodules
+	fi
+
+	# pixbufs are now handled by x11-libs/gdk-pixbuf
+	if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
+		elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
+		elog "Removing deprecated file."
+		rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders
+	fi
+
+	# two checks needed since we dropped multilib conditional
+	if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
+		elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
+		elog "Removing deprecated file."
+		rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders
+	fi
+
+	if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then
+		elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]*
+		elog "to do that you can use qfile from portage-utils:"
+		elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
+	fi
+
+	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 gtkrc."
+	fi
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+	fi
+}
diff --git a/x11-libs/gtk+/gtk+-3.24.22.ebuild b/x11-libs/gtk+/gtk+-3.24.22.ebuild
new file mode 100644
index 0000000..c5b3f38
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.24.22.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit flag-o-matic gnome2 multilib virtualx multilib-minimal
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+IUSE="aqua atk-bridge broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	xinerama? ( X )
+"
+
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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"
+
+# FIXME: introspection data is built against system installation of gtk+:3,
+# bug #????
+COMMON_DEPEND="
+	>=dev-libs/atk-2.15[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/libepoxy-1.4[X(+)?,${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.41.0[introspection?,${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-0.9:=
+	x11-misc/shared-mime-info
+
+	cloudprint? (
+		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
+		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
+	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:= )
+	wayland? (
+		>=dev-libs/wayland-1.14.91[${MULTILIB_USEDEP}]
+		>=dev-libs/wayland-protocols-1.14
+		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
+	)
+	X? (
+		atk-bridge? ( >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}] )
+		media-libs/mesa[X(+),${MULTILIB_USEDEP}]
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+		x11-libs/libXdamage[${MULTILIB_USEDEP}]
+		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.1.2
+	dev-libs/libxslt
+	dev-libs/gobject-introspection-common
+	>=dev-util/gdbus-codegen-2.48
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.20
+	gtk-doc? ( >=dev-util/gtk-doc-1.20
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )
+	test? (
+		media-fonts/font-misc-misc
+		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
+RDEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-update-icon-cache-3
+	!<gnome-base/gail-1000
+	!<x11-libs/vte-0.31.0:2.90
+"
+# 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 )
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gtk-query-immodules-3.0$(get_exeext)
+)
+
+strip_builddir() {
+	local rule=$1
+	shift
+	local directory=$1
+	shift
+	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+		|| die "Could not strip director ${directory} from build."
+}
+
+src_prepare() {
+	if ! use test ; then
+		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
+
+		# the tests dir needs to be build now because since commit
+		# 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
+		# strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+	fi
+
+	if ! use examples; then
+		# don't waste time building demos
+		strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+		strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
+	fi
+
+	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
+	eapply "${FILESDIR}"/${PN}-3.24.8-update-icon-cache.patch
+
+	# Fix broken autotools logic
+	eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
+
+	# get rid of gtk3-atk-bridge if not wanted
+	if ! use atk-bridge; then
+		eapply "${FILESDIR}"/${PN}-3.22.30.atk-bridge.patch
+	fi
+
+	gnome2_src_prepare
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(use_enable aqua quartz-backend)
+		$(use_enable broadway broadway-backend)
+		$(use_enable cloudprint)
+		$(use_enable colord)
+		$(use_enable cups cups auto)
+		$(multilib_native_use_enable gtk-doc)
+		$(multilib_native_use_enable introspection)
+		$(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)
+		$(use_with atk-bridge)
+		# cloudprovider is not packaged in Gentoo yet
+		--disable-cloudproviders
+		--disable-papi
+		# sysprof integration needs >=sysprof-3.33.2
+		--disable-profiler
+		--enable-man
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog
+		# need libdir here to avoid a double slash in a path that libtool doesn't
+		# grok so well during install (// between $EPREFIX and usr ...)
+		# TODO: Is this still the case?
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+	)
+
+	if use wayland; then
+		myconf+=(
+			# Include wayland immodule into gtk itself, to avoid problems like
+			# https://gitlab.gnome.org/GNOME/gnome-shell/issues/109 from a
+			# user overridden GTK_IM_MODULE envvar
+			--with-included-immodules=wayland
+		)
+	fi;
+
+	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
+
+	# work-around gtk-doc out-of-source brokedness
+	if multilib_is_native_abi; then
+		local d
+		for d in gdk gtk libgail-util; do
+			ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+		done
+	fi
+}
+
+multilib_src_test() {
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+	GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx emake check
+}
+
+multilib_src_install() {
+	gnome2_src_install
+}
+
+multilib_src_install_all() {
+	insinto /etc/gtk-3.0
+	doins "${FILESDIR}"/settings.ini
+	# Skip README.{in,commits,win32} that would get installed by default
+	DOCS=( AUTHORS ChangeLog NEWS README )
+	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
new file mode 100644
index 0000000..67e91d3
--- /dev/null
+++ b/x11-libs/gtk+/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gtw@gnu.org</email>
+	</maintainer>
+	<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="atk-bridge">Enable the accessibility toolkit dbus bridge.</flag>
+		<flag name="broadway">Enable the GDK Broadway backend.</flag>
+		<flag name="cloudprint">Enable printing via Google Cloud Print.</flag>
+		<flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management
+			in printing</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gtk:gtk%2B</remote-id>
+	</upstream>
+</pkgmetadata>