Version bump as upstream bug #646609 is not a regression over 2.24.3 and doesn't look to be a major problem. Remove old.

(Portage version: 2.1.9.50/cvs/Linux x86_64)

13 files changed, 513 insertions, 768 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 4b74404f7b23..4038e68d9a1a 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.509 2011/06/02 15:30:25 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.510 2011/06/03 18:58:10 pacho Exp $
+
+*gtk+-2.24.4 (03 Jun 2011)
+
+  03 Jun 2011; Pacho Ramos <pacho@gentoo.org> -files/gtk+-2.8.0-multilib.patch,
+  -files/gtk+-2.18.5-macosx-aqua.patch,
+  -files/gtk+-2.18.9-notifications-gtkentry.patch, -gtk+-2.20.1-r1.ebuild,
+  -files/gtk+-2.20.1-GtkOffscreenWindow.patch,
+  -files/gtk+-2.20.1-darwin8.patch, -files/gtk+-2.20.1-gail_cell_type.patch,
+  -files/gtk+-2.20.1-gtkrange.patch,
+  -files/gtk+-2.20.1-libpixbufloader-warning.patch,
+  -files/gtk+-2.20.1-libpng-fix.patch, +gtk+-2.24.4.ebuild,
+  +files/gtk+-2.24.4-old-icons.patch:
+  Version bump as upstream bug #646609 is not a regression over 2.24.3 and
+  doesn't look to be a major problem. Remove old.
 
 *gtk+-3.0.10 (02 Jun 2011)
 
