Remove old version and unused patch.

Package-Manager: portage-2.1.2-r7

diff --git a/media-libs/imlib/Manifest b/media-libs/imlib/Manifest
index 374f3193480b4bd87dfdbd68190b27c2435613ba..5311ecc61bc80e1ac7ae94dac99c6fe61cc611f9 100644 (file)
--- a/media-libs/imlib/Manifest
+++ b/media-libs/imlib/Manifest
@@ -6,14 +6,6 @@ AUX imlib-1.9.14-m4.patch 436 RMD160 b6fb39be5db68e2bb4ef1ad8da53483538839bf6 SH
 MD5 8e77a50e166c6610a16692c5e35adfe9 files/imlib-1.9.14-m4.patch 436
 RMD160 b6fb39be5db68e2bb4ef1ad8da53483538839bf6 files/imlib-1.9.14-m4.patch 436
 SHA256 eb442e227dc20a5aa574cd1334c2e8d2062c54a4f0a45ad9418ea1e46091962f files/imlib-1.9.14-m4.patch 436
-AUX imlib-1.9.14-sec2.patch 13040 RMD160 432377938bd85f9974bff8f08aca6d93d310057c SHA1 ec1b47281c1a7fb21abe841f948ecc56ed13f310 SHA256 d67a7faa2dba8d361cf25b6fc8125c1da92f25b612bffe909daacdeda577dd57
-MD5 b273d36aa60adbfaacaf6062234e4c1f files/imlib-1.9.14-sec2.patch 13040
-RMD160 432377938bd85f9974bff8f08aca6d93d310057c files/imlib-1.9.14-sec2.patch 13040
-SHA256 d67a7faa2dba8d361cf25b6fc8125c1da92f25b612bffe909daacdeda577dd57 files/imlib-1.9.14-sec2.patch 13040
-AUX imlib-1.9.15-gdk_flag.patch 888 RMD160 9ea1c287e3b24b9b29262d416fe5aa2739c7a1a9 SHA1 fdaf24df0bb74515d0425f1f24c5b41fdb37b1bb SHA256 971e2971a23a627c389769b5c164bdd9d1bd3644e4ab1b1929982080a16e0dee
-MD5 2d810b6b736520a0b248a989e9195a9e files/imlib-1.9.15-gdk_flag.patch 888
-RMD160 9ea1c287e3b24b9b29262d416fe5aa2739c7a1a9 files/imlib-1.9.15-gdk_flag.patch 888
-SHA256 971e2971a23a627c389769b5c164bdd9d1bd3644e4ab1b1929982080a16e0dee files/imlib-1.9.15-gdk_flag.patch 888
 AUX imlib-1.9.15.patch 2253 RMD160 beb86753cc2024a9eb671acdc3886b7a5692b526 SHA1 29fb949680e5b2d95392b4c5efd1fdfa21f2df3d SHA256 43dd12dae7913475f968f35a4fa4b1ef4670451e58c712cbd6e5460f20fc9197
 MD5 8328ba4002a30764a848de8b9b70f158 files/imlib-1.9.15.patch 2253
 RMD160 beb86753cc2024a9eb671acdc3886b7a5692b526 files/imlib-1.9.15.patch 2253
@@ -32,10 +24,6 @@ EBUILD imlib-1.9.15-r1.ebuild 1388 RMD160 9694d2577920974c6a57bd2d00c0944f4dc30c
 MD5 cdbff0e0a0171d8c51a46645146b90cb imlib-1.9.15-r1.ebuild 1388
 RMD160 9694d2577920974c6a57bd2d00c0944f4dc30c79 imlib-1.9.15-r1.ebuild 1388
 SHA256 c2bc4ca3deee69dcc7ab450c9aa3faadd5de0c385010bcc0dfd05b0ce75d47dd imlib-1.9.15-r1.ebuild 1388
