--- ../../../gentoo/x11-libs/gtk+/gtk+-2.24.31-r1.ebuild	2017-08-26 10:07:21.000000000 -0000
+++ ../../../gentoo/x11-libs/gtk+/gtk+-2.24.31-r1.ebuild	2018-03-18 15:21:29.180059478 -0000
@@ -115,8 +115,8 @@ 
 
 src_prepare() {
 	# marshalers code was pre-generated with glib-2.31, upstream bug #662109
-	rm -v gdk/gdkmarshalers.c gtk/gtkmarshal.c gtk/gtkmarshalers.c \
-		perf/marshalers.c || die
+	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}
@@ -173,6 +173,8 @@ 
 	# Fix beep when overwriting at the end of a gtkentry, from gtk-2-24 branch
 	eapply "${FILESDIR}"/${PN}-2.24.31-fix-gtkentry-beep.patch
 
+	eapply "${FILESDIR}"/${PN}-2.24.31-fix-gtk-symbols-for-glib-2.54.3.patch
+
 	eautoreconf
 	gnome2_src_prepare
 }