remove some old stuff

15 files changed, 0 insertions, 1768 deletions

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 2f12cc247bb9..7a89da920911 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,26 +1,12 @@
 MD5 d6655e8e52726077647e3213045205f4 gimp-2.0.0.ebuild 2665
 MD5 ce5ae5d71364c06be889e2c500ac90d5 gimp-2.0.2.ebuild 2568
 MD5 407ec5f52d77b3d34e037a606baf3563 gimp-1.2.5.ebuild 3214
-MD5 fc6d6f0c6212cef9b6be1a5c8090d8a7 gimp-1.2.3-r3.ebuild 4601
-MD5 c815c21e193e42741c85441b01a77215 gimp-1.2.4.ebuild 3073
 MD5 72fd60ab6a9aafcf2b1efec2f85a0e6a ChangeLog 12841
-MD5 82f7f5af98180c722f5d381722cff9cb gimp-2.0_pre3-r1.ebuild 2992
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r3-gentoo.diff 427
-MD5 86617fa03849f2ba22c845a31ddf8958 files/digest-gimp-1.2.3-r3 65
 MD5 be326cb198ec1f1f6c21a5a5a1460415 files/gimp-2.0.0-gcc34.patch 1148
 MD5 f2b58299eceabecfe5df955198c267d6 files/psd_save.c 49151
-MD5 9419aa01519fb83087a79cd0a0aef714 files/digest-gimp-2.0_pre3-r1 67
-MD5 8155b76ae44707f433bf29bebf19cf04 files/gimp-2.0_pre3-gcc_2.95.patch 2233
 MD5 12ff6c7c980ee34dc7d4d94aa40059b0 files/ltmain_sh-1.5.0-fix-relink.patch 1718
-MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.4-gentoo.diff 427
 MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404
-MD5 cdda0b1cc179cf75eabb63945efdae0e files/gimp-1.2.3-libgimpi-libtool.diff 1365
-MD5 c73865fe1298b84c685ee1314093c7bd files/gimp-2.0_pre2-remote_new_behaviour.patch 11818
-MD5 edd3aa0572ed45191d25b99712a875d9 files/gimp-1.2.3-r2-gentoo.diff 427
-MD5 945091d07e44e026c8e5fb5c01014873 files/gimp-2.0_pre2-cpuaccel-pic.patch 2524
-MD5 f8c14ef5c45d029ac5abc6c614701d5e files/gimp-1.3.20-screenshot_fix.patch 20024
-MD5 86551dc2402aaed28ccf3612e8fe7b7a files/digest-gimp-1.2.4 65
 MD5 662e7b51f4c882429b73dea3263b39de files/digest-gimp-1.2.5 65
 MD5 568ba885fc51613466e3b0039e21946c files/digest-gimp-2.0.0 65
 MD5 1f2afa6b0785b0547e956d5aff63cf4d files/digest-gimp-2.0.2 65