-EBUILD imlib-1.9.15.ebuild 1800 RMD160 6e1ef60b3ad6ffbfa83d9e676b5b9db1d7ef9e72 SHA1 9e9c406a06a465eba4cdad29e1c96b56e6042e7a SHA256 295183b7810ee8dd252e22fc6c7d9ebf2a898f9bd6add1654a04fd3d6fbcf10e
-MD5 eee2e020af96b3b5dfb189f91ea911c5 imlib-1.9.15.ebuild 1800
-RMD160 6e1ef60b3ad6ffbfa83d9e676b5b9db1d7ef9e72 imlib-1.9.15.ebuild 1800
-SHA256 295183b7810ee8dd252e22fc6c7d9ebf2a898f9bd6add1654a04fd3d6fbcf10e imlib-1.9.15.ebuild 1800
 MISC ChangeLog 6130 RMD160 0b54eea6e58c48d02c5f7dae0573b977f797af9c SHA1 5a011222f3a398c8564e35d04b9915c9cf547e60 SHA256 413281dc227318e2aba51a56dceb171b8220de0a2b706a1bfe11fc3988e15191
 MD5 55259af9d0bc31786651b68e7ee2afca ChangeLog 6130
 RMD160 0b54eea6e58c48d02c5f7dae0573b977f797af9c ChangeLog 6130
@@ -47,9 +35,6 @@ SHA256 b589c118502c8401bcc833956c80ac3cdb0e484a332e7509a332352721a9f8c6 metadata
 MD5 7d8943e4540b953388cc87b41ed392a1 files/digest-imlib-1.9.14-r3 241
 RMD160 3ed410a2157023b27faff6ca7c8256f15ebbb9dc files/digest-imlib-1.9.14-r3 241
 SHA256 428e5761ccd271e004869673db035c46d40c623d7d90f262911706b0d9888132 files/digest-imlib-1.9.14-r3 241
-MD5 3ca74ed1d09e760b3ba65e3ea3f0c88d files/digest-imlib-1.9.15 241
-RMD160 039218e55a8fed0fb8c45920058885c1d84c22df files/digest-imlib-1.9.15 241
-SHA256 79835fd763b99e818f64104e0bf5f475c9dc57a629506db65b9694b4eec1c997 files/digest-imlib-1.9.15 241
 MD5 3ca74ed1d09e760b3ba65e3ea3f0c88d files/digest-imlib-1.9.15-r1 241
 RMD160 039218e55a8fed0fb8c45920058885c1d84c22df files/digest-imlib-1.9.15-r1 241
 SHA256 79835fd763b99e818f64104e0bf5f475c9dc57a629506db65b9694b4eec1c997 files/digest-imlib-1.9.15-r1 241

diff --git a/media-libs/imlib/files/digest-imlib-1.9.15 b/media-libs/imlib/files/digest-imlib-1.9.15
deleted file mode 100644 (file)
index 52c816f..0000000
--- a/media-libs/imlib/files/digest-imlib-1.9.15
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7db987e6c52e4daf70d7d0f471238eae imlib-1.9.15.tar.bz2 683242
-RMD160 195b80833167134ba2d9a9574d420279f9cf55f4 imlib-1.9.15.tar.bz2 683242
-SHA256 4e6a270308a9ae16586bfc133c1a3dfb2e56f431edb66aaa3a80e36e5ed84ce0 imlib-1.9.15.tar.bz2 683242

