apply patch to fix #97361, purged old ebuilds

Package-Manager: portage-2.0.51.19

21 files changed, 31 insertions, 2628 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 2b044fbf09d8..a86d541ebf90 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.118 2005/06/28 23:35:34 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.119 2005/07/01 02:57:59 allanonjl Exp $
+
+*gimp-2.2.8-r1 (01 Jul 2005)
+
+  01 Jul 2005; John N. Laliberte <allanonjl@gentoo.org>
+  -files/gimp-2.0.0-gcc34.patch, +files/gimp-2.2.8-restart-marker.patch,
+  -files/psd_save.c, -gimp-2.0.0.ebuild, -gimp-2.0.2.ebuild,
+  -gimp-2.0.5.ebuild, -gimp-2.0.6.ebuild, -gimp-2.2.0.ebuild,
+  -gimp-2.2.3.ebuild, -gimp-2.2.6.ebuild, -gimp-2.2.8.ebuild,
+  +gimp-2.2.8-r1.ebuild:
+  apply patch to fix #97361, purged old ebuilds
 
 *gimp-2.2.8 (28 Jun 2005)
 
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 226c8010cdce..fb94c7d2d408 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,30 +1,15 @@
-MD5 b3fb5e1d6f43034d0b9182f097b2df11 gimp-2.0.0.ebuild 2654
-MD5 6e30693ee2b8125d5dfadf3a72625397 gimp-2.2.6.ebuild 3660
-MD5 0c8f35412e83518ba717b652b05e4c85 gimp-2.0.2.ebuild 2569
-MD5 f009920607d22fd87afcba14fb59cb51 gimp-2.2.8.ebuild 4517
-MD5 405d2674bac45813485d5abed39d6eb3 gimp-2.2.3.ebuild 3740
+MD5 17cf354733d11b4ea8f98d92dbbe2ca4 gimp-2.2.8-r1.ebuild 4591
 MD5 77ea6e18335093980ca0521510f64183 gimp-1.2.5.ebuild 3202
 MD5 f4ee70356bf8aa8f588d0d41e194c584 gimp-2.0.4.ebuild 3203
-MD5 542c10ced4b60c3b5f6d181da2c008d4 gimp-2.2.0.ebuild 3512
-MD5 23321eb2aa740463c9181ddcacb2c9bd gimp-2.0.6.ebuild 3247
 MD5 791e42876920e6a3d55e5a4ab661190c gimp-2.2.6-r1.ebuild 4223
-MD5 d5ffdaca71c7e7a55e733e7be8110da5 ChangeLog 17414
+MD5 2facf9ce43d3942b3c7033e39bbec836 ChangeLog 17832
 MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222
-MD5 7878202fbf35cdba9a2907b735cbf90c gimp-2.0.5.ebuild 3216
-MD5 be326cb198ec1f1f6c21a5a5a1460415 files/gimp-2.0.0-gcc34.patch 1148
-MD5 f2b58299eceabecfe5df955198c267d6 files/psd_save.c 49151
+MD5 9d903731e90f07c2492aab4bd55f0e62 files/gimp-2.2.8-restart-marker.patch 611
 MD5 12ff6c7c980ee34dc7d4d94aa40059b0 files/ltmain_sh-1.5.0-fix-relink.patch 1718
 MD5 9696bde4a1b70dd2816d46bed477ebc0 files/gimp.desktop 2404
 MD5 8bf83fb83ce1c66006a27a7d9ec29dd7 files/pygimp-logo.png 19823
 MD5 5bd6fc067eba3828be1e3a49b4aa1c44 files/digest-gimp-2.2.6-r1 134
+MD5 aebd823dc72aefe0a0e4596da64c7277 files/digest-gimp-2.2.8-r1 134
 MD5 ff17b80bceb6bd818e20556c23647b0f files/gimp-2.2.8-configure-fix.patch 2423
 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
 MD5 0d3108f9120d6976ce4ccb29a131aea7 files/digest-gimp-2.0.4 133
