new release

Package-Manager: portage-2.0.51.19
author: Marinus Schraal <foser@gentoo.org> 2005-06-22 16:05:59 +0000
committer: Marinus Schraal <foser@gentoo.org> 2005-06-22 16:05:59 +0000
commit: 009d6cc72a1b1e16e5adea338a2bc317b793e884 (patch)
tree: 81532ed7478614428c64091ecb980417a75e6315 /x11-libs/gtk+
parent: Version bump for bug 96700; Don't waste time building tests/examples. Also ad... (diff)
download: historical-009d6cc72a1b1e16e5adea338a2bc317b793e884.tar.gz
historical-009d6cc72a1b1e16e5adea338a2bc317b793e884.tar.bz2
historical-009d6cc72a1b1e16e5adea338a2bc317b793e884.zip
22 files changed, 32 insertions, 2076 deletions
diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 14c6e6a3f986..429634505ef0 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.168 2005/06/12 18:15:51 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.169 2005/06/22 16:05:59 foser Exp $
+
+*gtk+-2.6.8 (22 Jun 2005)
+
+  22 Jun 2005; Marinus Schraal <foser@gentoo.org> gtk+-2.6.8.ebuild :
+  New release
 
   12 Jun 2005; Olivier Crête <tester@gentoo.org> gtk+-2.6.7.ebuild:
   Stable on amd64
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 43c050c47783..30061681b873 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,45 +1,18 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d0160ef5c7f542df383228f3a040580e gtk+-2.4.9-r1.ebuild 3139
-MD5 ef2a0dc4245e964cf21ba8b20a3ad067 gtk+-2.6.2.ebuild 3036
-MD5 55a0240fe45beae9e83402b8bd3f8cbf gtk+-2.6.1-r2.ebuild 3279
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 88d6d5cc6a5a4f0e0426646667134046 gtk+-1.2.10-r11.ebuild 1831
-MD5 afb0e5aa8f6410c088c2e177a17efe5d gtk+-1.2.10-r10.ebuild 1719
-MD5 8482453c8a5b40134b3b60b8e923ec5b gtk+-2.4.13-r1.ebuild 3120
-MD5 e83d1e963506dee6bda61f3f8d02f49e ChangeLog 24155
-MD5 4cb5f6f9bbd2c302c853982ca7592744 gtk+-2.6.4.ebuild 2901
-MD5 cc82c88ecc09a6160980805e484421ac gtk+-2.4.14.ebuild 2916
-MD5 b63cd20330898c8115bb7f119e4c60b6 gtk+-2.4.9-r2.ebuild 3178
 MD5 d449a794b875a68522a7a57c677dd7cd gtk+-2.6.4-r1.ebuild 2980
+MD5 afb0e5aa8f6410c088c2e177a17efe5d gtk+-1.2.10-r10.ebuild 1719
+MD5 70f9e2f352eb8131022f1003e0b7fe03 gtk+-2.6.8.ebuild 2868
 MD5 f78de8cc7b7a7c958e45de5b0b444aa8 gtk+-2.6.7.ebuild 2862
-MD5 28fa6c231f22418b560385c58a179543 files/digest-gtk+-2.4.9-r1 133
+MD5 91090d2303bfff8cf4823c5eb8cb0a59 ChangeLog 24266
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 9140d07ec4cf965b2041cf5b7f128743 files/digest-gtk+-2.6.7 208
+MD5 be913a24b313d3aa817672877af353f3 files/digest-gtk+-2.6.8 139
+MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
 MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r11 138
-MD5 a81714da3cedcf01f370878a82f4ba8d files/gtk+-2.6.1-gtk_dialog.patch 627
-MD5 c009a53ad7a5f839fc0b47feb72369fd files/gtk+-2.6.1-empty_default_combo.patch 4293
-MD5 b56b88c0586a987cf38f9cf8b4c04688 files/digest-gtk+-2.6.2 208
-MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
-MD5 df6efc98861d335b1a09eab5c6011620 files/gtk+-2.4-smoothscroll.patch 29006
 MD5 36d00cf3b4035e6cb9873ade9ed1a9ce files/gtkrc 627
-MD5 cb2a11a7cb2252993185a44ddaa52d4e files/digest-gtk+-2.6.1-r2 208
-MD5 0df92cf64a9324ef85fc72885a4285b1 files/gtk+-2.4.9-ppc64.patch 1732
-MD5 480ef570b5082ad4677f50eb110ef1e0 files/digest-gtk+-2.6.4 208
-MD5 28fa6c231f22418b560385c58a179543 files/digest-gtk+-2.4.9-r2 133
-MD5 621a7db3e7e6856c66eec5caeea1e88e files/digest-gtk+-1.2.10-r10 138
-MD5 06d8be5421935ac9ed4da45830bb68bc files/gtk+-2.4.9-xpm_ico_secure.patch 3291
-MD5 549c22c55ac1f423f716d7bc28564c17 files/digest-gtk+-2.4.14 208
-MD5 96b708d4ee80d6f31674d4a83e950276 files/digest-gtk+-2.4.13-r1 208
-MD5 69a6335566f344b004a5db02b68008ed files/gtk+-2.0.6-exportsymbols.patch 558
 MD5 5e3ff7fa761495300d3f30c9207c13f8 files/gtk+-1.2-locale_fix.patch 419
-MD5 480ef570b5082ad4677f50eb110ef1e0 files/digest-gtk+-2.6.4-r1 208
-MD5 9140d07ec4cf965b2041cf5b7f128743 files/digest-gtk+-2.6.7 208
 MD5 0ec83a4bf20f79d85eb2976b58c39465 files/gtk+-1.2.10-m4.patch 220