diff --git a/media-gfx/gimp/files/digest-gimp-1.2.3-r3 b/media-gfx/gimp/files/digest-gimp-1.2.3-r3
deleted file mode 100644
index 174f1d822a12..000000000000
--- a/media-gfx/gimp/files/digest-gimp-1.2.3-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b19235f19f524f772a4aef597a69b1da gimp-1.2.3.tar.bz2 10795020
diff --git a/media-gfx/gimp/files/digest-gimp-1.2.4 b/media-gfx/gimp/files/digest-gimp-1.2.4
deleted file mode 100644
index 7a77c13b4ef4..000000000000
--- a/media-gfx/gimp/files/digest-gimp-1.2.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 63ac650507eaa2748eb28e9ff4801c32 gimp-1.2.4.tar.bz2 10875154
diff --git a/media-gfx/gimp/files/digest-gimp-2.0_pre3-r1 b/media-gfx/gimp/files/digest-gimp-2.0_pre3-r1
deleted file mode 100644
index 43568a17c2d3..000000000000
--- a/media-gfx/gimp/files/digest-gimp-2.0_pre3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f4d45d83cba87bc9d45399b0e6bce27c gimp-2.0pre3.tar.bz2 12102800
diff --git a/media-gfx/gimp/files/gimp-1.2.3-libgimpi-libtool.diff b/media-gfx/gimp/files/gimp-1.2.3-libgimpi-libtool.diff
deleted file mode 100644
index ff8b03815442..000000000000
--- a/media-gfx/gimp/files/gimp-1.2.3-libgimpi-libtool.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -ur gimp-1.2.3.orig/app/Makefile.am gimp-1.2.3/app/Makefile.am
---- gimp-1.2.3.orig/app/Makefile.am	2002-02-03 19:28:05.000000000 -0600
-+++ gimp-1.2.3/app/Makefile.am	2002-12-03 00:52:28.000000000 -0600
-@@ -466,7 +466,7 @@
- 	$(gimp_exp)				\
- 	$(gimp_win32_resource)			\
- 	libgimpim.a				\
--	$(top_builddir)/libgimp/libgimpi.a	\
-+	$(top_builddir)/libgimp/libgimpi.la	\
- 	$(GTK_LIBS)				\
- 	$(GIMP_THREAD_LIBS)			\
- 	$(GIMP_MP_LIBS)				\
-diff -ur gimp-1.2.3.orig/libgimp/Makefile.am gimp-1.2.3/libgimp/Makefile.am
---- gimp-1.2.3.orig/libgimp/Makefile.am	2001-11-29 16:32:46.000000000 -0600
-+++ gimp-1.2.3/libgimp/Makefile.am	2002-12-03 00:56:26.000000000 -0600
-@@ -71,7 +71,7 @@
- 	gimpui.def
- 
- lib_LTLIBRARIES = libgimp.la libgimpui.la
--noinst_LIBRARIES = libgimpi.a
-+noinst_LTLIBRARIES = libgimpi.la
- 
- PDB_WRAPPERS_C = \
- 	gimpbrushes_pdb.c		\
-@@ -142,7 +142,7 @@
- 	gimpundo_pdb.h			\
- 	gimpunit_pdb.h
- 
--libgimpi_a_SOURCES = \
-+libgimpi_la_SOURCES = \
- 	gimpenv.c		\
- 	gimpenv.h		\
- 	gimpchainbutton.c	\
-@@ -187,9 +187,11 @@
- 
- if STATICLIBS
- ## Evil hack to insure all deps are satisfied on first-run make
--libgimpi_a_DEPENDENCIES = libgimp.la
-+libgimpi_la_DEPENDENCIES = libgimp.la
- endif
- 
-+libgimpi_la_LDFLAGS = -static
-+
- # help `make' along by giving another name for the file, which it knows
- # how to build
- ../libgimp/gimpfeatures.h: gimpfeatures.h
diff --git a/media-gfx/gimp/files/gimp-1.2.3-r2-gentoo.diff b/media-gfx/gimp/files/gimp-1.2.3-r2-gentoo.diff
deleted file mode 100644
index 2021e975f7ba..000000000000
--- a/media-gfx/gimp/files/gimp-1.2.3-r2-gentoo.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.am~	Mon Dec 18 16:14:07 2000
-+++ Makefile.am	Fri Jun 22 16:58:34 2001
-@@ -105,6 +105,7 @@
- 	polar \
- 	ps \
- 	psd \
-+	psd_save \
- 	$(PSP) \
- 	randomize \
- 	ripple \
-@@ -944,6 +945,14 @@
- 	psd.c
-
- psd_LDADD = \
-+	$(top_builddir)/libgimp/libgimp.la	\
-+	$(GLIB_LIBS)				\
-+	$(INTLLIBS)
-+
-+psd_save_SOURCES = \
-+	psd_save.c
-+
-+psd_save_LDADD = \
- 	$(top_builddir)/libgimp/libgimp.la	\
- 	$(GLIB_LIBS)				\
- 	$(INTLLIBS)
diff --git a/media-gfx/gimp/files/gimp-1.2.3-r3-gentoo.diff b/media-gfx/gimp/files/gimp-1.2.3-r3-gentoo.diff
deleted file mode 100644
index 2021e975f7ba..000000000000
--- a/media-gfx/gimp/files/gimp-1.2.3-r3-gentoo.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.am~	Mon Dec 18 16:14:07 2000
-+++ Makefile.am	Fri Jun 22 16:58:34 2001
-@@ -105,6 +105,7 @@
- 	polar \
- 	ps \
- 	psd \
-+	psd_save \
- 	$(PSP) \
- 	randomize \
- 	ripple \
-@@ -944,6 +945,14 @@
- 	psd.c
-
- psd_LDADD = \
-+	$(top_builddir)/libgimp/libgimp.la	\
-+	$(GLIB_LIBS)				\
-+	$(INTLLIBS)
-+
-+psd_save_SOURCES = \
-+	psd_save.c
-+
-+psd_save_LDADD = \
- 	$(top_builddir)/libgimp/libgimp.la	\
- 	$(GLIB_LIBS)				\
- 	$(INTLLIBS)
diff --git a/media-gfx/gimp/files/gimp-1.2.4-gentoo.diff b/media-gfx/gimp/files/gimp-1.2.4-gentoo.diff
deleted file mode 100644
index 2021e975f7ba..000000000000
--- a/media-gfx/gimp/files/gimp-1.2.4-gentoo.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.am~	Mon Dec 18 16:14:07 2000
-+++ Makefile.am	Fri Jun 22 16:58:34 2001
-@@ -105,6 +105,7 @@
- 	polar \
- 	ps \
- 	psd \
-+	psd_save \
- 	$(PSP) \
- 	randomize \
- 	ripple \
-@@ -944,6 +945,14 @@
- 	psd.c
-
- psd_LDADD = \
-+	$(top_builddir)/libgimp/libgimp.la	\
-+	$(GLIB_LIBS)				\
-+	$(INTLLIBS)
-+
-+psd_save_SOURCES = \
-+	psd_save.c
-+
-+psd_save_LDADD = \
- 	$(top_builddir)/libgimp/libgimp.la	\
- 	$(GLIB_LIBS)				\
- 	$(INTLLIBS)
diff --git a/media-gfx/gimp/files/gimp-1.3.20-screenshot_fix.patch b/media-gfx/gimp/files/gimp-1.3.20-screenshot_fix.patch
deleted file mode 100644
index c7d2554ff085..000000000000
--- a/media-gfx/gimp/files/gimp-1.3.20-screenshot_fix.patch
+++ /dev/null
@@ -1,687 +0,0 @@
---- plug-ins/common/screenshot.c.org	2003-09-26 23:35:11.000000000 +0200
-+++ plug-ins/common/screenshot.c	2003-09-26 23:35:13.000000000 +0200
-@@ -1,10 +1,13 @@
--/*
-+/*  
-  *  ScreenShot plug-in
-  *  Copyright 1998-2000 Sven Neumann <sven@gimp.org>
-- *  Copyright 2003      Henrik Brix Andersen <brix@gimp.org>
-  *
-  *  Any suggestions, bug-reports or patches are very welcome.
-- *
-+ * 
-+ *  This plug-in uses the X-utility xwd to grab an image from the screen
-+ *  and the xwd-plug-in created by Peter Kirchgessner (pkirchg@aol.com)
-+ *  to load this image into the gimp.
-+ *  Hence its nothing but a simple frontend to those utilities.
-  */
- 
- /* The GIMP -- an image manipulation program
-@@ -27,59 +30,56 @@
- 
- #include "config.h"
- 
-+#include <stdio.h>
-+#include <errno.h>
-+#include <sys/wait.h>
-+#include <unistd.h>
-+#ifdef __EMX__
-+#include <process.h>
-+#endif
-+
- #include <gtk/gtk.h>
- 
- #include <libgimp/gimp.h>
- #include <libgimp/gimpui.h>
- 
--#if defined(GDK_WINDOWING_X11)
--#include <gdk/gdkx.h>
--#elif defined(GDK_WINDOWING_WIN32)
--#include <windows.h>
--#endif
--
- #include "libgimp/stdplugins-intl.h"
- 
- 
- /* Defines */
- #define PLUG_IN_NAME "plug_in_screenshot"
- 
--#ifdef __GNUC__
--#ifdef GDK_NATIVE_WINDOW_POINTER
--#if GLIB_SIZEOF_VOID_P != 4
--#warning window_id does not fit in PDB_INT32
--#endif
--#endif
-+#ifndef XWD
-+#define XWD "xwd"
- #endif
- 
- typedef struct
- {
--  gboolean         root;
--  guint            window_id;
--  guint            delay;
-+  gboolean   root;
-+  gchar     *window_id;
-+  guint      delay;
-+  gboolean   decor;
- } ScreenShotValues;
- 
--static ScreenShotValues shootvals =
--{
-+static ScreenShotValues shootvals = 
-+{ 
-   FALSE,     /* root window */
--  0,         /* window ID   */
--  0,         /* delay       */
-+  NULL,      /* window ID */
-+  0,         /* delay */
-+  TRUE,      /* decorations */
- };
- 
- 
- static void      query (void);
- static void      run   (const gchar      *name,
- 			gint              nparams,
--			const GimpParam  *param,
-+			const GimpParam  *param, 
- 			gint             *nreturn_vals,
- 			GimpParam       **return_vals);
- 
--static GdkNativeWindow select_window  (const GdkScreen *screen);
--static gint32          create_image   (const GdkPixbuf *pixbuf);
--
- static void      shoot                (void);
- static gboolean  shoot_dialog         (void);
--static void      shoot_ok_callback    (GtkWidget *widget,
-+static void      shoot_ok_callback    (GtkWidget *widget, 
- 				       gpointer   data);
- static void      shoot_delay          (gint32     delay);
- static gboolean  shoot_delay_callback (gpointer   data);
-@@ -95,15 +95,10 @@
- };
- 
- /* the image that will be returned */
--gint32     image_ID = -1;
-+gint32    image_ID = -1;
- 
--gboolean   run_flag = FALSE;
-+gboolean  run_flag = FALSE;
- 
--/* the screen on which we are running */
--GdkScreen *cur_screen = NULL;
--
--/* the window the user selected */
--GdkNativeWindow selected_native;
- 
- /* Functions */
- 
-@@ -114,9 +109,9 @@
- {
-   static GimpParamDef args[] =
-   {
--    { GIMP_PDB_INT32, "run_mode",  "Interactive, non-interactive" },
--    { GIMP_PDB_INT32, "root",      "Root window { TRUE, FALSE }" },
--    { GIMP_PDB_INT32, "window_id", "Window id" }
-+    { GIMP_PDB_INT32,  "run_mode",  "Interactive, non-interactive" },
-+    { GIMP_PDB_INT32,  "root",      "Root window { TRUE, FALSE }" },
-+    { GIMP_PDB_STRING, "window_id", "Window id" }
-   };
- 
-   static GimpParamDef return_vals[] =
-@@ -126,14 +121,17 @@
- 
-   gimp_install_procedure (PLUG_IN_NAME,
- 			  "Creates a screenshot of a single window or the whole screen",
--                          "After specifying some options the user selects a window and "
--                          "a time out is started. At the end of the time out the window "
--                          "is grabbed and the image is loaded into The GIMP. Alternatively "
--                          "the whole screen can be grabbed. When called non-interactively "
--                          "it may grab the root window or use the window-id passed as a parameter.",
--			  "Sven Neumann <sven@gimp.org>, Henrik Brix Andersen <brix@gimp.org>",
--			  "1998 - 2003",
--			  "v0.9.6 (2003/08/28)",
-+			  "This extension serves as a simple frontend to the "
-+			  "X-window utility xwd and the xwd-file-plug-in. "
-+			  "After specifying some options, xwd is called, the "
-+			  "user selects a window, and the resulting image is "
-+			  "loaded into the gimp. Alternatively the whole "
-+			  "screen can be grabbed. When called non-interactively "
-+			  "it may grab the root window or use the window-id "
-+			  "passed as a parameter.",
-+			  "Sven Neumann <sven@gimp.org>",
-+			  "1998 - 2000",
-+			  "v0.9.5 (2000/10/29)",
- 			  N_("<Toolbox>/File/Acquire/_Screen Shot..."),
- 			  NULL,
- 			  GIMP_PLUGIN,
-@@ -142,7 +140,7 @@
- 			  args, return_vals);
- }
- 
--static void
-+static void 
- run (const gchar      *name,
-      gint             nparams,
-      const GimpParam  *param,
-@@ -150,17 +148,17 @@
-      GimpParam       **return_vals)
- {
-   /* Get the runmode from the in-parameters */
--  GimpRunMode run_mode = param[0].data.d_int32;
-+  GimpRunMode run_mode = param[0].data.d_int32;	
- 
--  /* status variable, use it to check for errors in invocation usually only
-+  /* status variable, use it to check for errors in invocation usualy only 
-    * during non-interactive calling
-    */
--  GimpPDBStatusType status = GIMP_PDB_SUCCESS;
-+  GimpPDBStatusType status = GIMP_PDB_SUCCESS;	 
- 
-   /* always return at least the status to the caller. */
-   static GimpParam values[2];
- 
--  /* initialize the return of the status */
-+  /* initialize the return of the status */ 	
-   values[0].type          = GIMP_PDB_STATUS;
-   values[0].data.d_status = status;
-   *nreturn_vals = 1;
-@@ -174,7 +172,7 @@
-     case GIMP_RUN_INTERACTIVE:
-       /* Possibly retrieve data from a previous run */
-       gimp_get_data (PLUG_IN_NAME, &shootvals);
--      shootvals.window_id = 0;
-+      shootvals.window_id = NULL;
- 
-      /* Get information from the dialog */
-       if (!shoot_dialog ())
-@@ -182,17 +180,15 @@
-       break;
- 
-     case GIMP_RUN_NONINTERACTIVE:
--      if (nparams == 3)
-+      if (nparams == 3) 
- 	{
- 	  shootvals.root      = param[1].data.d_int32;
--	  shootvals.window_id = param[2].data.d_int32;
-+	  shootvals.window_id = (gchar*) param[2].data.d_string;
- 	  shootvals.delay     = 0;
-+	  shootvals.decor     = FALSE;
- 	}
-       else
- 	status = GIMP_PDB_CALLING_ERROR;
--
--      if (!gdk_init_check (0, NULL))
--	status = GIMP_PDB_CALLING_ERROR;
-       break;
- 
-     case GIMP_RUN_WITH_LAST_VALS:
-@@ -229,264 +225,139 @@
-       values[1].data.d_image = image_ID;
-     }
- 
--  values[0].data.d_status = status;
--}
--
--/* Allow the user to select a window with the mouse */
--
--static GdkNativeWindow
--select_window (const GdkScreen *screen)
--{
--#if defined(GDK_WINDOWING_X11)
--  /* X11 specific code */
--
--#define MASK (ButtonPressMask | ButtonReleaseMask)
--
--  Display    *x_dpy;
--  Cursor      x_cursor;
--  XEvent      x_event;
--  Window      x_win;
--  Window      x_root;
--  gint        x_scr;
--  gint        status;
--  gint        buttons;
--
--  x_dpy = GDK_SCREEN_XDISPLAY (GDK_SCREEN (screen));
--  x_scr = GDK_SCREEN_XNUMBER (GDK_SCREEN (screen));
--
--  x_win    = None;
--  x_root   = RootWindow (x_dpy, x_scr);
--  x_cursor = XCreateFontCursor (x_dpy, GDK_CROSSHAIR);
--  buttons  = 0;
--
--  status = XGrabPointer (x_dpy, x_root, False,
--                         MASK, GrabModeSync, GrabModeAsync,
--                         x_root, x_cursor, CurrentTime);
--
--  if (status != GrabSuccess)
--    {
--      g_message (_("Error grabbing the pointer"));
--      return 0;
--    }
--
--  while ((x_win == None) || (buttons != 0))
--    {
--      XAllowEvents (x_dpy, SyncPointer, CurrentTime);
--      XWindowEvent (x_dpy, x_root, MASK, &x_event);
--
--      switch (x_event.type)
--        {
--        case ButtonPress:
--          if (x_win == None)
--            {
--              x_win = x_event.xbutton.subwindow;
--              if (x_win == None)
--                x_win = x_root;
--            }
--          buttons++;
--          break;
--
--        case ButtonRelease:
--          if (buttons > 0)
--            buttons--;
--          break;
--
--        default:
--          g_assert_not_reached ();
--        }
--    }
--
--  XUngrabPointer (x_dpy, CurrentTime);
--  XFreeCursor (x_dpy, x_cursor);
--
--  return x_win;
--#elif defined(GDK_WINDOWING_WIN32)
--  /* MS Windows specific code goes here (yet to be written) */
--
--  /* basically the code should grab the pointer using a crosshair
--     cursor, allow the user to click on a window and return the
--     obtained HWND (as a GdkNativeWindow) - for more details consult
--     the X11 specific code below */
--
--  /* note to self: take a look at the winsnap plug-in for example
--     code */
--
--#warning Win32 screenshot window chooser not implemented yet
--  return 0;
--#else /* GDK_WINDOWING_WIN32 */
--#warning screenshot window chooser not implemented yet for this GDK backend
--  return 0;
--#endif
-+  values[0].data.d_status = status; 
- }
- 
--/* Create a GimpImage from a GdkPixbuf */
--
--static gint32
--create_image (const GdkPixbuf *pixbuf)
--{
--  GimpPixelRgn	pr;
--  GimpDrawable *drawable;
--  GimpParasite *parasite;
--  gint32        image;
--  gint32        layer;
--  gdouble       xres, yres;
--  gchar        *comment;
--  gint          width, height;
--  gint          rowstride;
--  gboolean      status;
--  gchar        *buf;
--  gint          i;
--
--  width  = gdk_pixbuf_get_width (GDK_PIXBUF (pixbuf));
--  height = gdk_pixbuf_get_height (GDK_PIXBUF (pixbuf));
--
--  image = gimp_image_new (width, height, GIMP_RGB);
--  layer = gimp_layer_new (image, _("Background"),
--                          width, height,
--                          GIMP_RGB_IMAGE, 100, GIMP_NORMAL_MODE);
--
--  gimp_image_add_layer (image, layer, 0);
--
--  drawable = gimp_drawable_get (layer);
--
--  gimp_tile_cache_ntiles ((width / gimp_tile_width ()) + 1);
--
--  gimp_pixel_rgn_init (&pr, drawable,
--                       0, 0, width, height,
--                       TRUE, FALSE);
--
--  /* copy the contents of the GdkPixbuf to the GimpDrawable */
--  rowstride = gdk_pixbuf_get_rowstride (GDK_PIXBUF (pixbuf));
--  buf       = gdk_pixbuf_get_pixels (GDK_PIXBUF (pixbuf));
--  status    = gimp_progress_init (_("Loading Screen Shot..."));
--
--  for (i = 0; i < height; i++)
--    {
--      gimp_pixel_rgn_set_row (&pr, buf, 0, i, width);
--      buf += rowstride;
--      /* update progress every 10 percent */
--      if (status && ((i + 1) * 100 / height) % 10 == 0)
--        status = gimp_progress_update ((i + 1.0) / height);
--    }
--
--  gimp_progress_update (1.0);
--
--  /*  figure out the monitor resolution and set the image to it  */
--  gimp_get_monitor_resolution (&xres, &yres);
--  gimp_image_set_resolution (image, xres, yres);
--
--  /* Set the default comment parasite */
--  comment = gimp_get_default_comment ();
--
--  if (comment)
--    {
--      parasite = gimp_parasite_new ("gimp-comment",
--                                    GIMP_PARASITE_PERSISTENT,
--                                    g_utf8_strlen (comment, -1) + 1,
--                                    comment);
--
--      gimp_image_parasite_attach (image_ID, parasite);
--      gimp_parasite_free (parasite);
--      g_free (comment);
--    }
--
--  return image;
--}
- 
- /* The main ScreenShot function */
--
--static void
-+static void 
- shoot (void)
- {
--  GdkWindow    *window;
--  GdkPixbuf    *screenshot;
--  GdkRectangle  clip;
--  GdkPoint      origin;
--  gint          screen_w, screen_h;
--
--  /* use default screen if we are running non-interactively */
--  if (cur_screen == NULL)
--    cur_screen = gdk_screen_get_default ();
--
--  screen_w = gdk_screen_get_width (GDK_SCREEN (cur_screen));
--  screen_h = gdk_screen_get_height (GDK_SCREEN (cur_screen));
--  clip.x   = 0;
--  clip.y   = 0;
--
--  if (shootvals.root)
--    {
--      /* entire screen */
--      window = gdk_screen_get_root_window (GDK_SCREEN (cur_screen));
-+  GimpParam *params;
-+  gint       retvals;
-+  gchar     *tmpname;
-+  gchar     *xwdargv[7];    /*  need a maximum of 7 arguments to xwd  */
-+  gdouble    xres, yres;
-+  gint       pid;
-+  gint       wpid;
-+  gint       status;
-+  gint       i = 0;
-+
-+  /*  get a temp name with the right extension  */
-+  tmpname = gimp_temp_name ("xwd");
-+
-+  /*  construct the xwd arguments  */
-+  xwdargv[i++] = XWD;
-+  xwdargv[i++] = "-out";
-+  xwdargv[i++] = tmpname;
-+  if ( shootvals.root == TRUE )
-+    xwdargv[i++] = "-root";
-+  else 
-+    {
-+      if (shootvals.decor == TRUE )
-+	xwdargv[i++] = "-frame";
-+      if (shootvals.window_id != NULL)
-+	{
-+	  xwdargv[i++] = "-id";
-+	  xwdargv[i++] = shootvals.window_id;
-+	}
-     }
--  else
-+  xwdargv[i] = NULL;
-+  
-+#ifndef __EMX__
-+  /*  fork off a xwd process  */
-+  if ((pid = fork ()) < 0)
-     {
--      /* single window */
--      if (shootvals.window_id)
--        {
--          window = gdk_window_foreign_new (shootvals.window_id);
--        }
--      else
--        {
--          window = gdk_window_foreign_new (selected_native);
--        }
-+      g_message ("fork() failed: %s", g_strerror (errno));
-+      return;
-     }
--
--  if (!window)
-+  else if (pid == 0)
-     {
--      g_message (_("Specified window not found"));
-+      execvp (XWD, xwdargv);
-+      /*  What are we doing here? exec must have failed  */
-+      g_message ("exec failed: xwd: %s", g_strerror (errno));
-       return;
-     }
--
--  gdk_drawable_get_size (GDK_WINDOW (window), &clip.width, &clip.height);
--  gdk_window_get_origin (GDK_WINDOW (window), &origin.x, &origin.y);
--
--  /* do clipping */
--  if (origin.x < 0)
-+  else
-+#else /* __EMX__ */
-+  pid = spawnvp (P_NOWAIT, XWD, xwdargv);
-+  if (pid == -1)
-     {
--      clip.x = -origin.x;
--      clip.width += origin.x;
-+      g_message ("spawn failed: %s", g_strerror (errno));
-+      return;
-     }
--  if (origin.y < 0)
-+#endif
-     {
--      clip.y = -origin.y;
--      clip.height += origin.y;
-+      status = -1;
-+      wpid = waitpid (pid, &status, 0);
-+
-+      if ((wpid < 0) || !WIFEXITED (status))
-+	{
-+	  /*  the tmpfile may have been created even if xwd failed  */
-+	  unlink (tmpname);
-+	  g_free (tmpname);
-+	  g_message ("xwd didn't work");
-+	  return;
-+	}
-     }
--  if (origin.x + clip.width > screen_w)
--    clip.width -= origin.x + clip.width - screen_w;
--  if (origin.y + clip.height > screen_h)
--    clip.height -= origin.y + clip.height - screen_h;
--
--  screenshot = gdk_pixbuf_get_from_drawable (NULL, GDK_WINDOW (window),
--                                             NULL, clip.x, clip.y, 0, 0,
--                                             clip.width, clip.height);
- 
--  gdk_display_beep (gdk_screen_get_display (GDK_SCREEN (cur_screen)));
--  gdk_flush ();
-+  /*  now load the tmpfile using the xwd-plug-in  */
-+  params = gimp_run_procedure ("file_xwd_load",
-+			       &retvals,
-+			       GIMP_PDB_INT32, 1,
-+			       GIMP_PDB_STRING, tmpname,
-+			       GIMP_PDB_STRING, tmpname,
-+			       GIMP_PDB_END);
-+  if (params[0].data.d_status == GIMP_PDB_SUCCESS)
-+    {
-+      image_ID = params[1].data.d_image;
-+    }
-+  gimp_destroy_params (params, retvals);
-+
-+  /*  get rid of the tmpfile  */
-+  unlink (tmpname);
-+  g_free (tmpname);
-+
-+  if (image_ID != -1)
-+    {
-+      GimpParasite *parasite;
-+      gchar *comment;
-+      
-+      /*  figure out the monitor resolution and set the image to it  */
-+      gimp_get_monitor_resolution (&xres, &yres);      
-+      gimp_image_set_resolution (image_ID, xres, yres);
-+
-+      /*  unset the image filename  */
-+      gimp_image_set_filename (image_ID, "");
-+
-+      
-+      /* Set the default comment parasite */
-+      comment = gimp_get_default_comment ();
-+      
-+      if (comment != NULL)
-+        {
-+          parasite = gimp_parasite_new ("gimp-comment", 
-+                                        GIMP_PARASITE_PERSISTENT,
-+                                        g_utf8_strlen (comment, -1) + 1,
-+                                        comment);
- 
--  if (!screenshot)
--    {
--      g_message (_("Error obtaining screenshot"));
--      return;
-+          gimp_image_parasite_attach (image_ID, parasite);
-+          gimp_parasite_free(parasite);
-+        }
-     }
--
--  image_ID = create_image (GDK_PIXBUF (screenshot));
-+  
-+  return;
- }
- 
-+
- /*  ScreenShot dialog  */
- 
- static void
--shoot_ok_callback (GtkWidget *widget,
-+shoot_ok_callback (GtkWidget *widget, 
- 		   gpointer   data)
- {
-   run_flag = TRUE;
--
--  /* get the screen on which we are running */
--  cur_screen = gtk_widget_get_screen (GTK_WIDGET (widget));
--
-   gtk_widget_destroy (GTK_WIDGET (data));
--
--  if (!shootvals.root && !shootvals.window_id)
--    selected_native = select_window (GDK_SCREEN (cur_screen));
- }
- 
- static gboolean
-@@ -499,7 +370,9 @@
-   GtkWidget *hbox;
-   GtkWidget *label;
-   GtkWidget *button;
-+  GtkWidget *decor_button;
-   GtkWidget *spinner;
-+  GtkWidget *sep;
-   GSList    *radio_group = NULL;
-   GtkObject *adj;
- 
-@@ -514,7 +387,6 @@
- 
- 			    GTK_STOCK_CANCEL, gtk_widget_destroy,
- 			    NULL, 1, NULL, FALSE, TRUE,
--
- 			    GTK_STOCK_OK, shoot_ok_callback,
- 			    NULL, NULL, NULL, TRUE, FALSE,
- 
-@@ -539,9 +411,9 @@
-   gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
-   gtk_container_add (GTK_CONTAINER (frame), vbox);
- 
--  button = gtk_radio_button_new_with_mnemonic (radio_group,
--					       _("a _Single Window"));
--  radio_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
-+  button = gtk_radio_button_new_with_mnemonic (radio_group, 
-+					       _("_Single Window"));
-+  radio_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));  
-   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), ! shootvals.root);
-   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-   gtk_widget_show (button);
-@@ -553,10 +425,32 @@
-                     G_CALLBACK (gimp_radio_button_update),
-                     &shootvals.root);
- 
-+  /*  with decorations  */
-+  hbox = gtk_hbox_new (FALSE, 2);
-+  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
-+  decor_button =
-+    gtk_check_button_new_with_mnemonic (_("With _Decorations"));
-+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (decor_button), 
-+				shootvals.decor);
-+  gtk_box_pack_end (GTK_BOX (hbox), decor_button, FALSE, FALSE, 0);
-+  gtk_widget_show (decor_button);
-+
-+  g_object_set_data (G_OBJECT (button), "set_sensitive", decor_button);
-+
-+  g_signal_connect (decor_button, "toggled",
-+                    G_CALLBACK (gimp_toggle_button_update),
-+                    &shootvals.decor);
-+
-+  gtk_widget_show (hbox);
-+
-+  sep = gtk_hseparator_new ();
-+  gtk_box_pack_start (GTK_BOX (vbox), sep, FALSE, FALSE, 0);
-+  gtk_widget_show (sep);
-+
-   /*  root window  */
-   button = gtk_radio_button_new_with_mnemonic (radio_group,
--					       _("the _Whole Screen"));
--  radio_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
-+					       _("_Whole Screen"));
-+  radio_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));  
-   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), shootvals.root);
-   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
- 
-@@ -577,14 +471,14 @@
-   label = gtk_label_new_with_mnemonic (_("_after"));
-   gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-   gtk_widget_show (label);
--
-+ 
-   adj = gtk_adjustment_new (shootvals.delay, 0.0, 100.0, 1.0, 5.0, 0.0);
-   spinner = gtk_spin_button_new (GTK_ADJUSTMENT (adj), 0, 0);
-   gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, FALSE, 0);
-   gtk_widget_show (spinner);
- 
-   g_signal_connect (adj, "value_changed",
--                    G_CALLBACK (gimp_int_adjustment_update),
-+                    G_CALLBACK (gimp_int_adjustment_update), 
-                     &shootvals.delay);
- 
-   label = gtk_label_new (_("Seconds Delay"));
-@@ -611,12 +505,12 @@
- gboolean
- shoot_delay_callback (gpointer data)
- {
--  gint *seconds_left = data;
-+  gint *seconds_left = (gint *)data;
- 
-   (*seconds_left)--;
- 
--  if (!*seconds_left)
--    gtk_main_quit ();
-+  if (!*seconds_left) 
-+    gtk_main_quit();
- 
-   return *seconds_left;
- }
diff --git a/media-gfx/gimp/files/gimp-2.0_pre2-cpuaccel-pic.patch b/media-gfx/gimp/files/gimp-2.0_pre2-cpuaccel-pic.patch
deleted file mode 100644
index b1bc32c04ed3..000000000000
--- a/media-gfx/gimp/files/gimp-2.0_pre2-cpuaccel-pic.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- gimp-2.0pre2/app/base/cpu-accel.c	2003-09-07 15:56:51.000000000 -0400
-+++ gimp-cvs/app/base/cpu-accel.c	2004-01-31 04:01:34.000000000 -0500
-@@ -40,11 +40,6 @@
- 
- #ifdef ARCH_X86
- 
--#if GLIB_SIZEOF_LONG == 8
--#define ARCH_X86_64 1
--#endif
--
--
- typedef enum
- {
-   ARCH_X86_VENDOR_NONE,
-@@ -78,14 +73,25 @@
-   ARCH_X86_CYRIX_FEATURE_MMXEXT   = 1 << 24
- };
- 
--/* FIXME: This should save off ebx/rbx if compiled for PIC */
--#define cpuid(op,eax,ebx,ecx,edx) \
--  asm ("cpuid\n\t"                \
--       : "=a" (eax),             \
--         "=b" (ebx),             \
--         "=c" (ecx),             \
--         "=d" (edx)              \
--       : "0" (op))
-+#if !defined(ARCH_X86_64) && (defined(__PIC__) || defined(__pic__) || defined(PIC))
-+#define cpuid(op,eax,ebx,ecx,edx)  \
-+  __asm__ ("movl %%ebx, %%esi\n\t" \
-+           "cpuid\n\t"             \
-+           "xchgl %%ebx,%%esi"     \
-+           : "=a" (eax),           \
-+             "=S" (ebx),           \
-+             "=c" (ecx),           \
-+             "=d" (edx)            \
-+           : "0" (op))
-+#else
-+#define cpuid(op,eax,ebx,ecx,edx)  \
-+  __asm__ ("cpuid"                 \
-+           : "=a" (eax),           \
-+             "=b" (ebx),           \
-+             "=c" (ecx),           \
-+             "=d" (edx)            \
-+           : "0" (op))
-+#endif
- 
- 
- static X86Vendor
-@@ -96,22 +102,22 @@
- 
- #ifndef ARCH_X86_64
-   /* Only need to check this on ia32 */
--  asm ("pushfl\n\t"
--       "pushfl\n\t"
--       "popl %0\n\t"
--       "movl %0,%1\n\t"
--       "xorl $0x200000,%0\n\t"
--       "push %0\n\t"
--       "popfl\n\t"
--       "pushfl\n\t"
--       "popl %0\n\t"
--       "popfl\n\t"
--       : "=a" (eax),
--         "=b" (ebx)
--       :
--       : "cc");
-+  __asm__ ("pushfl\n\t"
-+           "pushfl\n\t"
-+           "popl %0\n\t"
-+           "movl %0,%1\n\t"
-+           "xorl $0x200000,%0\n\t"
-+           "pushl %0\n\t"
-+           "popfl\n\t"
-+           "pushfl\n\t"
-+           "popl %0\n\t"
-+           "popfl"
-+           : "=a" (eax),
-+             "=c" (ecx)
-+           :
-+           : "cc");
- 
--  if (eax == ebx)
-+  if (eax == ecx)
-     return ARCH_X86_VENDOR_NONE;
- #endif
- 
-@@ -385,7 +391,6 @@
-   accel = arch_accel ();
- 
- #ifdef USE_SSE
--
-   /* test OS support for SSE */
-   if (accel & CPU_ACCEL_X86_SSE)
-     {
-@@ -396,7 +401,7 @@
-       else
- 	{
- 	  signal (SIGILL, sigill_handler);
--	  __asm __volatile ("xorps %xmm0, %xmm0");
-+	  __asm__ __volatile__ ("xorps %xmm0, %xmm0");
- 	  signal (SIGILL, SIG_DFL);
- 	}
-     }
diff --git a/media-gfx/gimp/files/gimp-2.0_pre2-remote_new_behaviour.patch b/media-gfx/gimp/files/gimp-2.0_pre2-remote_new_behaviour.patch
deleted file mode 100644
index 490fe1d5866d..000000000000
--- a/media-gfx/gimp/files/gimp-2.0_pre2-remote_new_behaviour.patch
+++ /dev/null
@@ -1,369 +0,0 @@
-Index: tools/gimp-remote.c
-===================================================================
-RCS file: /cvs/gnome/gimp/tools/gimp-remote.c,v
-retrieving revision 1.14
-diff -u -p -r1.14 gimp-remote.c
---- tools/gimp-remote.c	17 Nov 2003 08:46:51 -0000	1.14
-+++ tools/gimp-remote.c	20 Jan 2004 12:06:45 -0000
-@@ -2,14 +2,11 @@
-  * Copyright (C) 1995 Spencer Kimball and Peter Mattis
-  *
-  * gimp-remote.c
-- * Copyright (C) 2000-2003  Sven Neumann <sven@gimp.org>
-+ * Copyright (C) 2000-2004  Sven Neumann <sven@gimp.org>
-  *                          Simon Budig <simon@gimp.org>
-  *
-  * Tells a running gimp to open files by creating a synthetic drop-event.
-  *
-- * compile with
-- *  gcc -o gimp-remote `pkg-config --cflags --libs gtk+-2.0` -lXmu gimp-remote.c
-- *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation; either version 2 of the License, or
-@@ -38,7 +35,6 @@
-  *                                                Simon
-  */
- 
--
- #include "config.h"
- 
- #include <errno.h>
-@@ -54,7 +50,7 @@
- #include "libgimpbase/gimpversion.h"
- 
- 
--static gboolean  start_new = FALSE;
-+#define GIMP_BINARY "gimp-1.3"
- 
- 
- static GdkWindow *
-@@ -137,10 +133,8 @@ source_selection_get (GtkWidget        *
- 		      GtkSelectionData *selection_data,
- 		      guint             info,
- 		      guint             time,
--		      gpointer          data)
-+		      const gchar      *uri)
- {
--  gchar *uri = (gchar *) data;
--
-   gtk_selection_data_set (selection_data,
-                           selection_data->target,
-                           8, uri, strlen (uri));
-@@ -165,7 +159,6 @@ usage (const gchar *name)
- 	   "Usage: %s [options] [FILE|URI]...\n\n", name);
-   g_print ("Valid options are:\n"
-            "  --display <display>  Use the designated X display.\n"
--	   "  -n --new             Start gimp if no active gimp window was found.\n"
- 	   "  -h --help            Output this help.\n"
- 	   "  -v --version         Output version info.\n"
-              "\n");
-@@ -182,9 +175,12 @@ start_new_gimp (gchar   *argv0,
-   gchar  *gimp, *path, *name, *pwd;
-   const gchar *spath;
- 
--  file_list = g_string_prepend (file_list, "gimp\n");
-+  if (file_list->len > 0)
-+    file_list = g_string_prepend (file_list, "\n");
-+
-+  file_list = g_string_prepend (file_list, "gimp");
-+
-   argv = g_strsplit (file_list->str, "\n", 0);
--  g_string_free (file_list, TRUE);
- 
-   /* We are searching for the path the gimp-remote executable lives in */
- 
-@@ -194,15 +190,19 @@ start_new_gimp (gchar   *argv0,
-    * usable in it try argv[0], then fall back to search the path.
-    */
- 
--  gimp = NULL;
-+  gimp  = NULL;
-   spath = NULL;
- 
--  for (i=0; i < 2; i++)
-+  for (i = 0; i < 2; i++)
-     {
-       if (i == 0)
--        spath = g_getenv ("_");
-+        {
-+          spath = g_getenv ("_");
-+        }
-       else if (i == 1)
--        spath = argv0;
-+        {
-+          spath = argv0;
-+        }
- 
-       if (spath)
-         {
-@@ -210,22 +210,20 @@ start_new_gimp (gchar   *argv0,
- 
-           if (!strncmp (name, "gimp-remote", 11))
-             {
-+              path = g_path_get_dirname (spath);
-+
-               if (g_path_is_absolute (spath))
-                 {
--                  path = g_path_get_dirname (spath);
--                  gimp = g_strconcat (path, G_DIR_SEPARATOR_S,
--                                      "gimp-1.3", NULL);
--                  g_free (path);
-+                  gimp = g_build_filename (path, GIMP_BINARY, NULL);
-                 }
-               else
-                 {
-                   pwd = g_get_current_dir ();
--                  path = g_path_get_dirname (spath);
--                  gimp = g_strconcat (pwd, G_DIR_SEPARATOR_S, path,
--                                      G_DIR_SEPARATOR_S, "gimp-1.3", NULL);
--                  g_free (path);
-+                  gimp = g_build_filename (pwd, path, GIMP_BINARY, NULL);
-                   g_free (pwd);
-                 }
-+
-+              g_free (path);
-             }
- 
-           g_free (name);
-@@ -235,19 +233,13 @@ start_new_gimp (gchar   *argv0,
-         break;
-     }
- 
--  for (i = 1; argv[i]; i++)
--    {
--      if (g_ascii_strncasecmp ("file:", argv[i], 5) == 0)
--	argv[i] += 5;
--    }
--
-   execv (gimp, argv);
--  execvp ("gimp-1.3", argv);
-+  execvp (GIMP_BINARY, argv);
- 
-   /*  if execv and execvp return, there was an arror  */
--  g_printerr ("Couldn't start gimp-1.3 for the following reason: %s\n",
--              g_strerror (errno));
--  exit (-1);
-+  g_printerr ("Couldn't start %s for the following reason: %s\n",
-+              GIMP_BINARY, g_strerror (errno));
-+  exit (EXIT_FAILURE);
- }
- 
- static void
-@@ -258,7 +250,7 @@ parse_option (const gchar *progname,
-       strcmp (arg, "--version") == 0)
-     {
-       g_print ("gimp-remote version %s\n", GIMP_VERSION);
--      exit (0);
-+      exit (EXIT_SUCCESS);
-     }
-   else if (strcmp (arg, "-h") == 0 ||
- 	   strcmp (arg, "-?") == 0 ||
-@@ -266,18 +258,20 @@ parse_option (const gchar *progname,
- 	   strcmp (arg, "--usage") == 0)
-     {
-       usage (progname);
--      exit (0);
-+      exit (EXIT_SUCCESS);
-     }
-   else if (strcmp (arg, "-n") == 0 ||
- 	   strcmp (arg, "--new") == 0)
-     {
--      start_new = TRUE;
-+      /*  accepted for backward compatibility; this is now the default  */
-     }
-   else
-     {
--      g_print ("Unknown option %s\n", arg);
--      g_print ("Try gimp-remote --help to get detailed usage instructions.\n");
--      exit (0);
-+      g_printerr ("Unknown option %s\n", arg);
-+      g_printerr ("Try %s --help to get detailed usage instructions.\n",
-+                  progname);
-+
-+      exit (EXIT_FAILURE);
-     }
- }
- 
-@@ -285,28 +279,19 @@ gint
- main (gint    argc,
-       gchar **argv)
- {
--  GtkWidget  *source;
-   GdkDisplay *display;
-   GdkWindow  *gimp_window;
--
--  GdkDragContext  *context;
--  GdkDragProtocol  protocol;
--
--  GdkAtom   sel_type;
--  GdkAtom   sel_id;
--  GList    *targetlist;
--  guint     timeout;
--  gboolean  options = TRUE;
--
--  GString  *file_list = g_string_new (NULL);
--  gchar    *cwd       = g_get_current_dir ();
--  gchar    *file_uri  = "";
--  guint    i;
-+  GString    *file_list = g_string_new (NULL);
-+  gchar      *cwd       = g_get_current_dir ();
-+  gint        i;
- 
-   gtk_init (&argc, &argv);
- 
-   for (i = 1; i < argc; i++)
-     {
-+      gchar    *file_uri  = NULL;
-+      gboolean  options   = TRUE;
-+
-       if (strlen (argv[i]) == 0)
-         continue;
- 
-@@ -332,9 +317,17 @@ main (gint    argc,
-           g_ascii_strncasecmp ("https:", argv[i], 6))
-         {
-           if (g_path_is_absolute (argv[i]))
--            file_uri = g_strconcat ("file:", argv[i], NULL);
-+            {
-+              file_uri = g_filename_to_uri (argv[i], NULL, NULL);
-+            }
-           else
--            file_uri = g_strconcat ("file:", cwd, "/", argv[i], NULL);
-+            {
-+              gchar *abs = g_build_filename (cwd, argv[i], NULL);
-+
-+              file_uri = g_strconcat (abs, NULL, NULL);
-+
-+              g_free (abs);
-+            }
-         }
-       else
-         {
-@@ -348,74 +341,82 @@ main (gint    argc,
-       g_free (file_uri);
-     }
- 
--  if (file_list->len == 0)
--    {
--      usage (argv[0]);
--      return EXIT_SUCCESS;
--    }
--
-   /*  locate Gimp window */
- 
-   display = gdk_display_get_default ();
- 
-   gimp_window = gimp_remote_find_window (display, gdk_screen_get_default ());
- 
--  if (!gimp_window)
-+  if (! gimp_window)
-     {
--      if (start_new)
--        start_new_gimp (argv[0], file_list);
-+      start_new_gimp (argv[0], file_list);
- 
-       g_printerr ("No gimp window found on display %s\n", gdk_get_display ());
-       return EXIT_FAILURE;
-     }
- 
--  gdk_drag_get_protocol_for_display (display, GDK_WINDOW_XID (gimp_window),
--                                     &protocol);
--  if (protocol != GDK_DRAG_PROTO_XDND)
-+  if (file_list->len > 0)
-     {
--      g_printerr ("Gimp Window doesnt use Xdnd-Protocol - huh?\n");
--      return EXIT_FAILURE;
--    }
-+      GdkDragContext  *context;
-+      GdkDragProtocol  protocol;
-+      GtkWidget       *source;
-+      GdkAtom          sel_type;
-+      GdkAtom          sel_id;
-+      GList           *targetlist;
-+      guint            timeout;
-+
-+      gdk_drag_get_protocol_for_display (display,
-+                                         GDK_WINDOW_XID (gimp_window),
-+                                         &protocol);
-+      if (protocol != GDK_DRAG_PROTO_XDND)
-+        {
-+          g_printerr ("Gimp Window doesnt use Xdnd-Protocol - huh?\n");
-+          return EXIT_FAILURE;
-+        }
- 
--  /*  Problem: If the Toolbox is hidden via Tab (gtk_widget_hide)
--   *  it does not accept DnD-Operations and gtk_main() will not be
--   *  terminated. If the Toolbox is simply unmapped (by the Windowmanager)
--   *  DnD works. But in both cases gdk_window_is_visible () == 0.... :-(
--   *  To work around this add a timeout and abort after 1.5 seconds.
--   */
-+      /*  Problem: If the Toolbox is hidden via Tab (gtk_widget_hide)
-+       *  it does not accept DnD-Operations and gtk_main() will not be
-+       *  terminated. If the Toolbox is simply unmapped (by the WM)
-+       *  DnD works. But in both cases gdk_window_is_visible() returns
-+       *  FALSE. To work around this we add a timeout and abort after
-+       *  1.5 seconds.
-+       */
- 
--  timeout = g_timeout_add (1500, toolbox_hidden, NULL);
-+      timeout = g_timeout_add (1500, toolbox_hidden, NULL);
- 
--  /*  set up an DND-source  */
--  source = gtk_window_new (GTK_WINDOW_TOPLEVEL);
--  g_signal_connect (source, "selection_get",
--                    G_CALLBACK (source_selection_get), file_list->str);
--  gtk_widget_realize (source);
-+      /*  set up an DND-source  */
-+      source = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-+      g_signal_connect (source, "selection_get",
-+                        G_CALLBACK (source_selection_get),
-+                        file_list->str);
-+      gtk_widget_realize (source);
- 
- 
--  /*  specify the id and the content-type of the selection used to
--   *  pass the URIs to Gimp.
--   */
--  sel_id   = gdk_atom_intern ("XdndSelection", FALSE);
--  sel_type = gdk_atom_intern ("text/uri-list", FALSE);
--  targetlist = g_list_prepend (NULL, GUINT_TO_POINTER (sel_type));
-+      /*  specify the id and the content-type of the selection used to
-+       *  pass the URIs to Gimp.
-+       */
-+      sel_id   = gdk_atom_intern ("XdndSelection", FALSE);
-+      sel_type = gdk_atom_intern ("text/uri-list", FALSE);
-+      targetlist = g_list_prepend (NULL, GUINT_TO_POINTER (sel_type));
- 
--  /*  assign the selection to our DnD-source  */
--  gtk_selection_owner_set (source, sel_id, GDK_CURRENT_TIME);
--  gtk_selection_add_target (source, sel_id, sel_type, 0);
-+      /*  assign the selection to our DnD-source  */
-+      gtk_selection_owner_set (source, sel_id, GDK_CURRENT_TIME);
-+      gtk_selection_add_target (source, sel_id, sel_type, 0);
- 
--  /*  drag_begin/motion/drop  */
--  context = gdk_drag_begin (source->window, targetlist);
-+      /*  drag_begin/motion/drop  */
-+      context = gdk_drag_begin (source->window, targetlist);
- 
--  gdk_drag_motion (context, gimp_window, protocol, 0, 0,
--                   GDK_ACTION_COPY, GDK_ACTION_COPY, GDK_CURRENT_TIME);
-+      gdk_drag_motion (context, gimp_window, protocol, 0, 0,
-+                       GDK_ACTION_COPY, GDK_ACTION_COPY, GDK_CURRENT_TIME);
- 
--  gdk_drag_drop (context, GDK_CURRENT_TIME);
-+      gdk_drag_drop (context, GDK_CURRENT_TIME);
- 
--  /*  finally enter the mainloop to handle the events  */
--  gtk_main ();
-+      /*  finally enter the mainloop to handle the events  */
-+      gtk_main ();
-+
-+      g_source_remove (timeout);
-+    }
- 
--  g_source_remove (timeout);
-   g_string_free (file_list, TRUE);
- 
-   return EXIT_SUCCESS;
diff --git a/media-gfx/gimp/files/gimp-2.0_pre3-gcc_2.95.patch b/media-gfx/gimp/files/gimp-2.0_pre3-gcc_2.95.patch
deleted file mode 100644
index c4e89dd94de3..000000000000
--- a/media-gfx/gimp/files/gimp-2.0_pre3-gcc_2.95.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Naur gimp-2.0pre3.orig/app/core/gimpchannel.c gimp-2.0pre3/app/core/gimpchannel.c
---- gimp-2.0pre3.orig/app/core/gimpchannel.c	2004-02-03 16:53:08.000000000 -0500
-+++ gimp-2.0pre3/app/core/gimpchannel.c	2004-02-13 10:44:09.000000000 -0500
-@@ -640,7 +640,7 @@
-   else if (GIMP_IS_PAINT_INFO (stroke_desc))
-     {
-       GimpImage        *gimage     = gimp_item_get_image (item);
--      GimpPaintInfo    *paint_info = GIMP_PAINT_INFO (stroke_desc);;
-+      GimpPaintInfo    *paint_info = GIMP_PAINT_INFO (stroke_desc);
-       GimpPaintOptions *paint_options;
-       GimpPaintCore    *core;
- 
-diff -Naur gimp-2.0pre3.orig/app/tools/gimptexttool.c gimp-2.0pre3/app/tools/gimptexttool.c
---- gimp-2.0pre3.orig/app/tools/gimptexttool.c	2004-02-03 16:53:10.000000000 -0500
-+++ gimp-2.0pre3/app/tools/gimptexttool.c	2004-02-13 11:03:06.000000000 -0500
-@@ -187,7 +187,7 @@
- 			GimpToolAction  action,
- 			GimpDisplay    *gdisp)
- {
--  GimpTextTool *text_tool = GIMP_TEXT_TOOL (tool);;
-+  GimpTextTool *text_tool = GIMP_TEXT_TOOL (tool);
- 
-   switch (action)
-     {
-@@ -218,7 +218,7 @@
- 			     GdkModifierType  state,
- 			     GimpDisplay     *gdisp)
- {
--  GimpTextTool *text_tool = GIMP_TEXT_TOOL (tool);;
-+  GimpTextTool *text_tool = GIMP_TEXT_TOOL (tool);
-   GimpDrawable *drawable;
-   GimpText     *text  = NULL;
-   gint          off_x = 0;
-diff -Naur gimp-2.0pre3.orig/app/vectors/gimpvectors.c gimp-2.0pre3/app/vectors/gimpvectors.c
---- gimp-2.0pre3.orig/app/vectors/gimpvectors.c	2004-02-03 16:53:10.000000000 -0500
-+++ gimp-2.0pre3/app/vectors/gimpvectors.c	2004-02-13 11:02:34.000000000 -0500
-@@ -545,7 +545,7 @@
-                      GimpObject   *stroke_desc,
-                      gboolean      use_default_values)
- {
--  GimpVectors *vectors = GIMP_VECTORS (item);;
-+  GimpVectors *vectors = GIMP_VECTORS (item);
-   gboolean     retval  = FALSE;
- 
-   if (! vectors->strokes)
-@@ -564,7 +564,7 @@
-   else if (GIMP_IS_PAINT_INFO (stroke_desc))
-     {
-       GimpImage        *gimage     = gimp_item_get_image (item);
--      GimpPaintInfo    *paint_info = GIMP_PAINT_INFO (stroke_desc);;
-+      GimpPaintInfo    *paint_info = GIMP_PAINT_INFO (stroke_desc);
-       GimpPaintOptions *paint_options;
-       GimpPaintCore    *core;
- 
diff --git a/media-gfx/gimp/gimp-1.2.3-r3.ebuild b/media-gfx/gimp/gimp-1.2.3-r3.ebuild
deleted file mode 100644
index f74fc7646db4..000000000000
--- a/media-gfx/gimp/gimp-1.2.3-r3.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.3-r3.ebuild,v 1.15 2004/06/07 21:40:36 agriffis Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="The GIMP"
-HOMEPAGE="http://www.gimp.org/"
-SRC_URI="ftp://ftp.gimp.org/pub/gimp/v1.2/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1.2"
-KEYWORDS="x86 ppc sparc alpha"
-IUSE="python nls gnome aalib perl"
-
-RDEPEND="=x11-libs/gtk+-1.2*
-	aalib? ( >=media-libs/aalib-1.2 )
-	perl? ( >=dev-perl/PDL-2.2.1
-		>=dev-perl/Parse-RecDescent-1.80
-		>=dev-perl/gtk-perl-0.7004 )
-	python? ( >=dev-lang/python-2.0 )
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
-DEPEND="nls? ( sys-devel/gettext )
-	>=sys-devel/autoconf-2.58
-	sys-devel/automake
-	>=media-libs/mpeg-lib-1.3.1
-	${RDEPEND}"
-
-src_unpack() {
-	if use threads; then
-		eerror "I'm sorry I can't build against a threaded perl,"
-		eerror "please remerge perl and libperl without"
-		eerror "'USE=threads' and try again.  (Note: this message"
-		eerror "is triggered by having threads in USE so you must"
-		eerror "leave threads out of your USE var when merging"
-		eerror "gimp."
-		die "Not compatible with threaded perl"
-	fi
-	unpack ${A}
-
-	cd ${S}/plug-ins/common
-	# compile with nonstandard psd_save plugin
-	cp ${FILESDIR}/psd_save.c .
-	epatch ${FILESDIR}/${PF}-gentoo.diff
-	cd ${S}
-
-	if [ -f ${ROOT}/usr/share/gettext/config.rpath ] ; then
-		cp -f ${ROOT}/usr/share/gettext/config.rpath ${S}
-	else
-		touch ${S}/config.rpath
-		chmod 0755 ${S}/config.rpath
-	fi
-
-	echo ">>> Reconfiguring package..."
-	export WANT_AUTOMAKE=1.4
-	export WANT_AUTOCONF=2.1
-	aclocal -I . -I ${S}/plug-ins/perl
-	automake --add-missing --gnu
-# Do not run autoreconf, or even autoconf, as it (autoreconf at least)
-# needs cvs installed, and breaks configure (locales are not installed).
-# Our psd_save patch anyhow only touch .am files, so only automake is
-# needed ....  This should fix bug #8490, #6021 and #9621.
-#
-# <azarah@gentoo.org> (2 Nov 2002)
-#
-#	autoreconf --install --symlink &> ${T}/autoreconf.log || ( \
-#		echo "DEBUG: working directory is: `pwd`" >>${T}/autoreconf.log
-#		eerror "Reonfigure failed, please attatch the contents of:"
-#		eerror
-#		eerror "  ${T}/autoreconf.log"
-#		eerror
-#		eerror "in your bugreport."
-#		# we need an error here, else the ebuild do not die
-#		exit 1
-#	) || die "running autoreconf failed"
-	touch plug-ins/common/gimp-1.2.3.tar.bz2
-}
-
-src_compile() {
-
-
-	# Strip out -fomit-frame-pointer for k6's
-	is-flag "-march=k6-3" && strip-flags "-fomit-frame-pointer"
-	is-flag "-march=k6-2" && strip-flags "-fomit-frame-pointer"
-	is-flag "-march=k6" && strip-flags "-fomit-frame-pointer"
-
-
-	local myconf=""
-	local mymake=""
-	local myvars=""
-	if ! use nls ; then
-		myconf="${myconf} --disable-nls"
-	fi
-
-	if ! use perl ; then
-		myconf="${myconf} --disable-perl"
-	else
-		export  PERL_MM_OPT=' PREFIX=${D}/usr'
-		myconf="${myconf} --enable-perl"
-	fi
-
-	if ! use python ; then
-		myconf="${myconf} --disable-python"
-	else
-		myconf="${myconf} --enable-python"
-	fi
-
-	if ! use aalib ; then
-		mymake="LIBAA= AA="
-	fi
-
-	if ! use gnome ; then
-		mymake="${mymake} HELPBROWSER="
-	fi
-
-	econf \
-		--with-mp \
-		--with-threads \
-		--disable-debug \
-		${myconf} || die
-
-	if ! use aalib ; then
-		# Horrible automake brokenness
-		cp plug-ins/common/Makefile plug-ins/common/Makefile.orig
-		cat plug-ins/common/Makefile.orig | \
-			sed 's/CML_explorer$(EXEEXT) aa/CML_explorer$(EXEEXT)/' \
-			> plug-ins/common/Makefile
-	fi
-
-	# Doesn't work with -j 4 (hallski)
-	MAKEOPTS="-j1" emake ${mymake} || die
-}
-
-src_install() {
-
-	local mymake=""
-	if ! use aalib ; then
-		mymake="LIBAA= AA="
-	fi
-
-	if ! use gnome ; then
-		mymake="${mymake} HELPBROWSER="
-	fi
-
-	dodir /usr/lib/gimp/1.2/plug-ins
-
-	einstall \
-		gimpdatadir=${D}/usr/share/gimp/1.2 \
-		gimpsysconfdir=${D}/etc/gimp/1.2 \
-		PREFIX=${D}/usr \
-		INSTALLPRIVLIB=${D}/usr/lib/perl5 \
-		INSTALLSCRIPT=${D}/usr/bin \
-		INSTALLSITELIB=${D}/usr/lib/perl5/site_perl \
-		INSTALLBIN=${D}/usr/bin \
-		INSTALLMAN1DIR=${D}/usr/share/man/man1 \
-		INSTALLMAN3DIR=${D}/usr/share/man/man3 \
-		${mymake} || die "Installation failed"
-
-	dosym gimp-1.2 /usr/bin/gimp
-	#this next line closes bug #810
-	dosym gimptool-1.2 /usr/bin/gimptool
-
-	if use gnome && [ -d ${ROOT}/usr/share/applications ]
-	then
-		insinto /usr/share/applications
-		doins ${FILESDIR}/gimp.desktop
-	fi
-
-	preplib /usr
-
-	dodoc AUTHORS COPYING ChangeLog* *MAINTAINERS README* TODO
-	dodoc docs/*.txt docs/*.ps docs/Wilber* docs/quick_reference.tar.gz
-	dohtml -r devel-docs
-	docinto devel
-	dodoc devel-docs/*.txt
-}
diff --git a/media-gfx/gimp/gimp-1.2.4.ebuild b/media-gfx/gimp/gimp-1.2.4.ebuild
deleted file mode 100644
index 1e938a61467a..000000000000
--- a/media-gfx/gimp/gimp-1.2.4.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-1.2.4.ebuild,v 1.13 2004/06/07 21:40:36 agriffis Exp $
-
-inherit eutils flag-o-matic
-
-IUSE="python nls gnome aalib perl doc jpeg png tiff"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="The GIMP"
-SRC_URI="ftp://ftp.gimp.org/pub/gimp/v1.2/v${PV}/${P}.tar.bz2"
-HOMEPAGE="http://www.gimp.org/"
-
-SLOT="1.2"
-KEYWORDS="x86 ~ppc sparc ~alpha hppa amd64"
-LICENSE="GPL-2"
-
-RDEPEND="=x11-libs/gtk+-1.2*
-	aalib? ( >=media-libs/aalib-1.2 )
-	perl? ( >=dev-perl/PDL-2.2.1
-		>=dev-perl/Parse-RecDescent-1.80
-		>=dev-perl/gtk-perl-0.7004 )
-	python? ( >=dev-lang/python-2.0 )
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
-	tiff? ( media-libs/tiff )
-	jpeg? ( media-libs/jpeg )
-	png? ( media-libs/libpng )"
-
-DEPEND="nls? ( sys-devel/gettext )
-	doc? ( dev-util/gtk-doc )
-	>=media-libs/mpeg-lib-1.3.1
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	# here for a mysterious reason
-	touch ${S}/plug-ins/common/${P}.tar.bz2
-}
-
-src_compile() {
-	# fix problem with k6's (#22115)
-	replace-flags -march=k6-2 -march=i586
-	replace-flags -march=k6-3 -march=i586
-	replace-flags -march=k6 -march=i586
-	# over optimisations (#21787)
-	replace-flags -Os -O2
-
-	local mymake=""
-
-	use aalib || mymake="LIBAA= AA="
-	use gnome || mymake="${mymake} HELPBROWSER="
-	use perl && export PERL_MM_OPT=' PREFIX=${D}/usr'
-
-	econf \
-		--with-mp \
-		--with-threads \
-		--disable-debug \
-		--disable-print \
-		`use_enable perl` \
-		`use_enable python` \
-		`use_enable nls` \
-		`use_with jpeg libjpeg` \
-		`use_with png libpng` \
-		`use_with tiff libtiff` \
-		`use_enable doc gtk-doc` \
-		${myconf} || die
-
-	if ! use aalib ; then
-		# Horrible automake brokenness
-		cp plug-ins/common/Makefile plug-ins/common/Makefile.orig
-		cat plug-ins/common/Makefile.orig | \
-			sed 's/CML_explorer$(EXEEXT) aa/CML_explorer$(EXEEXT)/' \
-			> plug-ins/common/Makefile
-	fi
-
-	MAKEOPTS="${MAKEOPTS} -j1"
-	emake ${mymake} || die
-}
-
-src_install() {
-
-	local mymake=""
-	use aalib || mymake="LIBAA= AA="
-	use gnome || mymake="${mymake} HELPBROWSER="
-
-	dodir /usr/lib/gimp/1.2/plug-ins
-
-	einstall \
-		gimpdatadir=${D}/usr/share/gimp/1.2 \
-		gimpsysconfdir=${D}/etc/gimp/1.2 \
-		PREFIX=${D}/usr \
-		INSTALLPRIVLIB=${D}/usr/lib/perl5 \
-		INSTALLSCRIPT=${D}/usr/bin \
-		INSTALLSITELIB=${D}/usr/lib/perl5/site_perl \
-		INSTALLBIN=${D}/usr/bin \
-		INSTALLMAN1DIR=${D}/usr/share/man/man1 \
-		INSTALLMAN3DIR=${D}/usr/share/man/man3 \
-		INSTALLSITEMAN1DIR=${D}/usr/share/man/man1 \
-		INSTALLSITEMAN3DIR=${D}/usr/share/man/man3pm \
-		INSTALLVENDORMAN1DIR=${D}/usr/share/man/man1 \
-		INSTALLVENDORMAN3DIR=${D}/usr/share/man/man3pm \
-		${mymake} || die "Installation failed"
-
-	dosym gimp-1.2 /usr/bin/gimp
-	#this next line closes bug #810
-	dosym gimptool-1.2 /usr/bin/gimptool
-
-	use gnome && (
-		insinto /usr/share/applications
-		doins ${FILESDIR}/gimp.desktop
-	)
-
-	preplib /usr
-
-	dodoc AUTHORS COPYING ChangeLog* *MAINTAINERS README* TODO
-	dodoc docs/*.txt docs/*.ps docs/Wilber* docs/quick_reference.tar.gz
-}
diff --git a/media-gfx/gimp/gimp-2.0_pre3-r1.ebuild b/media-gfx/gimp/gimp-2.0_pre3-r1.ebuild
deleted file mode 100644
index 2864b7c7cb36..000000000000
--- a/media-gfx/gimp/gimp-2.0_pre3-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.0_pre3-r1.ebuild,v 1.4 2004/04/27 21:42:17 agriffis Exp $
-
-inherit debug flag-o-matic libtool eutils
-
-MY_PV=${PV/_/}
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="GNU Image Manipulation Program - Development series"
-SRC_URI="mirror://gimp/v2.0/testing/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.gimp.org/"
-
-SLOT="2"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~hppa ~sparc ~amd64"
-IUSE="doc python aalib png jpeg tiff wmf gimpprint gtkhtml mmx sse X altivec"
-
-# FIXME : some more things can be (local) USE flagged
-
-RDEPEND=">=dev-libs/glib-2.2
-	>=x11-libs/gtk+-2.2.2
-	>=x11-libs/pango-1.2.2
-	>=media-libs/fontconfig-2.2
-	>=media-libs/libart_lgpl-2.3.8-r1
-	sys-libs/zlib
-
-	gimpprint? ( =media-gfx/gimp-print-4.2* )
-
-	gtkhtml? ( =gnome-extra/libgtkhtml-2* )
-
-	png? ( >=media-libs/libpng-1.2.1 )
-	jpeg? ( >=media-libs/jpeg-6b-r2
-		media-libs/libexif )
-	tiff? ( >=media-libs/tiff-3.5.7 )
-
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-
-	aalib?	( media-libs/aalib )
-	python?	( >=dev-lang/python-2.2
-		>=dev-python/pygtk-2 )
-
-	X? ( virtual/x11 )"
-
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	dev-util/intltool
-	doc? ( >=dev-util/gtk-doc-1 )"
-#	sys-devel/gettext
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	# Fix linking to older version of gimp if installed - this should
-	# void liquidx's hack, so it is removed.
-	epatch ${FILESDIR}/ltmain_sh-1.5.0-fix-relink.patch
-
-	# gcc2 fixes (#41487)
-	epatch ${FILESDIR}/${P}-gcc_2.95.patch
-
-}
-
-src_compile() {
-
-	# Since 1.3.16, fixes linker problems when upgrading
-	elibtoolize
-
-	# Workaround portage variable leakage
-	local AA=
-	local myconf=
-
-	replace-flags "-march=k6*" "-march=i586"
-	# gimp uses inline functions (plug-ins/common/grid.c) (#23078)
-	filter-flags "-fno-inline"
-
-	econf ${myconf} \
-		`use_enable mmx` \
-		`use_enable sse` \
-		`use_enable altivec` \
-		`use_enable doc gtk-doc` \
-		`use_enable python` \
-		`use_enable gimpprint print` \
-		`use_with X x` \
-		`use_with png libpng` \
-		`use_with jpeg libjpeg` \
-		`use_with jpeg libexif` \
-		`use_with tiff libtiff` \
-		`use_with aalib aa` \
-		--enable-debug || die
-
-	emake || die
-
-}
-
-src_install() {
-
-	# Workaround portage variable leakage
-	local AA=
-
-	make DESTDIR=${D} install || die
-
-	# Install desktop file in the right place
-	insinto /usr/share/applications
-	newins ${S}/data/misc/gimp.desktop gimp-${PV}.desktop
-
-	dodoc AUTHORS COPYING ChangeL* HACKING INSTALL \
-		MAINTAINERS NEWS PLUGIN_MAINTAINERS README* TODO*
-
-}
-
-pkg_postinst() {
-
-	ewarn "The development Gimp series have been reslotted to SLOT 2"
-	ewarn "To clean up old 1.3 versions use 'emerge -C =gimp-1.3* -vp'"
-	echo ""
-	ewarn "If you are upgrading from an earlier 1.3/2.0_pre release, please note that"
-	ewarn "the gimprc and sessionrc file formats changed. We suggest you remove"
-	ewarn "your personal ~/.gimp-1.3 directory and do a fresh user installation."
-
-}