x11-libs/gtk+ : version bump

6 files changed, 138 insertions, 166 deletions

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 3caf8e34..c0d90bc5 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,3 +1,2 @@
-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.20.tar.xz 22726768 BLAKE2B 75daa850275d55758503fa98055ca4deb9adca172e0f38c39ca4d5e7f8179398ca8753a759b0d3afc1ad1712ac6e3aa2cc1bce29e2a8fff4198a7f2d70002b11 SHA512 bda8eeacf721afcff4565756fe45857cbf8b053494d1d747ca9b97c899e9fe21fddef6871ecd5ec9a7a0f87b0a3ede2f9d6b5e5712de10a845100d82464a4556
+DIST gtk+-2.24.33.tar.xz 12661828 BLAKE2B f3488b220aaee54bf36fa77e2112d060152e57938845d240014a7d43a5743b1d4de19cc09c683d9d238fd1967cd67cc3c493f2475e4e481f6709f5cdc652c65c SHA512 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5
+DIST gtk+-3.24.29.tar.xz 21396876 BLAKE2B 1675e54b185d813965a6279fa80a62784fc6216408710fad0b07a3300eb08301c80779e6e3a6b1109ce29bacca4e7ff4710b670a68ec0c6ffa68e44cfb07ccc5 SHA512 00f71024686c2d11d5c0cdd683365c35fe4d28b5eaad4937e79690777500788818faa5bd0c483e54ba8ce734aa6411388a39e398dc638cfcf0ec0e542aae6c2b
diff --git a/x11-libs/gtk+/files/3.24.4-more-gtkswitch-fallback.patch b/x11-libs/gtk+/files/3.24.4-more-gtkswitch-fallback.patch
deleted file mode 100644
index 629a2d75..00000000
--- a/x11-libs/gtk+/files/3.24.4-more-gtkswitch-fallback.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6a4ce55a69c5ecbbf06bc905ac0bfdd04f64bb66 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Wed, 23 Jan 2019 12:02:27 -0500
-Subject: [PATCH] switch: Avoid problems with glyph availability
-
-If none of the glyphs we want are available, fall
-back to using empty strings here, rather than causing
-critical warnings.
----
- gtk/gtkswitch.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c
-index 1d42f572a9..4c49e243ed 100644
---- a/gtk/gtkswitch.c
-+++ b/gtk/gtkswitch.c
-@@ -302,12 +302,14 @@ gtk_switch_create_pango_layouts (GtkSwitch *self)
-   const char *on_glyphs[] = {
-     "⏽", /* U+23FD POWER ON SYMBOL */
-     "❙", /* U+2759 MEDIUM VERTICAL BAR */
-+    ""
-   };
- 
-   /* Glyphs for the OFF state, in descending order of preference */
-   const char *off_glyphs[] = {
-     "⭘", /* U+2B58 HEAVY CIRCLE */
-     "○", /* U+25CB WHITE CIRCLE */
-+    ""
-   };
-   int i;
- 
--- 
-2.17.0
-
diff --git a/x11-libs/gtk+/files/gtk+-2.24.33-respect-NM.patch b/x11-libs/gtk+/files/gtk+-2.24.33-respect-NM.patch
new file mode 100644
index 00000000..0c74d962
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.24.33-respect-NM.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/725852
+--- a/configure.ac
++++ b/configure.ac
+@@ -190,7 +190,7 @@ m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
+ AC_SYS_LARGEFILE
+ 
+ AM_PROG_AS
+-AC_PATH_TOOL(NM, nm, nm)
++AC_CHECK_TOOL(NM, nm, nm)
+ 
+ dnl Initialize maintainer mode
+ AM_MAINTAINER_MODE([enable])
diff --git a/x11-libs/gtk+/files/gtk+-3.24.8-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.24.25-update-icon-cache.patch
index 6fcbb5c0..a648ba40 100644
--- a/x11-libs/gtk+/files/gtk+-3.24.8-update-icon-cache.patch
+++ b/x11-libs/gtk+/files/gtk+-3.24.25-update-icon-cache.patch
@@ -1,4 +1,4 @@
-From 87693de873b15194b122e98438b3bc1bf37f6d0b Mon Sep 17 00:00:00 2001
+From ce23725d2b25b61a4eec8db0899d49d5a9dbcc6d 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
@@ -10,14 +10,14 @@ used when building.
  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(-)
+ gtk/Makefile.am                  | 27 ---------------------------
+ 5 files changed, 4 insertions(+), 30 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index f700616649..e3604fef05 100644
+index 36dda2ebaf..df9d9b0e9b 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
+@@ -974,6 +974,8 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
  
  AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
  
@@ -27,10 +27,10 @@ index f700616649..e3604fef05 100644
  # Windowing system checks
  ########################################
 diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