diff --git a/media-libs/imlib/files/imlib-1.9.14-sec2.patch b/media-libs/imlib/files/imlib-1.9.14-sec2.patch
deleted file mode 100644 (file)
index c820270..0000000
--- a/media-libs/imlib/files/imlib-1.9.14-sec2.patch
+++ /dev/null
@@ -1,510 +0,0 @@
-diff -urN imlib-1.9.13.orig/Imlib/load.c imlib-1.9.13/Imlib/load.c
---- imlib-1.9.13.orig/Imlib/load.c     Wed Mar 13 19:06:29 2002
-+++ imlib-1.9.13/Imlib/load.c  Thu Sep 16 17:21:01 2004
-@@ -4,6 +4,8 @@
- #include "Imlib_private.h"
- #include <setjmp.h>
- 
-+#define G_MAXINT ((int) 0x7fffffff)
-+
- /*      Split the ID - damages input    */
- 
- static char        *
-@@ -41,13 +43,17 @@
- 
- /*
-  *     Make sure we don't wrap on our memory allocations
-+ *     we check G_MAXINT/4 because rend.c malloc's w * h * bpp
-+ *     + 3 is safety margin
-  */
- 
- void * _imlib_malloc_image(unsigned int w, unsigned int h)
- {
--       if( w > 32767 || h > 32767)
--               return NULL;
--       return malloc(w * h * 3);
-+       if (w <= 0 || w > 32767 ||
-+           h <= 0 || h > 32767 ||
-+           h >= (G_MAXINT/4 - 1) / w)
-+                return NULL;
-+       return malloc(w * h * 3 + 3);
- }
- 
- #ifdef HAVE_LIBJPEG
-@@ -360,7 +366,9 @@
-   npix = ww * hh;
-   *w = (int)ww;
-   *h = (int)hh;
--  if(ww > 32767 || hh > 32767)
-+  if (ww <= 0 || ww > 32767 ||
-+      hh <= 0 || hh > 32767 ||
-+      hh >= (G_MAXINT/sizeof(uint32)) / ww)
-     {
-        TIFFClose(tif);
-        return NULL;
-@@ -463,7 +471,7 @@
-           }
-         *w = gif->Image.Width;
-         *h = gif->Image.Height;
--        if (*h > 32767 || *w > 32767)
-+        if (*h <= 0 || *h > 32767 || *w <= 0 || *w > 32767)
-           {
-              return NULL;
-           }
-@@ -965,7 +973,12 @@
-   comment = 0;
-   quote = 0;
-   context = 0;
-+  memset(lookup, 0, sizeof(lookup));
-+
-   line = malloc(lsz);
-+  if (!line)
-+    return NULL;
-+
-   while (!done)
-     {
-       pc = c;
-@@ -994,25 +1007,25 @@
-               {
-                 /* Header */
-                 sscanf(line, "%i %i %i %i", w, h, &ncolors, &cpp);
--                  if (ncolors > 32766)
-+                  if (ncolors <= 0 || ncolors > 32766)
-                   {
-                     fprintf(stderr, "IMLIB ERROR: XPM files wth colors > 32766 not supported\n");
-                     free(line);
-                     return NULL;
-                   }
--                if (cpp > 5)
-+                if (cpp <= 0 || cpp > 5)
-                   {
-                     fprintf(stderr, "IMLIB ERROR: XPM files with characters per pixel > 5 not supported\n");
-                     free(line);
-                     return NULL;
-                   }
--                if (*w > 32767)
-+                if (*w <= 0 || *w > 32767)
-                   {
-                     fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for file\n");
-                     free(line);
-                     return NULL;
-                   }
--                if (*h > 32767)
-+                if (*h <= 0 || *h > 32767)
-                   {
-                     fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for file\n");
-                     free(line);
-@@ -1045,11 +1058,13 @@
-                   {
-                     int                 slen;
-                     int                 hascolor, iscolor;
-+                    int                 space;
- 
-                     iscolor = 0;
-                     hascolor = 0;
-                     tok[0] = 0;
-                     col[0] = 0;
-+                    space = sizeof(col) - 1;
-                     s[0] = 0;
-                     len = strlen(line);
-                     strncpy(cmap[j].str, line, cpp);
-@@ -1072,10 +1087,10 @@
-                               {
-                                 if (k >= len)
-                                   {
--                                    if (col[0])
--                                      strcat(col, " ");
--                                      if (strlen(col) + strlen(s) < sizeof(col))
--                                      strcat(col, s);
-+                                    if (col[0] && space > 0)
-+                                      strcat(col, " "), space -= 1;
-+                                      if (slen <= space)
-+                                      strcat(col, s), space -= slen;
-                                   }
-                                 if (col[0])
-                                   {
-@@ -1105,14 +1120,17 @@
-                                           }
-                                       }
-                                   }
--                                strcpy(tok, s);
-+                                if (slen < sizeof(tok));
-+                                  strcpy(tok, s);
-                                 col[0] = 0;
-+                                space = sizeof(col) - 1;
-                               }
-                             else
-                               {
--                                if (col[0])
--                                  strcat(col, " ");
--                                strcat(col, s);
-+                                if (col[0] && space > 0)
-+                                  strcat(col, " "), space -=1;
-+                                if (slen <= space)
-+                                  strcat(col, s), space -= slen;
-                               }
-                           }
-                       }
-@@ -1341,12 +1359,12 @@
-         sscanf(s, "%i %i", w, h);
-         a = *w;
-         b = *h;
--        if (a > 32767)
-+        if (a <= 0 || a > 32767)
-           {
-             fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for file\n");
-             return NULL;
-           }
--        if (b > 32767)
-+        if (b <= 0 || b > 32767)
-           {
-             fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for file\n");
-             return NULL;
-diff -urN imlib-1.9.13.orig/Imlib/utils.c imlib-1.9.13/Imlib/utils.c
---- imlib-1.9.13.orig/Imlib/utils.c    Mon Mar  4 17:45:28 2002
-+++ imlib-1.9.13/Imlib/utils.c Thu Sep 16 17:21:15 2004
-@@ -1496,36 +1496,56 @@
-   context = 0;
-   ptr = NULL;
-   end = NULL;
-+  memset(lookup, 0, sizeof(lookup));
- 
-   while (!done)
-     {
-       line = data[count++];
-+      if (!line)
-+      break;
-+      line = strdup(line);
-+      if (!line)
-+      break;
-+      len = strlen(line);
-+      for (i = 0; i < len; ++i)
-+      {
-+        c = line[i];
-+        if (c < 32)
-+          line[i] = 32;
-+        else if (c > 127)
-+          line[i] = 127;
-+      }
-+
-       if (context == 0)
-       {
-         /* Header */
-         sscanf(line, "%i %i %i %i", &w, &h, &ncolors, &cpp);
--        if (ncolors > 32766)
-+        if (ncolors <= 0 || ncolors > 32766)
-           {
-             fprintf(stderr, "IMLIB ERROR: XPM data wth colors > 32766 not supported\n");
-             free(im);
-+            free(line);
-             return NULL;
-           }
--        if (cpp > 5)
-+        if (cpp <= 0 || cpp > 5)
-           {
-             fprintf(stderr, "IMLIB ERROR: XPM data with characters per pixel > 5 not supported\n");
-             free(im);
-+            free(line);
-             return NULL;
-           }
--        if (w > 32767)
-+        if (w <= 0 || w > 32767)
-           {
-             fprintf(stderr, "IMLIB ERROR: Image width > 32767 pixels for data\n");
-             free(im);
-+            free(line);
-             return NULL;
-           }
--        if (h > 32767)
-+        if (h <= 0 || h > 32767)
-           {
-             fprintf(stderr, "IMLIB ERROR: Image height > 32767 pixels for data\n");
-             free(im);
-+            free(line);
-             return NULL;
-           }
-         cmap = malloc(sizeof(struct _cmap) * ncolors);
-@@ -1533,6 +1553,7 @@
-         if (!cmap)
-           {
-             free(im);
-+            free(line);
-             return NULL;
-           }
-         im->rgb_width = w;
-@@ -1542,6 +1563,7 @@
-           {
-             free(cmap);
-             free(im);
-+            free(line);
-             return NULL;
-           }
-         im->alpha_data = NULL;
-@@ -1817,6 +1839,7 @@
-       }
-       if ((ptr) && ((ptr - im->rgb_data) >= w * h * 3))
-       done = 1;
-+      free(line);
-     }
-   if (!transp)
-     {
-diff -urN imlib-1.9.13.orig/gdk_imlib/io-gif.c imlib-1.9.13/gdk_imlib/io-gif.c
---- imlib-1.9.13.orig/gdk_imlib/io-gif.c       Mon Mar  4 17:26:51 2002
-+++ imlib-1.9.13/gdk_imlib/io-gif.c    Thu Sep 16 16:11:31 2004
-@@ -55,7 +55,7 @@
-           }
-         *w = gif->Image.Width;
-         *h = gif->Image.Height;
--        if(*h > 32767 || *w > 32767)
-+        if(*h <= 0 || *h > 32767 || *w <= 0 || *w > 32767)
-           {
-             return NULL;
-           }
-diff -urN imlib-1.9.13.orig/gdk_imlib/io-ppm.c imlib-1.9.13/gdk_imlib/io-ppm.c
---- imlib-1.9.13.orig/gdk_imlib/io-ppm.c       Mon Mar  4 17:26:51 2002
-+++ imlib-1.9.13/gdk_imlib/io-ppm.c    Thu Sep 16 16:13:13 2004
-@@ -53,12 +53,12 @@
-         sscanf(s, "%i %i", w, h);
-         a = *w;
-         b = *h;
--        if (a > 32767)
-+        if (a <= 0 || a > 32767)
-           {
-             fprintf(stderr, "gdk_imlib ERROR: Image width > 32767 pixels for file\n");
-             return NULL;
-           }
--        if (b > 32767)
-+        if (b <= 0 || b > 32767)
-           {
-             fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for file\n");
-             return NULL;
-diff -urN imlib-1.9.13.orig/gdk_imlib/io-tiff.c imlib-1.9.13/gdk_imlib/io-tiff.c
---- imlib-1.9.13.orig/gdk_imlib/io-tiff.c      Mon Mar  4 17:26:51 2002
-+++ imlib-1.9.13/gdk_imlib/io-tiff.c   Thu Sep 16 16:13:57 2004
-@@ -36,7 +36,9 @@
-   npix = ww * hh;
-   *w = (int)ww;
-   *h = (int)hh;
--  if(ww > 32767 || hh > 32767)
-+  if (ww <= 0 || ww > 32767 ||
-+      hh <= 0 || hh > 32767 ||
-+      hh >= (G_MAXINT/sizeof(uint32)) / ww)
-     {
-       TIFFClose(tif);
-       return NULL;
-diff -urN imlib-1.9.13.orig/gdk_imlib/io-xpm.c imlib-1.9.13/gdk_imlib/io-xpm.c
---- imlib-1.9.13.orig/gdk_imlib/io-xpm.c       Mon Mar  4 17:26:51 2002
-+++ imlib-1.9.13/gdk_imlib/io-xpm.c    Thu Sep 16 17:08:24 2004
-@@ -40,8 +40,12 @@
-   context = 0;
-   i = j = 0;
-   cmap = NULL;
-+  memset(lookup, 0, sizeof(lookup));
- 
-   line = malloc(lsz);
-+  if (!line)
-+    return NULL;
-+
-   while (!done)
-     {
-       pc = c;
-@@ -70,25 +74,25 @@
-               {
-                 /* Header */
-                 sscanf(line, "%i %i %i %i", w, h, &ncolors, &cpp);
--                if (ncolors > 32766)
-+                if (ncolors <= 0 || ncolors > 32766)
-                   {
-                     fprintf(stderr, "gdk_imlib ERROR: XPM files wth colors > 32766 not supported\n");
-                     free(line);
-                     return NULL;
-                   }
--                if (cpp > 5)
-+                if (cpp <= 0 || cpp > 5)
-                   {
-                     fprintf(stderr, "gdk_imlib ERROR: XPM files with characters per pixel > 5 not supported\n");
-                     free(line);
-                     return NULL;
-                   }
--                if (*w > 32767)
-+                if (*w <= 0 || *w > 32767)
-                   {
-                     fprintf(stderr, "gdk_imlib ERROR: Image width > 32767 pixels for file\n");
-                     free(line);
-                     return NULL;
-                   }
--                if (*h > 32767)
-+                if (*h <= 0 || *h > 32767)
-                   {
-                     fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for file\n");
-                     free(line);
-@@ -120,11 +124,13 @@
-                   {
-                     int                 slen;
-                     int                 hascolor, iscolor;
-+                    int                 space;
- 
-                     hascolor = 0;
-                     iscolor = 0;
-                     tok[0] = 0;
-                     col[0] = 0;
-+                    space = sizeof(col) - 1;
-                     s[0] = 0;
-                     len = strlen(line);
-                     strncpy(cmap[j].str, line, cpp);
-@@ -147,10 +153,10 @@
-                               {
-                                 if (k >= len)
-                                   {
--                                    if (col[0])
--                                      strcat(col, " ");
--                                    if (strlen(col) + strlen(s) < sizeof(col))
--                                      strcat(col, s);
-+                                    if (col[0] && space > 0)
-+                                      strncat(col, " ", space), space -= 1;
-+                                    if (slen <= space)
-+                                      strcat(col, s), space -= slen;
-                                   }
-                                 if (col[0])
-                                   {
-@@ -180,14 +186,17 @@
-                                           }
-                                       }
-                                   }
--                                strcpy(tok, s);
-+                                if (slen < sizeof(tok))
-+                                  strcpy(tok, s);
-                                 col[0] = 0;
-+                                space = sizeof(col) - 1;
-                               }
-                             else
-                               {
--                                if (col[0])
--                                  strcat(col, " ");
--                                strcat(col, s);
-+                                if (col[0] && space > 0)
-+                                  strcat(col, " "), space -= 1;
-+                                if (slen <= space)
-+                                  strcat(col, s), space -= slen;
-                               }
-                           }
-                       }
-diff -urN imlib-1.9.13.orig/gdk_imlib/misc.c imlib-1.9.13/gdk_imlib/misc.c
---- imlib-1.9.13.orig/gdk_imlib/misc.c Mon Mar  4 17:26:51 2002
-+++ imlib-1.9.13/gdk_imlib/misc.c      Thu Sep 16 16:35:32 2004
-@@ -1355,11 +1355,16 @@
- 
- /*
-  *    Make sure we don't wrap on our memory allocations
-+ *    we check G_MAX_INT/4 because rend.c malloc's w * h * bpp
-+ *    + 3 is safety margin
-  */
- 
- void *_gdk_malloc_image(unsigned int w, unsigned int h)
- {
--      if( w > 32767 || h > 32767)
-+      if (w <= 0 || w > 32767 ||
-+          h <= 0 || h > 32767 ||
-+          h >= (G_MAXINT/4 - 1) / w)
-               return NULL;
--      return malloc(w * h * 3);
-+      return malloc(w * h * 3 + 3);
- }
-+
-diff -urN imlib-1.9.13.orig/gdk_imlib/utils.c imlib-1.9.13/gdk_imlib/utils.c
---- imlib-1.9.13.orig/gdk_imlib/utils.c        Mon Mar  4 17:26:51 2002
-+++ imlib-1.9.13/gdk_imlib/utils.c     Thu Sep 16 17:28:35 2004
-@@ -1236,36 +1236,56 @@
-   context = 0;
-   ptr = NULL;
-   end = NULL;
-+  memset(lookup, 0, sizeof(lookup));
- 
-   while (!done)
-     {
-       line = data[count++];
-+      if (!line)
-+      break;
-+      line = strdup(line);
-+      if (!line)
-+      break;
-+      len = strlen(line);
-+      for (i = 0; i < len; ++i)
-+        {
-+        c = line[i];
-+        if (c < 32)
-+          line[i] = 32;
-+        else if (c > 127)
-+          line[i] = 127;
-+      }
-+
-       if (context == 0)
-       {
-         /* Header */
-         sscanf(line, "%i %i %i %i", &w, &h, &ncolors, &cpp);
--        if (ncolors > 32766)
-+        if (ncolors <= 0 || ncolors > 32766)
-           {
-             fprintf(stderr, "gdk_imlib ERROR: XPM data wth colors > 32766 not supported\n");
-             free(im);
-+            free(line);
-             return NULL;
-           }
--        if (cpp > 5)
-+        if (cpp <= 0 || cpp > 5)
-           {
-             fprintf(stderr, "gdk_imlib ERROR: XPM data with characters per pixel > 5 not supported\n");
-             free(im);
-+            free(line);
-             return NULL;
-           }
--        if (w > 32767)
-+        if (w <= 0 || w > 32767)
-           {
-             fprintf(stderr, "gdk_imlib ERROR: Image width > 32767 pixels for data\n");
-             free(im);
-+            free(line);
-             return NULL;
-           }
--        if (h > 32767)
-+        if (h <= 0 || h > 32767)
-           {
-             fprintf(stderr, "gdk_imlib ERROR: Image height > 32767 pixels for data\n");
-             free(im);
-+            free(line);
-             return NULL;
-           }
-         cmap = malloc(sizeof(struct _cmap) * ncolors);
-@@ -1273,6 +1293,7 @@
-         if (!cmap)
-           {
-             free(im);
-+            free(line);
-             return NULL;
-           }
-         im->rgb_width = w;
-@@ -1282,6 +1303,7 @@
-           {
-             free(cmap);
-             free(im);
-+            free(line);
-             return NULL;
-           }
-         im->alpha_data = NULL;
-@@ -1355,7 +1377,7 @@
-                                 strcpy(col + colptr, " ");
-                                 colptr++;
-                               }
--                            if (colptr + ls <= sizeof(col))
-+                            if (colptr + ls < sizeof(col))
-                               {
-                                 strcpy(col + colptr, s);
-                                 colptr += ls;
-@@ -1558,6 +1580,7 @@
-       }
-       if ((ptr) && ((ptr - im->rgb_data) >= w * h * 3))
-       done = 1;
-+      free(line);
-     }
-   if (!transp)
-     {

diff --git a/media-libs/imlib/files/imlib-1.9.15-gdk_flag.patch b/media-libs/imlib/files/imlib-1.9.15-gdk_flag.patch
deleted file mode 100644 (file)
index 8ca134f..0000000
--- a/media-libs/imlib/files/imlib-1.9.15-gdk_flag.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.in.old   2004-08-26 15:19:09.404502200 +0200
-+++ configure.in       2004-08-26 15:40:08.283123560 +0200
-@@ -17,11 +17,26 @@
- dnl incase it is broken for example.
- AC_ARG_ENABLE(shm, [  --enable-shm            support shared memory if available [default=yes]], echo $enable_shm, enable_shm="yes")
- 
-+AC_ARG_ENABLE(gdk, [  --enable-gdk            enable gdk_imlib compilation [default=yes]],[
-+  if test x$enableval = xyes; then
-+    disable_gdk="no"
-+  else
-+    disable_gdk="yes"
-+  fi],disable_gdk=no)
-+
-+if test x$disable_gdk = xno; then
-+ AC_MSG_RESULT(no)
-+
- AM_PATH_GTK(1.2.1,[
-   GDK_IMLIB="gdk_imlib utils"],[
-   GDK_IMLIB="" 
-   AC_MSG_WARN([*** gdk_imlib will not be built ***])])
- 
-+else
-+  AC_MSG_RESULT(yes)
-+  GDK_IMLIB=""
-+fi
-+
- AC_MSG_CHECKING(whether to build gmodulized imlib)
- 
- AC_ARG_ENABLE(modules, [  --disable-modules       Disables dynamic module loading],[

diff --git a/media-libs/imlib/imlib-1.9.15.ebuild b/media-libs/imlib/imlib-1.9.15.ebuild
deleted file mode 100644 (file)
index 3be603e..0000000
--- a/media-libs/imlib/imlib-1.9.15.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/imlib-1.9.15.ebuild,v 1.4 2006/07/05 05:27:40 vapier Exp $
-
-inherit eutils gnome.org libtool
-
-DESCRIPTION="Image loading and rendering library"
-HOMEPAGE="http://www.enlightenment.org/Libraries/Imlib.html"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="gtk static"
-
-RDEPEND="gtk? ( =x11-libs/gtk+-1.2* )
-       >=media-libs/tiff-3.5.5
-       >=media-libs/giflib-4.1.0
-       >=media-libs/libpng-1.2.1
-       >=media-libs/jpeg-6b"
-DEPEND="${RDEPEND}
-       sys-devel/autoconf
-       sys-devel/automake"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       # fix config script #3425
-       sed -i \
-               -e "49,51D" \
-               -e "55,57D" \
-               imlib-config.in
-
-       #Security fix for bug #72681
-       epatch "${FILESDIR}"/${PN}-1.9.14-sec2.patch
-       # shutup aclocal
-       epatch "${FILESDIR}"/${PN}-1.9.14-m4.patch
-       # Add configure switch to enable/disable Gdk functions. See bug #40453.
-       epatch "${FILESDIR}"/${P}-gdk_flag.patch
-
-       autoconf || die "autoconf failed"
-       automake || die "automake failed"
-
-       elibtoolize
-}
-
-src_compile() {
-       econf \
-               --sysconfdir=/etc/imlib \
-               $(use_enable static) \
-               $(use_enable gtk gdk) \
-               $(use_enable gtk gtktest) \
-               || die
-       emake || die
-}
-
-src_install() {
-       einstall \
-               includedir="${D}"/usr/include \
-               sysconfdir="${D}"/etc/imlib \
-               || die
-
-       dodoc AUTHORS ChangeLog README NEWS
-       dohtml -r doc
-}
-
-pkg_postinst() {
-       if ! use gtk; then
-               ewarn "You have installed Imlib without support for Gdk. This may"
-               ewarn "cause problems with packages that depend on the libgdk_imlib"
-               ewarn "library. To install the complete set of Imlib libraries, please"
-               ewarn "emerge it again with the 'gtk' USE flag enabled."
-       fi
-}