new release 'n cleanup

15 files changed, 12 insertions, 936 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index bf2845576340..2832181d9523 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.116 2004/08/23 22:36:00 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.117 2004/08/29 12:50:08 foser Exp $
+
+*gtk+-2.4.9 (29 Aug 2004)
+
+  29 Aug 2004; foser <foser@gentoo.org. gtk+-2.4.9.ebuild :
+  New release
 
   24 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> gtk+-2.4.4.ebuild:
   Stable on alpha.
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.2.4-r1 b/x11-libs/gtk+/files/digest-gtk+-2.2.4-r1
deleted file mode 100644
index 743189299eaf..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.2.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 605332199533e73bc6eec481fb4f1671 gtk+-2.2.4.tar.bz2 7189272
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.4.0-r1 b/x11-libs/gtk+/files/digest-gtk+-2.4.0-r1
deleted file mode 100644
index 927736ca506c..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.4.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fd16157de447c7f0a86495ad0dc67a1b gtk+-2.4.0.tar.bz2 8476610
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.4.3 b/x11-libs/gtk+/files/digest-gtk+-2.4.3
deleted file mode 100644
index 83cae04e6bb8..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.4.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 debfd0fcef08683c0761f13e1ba2dced gtk+-2.4.3.tar.bz2 9256514
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.4.3-r1 b/x11-libs/gtk+/files/digest-gtk+-2.4.3-r1
deleted file mode 100644
index 83cae04e6bb8..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.4.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 debfd0fcef08683c0761f13e1ba2dced gtk+-2.4.3.tar.bz2 9256514
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.4.9 b/x11-libs/gtk+/files/digest-gtk+-2.4.9
new file mode 100644
index 000000000000..78e6fd116191
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.4.9
@@ -0,0 +1 @@
+MD5 bfe3b960d334e81d8f91c3509f70868d gtk+-2.4.9.tar.bz2 9599004
diff --git a/x11-libs/gtk+/files/gtk+-2-xftprefs.patch b/x11-libs/gtk+/files/gtk+-2-xftprefs.patch
deleted file mode 100644
index fbc9fc253a29..000000000000
--- a/x11-libs/gtk+/files/gtk+-2-xftprefs.patch
+++ /dev/null
@@ -1,229 +0,0 @@
---- gtk+-2.2.1/gdk/x11/gdkevents-x11.c.xftprefs	Thu Jan 23 16:57:04 2003
-+++ gtk+-2.2.1/gdk/x11/gdkevents-x11.c	Sun Feb  2 22:29:22 2003
-@@ -2497,7 +2497,12 @@
-   { "Gtk/IMStatusStyle", "gtk-im-status-style" },
-   { "Net/CursorBlink", "gtk-cursor-blink" },
-   { "Net/CursorBlinkTime", "gtk-cursor-blink-time" },
--  { "Net/ThemeName", "gtk-theme-name" }
-+  { "Net/ThemeName", "gtk-theme-name" },
-+  { "Xft/Antialias", "gtk-xft-antialias" },
-+  { "Xft/Hinting", "gtk-xft-hinting" },
-+  { "Xft/HintStyle", "gtk-xft-hintstyle" },
-+  { "Xft/RGBA", "gtk-xft-rgba" },
-+  { "Xft/DPI", "gtk-xft-dpi" },
- };
- 
- static void
---- gtk+-2.2.1/gtk/gtksettings.c.xftprefs	Sun Feb  2 22:29:22 2003
-+++ gtk+-2.2.1/gtk/gtksettings.c	Sun Feb  2 22:31:55 2003
-@@ -42,6 +42,12 @@
-   GtkSettingsSource source;
- };
- 
-+#ifdef GDK_WINDOWING_X11
-+#include <X11/Xft/Xft.h>
-+#include <pango/pangoxft.h>
-+#include <gdk/x11/gdkx.h>
-+#endif
-+
- enum {
-   PROP_0,
-   PROP_DOUBLE_CLICK_TIME,
-@@ -53,7 +59,12 @@
-   PROP_MENU_BAR_ACCEL,
-   PROP_DND_DRAG_THRESHOLD,
-   PROP_FONT_NAME,
--  PROP_ICON_SIZES
-+  PROP_ICON_SIZES,
-+  PROP_XFT_ANTIALIAS,
-+  PROP_XFT_HINTING,
-+  PROP_XFT_HINTSTYLE,
-+  PROP_XFT_RGBA,
-+  PROP_XFT_DPI
- };
- 
- 
-@@ -112,6 +123,85 @@
-   return settings_type;
- }
- 
-+#ifdef GDK_WINDOWING_X11
-+static void
-+gtk_default_substitute (FcPattern *pattern,
-+			gpointer   data)
-+{
-+  GtkSettings *settings = data;
-+  gint antialias;
-+  gint hinting;
-+  char *rgba;
-+  char *hintstyle;
-+  gint dpi;
-+  FcValue v;
-+  
-+  g_object_get (G_OBJECT (settings),
-+		"gtk-xft-antialias", &antialias,
-+		"gtk-xft-hinting", &hinting,
-+		"gtk-xft-hintstyle", &hintstyle,
-+		"gtk-xft-rgba", &rgba,
-+		"gtk-xft-dpi", &dpi,
-+		NULL);
-+  
-+  if (antialias >= 0 &&
-+      FcPatternGet (pattern, FC_ANTIALIAS, 0, &v) == FcResultNoMatch)
-+    FcPatternAddBool (pattern, FC_ANTIALIAS, antialias != 0);
-+  
-+  if (hinting >= 0 &&
-+      FcPatternGet (pattern, FC_HINTING, 0, &v) == FcResultNoMatch)
-+    FcPatternAddBool (pattern, FC_HINTING, hinting != 0);
-+  
-+  if (hintstyle && FcPatternGet (pattern, FC_HINT_STYLE, 0, &v) == FcResultNoMatch)
-+    {
-+      int val = FC_HINT_FULL;	/* Quiet GCC */
-+      gboolean found = TRUE;
-+
-+      if (strcmp (hintstyle, "hintnone") == 0)
-+	val = FC_HINT_NONE;
-+      else if (strcmp (hintstyle, "hintslight") == 0)
-+	val = FC_HINT_SLIGHT;
-+      else if (strcmp (hintstyle, "hintmedium") == 0)
-+	val = FC_HINT_MEDIUM;
-+      else if (strcmp (hintstyle, "hintfull") == 0)
-+	val = FC_HINT_FULL;
-+      else
-+	found = FALSE;
-+
-+      if (found)
-+	FcPatternAddInteger (pattern, FC_HINT_STYLE, val);
-+    }
-+
-+  if (rgba && FcPatternGet (pattern, FC_RGBA, 0, &v) == FcResultNoMatch)
-+    {
-+      int val = FC_RGBA_NONE;	/* Quiet GCC */
-+      gboolean found = TRUE;
-+
-+      if (strcmp (rgba, "none") == 0)
-+	val = FC_RGBA_NONE;
-+      else if (strcmp (rgba, "rgb") == 0)
-+	val = FC_RGBA_RGB;
-+      else if (strcmp (rgba, "bgr") == 0)
-+	val = FC_RGBA_BGR;
-+      else if (strcmp (rgba, "vrgb") == 0)
-+	val = FC_RGBA_VRGB;
-+      else if (strcmp (rgba, "vbgr") == 0)
-+	val = FC_RGBA_VBGR;
-+      else
-+	found = FALSE;
-+
-+      if (found)
-+	FcPatternAddInteger (pattern, FC_RGBA, val);
-+    }
-+
-+  if (dpi >= 0 && FcPatternGet (pattern, FC_DPI, 0, &v) == FcResultNoMatch)
-+    FcPatternAddDouble (pattern, FC_DPI, dpi / 1024.);
-+
-+  g_free (hintstyle);
-+  g_free (rgba);
-+}
-+#endif /* GDK_WINDOWING_X11 */
-+
- static void
- gtk_settings_init (GtkSettings *settings)
- {
-@@ -247,6 +337,58 @@
- 								  G_PARAM_READWRITE),
-                                              NULL);
-   g_assert (result == PROP_ICON_SIZES);
-+
-+#ifdef GDK_WINDOWING_X11
-+  result = settings_install_property_parser (class,
-+					     g_param_spec_int ("gtk-xft-antialias",
-+ 							       _("Xft Antialias"),
-+ 							       _("Whether to antialias Xft fonts; 0=no, 1=yes, -1=default"),
-+ 							       -1, 1, -1,
-+ 							       G_PARAM_READWRITE),
-+					     NULL);
-+ 
-+  g_assert (result == PROP_XFT_ANTIALIAS);
-+  
-+  result = settings_install_property_parser (class,
-+					     g_param_spec_int ("gtk-xft-hinting",
-+ 							       _("Xft Hinting"),
-+ 							       _("Whether to hint Xft fonts; 0=no, 1=yes, -1=default"),
-+ 							       -1, 1, -1,
-+ 							       G_PARAM_READWRITE),
-+					     NULL);
-+  
-+  g_assert (result == PROP_XFT_HINTING);
-+  
-+  result = settings_install_property_parser (class,
-+					     g_param_spec_string ("gtk-xft-hintstyle",
-+ 								  _("Xft Hint Style"),
-+ 								  _("What degree of hinting to use; none, slight, medium, or full"),
-+ 								  NULL,
-+ 								  G_PARAM_READWRITE),
-+                                              NULL);
-+  
-+  g_assert (result == PROP_XFT_HINTSTYLE);
-+  
-+  result = settings_install_property_parser (class,
-+					     g_param_spec_string ("gtk-xft-rgba",
-+ 								  _("Xft RGBA"),
-+ 								  _("Type of subpixel antialiasing; none, rgb, bgr, vrgb, vbgr"),
-+ 								  NULL,
-+ 								  G_PARAM_READWRITE),
-+					     NULL);
-+  
-+  g_assert (result == PROP_XFT_RGBA);
-+  
-+  result = settings_install_property_parser (class,
-+					     g_param_spec_int ("gtk-xft-dpi",
-+ 							       _("Xft DPI"),
-+ 							       _("Resolution for Xft, in 1024 * dots/inch. -1 to use default value"),
-+ 							       -1, 1024*1024, -1,
-+ 							       G_PARAM_READWRITE),
-+					     NULL);
-+  
-+  g_assert (result == PROP_XFT_DPI);
-+#endif  /* GDK_WINDOWING_X11 */
- }
- 
- static void
-@@ -288,7 +430,17 @@
-     {
-       settings = g_object_new (GTK_TYPE_SETTINGS, NULL);
-       settings->screen = screen;
--      g_object_set_data (G_OBJECT (screen), "gtk-settings", settings); 
-+      g_object_set_data (G_OBJECT (screen), "gtk-settings", settings);
-+
-+#ifdef GDK_WINDOWING_X11  
-+      /* Set the default substitution function for the Pango fontmap.
-+       */
-+      pango_xft_set_default_substitute (GDK_SCREEN_XDISPLAY (screen),
-+					GDK_SCREEN_XNUMBER (screen),
-+					gtk_default_substitute,
-+					settings, NULL);
-+#endif /* GDK_WINDOWING_X11 */
-+      
-       gtk_rc_reparse_all_for_settings (settings, TRUE);
-       settings_update_double_click_time (settings);
-     }
-@@ -413,6 +565,19 @@
-     case PROP_DOUBLE_CLICK_TIME:
-       settings_update_double_click_time (settings);
-       break;
-+#ifdef GDK_WINDOWING_X11      
-+    case PROP_XFT_ANTIALIAS:
-+    case PROP_XFT_HINTING:
-+    case PROP_XFT_HINTSTYLE:
-+    case PROP_XFT_RGBA:
-+    case PROP_XFT_DPI:
-+      pango_xft_substitute_changed (GDK_SCREEN_XDISPLAY (settings->screen),
-+ 				    GDK_SCREEN_XNUMBER (settings->screen));
-+      /* See comments with _gtk_rc_reset_styles for why this is a hack
-+       */
-+      _gtk_rc_reset_styles (GTK_SETTINGS (object));
-+      break;
-+#endif /* GDK_WINDOWING_X11 */
-     }
- }
- 
diff --git a/x11-libs/gtk+/files/gtk+-2.2-notificationarea_loop.patch b/x11-libs/gtk+/files/gtk+-2.2-notificationarea_loop.patch
deleted file mode 100644
index b67e218a0cdf..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.2-notificationarea_loop.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur gtk+-2.2.4.orig/gtk/gtksocket.c gtk+-2.2.4/gtk/gtksocket.c
---- gtk+-2.2.4.orig/gtk/gtksocket.c	2003-10-06 20:42:48.679102912 -0400
-+++ gtk+-2.2.4/gtk/gtksocket.c	2003-10-06 20:43:02.267037232 -0400
-@@ -840,7 +840,7 @@
-   if (socket->plug_widget)
-     return gtk_widget_child_focus (socket->plug_widget, direction);
- 
--  if (!GTK_WIDGET_HAS_FOCUS (widget))
-+  if (!gtk_widget_is_focus (widget))
-     {
-       switch (direction)
- 	{
diff --git a/x11-libs/gtk+/files/gtk+-2.4.0-uimanager-zero-becomes-null.patch b/x11-libs/gtk+/files/gtk+-2.4.0-uimanager-zero-becomes-null.patch
deleted file mode 100644
index 92de10faff12..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.4.0-uimanager-zero-becomes-null.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- gtk/gtkuimanager.c.old	2004-04-09 02:36:33.679152760 -0400
-+++ gtk/gtkuimanager.c	2004-04-09 02:45:50.571492256 -0400
-@@ -584,7 +584,7 @@
- 		    "object_signal::connect_proxy", G_CALLBACK (cb_proxy_connect_proxy), self,
- 		    "object_signal::disconnect_proxy", G_CALLBACK (cb_proxy_disconnect_proxy), self,
- 		    "object_signal::pre_activate", G_CALLBACK (cb_proxy_pre_activate), self,
--		    "object_signal::post_activate", G_CALLBACK (cb_proxy_post_activate), self, 0);
-+		    "object_signal::post_activate", G_CALLBACK (cb_proxy_post_activate), self, NULL);
- 
-   /* dirty all nodes, as action bindings may change */
-   dirty_all_nodes (self);
-@@ -619,7 +619,7 @@
-                        "any_signal::disconnect_proxy", G_CALLBACK (cb_proxy_disconnect_proxy), self,
-                        "any_signal::pre_activate", G_CALLBACK (cb_proxy_pre_activate), self,
-                        "any_signal::post_activate", G_CALLBACK (cb_proxy_post_activate), self, 
--                       0);
-+                       NULL);
-   g_object_unref (action_group);
- 
-   /* dirty all nodes, as action bindings may change */
diff --git a/x11-libs/gtk+/files/gtk+-2.4.x-filesel-navbuttons.patch.bz2 b/x11-libs/gtk+/files/gtk+-2.4.x-filesel-navbuttons.patch.bz2
deleted file mode 100644
index 5a0f37327d48..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.4.x-filesel-navbuttons.patch.bz2
+++ /dev/null
diff --git a/x11-libs/gtk+/files/gtk+-wm.patch b/x11-libs/gtk+/files/gtk+-wm.patch
deleted file mode 100644
index 5706395e021c..000000000000
--- a/x11-libs/gtk+/files/gtk+-wm.patch
+++ /dev/null
@@ -1,378 +0,0 @@
-Index: configure.in
-===================================================================
-RCS file: /cvs/gnome/gtk+/configure.in,v
-retrieving revision 1.307
-diff -u -p -u -r1.307 configure.in
---- configure.in	3 Dec 2002 03:11:41 -0000	1.307
-+++ configure.in	9 Dec 2002 16:44:48 -0000
-@@ -1149,6 +1149,16 @@ if test "x$gdktarget" = "xx11"; then
-       ,
-       $x_libs_for_checks)
- 
-+  # Check for XSync extension
-+
-+  AC_CHECK_LIB(Xext, XSyncQueryExtension,
-+      if test -z "`echo $x_extra_libs $x_libs | grep "\-lXext" 2> /dev/null`"; then
-+           x_extra_libs="-lXext $x_extra_libs"
-+      fi
-+      AC_DEFINE(HAVE_XSYNC),
-+      ,
-+      $x_libs_for_checks)
-+
-   # Check for XConvertCase (X11R6 specific)
- 
-   AC_CHECK_LIB(X11, XConvertCase,
-Index: acconfig.h
-===================================================================
-RCS file: /cvs/gnome/gtk+/acconfig.h,v
-retrieving revision 1.28
-diff -u -p -u -r1.28 acconfig.h
---- acconfig.h	12 Jun 2002 18:48:09 -0000	1.28
-+++ acconfig.h	9 Dec 2002 16:44:48 -0000
-@@ -48,6 +48,9 @@
- #undef USE_GMODULE
- #undef USE_MMX
- 
-+/* Xsync extension */
-+#undef HAVE_XSYNC
-+
- /* Define to use XKB extension */
- #undef HAVE_XKB
- 
-Index: gdk/gdkgc.c
-===================================================================
-RCS file: /cvs/gnome/gtk+/gdk/gdkgc.c,v
-retrieving revision 1.39
-diff -u -p -u -r1.39 gdkgc.c
---- gdk/gdkgc.c	25 Sep 2002 07:23:52 -0000	1.39
-+++ gdk/gdkgc.c	9 Dec 2002 16:44:48 -0000
-@@ -112,7 +112,7 @@ gdk_gc_new_with_values (GdkDrawable	*dra
-     {
-       gc->colormap = gdk_drawable_get_colormap (drawable);
-       if (gc->colormap)
--	g_object_ref (gc->colormap);
-+        g_object_ref (gc->colormap);
-     }
-   
-   return gc;
-Index: gdk/gdkinternals.h
-===================================================================
-RCS file: /cvs/gnome/gtk+/gdk/gdkinternals.h,v
-retrieving revision 1.27
-diff -u -p -u -r1.27 gdkinternals.h
---- gdk/gdkinternals.h	31 Oct 2002 21:11:13 -0000	1.27
-+++ gdk/gdkinternals.h	9 Dec 2002 16:44:48 -0000
-@@ -308,6 +308,11 @@ void _gdk_windowing_display_set_sm_clien
- GType _gdk_window_impl_get_type (void) G_GNUC_CONST;
- GType _gdk_pixmap_impl_get_type (void) G_GNUC_CONST;
- 
-+/* Called after processing updates on a window */
-+void _gdk_windowing_window_notify_updated (GdkWindow *window);
-+/* Called when we get a configure notify on a window */
-+void _gdk_window_must_notify_updated      (GdkWindow *window);
-+
- /************************************
-  * Initialization and exit routines *
-  ************************************/
-Index: gdk/gdkwindow.c
-===================================================================
-RCS file: /cvs/gnome/gtk+/gdk/gdkwindow.c,v
-retrieving revision 1.146
-diff -u -p -u -r1.146 gdkwindow.c
---- gdk/gdkwindow.c	28 Nov 2002 00:33:03 -0000	1.146
-+++ gdk/gdkwindow.c	9 Dec 2002 16:44:48 -0000
-@@ -2067,6 +2067,7 @@ gdk_window_copy_to_image (GdkDrawable   
-  */
- 
- static GSList *update_windows = NULL;
-+static GSList *update_notify_windows = NULL;
- static guint update_idle = 0;
- static gboolean debug_updates = FALSE;
- 
-@@ -2133,6 +2134,18 @@ gdk_window_process_updates_internal (Gdk
- 
- 	  if (expose_region != update_area)
- 	    gdk_region_destroy (expose_region);
-+
-+          /* Notify windowing system of updates, X11 uses this
-+           * to notify the window manager
-+           */
-+          {
-+            GdkWindow *top;
-+
-+            top = gdk_window_get_toplevel (window);
-+            if (top != NULL)
-+              _gdk_window_must_notify_updated (top);
-+          }
-+          
- 	  g_object_unref (window);
- 	}
-       if (!save_region)
-@@ -2140,6 +2153,51 @@ gdk_window_process_updates_internal (Gdk
-     }
- }
- 
-+static void
-+gdk_window_notify_updates (void)
-+{
-+  GSList *tmp_list = update_notify_windows;
-+
-+  while (tmp_list != NULL)
-+    {
-+      GSList *next = tmp_list->next;
-+      GdkWindow *window = tmp_list->data;
-+      
-+      _gdk_windowing_window_notify_updated (window);
-+      g_object_unref (G_OBJECT (window));
-+      
-+      tmp_list = next;
-+    }
-+
-+  g_slist_free (update_notify_windows);
-+  update_notify_windows = NULL;
-+}
-+
-+/* FIXME move this */
-+static gboolean gdk_window_update_idle (gpointer data);
-+
-+void
-+_gdk_window_must_notify_updated (GdkWindow *window)
-+{
-+  if (GDK_WINDOW_OBJECT (window)->window_type == GDK_WINDOW_TOPLEVEL ||
-+      GDK_WINDOW_OBJECT (window)->window_type == GDK_WINDOW_DIALOG)
-+    {
-+      if (g_slist_find (update_notify_windows, window) == NULL)
-+        {
-+          update_notify_windows = g_slist_prepend (update_notify_windows,
-+                                                   window);
-+          g_object_ref (window);
-+        }
-+
-+      /* be sure we process updates, even if there's not actually
-+       * any invalid region.
-+       */
-+      if (!GDK_WINDOW_OBJECT (window)->update_freeze_count && !update_idle)
-+        update_idle = g_idle_add_full (GDK_PRIORITY_REDRAW,
-+                                       gdk_window_update_idle, NULL, NULL);
-+    }
-+}
-+
- /**
-  * gdk_window_process_all_updates:
-  *
-@@ -2167,10 +2225,12 @@ gdk_window_process_all_updates (void)
-       g_object_unref (tmp_list->data);
-       tmp_list = tmp_list->next;
-     }
--
-+  
-   g_slist_free (old_update_windows);
- 
--  gdk_flush();
-+  gdk_window_notify_updates ();
-+  
-+  gdk_flush ();
- }
- 
- static gboolean
-@@ -2222,6 +2282,8 @@ gdk_window_process_updates (GdkWindow *w
- 	  tmp_list = tmp_list->next;
- 	}
-     }
-+
-+  gdk_window_notify_updates ();
- }
- 
- /**
-Index: gdk/x11/gdkdisplay-x11.c
-===================================================================
-RCS file: /cvs/gnome/gtk+/gdk/x11/gdkdisplay-x11.c,v
-retrieving revision 1.24
-diff -u -p -u -r1.24 gdkdisplay-x11.c
---- gdk/x11/gdkdisplay-x11.c	28 Nov 2002 00:33:05 -0000	1.24
-+++ gdk/x11/gdkdisplay-x11.c	9 Dec 2002 16:44:48 -0000
-@@ -213,6 +213,20 @@ gdk_display_open (const gchar *display_n
-   }
- #endif
- 
-+  display_x11->use_xsync = FALSE;
-+#ifdef HAVE_XSYNC
-+  {
-+    int major, minor;
-+    int error_base, event_base;
-+    
-+    if (XSyncQueryExtension (display_x11->xdisplay,
-+                              &event_base, &error_base) &&
-+        XSyncInitialize (display_x11->xdisplay,
-+                         &major, &minor))
-+      display_x11->use_xsync = TRUE;
-+  }
-+#endif
-+  
-   _gdk_windowing_image_init (display);
-   _gdk_events_init (display);
-   _gdk_input_init (display);
-Index: gdk/x11/gdkdisplay-x11.h
-===================================================================
-RCS file: /cvs/gnome/gtk+/gdk/x11/gdkdisplay-x11.h,v
-retrieving revision 1.8
-diff -u -p -u -r1.8 gdkdisplay-x11.h
---- gdk/x11/gdkdisplay-x11.h	8 Nov 2002 22:29:32 -0000	1.8
-+++ gdk/x11/gdkdisplay-x11.h	9 Dec 2002 16:44:48 -0000
-@@ -24,8 +24,14 @@
- #ifndef __GDK_DISPLAY_X11__
- #define __GDK_DISPLAY_X11__
- 
-+#include <config.h>
-+
- #include <X11/X.h>
- #include <X11/Xlib.h>
-+#ifdef HAVE_XSYNC
-+#include <X11/extensions/sync.h>
-+#endif
-+
- #include <glib.h>
- #include <gdk/gdkdisplay.h>
- #include <gdk/gdkkeys.h>
-@@ -136,6 +142,9 @@ struct _GdkDisplayX11
- 
-   /* Startup notification */
-   gchar *startup_notification_id;
-+
-+  /* XSync */
-+  gboolean use_xsync;
- };
- 
- struct _GdkDisplayX11Class
-Index: gdk/x11/gdkevents-x11.c
-===================================================================
-RCS file: /cvs/gnome/gtk+/gdk/x11/gdkevents-x11.c,v
-retrieving revision 1.104
-diff -u -p -u -r1.104 gdkevents-x11.c
---- gdk/x11/gdkevents-x11.c	9 Dec 2002 02:41:51 -0000	1.104
-+++ gdk/x11/gdkevents-x11.c	9 Dec 2002 16:44:49 -0000
-@@ -1627,6 +1627,9 @@ gdk_event_translate (GdkDisplay *display
- 	      if (window_private->resize_count == 0)
- 		_gdk_moveresize_configure_done (display, window);
- 	    }
-+
-+          /* be sure we increment our update counter */
-+          _gdk_window_must_notify_updated (window);
- 	}
-       break;
-       
-Index: gdk/x11/gdkwindow-x11.c
-===================================================================
-RCS file: /cvs/gnome/gtk+/gdk/x11/gdkwindow-x11.c,v
-retrieving revision 1.179
-diff -u -p -u -r1.179 gdkwindow-x11.c
---- gdk/x11/gdkwindow-x11.c	3 Dec 2002 21:57:13 -0000	1.179
-+++ gdk/x11/gdkwindow-x11.c	9 Dec 2002 16:44:50 -0000
-@@ -365,6 +365,41 @@ check_leader_window_title (GdkDisplay *d
-     }
- }
- 
-+static void
-+create_update_counter (GdkDisplay       *display,
-+                       GdkWindowImplX11 *impl)
-+{
-+  impl->update_counter = None;
-+#ifdef HAVE_XSYNC
-+  if (g_getenv ("GDK_DISABLE_UPDATE_COUNTER") == NULL)
-+    {
-+      XSyncValue value;
-+      /* we init to 1, so that 0 can be "invalid" */
-+      XSyncIntToValue (&value, 1);
-+      impl->update_counter = XSyncCreateCounter (GDK_DISPLAY_XDISPLAY (display),
-+                                                 value);
-+      
-+      XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
-+                       GDK_DRAWABLE_IMPL_X11 (impl)->xid, 
-+                       
-+                       gdk_x11_get_xatom_by_name_for_display (display, "_METACITY_UPDATE_COUNTER"),
-+                       gdk_x11_get_xatom_by_name_for_display (display, "SYNC_COUNTER"),
-+                       32, PropModeReplace,
-+                       (guchar *) &impl->update_counter, 1);
-+    }
-+#endif /* HAVE_XSYNC */
-+}
-+
-+static void
-+destroy_update_counter (GdkDisplay       *display,
-+                        GdkWindowImplX11 *impl)
-+{
-+#ifdef HAVE_XSYNC
-+  if (impl->update_counter != None)
-+    XSyncDestroyCounter (GDK_DISPLAY_XDISPLAY (display), impl->update_counter);
-+#endif /* HAVE_XSYNC */
-+}
-+
- /**
-  * gdk_window_new:
-  * @parent: a #GdkWindow, or %NULL to create the window as a child of
-@@ -616,7 +651,11 @@ gdk_window_new (GdkWindow     *parent,
-     {
-     case GDK_WINDOW_DIALOG:
-       XSetTransientForHint (xdisplay, xid, xparent);
-+      /* FALL THROUGH */
-     case GDK_WINDOW_TOPLEVEL:
-+      create_update_counter (gdk_drawable_get_display (window),
-+                             impl);
-+      /* FALL THROUGH */
-     case GDK_WINDOW_TEMP:
-       set_wm_protocols (window);
-       break;
-@@ -877,6 +916,9 @@ _gdk_windowing_window_destroy (GdkWindow
-   }
- #endif /* HAVE_XFT */  
- 
-+  destroy_update_counter (gdk_drawable_get_display (window),
-+                          GDK_WINDOW_IMPL_X11 (private->impl));
-+  
-   if (private->window_type == GDK_WINDOW_FOREIGN)
-     {
-       if (!foreign_destroy && (private->parent != NULL))
-@@ -5013,4 +5055,26 @@ gdk_window_begin_move_drag (GdkWindow *w
- 		       timestamp);
-   else
-     emulate_move_drag (window, button, root_x, root_y, timestamp);
-+}
-+
-+void
-+_gdk_windowing_window_notify_updated (GdkWindow *window)
-+{
-+#ifdef HAVE_XSYNC
-+  GdkWindowObject *private = (GdkWindowObject *)window;
-+  GdkWindowImplX11 *impl = GDK_WINDOW_IMPL_X11 (private->impl);
-+
-+  if (GDK_WINDOW_DESTROYED (window))
-+    return;
-+  
-+  if (impl->update_counter != None)
-+    {
-+      XSyncValue value;
-+      
-+      XSyncIntToValue (&value, 1);
-+      
-+      XSyncChangeCounter (GDK_DRAWABLE_XDISPLAY (window),
-+                          impl->update_counter, value);
-+    }
-+#endif
- }
-Index: gdk/x11/gdkwindow-x11.h
-===================================================================
-RCS file: /cvs/gnome/gtk+/gdk/x11/gdkwindow-x11.h,v
-retrieving revision 1.6
-diff -u -p -u -r1.6 gdkwindow-x11.h
---- gdk/x11/gdkwindow-x11.h	9 Dec 2002 02:41:51 -0000	1.6
-+++ gdk/x11/gdkwindow-x11.h	9 Dec 2002 16:44:50 -0000
-@@ -96,6 +96,9 @@ struct _GdkWindowImplX11
-    * that might not even be part of this app
-    */
-   Window focus_window;
-+
-+  /* XSyncCounter */
-+  XID update_counter;
- };
-  
- struct _GdkWindowImplX11Class 
diff --git a/x11-libs/gtk+/gtk+-2.2.4-r1.ebuild b/x11-libs/gtk+/gtk+-2.2.4-r1.ebuild
deleted file mode 100644
index 6db54771bff7..000000000000
--- a/x11-libs/gtk+/gtk+-2.2.4-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.2.4-r1.ebuild,v 1.16 2004/06/24 22:01:25 agriffis Exp $
-
-inherit eutils libtool flag-o-matic
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.2/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="x86 ppc alpha sparc amd64 hppa ia64 mips"
-IUSE="doc tiff jpeg"
-
-RDEPEND="virtual/x11
-	>=dev-libs/glib-2.2
-	>=dev-libs/atk-1.2
-	>=x11-libs/pango-1.2
-	>=media-libs/libpng-1.2.1
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( >=media-libs/tiff-3.5.7 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-0.9 )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# Turn of --export-symbols-regex for now, since it removes
-	# the wrong symbols
-	epatch ${FILESDIR}/gtk+-2.0.6-exportsymbols.patch
-	# should speed up metacity
-	epatch ${FILESDIR}/gtk+-wm.patch
-	# beautifying patch for disabled icons
-	epatch ${FILESDIR}/${PN}-2.2.1-disable_icons_smooth_alpha.patch
-	# xft/slighthint stuff from RH
-	epatch ${FILESDIR}/${PN}-2-xftprefs.patch
-	# notification area loop fix (http://bugs.gnome.org/show_bug.cgi?id=122327)
-	# submitted by <pat@engsoc.org>
-	epatch ${FILESDIR}/${PN}-2.2-notificationarea_loop.patch
-
-	autoconf || die
-}
-
-src_compile() {
-	# bug 8762
-	replace-flags "-O3" "-O2"
-
-	elibtoolize
-
-	econf \
-		`use_enable doc gtk-doc` \
-		`use_with jpeg libjpeg` \
-		`use_with tiff libtiff` \
-		--with-gdktarget=x11 \
-		--with-xinput=xfree \
-		|| die
-
-	# gtk+ isn't multithread friendly due to some obscure code generation bug
-	make || die
-}
-
-src_install() {
-	dodir /etc/gtk-2.0
-
-	make DESTDIR=${D} \
-		prefix=/usr \
-		sysconfdir=/etc \
-		infodir=/usr/share/info \
-		mandir=/usr/share/man \
-		install || die
-
-	# Enable xft in environment as suggested by <utx@gentoo.org>
-	dodir /etc/env.d
-	echo "GDK_USE_XFT=1" >${D}/etc/env.d/50gtk2
-
-	dodoc AUTHORS COPYING ChangeLog* HACKING INSTALL NEWS* README*
-}
-
-pkg_postinst() {
-	gtk-query-immodules-2.0 >	/etc/gtk-2.0/gtk.immodules
-	gdk-pixbuf-query-loaders >	/etc/gtk-2.0/gdk-pixbuf.loaders
-
-	einfo "For your gtk themes to work correctly after an update,"
-	einfo "you might have to rebuild your theme engines."
-	einfo "Executing 'qpkg -I -nc gtk-engines | xargs emerge' should do the trick (requires gentoolkit)"
-
-	env-update
-}
-
-pkg_postrm() {
-
-	env-update
-
-}
diff --git a/x11-libs/gtk+/gtk+-2.4.0-r1.ebuild b/x11-libs/gtk+/gtk+-2.4.0-r1.ebuild
deleted file mode 100644
index 5abe8a1a4d9f..000000000000
--- a/x11-libs/gtk+/gtk+-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.4.0-r1.ebuild,v 1.7 2004/06/24 22:01:25 agriffis Exp $
-
-inherit libtool flag-o-matic eutils
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.4/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="x86 ppc ~sparc ~mips ~alpha hppa ~amd64 ~ia64"
-IUSE="doc tiff jpeg"
-
-RDEPEND="virtual/x11
-	>=dev-libs/glib-2.4
-	>=dev-libs/atk-1.0.1
-	>=x11-libs/pango-1.4
-	>=media-libs/libpng-1.2.1
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( >=media-libs/tiff-3.5.7 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	# Turn of --export-symbols-regex for now, since it removes
-	# the wrong symbols
-	epatch ${FILESDIR}/gtk+-2.0.6-exportsymbols.patch
-	# beautifying patch for disabled icons
-	epatch ${FILESDIR}/${PN}-2.2.1-disable_icons_smooth_alpha.patch
-
-	# This patch fixes crashes in epiphany that some users on amd64
-	# seem to be experiencing. For more information, please refer to
-	# http://bugzilla.gnome.org/show_bug.cgi?id=138997
-	# This might also be usefull to other archs.
-	# Travis Tilley <lv@gentoo.org> (9 Apr 2004)
-	epatch ${FILESDIR}/gtk+-2.4.0-uimanager-zero-becomes-null.patch
-
-	autoconf || die
-
-}
-
-src_compile() {
-
-	# bug 8762
-	replace-flags "-O3" "-O2"
-
-	elibtoolize
-
-	econf \
-		`use_enable doc gtk-doc` \
-		`use_with jpeg libjpeg` \
-		`use_with tiff libtiff` \
-		--with-png \
-		--with-gdktarget=x11 \
-		--with-xinput \
-		|| die
-
-	# gtk+ isn't multithread friendly due to some obscure code generation bug
-	MAKEOPTS="${MAKEOPTS} -j1" emake || die
-
-}
-
-src_install() {
-
-	dodir /etc/gtk-2.0
-
-	make DESTDIR=${D} install || die
-
-	# Enable xft in environment as suggested by <utx@gentoo.org>
-	dodir /etc/env.d
-	echo "GDK_USE_XFT=1" >${D}/etc/env.d/50gtk2
-
-	dodoc AUTHORS ChangeLog* HACKING INSTALL NEWS* README*
-
-}
-
-pkg_postinst() {
-
-	gtk-query-immodules-2.0 >	/etc/gtk-2.0/gtk.immodules
-	gdk-pixbuf-query-loaders >	/etc/gtk-2.0/gdk-pixbuf.loaders
-
-	einfo "For gtk themes to work correctly after an update, you might have to rebuild your theme engines."
-	einfo "Executing 'qpkg -f -nc /usr/lib/gtk-2.0/2.2.0/engines | xargs emerge' should do the trick if"
-	einfo "you upgrade from gtk+-2.2 to 2.4 (requires gentoolkit)."
-
-}
diff --git a/x11-libs/gtk+/gtk+-2.4.3-r1.ebuild b/x11-libs/gtk+/gtk+-2.4.3-r1.ebuild
deleted file mode 100644
index f49e58ef6549..000000000000
--- a/x11-libs/gtk+/gtk+-2.4.3-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.4.3-r1.ebuild,v 1.2 2004/07/20 20:41:08 tgall Exp $
-
-inherit libtool flag-o-matic eutils
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.4/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ppc64"
-IUSE="doc tiff jpeg"
-
-RDEPEND="virtual/x11
-	>=dev-libs/glib-2.4
-	>=dev-libs/atk-1.0.1
-	>=x11-libs/pango-1.4
-	>=media-libs/libpng-1.2.1
-	>=x11-themes/gnome-icon-theme-1.2
-	x11-misc/shared-mime-info
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( >=media-libs/tiff-3.5.7 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	sys-devel/autoconf
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	# Turn of --export-symbols-regex for now, since it removes
-	# the wrong symbols
-	epatch ${FILESDIR}/gtk+-2.0.6-exportsymbols.patch
-	# beautifying patch for disabled icons
-	epatch ${FILESDIR}/${PN}-2.2.1-disable_icons_smooth_alpha.patch
-	# define a sensible default icon theme
-	epatch ${FILESDIR}/${PN}-2.4.1-define_sensible_icon_theme.patch
-	# Fileselect dialog from Ximian/Suse
-	epatch ${FILESDIR}/${PN}-2.4.x-filesel-navbuttons.patch.bz2
-
-	autoconf || die
-
-}
-
-src_compile() {
-
-	# bug 8762
-	replace-flags "-O3" "-O2"
-
-	elibtoolize
-
-	econf \
-		`use_enable doc gtk-doc` \
-		`use_with jpeg libjpeg` \
-		`use_with tiff libtiff` \
-		--with-png \
-		--with-gdktarget=x11 \
-		--with-xinput \
-		|| die
-
-	# gtk+ isn't multithread friendly due to some obscure code generation bug
-	MAKEOPTS="${MAKEOPTS} -j1" emake || die
-
-}
-
-src_install() {
-
-	dodir /etc/gtk-2.0
-
-	make DESTDIR=${D} install || die
-
-	# Enable xft in environment as suggested by <utx@gentoo.org>
-	dodir /etc/env.d
-	echo "GDK_USE_XFT=1" >${D}/etc/env.d/50gtk2
-
-	dodoc AUTHORS ChangeLog* HACKING INSTALL NEWS* README*
-
-}
-
-pkg_postinst() {
-
-	gtk-query-immodules-2.0 >	/etc/gtk-2.0/gtk.immodules
-	gdk-pixbuf-query-loaders >	/etc/gtk-2.0/gdk-pixbuf.loaders
-
-	einfo "For gtk themes to work correctly after an update, you might have to rebuild your theme engines."
-	einfo "Executing 'qpkg -f -nc /usr/lib/gtk-2.0/2.2.0/engines | xargs emerge' should do the trick if"
-	einfo "you upgrade from gtk+-2.2 to 2.4 (requires gentoolkit)."
-
-}
diff --git a/x11-libs/gtk+/gtk+-2.4.3.ebuild b/x11-libs/gtk+/gtk+-2.4.9.ebuild
index 3db642b4efb2..e0ecc57d2d68 100644
--- a/x11-libs/gtk+/gtk+-2.4.3.ebuild
+++ b/x11-libs/gtk+/gtk+-2.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.4.3.ebuild,v 1.3 2004/06/29 04:47:31 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.4.9.ebuild,v 1.1 2004/08/29 12:50:08 foser Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -17,9 +17,8 @@ RDEPEND="virtual/x11
 	>=dev-libs/glib-2.4
 	>=dev-libs/atk-1.0.1
 	>=x11-libs/pango-1.4
-	>=media-libs/libpng-1.2.1
-	>=x11-themes/gnome-icon-theme-1.2
 	x11-misc/shared-mime-info
+	>=media-libs/libpng-1.2.1
 	jpeg? ( >=media-libs/jpeg-6b-r2 )
 	tiff? ( >=media-libs/tiff-3.5.7 )"
 
@@ -28,7 +27,6 @@ DEPEND="${RDEPEND}
 	sys-devel/autoconf
 	doc? ( >=dev-util/gtk-doc-1 )"
 
-
 src_unpack() {
 
 	unpack ${A}
@@ -39,8 +37,9 @@ src_unpack() {
 	epatch ${FILESDIR}/gtk+-2.0.6-exportsymbols.patch
 	# beautifying patch for disabled icons
 	epatch ${FILESDIR}/${PN}-2.2.1-disable_icons_smooth_alpha.patch
-	# define a sensible default icon theme
-	epatch ${FILESDIR}/${PN}-2.4.1-define_sensible_icon_theme.patch
+	# add smoothscroll support for usability reasons
+	# http://bugzilla.gnome.org/show_bug.cgi?id=103811
+	epatch ${FILESDIR}/${PN}-2.4-smoothscroll.patch
 
 	autoconf || die