diff --git a/x11-libs/gtk+/files/gtk+-2.18.5-macosx-aqua.patch b/x11-libs/gtk+/files/gtk+-2.18.5-macosx-aqua.patch
deleted file mode 100644
index f13ffe65c57c..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.18.5-macosx-aqua.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-This patch touches both the Makefile.am files as well as the Makefile.in files because
-eautoreconf doesn't work properly on gtk+, for some reason.
-
---- gtk+-2.18.5.orig/demos/gtk-demo/Makefile.am
-+++ gtk+-2.18.5/demos/gtk-demo/Makefile.am
-@@ -83,6 +83,10 @@ gtk_demo_DEPENDENCIES = $(DEPS)
- gtk_demo_LDADD = $(LDADDS)
- gtk_demo_LDFLAGS = -export-dynamic
- 
-+if USE_QUARTZ
-+gtk_demo_LDFLAGS += -framework AppKit -framework Carbon
-+endif
-+
- IMAGEFILES=	alphatest.png		\
- 	        apple-red.png		\
- 		background.jpg		\
---- gtk+-2.18.5.orig/demos/gtk-demo/Makefile.in
-+++ gtk+-2.18.5/demos/gtk-demo/Makefile.in
-@@ -40,6 +40,7 @@ host_triplet = @host@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- 	$(srcdir)/geninclude.pl.in $(top_srcdir)/Makefile.decl
- bin_PROGRAMS = gtk-demo$(EXEEXT)
-+@USE_QUARTZ_TRUE@am__append_1 = -framework AppKit -framework Carbon
- subdir = demos/gtk-demo
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-@@ -460,7 +461,7 @@ gtk_demo_SOURCES = \
- 
- gtk_demo_DEPENDENCIES = $(DEPS)
- gtk_demo_LDADD = $(LDADDS)
--gtk_demo_LDFLAGS = -export-dynamic
-+gtk_demo_LDFLAGS = -export-dynamic $(am__append_1)
- IMAGEFILES = alphatest.png		\
- 	        apple-red.png		\
- 		background.jpg		\
---- gtk+-2.18.5.orig/demos/Makefile.am
-+++ gtk+-2.18.5/demos/Makefile.am
-@@ -28,6 +28,10 @@ noinst_PROGRAMS = 		\
- 	testpixbuf-scale 	\
- 	pixbuf-demo
- 
-+if USE_QUARTZ
-+AM_LDFLAGS = -framework AppKit -framework Carbon
-+endif
-+
- # Need to build test-inline-pixbufs.h for testpixbuf
- if HAVE_PNG
- noinst_PROGRAMS += testpixbuf
---- gtk+-2.18.5.orig/demos/Makefile.in
-+++ gtk+-2.18.5/demos/Makefile.in
-@@ -433,6 +433,7 @@ LDADDS = \
- 	$(top_builddir)/gdk/$(gdktargetlib)        			\
- 	$(top_builddir)/gtk/$(gtktargetlib)
- 
-+@USE_QUARTZ_TRUE@AM_LDFLAGS = -framework AppKit -framework Carbon
- @HAVE_PNG_TRUE@BUILT_SOURCES = test-inline-pixbufs.h
- @CROSS_COMPILING_FALSE@pixbuf_csource = GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders $(top_builddir)/gdk-pixbuf/gdk-pixbuf-csource
- @CROSS_COMPILING_TRUE@pixbuf_csource = $(GDK_PIXBUF_CSOURCE)
---- gtk+-2.18.5.orig/gtk/Makefile.am
-+++ gtk+-2.18.5/gtk/Makefile.am
-@@ -888,7 +888,7 @@ libgtk_directfb_2_0_la_SOURCES = $(gtk_c
- 
- libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts)
- libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
--libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts)
-+libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts) -framework AppKit -framework Carbon
- libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts)
- 
- libgtk_x11_2_0_la_LIBADD = $(libadd)
-@@ -901,6 +901,10 @@ libgtk_win32_2_0_la_DEPENDENCIES = $(gtk
- libgtk_quartz_2_0_la_DEPENDENCIES = $(deps)
- libgtk_directfb_2_0_la_DEPENDENCIES = $(deps)
- 
-+if USE_QUARTZ
-+AM_LDFLAGS = -framework AppKit -framework Carbon
-+endif
-+
- if USE_WIN32
- libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
- endif
---- gtk+-2.18.5.orig/gtk/Makefile.in
-+++ gtk+-2.18.5/gtk/Makefile.in
-@@ -1294,7 +1294,7 @@ libgtk_quartz_2_0_la_SOURCES = $(gtk_c_s
- libgtk_directfb_2_0_la_SOURCES = $(gtk_c_sources)
- libgtk_x11_2_0_la_LDFLAGS = $(libtool_opts)
- libgtk_win32_2_0_la_LDFLAGS = $(libtool_opts) -Wl,-luuid
--libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts)
-+libgtk_quartz_2_0_la_LDFLAGS = $(libtool_opts) -framework AppKit -framework Carbon
- libgtk_directfb_2_0_la_LDFLAGS = $(libtool_opts)
- libgtk_x11_2_0_la_LIBADD = $(libadd)
- libgtk_win32_2_0_la_LIBADD = $(libadd) -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
-@@ -1304,6 +1304,7 @@ libgtk_x11_2_0_la_DEPENDENCIES = $(deps)
- libgtk_win32_2_0_la_DEPENDENCIES = $(gtk_def) $(gtk_win32_res) $(deps)
- libgtk_quartz_2_0_la_DEPENDENCIES = $(deps)
- libgtk_directfb_2_0_la_DEPENDENCIES = $(deps)
-+@USE_QUARTZ_TRUE@AM_LDFLAGS = -framework AppKit -framework Carbon
- @USE_WIN32_TRUE@libgtk_target_ldflags = $(gtk_win32_res_ldflag) $(gtk_win32_symbols)
- EXTRA_LTLIBRARIES = libgtk-x11-2.0.la libgtk-win32-2.0.la libgtk-quartz-2.0.la libgtk-directfb-2.0.la
- DEPS = $(gtktargetlib) $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(top_builddir)/gdk/$(gdktargetlib)
---- gtk+-2.18.5.orig/perf/Makefile.am
-+++ gtk+-2.18.5/perf/Makefile.am
-@@ -20,6 +20,10 @@ LDADDS =								\
- 	$(top_builddir)/gdk/$(gdktargetlib)				\
- 	$(top_builddir)/gtk/$(gtktargetlib)
- 
-+if USE_QUARTZ
-+AM_LDFLAGS = -framework AppKit -framework Carbon
-+endif
-+
- noinst_PROGRAMS	= 	\
- 	testperf
- 
---- gtk+-2.18.5.orig/perf/Makefile.in
-+++ gtk+-2.18.5/perf/Makefile.in
-@@ -373,6 +373,7 @@ LDADDS = \
- 	$(top_builddir)/gdk/$(gdktargetlib)				\
- 	$(top_builddir)/gtk/$(gtktargetlib)
- 
-+@USE_QUARTZ_TRUE@AM_LDFLAGS = -framework AppKit -framework Carbon
- testperf_DEPENDENCIES = $(TEST_DEPS)
- testperf_LDADD = $(LDADDS)
- testperf_SOURCES = \
---- gtk+-2.18.5.orig/tests/Makefile.am
-+++ gtk+-2.18.5/tests/Makefile.am
-@@ -20,6 +20,10 @@ LDADDS =								\
- 	$(top_builddir)/gdk/$(gdktargetlib)				\
- 	$(top_builddir)/gtk/$(gtktargetlib)
- 
-+if USE_QUARTZ
-+AM_LDFLAGS = -framework AppKit -framework Carbon
-+endif
-+
- if USE_X11
- testsocket_programs = testsocket testsocket_child
- endif
---- gtk+-2.18.5.orig/tests/Makefile.in
-+++ gtk+-2.18.5/tests/Makefile.in
-@@ -639,6 +639,7 @@ LDADDS = \
- 	$(top_builddir)/gdk/$(gdktargetlib)				\
- 	$(top_builddir)/gtk/$(gtktargetlib)
- 
-+@USE_QUARTZ_TRUE@AM_LDFLAGS = -framework AppKit -framework Carbon
- @USE_X11_TRUE@testsocket_programs = testsocket testsocket_child
- @HAVE_CXX_TRUE@autotestkeywords_SOURCES = autotestkeywords.cc
- @HAVE_CXX_TRUE@autotestkeywords_CPPFLAGS = -I$(srcdir)/dummy-headers \
diff --git a/x11-libs/gtk+/files/gtk+-2.18.9-notifications-gtkentry.patch b/x11-libs/gtk+/files/gtk+-2.18.9-notifications-gtkentry.patch
deleted file mode 100644
index 9ce97f330308..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.18.9-notifications-gtkentry.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0fff51eab6427ca4d0ab679c1d994a2a36898a7d Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Sat, 20 Mar 2010 03:20:38 +0000
-Subject: Avoid spurious notifications from GtkEntry
-
-Using gtk_entry_set_buffer() in dispose() causes problematic
-notifications, so just get rid of the buffer manually. See bug 613241.
-(cherry picked from commit 5f29a679f8a31b6548f34179d65a39de9ec63535)
----
-diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
-index 4344449..0dafcf7 100644
---- a/gtk/gtkentry.c
-+++ b/gtk/gtkentry.c
-@@ -2425,12 +2425,19 @@ static void
- gtk_entry_dispose (GObject *object)
- {
-   GtkEntry *entry = GTK_ENTRY (object);
-+  GtkEntryPrivate *priv = GTK_ENTRY_GET_PRIVATE (entry);
- 
-   gtk_entry_set_icon_from_pixbuf (entry, GTK_ENTRY_ICON_PRIMARY, NULL);
-   gtk_entry_set_icon_tooltip_markup (entry, GTK_ENTRY_ICON_PRIMARY, NULL);
-   gtk_entry_set_icon_from_pixbuf (entry, GTK_ENTRY_ICON_SECONDARY, NULL);
-   gtk_entry_set_icon_tooltip_markup (entry, GTK_ENTRY_ICON_SECONDARY, NULL);
--  gtk_entry_set_buffer (entry, NULL);
-+
-+  if (priv->buffer)
-+    {
-+      buffer_disconnect_signals (entry);
-+      g_object_unref (priv->buffer);
-+      priv->buffer = NULL;
-+    }
- 
-   G_OBJECT_CLASS (gtk_entry_parent_class)->dispose (object);
- }
---
-cgit v0.8.3.1
diff --git a/x11-libs/gtk+/files/gtk+-2.20.1-GtkOffscreenWindow.patch b/x11-libs/gtk+/files/gtk+-2.20.1-GtkOffscreenWindow.patch
deleted file mode 100644
index 7845bfa478c5..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.20.1-GtkOffscreenWindow.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4cf1f2c55c8d27052e43da932a5d5444bf1ed1f6 Mon Sep 17 00:00:00 2001
-From: Cody Russell <bratsche@gnome.org>
-Date: Tue, 01 Jun 2010 15:32:18 +0000
-Subject: Bug 608218 - GtkOffscreenWindow causes bad window with GtkEntry
-
-We now exit early from gdk_window_register_dnd() to avoid crashing if the
-window type is GDK_WINDOW_OFFSCREEN and does not support dnd operations.
-This makes it possible to use any dnd-enabled widgets, such as GtkEntry,
-within a GtkOffscreenWindow.
----
-diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
-index 4b7fd85..c0ad26d 100644
---- a/gdk/x11/gdkdnd-x11.c
-+++ b/gdk/x11/gdkdnd-x11.c
-@@ -3879,6 +3879,9 @@ gdk_window_register_dnd (GdkWindow      *window)
- 
-   g_return_if_fail (window != NULL);
- 
-+  if (gdk_window_get_window_type (window) == GDK_WINDOW_OFFSCREEN)
-+    return;
-+
-   base_precache_atoms (display);
- 
-   if (g_object_get_data (G_OBJECT (window), "gdk-dnd-registered") != NULL)
---
-cgit v0.8.3.1
diff --git a/x11-libs/gtk+/files/gtk+-2.20.1-darwin8.patch b/x11-libs/gtk+/files/gtk+-2.20.1-darwin8.patch
deleted file mode 100644
index dca75ded1ae7..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.20.1-darwin8.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 7f2e4c38a9bd9ed30db937d9fc8b51cb87324c23 Mon Sep 17 00:00:00 2001
-From: Kristian Rietveld <kris@gtk.org>
-Date: Sun, 27 Jun 2010 08:32:12 +0000
-Subject: Move Leopard-specific type definitions to gdkquartz.h
-
-Update includes subsequently where it matters.  Fixes build on Mac OS
-X 10.4.
-
-(cherry picked from commit e634f3fbe0498afc560530d9b92eb4709d7c7f97)
----
-diff --git a/gdk/quartz/GdkQuartzView.c b/gdk/quartz/GdkQuartzView.c
-index 02018ff..2c897fb 100644
---- a/gdk/quartz/GdkQuartzView.c
-+++ b/gdk/quartz/GdkQuartzView.c
-@@ -23,6 +23,7 @@
- #include "gdkregion-generic.h"
- #include "gdkwindow-quartz.h"
- #include "gdkprivate-quartz.h"
-+#include "gdkquartz.h"
- 
- @implementation GdkQuartzView
- 
-diff --git a/gdk/quartz/gdkprivate-quartz.h b/gdk/quartz/gdkprivate-quartz.h
-index 8e9708f..11d57bf 100644
---- a/gdk/quartz/gdkprivate-quartz.h
-+++ b/gdk/quartz/gdkprivate-quartz.h
-@@ -27,6 +27,7 @@
- #include <gdk/gdkprivate.h>
- #include <gdk/quartz/gdkpixmap-quartz.h>
- #include <gdk/quartz/gdkwindow-quartz.h>
-+#include <gdk/quartz/gdkquartz.h>
- 
- #include <gdk/gdk.h>
- 
-diff --git a/gdk/quartz/gdkquartz.h b/gdk/quartz/gdkquartz.h
-index d7177fe..48c4748 100644
---- a/gdk/quartz/gdkquartz.h
-+++ b/gdk/quartz/gdkquartz.h
-@@ -26,6 +26,19 @@
- 
- G_BEGIN_DECLS
- 
-+/* NSInteger only exists in Leopard and newer.  This check has to be
-+ * done after inclusion of the system headers.  If NSInteger has not
-+ * been defined, we know for sure that we are on 32-bit.
-+ */
-+#ifndef NSINTEGER_DEFINED
-+typedef int NSInteger;
-+typedef unsigned int NSUInteger;
-+#endif
-+
-+#ifndef CGFLOAT_DEFINED
-+typedef float CGFloat;
-+#endif
-+
- NSWindow *gdk_quartz_window_get_nswindow                        (GdkWindow      *window);
- NSView   *gdk_quartz_window_get_nsview                          (GdkWindow      *window);
- NSImage  *gdk_quartz_pixbuf_to_ns_image_libgtk_only             (GdkPixbuf      *pixbuf);
-diff --git a/gdk/quartz/gdkwindow-quartz.h b/gdk/quartz/gdkwindow-quartz.h
-index cbb0fe1..4a0e27a 100644
---- a/gdk/quartz/gdkwindow-quartz.h
-+++ b/gdk/quartz/gdkwindow-quartz.h
-@@ -25,19 +25,6 @@
- #import <gdk/quartz/GdkQuartzView.h>
- #import <gdk/quartz/GdkQuartzWindow.h>
- 
--/* NSInteger only exists in Leopard and newer.  This check has to be
-- * done after inclusion of the system headers.  If NSInteger has not
-- * been defined, we know for sure that we are on 32-bit.
-- */
--#ifndef NSINTEGER_DEFINED
--typedef int NSInteger;
--typedef unsigned int NSUInteger;
--#endif
--
--#ifndef CGFLOAT_DEFINED
--typedef float CGFloat;
--#endif
--
- G_BEGIN_DECLS
- 
- /* Window implementation for Quartz
-diff --git a/gtk/gtkquartz.c b/gtk/gtkquartz.c
-index dcc8ee0..265d9ff 100644
---- a/gtk/gtkquartz.c
-+++ b/gtk/gtkquartz.c
-@@ -21,6 +21,7 @@
- #include "config.h"
- 
- #include "gtkquartz.h"
-+#include <gdk/quartz/gdkquartz.h>
- #include "gtkalias.h"
- 
- NSImage *
---
-cgit v0.8.3.1
diff --git a/x11-libs/gtk+/files/gtk+-2.20.1-gail_cell_type.patch b/x11-libs/gtk+/files/gtk+-2.20.1-gail_cell_type.patch
deleted file mode 100644
index 91c51a65e04e..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.20.1-gail_cell_type.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 5d6ebcc17703e20560d55e34c8bef87d27ef0127 Mon Sep 17 00:00:00 2001
-From: Mike Gorse <mgorse@novell.com>
-Date: Fri, 21 May 2010 14:40:46 +0000
-Subject:     Implement action interface for gailcell.
-
-    Bug #580889.
----
-diff --git a/modules/other/gail/gailbooleancell.c b/modules/other/gail/gailbooleancell.c
-index 5c86d04..0aefcfa 100644
---- a/modules/other/gail/gailbooleancell.c
-+++ b/modules/other/gail/gailbooleancell.c
-@@ -36,8 +36,7 @@ gchar *gail_boolean_cell_property_list[] = {
-   NULL
- };
- 
--G_DEFINE_TYPE_WITH_CODE (GailBooleanCell, gail_boolean_cell, GAIL_TYPE_RENDERER_CELL,
--                         gail_cell_type_add_action_interface (g_define_type_id))
-+G_DEFINE_TYPE (GailBooleanCell, gail_boolean_cell, GAIL_TYPE_RENDERER_CELL)
- 
- static void 
- gail_boolean_cell_class_init (GailBooleanCellClass *klass)
-diff --git a/modules/other/gail/gailcell.c b/modules/other/gail/gailcell.c
-index 35e531e..bc8dd13 100644
---- a/modules/other/gail/gailcell.c
-+++ b/modules/other/gail/gailcell.c
-@@ -37,7 +37,7 @@ static gint         gail_cell_get_index_in_parent (AtkObject           *obj);
- 
- /* AtkAction */
- 
--static void         gail_cell_atk_action_interface_init 
-+static void         atk_action_interface_init 
-                                                   (AtkActionIface      *iface);
- static ActionInfo * _gail_cell_get_action_info    (GailCell            *cell,
- 			                           gint                index);
-@@ -76,6 +76,7 @@ static void         gail_cell_get_extents         (AtkComponent        *componen
- static gboolean     gail_cell_grab_focus         (AtkComponent        *component);
- 
- G_DEFINE_TYPE_WITH_CODE (GailCell, gail_cell, ATK_TYPE_OBJECT,
-+                         G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)
-                          G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init))
- 
- static void	 
-@@ -285,7 +286,7 @@ gail_cell_get_index_in_parent (AtkObject *obj)
- }
- 
- static void
--gail_cell_atk_action_interface_init (AtkActionIface *iface)
-+atk_action_interface_init (AtkActionIface *iface)
- {
-   iface->get_n_actions = gail_cell_action_get_n_actions;
-   iface->do_action = gail_cell_action_do_action;
-@@ -298,14 +299,6 @@ gail_cell_atk_action_interface_init (AtkActionIface *iface)
- void
- gail_cell_type_add_action_interface (GType type)
- {
--  const GInterfaceInfo atk_action_info =
--  {
--    (GInterfaceInitFunc) gail_cell_atk_action_interface_init,
--    (GInterfaceFinalizeFunc) NULL,
--    NULL
--  };
--  g_type_add_interface_static (type, ATK_TYPE_ACTION,
--                                 &atk_action_info);
- }
- 
- gboolean
---
-cgit v0.8.3.1
diff --git a/x11-libs/gtk+/files/gtk+-2.20.1-gtkrange.patch b/x11-libs/gtk+/files/gtk+-2.20.1-gtkrange.patch
deleted file mode 100644
index 50d7c5a6fca5..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.20.1-gtkrange.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 84f88bbb1d2e12b1c582e87fa098b823e91bbf33 Mon Sep 17 00:00:00 2001
-From: Jan Arne Petersen <jap@gnome.org>
-Date: Tue, 18 May 2010 06:46:42 +0000
-Subject: GtkRange: Redraw if GtkRange is a GtkScale and value is drawn.
-
-* gtk/gtkrange.c: (gtk_range_adjustment_value_change):
-Queue the draw also if the range is a scale and the value is drawn,
-fixing bug #533946 (Markus Brinkmann), when two HScales use one
-adjustment.
----
-diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
-index 552eac7..a4fcee4 100644
---- a/gtk/gtkrange.c
-+++ b/gtk/gtkrange.c
-@@ -35,6 +35,7 @@
- #include "gtkmarshalers.h"
- #include "gtkorientable.h"
- #include "gtkrange.h"
-+#include "gtkscale.h"
- #include "gtkscrollbar.h"
- #include "gtkprivate.h"
- #include "gtkintl.h"
-@@ -2618,7 +2619,8 @@ gtk_range_adjustment_value_changed (GtkAdjustment *adjustment,
-   gtk_range_calc_layout (range, range->adjustment->value);
-   
-   /* now check whether the layout changed  */
--  if (layout_changed (range->layout, &layout))
-+  if (layout_changed (range->layout, &layout) ||
-+      (GTK_IS_SCALE (range) && GTK_SCALE (range)->draw_value))
-     {
-       gtk_widget_queue_draw (GTK_WIDGET (range));
-       /* setup a timer to ensure the range isn't lagging too much behind the scroll position */
---
-cgit v0.8.3.1
diff --git a/x11-libs/gtk+/files/gtk+-2.20.1-libpixbufloader-warning.patch b/x11-libs/gtk+/files/gtk+-2.20.1-libpixbufloader-warning.patch
deleted file mode 100644
index d2759b905d83..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.20.1-libpixbufloader-warning.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From a6c4833d9a307a1905516fb497dfaf0f141e1c0d Mon Sep 17 00:00:00 2001
-From: Javier Jardón <jjardon@gnome.org>
-Date: Tue, 04 May 2010 13:27:08 +0000
-Subject: Remove the definition of libpixbufloader_gdip_png_la_*
-
-libstatic-pixbufloader-gdip-png.la should not be built or at least not
-included in STATIC_GDIPLUS_LIBS as we don't want to use the GDI+-based
-loader for PNG, because if we do, we can't get (or was it set?) the
-options of a PNG pixbuf that for instance some code in GIMP wants to do.
-
-Fixes https://bugzilla.gnome.org/show_bug.cgi?id=607839
----
-diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
-index cf1769b..52fd710 100644
---- a/gdk-pixbuf/Makefile.am
-+++ b/gdk-pixbuf/Makefile.am
-@@ -244,9 +244,6 @@ libstatic_pixbufloader_gdip_gif_la_SOURCES = 	\
- libstatic_pixbufloader_gdip_jpeg_la_SOURCES = 	\
- 	io-gdip-jpeg.c
- 
--libstatic_pixbufloader_gdip_png_la_SOURCES = 	\
--	io-gdip-png.c
--
- libstatic_pixbufloader_gdip_tiff_la_SOURCES = 	\
- 	io-gdip-tiff.c
- 
-@@ -327,17 +324,6 @@ libpixbufloader_gdip_jpeg_la_SOURCES = 	\
- 	io-gdip-jpeg.c
- libpixbufloader_gdip_jpeg_la_LIBADD = $(module_libs) $(libole32)
- 
--libpixbufloader_gdip_png_la_LDFLAGS = -avoid-version -module -no-undefined
--libpixbufloader_gdip_png_la_SOURCES = 	\
--	io-gdip-native.h		\
--	io-gdip-propertytags.h		\
--	io-gdip-utils.h			\
--	io-gdip-utils.c			\
--	io-gdip-animation.c		\
--	io-gdip-animation.h		\
--	io-gdip-png.c
--libpixbufloader_gdip_png_la_LIBADD = $(module_libs) $(libole32)
--
- libpixbufloader_gdip_tiff_la_LDFLAGS = -avoid-version -module -no-undefined
- libpixbufloader_gdip_tiff_la_SOURCES = 	\
- 	io-gdip-native.h		\
---
-cgit v0.8.3.1
diff --git a/x11-libs/gtk+/files/gtk+-2.20.1-libpng-fix.patch b/x11-libs/gtk+/files/gtk+-2.20.1-libpng-fix.patch
deleted file mode 100644
index 5c7332777d09..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.20.1-libpng-fix.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-commit 006d5718fa927d9d3509fca1a1c1ca6522110b57
-Author: Matthias Clasen <mclasen@redhat.com>
-Date:   Wed May 12 15:02:02 2010 -0400
-
-    Another attempt to handle pngs changing int types
-
-diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c
-index 43db70a..844064a 100644
---- a/gdk-pixbuf/io-png.c
-+++ b/gdk-pixbuf/io-png.c
-@@ -261,7 +261,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error)
-         gchar *icc_profile_base64;
-         const gchar *icc_profile_title;
-         const gchar *icc_profile;
--        gulong icc_profile_size;
-+        png_uint_32 icc_profile_size;
-         guint32 retval;
-         gint compression_type;
- 
-@@ -344,7 +344,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error)
-                                (png_charpp) &icc_profile_title, &compression_type,
-                                (png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size);
-         if (retval != 0) {
--                icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, icc_profile_size);
-+                icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, (gsize)icc_profile_size);
-                 gdk_pixbuf_set_option (pixbuf, "icc-profile", icc_profile_base64);
-                 g_free (icc_profile_base64);
-         }
-@@ -607,7 +607,7 @@ png_info_callback   (png_structp png_read_ptr,
-         gchar *icc_profile_base64;
-         const gchar *icc_profile_title;
-         const gchar *icc_profile;
--        gulong icc_profile_size;
-+        png_uint_32 icc_profile_size;
-         guint32 retval;
-         gint compression_type;
- 
-@@ -679,9 +679,9 @@ png_info_callback   (png_structp png_read_ptr,
-         /* Extract embedded ICC profile */
-         retval = png_get_iCCP (png_read_ptr, png_info_ptr,
-                                (png_charpp) &icc_profile_title, &compression_type,
--                               (png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size);
-+                               (png_charpp) &icc_profile, &icc_profile_size);
-         if (retval != 0) {
--                icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, icc_profile_size);
-+                icc_profile_base64 = g_base64_encode ((const guchar *) icc_profile, (gsize)icc_profile_size);
-                 gdk_pixbuf_set_option (lc->pixbuf, "icc-profile", icc_profile_base64);
-                 g_free (icc_profile_base64);
-         }
diff --git a/x11-libs/gtk+/files/gtk+-2.24.4-old-icons.patch b/x11-libs/gtk+/files/gtk+-2.24.4-old-icons.patch
new file mode 100644
index 000000000000..d54fa5596143
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.24.4-old-icons.patch
@@ -0,0 +1,270 @@
+--- gtk/Makefile.am.old	2011-04-02 20:17:40.000000000 +0200
++++ gtk/Makefile.am	2011-04-03 11:41:21.000000000 +0200
+@@ -1324,7 +1324,174 @@
+ 	stock-icons/24/folder-remote.png 		\
+ 	stock-icons/24/user-home.png 			\
+ 	stock-icons/24/user-desktop.png 		\
+-	stock-icons/24/text-x-generic.png
++        stock-icons/24/text-x-generic.png               \
++        stock-icons/16/gtk-quit.png                     \
++        stock-icons/16/gtk-info.png                     \
++        stock-icons/16/gtk-file.png                     \
++        stock-icons/16/gtk-open.png                     \
++        stock-icons/16/gtk-print-preview.png            \
++        stock-icons/16/gtk-print.png                    \
++        stock-icons/16/gtk-properties.png               \
++        stock-icons/16/gtk-revert-to-saved-ltr.png      \
++        stock-icons/16/gtk-revert-to-saved-rtl.png      \
++        stock-icons/16/gtk-save-as.png                  \
++        stock-icons/16/gtk-new.png                      \
++        stock-icons/16/gtk-harddisk.png                 \
++        stock-icons/16/gtk-clear.png                    \
++        stock-icons/16/gtk-copy.png                     \
++        stock-icons/16/gtk-cut.png                      \
++        stock-icons/16/gtk-delete.png                   \
++        stock-icons/16/gtk-find-and-replace.png         \
++        stock-icons/16/gtk-find.png                     \
++        stock-icons/16/gtk-paste.png                    \
++        stock-icons/16/gtk-redo-ltr.png                 \
++        stock-icons/16/gtk-redo-rtl.png                 \
++        stock-icons/16/gtk-select-all.png               \
++        stock-icons/16/gtk-undo-ltr.png                 \
++        stock-icons/16/gtk-undo-rtl.png                 \
++        stock-icons/16/gtk-directory.png                \
++        stock-icons/16/gtk-unindent-ltr.png             \
++        stock-icons/16/gtk-unindent-rtl.png             \
++        stock-icons/16/gtk-indent-ltr.png               \
++        stock-icons/16/gtk-indent-rtl.png               \
++        stock-icons/16/gtk-justify-center.png           \
++        stock-icons/16/gtk-justify-fill.png             \
++        stock-icons/16/gtk-justify-left.png             \
++        stock-icons/16/gtk-justify-right.png            \
++        stock-icons/16/gtk-bold.png                     \
++        stock-icons/16/gtk-italic.png                   \
++        stock-icons/16/gtk-strikethrough.png            \
++        stock-icons/16/gtk-underline.png                \
++        stock-icons/16/gtk-goto-bottom.png              \
++        stock-icons/16/gtk-go-down.png                  \
++        stock-icons/16/gtk-goto-first-ltr.png           \
++        stock-icons/16/gtk-home.png                     \
++        stock-icons/16/gtk-jump-to-ltr.png              \
++        stock-icons/16/gtk-jump-to-rtl.png              \
++        stock-icons/16/gtk-goto-last-ltr.png            \
++        stock-icons/16/gtk-go-forward-ltr.png           \
++        stock-icons/16/gtk-go-back-ltr.png              \
++        stock-icons/16/gtk-goto-top.png                 \
++        stock-icons/16/gtk-go-up.png                    \
++        stock-icons/16/gtk-about.png                    \
++        stock-icons/16/gtk-help.png                     \
++        stock-icons/16/gtk-missing-image.png            \
++        stock-icons/16/gtk-add.png                      \
++        stock-icons/16/gtk-remove.png                   \
++        stock-icons/16/gtk-floppy.png                   \
++        stock-icons/16/gtk-cdrom.png                    \
++        stock-icons/16/gtk-media-pause.png              \
++        stock-icons/16/gtk-media-play-ltr.png           \
++        stock-icons/16/gtk-media-play-rtl.png           \
++        stock-icons/16/gtk-media-stop.png               \
++        stock-icons/16/gtk-media-record.png             \
++        stock-icons/16/gtk-media-rewind-ltr.png         \
++        stock-icons/16/gtk-media-forward-ltr.png        \
++        stock-icons/16/gtk-media-previous-ltr.png       \
++        stock-icons/16/gtk-media-next-ltr.png           \
++        stock-icons/16/gtk-network.png                  \
++        stock-icons/16/gtk-print-error.png              \
++        stock-icons/16/gtk-print-report.png             \
++        stock-icons/16/gtk-print-paused.png             \
++        stock-icons/16/gtk-print-warning.png            \
++        stock-icons/16/gtk-stop.png                     \
++        stock-icons/16/gtk-execute.png                  \
++        stock-icons/16/gtk-spell-check.png              \
++        stock-icons/16/gtk-fullscreen.png               \
++        stock-icons/16/gtk-refresh.png                  \
++        stock-icons/16/gtk-leave-fullscreen.png         \
++        stock-icons/16/gtk-sort-ascending.png           \
++        stock-icons/16/gtk-sort-descending.png          \
++        stock-icons/16/gtk-close.png                    \
++        stock-icons/16/gtk-zoom-fit.png                 \
++        stock-icons/16/gtk-zoom-in.png                  \
++        stock-icons/16/gtk-zoom-100.png                 \
++        stock-icons/16/gtk-zoom-out.png                 \
++        stock-icons/24/gtk-quit.png                     \
++        stock-icons/24/gtk-info.png                     \
++        stock-icons/24/gtk-file.png                     \
++        stock-icons/24/gtk-open.png                     \
++        stock-icons/24/gtk-print-preview.png            \
++        stock-icons/24/gtk-print.png                    \
++        stock-icons/24/gtk-properties.png               \
++        stock-icons/24/gtk-revert-to-saved-ltr.png      \
++        stock-icons/24/gtk-revert-to-saved-rtl.png      \
++        stock-icons/24/gtk-save-as.png                  \
++        stock-icons/24/gtk-new.png                      \
++        stock-icons/24/gtk-harddisk.png                 \
++        stock-icons/24/gtk-clear.png                    \
++        stock-icons/24/gtk-copy.png                     \
++        stock-icons/24/gtk-cut.png                      \
++        stock-icons/24/gtk-delete.png                   \
++        stock-icons/24/gtk-find-and-replace.png         \
++        stock-icons/24/gtk-find.png                     \
++        stock-icons/24/gtk-paste.png                    \
++        stock-icons/24/gtk-redo-ltr.png                 \
++        stock-icons/24/gtk-redo-rtl.png                 \
++        stock-icons/24/gtk-select-all.png               \
++        stock-icons/24/gtk-undo-ltr.png                 \
++        stock-icons/24/gtk-undo-rtl.png                 \
++        stock-icons/24/gtk-directory.png                \
++        stock-icons/24/gtk-unindent-ltr.png             \
++        stock-icons/24/gtk-unindent-rtl.png             \
++        stock-icons/24/gtk-indent-ltr.png               \
++        stock-icons/24/gtk-indent-rtl.png               \
++        stock-icons/24/gtk-justify-center.png           \
++        stock-icons/24/gtk-justify-fill.png             \
++        stock-icons/24/gtk-justify-left.png             \
++        stock-icons/24/gtk-justify-right.png            \
++        stock-icons/24/gtk-bold.png                     \
++        stock-icons/24/gtk-italic.png                   \
++        stock-icons/24/gtk-strikethrough.png            \
++        stock-icons/24/gtk-underline.png                \
++        stock-icons/24/gtk-goto-bottom.png              \
++        stock-icons/24/gtk-go-down.png                  \
++        stock-icons/24/gtk-goto-first-ltr.png           \
++        stock-icons/24/gtk-home.png                     \
++        stock-icons/24/gtk-jump-to-ltr.png              \
++        stock-icons/24/gtk-jump-to-rtl.png              \
++        stock-icons/24/gtk-goto-last-ltr.png            \
++        stock-icons/24/gtk-go-forward-ltr.png           \
++        stock-icons/24/gtk-go-back-ltr.png              \
++        stock-icons/24/gtk-goto-top.png                 \
++        stock-icons/24/gtk-go-up.png                    \
++        stock-icons/24/gtk-about.png                    \
++        stock-icons/24/gtk-help.png                     \
++        stock-icons/24/gtk-missing-image.png            \
++        stock-icons/24/gtk-add.png                      \
++        stock-icons/24/gtk-remove.png                   \
++        stock-icons/24/gtk-floppy.png                   \
++        stock-icons/24/gtk-cdrom.png                    \
++        stock-icons/24/gtk-media-pause.png              \
++        stock-icons/24/gtk-media-play-ltr.png           \
++        stock-icons/24/gtk-media-play-rtl.png           \
++        stock-icons/24/gtk-media-stop.png               \
++        stock-icons/24/gtk-media-record.png             \
++        stock-icons/24/gtk-media-rewind-ltr.png         \
++        stock-icons/24/gtk-media-forward-ltr.png        \
++        stock-icons/24/gtk-media-previous-ltr.png       \
++        stock-icons/24/gtk-media-next-ltr.png           \
++        stock-icons/24/gtk-network.png                  \
++        stock-icons/24/gtk-print-error.png              \
++        stock-icons/24/gtk-print-report.png             \
++        stock-icons/24/gtk-print-paused.png             \
++        stock-icons/24/gtk-print-warning.png            \
++        stock-icons/24/gtk-stop.png                     \
++        stock-icons/24/gtk-execute.png                  \
++        stock-icons/24/gtk-spell-check.png              \
++        stock-icons/24/gtk-fullscreen.png               \
++        stock-icons/24/gtk-refresh.png                  \
++        stock-icons/24/gtk-leave-fullscreen.png         \
++        stock-icons/24/gtk-sort-ascending.png           \
++        stock-icons/24/gtk-sort-descending.png          \
++        stock-icons/24/gtk-close.png                    \
++        stock-icons/24/gtk-zoom-fit.png                 \
++        stock-icons/24/gtk-zoom-in.png                  \
++        stock-icons/24/gtk-zoom-100.png                 \
++        stock-icons/24/gtk-zoom-out.png                 \
++        stock-icons/48/gtk-dialog-error.png
++
++
+ 
+ # need to copy the icons so that we can replace the generated ones with
+ # symlinks, even in the readonly srcdir case
+@@ -1364,7 +1531,91 @@
+ 	   && $(LN_S) folder.png user-desktop.png 			\
+ 	   && $(RM) user-home.png 					\
+ 	   && $(LN_S) folder.png user-home.png 				\
++           && $(LN_S) application-exit.png gtk-quit.png                 \
++           && $(LN_S) dialog-information.png gtk-info.png                       \
++           && $(LN_S) document-new.png gtk-file.png                     \
++           && $(LN_S) document-open.png gtk-open.png                    \
++           && $(LN_S) document-print-preview.png gtk-print-preview.png                  \
++           && $(LN_S) document-print.png gtk-print.png                  \
++           && $(LN_S) document-properties.png gtk-properties.png                        \
++           && $(LN_S) document-revert-ltr.png gtk-revert-to-saved-ltr.png                       \
++           && $(LN_S) document-revert-rtl.png gtk-revert-to-saved-rtl.png                       \
++           && $(LN_S) document-save-as.png gtk-save-as.png                      \
++           && $(LN_S) document-x-generic.png gtk-new.png                        \
++           && $(LN_S) drive-harddisk.png gtk-harddisk.png                       \
++           && $(LN_S) edit-clear.png gtk-clear.png                      \
++           && $(LN_S) edit-copy.png gtk-copy.png                        \
++           && $(LN_S) edit-cut.png gtk-cut.png                  \
++           && $(LN_S) edit-delete.png gtk-delete.png                    \
++           && $(LN_S) edit-find-replace.png gtk-find-and-replace.png                    \
++           && $(LN_S) edit-find.png gtk-find.png                        \
++           && $(LN_S) edit-paste.png gtk-paste.png                      \
++           && $(LN_S) edit-redo-ltr.png gtk-redo-ltr.png                        \
++           && $(LN_S) edit-redo-rtl.png gtk-redo-rtl.png                        \
++           && $(LN_S) edit-select-all.png gtk-select-all.png                    \
++           && $(LN_S) edit-undo-ltr.png gtk-undo-ltr.png                        \
++           && $(LN_S) edit-undo-rtl.png gtk-undo-rtl.png                        \
++           && $(LN_S) folder.png gtk-directory.png                      \
++           && $(LN_S) format-indent-less-ltr.png gtk-unindent-ltr.png                   \
++           && $(LN_S) format-indent-less-rtl.png gtk-unindent-rtl.png                   \
++           && $(LN_S) format-indent-more-ltr.png gtk-indent-ltr.png                     \
++           && $(LN_S) format-indent-more-rtl.png gtk-indent-rtl.png                     \
++           && $(LN_S) format-justify-center.png gtk-justify-center.png                  \
++           && $(LN_S) format-justify-fill.png gtk-justify-fill.png                      \
++           && $(LN_S) format-justify-left.png gtk-justify-left.png                      \
++           && $(LN_S) format-justify-right.png gtk-justify-right.png                    \
++           && $(LN_S) format-text-bold.png gtk-bold.png                 \
++           && $(LN_S) format-text-italic.png gtk-italic.png                     \
++           && $(LN_S) format-text-strikethrough.png gtk-strikethrough.png                       \
++           && $(LN_S) format-text-underline.png gtk-underline.png                       \
++           && $(LN_S) go-bottom.png gtk-goto-bottom.png                 \
++           && $(LN_S) go-down.png gtk-go-down.png                       \
++           && $(LN_S) go-first-ltr.png gtk-goto-first-ltr.png                   \
++           && $(LN_S) go-home.png gtk-home.png                  \
++           && $(LN_S) go-jump-ltr.png gtk-jump-to-ltr.png                       \
++           && $(LN_S) go-jump-rtl.png gtk-jump-to-rtl.png                       \
++           && $(LN_S) go-last-ltr.png gtk-goto-last-ltr.png                     \
++           && $(LN_S) go-next-ltr.png gtk-go-forward-ltr.png                    \
++           && $(LN_S) go-previous-ltr.png gtk-go-back-ltr.png                   \
++           && $(LN_S) go-top.png gtk-goto-top.png                       \
++           && $(LN_S) go-up.png gtk-go-up.png                   \
++           && $(LN_S) help-about.png gtk-about.png                      \
++           && $(LN_S) help-contents.png gtk-help.png                    \
++           && $(LN_S) image-missing.png gtk-missing-image.png                   \
++           && $(LN_S) list-add.png gtk-add.png                  \
++           && $(LN_S) list-remove.png gtk-remove.png                    \
++           && $(LN_S) media-floppy.png gtk-floppy.png                   \
++           && $(LN_S) media-optical.png gtk-cdrom.png                   \
++           && $(LN_S) media-playback-pause.png gtk-media-pause.png                      \
++           && $(LN_S) media-playback-start-ltr.png gtk-media-play-ltr.png                       \
++           && $(LN_S) media-playback-start-rtl.png gtk-media-play-rtl.png                       \
++           && $(LN_S) media-playback-stop.png gtk-media-stop.png                        \
++           && $(LN_S) media-record.png gtk-media-record.png                     \
++           && $(LN_S) media-seek-backward-ltr.png gtk-media-rewind-ltr.png                      \
++           && $(LN_S) media-seek-forward-ltr.png gtk-media-forward-ltr.png                      \
++           && $(LN_S) media-skip-backward-ltr.png gtk-media-previous-ltr.png                    \
++           && $(LN_S) media-skip-forward-ltr.png gtk-media-next-ltr.png                 \
++           && $(LN_S) network-idle.png gtk-network.png                  \
++           && $(LN_S) printer-error.png gtk-print-error.png                     \
++           && $(LN_S) printer-info.png gtk-print-report.png                     \
++           && $(LN_S) printer-paused.png gtk-print-paused.png                   \
++           && $(LN_S) printer-warning.png gtk-print-warning.png                 \
++           && $(LN_S) process-stop.png gtk-stop.png                     \
++           && $(LN_S) system-run.png gtk-execute.png                    \
++           && $(LN_S) tools-check-spelling.png gtk-spell-check.png                      \
++           && $(LN_S) view-fullscreen.png gtk-fullscreen.png                    \
++           && $(LN_S) view-refresh.png gtk-refresh.png                  \
++           && $(LN_S) view-restore.png gtk-leave-fullscreen.png                 \
++           && $(LN_S) view-sort-ascending.png gtk-sort-ascending.png                    \
++           && $(LN_S) view-sort-descending.png gtk-sort-descending.png                  \
++           && $(LN_S) window-close.png gtk-close.png                    \
++           && $(LN_S) zoom-fit-best.png gtk-zoom-fit.png                        \
++           && $(LN_S) zoom-in.png gtk-zoom-in.png                       \
++           && $(LN_S) zoom-original.png gtk-zoom-100.png                        \
++           && $(LN_S) zoom-out.png gtk-zoom-out.png                     \
+ 	) done 								\
++        && (cd stock-icons/48                                           \
++           && $(LN_S) dialog-error.png gtk-dialog-error.png)            \
+ 	&& touch stamp-icons
+ 
+ if CROSS_COMPILING
diff --git a/x11-libs/gtk+/files/gtk+-2.8.0-multilib.patch b/x11-libs/gtk+/files/gtk+-2.8.0-multilib.patch
deleted file mode 100644
index 4a1b73dc7e59..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.8.0-multilib.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -urN gtk+-2.8.0.orig/gdk-pixbuf/Makefile.am gtk+-2.8.0/gdk-pixbuf/Makefile.am
---- gtk+-2.8.0.orig/gdk-pixbuf/Makefile.am	2005-07-09 01:10:11.000000000 +0100
-+++ gtk+-2.8.0/gdk-pixbuf/Makefile.am	2005-08-17 17:59:20.000000000 +0100
-@@ -271,6 +271,7 @@
- 	-I$(top_srcdir)/gdk-pixbuf 		\
- 	-I$(top_builddir)/gdk-pixbuf 		\
- 	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"	\
-+	-DHOST=\"$(host_triplet)\"		\
- 	-DGTK_VERSION=\"$(GTK_VERSION)\"	\
- 	-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"	\
- 	-DG_DISABLE_DEPRECATED			\
-diff -urN gtk+-2.8.0.orig/gdk-pixbuf/Makefile.in gtk+-2.8.0/gdk-pixbuf/Makefile.in
---- gtk+-2.8.0.orig/gdk-pixbuf/Makefile.in	2005-08-17 17:38:06.000000000 +0100
-+++ gtk+-2.8.0/gdk-pixbuf/Makefile.in	2005-08-17 17:59:35.000000000 +0100
-@@ -504,6 +504,7 @@
- 	-I$(top_srcdir)/gdk-pixbuf 		\
- 	-I$(top_builddir)/gdk-pixbuf 		\
- 	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"	\
-+	-DHOST=\"$(host_triplet)\"		\
- 	-DGTK_VERSION=\"$(GTK_VERSION)\"	\
- 	-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"	\
- 	-DG_DISABLE_DEPRECATED			\
-diff -urN gtk+-2.8.0.orig/gdk-pixbuf/gdk-pixbuf-io.c gtk+-2.8.0/gdk-pixbuf/gdk-pixbuf-io.c
---- gtk+-2.8.0.orig/gdk-pixbuf/gdk-pixbuf-io.c	2005-07-22 16:34:32.000000000 +0100
-+++ gtk+-2.8.0/gdk-pixbuf/gdk-pixbuf-io.c	2005-08-17 17:44:48.000000000 +0100
-@@ -276,8 +276,15 @@
-   gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
- 
-   if (!result)
--	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
--
-+  {
-+	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", HOST, "gdk-pixbuf.loaders", NULL);
-+	  if (!g_file_test (result, G_FILE_TEST_EXISTS))
-+	  {
-+		  g_free (result);
-+
-+		  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
-+	  }
-+  }
-   return result;
- }
- 
-diff -urN gtk+-2.8.0.orig/gtk/gtkrc.c gtk+-2.8.0/gtk/gtkrc.c
---- gtk+-2.8.0.orig/gtk/gtkrc.c	2005-04-06 14:49:28.000000000 +0100
-+++ gtk+-2.8.0/gtk/gtkrc.c	2005-08-17 17:54:36.000000000 +0100
-@@ -364,7 +364,15 @@
-       if (im_module_file)
- 	result = g_strdup (im_module_file);
-       else
--	result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
-+	{
-+	  result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", GTK_HOST, "gtk.immodules", NULL);
-+	  if (!g_file_test (result, G_FILE_TEST_EXISTS))
-+	    {
-+	      g_free (result);
-+	      
-+	      result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
-+	    }
-+	}
-     }
- 
-   return result;
diff --git a/x11-libs/gtk+/gtk+-2.20.1-r1.ebuild b/x11-libs/gtk+/gtk+-2.20.1-r1.ebuild
deleted file mode 100644
index b558973ab90f..000000000000
--- a/x11-libs/gtk+/gtk+-2.20.1-r1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.20.1-r1.ebuild,v 1.13 2010/11/15 22:58:56 eva Exp $
-
-EAPI="3"
-
-inherit gnome.org flag-o-matic eutils libtool virtualx
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="aqua cups debug doc +introspection jpeg jpeg2k tiff test vim-syntax xinerama"
-
-# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
-RDEPEND="!aqua? (
-		x11-libs/libXrender
-		x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXt
-		x11-libs/libXext
-		>=x11-libs/libXrandr-1.3
-		x11-libs/libXcursor
-		x11-libs/libXfixes
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		>=x11-libs/cairo-1.6[X,svg]
-	)
-	aqua? (
-		>=x11-libs/cairo-1.6[aqua,svg]
-	)
-	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.23.6
-	>=x11-libs/pango-1.20[introspection?]
-	>=dev-libs/atk-1.29.2[introspection?]
-	media-libs/fontconfig
-	x11-misc/shared-mime-info
-	>=media-libs/libpng-1.4
-	cups? ( net-print/cups )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/jasper )
-	tiff? ( >=media-libs/tiff-3.9.2 )
-	!<gnome-base/gail-1000"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	!aqua? (
-		x11-proto/xextproto
-		x11-proto/xproto
-		x11-proto/inputproto
-		x11-proto/damageproto
-	)
-	x86-interix? (
-		sys-libs/itx-bind
-	)
-	xinerama? ( x11-proto/xineramaproto )
-	>=dev-util/gtk-doc-am-1.11
-	doc? (
-		>=dev-util/gtk-doc-1.11
-		~app-text/docbook-xml-dtd-4.1.2 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
-	test? (
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )"
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
-
-set_gtk2_confdir() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
-}
-
-src_prepare() {
-	# use an arch-specific config directory so that 32bit and 64bit versions
-	# dont clash on multilib systems
-	has_multilib_profile && epatch "${FILESDIR}/${PN}-2.8.0-multilib.patch"
-
-	# Don't break inclusion of gtkclist.h, upstream bug 536767
-	epatch "${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch"
-
-	# Fix for missing NSUInteger on Darwin8 (10.4)
-	epatch "${FILESDIR}"/${P}-darwin8.patch
-
-	# Remove the definition of libpixbufloader_gdip_png_la_*
-	epatch "${FILESDIR}/${P}-libpixbufloader-warning.patch"
-
-	# Redraw if GtkRange is a GtkScale and value is drawn.
-	epatch "${FILESDIR}/${P}-gtkrange.patch"
-
-	# Fix upstream "table cells do not implement action interface"
-	epatch "${FILESDIR}/${P}-gail_cell_type.patch"
-
-	# Upstream bg 608218: GtkOffscreenWindow causes bad window with GtkEntry
-	epatch "${FILESDIR}/${P}-GtkOffscreenWindow.patch"
-
-	# fix a 64-bit crasher in libpng 1.4 (upstream bug #617878)
-	epatch "${FILESDIR}/${P}-libpng-fix.patch"
-
-	# -O3 and company cause random crashes in applications. Bug #133469
-	replace-flags -O3 -O2
-	strip-flags
-
-	use ppc64 && append-flags -mminimal-toc
-
-	# 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"
-
-	if use x86-interix; then
-		# activate the itx-bind package...
-		append-flags "-I${EPREFIX}/usr/include/bind"
-		append-ldflags "-L${EPREFIX}/usr/lib/bind"
-	fi
-
-	elibtoolize
-}
-
-src_configure() {
-	# png always on to display icons (foser)
-	local myconf="$(use_enable doc gtk-doc)
-		$(use_with jpeg libjpeg)
-		$(use_with jpeg2k libjasper)
-		$(use_with tiff libtiff)
-		$(use_enable xinerama)
-		$(use_enable cups cups auto)
-		$(use_enable introspection)
-		--disable-papi
-		--with-libpng"
-	if use aqua; then
-		myconf="${myconf} --with-gdktarget=quartz"
-	else
-		myconf="${myconf} --with-gdktarget=x11 --with-xinput"
-	fi
-
-	# 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}
-}
-
-src_test() {
-	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.
-	HOME="${T}" Xemake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	set_gtk2_confdir
-	dodir ${GTK2_CONFDIR}
-	keepdir ${GTK2_CONFDIR}
-
-	# see bug #133241
-	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
-	insinto ${GTK2_CONFDIR}
-	doins "${T}"/gtkrc
-
-	# Enable xft in environment as suggested by <utx@gentoo.org>
-	echo "GDK_USE_XFT=1" > "${T}"/50gtk2
-	doenvd "${T}"/50gtk2
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed"
-
-	# This has to be removed, because it's multilib specific; generated in
-	# postinst
-	rm "${ED%/}/etc/gtk-2.0/gtk.immodules"
-
-	# add -framework Carbon to the .pc files
-	use aqua && for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do
-		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED%/}"/usr/lib/pkgconfig/$i || die "sed failed"
-	done
-}
-
-pkg_postinst() {
-	set_gtk2_confdir
-
-	if [ -d "${EROOT%/}${GTK2_CONFDIR}" ]; then
-		gtk-query-immodules-2.0  > "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules"
-		gdk-pixbuf-query-loaders > "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders"
-	else
-		ewarn "The destination path ${EROOT%/}${GTK2_CONFDIR} doesn't exist;"
-		ewarn "to complete the installation of GTK+, please create the"
-		ewarn "directory and then manually run:"
-		ewarn "  cd ${EROOT%/}${GTK2_CONFDIR}"
-		ewarn "  gtk-query-immodules-2.0  > gtk.immodules"
-		ewarn "  gdk-pixbuf-query-loaders > 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
-
-	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."
-}
diff --git a/x11-libs/gtk+/gtk+-2.24.4.ebuild b/x11-libs/gtk+/gtk+-2.24.4.ebuild
new file mode 100644
index 000000000000..55f847b28014
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.24.4.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.4.ebuild,v 1.1 2011/06/03 18:58:10 pacho Exp $
+
+EAPI="3"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="2:2.4"
+
+inherit eutils flag-o-matic gnome.org libtool python virtualx autotools
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="aqua cups debug doc examples +introspection test vim-syntax xinerama"
+
+# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
+RDEPEND="!aqua? (
+		x11-libs/libXrender
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXt
+		x11-libs/libXext
+		>=x11-libs/libXrandr-1.3
+		x11-libs/libXcursor
+		x11-libs/libXfixes
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		>=x11-libs/cairo-1.6[X,svg]
+		x11-libs/gdk-pixbuf:2[X,introspection?]
+	)
+	aqua? (
+		>=x11-libs/cairo-1.6[aqua,svg]
+		x11-libs/gdk-pixbuf:2[introspection?]
+	)
+	xinerama? ( x11-libs/libXinerama )
+	>=dev-libs/glib-2.27.3:2
+	>=x11-libs/pango-1.20[introspection?]
+	>=dev-libs/atk-1.29.2[introspection?]
+	media-libs/fontconfig
+	x11-misc/shared-mime-info
+	cups? ( net-print/cups )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+	!<gnome-base/gail-1000"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	!aqua? (
+		x11-proto/xextproto
+		x11-proto/xproto
+		x11-proto/inputproto
+		x11-proto/damageproto
+	)
+	x86-interix? (
+		sys-libs/itx-bind
+	)
+	xinerama? ( x11-proto/xineramaproto )
+	>=dev-util/gtk-doc-am-1.11
+	doc? (
+		>=dev-util/gtk-doc-1.11
+		~app-text/docbook-xml-dtd-4.1.2 )
+	test? (
+		media-fonts/font-misc-misc
+		media-fonts/font-cursor-misc )"
+PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+
+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() {
+	# use an arch-specific config directory so that 32bit and 64bit versions
+	# dont clash on multilib systems
+	epatch "${FILESDIR}/${PN}-2.21.3-multilib.patch"
+
+	# Don't break inclusion of gtkclist.h, upstream bug 536767
+	epatch "${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch"
+
+	# Create symlinks to old icons until apps are ported, bug #339319
+	epatch "${FILESDIR}/${PN}-2.24.4-old-icons.patch"
+
+	# Stop trying to build unmaintained docs, bug #349754
+	strip_builddir SUBDIRS tutorial docs/Makefile.am docs/Makefile.in
+	strip_builddir SUBDIRS faq docs/Makefile.am docs/Makefile.in
+
+	# -O3 and company cause random crashes in applications. Bug #133469
+	replace-flags -O3 -O2
+	strip-flags
+
+	use ppc64 && append-flags -mminimal-toc
+
+	# 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)"
+
+	if use x86-interix; then
+		# activate the itx-bind package...
+		append-flags "-I${EPREFIX}/usr/include/bind"
+		append-ldflags "-L${EPREFIX}/usr/lib/bind"
+	fi
+
+	if ! use test; then
+		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS tests Makefile.am Makefile.in
+	fi
+
+	if ! use examples; then
+		# don't waste time building demos
+		strip_builddir SRC_SUBDIRS demos Makefile.am Makefile.in
+	fi
+
+	# Use elibtoolize in place of eautoreconf when it will be dropped
+	#elibtoolize
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="$(use_enable doc gtk-doc)
+		$(use_enable xinerama)
+		$(use_enable cups cups auto)
+		$(use_enable introspection)
+		--disable-papi"
+	if use aqua; then
+		myconf="${myconf} --with-gdktarget=quartz"
+	else
+		myconf="${myconf} --with-gdktarget=x11 --with-xinput"
+	fi
+
+	# Passing --disable-debug is not recommended for production use
+	use debug && myconf="${myconf} --enable-debug=yes"
+
+	econf ${myconf}
+}
+
+src_test() {
+	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"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Installation failed"
+
+	set_gtk2_confdir
+	dodir ${GTK2_CONFDIR} || die "dodir failed"
+	keepdir ${GTK2_CONFDIR}
+
+	# see bug #133241
+	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
+	insinto /etc/gtk-2.0
+	doins "${T}"/gtkrc || die "doins gtkrc failed"
+
+	# Enable xft in environment as suggested by <utx@gentoo.org>
+	echo "GDK_USE_XFT=1" > "${T}"/50gtk2
+	doenvd "${T}"/50gtk2 || die "doenvd failed"
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README* || die "dodoc failed"
+
+	# add -framework Carbon to the .pc files
+	use aqua && for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do
+		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED%/}"/usr/lib/pkgconfig/$i || die "sed failed"
+	done
+
+	python_convert_shebangs 2 "${ED}"usr/bin/gtk-builder-convert
+}
+
+pkg_postinst() {
+	set_gtk2_confdir
+
+	# gtk.immodules should be in their CHOST directories respectively.
+	gtk-query-immodules-2.0  > "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" \
+		|| ewarn "Failed to run gtk-query-immodules-2.0"
+
+	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
+
+	# 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
+}