+MD5 480ef570b5082ad4677f50eb110ef1e0 files/digest-gtk+-2.6.4-r1 208
 MD5 84c943ddbc93a756c745f969e9d542e2 files/gtk+-2.6.4-bmp_reject_corrupt.patch 1256
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCrHvxmOfEJZHYOKcRApkRAKCsHP2j3l7t94eUcHJTJkG3JMfbNQCcDtFa
-TovuGdPPOeoHZ+a8+FE6uTs=
-=niAg
------END PGP SIGNATURE-----
+MD5 d94ff41d82a8f0c56dd68a2fa71ef2fc files/gtk+-2.2.1-disable_icons_smooth_alpha.patch 1383
+MD5 0df92cf64a9324ef85fc72885a4285b1 files/gtk+-2.4.9-ppc64.patch 1732
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.4.13-r1 b/x11-libs/gtk+/files/digest-gtk+-2.4.13-r1
deleted file mode 100644
index 77956265b95c..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.4.13-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3a438e1010704b11acaf060c9ba0fd7b gtk+-2.4.13.tar.bz2 9272024
-MD5 5aac24d5f86eb87ca6e9b9f024782555 gtk+-2.4-smoothscroll-r1.patch 25007
-MD5 8608e20184bd9f4d3eca98d7c01c98ee gtk+-2.4.1-lib64.patch.bz2 6982
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.4.14 b/x11-libs/gtk+/files/digest-gtk+-2.4.14
deleted file mode 100644
index 06787ceafb5e..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.4.14
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 10470d574933460809e4ac488e579e26 gtk+-2.4.14.tar.bz2 9641695
-MD5 5aac24d5f86eb87ca6e9b9f024782555 gtk+-2.4-smoothscroll-r1.patch 25007
-MD5 8608e20184bd9f4d3eca98d7c01c98ee gtk+-2.4.1-lib64.patch.bz2 6982
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.4.9-r1 b/x11-libs/gtk+/files/digest-gtk+-2.4.9-r1
deleted file mode 100644
index 3ede30e4d7ca..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.4.9-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 bfe3b960d334e81d8f91c3509f70868d gtk+-2.4.9.tar.bz2 9599004
-MD5 8608e20184bd9f4d3eca98d7c01c98ee gtk+-2.4.1-lib64.patch.bz2 6982
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.4.9-r2 b/x11-libs/gtk+/files/digest-gtk+-2.4.9-r2
deleted file mode 100644
index 3ede30e4d7ca..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.4.9-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 bfe3b960d334e81d8f91c3509f70868d gtk+-2.4.9.tar.bz2 9599004
-MD5 8608e20184bd9f4d3eca98d7c01c98ee gtk+-2.4.1-lib64.patch.bz2 6982
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.6.1-r2 b/x11-libs/gtk+/files/digest-gtk+-2.6.1-r2
deleted file mode 100644
index 3b2b31081039..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.6.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 146ed9d12c9506fcf8745ddb2c22530a gtk+-2.6.1.tar.bz2 11070668
-MD5 ea90aff86c5f7d059bceb6b3550e6aac gtk+-2.6-smoothscroll-r2.patch 26277
-MD5 5a046e852e4a0145197fca14969dcd4d gtk+-2.6.1-lib64.patch.bz2 6047
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.6.2 b/x11-libs/gtk+/files/digest-gtk+-2.6.2
deleted file mode 100644
index 1abd34aee985..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.6.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f5cbbcb82627bc6d0d186063e6109399 gtk+-2.6.2.tar.bz2 11206837
-MD5 ea90aff86c5f7d059bceb6b3550e6aac gtk+-2.6-smoothscroll-r2.patch 26277
-MD5 5a046e852e4a0145197fca14969dcd4d gtk+-2.6.1-lib64.patch.bz2 6047
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.6.4 b/x11-libs/gtk+/files/digest-gtk+-2.6.4
deleted file mode 100644
index 2525cd8498ef..000000000000
--- a/x11-libs/gtk+/files/digest-gtk+-2.6.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4749fce7b082b784a71a076aa586dc25 gtk+-2.6.4.tar.bz2 11222426
-MD5 ea90aff86c5f7d059bceb6b3550e6aac gtk+-2.6-smoothscroll-r2.patch 26277
-MD5 5a046e852e4a0145197fca14969dcd4d gtk+-2.6.1-lib64.patch.bz2 6047
diff --git a/x11-libs/gtk+/files/digest-gtk+-2.6.8 b/x11-libs/gtk+/files/digest-gtk+-2.6.8
new file mode 100644
index 000000000000..b93efb4f50be
--- /dev/null
+++ b/x11-libs/gtk+/files/digest-gtk+-2.6.8
@@ -0,0 +1,2 @@
+MD5 535fa4b62d219445b99953f679b5cf8e gtk+-2.6.8.tar.bz2 11648931
+MD5 85c85d563204d34c17a8670770c1120a gtk+-2.6-smoothscroll-r5.patch 18330
diff --git a/x11-libs/gtk+/files/gtk+-2.0.6-exportsymbols.patch b/x11-libs/gtk+/files/gtk+-2.0.6-exportsymbols.patch
deleted file mode 100644
index e6106e741928..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.0.6-exportsymbols.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gtk+-2.0.6/configure.in.exportsymbols	Thu Aug  8 16:46:41 2002
-+++ gtk+-2.0.6/configure.in	Thu Aug  8 16:47:12 2002
-@@ -273,7 +273,8 @@
- if test "$os_win32" != yes; then
-     # libtool option to control which symbols are exported
-     # right now, symbols starting with _ are not exported
--    LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"'
-+    # Disabled until -export-symbols-regex works (RH patch)
-+    LIBTOOL_EXPORT_OPTIONS=
- else
-     # We currently use .def files on Windows (for gdk-pixbuf, gdk and gtk)
-     LIBTOOL_EXPORT_OPTIONS=
diff --git a/x11-libs/gtk+/files/gtk+-2.4-smoothscroll.patch b/x11-libs/gtk+/files/gtk+-2.4-smoothscroll.patch
deleted file mode 100644
index 8ce2966fbed0..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.4-smoothscroll.patch
+++ /dev/null
@@ -1,1074 +0,0 @@
-? 119804.patch
-? ChangeLog.new
-? accels
-? accepttab
-? adsf
-? asdf
-? beta
-? birnan
-? blah
-? complete.diff
-? crack.patch
-? defer_phase1
-? dizzy2.patch
-? dizzybar.patch
-? draw-as-radio.patch
-? emfle
-? extra.patch
-? frugt
-? gd
-? goback.patch
-? good-install.patch
-? gtk-noexpose-scroll.diff
-? gtkd
-? hasspinner.patch
-? head-unchanged-gtk+-diff
-? hmm
-? hmm.patch
-? huh
-? instrument.patch
-? jazz.patch
-? jazz2.patch
-? mactreeplus.patch
-? mbdraw.patch
-? menu-redraw
-? no-flicker-old.patch
-? nopackend
-? paintstack-3.diff
-? paintstack.diff
-? paintstack2.diff
-? patches
-? phase1
-? profiler.diff
-? profiler.log
-? signalspeedup
-? simple_scroll.patch
-? simplify.patch
-? slet
-? smooth2.patch
-? statu
-? string-bugs.patch
-? td2
-? textdiff
-? textview-cursor-move.patch
-? tool-current.patch
-? tool13
-? tooldiff
-? tooldiff4
-? toolfix
-? whatelse
-? demos/gtk-demo/core.3957
-? gdk/gc-caching.patch
-? gdk/newgccache.patch
-? gdk/paintfix
-? gdk/profiler.c
-? gdk/profiler.h
-? gdk/profiler.log
-? gdk/spam
-? gdk/timing.c
-? gdk/x11/119722.patch
-? gdk/x11/bug117579.patch
-? gdk/x11/gravity.patch
-? gdk/x11/problem
-? gdk/x11/xidfix
-? gdk/x11/xsettings.patch
-? gtk/accels
-? gtk/adjd
-? gtk/adsfasdf
-? gtk/arrows.patch
-? gtk/asdf
-? gtk/asdfasdfasdf
-? gtk/asdfqwer
-? gtk/attempt.diff
-? gtk/bardiff
-? gtk/birnan
-? gtk/bodies
-? gtk/bt
-? gtk/calls
-? gtk/commitcand.patch
-? gtk/core.11617
-? gtk/core.13415
-? gtk/core.16181
-? gtk/core.17238
-? gtk/core.1944
-? gtk/core.19975
-? gtk/core.23401
-? gtk/core.24368
-? gtk/core.26526
-? gtk/core.27892
-? gtk/core.30053
-? gtk/core.30067
-? gtk/core.30080
-? gtk/core.32237
-? gtk/core.4428
-? gtk/core.9619
-? gtk/dizzy.patch
-? gtk/emfle
-? gtk/fixtodo
-? gtk/gtkmenu.ac
-? gtk/gtkmenuitem.ac
-? gtk/gtknotebook.ac
-? gtk/gtkpaned.hack.c
-? gtk/gtkradiobutton.ac
-? gtk/gtkstyle.mac.c
-? gtk/gtkstyle.orig.c
-? gtk/gtktoolbar.125
-? gtk/gtktoolbar.ac
-? gtk/gtktoolbar.c.current
-? gtk/gtktoolbar.c.draft
-? gtk/gtktoolbar.conflict-resolved.c
-? gtk/gtktoolbar.cvs
-? gtk/gtktoolbar.defer.c
-? gtk/gtktoolbar.hacked.c
-? gtk/gtktoolbar.hacked.h
-? gtk/gtktoolbar.smooth.c
-? gtk/gtktoolbar.smooth.h
-? gtk/gtktoolbar.splitalloc.c
-? gtk/gtktooltips.broken.c
-? gtk/gwp
-? gtk/handlefix.patch
-? gtk/highlight
-? gtk/hsdf
-? gtk/huh
-? gtk/huh2
-? gtk/idles
-? gtk/menuimprovements
-? gtk/minw.patch
-? gtk/paned-rtl.diff
-? gtk/profiler.log
-? gtk/qwer
-? gtk/qwer2
-? gtk/sofar
-? gtk/tb
-? gtk/td
-? gtk/testtoolbar.diff
-? gtk/tit
-? gtk/tool.ac
-? gtk/tool.diff
-? gtk/toolchange.patch
-? gtk/tooldiff
-? gtk/toolfix
-? gtk/toolitem.diff
-? gtk/tt
-? tests/accels
-? tests/asdf
-? tests/core.22082
-? tests/core.24504
-? tests/core.7041
-? tests/testtoolbar.hacked.c
-? tests/tt.diff
-Index: gdk/gdkwindow.c
-===================================================================
-RCS file: /cvs/gnome/gtk+/gdk/gdkwindow.c,v
-retrieving revision 1.157
-diff -u -p -u -r1.157 gdkwindow.c
---- gdk/gdkwindow.c	18 Feb 2004 17:03:46 -0000	1.157
-+++ gdk/gdkwindow.c	29 Feb 2004 23:54:21 -0000
-@@ -1963,6 +1963,7 @@ gdk_window_copy_to_image (GdkDrawable   
- static GSList *update_windows = NULL;
- static guint update_idle = 0;
- static gboolean debug_updates = FALSE;
-+static gint update_serial = 1;
- 
- static void
- gdk_window_process_updates_internal (GdkWindow *window)
-@@ -1988,6 +1989,8 @@ gdk_window_process_updates_internal (Gdk
- 	  GdkRegion *window_region;
-           gint width, height;
- 
-+	  ++update_serial;
-+
-           if (debug_updates)
-             {
-               /* Make sure we see the red invalid area before redrawing. */
-@@ -2056,6 +2059,7 @@ flush_all_displays (void)
- void
- gdk_window_process_all_updates (void)
- {
-+  gboolean retval = FALSE;
-   GSList *old_update_windows = update_windows;
-   GSList *tmp_list = update_windows;
- 
-@@ -2065,6 +2069,9 @@ gdk_window_process_all_updates (void)
-   update_windows = NULL;
-   update_idle = 0;
- 
-+  if (old_update_windows)
-+    retval = TRUE;
-+  
-   g_slist_foreach (old_update_windows, (GFunc)g_object_ref, NULL);
-   
-   while (tmp_list)
-@@ -2079,6 +2086,12 @@ gdk_window_process_all_updates (void)
-   flush_all_displays ();
- }
- 
-+gint
-+gdk_window_get_update_serial (void)
-+{
-+  return update_serial;
-+}
-+
- static gboolean
- gdk_window_update_idle (gpointer data)
- {
-Index: gdk/gdkwindow.h
-===================================================================
-RCS file: /cvs/gnome/gtk+/gdk/gdkwindow.h,v
-retrieving revision 1.49
-diff -u -p -u -r1.49 gdkwindow.h
---- gdk/gdkwindow.h	26 Jan 2004 20:20:42 -0000	1.49
-+++ gdk/gdkwindow.h	29 Feb 2004 23:54:25 -0000
-@@ -542,6 +542,7 @@ GdkRegion *gdk_window_get_update_area   
- void       gdk_window_freeze_updates      (GdkWindow    *window);
- void       gdk_window_thaw_updates        (GdkWindow    *window);
- 
-+gint       gdk_window_get_update_serial   (void);
- void       gdk_window_process_all_updates (void);
- void       gdk_window_process_updates     (GdkWindow    *window,
- 					   gboolean      update_children);
-Index: gtk/gtkadjustment.c
-===================================================================
-RCS file: /cvs/gnome/gtk+/gtk/gtkadjustment.c,v
-retrieving revision 1.29
-diff -u -p -u -r1.29 gtkadjustment.c
---- gtk/gtkadjustment.c	3 Feb 2004 21:43:10 -0000	1.29
-+++ gtk/gtkadjustment.c	29 Feb 2004 23:54:26 -0000
-@@ -27,6 +27,8 @@
- #include "gtkadjustment.h"
- #include "gtkintl.h"
- #include "gtkmarshalers.h"
-+#include <math.h>
-+
- 
- enum
- {
-@@ -46,9 +48,19 @@ enum {
- };
- 
- 
--static void gtk_adjustment_class_init (GtkAdjustmentClass *klass);
--static void gtk_adjustment_init       (GtkAdjustment      *adjustment);
-+typedef struct _GtkAdjustmentPrivate GtkAdjustmentPrivate;
-+struct _GtkAdjustmentPrivate
-+{
-+  GTimer *timer;
-+  gdouble start_value;
-+  gdouble goal_value;
-+  guint idle_id;
-+};
- 
-+static void                  gtk_adjustment_private_finalize   (GtkAdjustmentPrivate *private);
-+static void                  gtk_adjustment_class_init         (GtkAdjustmentClass   *klass);
-+static void                  gtk_adjustment_init               (GtkAdjustment        *adjustment);
-+static GtkAdjustmentPrivate *gtk_adjustment_get_private        (GtkAdjustment        *adjustment);
- static void gtk_adjustment_get_property (GObject      *object,
-                                          guint         prop_id,
-                                          GValue       *value,
-@@ -160,7 +172,6 @@ gtk_adjustment_class_init (GtkAdjustment
- 							0.0, 
- 							G_PARAM_READWRITE));
-   
--
-   adjustment_signals[CHANGED] =
-     g_signal_new ("changed",
- 		  G_OBJECT_CLASS_TYPE (class),
-@@ -190,6 +201,44 @@ gtk_adjustment_init (GtkAdjustment *adju
-   adjustment->page_size = 0.0;
- }
- 
-+static GtkAdjustmentPrivate *
-+gtk_adjustment_get_private (GtkAdjustment *adjustment)
-+{
-+  GtkAdjustmentPrivate *private;
-+  static GQuark private_quark = 0;
-+
-+  if (!private_quark)
-+    private_quark = g_quark_from_static_string ("gtk-adjustment-private");
-+
-+  private = g_object_get_qdata (G_OBJECT (adjustment), private_quark);
-+
-+  if (!private)
-+    {
-+      private = g_new0 (GtkAdjustmentPrivate, 1);
-+
-+      private->timer = g_timer_new ();
-+      private->start_value = 0.0;
-+      private->goal_value = 0.0;
-+      private->idle_id = 0;
-+      
-+      g_object_set_qdata_full (G_OBJECT (adjustment), private_quark,
-+			       private,
-+                               (GDestroyNotify) gtk_adjustment_private_finalize);
-+    }
-+
-+  return private;
-+}
-+
-+static void
-+gtk_adjustment_private_finalize (GtkAdjustmentPrivate *private)
-+{
-+  if (private->idle_id)
-+    g_source_remove (private->idle_id);
-+
-+  g_timer_destroy (private->timer);
-+  g_free (private);
-+}
-+
- static void
- gtk_adjustment_get_property (GObject *object, guint prop_id, GValue *value, 
- 	                     GParamSpec *pspec)
-@@ -334,11 +383,26 @@ gtk_adjustment_changed (GtkAdjustment   
-   g_signal_emit (adjustment, adjustment_signals[CHANGED], 0);
- }
- 
-+static void
-+gtk_adjustment_value_changed_unchecked (GtkAdjustment *adjustment)
-+{
-+  g_signal_emit (adjustment, adjustment_signals[VALUE_CHANGED], 0);
-+}
-+
- void
- gtk_adjustment_value_changed (GtkAdjustment        *adjustment)
- {
-+  GtkAdjustmentPrivate *priv;
-+  
-   g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
- 
-+  priv = gtk_adjustment_get_private (adjustment);
-+  if (priv->idle_id)
-+    {
-+      g_source_remove (priv->idle_id);
-+      priv->idle_id = 0;
-+    }
-+  gtk_adjustment_value_changed_unchecked (adjustment);
-   g_signal_emit (adjustment, adjustment_signals[VALUE_CHANGED], 0);
-   g_object_notify (G_OBJECT (adjustment), "value");
- }
-@@ -371,3 +435,171 @@ gtk_adjustment_clamp_page (GtkAdjustment
-   if (need_emission)
-     gtk_adjustment_value_changed (adjustment);
- }
-+
-+#define UPDATE_TIME 0.1
-+
-+static gboolean
-+adjustment_update_idle (gpointer data)
-+{
-+  GtkAdjustment *adj = data;
-+  GtkAdjustmentPrivate *priv = gtk_adjustment_get_private (adj);
-+
-+  gdouble new_value;
-+  gdouble elapsed = g_timer_elapsed (priv->timer, NULL);
-+
-+  GDK_THREADS_ENTER();
-+  
-+  new_value = priv->start_value +
-+    (elapsed / UPDATE_TIME) * (priv->goal_value - priv->start_value);
-+
-+  /* make sure new_value is betweeen start_value and goal_value */
-+  if (!((new_value >= priv->start_value && new_value <= priv->goal_value) ||
-+	(new_value <= priv->start_value && new_value >= priv->goal_value)))
-+    {
-+      new_value = priv->goal_value;
-+    }
-+
-+  if (new_value > adj->upper - adj->page_size)
-+    new_value = adj->upper - adj->page_size;
-+  
-+  if (new_value < adj->lower)
-+    new_value = adj->lower;
-+
-+  if (new_value != adj->value)
-+    {
-+      gint update_serial_before  = gdk_window_get_update_serial();
-+      
-+      adj->value = new_value;
-+
-+      gtk_adjustment_value_changed_unchecked (adj);
-+
-+      /* if anything was drawn during the signal emission, synchronize
-+       * with the X server to avoid swamping it with updates
-+       */
-+      gdk_window_process_all_updates ();
-+      if (update_serial_before != gdk_window_get_update_serial())
-+	gdk_flush ();
-+    }
-+  
-+  if (adj->value == priv->goal_value ||
-+      adj->value == adj->lower ||
-+      adj->value == adj->upper - adj->page_size)
-+    {
-+      priv->idle_id = 0;
-+
-+      GDK_THREADS_LEAVE();
-+      return FALSE;
-+    }
-+
-+  GDK_THREADS_LEAVE();
-+  return TRUE;
-+}
-+
-+static void
-+gtk_adjustment_change_value (GtkAdjustment *adjustment,
-+			     gdouble        delta)
-+{
-+  GtkAdjustmentPrivate *priv;
-+
-+  g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
-+  
-+  priv = gtk_adjustment_get_private (adjustment);
-+
-+  if (delta > -1 && delta < 1)
-+    return;
-+
-+  priv->start_value = adjustment->value;
-+  g_timer_reset (priv->timer);
-+  
-+  if (!priv->idle_id)
-+    {
-+      priv->idle_id = g_idle_add_full (GDK_PRIORITY_REDRAW + 3, adjustment_update_idle, adjustment, NULL);
-+      priv->goal_value = adjustment->value + delta;
-+    }
-+  else
-+    priv->goal_value = priv->goal_value + delta;
-+}
-+
-+void
-+gtk_adjustment_step_up (GtkAdjustment *adjustment)
-+{
-+  g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
-+  
-+  gtk_adjustment_change_value (adjustment, -adjustment->step_increment);
-+}
-+
-+void
-+gtk_adjustment_step_down (GtkAdjustment *adjustment)
-+{
-+  g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
-+  
-+  gtk_adjustment_change_value (adjustment, adjustment->step_increment);
-+}
-+
-+void
-+gtk_adjustment_wheel_up (GtkAdjustment *adjustment)
-+{
-+  g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
-+
-+  gtk_adjustment_change_value (adjustment,
-+			       -pow (adjustment->page_size, 2.0/3.0));
-+}
-+
-+void
-+gtk_adjustment_wheel_down (GtkAdjustment *adjustment)
-+{
-+  g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
-+
-+  gtk_adjustment_change_value (adjustment,
-+			       pow (adjustment->page_size, 2.0/3.0));
-+}
-+
-+void
-+gtk_adjustment_page_up (GtkAdjustment *adjustment)
-+{
-+  g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
-+
-+  gtk_adjustment_change_value (adjustment, -adjustment->page_increment);
-+}
-+
-+void
-+gtk_adjustment_page_down (GtkAdjustment *adjustment)
-+{
-+  g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
-+  
-+  gtk_adjustment_change_value (adjustment, adjustment->page_increment);
-+}
-+
-+void
-+gtk_adjustment_home (GtkAdjustment *adjustment)
-+{
-+  g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
-+  
-+  gtk_adjustment_goto_value (adjustment, 0.0);
-+}
-+
-+void
-+gtk_adjustment_end (GtkAdjustment *adjustment)
-+{
-+  g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
-+  
-+  gtk_adjustment_goto_value (adjustment, adjustment->upper - adjustment->page_size);
-+}
-+
-+void
-+gtk_adjustment_goto_value (GtkAdjustment *adjustment,
-+			   gdouble        value)
-+{
-+  GtkAdjustmentPrivate *priv;
-+  
-+  g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
-+
-+  priv = gtk_adjustment_get_private (adjustment);
-+
-+  priv->start_value = adjustment->value;
-+  priv->goal_value = value;
-+  g_timer_reset (priv->timer);
-+
-+  if (!priv->idle_id)
-+    priv->idle_id = g_idle_add_full (GDK_PRIORITY_REDRAW + 3, adjustment_update_idle, adjustment, NULL);
-+}
-Index: gtk/gtkadjustment.h
-===================================================================
-RCS file: /cvs/gnome/gtk+/gtk/gtkadjustment.h,v
-retrieving revision 1.18
-diff -u -p -u -r1.18 gtkadjustment.h
---- gtk/gtkadjustment.h	9 Oct 2002 22:25:17 -0000	1.18
-+++ gtk/gtkadjustment.h	29 Feb 2004 23:54:26 -0000
-@@ -75,21 +75,32 @@ struct _GtkAdjustmentClass
- };
- 
- 
--GType	   gtk_adjustment_get_type		(void) G_GNUC_CONST;
--GtkObject* gtk_adjustment_new			(gdouble	  value,
--						 gdouble	  lower,
--						 gdouble	  upper,
--						 gdouble	  step_increment,
--						 gdouble	  page_increment,
--						 gdouble	  page_size);
--void	   gtk_adjustment_changed		(GtkAdjustment	 *adjustment);
--void	   gtk_adjustment_value_changed		(GtkAdjustment	 *adjustment);
--void	   gtk_adjustment_clamp_page		(GtkAdjustment	 *adjustment,
--						 gdouble	  lower,
--						 gdouble	  upper);
--gdouble	   gtk_adjustment_get_value		(GtkAdjustment   *adjustment);
--void	   gtk_adjustment_set_value		(GtkAdjustment	 *adjustment,
--						 gdouble	  value);
-+GType	   gtk_adjustment_get_type	(void) G_GNUC_CONST;
-+GtkObject* gtk_adjustment_new           (gdouble        value,
-+					 gdouble        lower,
-+					 gdouble        upper,
-+					 gdouble        step_increment,
-+					 gdouble        page_increment,
-+					 gdouble        page_size);
-+void       gtk_adjustment_changed       (GtkAdjustment *adjustment);
-+void       gtk_adjustment_value_changed (GtkAdjustment *adjustment);
-+void       gtk_adjustment_clamp_page    (GtkAdjustment *adjustment,
-+					 gdouble        lower,
-+					 gdouble        upper);
-+gdouble    gtk_adjustment_get_value     (GtkAdjustment *adjustment);
-+void       gtk_adjustment_set_value     (GtkAdjustment *adjustment,
-+					 gdouble        value);
-+
-+void       gtk_adjustment_goto_value    (GtkAdjustment *adjustment,
-+					 gdouble        value);
-+void	   gtk_adjustment_home		(GtkAdjustment *adjustment);
-+void       gtk_adjustment_end           (GtkAdjustment *adjustment);
-+void       gtk_adjustment_step_up       (GtkAdjustment *adjustment);
-+void       gtk_adjustment_step_down     (GtkAdjustment *adjustment);
-+void       gtk_adjustment_wheel_up      (GtkAdjustment *adjustment);
-+void       gtk_adjustment_wheel_down    (GtkAdjustment *adjustment);
-+void       gtk_adjustment_page_up       (GtkAdjustment *adjustment);
-+void       gtk_adjustment_page_down     (GtkAdjustment *adjustment);
- 
- #ifdef __cplusplus
- }
-Index: gtk/gtkrange.c
-===================================================================
-RCS file: /cvs/gnome/gtk+/gtk/gtkrange.c,v
-retrieving revision 1.96
-diff -u -p -u -r1.96 gtkrange.c
---- gtk/gtkrange.c	29 Feb 2004 18:21:57 -0000	1.96
-+++ gtk/gtkrange.c	29 Feb 2004 23:54:32 -0000
-@@ -27,6 +27,7 @@
- 
- #include <stdio.h>
- #include <math.h>
-+#include <string.h>
- #include "gtkintl.h"
- #include "gtkmain.h"
- #include "gtkmarshalers.h"
-@@ -34,8 +35,8 @@
- #include "gtkintl.h"
- #include "gtkscrollbar.h"
- 
--#define SCROLL_INITIAL_DELAY 250  /* must hold button this long before ... */
--#define SCROLL_LATER_DELAY   100  /* ... it starts repeating at this rate  */
-+#define SCROLL_INITIAL_DELAY 225  /* must hold button this long before ... */
-+#define SCROLL_LATER_DELAY   55   /* ... it starts repeating at this rate  */
- #define UPDATE_DELAY         300  /* Delay for queued update */
- 
- enum {
-@@ -701,6 +702,12 @@ should_invert (GtkRange *range)
-     return range->inverted;
- }
- 
-+static gboolean
-+can_be_smooth (GtkRange *range)
-+{
-+  return (range->round_digits < 0 && range->update_policy == GTK_UPDATE_CONTINUOUS);
-+}
-+
- static void
- gtk_range_finalize (GObject *object)
- {
-@@ -1366,39 +1373,6 @@ gtk_range_button_release (GtkWidget     
-   return FALSE;
- }
- 
--/**
-- * _gtk_range_get_wheel_delta:
-- * @range: a #GtkRange
-- * @direction: A #GdkScrollDirection
-- * 
-- * Returns a good step value for the mouse wheel.
-- * 
-- * Return value: A good step value for the mouse wheel. 
-- * 
-- * Since: 2.4
-- **/
--gdouble
--_gtk_range_get_wheel_delta (GtkRange           *range,
--			    GdkScrollDirection  direction)
--{
--  GtkAdjustment *adj = range->adjustment;
--  gdouble delta;
--
--  if (GTK_IS_SCROLLBAR (range))
--    delta = pow (adj->page_size, 2.0 / 3.0);
--  else
--    delta = adj->step_increment * 2;
--  
--  if (direction == GDK_SCROLL_UP ||
--      direction == GDK_SCROLL_LEFT)
--    delta = - delta;
--  
--  if (range->inverted)
--    delta = - delta;
--
--  return delta;
--}
--      
- static gint
- gtk_range_scroll_event (GtkWidget      *widget,
- 			GdkEventScroll *event)
-@@ -1408,19 +1382,59 @@ gtk_range_scroll_event (GtkWidget      *
-   if (GTK_WIDGET_REALIZED (range))
-     {
-       GtkAdjustment *adj = GTK_RANGE (range)->adjustment;
--      gdouble delta;
-+      GdkScrollDirection direction = event->direction;
- 
--      delta = _gtk_range_get_wheel_delta (range, event->direction);
--      gtk_range_internal_set_value (range, adj->value + delta);
-+      if (direction == GDK_SCROLL_UP ||
-+ 	  direction == GDK_SCROLL_LEFT)
-+ 	{
-+ 	  direction = GDK_SCROLL_UP;
-+ 	}
-+      else
-+ 	{
-+ 	  direction = GDK_SCROLL_DOWN;
-+ 	}
-       
--      /* Policy DELAYED makes sense with scroll events,
--       * but DISCONTINUOUS doesn't, so we update immediately
--       * for DISCONTINUOUS
--       */
--      if (range->update_policy == GTK_UPDATE_DISCONTINUOUS)
--        gtk_range_update_value (range);
-+      if (should_invert (range))
-+ 	{
-+ 	  if (direction == GDK_SCROLL_UP)
-+ 	    direction = GDK_SCROLL_DOWN;
-+ 	  else
-+ 	    direction = GDK_SCROLL_UP;
-+ 	}
-+      
-+      if (can_be_smooth (range) && GTK_IS_SCROLLBAR (range))
-+ 	{
-+ 	  if (direction == GDK_SCROLL_UP)
-+ 	    gtk_adjustment_wheel_up (adj);
-+ 	  else
-+ 	    gtk_adjustment_wheel_down (adj);
-+	  
-+ 	  range->need_recalc = TRUE;
-+ 	  gtk_widget_queue_draw (GTK_WIDGET (range));
-+ 	}
-+      else
-+ 	{
-+ 	  gdouble increment;
-+
-+	  if (GTK_IS_SCROLLBAR (widget))
-+	    increment = pow (adj->page_size, 2.0/3.0);
-+	  else
-+	    increment = 2 * adj->step_increment;
-+	  
-+ 	  if (direction == GDK_SCROLL_UP)
-+ 	    increment *= -1;
-+	  
-+ 	  gtk_range_internal_set_value (range, adj->value + increment);
-+	  
-+ 	  /* Policy DELAYED makes sense with scroll events,
-+ 	   * but DISCONTINUOUS doesn't, so we update immediately
-+	   * for DISCONTINUOUS
-+ 	   */
-+ 	  if (range->update_policy == GTK_UPDATE_DISCONTINUOUS)
-+ 	    gtk_range_update_value (range);
-+ 	}
-     }
--
-+  
-   return TRUE;
- }
- 
-@@ -1517,14 +1531,22 @@ gtk_range_adjustment_value_changed (GtkA
- 				    gpointer       data)
- {
-   GtkRange *range = GTK_RANGE (data);
-+  GtkRangeLayout old_layout;
-+
-+  old_layout = *range->layout;
- 
-   range->need_recalc = TRUE;
-+  gtk_range_calc_layout (range, adjustment->value);
-+
-+  if (memcmp (&old_layout, range->layout, sizeof (GtkRangeLayout)) != 0)
-+    {
-+      gtk_widget_queue_draw (GTK_WIDGET (range));
-+
-+      /* This is so we don't lag the widget being scrolled. */
-+      if (GTK_WIDGET_REALIZED (range))
-+	gdk_window_process_updates (GTK_WIDGET (range)->window, FALSE);
-+    }
- 
--  gtk_widget_queue_draw (GTK_WIDGET (range));
--  /* This is so we don't lag the widget being scrolled. */
--  if (GTK_WIDGET_REALIZED (range))
--    gdk_window_process_updates (GTK_WIDGET (range)->window, FALSE);
--  
-   /* Note that we don't round off to range->round_digits here.
-    * that's because it's really broken to change a value
-    * in response to a change signal on that value; round_digits
-@@ -1550,53 +1572,80 @@ gtk_range_style_set (GtkWidget *widget,
- static void
- step_back (GtkRange *range)
- {
--  gdouble newval;
--  
--  newval = range->adjustment->value - range->adjustment->step_increment;
--  gtk_range_internal_set_value (range, newval);
--}
-+  GtkAdjustment *adj = range->adjustment;
- 
--static void
--step_forward (GtkRange *range)
--{
--  gdouble newval;
-+  if (can_be_smooth (range))
-+    {
-+      gtk_adjustment_step_up (adj);
-+      range->need_recalc = TRUE;
-+      gtk_widget_queue_draw (GTK_WIDGET (range));
-+    }
-+  else
-+    {
-+      gdouble newval;
- 
--  newval = range->adjustment->value + range->adjustment->step_increment;
--  gtk_range_internal_set_value (range, newval);
-+      newval = adj->value - adj->step_increment;
-+      gtk_range_internal_set_value (range, newval);
-+    }
- }
- 
--
- static void
--page_back (GtkRange *range)
-+step_forward (GtkRange *range)
- {
--  gdouble newval;
-+  GtkAdjustment *adj = range->adjustment;
-+
-+  if (can_be_smooth (range))
-+    {
-+      gtk_adjustment_step_down (adj);
-+      range->need_recalc = TRUE;
-+      gtk_widget_queue_draw (GTK_WIDGET (range));
-+    }
-+  else
-+    {
-+      gdouble newval;
- 
--  newval = range->adjustment->value - range->adjustment->page_increment;
--  gtk_range_internal_set_value (range, newval);
-+      newval = adj->value + adj->step_increment;
-+      gtk_range_internal_set_value (range, newval);
-+    }
- }
- 
- static void
--page_forward (GtkRange *range)
-+page_back (GtkRange *range)
- {
--  gdouble newval;
-+  GtkAdjustment *adj = range->adjustment;
- 
--  newval = range->adjustment->value + range->adjustment->page_increment;
--  gtk_range_internal_set_value (range, newval);
--}
-+  if (can_be_smooth (range))
-+    {
-+      gtk_adjustment_page_up (adj);
-+      range->need_recalc = TRUE;
-+      gtk_widget_queue_draw (GTK_WIDGET (range));
-+    }
-+  else
-+    {
-+      gdouble newval;
- 
--static void
--scroll_begin (GtkRange *range)
--{
--  gtk_range_internal_set_value (range, range->adjustment->lower);
-+      newval = adj->value - adj->page_increment;
-+      gtk_range_internal_set_value (range, newval);
-+    }
- }
- 
- static void
--scroll_end (GtkRange *range)
-+page_forward (GtkRange *range)
- {
--  gdouble newval;
-+  GtkAdjustment *adj = range->adjustment;
- 
--  newval = range->adjustment->upper - range->adjustment->page_size;
--  gtk_range_internal_set_value (range, newval);
-+  if (can_be_smooth (range))
-+    {
-+      gtk_adjustment_page_down (adj);
-+      range->need_recalc = TRUE;
-+      gtk_widget_queue_draw (GTK_WIDGET (range));
-+    }
-+  else
-+    {
-+      gdouble newval;
-+      newval = adj->value - adj->page_increment;
-+      gtk_range_internal_set_value (range, newval);
-+    }
- }
- 
- static void
-@@ -1678,11 +1727,27 @@ gtk_range_scroll (GtkRange     *range,
-       break;
- 
-     case GTK_SCROLL_START:
--      scroll_begin (range);
-+      if (can_be_smooth (range))
-+	{
-+	  gtk_adjustment_home (range->adjustment);
-+	  range->need_recalc = TRUE;
-+	  gtk_widget_queue_draw (GTK_WIDGET (range));
-+	}
-+      else
-+	gtk_range_internal_set_value (range,
-+				      range->adjustment->lower);
-       break;
- 
-     case GTK_SCROLL_END:
--      scroll_end (range);
-+      if (can_be_smooth (range))
-+	{
-+	  gtk_adjustment_end (range->adjustment);
-+	  range->need_recalc = TRUE;
-+	  gtk_widget_queue_draw (GTK_WIDGET (range));
-+	}
-+      else
-+	gtk_range_internal_set_value (range,
-+				      range->adjustment->upper - range->adjustment->page_size);
-       break;
- 
-     case GTK_SCROLL_JUMP:
-Index: gtk/gtkrange.h
-===================================================================
-RCS file: /cvs/gnome/gtk+/gtk/gtkrange.h,v
-retrieving revision 1.28
-diff -u -p -u -r1.28 gtkrange.h
---- gtk/gtkrange.h	29 Feb 2004 18:21:57 -0000	1.28
-+++ gtk/gtkrange.h	29 Feb 2004 23:54:33 -0000
-@@ -149,9 +149,6 @@ void           gtk_range_set_value      
-                                             gdouble        value);
- gdouble        gtk_range_get_value         (GtkRange      *range);
- 
--gdouble	      _gtk_range_get_wheel_delta   (GtkRange           *range,
--					    GdkScrollDirection  direction);
--
- #ifdef __cplusplus
- }
- #endif /* __cplusplus */
-Index: gtk/gtkscrolledwindow.c
-===================================================================
-RCS file: /cvs/gnome/gtk+/gtk/gtkscrolledwindow.c,v
-retrieving revision 1.70
-diff -u -p -u -r1.70 gtkscrolledwindow.c
---- gtk/gtkscrolledwindow.c	29 Feb 2004 18:21:57 -0000	1.70
-+++ gtk/gtkscrolledwindow.c	29 Feb 2004 23:54:37 -0000
-@@ -794,98 +794,65 @@ gtk_scrolled_window_scroll_child (GtkScr
- 				  GtkScrollType      scroll,
- 				  gboolean           horizontal)
- {
--  GtkAdjustment *adjustment = NULL;
-+  GtkAdjustment *hadj = NULL;
-+  GtkAdjustment *vadj = NULL;
-+
-+  if (scrolled_window->hscrollbar)
-+    hadj = gtk_range_get_adjustment (GTK_RANGE (scrolled_window->hscrollbar));
-+
-+  if (scrolled_window->vscrollbar)
-+    vadj = gtk_range_get_adjustment (GTK_RANGE (scrolled_window->vscrollbar));
-   
-   switch (scroll)
-     {
-     case GTK_SCROLL_STEP_UP:
--      scroll = GTK_SCROLL_STEP_BACKWARD;
--      horizontal = FALSE;
-+    case GTK_SCROLL_STEP_BACKWARD:
-+      if (vadj)
-+	gtk_adjustment_step_up (vadj);
-       break;
-     case GTK_SCROLL_STEP_DOWN:
--      scroll = GTK_SCROLL_STEP_FORWARD;
--      horizontal = FALSE;
-+    case GTK_SCROLL_STEP_FORWARD:
-+      if (vadj)
-+	gtk_adjustment_step_down (vadj);
-       break;
-     case GTK_SCROLL_STEP_LEFT:
--      scroll = GTK_SCROLL_STEP_BACKWARD;
--      horizontal = TRUE;
-+      if (hadj)
-+	gtk_adjustment_step_up (hadj);
-       break;
-     case GTK_SCROLL_STEP_RIGHT:
--      scroll = GTK_SCROLL_STEP_FORWARD;
--      horizontal = TRUE;
-+      if (hadj)
-+	gtk_adjustment_step_down (hadj);
-       break;
-     case GTK_SCROLL_PAGE_UP:
--      scroll = GTK_SCROLL_PAGE_BACKWARD;
--      horizontal = FALSE;
-+    case GTK_SCROLL_PAGE_BACKWARD:
-+      if (vadj)
-+	gtk_adjustment_page_up (vadj);
-       break;
-     case GTK_SCROLL_PAGE_DOWN:
--      scroll = GTK_SCROLL_PAGE_FORWARD;
--      horizontal = FALSE;
-+    case GTK_SCROLL_PAGE_FORWARD:
-+      if (vadj)
-+	gtk_adjustment_page_down (vadj);
-       break;
-     case GTK_SCROLL_PAGE_LEFT:
--      scroll = GTK_SCROLL_STEP_BACKWARD;
--      horizontal = TRUE;
-+      if (hadj)
-+	gtk_adjustment_page_up (hadj);
-       break;
-     case GTK_SCROLL_PAGE_RIGHT:
--      scroll = GTK_SCROLL_STEP_FORWARD;
--      horizontal = TRUE;
-+      if (hadj)
-+	gtk_adjustment_page_down (hadj);
-       break;
--    case GTK_SCROLL_STEP_BACKWARD:
--    case GTK_SCROLL_STEP_FORWARD:
--    case GTK_SCROLL_PAGE_BACKWARD:
--    case GTK_SCROLL_PAGE_FORWARD:
-     case GTK_SCROLL_START:
-+      if (vadj)
-+	gtk_adjustment_home (vadj);
-+      break;
-     case GTK_SCROLL_END:
-+      if (vadj)
-+	gtk_adjustment_end (vadj);
-       break;
-     default:
-       g_warning ("Invalid scroll type %d for GtkSpinButton::change-value", scroll);
-       return;
-     }
--
--  if (horizontal)
--    {
--      if (scrolled_window->hscrollbar)
--	adjustment = gtk_range_get_adjustment (GTK_RANGE (scrolled_window->hscrollbar));
--    }
--  else
--    {
--      if (scrolled_window->vscrollbar)
--	adjustment = gtk_range_get_adjustment (GTK_RANGE (scrolled_window->vscrollbar));
--    }
--
--  if (adjustment)
--    {
--      gdouble value = adjustment->value;
--      
--      switch (scroll)
--	{
--	case GTK_SCROLL_STEP_FORWARD:
--	  value += adjustment->step_increment;
--	  break;
--	case GTK_SCROLL_STEP_BACKWARD:
--	  value -= adjustment->step_increment;
--	  break;
--	case GTK_SCROLL_PAGE_FORWARD:
--	  value += adjustment->page_increment;
--	  break;
--	case GTK_SCROLL_PAGE_BACKWARD:
--	  value -= adjustment->page_increment;
--	  break;
--	case GTK_SCROLL_START:
--	  value = adjustment->lower;
--	  break;
--	case GTK_SCROLL_END:
--	  value = adjustment->upper;
--	  break;
--	default:
--	  g_assert_not_reached ();
--	  break;
--	}
--
--      value = CLAMP (value, adjustment->lower, adjustment->upper - adjustment->page_size);
--      
--      gtk_adjustment_set_value (adjustment, value);
--    }
- }
- 
- static void
-@@ -1226,15 +1193,18 @@ gtk_scrolled_window_scroll_event (GtkWid
- 
-   if (range && GTK_WIDGET_VISIBLE (range))
-     {
--      GtkAdjustment *adj = GTK_RANGE (range)->adjustment;
--      gdouble delta, new_value;
--
--      delta = _gtk_range_get_wheel_delta (GTK_RANGE (range), event->direction);
--
--      new_value = CLAMP (adj->value + delta, adj->lower, adj->upper - adj->page_size);
-+      GtkAdjustment *adjustment = GTK_RANGE (range)->adjustment;
-+      
-+      if (event->direction == GDK_SCROLL_UP ||
-+	  event->direction == GDK_SCROLL_LEFT)
-+ 	{
-+	  gtk_adjustment_wheel_up (adjustment);
-+ 	}
-+      else
-+ 	{
-+	  gtk_adjustment_wheel_down (adjustment);
-+ 	}
-       
--      gtk_adjustment_set_value (adj, new_value);
--
-       return TRUE;
-     }
- 
diff --git a/x11-libs/gtk+/files/gtk+-2.4.9-xpm_ico_secure.patch b/x11-libs/gtk+/files/gtk+-2.4.9-xpm_ico_secure.patch
deleted file mode 100644
index 7cf696a443f6..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.4.9-xpm_ico_secure.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- gtk+/gdk-pixbuf/io-ico.c	7 Jan 2004 00:26:58 -0000	1.34
-+++ gtk+/gdk-pixbuf/io-ico.c	15 Sep 2004 14:32:13 -0000	1.34.2.1
-@@ -323,6 +323,14 @@ static void DecodeHeader(guchar *Data, g
- 	
- 	State->HeaderSize+=I;
- 	
-+	if (State->HeaderSize < 0) {
-+		g_set_error (error,
-+			     GDK_PIXBUF_ERROR,
-+			     GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-+			     _("Invalid header in icon"));
-+		return;
-+	}
-+
-  	if (State->HeaderSize>State->BytesInHeaderBuf) {
- 	        guchar *tmp=g_try_realloc(State->HeaderBuf,State->HeaderSize);
- 		if (!tmp) {
-Index: gdk-pixbuf/io-xpm.c
-===================================================================
-RCS file: /cvs/gnome/gtk+/gdk-pixbuf/io-xpm.c,v
-retrieving revision 1.42
-retrieving revision 1.42.2.1
-diff -u -p -r1.42 -r1.42.2.1
---- gtk+/gdk-pixbuf/io-xpm.c	8 Mar 2003 20:48:58 -0000	1.42
-+++ gtk+/gdk-pixbuf/io-xpm.c	15 Sep 2004 14:32:13 -0000	1.42.2.1
-@@ -1079,7 +1079,7 @@ xpm_extract_color (const gchar *buffer)
- 	gint key = 0;
- 	gint current_key = 1;
- 	gint space = 128;
--	gchar word[128], color[128], current_color[128];
-+	gchar word[129], color[129], current_color[129];
- 	gchar *r; 
- 	
- 	word[0] = '\0';
-@@ -1121,8 +1121,8 @@ xpm_extract_color (const gchar *buffer)
- 				return NULL;
- 			/* accumulate color name */
- 			if (color[0] != '\0') {
--				strcat (color, " ");
--				space--;
-+				strncat (color, " ", space);
-+				space -= MIN (space, 1);
- 			}
- 			strncat (color, word, space);
- 			space -= MIN (space, strlen (word));
-@@ -1246,27 +1246,43 @@ pixbuf_create_from_xpm (const gchar * (*
- 		return NULL;
- 
- 	}
--	if (n_col <= 0) {
-+	if (cpp <= 0 || cpp >= 32) {
-                 g_set_error (error,
-                              GDK_PIXBUF_ERROR,
-                              GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
--                             _("XPM file has invalid number of colors"));
-+                             _("XPM has invalid number of chars per pixel"));
- 		return NULL;
--
- 	}
--	if (cpp <= 0 || cpp >= 32) {
-+	if (n_col <= 0 || n_col >= G_MAXINT / (cpp + 1)) {
-                 g_set_error (error,
-                              GDK_PIXBUF_ERROR,
-                              GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
--                             _("XPM has invalid number of chars per pixel"));
-+                             _("XPM file has invalid number of colors"));
- 		return NULL;
- 	}
- 
- 	/* The hash is used for fast lookups of color from chars */
- 	color_hash = g_hash_table_new (g_str_hash, g_str_equal);
- 
--	name_buf = g_new (gchar, n_col * (cpp + 1));
--	colors = g_new (XPMColor, n_col);
-+	name_buf = g_try_malloc (n_col * (cpp + 1));
-+	if (!name_buf) {
-+		g_set_error (error,
-+			     GDK_PIXBUF_ERROR,
-+                             GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
-+                             _("Can't allocate memory for loading XPM image"));
-+		g_hash_table_destroy (color_hash);
-+		return NULL;
-+	}
-+	colors = (XPMColor *) g_try_malloc (sizeof (XPMColor) * n_col);
-+	if (!colors) {
-+		g_set_error (error,
-+			     GDK_PIXBUF_ERROR,
-+                             GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
-+                             _("Can't allocate memory for loading XPM image"));
-+		g_hash_table_destroy (color_hash);
-+		g_free (name_buf);
-+		return NULL;
-+	}
- 
- 	for (cnt = 0; cnt < n_col; cnt++) {
- 		gchar *color_name;
-
diff --git a/x11-libs/gtk+/files/gtk+-2.6.1-empty_default_combo.patch b/x11-libs/gtk+/files/gtk+-2.6.1-empty_default_combo.patch
deleted file mode 100644
index c153258cce66..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.6.1-empty_default_combo.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-===================================================================
-RCS file: /cvs/gnome/gtk+/gtk/gtkfilechooserdefault.c,v
-retrieving revision 1.240
-retrieving revision 1.240.2.1
-diff -u -r1.240 -r1.240.2.1
---- gtkfilechooserdefault.c	2005/01/06 20:27:58	1.240
-+++ gtkfilechooserdefault.c	2005/01/17 07:05:59	1.240.2.1
-@@ -376,6 +376,8 @@
- 					 GtkTreePath           *path,
- 					 gboolean               path_currently_selected,
- 					 gpointer               data);
-+static gboolean shortcuts_get_selected  (GtkFileChooserDefault *impl,
-+					 GtkTreeIter           *iter);
- static void shortcuts_activate_iter (GtkFileChooserDefault *impl,
- 				     GtkTreeIter           *iter);
- static int shortcuts_get_index (GtkFileChooserDefault *impl,
-@@ -1056,9 +1058,9 @@
-   } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (impl->shortcuts_model),&iter));
- }
- 
--/* If a shortcut corresponds to the current folder, selects it */
--static void
--shortcuts_find_current_folder (GtkFileChooserDefault *impl)
-+static void 
-+shortcuts_find_folder (GtkFileChooserDefault *impl,
-+		       GtkFilePath           *folder)
- {
-   GtkTreeSelection *selection;
-   int pos;
-@@ -1066,8 +1068,8 @@
- 
-   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view));
- 
--  g_assert (impl->current_folder != NULL);
--  pos = shortcut_find_position (impl, impl->current_folder);
-+  g_assert (folder != NULL);
-+  pos = shortcut_find_position (impl, folder);
-   if (pos == -1)
-     {
-       gtk_tree_selection_unselect_all (selection);
-@@ -1079,6 +1081,13 @@
-   gtk_tree_path_free (path);
- }
- 
-+/* If a shortcut corresponds to the current folder, selects it */
-+static void
-+shortcuts_find_current_folder (GtkFileChooserDefault *impl)
-+{
-+  shortcuts_find_folder (impl, impl->current_folder);
-+}
-+
- /* Convenience function to get the display name and icon info for a path */
- static GtkFileInfo *
- get_file_info (GtkFileSystem      *file_system, 
-@@ -1452,10 +1461,41 @@
- {
-   GSList *bookmarks;
-   gboolean old_changing_folders;
--
-+  GtkTreeIter iter;
-+  GtkFilePath *list_selected = NULL;
-+  GtkFilePath *combo_selected = NULL;
-+  gboolean is_volume;
-+  gpointer col_data;
-+        
-   old_changing_folders = impl->changing_folder;
-   impl->changing_folder = TRUE;
- 
-+  if (shortcuts_get_selected (impl, &iter))
-+    {
-+      gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), 
-+			  &iter, 
-+			  SHORTCUTS_COL_DATA, &col_data,
-+			  SHORTCUTS_COL_IS_VOLUME, &is_volume,
-+			  -1);
-+
-+      if (col_data && !is_volume)
-+	list_selected = gtk_file_path_copy (col_data);
-+    }
-+
-+  if (impl->save_folder_combo &&
-+      gtk_combo_box_get_active_iter (GTK_COMBO_BOX (impl->save_folder_combo), 
-+				     &iter))
-+    {
-+      gtk_tree_model_get (GTK_TREE_MODEL (impl->shortcuts_model), 
-+			  &iter, 
-+			  SHORTCUTS_COL_DATA, &col_data,
-+			  SHORTCUTS_COL_IS_VOLUME, &is_volume,
-+			  -1);
-+      
-+      if (col_data && !is_volume)
-+	combo_selected = gtk_file_path_copy (col_data);
-+    }
-+
-   if (impl->num_bookmarks > 0)
-     shortcuts_remove_rows (impl,
- 			   shortcuts_get_index (impl, SHORTCUTS_BOOKMARKS_SEPARATOR),
-@@ -1466,12 +1506,28 @@
-   gtk_file_paths_free (bookmarks);
- 
-   if (impl->num_bookmarks > 0)
--    {
--      shortcuts_insert_separator (impl, SHORTCUTS_BOOKMARKS_SEPARATOR);
--    }
-+    shortcuts_insert_separator (impl, SHORTCUTS_BOOKMARKS_SEPARATOR);
-+
-   if (impl->shortcuts_filter_model)
-     gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (impl->shortcuts_filter_model));
- 
-+  if (list_selected)
-+    {
-+      shortcuts_find_folder (impl, list_selected);
-+      gtk_file_path_free (list_selected);
-+    }
-+
-+  if (combo_selected)
-+    {
-+      gint pos;
-+
-+      pos = shortcut_find_position (impl, combo_selected);
-+      if (pos != -1)
-+	gtk_combo_box_set_active (GTK_COMBO_BOX (impl->save_folder_combo), 
-+				  pos);
-+      gtk_file_path_free (combo_selected);
-+    }
-+  
-   impl->changing_folder = old_changing_folders;
- }
- 
-@@ -1918,6 +1974,9 @@
-   GtkTreeSelection *selection;
-   GtkTreeIter parent_iter;
- 
-+  if (!impl->browse_shortcuts_tree_view)
-+    return FALSE;
-+
-   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->browse_shortcuts_tree_view));
- 
-   if (!gtk_tree_selection_get_selected (selection, NULL, &parent_iter))
diff --git a/x11-libs/gtk+/files/gtk+-2.6.1-gtk_dialog.patch b/x11-libs/gtk+/files/gtk+-2.6.1-gtk_dialog.patch
deleted file mode 100644
index e73b27dd57c3..000000000000
--- a/x11-libs/gtk+/files/gtk+-2.6.1-gtk_dialog.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur gtk+-2.6.1.orig/gtk/gtkdialog.c gtk+-2.6.1/gtk/gtkdialog.c
---- gtk+-2.6.1.orig/gtk/gtkdialog.c	2005-01-03 18:40:36.000000000 +0100
-+++ gtk+-2.6.1/gtk/gtkdialog.c	2005-01-21 10:31:17.072576888 +0100
-@@ -345,10 +345,16 @@
-   if (!window->focus_widget)
-     {
-       GList *children, *tmp_list;
-+      GtkWidget *first_focus = NULL;
-       
-       do 
- 	{
- 	  g_signal_emit_by_name (window, "move_focus", GTK_DIR_TAB_FORWARD);
-+
-+	  if (first_focus == NULL)
-+	    first_focus = window->focus_widget;
-+	  else if (first_focus == window->focus_widget)
-+	    break;
- 	}
-       while (GTK_IS_LABEL (window->focus_widget));
diff --git a/x11-libs/gtk+/gtk+-2.4.13-r1.ebuild b/x11-libs/gtk+/gtk+-2.4.13-r1.ebuild
deleted file mode 100644
index 450cbfaf9101..000000000000
--- a/x11-libs/gtk+/gtk+-2.4.13-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.4.13-r1.ebuild,v 1.7 2005/01/12 22:10:42 gustavoz 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
-	mirror://gentoo/gtk+-2.4-smoothscroll-r1.patch
-	amd64? ( http://dev.gentoo.org/~lv/gtk+-2.4.1-lib64.patch.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
-	x11-misc/shared-mime-info
-	>=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
-	sys-devel/autoconf
-	>=sys-devel/automake-1.7.9
-	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
-	# add smoothscroll support for usability reasons
-	# http://bugzilla.gnome.org/show_bug.cgi?id=103811
-	epatch ${DISTDIR}/${PN}-2.4-smoothscroll-r1.patch
-
-	# use an arch-specific config directory so that 32bit and 64bit versions
-	# dont clash on multilib systems
-	use amd64 && epatch ${DISTDIR}/gtk+-2.4.1-lib64.patch.bz2
-	# and this line is just here to make building emul-linux-x86-gtklibs a bit
-	# easier, so even this should be amd64 specific.
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && epatch ${DISTDIR}/gtk+-2.4.1-lib64.patch.bz2
-
-	autoconf || die
-	automake || 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
-	use amd64 && dodir /etc/gtk-2.0/${CHOST}
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && dodir /etc/gtk-2.0/${CHOST}
-
-	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() {
-
-	use amd64 && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
-
-	gtk-query-immodules-2.0 >	/${GTK2_CONFDIR}/gtk.immodules
-	gdk-pixbuf-query-loaders >	/${GTK2_CONFDIR}/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.14.ebuild b/x11-libs/gtk+/gtk+-2.4.14.ebuild
deleted file mode 100644
index df2f5321f75a..000000000000
--- a/x11-libs/gtk+/gtk+-2.4.14.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.4.14.ebuild,v 1.8 2005/04/07 15:30:33 blubb 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
-	mirror://gentoo/gtk+-2.4-smoothscroll-r1.patch
-	amd64? ( http://dev.gentoo.org/~lv/gtk+-2.4.1-lib64.patch.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
-	x11-misc/shared-mime-info
-	>=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
-	sys-devel/autoconf
-	>=sys-devel/automake-1.7.9
-	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
-	# add smoothscroll support for usability reasons
-	# http://bugzilla.gnome.org/show_bug.cgi?id=103811
-	epatch ${DISTDIR}/${PN}-2.4-smoothscroll-r1.patch
-
-	# use an arch-specific config directory so that 32bit and 64bit versions
-	# dont clash on multilib systems
-	use amd64 && epatch ${DISTDIR}/gtk+-2.4.1-lib64.patch.bz2
-	# and this line is just here to make building emul-linux-x86-gtklibs a bit
-	# easier, so even this should be amd64 specific.
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && epatch ${DISTDIR}/gtk+-2.4.1-lib64.patch.bz2
-	# patch for ppc64 (#64359)
-	use ppc64 && epatch ${FILESDIR}/${PN}-2.4.9-ppc64.patch
-
-	autoconf || die
-	automake || 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
-	use amd64 && dodir /etc/gtk-2.0/${CHOST}
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && dodir /etc/gtk-2.0/${CHOST}
-
-	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 NEWS* README*
-
-}
-
-pkg_postinst() {
-
-	use amd64 && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
-
-	gtk-query-immodules-2.0 >	/${GTK2_CONFDIR}/gtk.immodules
-	gdk-pixbuf-query-loaders >	/${GTK2_CONFDIR}/gdk-pixbuf.loaders
-
-}
diff --git a/x11-libs/gtk+/gtk+-2.4.9-r1.ebuild b/x11-libs/gtk+/gtk+-2.4.9-r1.ebuild
deleted file mode 100644
index 035374866e7b..000000000000
--- a/x11-libs/gtk+/gtk+-2.4.9-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.4.9-r1.ebuild,v 1.10 2005/01/12 22:10:42 gustavoz 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
-	amd64? ( http://dev.gentoo.org/~lv/gtk+-2.4.1-lib64.patch.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
-	x11-misc/shared-mime-info
-	>=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
-	sys-devel/autoconf
-	>=sys-devel/automake-1.7.9
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	# security fixes (#64230)
-	epatch ${FILESDIR}/${P}-xpm_ico_secure.patch
-
-	# 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
-	# add smoothscroll support for usability reasons
-	# http://bugzilla.gnome.org/show_bug.cgi?id=103811
-	epatch ${FILESDIR}/${PN}-2.4-smoothscroll.patch
-	# use an arch-specific config directory so that 32bit and 64bit versions
-	# dont clash on multilib systems
-	use amd64 && epatch ${DISTDIR}/gtk+-2.4.1-lib64.patch.bz2
-	# and this line is just here to make building emul-linux-x86-gtklibs a bit
-	# easier, so even this should be amd64 specific.
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && epatch ${DISTDIR}/gtk+-2.4.1-lib64.patch.bz2
-
-	autoconf || die
-	automake || 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
-	use amd64 && dodir /etc/gtk-2.0/${CHOST}
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && dodir /etc/gtk-2.0/${CHOST}
-
-	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() {
-
-	use amd64 && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
-
-	gtk-query-immodules-2.0 >	/${GTK2_CONFDIR}/gtk.immodules
-	gdk-pixbuf-query-loaders >	/${GTK2_CONFDIR}/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.9-r2.ebuild b/x11-libs/gtk+/gtk+-2.4.9-r2.ebuild
deleted file mode 100644
index f47f4f237f17..000000000000
--- a/x11-libs/gtk+/gtk+-2.4.9-r2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.4.9-r2.ebuild,v 1.2 2005/01/12 22:10:42 gustavoz 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
-	amd64? ( http://dev.gentoo.org/~lv/gtk+-2.4.1-lib64.patch.bz2 )"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="ppc64"
-IUSE="doc tiff jpeg"
-
-RDEPEND="virtual/x11
-	>=dev-libs/glib-2.4
-	>=dev-libs/atk-1.0.1
-	>=x11-libs/pango-1.4
-	x11-misc/shared-mime-info
-	>=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
-	sys-devel/autoconf
-	>=sys-devel/automake-1.7.9
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	# security fixes (#64230)
-	epatch ${FILESDIR}/${P}-xpm_ico_secure.patch
-
-	# 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
-	# add smoothscroll support for usability reasons
-	# http://bugzilla.gnome.org/show_bug.cgi?id=103811
-	epatch ${FILESDIR}/${PN}-2.4-smoothscroll.patch
-	# use an arch-specific config directory so that 32bit and 64bit versions
-	# dont clash on multilib systems
-	use amd64 && epatch ${DISTDIR}/gtk+-2.4.1-lib64.patch.bz2
-	# and this line is just here to make building emul-linux-x86-gtklibs a bit
-	# easier, so even this should be amd64 specific.
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && epatch ${DISTDIR}/gtk+-2.4.1-lib64.patch.bz2
-	# patch for ppc64 (#64359)
-	use ppc64 && epatch ${FILESDIR}/${PN}-2.4.9-ppc64.patch
-
-	autoconf || die
-	automake || 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
-	use amd64 && dodir /etc/gtk-2.0/${CHOST}
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && dodir /etc/gtk-2.0/${CHOST}
-
-	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() {
-
-	use amd64 && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
-
-	gtk-query-immodules-2.0 >	/${GTK2_CONFDIR}/gtk.immodules
-	gdk-pixbuf-query-loaders >	/${GTK2_CONFDIR}/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.6.1-r2.ebuild b/x11-libs/gtk+/gtk+-2.6.1-r2.ebuild
deleted file mode 100644
index 037d6ce78c48..000000000000
--- a/x11-libs/gtk+/gtk+-2.6.1-r2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.6.1-r2.ebuild,v 1.1 2005/02/03 06:54:11 joem Exp $
-
-inherit libtool flag-o-matic eutils
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.6/${P}.tar.bz2
-	mirror://gentoo/gtk+-2.6-smoothscroll-r2.patch
-	amd64? ( http://dev.gentoo.org/~kingtaco/gtk+-2.6.1-lib64.patch.bz2 )"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64"
-IUSE="doc tiff jpeg static"
-
-RDEPEND="virtual/x11
-	>=dev-libs/glib-2.6
-	>=dev-libs/atk-1.0.1
-	>=x11-libs/pango-1.8
-	x11-misc/shared-mime-info
-	>=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
-	sys-devel/autoconf
-	>=sys-devel/automake-1.7.9
-	doc? ( >=dev-util/gtk-doc-1 )
-	!x11-themes/gtk-engines-pixmap"
-
-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
-	# add smoothscroll support for usability reasons
-	# http://bugzilla.gnome.org/show_bug.cgi?id=103811
-	epatch ${DISTDIR}/${PN}-2.6-smoothscroll-r2.patch
-	# fix empty filechooser combo (http://bugzilla.gnome.org/show_bug.cgi?id=164290)
-	#Fix crash when labled widgets are given focus. Bug 80411 
-	epatch ${FILESDIR}/${P}-gtk_dialog.patch
-	cd ${S}/gtk
-	epatch ${FILESDIR}/${P}-empty_default_combo.patch
-
-	cd ${S}
-	# use an arch-specific config directory so that 32bit and 64bit versions
-	# dont clash on multilib systems
-	use amd64 && epatch ${DISTDIR}/gtk+-2.6.1-lib64.patch.bz2
-	# and this line is just here to make building emul-linux-x86-gtklibs a bit
-	# easier, so even this should be amd64 specific.
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && epatch ${DISTDIR}/gtk+-2.6.1-lib64.patch.bz2
-	# patch for ppc64 (#64359)
-	use ppc64 && epatch ${FILESDIR}/${PN}-2.4.9-ppc64.patch
-	use ppc64 && append-flags -mminimal-toc
-
-	autoconf || die
-	automake || die
-
-}
-
-src_compile() {
-
-	# bug 8762
-	replace-flags "-O3" "-O2"
-
-	econf \
-		`use_enable doc gtk-doc` \
-		`use_with jpeg libjpeg` \
-		`use_with tiff libtiff` \
-		`use_enable static` \
-		--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
-	use amd64 && dodir /etc/gtk-2.0/${CHOST}
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && dodir /etc/gtk-2.0/${CHOST}
-
-	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 NEWS* README*
-
-}
-
-pkg_postinst() {
-
-	use amd64 && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
-
-	gtk-query-immodules-2.0 >	/${GTK2_CONFDIR}/gtk.immodules
-	gdk-pixbuf-query-loaders >	/${GTK2_CONFDIR}/gdk-pixbuf.loaders
-
-}
diff --git a/x11-libs/gtk+/gtk+-2.6.2.ebuild b/x11-libs/gtk+/gtk+-2.6.2.ebuild
deleted file mode 100644
index b6783a87aa7b..000000000000
--- a/x11-libs/gtk+/gtk+-2.6.2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.6.2.ebuild,v 1.5 2005/03/12 19:52:15 vapier Exp $
-
-inherit libtool flag-o-matic eutils
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/"
-SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.6/${P}.tar.bz2
-	mirror://gentoo/gtk+-2.6-smoothscroll-r2.patch
-	amd64? ( http://dev.gentoo.org/~kingtaco/gtk+-2.6.1-lib64.patch.bz2 )"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="x86 ~ppc sparc ~mips ~alpha arm hppa ~amd64 ia64 ppc64"
-IUSE="doc tiff jpeg static"
-
-RDEPEND="virtual/x11
-	>=dev-libs/glib-2.6
-	>=dev-libs/atk-1.0.1
-	>=x11-libs/pango-1.8
-	x11-misc/shared-mime-info
-	>=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
-	sys-devel/autoconf
-	>=sys-devel/automake-1.7.9
-	doc? ( >=dev-util/gtk-doc-1 )
-	!x11-themes/gtk-engines-pixmap"
-
-src_unpack() {
-
-	unpack ${A}
-
-	epunt_cxx
-
-	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
-	# add smoothscroll support for usability reasons
-	# http://bugzilla.gnome.org/show_bug.cgi?id=103811
-	epatch ${DISTDIR}/${PN}-2.6-smoothscroll-r2.patch
-
-	cd ${S}
-	# use an arch-specific config directory so that 32bit and 64bit versions
-	# dont clash on multilib systems
-	use amd64 && epatch ${DISTDIR}/gtk+-2.6.1-lib64.patch.bz2
-	# and this line is just here to make building emul-linux-x86-gtklibs a bit
-	# easier, so even this should be amd64 specific.
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && epatch ${DISTDIR}/gtk+-2.6.1-lib64.patch.bz2
-	# patch for ppc64 (#64359)
-	use ppc64 && epatch ${FILESDIR}/${PN}-2.4.9-ppc64.patch
-	use ppc64 && append-flags -mminimal-toc
-
-	autoconf || die
-	automake || die
-
-}
-
-src_compile() {
-
-	# bug 8762
-	replace-flags "-O3" "-O2"
-
-	econf \
-		`use_enable doc gtk-doc` \
-		`use_with jpeg libjpeg` \
-		`use_with tiff libtiff` \
-		`use_enable static` \
-		--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
-	use amd64 && dodir /etc/gtk-2.0/${CHOST}
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && dodir /etc/gtk-2.0/${CHOST}
-
-	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 NEWS* README*
-
-}
-
-pkg_postinst() {
-
-	use amd64 && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
-
-	gtk-query-immodules-2.0 >	/${GTK2_CONFDIR}/gtk.immodules
-	gdk-pixbuf-query-loaders >	/${GTK2_CONFDIR}/gdk-pixbuf.loaders
-
-}
diff --git a/x11-libs/gtk+/gtk+-2.6.4.ebuild b/x11-libs/gtk+/gtk+-2.6.8.ebuild
index b13c1eb2f90b..6b1904eb160a 100644
--- a/x11-libs/gtk+/gtk+-2.6.4.ebuild
+++ b/x11-libs/gtk+/gtk+-2.6.8.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.6.4.ebuild,v 1.1 2005/03/02 21:53:19 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.6.8.ebuild,v 1.1 2005/06/22 16:05:59 foser Exp $
 
 inherit flag-o-matic eutils
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/"
 SRC_URI="ftp://ftp.gtk.org/pub/gtk/v2.6/${P}.tar.bz2
-	mirror://gentoo/gtk+-2.6-smoothscroll-r2.patch
+	mirror://gentoo/gtk+-2.6-smoothscroll-r5.patch
 	amd64? ( http://dev.gentoo.org/~kingtaco/gtk+-2.6.1-lib64.patch.bz2 )"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc tiff jpeg static"
 
 RDEPEND="virtual/x11
@@ -31,26 +31,29 @@ DEPEND="${RDEPEND}
 	doc? ( >=dev-util/gtk-doc-1 )
 	!x11-themes/gtk-engines-pixmap"
 
+# An arch specific config directory is used on multilib systems
+has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+use x86 && [ "$(get_libdir)" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
+
 src_unpack() {
 
 	unpack ${A}
 
-	epunt_cxx
-
 	cd ${S}
 	# beautifying patch for disabled icons
 	epatch ${FILESDIR}/${PN}-2.2.1-disable_icons_smooth_alpha.patch
 	# add smoothscroll support for usability reasons
 	# http://bugzilla.gnome.org/show_bug.cgi?id=103811
-	epatch ${DISTDIR}/${PN}-2.6-smoothscroll-r2.patch
+	epatch ${DISTDIR}/${PN}-2.6-smoothscroll-r5.patch
 
 	cd ${S}
 	# use an arch-specific config directory so that 32bit and 64bit versions
 	# dont clash on multilib systems
-	use amd64 && epatch ${DISTDIR}/gtk+-2.6.1-lib64.patch.bz2
+	has_multilib_profile && epatch ${DISTDIR}/gtk+-2.6.1-lib64.patch.bz2
 	# and this line is just here to make building emul-linux-x86-gtklibs a bit
 	# easier, so even this should be amd64 specific.
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && epatch ${DISTDIR}/gtk+-2.6.1-lib64.patch.bz2
+	use x86 && [ "$(get_libdir)" == "lib32" ] && epatch ${DISTDIR}/gtk+-2.6.1-lib64.patch.bz2
 
 	# patch for ppc64 (#64359)
 	use ppc64 && epatch ${FILESDIR}/${PN}-2.4.9-ppc64.patch
@@ -59,6 +62,8 @@ src_unpack() {
 	autoconf || die
 	automake || die
 
+	epunt_cxx
+
 }
 
 src_compile() {
@@ -83,9 +88,7 @@ src_compile() {
 
 src_install() {
 
-	dodir /etc/gtk-2.0
-	use amd64 && dodir /etc/gtk-2.0/${CHOST}
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && dodir /etc/gtk-2.0/${CHOST}
+	dodir ${GTK2_CONFDIR}
 
 	make DESTDIR=${D} install || die
 
@@ -99,10 +102,6 @@ src_install() {
 
 pkg_postinst() {
 
-	use amd64 && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	use x86 && [ "${CONF_LIBDIR}" == "lib32" ] && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
-
 	gtk-query-immodules-2.0 >	/${GTK2_CONFDIR}/gtk.immodules
 	gdk-pixbuf-query-loaders >	/${GTK2_CONFDIR}/gdk-pixbuf.loaders
author	Marinus Schraal <foser@gentoo.org>	2005-06-22 16:05:59 +0000
committer	Marinus Schraal <foser@gentoo.org>	2005-06-22 16:05:59 +0000
commit	009d6cc72a1b1e16e5adea338a2bc317b793e884 (patch)
tree	81532ed7478614428c64091ecb980417a75e6315 /x11-libs/gtk+
parent	Version bump for bug 96700; Don't waste time building tests/examples. Also ad... (diff)
download	historical-009d6cc72a1b1e16e5adea338a2bc317b793e884.tar.gz historical-009d6cc72a1b1e16e5adea338a2bc317b793e884.tar.bz2 historical-009d6cc72a1b1e16e5adea338a2bc317b793e884.zip