-MD5 397055832117d5c76e873af50a2e6f30 files/digest-gimp-2.0.5 134
-MD5 bbe7cd6ece5455900adcaeed9b467679 files/digest-gimp-2.0.6 134
-MD5 204a8065e28141810fbda423e4118b9e files/digest-gimp-2.2.0 134
-MD5 675541af3f64fc4acdd1bd3e759b607d files/digest-gimp-2.2.3 134
-MD5 5bd6fc067eba3828be1e3a49b4aa1c44 files/digest-gimp-2.2.6 134
-MD5 aebd823dc72aefe0a0e4596da64c7277 files/digest-gimp-2.2.8 134
diff --git a/media-gfx/gimp/files/digest-gimp-2.0.0 b/media-gfx/gimp/files/digest-gimp-2.0.0
deleted file mode 100644
index d85a3ea8446d..000000000000
--- a/media-gfx/gimp/files/digest-gimp-2.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 322cc091da8bbd324b37c60143fa26fa gimp-2.0.0.tar.bz2 13208717
diff --git a/media-gfx/gimp/files/digest-gimp-2.0.2 b/media-gfx/gimp/files/digest-gimp-2.0.2
deleted file mode 100644
index e9d1b2d50be8..000000000000
--- a/media-gfx/gimp/files/digest-gimp-2.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b0dfdf4720e09ffa44fdc4d1bb48f82b gimp-2.0.2.tar.bz2 13788996
diff --git a/media-gfx/gimp/files/digest-gimp-2.0.5 b/media-gfx/gimp/files/digest-gimp-2.0.5
deleted file mode 100644
index 850735541c9b..000000000000
--- a/media-gfx/gimp/files/digest-gimp-2.0.5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b24d069b9d670d92fc75ba7035e9300d gimp-2.0.5.tar.bz2 14107082
-MD5 4b10833a545842ee4436a75eea68fd42 gimp-help-2-0.5.tar.gz 11904088
diff --git a/media-gfx/gimp/files/digest-gimp-2.0.6 b/media-gfx/gimp/files/digest-gimp-2.0.6
deleted file mode 100644
index cd058b483b94..000000000000
--- a/media-gfx/gimp/files/digest-gimp-2.0.6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 632b9ec629ba7c48d292069c37a1a6c1 gimp-2.0.6.tar.bz2 14097124
-MD5 4b10833a545842ee4436a75eea68fd42 gimp-help-2-0.5.tar.gz 11904088
diff --git a/media-gfx/gimp/files/digest-gimp-2.2.0 b/media-gfx/gimp/files/digest-gimp-2.2.0
deleted file mode 100644
index 9d265067f769..000000000000
--- a/media-gfx/gimp/files/digest-gimp-2.2.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 7fa66cfd3a2a67f95c3c80307e46e4dd gimp-2.2.0.tar.bz2 13806207
-MD5 4a5f7f6f31d14977718b62b5a3d79872 gimp-help-2-0.6.tar.gz 14156511
diff --git a/media-gfx/gimp/files/digest-gimp-2.2.3 b/media-gfx/gimp/files/digest-gimp-2.2.3
deleted file mode 100644
index 127beb0b1135..000000000000
--- a/media-gfx/gimp/files/digest-gimp-2.2.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a65ea578d42a8c6658296aa52547063d gimp-2.2.3.tar.bz2 13810493
-MD5 4a5f7f6f31d14977718b62b5a3d79872 gimp-help-2-0.6.tar.gz 14156511
diff --git a/media-gfx/gimp/files/digest-gimp-2.2.6 b/media-gfx/gimp/files/digest-gimp-2.2.6
deleted file mode 100644
index 4ff3355ba400..000000000000
--- a/media-gfx/gimp/files/digest-gimp-2.2.6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 cf7de255739bf5abc2e90d7882eda6c9 gimp-2.2.6.tar.bz2 13990261
-MD5 aee429af1f99e3d1f9e23d5d4a6d3622 gimp-help-2-0.7.tar.gz 15500754
diff --git a/media-gfx/gimp/files/digest-gimp-2.2.8 b/media-gfx/gimp/files/digest-gimp-2.2.8-r1
index 18f67b9b1358..18f67b9b1358 100644
--- a/media-gfx/gimp/files/digest-gimp-2.2.8
+++ b/media-gfx/gimp/files/digest-gimp-2.2.8-r1
diff --git a/media-gfx/gimp/files/gimp-2.0.0-gcc34.patch b/media-gfx/gimp/files/gimp-2.0.0-gcc34.patch
deleted file mode 100644
index 74150cdd9ff1..000000000000
--- a/media-gfx/gimp/files/gimp-2.0.0-gcc34.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- app/paint-funcs/paint-funcs.h.old	2004-04-23 09:31:21.854795584 +0100
-+++ app/paint-funcs/paint-funcs.h	2004-04-23 09:32:15.623621480 +0100
-@@ -350,13 +350,13 @@
-                                            PixelRegion *dest,
-                                            guint        pixel);
- 
--void  initial_region                      (PixelRegion *, PixelRegion *,
--					   PixelRegion *,
--                                           guchar *,
--					   gint,
--                                           GimpLayerModeEffects,
--                                           gboolean *,
--                                           CombinationMode);
-+void  initial_region                      (PixelRegion *src, PixelRegion *dest,
-+					   PixelRegion *mask,
-+                                           guchar *data,
-+					   gint opacity,
-+                                           GimpLayerModeEffects mode,
-+                                           gboolean *affect,
-+                                           InitialMode type);
- 
- void  combine_regions                     (PixelRegion *, PixelRegion *,
- 					   PixelRegion *, PixelRegion *,
diff --git a/media-gfx/gimp/files/gimp-2.2.8-restart-marker.patch b/media-gfx/gimp/files/gimp-2.2.8-restart-marker.patch
new file mode 100644
index 000000000000..712510deb10f
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.2.8-restart-marker.patch
@@ -0,0 +1,12 @@
+diff -Nur gimp-2.2.7/plug-ins/common/jpeg.c gimp-2.2.7-mod/plug-ins/common/jpeg.c
+--- gimp-2.2.7/plug-ins/common/jpeg.c	2005-01-22 17:22:40.000000000 +0100
++++ gimp-2.2.7-mod/plug-ins/common/jpeg.c	2005-06-29 02:43:44.000000000 +0200
+@@ -2039,6 +2039,8 @@
+   gtk_table_attach (GTK_TABLE (table), restart, 2, 4, 1, 2,
+                     GTK_FILL, 0, 0, 0);
+   gtk_widget_show (restart);
++  
++  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (restart), jsvals.restart);
+ 
+   gtk_widget_set_sensitive (restart_markers_label, jsvals.restart);
+   gtk_widget_set_sensitive (restart_markers_scale, jsvals.restart);
diff --git a/media-gfx/gimp/files/psd_save.c b/media-gfx/gimp/files/psd_save.c
deleted file mode 100644
index c4129353da2c..000000000000
--- a/media-gfx/gimp/files/psd_save.c
+++ /dev/null
@@ -1,1625 +0,0 @@
-#/*
- * PSD Save Plugin version 1.0 (BETA)
- * This GIMP plug-in is designed to save Adobe Photoshop(tm) files (.PSD)
- *
- * Monigotes
- *
- *     If this plug-in fails to save a file which you think it should,
- *     please tell me what seemed to go wrong, and anything you know
- *     about the image you tried to save.  Please don't send big PSD
- *     files to me without asking first.
- *
- *          Copyright (C) 2000 Monigotes
- *
- * 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/*
- * Adobe and Adobe Photoshop are trademarks of Adobe Systems
- * Incorporated that may be registered in certain jurisdictions.
- */
-
-/*
- * Revision history:
- *
- *  2000.02 / v1.0 / Monigotes
- *       First version.
- *
- */
-
-/*
- * TODO:
- */
-
-/*
- * BUGS:
- */
-
-
-/* *** DEFINES *** */
-
-/* set to TRUE if you want debugging, FALSE otherwise */
-#define DEBUG FALSE
-
-/* 1: Normal debuggin, 2: Deep debuggin */
-#define DEBUG_LEVEL 1
-
-#define IFDBG if (DEBUG)
-#define IF_DEEP_DBG if (DEBUG && DEBUG_LEVEL==2)
-
-/* *** END OF DEFINES *** */
-
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <glib.h>
-#include <libgimp/gimp.h>
-
-
-/* Local types etc
- */
-
-
-typedef struct PsdLayerDimension
-{
-  gint left;
-  gint top;
-  gint32 width;
-  gint32 height;
-} PSD_Layer_Dimension;
-
-
-typedef struct PsdImageData
-{
-  gint compression;         /* 0, no hay compresion; 1, si la hay */
-
-  gint32 image_height;      /* Numero de filas de la imagen */
-  gint32 image_width;       /* Numero de columnas de la imagen*/
-
-  gint baseType;
-
-  gint nChannels;           /* Numero de canales de usuario de la imagen */
-  gint32 *lChannels;        /* Canales de usuario de la imagen */
-
-  gint nLayers;            		/* Num de capas de la imagen */
-  gint32 *lLayers;         		/* Identificador de cada capa */
-  PSD_Layer_Dimension* layersDim;	/* Dimensiones de cada capa */
-
-} PSD_Image_Data;
-
-static PSD_Image_Data PSDImageData;
-
-
-
-/* Declare some local functions.
- */
-
-static void   query      (void);
-static void   run        (char    *name,
-                          int      nparams,
-                          GimpParam  *param,
-                          int     *nreturn_vals,
-                          GimpParam **return_vals);
-static void* xmalloc(size_t n);
-static void psd_lmode_layer(gint32 idLayer, gchar* psdMode);
-static void reshuffle_cmap_write(guchar *mapGimp);
-static void save_header (FILE *fd, gint32 image_id);
-static void save_color_mode_data (FILE *fd, gint32 image_id);
-static void save_resources (FILE *fd, gint32 image_id);
-static void save_layerAndMask (FILE *fd, gint32 image_id);
-static void save_data (FILE *fd, gint32 image_id);
-static int save_image (gchar *filename, gint32 image_id);
-static void xfwrite(FILE *fd, void *buf, long len, gchar *why);
-static void write_pascalstring (FILE *fd, char *val, gint paded, gchar *why);
-static void write_string (FILE *fd, char *val, gchar *why);
-static void write_PSstring (FILE *fd, char *val, gchar *why);
-static void write_gchar(FILE *fd, unsigned char val, gchar *why);
-static void write_gshort(FILE *fd, gshort val, gchar *why);
-static void write_glong(FILE *fd, glong val, gchar *why);
-
-
-GimpPlugInInfo PLUG_IN_INFO =
-{
-  NULL,    /* init_proc */
-  NULL,    /* quit_proc */
-  query,   /* query_proc */
-  run,     /* run_proc */
-};
-
-static const gchar *prog_name = "PSD";
-
-MAIN()
-
-
-static void
-query ()
-{
-  static GimpParamDef save_args[] =
-  {
-    { GIMP_PDB_INT32, "run_mode", "Interactive, non-interactive" },
-    { GIMP_PDB_IMAGE, "image", "Input image" },
-    { GIMP_PDB_DRAWABLE, "drawable", "Drawable to save" },
-    { GIMP_PDB_STRING, "filename", "The name of the file to save the image in" },
-    { GIMP_PDB_STRING, "raw_filename", "The name of the file to save the image in" },
-    { GIMP_PDB_INT32, "compression", "Compression type: { NONE (0), LZW (1), PACKBITS (2)" },
-    { GIMP_PDB_INT32, "fillorder", "Fill Order: { MSB to LSB (0), LSB to MSB (1)" }
-  };
-  static int nsave_args = sizeof (save_args) / sizeof (save_args[0]);
-
-  gimp_install_procedure ("file_psd_save",
-                          "saves files in the Photoshop(tm) PSD file format",
-                          "This filter saves files of Adobe Photoshop(tm) native PSD format.  These files may be of any image type supported by GIMP, with or without layers, layer masks, aux channels and guides.",
-                          "Monigotes",
-                          "Monigotes",
-                          "2000",
-                          "<Save>/PSD",
-			  "RGB*, GRAY*, INDEXED*",
-                          GIMP_PLUGIN,
-                          nsave_args, 0,
-                          save_args, NULL);
-  gimp_register_save_handler ("file_psd_save", "psd", "");
-}
-
-
-
-static void
-run (char    *name,
-     int      nparams,
-     GimpParam  *param,
-     int     *nreturn_vals,
-     GimpParam **return_vals)
-{
-  static GimpParam values[2];
-  GimpRunModeType run_mode;
-
-  run_mode = param[0].data.d_int32;
-
-  *nreturn_vals = 1;
-  *return_vals = values;
-  values[0].type = GIMP_PDB_STATUS;
-  values[0].data.d_status = GIMP_PDB_CALLING_ERROR;
-
-  if (strcmp (name, "file_psd_save") == 0)
-  {
-    IFDBG printf("\n---------------- %s ----------------\n", param[3].data.d_string);
-
-    if ( save_image (param[3].data.d_string,          /* Nombre del fichero */
-                     param[1].data.d_image) )         /* Identificador de la imagen */
-    {
-      values[0].data.d_status = GIMP_PDB_SUCCESS;
-    }
-    else
-    {
-      values[0].data.d_status = GIMP_PDB_EXECUTION_ERROR;
-    }
-  }
-}
-
-
-
-static void *
-xmalloc(size_t n)
-{
-  void *p;
-
-  if (n == 0)
-    {
-      IFDBG printf("PSD: WARNING: %s: xmalloc asked for zero-sized chunk\n", prog_name);
-
-      return (NULL);
-    }
-
-  if ((p = g_malloc(n)) != NULL)
-    return p;
-
-  IFDBG printf("%s: out of memory\n", prog_name);
-  gimp_quit();
-  return NULL;
-}
-
-static void psd_lmode_layer(gint32 idLayer, gchar* psdMode)
-{
-  switch ( gimp_layer_get_mode (idLayer) )
-  {
-    case GIMP_NORMAL_MODE:
-      strcpy (psdMode, "norm");
-      break;
-    case GIMP_DARKEN_ONLY_MODE:
-      strcpy (psdMode, "dark");
-      break;
-    case GIMP_LIGHTEN_ONLY_MODE:
-      strcpy (psdMode, "lite");
-      break;
-    case GIMP_HUE_MODE:
-      strcpy (psdMode, "hue ");
-      break;
-    case GIMP_SATURATION_MODE:
-      strcpy (psdMode, "sat ");
-      break;
-    case GIMP_COLOR_MODE:
-      strcpy (psdMode, "colr");
-      break;
-    case GIMP_MULTIPLY_MODE:
-      strcpy (psdMode, "mul ");
-      break;
-    case GIMP_SCREEN_MODE:
-      strcpy (psdMode, "scrn");
-      break;
-    case GIMP_DISSOLVE_MODE:
-      strcpy (psdMode, "diss");
-      break;
-    case GIMP_DIFFERENCE_MODE:
-      strcpy (psdMode, "diff");
-      break;
-    case GIMP_VALUE_MODE:                  /* ? */
-      strcpy (psdMode, "lum ");
-      break;
-    case GIMP_OVERLAY_MODE:                /* ? */
-      strcpy (psdMode, "over");
-      break;
-/*    case BEHIND_MODE:                 Estos son de GIMP 1.1.14*/
-/*    case DIVIDE_MODE:                 Estos son de GIMP 1.1.14*/
-    case GIMP_ADDITION_MODE:
-    case GIMP_SUBTRACT_MODE:
-      IFDBG printf("PSD: Warning - unsupported layer-blend mode: %c, using 'norm' mode\n",
-                   gimp_layer_get_mode (idLayer));
-      strcpy (psdMode, "norm");
-      break;
-    default:
-      IFDBG printf("PSD: Warning - UNKNOWN layer-blend mode, reverting to 'norm'\n");
-      strcpy (psdMode, "norm");
-      break;
-  }
-}
-
-
-static void write_string (FILE *fd, char *val, gchar *why)
-{
-  write_gchar(fd, strlen(val), why);
-  xfwrite(fd, val, strlen(val), why);
-}
-
-
-static void write_PSstring (FILE *fd, char *val, gchar *why)
-{
-  int longitud = strlen(val) +  1;
-  int i;
-
-  write_glong(fd, longitud, why);
-  for (i=0; i<longitud; i++)
-    write_gshort(fd, val[i], why);
-}
-
-
-static void write_pascalstring (FILE *fd, char *val, gint paded, gchar *why)
-{
-  unsigned char valLength;
-  gint i;
-
-  /* Calcula la longitud del string a grabar y lo limita a 255 */
-
-  valLength = ( strlen(val) > 255 ) ? 255 : (unsigned char) strlen(val);
-
-  /* Se realiza la grabacion */
-
-  if ( valLength !=  0 )
-  {
-    write_gchar(fd, valLength, why);
-    xfwrite(fd, val, valLength, why);
-  }
-  else
-    write_gshort(fd, 0, why);
-
-  /* Si la longitud total (longitud + contenido) no es multiplo del valor 'paded',
-     se añaden los ceros necesarios para rellenar */
-
-  valLength ++;						/* Le añado el campo longitud */
-
-  if ( (valLength % paded) == 0 )
-    return;
-
-  for ( i=0; i < (paded - (valLength % paded)); i++)
-    write_gchar(fd, 0, why);
-}
-
-
-static void xfwrite(FILE * fd, void * buf, long len, gchar *why)
-{
-  if (fwrite(buf, len, 1, fd) == 0)
-  {
-    IFDBG printf(" Funcion: xfwrite: Error mientras grababa '%s'\n", why);
-    gimp_quit();
-  }
-}
-
-
-
-
-static void write_gchar(FILE *fd, unsigned char val, gchar *why)
-{
-  unsigned char b[2];
-  gint32 pos;
-
-  b[0] = val;
-  b[1] = 0;
-
-  pos = ftell(fd);
-  if (fwrite(&b, 1, 2, fd) == 0)
-  {
-    IFDBG printf(" Funcion: write_gchar: Error mientras grababa '%s'\n", why);
-    gimp_quit();
-  }
-  fseek(fd, pos+1, SEEK_SET);
-}
-
-
-
-
-static void write_gshort(FILE *fd, gshort val, gchar *why)
-{
-  unsigned char b[2];
-  /*  b[0] = val & 255;
-      b[1] = (val >> 8) & 255;*/
-
-  b[1] = val & 255;
-  b[0] = (val >> 8) & 255;
-
-  if (fwrite(&b, 1, 2, fd) == 0)
-  {
-    IFDBG printf(" Funcion: write_gshort: Error mientras grababa '%s'\n", why);
-    gimp_quit();
-  }
-}
-
-
-
-
-static void write_glong(FILE *fd, glong val, gchar *why)
-{
-  unsigned char b[4];
-  /*  b[0] = val & 255;
-      b[1] = (val >> 8) & 255;
-      b[2] = (val >> 16) & 255;
-      b[3] = (val >> 24) & 255;*/
-
-  b[3] = val & 255;
-  b[2] = (val >> 8) & 255;
-  b[1] = (val >> 16) & 255;
-  b[0] = (val >> 24) & 255;
-
-  if (fwrite(&b, 1, 4, fd) == 0)
-  {
-    IFDBG printf(" Funcion: write_glong: Error mientras grababa '%s'\n", why);
-    gimp_quit();
-  }
-}
-
-
-static void pack_pb_line ( guchar* ini, guchar* fin,
-                           guchar* datosRes, gshort* longitud )
-{
-  int i,j;
-  gint32 restantes;
-
-  restantes = fin - ini;
-  *longitud = 0;
-
-  while ( restantes > 0 )
-  {
-    /* Busca caracteres iguales a la muestra */
-
-    i = 0;
-    while ( ( i < 128 ) &&
-            ( ini + i < fin ) &&
-            ( (*ini) == *(ini + i) ) )
-      i++;
-
-    if ( i > 1 )		/* Ha encontrado iguales */
-    {
-      IF_DEEP_DBG printf("Repeticion: '%d', %d veces ------------> ", *ini, i);
-      IF_DEEP_DBG printf("Grabo: '%d' %d\n", -(i - 1), *ini);
-
-      *(datosRes++) = -(i - 1);
-      *(datosRes++) = *ini;
-
-      ini += i;
-      restantes -= i;
-      *longitud += 2;
-    }
-    else		/* Busca caracteres distintos al anterior */
-    {
-      i = 0;
-      while ( ( i < 128 ) &&
-              ( ini + i + 1 <= fin ) &&
-              ( *(ini + i) != *(ini + i + 1) ) )
-        i++;
-
-      /* Si solo quedaba 1 en la linea, el while anterior no lo coje  */
-
-      if ( restantes == 1 )
-      {
-        IF_DEEP_DBG printf("1 Restante:\t");
-        i = 1;
-      }
-
-      if ( i > 0 )		/* Ha encontrado distintos */
-      {
-        IF_DEEP_DBG printf("%d distintos              ------------> Grabo: '%d' ", i, i - 1);
-
-        *(datosRes++) = i - 1;
-        for (j=0; j<i; j++)
-        {
-          IF_DEEP_DBG printf ("%d ", *(ini + j));
-          *(datosRes++) = *(ini + j);
-        }
-
-        IF_DEEP_DBG printf ("\n");
-
-        ini += i;
-        restantes -= i;
-        *longitud += ( i + 1 );
-      }
-
-    } /* else */
-
-    IF_DEEP_DBG printf("Restantes: %d\n", restantes);
-  } /* while principal */
-
-  IF_DEEP_DBG printf("\nLongitud total: %d\n", *longitud);
-
-/*  if ( *longitud & 1 )		// longitud impar, se añade un nop (128)
-  {
-    *longitud += 1;
-    *(datosRes++) = 128;
-
-    IF_DEEP_DBG printf("Longitud total modificada: %d\n", *longitud);
-  } */
-}
-
-
-static void GRAYA_to_chans ( guchar* greyA, gint numpix,
-                             guchar** grey, guchar** alpha )
-{
-  int i;
-  gint nPix;
-
-  if ( greyA == NULL )
-  {
-    IFDBG printf("greyA es un canal nulo");
-    *grey = NULL;
-    *alpha = NULL;
-    return;
-  }
-
-  nPix = numpix/2;
-  *grey = xmalloc(nPix);
-  *alpha = xmalloc(nPix);
-
-  for (i=0; i<nPix; i++)
-  {
-    (*grey)[i] = greyA[i*2];
-    (*alpha)[i] = greyA[i*2+1];
-  }
-}
-
-
-static void RGB_to_chans ( guchar* rgb, gint numpix,
-                           guchar** red, guchar** green, guchar** blue )
-{
-  int i;
-  gint nPix;
-
-  if ( rgb == NULL )
-  {
-    IFDBG printf("rgb es un canal nulo");
-    *red = NULL;
-    *green = NULL;
-    *blue = NULL;
-    return;
-  }
-
-  nPix = numpix/3;
-  *red = xmalloc(nPix);
-  *green = xmalloc(nPix);
-  *blue = xmalloc(nPix);
-
-  for (i=0; i<nPix; i++)
-  {
-    (*red)[i] = rgb[i*3];
-    (*green)[i] = rgb[i*3+1];
-    (*blue)[i] = rgb[i*3+2];
-  }
-}
-
-
-static void RGBA_to_chans ( guchar* rgbA, gint numpix,
-                            guchar** red, guchar** green, guchar** blue,
-                            guchar** alpha )
-{
-  int i;
-  gint nPix;
-
-  if ( rgbA == NULL )
-  {
-    IFDBG printf("rgb es un canal nulo");
-    *red = NULL;
-    *green = NULL;
-    *blue = NULL;
-    *alpha = NULL;
-    return;
-  }
-
-  nPix = numpix/4;
-  *red = xmalloc(nPix);
-  *green = xmalloc(nPix);
-  *blue = xmalloc(nPix);
-  *alpha = xmalloc(nPix);
-
-  for (i=0; i<nPix; i++)
-  {
-    (*red)[i] = rgbA[i*4];
-    (*green)[i] = rgbA[i*4+1];
-    (*blue)[i] = rgbA[i*4+2];
-    (*alpha)[i] = rgbA[i*4+3];
-  }
-}
-
-
-static gint gimpBaseTypeToPsdMode (gint gimpBaseType)
-{
-  switch (gimpBaseType)
-  {
-    case GIMP_RGB: return(3);                     /* RGB */
-    case GIMP_GRAY: return(1);                    /* Grayscale */
-    case GIMP_INDEXED: return(2);                 /* Indexed */
-    default:
-      g_message ("PSD: Error: Can't convert GIMP base imagetype to PSD mode\n");
-      IFDBG printf ("PSD Save: el gimpBaseType vale %d, no puede convertirlo a PSD mode", gimpBaseType);
-      gimp_quit();
-      return(3);                        /* Retorno RGB por defecto */
-  }
-}
-
-
-static gint nCanalesLayer (gint gimpBaseType, gint hasAlpha)
-{
-  int incAlpha = 0;
-
-  incAlpha = ( hasAlpha == 0 ) ? 0 : 1;
-
-  switch (gimpBaseType)
-  {
-    case GIMP_RGB: return(3+incAlpha);                /* R,G,B y Alpha (Si existe) */
-    case GIMP_GRAY: return(1+incAlpha);               /* G y Alpha (Si existe) */
-    case GIMP_INDEXED: return(1+incAlpha);            /* I y Alpha (Si existe) */
-    default:
-      return(0);                        /* Retorno 0 cananles por defecto */
-  }
-}
-
-
-static void  reshuffle_cmap_write(guchar *mapGimp)
-{
-  guchar *mapPSD;
-  int i;
-
-  mapPSD = xmalloc(768);
-
-  for (i=0;i<256;i++)
-  {
-    mapPSD[i] = mapGimp[i*3];
-    mapPSD[i+256] = mapGimp[i*3+1];
-    mapPSD[i+512] = mapGimp[i*3+2];
-  }
-
-  for (i=0;i<768;i++)
-  {
-    mapGimp[i] = mapPSD[i];
-  }
-
-  g_free(mapPSD);
-}
-
-
-static void save_header (FILE *fd, gint32 image_id)
-{
-  IFDBG printf (" Funcion: save_header\n");
-  IFDBG printf ("      Filas: %d\n", PSDImageData.image_height);
-  IFDBG printf ("      Columnas: %d\n", PSDImageData.image_width);
-  IFDBG printf ("      Tipo base: %d\n", PSDImageData.baseType);
-  IFDBG printf ("      Numero de canales: %d\n", PSDImageData.nChannels);
-
-  xfwrite(fd, "8BPS", 4, "signature");
-  write_gshort(fd, 1, "version");
-  write_glong(fd, 0, "reserved 1");       /* 6 bytes para el campo 'reservado'. 4 bytes de un long */
-  write_gshort(fd, 0, "reserved 1");      /* y 2 bytes de un short */
-  write_gshort(fd, PSDImageData.nChannels +
-                   nCanalesLayer (PSDImageData.baseType, 0),
-               "channels");
-  write_glong(fd, PSDImageData.image_height, "rows");
-  write_glong(fd, PSDImageData.image_width, "columns");
-  write_gshort(fd, 8, "depth");        /* Parece que GIMP solo soporta las
-                                           imagenes PSD de 8 bits de profundidad */
-  write_gshort(fd, gimpBaseTypeToPsdMode(PSDImageData.baseType), "mode");
-}
-
-
-
-static void save_color_mode_data (FILE *fd, gint32 image_id)
-{
-  guchar *cmap;
-  guchar *cmap_modificado;
-  int i;
-  gint32 nColors;
-
-  IFDBG printf (" Funcion: save_color_mode_data\n");
-
-  switch (PSDImageData.baseType)
-  {
-    case GIMP_INDEXED:
-      IFDBG printf ("      Tipo de la imagen: INDEXED\n");
-
-      cmap = gimp_image_get_cmap (image_id, &nColors);
-      IFDBG printf ("      Longitud del colormap devuelto por gimp_image_get_cmap: %d\n", nColors);
-
-      if ( nColors == 0 )
-      {
-        IFDBG printf("      La imagen indexada no tiene colormap\n");
-        write_glong(fd, 0, "color data length");
-      }
-      else if ( nColors != 256 )
-      {
-        IFDBG printf("      La imagen indexada tiene %ld!=256 colores\n", nColors );
-        IFDBG printf("      Relleno hasta llegar a 256 con ceros\n" );
-        write_glong(fd, 768, "color data length");                   /* Para este tipo, longitud siempre 768 */
-
-        cmap_modificado = xmalloc(768);
-        for (i=0; i<nColors*3; i++)
-          cmap_modificado[i] = cmap[i];
-
-        for (i=nColors*3; i<768; i++)
-          cmap_modificado[i] = 0;
-
-        reshuffle_cmap_write(cmap_modificado);
-        xfwrite(fd, cmap_modificado, 768, "colormap");                          /* Graba el mapa de colores reajustado */
-
-        g_free(cmap_modificado);
-      }
-      else         /* nColors es igual a 256 */
-      {
-        write_glong(fd, 768, "color data length");                   /* Para este tipo, longitud siempre 768 */
-        reshuffle_cmap_write(cmap);
-        xfwrite(fd, cmap, 768, "colormap");                          /* Graba el mapa de colores reajustado */
-      }
-      break;
-
-    default:
-      IFDBG printf ("      Tipo de la imagen: No INDEXED\n");
-      write_glong(fd, 0, "color data length");
-  }
-}
-
-
-
-static void save_resources (FILE *fd, gint32 image_id)
-{
-  int i;
-  char **chName=NULL;           /* Nombres de los canales */
-  char *fileName;               /* Nombre del fichero de la imagen */
-  gint32 idActLayer;            /* Id de la capa activa */
-  guint nActiveLayer=0;         /* Num de la capa activa */
-  gboolean hayActiveLayer;      /* TRUE si hay alguna capa activa */
-
-  gint32 posActual;		/* Posicion: Fin de fichero */
-  gint32 posTotal;		/* Posicion: Longitud de la seccion recursos */
-  gint32 posNombres;		/* Posicion: Longitud de Nombres de canales */
-  gint32 posNombresII;		/* Posicion: Longitud de Nombres de canales II */
-  gint32 posTitulo;		/* Posicion: Longitud de Titulo de la imagen */
-
-
-  /* Los unicos recursos relevantes en GIMP son: 0x03EE, 0x03F0 y 0x0400 */
-  /* Para la version 4.0 de Adobe Photoshop, estudiar: 0x0408, 0x040A y 0x040B */
-
-  IFDBG printf (" Funcion: save_resources\n");
-
-  /* Obtiene los nombres de los canales */
-
-  if ( PSDImageData.nChannels > 0 )
-    chName = (char **) xmalloc( sizeof(char *) * PSDImageData.nChannels );
-
-  for (i=0; i<PSDImageData.nChannels; i++)
-  {
-    chName[i] = gimp_channel_get_name(PSDImageData.lChannels[i]);
-    IFDBG printf ("      Nombre del canal %d: %s\n", i, chName[i]);
-  }
-
-  /* Obtiene el titulo de la imagen, su nombre de fichero */
-
-  fileName = gimp_image_get_filename(image_id);
-  IFDBG printf ("      Titulo de la imagen: %s\n", fileName);
-
-  /* Obtiene el numero de la capa activa */
-
-  idActLayer = gimp_image_get_active_layer(image_id);
-  IFDBG printf ("      Identificador de capa activa es: %d\n", idActLayer);
-
-  hayActiveLayer = FALSE;
-  for (i=0; i<PSDImageData.nLayers; i++)
-    if ( idActLayer == PSDImageData.lLayers[i] )
-    {
-      nActiveLayer = i;
-      hayActiveLayer = TRUE;
-    }
-
-  if (hayActiveLayer)
-    IFDBG printf ("      El numero de capa activa es: %d\n", nActiveLayer);
-  else
-    IFDBG printf ("      No hay capa activa\n");
-
-
-
-  /* Aqui empiezo a grabar toda la historia */
-
-  posTotal = ftell(fd);
-  write_glong(fd, 0, "image resources length");
-
-
-  /* --------------- Voy a grabar: Nombres de los canales --------------- */
-
-  if ( PSDImageData.nChannels > 0 )
-  {
-    xfwrite(fd, "8BIM", 4, "imageresources signature");
-    write_gshort(fd, 0x03EE, "0x03EE Id");
-      /* write_pascalstring(fd, Name, "Id name"); */
-    write_gshort(fd, 0, "Id name");             /* Pongo un string nulo, dos ceros */
-
-    /* Marco la posicion actual del fichero */
-
-    posNombres = ftell(fd);
-    write_glong(fd, 0, "0x03EE resource size");
-
-    /* Grabo todos los strings */
-
-    for (i=PSDImageData.nChannels-1; i>=0; i--)
-/*      write_pascalstring(fd, chName[i], 2, "chanel name"); */
-      write_string(fd, chName[i], "channel name");
-
-    /* Calculo y grabo la longitud real de este recurso */
-
-    posActual = ftell(fd);		/* Posicion del fin de fichero */
-
-    fseek(fd, posNombres, SEEK_SET);
-    write_glong(fd, posActual - posNombres - sizeof(glong), "0x03EE resource size");
-    IFDBG printf ("\n      Longitud total de 0x03EE resource: %ld\n",
-                  posActual - posNombres - sizeof(glong) );
-
-    /* Vuelve al final de fichero para continuar con la grabacion */
-
-    fseek(fd, posActual, SEEK_SET);
-
-    /* Si la longitud es impar, añado un cero */
-
-    if ( ( posActual - posNombres - sizeof(glong) ) & 1 )
-      write_gchar(fd, 0, "pad byte");
-  }
-
-
-  /* ------------ Voy a grabar: Nombres de los canales version II ------------ */
-
-/*  if ( PSDImageData.nChannels > 0 )
-  {
-    xfwrite(fd, "8BIM", 4, "imageresources signature");
-    write_gshort(fd, 0x0415, "0x0415 Id");
-      // write_pascalstring(fd, Name, "Id name");
-    write_gshort(fd, 0, "Id name");             // Pongo un string nulo, dos ceros
-
-    // Marco la posicion actual del fichero
-
-    posNombresII = ftell(fd);
-    write_glong(fd, 0, "0x0415 resource size");
-
-    // Grabo todos los strings
-
-    for (i=PSDImageData.nChannels-1; i>=0; i--)
-//      write_pascalstring(fd, chName[i], 2, "chanel name");
-      write_PSstring(fd, chName[i], "channel name");
-
-    // Calculo y grabo la longitud real de este recurso
-
-    posActual = ftell(fd);		// Posicion del fin de fichero
-
-    fseek(fd, posNombresII, SEEK_SET);
-    write_glong(fd, posActual - posNombresII - sizeof(glong), "0x0415 resource size");
-    IFDBG printf ("\n      Longitud total de 0x0415 resource: %ld\n",
-            posActual - posNombresII - sizeof(glong) );
-
-    // Vuelve al final de fichero para continuar con la grabacion
-
-    fseek(fd, posActual, SEEK_SET);
-
-    // Si la longitud es impar, añado un cero
-
-    if ( ( posActual - posNombresII - sizeof(glong) ) & 1 )
-      write_gchar(fd, 0, "pad byte");
-  } */
-
-
-  /* --------------- Voy a grabar: Titulo de la imagen --------------- */
-
-/* NO LO GRABO
-
-  xfwrite(fd, "8BIM", 4, "imageresources signature");
-  write_gshort(fd, 0x03F0, "0x03F0 Id");
-  write_gshort(fd, 0, "Id name");      // Pongo un string nulo, que son dos ceros
-
-  // Marco la posicion actual del fichero
-
-  posTitulo = ftell(fd);
-  write_glong(fd, 0, "0x03F0 resource size");
-
-  // Grabo el titulo como pascal string, tendra siempre una longitud par
-
-  write_pascalstring(fd, fileName, 2, "image caption");
-
-  // Calculo y grabo la longitud real de este recurso
-
-  posActual = ftell(fd);		// Posicion del fin de fichero
-
-  fseek(fd, posTitulo, SEEK_SET);
-  write_glong(fd, posActual - posTitulo - sizeof(glong), "0x03F0 resource size");
-  IFDBG printf ("      Longitud total de 0x03F0 resource: %ld\n",
-          posActual - posTitulo - sizeof(glong) );
-
-  // Vuelve al final de fichero para continuar con la grabacion
-
-  fseek(fd, posActual, SEEK_SET);
-*/
-
-  /* --------------- Voy a grabar: Numero de capa activa --------------- */
-
-  if ( hayActiveLayer )
-  {
-    xfwrite(fd, "8BIM", 4, "imageresources signature");
-    write_gshort(fd, 0x0400, "0x0400 Id");
-      /* write_pascalstring(fd, Name, "Id name"); */
-    write_gshort(fd, 0, "Id name");      /* Pongo un string nulo, que son dos ceros */
-    write_glong(fd, sizeof(gshort), "0x0400 resource size");
-
-    /* Grabo el titulo como gshort, tendra siempre una longitud par */
-
-    write_gshort(fd, nActiveLayer, "active layer");
-
-    IFDBG printf ("      Longitud total de 0x0400 resource: %ld\n", sizeof(gshort) );
-  }
-
-
-  /* --------------- Voy a grabar: Longitud total de la seccion --------------- */
-
-  posActual = ftell(fd);		/* Posicion del fin de fichero */
-
-  fseek(fd, posTotal, SEEK_SET);
-  write_glong(fd, posActual - posTotal - sizeof(glong), "image resources length");
-  IFDBG printf ("      Longitud total de la seccion de recursos: %ld\n",
-                posActual - posTotal - sizeof(glong) );
-
-  /* Vuelve al final de fichero para continuar con la grabacion */
-
-  fseek(fd, posActual, SEEK_SET);
-
-  g_free(chName);
-}
-
-
-static void get_compress_channel_data (guchar* channel_data,
-                                       gint32 channel_cols,
-                                       gint32 channel_rows,
-                                       gshort** tablaLongitudes,
-                                       guchar** datosRes,
-                                       glong* longTotalComprimido )
-{
-  gint i;
-  gint32 longitud;		/* Longitud de datos comprimidos */
-  gshort longAux;		/* Auxiliar */
-  guchar* ini;			/* Posicion de inicio de una fila en channel_data */
-  guchar* fin;			/* Posicion de fin de una fila en channel_data */
-  gint32 channel_length;	/* Longitud total del canal */
-
-
-  channel_length = channel_cols * channel_rows;
-  *datosRes = g_new (guchar, channel_length * 2);
-  *tablaLongitudes = g_new (gshort, channel_rows);
-
-  /* Para cada una de las filas del canal */
-
-  longitud = 0;
-  for (i=0; i<channel_rows; i++)
-  {
-    ini = channel_data + ( i * channel_cols );
-    fin = ini + channel_cols;
-
-    /* Creando los datos comprimidos de la linea */
-    pack_pb_line ( ini, fin, (*datosRes) + longitud, &longAux );
-    (*tablaLongitudes)[i] = longAux;
-    longitud += longAux;
-  }
-
-  *longTotalComprimido = (longitud + channel_rows * sizeof(gshort)) + sizeof(gshort);
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-static void save_channel_data (FILE *fd, guchar* channel_data,
-                               gint32 channel_cols,
-                               gint32 channel_rows,
-                               gint32 posLong, gchar *why )
-{
-  gint i;
-  gint32 longitud;		/* Longitud de datos comprimidos */
-  glong longTotalCrudo;		/* Longitud total de los datos en crudo */
-  glong longTotalComprimido;	/* Longitud total de los datos coprimidos */
-  gshort* tablaLongitudes;	/* Longitudes de cada linea comprimida */
-  gshort longAux;		/* Auxiliar */
-  guchar* datosRes;		/* Datos comprimidos de una linea */
-  guchar* ini;			/* Posicion de inicio de una fila en channel_data */
-  guchar* fin;			/* Posicion de fin de una fila en channel_data */
-  gint32 channel_length;	/* Longitud total del canal */
-
-
-  channel_length = channel_cols * channel_rows;
-  datosRes = g_new (guchar, channel_length * 2);
-  tablaLongitudes = g_new (gshort, channel_rows);
-
-  /* Para cada una de las filas del canal */
-
-  longitud = 0;
-  for (i=0; i<channel_rows; i++)
-  {
-    ini = channel_data + ( i * channel_cols );
-    fin = ini + channel_cols;
-
-    /* Creando los datos comprimidos de la linea */
-    pack_pb_line ( ini, fin, datosRes + longitud, &longAux );
-    tablaLongitudes[i] = longAux;
-    longitud += longAux;
-  }
-
-  /* Calcula las longitudes totales de los dos tipos */
-
-  longTotalCrudo = (channel_rows*channel_cols) + sizeof(gshort);
-  longTotalComprimido = (longitud + channel_rows * sizeof(gshort)) + sizeof(gshort);
-
-/*  IFDBG printf("\nLongitud comprimida: %ld\n", longTotalComprimido );
-   IFDBG printf("\nLongitud cruda: %ld\n", longTotalCrudo ); */
-
-  if ( longTotalComprimido < longTotalCrudo )
-  {
-    IFDBG printf("        Grabo datos (RLE): %ld\n", longTotalComprimido );
-
-    write_gshort(fd, 1, "Compression");		/* Graba el tipo de compresion */
-
-    /* Graba la tabla de longitudes de linea comprimida */
-
-    for (i=0; i<channel_rows; i++)
-      write_gshort(fd, tablaLongitudes[i], "RLE length");
-
-    xfwrite(fd, datosRes, longitud, why);	/* Graba los datos comprimidos */
-
-    /* Actualiza el valor correspondiente a la longitud de los datos del canal */
-
-    fseek(fd, posLong, SEEK_SET);
-    write_glong(fd, longTotalComprimido, "channel data length");
-    fseek(fd, 0, SEEK_END);
-  }
-  else
-  {
-    IFDBG printf("        Grabo datos (raw): %ld\n", longTotalCrudo);
-
-    write_gshort(fd, 0, "Compression");		/* Graba el tipo de compresion */
-
-    xfwrite(fd, channel_data, channel_length, why);	/* Graba los datos en crudo */
-  }
-}
-
-
-static void save_layerAndMask (FILE *fd, gint32 image_id)
-{
-  int i,j;
-  int idCanal;
-  gint offset_x;		/* Offset x de cada capa */
-  gint offset_y;                /* Offset y de cada capa*/
-  gint32 layerHeight;		/* Altura de cada capa */
-  gint32 layerWidth;            /* Anchura de cada capa*/
-  gchar blendMode[5];			/* Blend mode de la capa */
-  unsigned char layerOpacity;		/* Opacidad de la capa */
-  unsigned char flags;			/* Banderas de la capa */
-  gint nChannelsLayer;			/* Numero de canales de una capa */
-  gint32 longCanal;			/* Longitud de los datos de un canal */
-  char *layerName;			/* Nombre de la capa */
-
-  gint32 posActual;			/* Posicion: Fin de fichero */
-  gint32 posExtraData;			/* Posicion: Longitud de Extra data */
-  gint32 posLayerMask;			/* Posicion: Longitud Layer & Mask section */
-  gint32 posLayerInfo;			/* Posicion: Longitud Layer info section */
-  gint32** posLongChannel;		/* Posicion: Longitud de un canal */
-
-
-  IFDBG printf (" Funcion: save_layer&mask\n");
-
-  /* Creo la primera dimension del array (capas, canales) */
-
-  posLongChannel = g_new (gint32*, PSDImageData.nLayers);
-
-  /* Seccion Layer and mask information  */
-
-  posLayerMask = ftell(fd);
-  write_glong(fd, 0, "layers & mask information length");
-
-  /* Seccion Layer info */
-
-  posLayerInfo = ftell(fd);
-  write_glong(fd, 0, "layers info section length");
-
-  /* Seccion Layer structure */
-
-  write_gshort(fd, PSDImageData.nLayers, "Layer structure count");
-
-  /* Seccion Layer records */
-  /* La ultima capa que tiene GIMP debe grabarse la primera */	
-
-  for (i=PSDImageData.nLayers-1; i>=0; i--)
-  {
-    gimp_drawable_offsets( PSDImageData.lLayers[i], &offset_x, &offset_y );
-    layerHeight = gimp_drawable_height( PSDImageData.lLayers[i] );
-    layerWidth = gimp_drawable_width( PSDImageData.lLayers[i] );
-
-    PSDImageData.layersDim[i].left = offset_x;
-    PSDImageData.layersDim[i].top = offset_y;
-    PSDImageData.layersDim[i].height = layerHeight;
-    PSDImageData.layersDim[i].width = layerWidth;
-
-    IFDBG printf ("      Capa numero: %d\n", i);
-    IFDBG printf ("         Offset x: %d\n", PSDImageData.layersDim[i].left);
-    IFDBG printf ("         Offset y: %d\n", PSDImageData.layersDim[i].top);
-    IFDBG printf ("         Height: %ld\n", PSDImageData.layersDim[i].height);
-    IFDBG printf ("         Width: %ld\n", PSDImageData.layersDim[i].width);
-
-    write_glong(fd, PSDImageData.layersDim[i].top, "Layer top");
-    write_glong(fd, PSDImageData.layersDim[i].left, "Layer left");
-    write_glong(fd, PSDImageData.layersDim[i].height +
-                    PSDImageData.layersDim[i].top, "Layer top");
-    write_glong(fd, PSDImageData.layersDim[i].width +
-                    PSDImageData.layersDim[i].left, "Layer right");
-
-    nChannelsLayer = nCanalesLayer (PSDImageData.baseType,
-                                    gimp_drawable_has_alpha(PSDImageData.lLayers[i]));
-
-
-    write_gshort(fd, nChannelsLayer, "Number channels in the layer");
-    IFDBG printf ("         Numero de canales: %ld\n", nChannelsLayer);
-
-    /* Creo la segunda dimension del array (capas, canales) */
-
-    posLongChannel[i] = g_new (gint32, nChannelsLayer);
-
-/* Probar con gimp_drawable_bytes() */
-
-    for (j=0; j<nChannelsLayer; j++)
-    {
-      if ( gimp_drawable_has_alpha(PSDImageData.lLayers[i]) )
-        idCanal = j - 1;
-      else
-        idCanal = j;
-
-      write_gshort(fd, idCanal, "Channel ID");
-      IFDBG printf ("           - Identificador: %d\n", idCanal);
-
-      /* Grabo la longitud como si no hubiese compression. Si en realidad
-         la hay, lo modifico mas tarde, cuando grabe los datos */
-
-      posLongChannel[i][j] = ftell(fd);
-      longCanal = sizeof(gshort) + ( PSDImageData.layersDim[i].width *
-                                     PSDImageData.layersDim[i].height );
-
-      write_glong(fd, longCanal, "Channel ID");
-      IFDBG printf ("             Longitud: %ld\n", longCanal );
-    }
-
-    xfwrite(fd, "8BIM", 4, "blend mode signature");
-
-    psd_lmode_layer(PSDImageData.lLayers[i], blendMode);
-    IFDBG printf ("         Blend mode: %s\n", blendMode);
-    xfwrite(fd, blendMode, 4, "blend mode key");
-
-    layerOpacity = ( gimp_layer_get_opacity(PSDImageData.lLayers[i]) * 255.0 ) / 100.0;
-    IFDBG printf ("         Opacity: %u\n", layerOpacity);
-    write_gchar(fd, layerOpacity, "Opacity");
-
-    /* Parece que el siguiente campo no se usa en GIMP */
-    write_gchar(fd, 0, "Clipping");
-
-    flags = 0;
-    if ( gimp_layer_get_preserve_transparency(PSDImageData.lLayers[i]) ) flags = flags | 1;
-    if ( ! gimp_layer_get_visible(PSDImageData.lLayers[i]) ) flags = flags | 2;
-    IFDBG printf ("         Flags: %u\n", flags);
-    write_gchar(fd, flags, "Flags");
-
-    /* Byte de relleno para parear */
-    write_gchar(fd, 0, "Filler");
-
-    posExtraData = ftell(fd);		             /* Posicion de Extra Data size */
-    write_glong(fd, 0, "Extra data size");
-
-    /* OJO Pongo vacia Layer mask / adjustment layer data */
-    write_glong(fd, 0, "Layer mask size");
-    IFDBG printf ("\n         Layer mask size: %ld\n", 0);
-
-    /* OJO Pongo vacia Layer blending ranges data */
-    write_glong(fd, 0, "Layer blending size");
-    IFDBG printf ("\n         Layer blending size: %ld\n", 0);
-
-    layerName = gimp_layer_get_name(PSDImageData.lLayers[i]);
-    write_pascalstring(fd, layerName, 4, "layer name");
-    IFDBG printf ("\n         Layer name: %s\n", layerName);
-
-    /* Graba la longitud real de: Extra data */
-
-    posActual = ftell(fd);		/* Posicion del fin de fichero */
-
-    fseek(fd, posExtraData, SEEK_SET);
-    write_glong(fd, posActual - posExtraData - sizeof(glong), "Extra data size");
-    IFDBG printf ("      Longitud total de ExtraData: %d\n",
-                  posActual - posExtraData - sizeof(glong) );
-
-    /* Vuelve al final de fichero para continuar con la grabacion */
-
-    fseek(fd, posActual, SEEK_SET);
-  }
-
-
-  /* Seccion channel image data */	
-  /* La ultima capa que tiene GIMP debe grabarse la primera */	
-
-  for (i=PSDImageData.nLayers-1; i>=0; i--)
-  {
-    int nCanal;
-    GimpDrawable* drawable;
-    GimpPixelRgn region;		/* Region de la imagen */
-    guchar* data;		/* Bytes que componen un layer con todos sus canales */
-    guchar* red;		/* Bytes que componen un canal R */
-    guchar* green;		/* Bytes que componen un canal G */
-    guchar* blue;		/* Bytes que componen un canal B */
-    guchar* gray;		/* Bytes que componen un canal G */
-    guchar* alpha;		/* Bytes que componen un canal Alpha */
-    gint32 longCanal;		/* Longitud de los datos de un canal */
-
-    IFDBG printf ("\n     Chanels image data. Layer: %d\n", i);
-
-    longCanal = PSDImageData.layersDim[i].width *
-                PSDImageData.layersDim[i].height;
-    nChannelsLayer = nCanalesLayer (PSDImageData.baseType,
-                                    gimp_drawable_has_alpha(PSDImageData.lLayers[i]));
-    data = g_new (guchar, longCanal * nChannelsLayer);
-
-    drawable = gimp_drawable_get(PSDImageData.lLayers[i]);
-
-    gimp_pixel_rgn_init(&region, drawable, 0, 0,
-                            PSDImageData.layersDim[i].width,
-                            PSDImageData.layersDim[i].height, FALSE, FALSE );
-
-    gimp_pixel_rgn_get_rect(&region, data, 0, 0,
-                            PSDImageData.layersDim[i].width,
-                            PSDImageData.layersDim[i].height );
-
-    IFDBG printf ("        Longitud canal: %ld\n", longCanal);
-
-    nCanal = 0;
-    switch ( PSDImageData.baseType )
-    {
-      case GIMP_RGB:
-
-        if ( gimp_drawable_has_alpha(PSDImageData.lLayers[i]) )
-        {
-          RGBA_to_chans (data, longCanal * nChannelsLayer, &red, &green, &blue, &alpha);
-          IFDBG printf ("        Grabando canal alpha...\n");
-
-          save_channel_data (fd, alpha, PSDImageData.layersDim[i].width,
-                             PSDImageData.layersDim[i].height,
-                             posLongChannel[i][nCanal++],
-                             "alpha channel" );
-        }
-        else
-          RGB_to_chans ( data, longCanal * nChannelsLayer, &red, &green, &blue);
-
-        IFDBG printf ("        Grabando canal red...\n");
-        save_channel_data (fd, red,PSDImageData.layersDim[i].width,
-                           PSDImageData.layersDim[i].height,
-                           posLongChannel[i][nCanal++],
-                           "red channel" );
-
-        IFDBG printf ("        Grabando canal green...\n");
-        save_channel_data (fd, green, PSDImageData.layersDim[i].width,
-                           PSDImageData.layersDim[i].height,
-                           posLongChannel[i][nCanal++],
-                           "green channel" );
-
-        IFDBG printf ("        Grabando canal blue...\n");
-        save_channel_data (fd, blue, PSDImageData.layersDim[i].width,
-                           PSDImageData.layersDim[i].height,
-                           posLongChannel[i][nCanal++],
-                           "blue channel" );
-        break;
-
-      case GIMP_GRAY:
-
-        if ( gimp_drawable_has_alpha(PSDImageData.lLayers[i]) )
-        {
-          GRAYA_to_chans ( data, longCanal * nChannelsLayer, &gray, &alpha );
-
-          IFDBG printf ("        Grabando canal alpha...\n");
-          save_channel_data (fd, alpha, PSDImageData.layersDim[i].width,
-                             PSDImageData.layersDim[i].height,
-                             posLongChannel[i][nCanal++],
-                             "alpha channel" );
-
-          IFDBG printf ("        Grabando canal gray...\n");
-          save_channel_data (fd, gray, PSDImageData.layersDim[i].width,
-                             PSDImageData.layersDim[i].height,
-                             posLongChannel[i][nCanal++],
-                             "gray channel" );
-        }
-        else
-        {
-          IFDBG printf ("        Grabando canal gray...\n");
-          save_channel_data (fd, data, PSDImageData.layersDim[i].width,
-                             PSDImageData.layersDim[i].height,
-                             posLongChannel[i][nCanal++],
-                             "gray channel" );
-        }
-
-        break;
-
-      case GIMP_INDEXED:
-        IFDBG printf ("        Grabando canal indexed...\n");
-        save_channel_data (fd, data, PSDImageData.layersDim[i].width,
-                           PSDImageData.layersDim[i].height,
-                           posLongChannel[i][nCanal++],
-                           "indexed channel" );
-        break;
-    }
-
-
-  }
-
-
-  posActual = ftell(fd);		/* Posicion del fin de fichero */
-
-  /* Graba la longitud real de: Seccion Layer info */
-
-  fseek(fd, posLayerInfo, SEEK_SET);
-  write_glong(fd, posActual - posLayerInfo - sizeof(glong), "layers info section length");
-  IFDBG printf ("\n      Longitud total de layers info section: %d\n",
-                posActual - posLayerInfo - sizeof(glong));
-
-  /* Graba la longitud real de: Seccion Layer and mask information  */
-
-  fseek(fd, posLayerMask, SEEK_SET);
-  write_glong(fd, posActual - posLayerMask - sizeof(glong), "layers & mask information length");
-  IFDBG printf ("      Longitud total de layers & mask information: %d\n",
-                posActual - posLayerMask - sizeof(glong));
-
-  /* Vuelve al final de fichero para continuar con la grabacion */
-
-  fseek(fd, posActual, SEEK_SET);
-}
-
-
-
-static void save_data (FILE *fd, gint32 image_id)
-{
-  int compression;
-  int nCanales;
-  int i, j;
-  int nCanal;
-  gint offset_x;		/* Offset x de cada capa */
-  gint offset_y;                /* Offset y de cada capa*/
-  gint32 layerHeight;		/* Altura de cada capa */
-  gint32 layerWidth;            /* Anchura de cada capa*/
-  GimpDrawable* drawable;
-  GimpPixelRgn region;		/* Region de la imagen */
-  guchar* data;			/* Bytes que componen un layer con todos sus canales */
-  guchar* red;			/* Bytes que componen un canal R */
-  guchar* green;		/* Bytes que componen un canal G */
-  guchar* blue;			/* Bytes que componen un canal B */
-  guchar* gray_indexed;		/* Bytes que componen un canal B */
-  gint32 longCanal;		/* Longitud de los datos de un canal */
-  gint nChannelsLayer;		/* Numero de canales de una capa */
-
-  gshort** TLdataCompress;
-  guchar** dataCompress;
-  glong* longDataCompress;
-  glong longTotal;
-
-
-  IFDBG printf ("\n Funcion: save_data\n");
-
-  nCanales = PSDImageData.nChannels +
-             nCanalesLayer (PSDImageData.baseType, 0);
-  TLdataCompress = g_new (gshort*, nCanales);
-  dataCompress = g_new (guchar*, nCanales);
-  longDataCompress = g_new (glong*, nCanales);
-
-  i = PSDImageData.nLayers - 1;		/* Canal a grabar */
-  IFDBG printf ("     Procesando capa %d\n", i);
-
-  gimp_drawable_offsets( PSDImageData.lLayers[i], &offset_x, &offset_y );
-  layerHeight = gimp_drawable_height( PSDImageData.lLayers[i] );
-  layerWidth = gimp_drawable_width( PSDImageData.lLayers[i] );
-
-  longCanal = layerWidth * layerHeight;
-  nChannelsLayer = nCanalesLayer (PSDImageData.baseType,
-                                  gimp_drawable_has_alpha(PSDImageData.lLayers[i]));
-  data = g_new (guchar, longCanal * nChannelsLayer);
-
-  drawable = gimp_drawable_get(PSDImageData.lLayers[i]);
-  gimp_pixel_rgn_init(&region, drawable, 0, 0, layerWidth, layerHeight, FALSE, FALSE );
-  gimp_pixel_rgn_get_rect(&region, data, 0, 0, layerWidth, layerHeight);
-
-  nCanal = 0;
-  switch ( PSDImageData.baseType )
-  {
-    case GIMP_RGB:
-      RGB_to_chans ( data, longCanal * nChannelsLayer, &red, &green, &blue);
-
-      get_compress_channel_data ( red, layerWidth, layerHeight,
-                                  &(TLdataCompress[nCanal]), &(dataCompress[nCanal]),
-                                  &(longDataCompress[nCanal]) );
-      IFDBG printf ("        Longitud comprimida canal rojo: %ld\n",
-                    longDataCompress[nCanal]);
-      nCanal++;
-
-      get_compress_channel_data ( green, layerWidth, layerHeight,
-                                  &(TLdataCompress[nCanal]), &(dataCompress[nCanal]),
-                                  &(longDataCompress[nCanal]) );
-      IFDBG printf ("        Longitud comprimida canal verde: %ld\n",
-                    longDataCompress[nCanal]);
-      nCanal++;
-
-      get_compress_channel_data ( blue, layerWidth, layerHeight,
-                                  &(TLdataCompress[nCanal]), &(dataCompress[nCanal]),
-                                  &(longDataCompress[nCanal]) );
-      IFDBG printf ("        Longitud comprimida canal azul: %ld\n",
-                    longDataCompress[nCanal]);
-      nCanal++;
-      break;
-
-    case GIMP_GRAY:
-    case GIMP_INDEXED:
-      gray_indexed = data;
-      get_compress_channel_data ( gray_indexed, layerWidth, layerHeight,
-                                  &(TLdataCompress[nCanal]), &(dataCompress[nCanal]),
-                                  &(longDataCompress[nCanal]) );
-      IFDBG printf ("        Longitud comprimida canal gray o indexed: %ld\n",
-                    longDataCompress[nCanal]);
-      nCanal++;
-      break;
-  }
-
-
-  for (i=PSDImageData.nChannels-1; i>=0; i--)
-  {
-    longCanal = PSDImageData.image_width *
-                PSDImageData.image_height;
-
-    drawable = gimp_drawable_get(PSDImageData.lChannels[i]);
-
-    gimp_pixel_rgn_init(&region, drawable, 0, 0,
-                        PSDImageData.image_width,
-                        PSDImageData.image_height, FALSE, FALSE );
-
-    gimp_pixel_rgn_get_rect(&region, data, 0, 0,
-                            PSDImageData.image_width,
-                            PSDImageData.image_height );
-
-    get_compress_channel_data ( data, layerWidth, layerHeight,
-                                &(TLdataCompress[nCanal]), &(dataCompress[nCanal]),
-                                &(longDataCompress[nCanal]) );
-    IFDBG printf ("     Longitud comprimida canal usuario: %ld\n",
-                  longDataCompress[nCanal]);
-    nCanal++;
-  }
-
-  /* Calculo la longitud de todos los canales comprimidos */
-
-  longTotal = 0;
-  for (i=0; i<nCanales; i++)
-    longTotal += longDataCompress[i];
-
-  IFDBG printf ("\n     Longitud total de datos comprimidos: %ld\n", longTotal);
-  IFDBG printf ("     Longitud total de datos en crudo: %ld\n", nCanales*longCanal);
-
-  /* Decido si grabo los datos comprimidos o crudos */
-
-  if ( longTotal < nCanales*longCanal )		/* Grabo comprimidos */
-  {
-    IFDBG printf ("\n     Grabando los datos comprimidos\n");
-    write_gshort(fd, 1, "RLE compression");
-
-    /* Se graban primero todas las longitudes de linea */
-
-    for (i=0; i<nCanales; i++)
-      for (j=0; j<layerHeight; j++)
-        write_gshort(fd, TLdataCompress[i][j], "line lengths");
-
-    /* Y ahora los datos comprimidos */
-
-    for (i=0; i<nCanales; i++)
-    {
-      longTotal = 0;
-      for (j=0; j<layerHeight; j++)
-        longTotal += TLdataCompress[i][j];
-
-      xfwrite(fd, dataCompress[i], longTotal, "channel data");
-    }
-  }
-  else			/* Grabo crudos */
-  {
-    IFDBG printf ("\n     Grabando los datos en crudo\n");
-    write_gshort(fd, 0, "RLE compression");
-
-    /* Los canales de la capa a grabar ya los tengo de antes */
-
-    switch ( PSDImageData.baseType )
-    {
-      case GIMP_RGB:
-        xfwrite(fd, red, longCanal, "red channel data");
-        xfwrite(fd, green, longCanal, "green channel data");
-        xfwrite(fd, blue, longCanal, "blue channel data");
-        break;
-
-      case GIMP_GRAY:
-      case GIMP_INDEXED:
-        xfwrite(fd, gray_indexed, longCanal, "gray or indexed channel data");
-        break;
-    }
-
-    /* Y ahora voy a por los canales de usuario */
-
-    for (i=PSDImageData.nChannels-1; i>=0; i--)
-    {
-      drawable = gimp_drawable_get(PSDImageData.lChannels[i]);
-
-      gimp_pixel_rgn_init(&region, drawable, 0, 0,
-                          PSDImageData.image_width,
-                          PSDImageData.image_height, FALSE, FALSE );
-
-      gimp_pixel_rgn_get_rect(&region, data, 0, 0,
-                              PSDImageData.image_width,
-                              PSDImageData.image_height );
-
-      xfwrite(fd, data, longCanal, "channel data");
-    }
-
-    /* ¡¡¡ y... YATAAAAA !!!  (¿Como?,¿Yataaa?) */
-  }
-}
-
-
-
-static void get_image_data (FILE *fd, gint32 image_id)
-{
-  IFDBG printf (" Funcion: get_image_data\n");
-
-  PSDImageData.compression = 0;		/* No hay compresion */
-
-  PSDImageData.image_height = gimp_image_height(image_id);
-  IFDBG printf ("      Obtenido numero de filas: %d\n", PSDImageData.image_height);
-
-  PSDImageData.image_width = gimp_image_width(image_id);
-  IFDBG printf ("      Obtenido numero de columnas: %d\n", PSDImageData.image_width);
-
-  PSDImageData.baseType = gimp_image_base_type(image_id);
-  IFDBG printf ("      Obtenido tipo base: %d\n", PSDImageData.baseType);
-
-  /* El formato PSD no permite imagenes indexadas con capas */
-
-  if ( PSDImageData.baseType == GIMP_INDEXED )
-  {
-    IFDBG printf ("      Realizo el flatten de la imagen indexada\n");
-    gimp_image_flatten(image_id);
-  }
-
-  PSDImageData.lChannels = gimp_image_get_channels(image_id, &PSDImageData.nChannels);
-  IFDBG printf ("      Obtenido numero de canales: %d\n", PSDImageData.nChannels);
-
-  PSDImageData.lLayers = gimp_image_get_layers(image_id, &PSDImageData.nLayers);
-  IFDBG printf ("      Obtenido numero de capas: %d\n", PSDImageData.nLayers);
-
-  PSDImageData.layersDim = g_new (PSD_Layer_Dimension, PSDImageData.nLayers);
-}
-
-
-
-int save_image (gchar *filename, gint32 image_id)
-{
-  FILE *fd;
-  gchar *name_buf;
-
-  IFDBG printf (" Funcion: save_image\n");
-
-  name_buf = g_malloc (64+strlen(filename));
-  IFDBG printf (name_buf, "Saving %s:", filename);
-  gimp_progress_init(name_buf);
-  g_free(name_buf);
-
-  IFDBG printf ("      Se ha puesto el mensaje en GIMP\n");
-
-  fd = fopen(filename, "wb");
-  if (fd==NULL)
-  {
-    IFDBG printf("PSD Save: no pudo abrir \"%s\"\n", filename);
-    return(-1);
-  }
-
-  IFDBG printf ("      Se ha abierto el fichero \"%s\"\n", filename);
-
-  get_image_data (fd, image_id);
-  save_header (fd, image_id);
-  save_color_mode_data (fd, image_id);
-  save_resources (fd, image_id);
-
-  /* El formato PSD no permite imagenes indexadas con capas */
-
-  if ( PSDImageData.baseType == GIMP_INDEXED )
-    write_glong(fd, 0, "layers info section length");
-  else
-    save_layerAndMask (fd, image_id);
-
-  /* Si es una indexada, aqui irá la información de la capa y los canales */
-
-  save_data (fd, image_id);
-
-  IFDBG printf ("\n\n");
-
-  fclose(fd);
-  return TRUE;
-}
-
diff --git a/media-gfx/gimp/gimp-2.0.0.ebuild b/media-gfx/gimp/gimp-2.0.0.ebuild
deleted file mode 100644
index 73d7321d13a0..000000000000
--- a/media-gfx/gimp/gimp-2.0.0.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/media-gfx/gimp/gimp-2.0.0.ebuild,v 1.11 2005/02/03 04:18:25 joem Exp $
-
-inherit flag-o-matic libtool eutils
-
-DESCRIPTION="GNU Image Manipulation Program"
-SRC_URI="mirror://gimp/v2.0/${P}.tar.bz2"
-HOMEPAGE="http://www.gimp.org/"
-
-SLOT="2"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc hppa sparc amd64 ~mips"
-IUSE="doc python aalib png jpeg tiff mng wmf gimpprint gtkhtml mmx sse X altivec debug"
-
-# FIXME : some more things can be (local) USE flagged
-# a few options are detection only, fix them to switch
-
-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 )
-	mng? ( media-libs/libmng )
-
-	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 )"
-
-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
-
-	# fix to compile using gcc 3.4
-	epatch ${FILESDIR}/${P}-gcc34.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 mng libmng` \
-		`use_with aalib aa` \
-		`use_enable debug` || die
-
-	emake || die
-
-}
-
-src_install() {
-
-	# Workaround portage variable leakage
-	local AA=
-
-	# create these dirs to make the makefile installs these items correctly
-	dodir /usr/share/{applications,application-registry,mime-info}
-
-	make DESTDIR=${D} install || die
-
-	# Remove unversioned link to 2.0 binary
-	rm ${D}/usr/bin/gimp
-
-	dodoc AUTHORS COPYING ChangeL* HACKING INSTALL \
-		MAINTAINERS NEWS PLUGIN_MAINTAINERS README* TODO*
-
-}
diff --git a/media-gfx/gimp/gimp-2.0.2.ebuild b/media-gfx/gimp/gimp-2.0.2.ebuild
deleted file mode 100644
index 9d8382271fd8..000000000000
--- a/media-gfx/gimp/gimp-2.0.2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.0.2.ebuild,v 1.5 2005/02/03 04:18:25 joem Exp $
-
-inherit flag-o-matic libtool eutils
-
-DESCRIPTION="GNU Image Manipulation Program"
-SRC_URI="mirror://gimp/v2.0/${P}.tar.bz2"
-HOMEPAGE="http://www.gimp.org/"
-
-SLOT="2"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~hppa ~sparc ~amd64 ~mips ppc64"
-IUSE="X aalib altivec debug doc gimpprint gtkhtml jpeg mmx mng png python sse svg tiff wmf"
-
-# FIXME : some more things can be (local) USE flagged
-# a few options are detection only, fix them to switch
-
-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 )
-	mng? ( media-libs/libmng )
-
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	svg? ( >=gnome-base/librsvg-2.2 )
-
-	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 )"
-
-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
-
-}
-
-src_compile() {
-
-	# Since 1.3.16, fixes linker problems when upgrading
-	elibtoolize
-
-	# Workaround portage variable leakage
-	local AA=
-
-	replace-flags "-march=k6*" "-march=i586"
-	# gimp uses inline functions (plug-ins/common/grid.c) (#23078)
-	filter-flags "-fno-inline"
-
-	econf \
-		--disable-default-binary \
-		`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 mng libmng` \
-		`use_with aalib aa` \
-		`use_enable debug` || die
-
-	emake || die
-
-}
-
-src_install() {
-
-	# Workaround portage variable leakage
-	local AA=
-
-	# create these dirs to make the makefile installs these items correctly
-	dodir /usr/share/{applications,application-registry,mime-info}
-
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeL* HACKING INSTALL \
-		MAINTAINERS NEWS PLUGIN_MAINTAINERS README* TODO*
-
-}
diff --git a/media-gfx/gimp/gimp-2.0.5.ebuild b/media-gfx/gimp/gimp-2.0.5.ebuild
deleted file mode 100644
index 9b27c2cca7eb..000000000000
--- a/media-gfx/gimp/gimp-2.0.5.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.0.5.ebuild,v 1.4 2005/02/03 04:18:25 joem Exp $
-
-inherit flag-o-matic libtool eutils
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-LICENSE="GPL-2"
-
-P_HELP="gimp-help-${PV/\./-}"
-S_HELP="$WORKDIR/${P_HELP}"
-SRC_URI="mirror://gimp/v2.0/${P}.tar.bz2
-	doc? ( mirror://gimp/help/testing/${P_HELP}.tar.gz )"
-
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~hppa ~sparc ~amd64 ~mips ~ppc64 ~alpha"
-#IUSE="X aalib altivec debug doc gimpprint jpeg mmx mng png python sse svg tiff wmf"
-IUSE="aalib altivec debug doc gimpprint jpeg mmx mng png python sse svg tiff wmf"
-
-# FIXME : some more things can be (local) USE flagged
-# a few options are detection only, fix them to switch
-
-#	X? ( virtual/x11 )"
-RDEPEND="virtual/x11
-	>=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* )
-	doc? ( =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 )
-	mng? ( media-libs/libmng )
-
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	svg? ( >=gnome-base/librsvg-2.2 )
-
-	aalib?	( media-libs/aalib )
-	python?	( >=dev-lang/python-2.2
-		>=dev-python/pygtk-2 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	dev-util/intltool
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-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
-
-}
-
-src_compile() {
-
-	# Since 1.3.16, fixes linker problems when upgrading
-	elibtoolize
-
-	# Workaround portage variable leakage
-	local AA=
-
-	# only use mmx if hardened is not set
-	local USE_MMX=
-
-	replace-flags "-march=k6*" "-march=i586"
-
-	# gimp uses inline functions (plug-ins/common/grid.c) (#23078)
-	filter-flags "-fno-inline"
-
-	if use hardened; then
-		ewarn "hardened use flag suppressing mmx use flag"
-		HARDENED_SUPPRESS_MMX="--disable-mmx"
-	else
-		HARDENED_SUPPRESS_MMX="`use_enable mmx`"
-	fi
-
-	econf \
-		--disable-default-binary \
-		--with-x \
-		"${HARDENED_SUPPRESS_MMX}" \
-		`use_enable sse` \
-		`use_enable altivec` \
-		`use_enable doc gtk-doc` \
-		`use_enable python` \
-		`use_enable gimpprint print` \
-		`use_with png libpng` \
-		`use_with jpeg libjpeg` \
-		`use_with jpeg libexif` \
-		`use_with tiff libtiff` \
-		`use_with mng libmng` \
-		`use_with aalib aa` \
-		`use_enable debug` || die
-
-	# X isn't optional (#58003) atm
-	#	`use_with X x` \
-
-	emake || die
-
-	if use doc; then
-		cd ${S_HELP}
-		econf --without-gimp || die
-		emake || die
-	fi
-
-}
-
-src_install() {
-
-	# Workaround portage variable leakage
-	local AA=
-
-	# create these dirs to make the makefile installs these items correctly
-	dodir /usr/share/{applications,application-registry,mime-info}
-
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeL* HACKING INSTALL \
-		MAINTAINERS NEWS PLUGIN_MAINTAINERS README* TODO*
-
-	if use doc; then
-		cd ${S_HELP}
-		make DESTDIR=${D} install || die
-	fi
-
-}
diff --git a/media-gfx/gimp/gimp-2.0.6.ebuild b/media-gfx/gimp/gimp-2.0.6.ebuild
deleted file mode 100644
index 1c9db30737e1..000000000000
--- a/media-gfx/gimp/gimp-2.0.6.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.0.6.ebuild,v 1.3 2005/02/03 04:18:25 joem Exp $
-
-inherit flag-o-matic libtool eutils
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-LICENSE="GPL-2"
-
-P_HELP="gimp-help-2-0.5" #"gimp-help-${PV/\./-}"
-S_HELP="$WORKDIR/${P_HELP}"
-SRC_URI="mirror://gimp/v2.0/${P}.tar.bz2
-	doc? ( mirror://gimp/help/testing/${P_HELP}.tar.gz )"
-
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~hppa ~sparc ~amd64 ~mips ~ppc64 ~alpha"
-#IUSE="X aalib altivec debug doc gimpprint jpeg mmx mng png python sse svg tiff wmf"
-IUSE="aalib altivec debug doc gimpprint gtkhtml jpeg mmx mng png python sse svg tiff wmf"
-
-# FIXME : some more things can be (local) USE flagged
-# a few options are detection only, fix them to switch
-
-#	X? ( virtual/x11 )"
-RDEPEND="virtual/x11
-	>=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 )
-	mng? ( media-libs/libmng )
-
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	svg? ( >=gnome-base/librsvg-2.2 )
-
-	aalib?	( media-libs/aalib )
-	python?	( >=dev-lang/python-2.2
-		>=dev-python/pygtk-2 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	dev-util/intltool
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-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
-
-}
-
-src_compile() {
-
-	# Since 1.3.16, fixes linker problems when upgrading
-	elibtoolize
-
-	# Workaround portage variable leakage
-	local AA=
-
-	# only use mmx if hardened is not set
-	local USE_MMX=
-
-	replace-flags "-march=k6*" "-march=i586"
-
-	# gimp uses inline functions (plug-ins/common/grid.c) (#23078)
-	filter-flags "-fno-inline"
-
-	if use hardened; then
-		ewarn "hardened use flag suppressing mmx use flag"
-		HARDENED_SUPPRESS_MMX="--disable-mmx"
-	else
-		HARDENED_SUPPRESS_MMX="`use_enable mmx`"
-	fi
-
-	econf \
-		--disable-default-binary \
-		--with-x \
-		"${HARDENED_SUPPRESS_MMX}" \
-		`use_enable sse` \
-		`use_enable altivec` \
-		`use_enable doc gtk-doc` \
-		`use_enable python` \
-		`use_enable gimpprint print` \
-		`use_with png libpng` \
-		`use_with jpeg libjpeg` \
-		`use_with jpeg libexif` \
-		`use_with tiff libtiff` \
-		`use_with mng libmng` \
-		`use_with aalib aa` \
-		`use_enable debug` || die
-
-	# X isn't optional (#58003) atm
-	#	`use_with X x` \
-
-	emake || die
-
-	if use doc; then
-		cd ${S_HELP}
-		econf --without-gimp || die
-		emake || die
-	fi
-
-}
-
-src_install() {
-
-	# Workaround portage variable leakage
-	local AA=
-
-	# create these dirs to make the makefile installs these items correctly
-	dodir /usr/share/{applications,application-registry,mime-info}
-
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS COPYING ChangeL* HACKING INSTALL \
-		MAINTAINERS NEWS PLUGIN_MAINTAINERS README* TODO*
-
-	if use doc; then
-		cd ${S_HELP}
-		make DESTDIR=${D} install || die
-	fi
-
-}
diff --git a/media-gfx/gimp/gimp-2.2.0.ebuild b/media-gfx/gimp/gimp-2.2.0.ebuild
deleted file mode 100644
index c900142bbde4..000000000000
--- a/media-gfx/gimp/gimp-2.2.0.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.0.ebuild,v 1.6 2005/02/03 04:18:25 joem Exp $
-
-inherit flag-o-matic libtool eutils
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-LICENSE="GPL-2"
-
-P_HELP="gimp-help-2-0.6" #gimp-help-2-{version}
-S_HELP="$WORKDIR/${P_HELP}"
-SRC_URI="mirror://gimp/v2.2/${P}.tar.bz2
-	doc? ( mirror://gimp/help/testing/${P_HELP}.tar.gz )"
-
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~hppa ~sparc ~amd64 ~mips ~ppc64 ~alpha"
-#IUSE="X aalib altivec debug doc gimpprint jpeg mmx mng png python sse svg tiff wmf"
-IUSE="aalib altivec debug doc gimpprint jpeg mmx mng png python sse svg tiff wmf"
-
-# FIXME : some more things can be (local) USE flagged
-# a few options are detection only, fix them to switch
-
-#	X? ( virtual/x11 )"
-RDEPEND="virtual/x11
-	>=dev-libs/glib-2.4.5
-	>=x11-libs/gtk+-2.4.4
-	>=x11-libs/pango-1.4
-	>=media-libs/freetype-2.1.7
-	>=media-libs/fontconfig-2.2
-	>=media-libs/libart_lgpl-2.3.8-r1
-	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-
-	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 )
-	mng? ( media-libs/libmng )
-
-	wmf? ( >=media-libs/libwmf-0.2.8.2 )
-	svg? ( >=gnome-base/librsvg-2.2 )
-
-	aalib?	( media-libs/aalib )
-	python?	( >=dev-lang/python-2.2
-		>=dev-python/pygtk-2 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	dev-util/intltool
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-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
-	# Install the missing pygimp logo
-	cp ${FILESDIR}/pygimp-logo.png ${S}/plug-ins/pygimp/
-
-}
-
-src_compile() {
-
-	# Since 1.3.16, fixes linker problems when upgrading
-	elibtoolize
-
-	# Workaround portage variable leakage
-	local AA=
-
-	# only use mmx if hardened is not set
-	local USE_MMX=
-
-	replace-flags "-march=k6*" "-march=i586"
-
-	# gimp uses inline functions (plug-ins/common/grid.c) (#23078)
-	filter-flags "-fno-inline"
-
-	if use hardened; then
-		ewarn "hardened use flag suppressing mmx use flag"
-		HARDENED_SUPPRESS_MMX="--disable-mmx"
-	else
-		HARDENED_SUPPRESS_MMX="`use_enable mmx`"
-	fi
-
-	local myconf
-	use doc || myconf="${myconf} --disable-devel-docs"
-
-	econf \
-		--disable-default-binary \
-		--with-x \
-		"${HARDENED_SUPPRESS_MMX}" \
-		${myconf} \
-		`use_enable sse` \
-		`use_enable altivec` \
-		`use_enable doc gtk-doc` \
-		`use_enable python` \
-		`use_enable gimpprint print` \
-		`use_with png libpng` \
-		`use_with jpeg libjpeg` \
-		`use_with jpeg libexif` \
-		`use_with tiff libtiff` \
-		`use_with mng libmng` \
-		`use_with aalib aa` \
-		`use_enable debug` || die
-
-	# X isn't optional (#58003) atm
-	#	`use_with X x` \
-
-	emake || die
-
-	if use doc; then
-		cd ${S_HELP}
-		econf --without-gimp || die
-		emake || die
-	fi
-
-}
-
-src_install() {
-
-	# Workaround portage variable leakage
-	local AA=
-
-	# create these dirs to make the makefile installs these items correctly
-	dodir /usr/share/{applications,application-registry,mime-info}
-
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS README*
-
-	if use doc; then
-		cd ${S_HELP}
-		make DESTDIR=${D} install || die
-	fi
-
-	# Create the gimp-remote link, see bug #36648
-	dosym gimp-remote-2.2 /usr/bin/gimp-remote
-
-}
diff --git a/media-gfx/gimp/gimp-2.2.3.ebuild b/media-gfx/gimp/gimp-2.2.3.ebuild
deleted file mode 100644
index be78060acaef..000000000000
--- a/media-gfx/gimp/gimp-2.2.3.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.3.ebuild,v 1.3 2005/03/07 14:09:29 corsair Exp $
-
-inherit flag-o-matic libtool eutils
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-LICENSE="GPL-2"
-
-P_HELP="gimp-help-2-0.6" #gimp-help-2-{version}
-S_HELP="$WORKDIR/${P_HELP}"
-SRC_URI="mirror://gimp/v2.2/${P}.tar.bz2
-	doc? ( mirror://gimp/help/testing/${P_HELP}.tar.gz )"
-
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~hppa ~sparc ~amd64 ~mips ppc64 ~alpha"
-#IUSE="X aalib altivec debug doc gimpprint jpeg mmx mng png python sse svg tiff wmf"
-IUSE="aalib altivec debug doc gtkhtml gimpprint jpeg mmx mng png python sse svg tiff wmf"
-
-# FIXME : some more things can be (local) USE flagged
-# a few options are detection only, fix them to switch
-
-#	X? ( virtual/x11 )"
-RDEPEND="virtual/x11
-	>=dev-libs/glib-2.4.5
-	>=x11-libs/gtk+-2.4.4
-	>=x11-libs/pango-1.4
-	>=media-libs/freetype-2.1.7
-	>=media-libs/fontconfig-2.2
-	>=media-libs/libart_lgpl-2.3.8-r1
-	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-
-	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 )
-	mng? ( media-libs/libmng )
-
-	wmf? ( >=media-libs/libwmf-0.2.8.2 )
-	svg? ( >=gnome-base/librsvg-2.2 )
-
-	aalib?	( media-libs/aalib )
-	python?	( >=dev-lang/python-2.2
-		>=dev-python/pygtk-2 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	dev-util/intltool
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-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
-	# Install the missing pygimp logo
-	cp ${FILESDIR}/pygimp-logo.png ${S}/plug-ins/pygimp/
-
-}
-
-src_compile() {
-
-	# Since 1.3.16, fixes linker problems when upgrading
-	elibtoolize
-
-	# Workaround portage variable leakage
-	local AA=
-
-	# only use mmx if hardened is not set
-	local USE_MMX=
-
-	replace-flags "-march=k6*" "-march=i586"
-
-	# gimp uses inline functions (plug-ins/common/grid.c) (#23078)
-	filter-flags "-fno-inline"
-
-	if use hardened; then
-		ewarn "hardened use flag suppressing mmx use flag"
-		HARDENED_SUPPRESS_MMX="--disable-mmx"
-	elif use x86; then
-		HARDENED_SUPPRESS_MMX="`use_enable mmx`"
-	elif use amd64; then
-		HARDENED_SUPPRESS_MMX="--enable-mmx"
-	fi
-
-	local myconf
-	use doc || myconf="${myconf} --disable-devel-docs"
-
-	# Hard enable SIMD assembler code for AMD64.
-	if use x86; then
-		myconf="${myconf} `use_enable sse`"
-	elif use amd64; then
-		myconf="${myconf} --enable-sse"
-	fi
-
-	econf \
-		--disable-default-binary \
-		--with-x \
-		"${HARDENED_SUPPRESS_MMX}" \
-		${myconf} \
-		`use_enable altivec` \
-		`use_enable doc gtk-doc` \
-		`use_enable python` \
-		`use_enable gimpprint print` \
-		`use_with png libpng` \
-		`use_with jpeg libjpeg` \
-		`use_with jpeg libexif` \
-		`use_with tiff libtiff` \
-		`use_with mng libmng` \
-		`use_with aalib aa` \
-		`use_enable debug` || die
-
-	# X isn't optional (#58003) atm
-	#	`use_with X x` \
-
-	emake || die
-
-	if use doc; then
-		cd ${S_HELP}
-		econf --without-gimp || die
-		emake || die
-	fi
-
-}
-
-src_install() {
-
-	# Workaround portage variable leakage
-	local AA=
-
-	# create these dirs to make the makefile installs these items correctly
-	dodir /usr/share/{applications,application-registry,mime-info}
-
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS README*
-
-	if use doc; then
-		cd ${S_HELP}
-		make DESTDIR=${D} install || die
-	fi
-
-	# Create the gimp-remote link, see bug #36648
-	dosym gimp-remote-2.2 /usr/bin/gimp-remote
-
-}
-
diff --git a/media-gfx/gimp/gimp-2.2.6.ebuild b/media-gfx/gimp/gimp-2.2.6.ebuild
deleted file mode 100644
index 3d26cbd7c244..000000000000
--- a/media-gfx/gimp/gimp-2.2.6.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.6.ebuild,v 1.4 2005/05/10 13:00:40 allanonjl Exp $
-
-inherit flag-o-matic libtool eutils
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="http://www.gimp.org/"
-LICENSE="GPL-2"
-
-P_HELP="gimp-help-2-0.7" #gimp-help-2-{version}
-S_HELP="$WORKDIR/${P_HELP}"
-SRC_URI="mirror://gimp/v2.2/${P}.tar.bz2
-	doc? ( mirror://gimp/help/testing/${P_HELP}.tar.gz )"
-
-SLOT="2"
-KEYWORDS="~x86 ~ppc ~hppa ~sparc ~amd64 ~mips ~ppc64 ~alpha ~ia64"
-#IUSE="X aalib altivec debug doc gimpprint jpeg mmx mng png python sse svg tiff wmf"
-IUSE="aalib altivec debug doc gtkhtml gimpprint jpeg mmx mng png python sse svg tiff wmf"
-
-# FIXME : some more things can be (local) USE flagged
-# a few options are detection only, fix them to switch
-
-#	X? ( virtual/x11 )"
-RDEPEND="virtual/x11
-	>=dev-libs/glib-2.4.5
-	>=x11-libs/gtk+-2.4.4
-	>=x11-libs/pango-1.4
-	>=media-libs/freetype-2.1.7
-	>=media-libs/fontconfig-2.2
-	>=media-libs/libart_lgpl-2.3.8-r1
-	sys-libs/zlib
-	dev-libs/libxml2
-	dev-libs/libxslt
-
-	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 )
-	mng? ( media-libs/libmng )
-
-	wmf? ( >=media-libs/libwmf-0.2.8.2 )
-	svg? ( >=gnome-base/librsvg-2.2 )
-
-	aalib?	( media-libs/aalib )
-	python?	( >=dev-lang/python-2.2
-		>=dev-python/pygtk-2 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.12.0
-	dev-util/intltool
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-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
-
-}
-
-src_compile() {
-
-	# Since 1.3.16, fixes linker problems when upgrading
-	elibtoolize
-
-	# Workaround portage variable leakage
-	local AA=
-
-	# only use mmx if hardened is not set
-	local USE_MMX=
-
-	replace-flags "-march=k6*" "-march=i586"
-
-	# gimp uses inline functions (plug-ins/common/grid.c) (#23078)
-	filter-flags "-fno-inline"
-
-	if use hardened; then
-		ewarn "hardened use flag suppressing mmx use flag"
-		HARDENED_SUPPRESS_MMX="--disable-mmx"
-	elif use x86; then
-		HARDENED_SUPPRESS_MMX="`use_enable mmx`"
-	elif use amd64; then
-		HARDENED_SUPPRESS_MMX="--enable-mmx"
-	fi
-
-	local myconf
-	use doc || myconf="${myconf} --disable-devel-docs"
-
-	# Hard enable SIMD assembler code for AMD64.
-	if use x86; then
-		myconf="${myconf} `use_enable sse`"
-	elif use amd64; then
-		myconf="${myconf} --enable-sse"
-	fi
-
-	econf \
-		--disable-default-binary \
-		--with-x \
-		"${HARDENED_SUPPRESS_MMX}" \
-		${myconf} \
-		`use_enable altivec` \
-		`use_enable doc gtk-doc` \
-		`use_enable python` \
-		`use_enable gimpprint print` \
-		`use_with png libpng` \
-		`use_with jpeg libjpeg` \
-		`use_with jpeg libexif` \
-		`use_with tiff libtiff` \
-		`use_with mng libmng` \
-		`use_with aalib aa` \
-		`use_enable debug` || die
-
-	# X isn't optional (#58003) atm
-	#	`use_with X x` \
-
-	emake || die
-
-	if use doc; then
-		cd ${S_HELP}
-		econf --without-gimp || die
-		emake || die
-	fi
-
-}
-
-src_install() {
-
-	# Workaround portage variable leakage
-	local AA=
-
-	# create these dirs to make the makefile installs these items correctly
-	dodir /usr/share/{applications,application-registry,mime-info}
-
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog* HACKING NEWS README*
-
-	if use doc; then
-		cd ${S_HELP}
-		make DESTDIR=${D} install || die
-	fi
-
-	# Create the gimp-remote link, see bug #36648
-	dosym gimp-remote-2.2 /usr/bin/gimp-remote
-
-}
-
diff --git a/media-gfx/gimp/gimp-2.2.8.ebuild b/media-gfx/gimp/gimp-2.2.8-r1.ebuild
index 2bf47c74c920..4cb61dc6c556 100644
--- a/media-gfx/gimp/gimp-2.2.8.ebuild
+++ b/media-gfx/gimp/gimp-2.2.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.8.ebuild,v 1.1 2005/06/28 23:35:34 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.8-r1.ebuild,v 1.1 2005/07/01 02:57:59 allanonjl Exp $
 
 inherit flag-o-matic libtool eutils fdo-mime alternatives
 
@@ -71,6 +71,9 @@ src_unpack() {
 	epatch ${FILESDIR}/ltmain_sh-1.5.0-fix-relink.patch
 	epatch ${FILESDIR}/${P}-configure-fix.patch
 
+	# fix for #97361
+	epatch ${FILESDIR}/gimp-2.2.8-restart-marker.patch
+
 	# fix for configure patch
 	aclocal
 	libtoolize --force --copy