-index c8529e5bf7..b2924fc081 100644
+index 4a2f827469..369ba5d3cc 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
+@@ -174,7 +174,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
  
@@ -40,7 +40,7 @@ index c8529e5bf7..b2924fc081 100644
  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
+index c33a6d0a95..291f389f53 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
@@ -53,10 +53,10 @@ index 62c156aa09..7aad079dcd 100644
  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
+index dc9b80c6c5..bcaa4032c9 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
+@@ -502,7 +502,6 @@ EXTRA_DIST += version.xml.in gtk3.types.in getting_started.xml.in
  
  man_MANS = 				\
  	gtk-query-immodules-3.0.1	\
@@ -65,10 +65,10 @@ index abdea7fb59..0ee826c31e 100644
  	gtk-launch.1			\
  	gtk3-demo.1			\
 diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index e556e9d3af..4d7973f3b1 100644
+index 9608ab3355..74792a4b40 100644
 --- a/gtk/Makefile.am
 +++ b/gtk/Makefile.am
-@@ -1653,7 +1653,6 @@ endif
+@@ -1658,7 +1658,6 @@ endif
  #
  bin_PROGRAMS = \
  	gtk-query-immodules-3.0	\
@@ -76,7 +76,7 @@ index e556e9d3af..4d7973f3b1 100644
  	gtk-encode-symbolic-svg \
  	gtk-builder-tool \
  	gtk-query-settings \
-@@ -1666,9 +1665,6 @@ gtk_query_immodules_3_0_LDADD = 		\
+@@ -1671,9 +1670,6 @@ gtk_query_immodules_3_0_LDADD = 		\
  	$(GMODULE_LIBS)				\
  	$(GTK_DEP_LIBS)
  
@@ -86,7 +86,7 @@ index e556e9d3af..4d7973f3b1 100644
  gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c
  gtk_encode_symbolic_svg_LDADD =			\
  	$(GDK_PIXBUF_LIBS)			\
-@@ -1693,46 +1689,6 @@ gtk_launch_LDADD =				\
+@@ -1698,29 +1694,6 @@ gtk_launch_LDADD =				\
  	$(top_builddir)/gdk/libgdk-3.la		\
  	$(GTK_DEP_LIBS)
  
@@ -101,27 +101,10 @@ index e556e9d3af..4d7973f3b1 100644
 -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_MANIFEST): Makefile generate-uac-manifest.py
+-	$(PYTHON) $(srcdir)/generate-uac-manifest.py -p=gtk3 -n=gtk-update-icon-cache --pkg-version=$(GTK_VERSION) --output-dir=$(builddir)
 -
--$(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_RC): $(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
@@ -134,5 +117,5 @@ index e556e9d3af..4d7973f3b1 100644
  
  files:
 -- 
-2.17.0
+2.30.0
 
diff --git a/x11-libs/gtk+/gtk+-2.24.32-r314.ebuild b/x11-libs/gtk+/gtk+-2.24.33-r10.ebuild
index f4d576a0..536b0ced 100644
--- a/x11-libs/gtk+/gtk+-2.24.32-r314.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.33-r10.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-GNOME2_LA_PUNT="yes"
+EAPI=7
 GNOME2_EAUTORECONF="yes"
 
-inherit eutils flag-o-matic gnome2 multilib multilib-minimal readme.gentoo-r1 virtualx
+inherit 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"
@@ -18,7 +16,7 @@ REQUIRED_USE="
 	xinerama? ( !aqua )
 "
 
-KEYWORDS="amd64 arm64"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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
@@ -28,6 +26,7 @@ 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}]
+	virtual/libintl[${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}]
@@ -37,35 +36,25 @@ COMMON_DEPEND="
 	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/libXcursor-1.1.14[${MULTILIB_USEDEP}]
 		>=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrender-0.9.8[${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-0-r1
 	!aqua? ( x11-base/xorg-proto )
 	test? (
-		x11-themes/hicolor-icon-theme
+		media-fonts/font-cursor-misc
 		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )
+		x11-themes/hicolor-icon-theme
+	)
 "
 
 # gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0
@@ -73,17 +62,30 @@ DEPEND="${COMMON_DEPEND}
 # 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
+	!<dev-util/gtk-builder-convert-${PV}
 "
 # librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
 PDEPEND="
-	x11-themes/gtk-engines-adwaita
 	gnome-base/librsvg[${MULTILIB_USEDEP}]
+	x11-themes/gtk-engines-adwaita
 	vim-syntax? ( app-vim/gtk-syntax )
 "
+# docbook-4.1.2 and xsl required for man pages
+# docbook-4.3 required for gtk-doc
+BDEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xml-dtd:4.3
+	app-text/docbook-xsl-stylesheets
+	dev-libs/gobject-introspection-common
+	dev-libs/libxslt
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.20
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+	examples? ( x11-libs/gdk-pixbuf )
+"
 
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="To make the gtk2 file chooser use 'current directory' mode by default,
@@ -100,8 +102,8 @@ PATCHES=(
 	"${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
+	# Respect ${NM}, bug #725852
+	"${FILESDIR}"/${PN}-2.24.33-respect-NM.patch # requires eautoreconf
 )
 
 strip_builddir() {
@@ -157,7 +159,7 @@ src_prepare() {
 		# 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 "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"
@@ -209,10 +211,11 @@ multilib_src_install_all() {
 	newins "${FILESDIR}"/gtkrc-2.0 gtkrc
 
 	einstalldocs
+	rm "${ED}"/usr/share/doc/${P}/ChangeLog # empty file
 
 	# 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
+	rm "${ED}"/usr/bin/gtk-builder-convert || die
+	rm "${ED}"/usr/share/man/man1/gtk-builder-convert.* || die
 
 	readme.gentoo_create_doc
 }
@@ -222,12 +225,12 @@ 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"
+		local cache="/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
 
-		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+		if [[ -e "${EROOT}${cache}" ]]; then
+			cp "${EROOT}${cache}" "${ED}${cache}" || die
 		else
-			touch "${ED}"/${cache} || die
+			touch "${ED}${cache}" || die
 		fi
 	}
 	multilib_parallel_foreach_abi multilib_pkg_preinst
@@ -244,35 +247,35 @@ pkg_postinst() {
 
 	set_gtk2_confdir
 
-	if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
+	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
+		rm -f "${EROOT}/etc/gtk-2.0/gtk.immodules"
 	fi
 
-	if [ -e "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" ]; then
+	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 "${EROOT}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
 		elog "Removing deprecated file."
-		rm -f ${EROOT%/}${GTK2_CONFDIR}/gtk.immodules
+		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"
+	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
+		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"
+	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
+		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]*
+	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
@@ -291,7 +294,7 @@ 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
+			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.20-r314.ebuild b/x11-libs/gtk+/gtk+-3.24.29-r10.ebuild
index 9a806a2d..b98e6b84 100644
--- a/x11-libs/gtk+/gtk+-3.24.20-r314.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.29-r10.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-GNOME2_LA_PUNT="yes"
+EAPI=7
 GNOME2_EAUTORECONF="yes"
 
-inherit flag-o-matic gnome2 multilib virtualx multilib-minimal
+inherit gnome2 multilib multilib-minimal virtualx
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="3"
-IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama"
+IUSE="aqua broadway cloudprint 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 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
@@ -27,65 +26,57 @@ 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/atk-2.32.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-0.9:=
 	>=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.41.0[introspection?,${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-0.9:=
 	x11-misc/shared-mime-info
 
 	cloudprint? (
+		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}]
 		>=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:= )
+	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.14
+		>=dev-libs/wayland-protocols-1.17
 		media-libs/mesa[wayland,${MULTILIB_USEDEP}]
 		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
 	)
 	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+		>=app-accessibility/at-spi2-atk-2.15.1[${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/libXcursor[${MULTILIB_USEDEP}]
 		x11-libs/libXdamage[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.5[${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-cursor-misc
 		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )
+	)
+	X? ( x11-base/xorg-proto )
 "
 # 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
@@ -94,11 +85,36 @@ PDEPEND="
 	>=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=(
+	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
+	"${FILESDIR}"/${PN}-3.24.25-update-icon-cache.patch
+
+	# Fix broken autotools logic
+	"${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
+)
+
 strip_builddir() {
 	local rule=$1
 	shift
@@ -124,12 +140,6 @@ src_prepare() {
 		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
-
 	gnome2_src_prepare
 }
 
@@ -142,6 +152,7 @@ multilib_src_configure() {
 		$(use_enable cups cups auto)
 		$(multilib_native_use_enable gtk-doc)
 		$(multilib_native_use_enable introspection)
+		$(use_enable sysprof profiler)
 		$(use_enable wayland wayland-backend)
 		$(use_enable X x11-backend)
 		$(use_enable X xcomposite)
@@ -153,8 +164,6 @@ multilib_src_configure() {
 		# 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
@@ -206,12 +215,12 @@ 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"
+		local cache="/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
 
 		if [[ -e ${EROOT}${cache} ]]; then
-			cp "${EROOT}"${cache} "${ED}"/${cache} || die
+			cp "${EROOT}${cache}" "${ED}${cache}" || die
 		else
-			touch "${ED}"/${cache} || die
+			touch "${ED}${cache}" || die
 		fi
 	}
 	multilib_parallel_foreach_abi multilib_pkg_preinst
@@ -238,7 +247,7 @@ 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
+			rm -f "${EROOT}/usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
 		}
 		multilib_foreach_abi multilib_pkg_postrm
 	fi