old

(Portage version: 2.0.51.21-r1)

7 files changed, 0 insertions, 573 deletions

diff --git a/media-libs/libpng/files/digest-libpng-1.2.7 b/media-libs/libpng/files/digest-libpng-1.2.7
deleted file mode 100644
index c0b13966cdce..000000000000
--- a/media-libs/libpng/files/digest-libpng-1.2.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 21030102f99f81c37276403e5956d198 libpng-1.2.7.tar.bz2 379504
diff --git a/media-libs/libpng/files/digest-libpng-1.2.7-r1 b/media-libs/libpng/files/digest-libpng-1.2.7-r1
deleted file mode 100644
index c0b13966cdce..000000000000
--- a/media-libs/libpng/files/digest-libpng-1.2.7-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 21030102f99f81c37276403e5956d198 libpng-1.2.7.tar.bz2 379504
diff --git a/media-libs/libpng/files/libpng-1.2.5-gentoo.diff b/media-libs/libpng/files/libpng-1.2.5-gentoo.diff
deleted file mode 100644
index 4104e86568b5..000000000000
--- a/media-libs/libpng/files/libpng-1.2.5-gentoo.diff
+++ /dev/null
@@ -1,93 +0,0 @@
---- libpng-1.2.5.orig/pngconf.h	2002-10-03 13:32:27.000000000 +0200
-+++ libpng-1.2.5/pngconf.h	2004-04-28 13:40:03.617656368 +0200
-@@ -252,8 +252,8 @@
- #      undef _BSD_SOURCE
- #    endif
- #    ifdef _SETJMP_H
--      __png.h__ already includes setjmp.h;
--      __dont__ include it again.;
-+#warning      __png.h__ already includes setjmp.h;
-+#warning      __dont__ include it again.;
- #    endif
- #  endif /* __linux__ */
- 
---- libpng3-1.2.5.orig/pngrtran.c
-+++ libpng3-1.2.5/pngrtran.c
-@@ -1889,8 +1889,8 @@
-          /* This changes the data from GG to GGXX */
-          if (flags & PNG_FLAG_FILLER_AFTER)
-          {
--            png_bytep sp = row + (png_size_t)row_width;
--            png_bytep dp = sp  + (png_size_t)row_width;
-+            png_bytep sp = row + (png_size_t)row_width * 2;
-+            png_bytep dp = sp  + (png_size_t)row_width * 2;
-             for (i = 1; i < row_width; i++)
-             {
-                *(--dp) = hi_filler;
-@@ -1907,8 +1907,8 @@
-          /* This changes the data from GG to XXGG */
-          else
-          {
--            png_bytep sp = row + (png_size_t)row_width;
--            png_bytep dp = sp  + (png_size_t)row_width;
-+            png_bytep sp = row + (png_size_t)row_width * 2;
-+            png_bytep dp = sp  + (png_size_t)row_width * 2;
-             for (i = 0; i < row_width; i++)
-             {
-                *(--dp) = *(--sp);
-@@ -1930,7 +1930,7 @@
-          if (flags & PNG_FLAG_FILLER_AFTER)
-          {
-             png_bytep sp = row + (png_size_t)row_width * 3;
--            png_bytep dp = sp  + (png_size_t)row_width;
-+            png_bytep dp = sp  + (png_size_t)row_width ;
-             for (i = 1; i < row_width; i++)
-             {
-                *(--dp) = lo_filler;
-@@ -1947,7 +1947,7 @@
-          else
-          {
-             png_bytep sp = row + (png_size_t)row_width * 3;
--            png_bytep dp = sp + (png_size_t)row_width;
-+            png_bytep dp = sp + (png_size_t)row_width ;
-             for (i = 0; i < row_width; i++)
-             {
-                *(--dp) = *(--sp);
-@@ -1965,8 +1965,8 @@
-          /* This changes the data from RRGGBB to RRGGBBXX */
-          if (flags & PNG_FLAG_FILLER_AFTER)
-          {
--            png_bytep sp = row + (png_size_t)row_width * 3;
--            png_bytep dp = sp  + (png_size_t)row_width;
-+            png_bytep sp = row + (png_size_t)row_width * 6;
-+            png_bytep dp = sp  + (png_size_t)row_width * 2;
-             for (i = 1; i < row_width; i++)
-             {
-                *(--dp) = hi_filler;
-@@ -1987,8 +1987,8 @@
-          /* This changes the data from RRGGBB to XXRRGGBB */
-          else
-          {
--            png_bytep sp = row + (png_size_t)row_width * 3;
--            png_bytep dp = sp  + (png_size_t)row_width;
-+            png_bytep sp = row + (png_size_t)row_width * 6;
-+            png_bytep dp = sp  + (png_size_t)row_width * 2;
-             for (i = 0; i < row_width; i++)
-             {
-                *(--dp) = *(--sp);
---- libpng3-1.2.5.orig/pngerror.c       2002-10-03 05:32:27.000000000 -0600
-+++ libpng3-1.2.5/pngerror.c     2004-04-29 09:26:18.000000000 -0600
-@@ -135,10 +135,12 @@
-       buffer[iout] = 0;
-    else
-    {
-+      png_size_t len = strnlen(error_message, 63);
-+
-       buffer[iout++] = ':';
-       buffer[iout++] = ' ';
--      png_memcpy(buffer+iout, error_message, 64);
--      buffer[iout+63] = 0;
-+      png_memcpy(buffer+iout, error_message, len);
-+      buffer[iout+len] = 0;
-    }
- }
diff --git a/media-libs/libpng/files/libpng-1.2.5-security.diff b/media-libs/libpng/files/libpng-1.2.5-security.diff
deleted file mode 100644
index 3cc329bc8cfa..000000000000
--- a/media-libs/libpng/files/libpng-1.2.5-security.diff
+++ /dev/null
@@ -1,269 +0,0 @@
-diff -r -U 3 libpng-1.2.5/png.h libpng-1.2.5p/png.h
---- libpng-1.2.5/png.h	Thu Oct  3 06:32:26 2002
-+++ libpng-1.2.5p/png.h	Tue Aug  3 21:45:21 2004
-@@ -833,7 +833,11 @@
- typedef png_info FAR * FAR * png_infopp;
- 
- /* Maximum positive integer used in PNG is (2^31)-1 */
--#define PNG_MAX_UINT ((png_uint_32)0x7fffffffL)
-+#define PNG_UINT_31_MAX ((png_uint_32)0x7fffffffL)
-+#define PNG_UINT_32_MAX (~((png_uint_32)0))
-+#define PNG_SIZE_MAX (~((png_size_t)0))
-+/* PNG_MAX_UINT is deprecated; use PNG_UINT_31_MAX instead. */
-+#define PNG_MAX_UINT PNG_UINT_31_MAX
- 
- /* These describe the color_type field in png_info. */
- /* color type masks */
-@@ -2655,6 +2659,8 @@
- PNG_EXTERN png_uint_32 png_get_uint_32 PNGARG((png_bytep buf));
- PNG_EXTERN png_uint_16 png_get_uint_16 PNGARG((png_bytep buf));
- #endif /* !PNG_READ_BIG_ENDIAN_SUPPORTED */
-+PNG_EXTERN png_uint_32 png_get_uint_31 PNGARG((png_structp png_ptr,
-+  png_bytep buf));
- 
- /* Initialize png_ptr struct for reading, and allocate any other memory.
-  * (old interface - DEPRECATED - use png_create_read_struct instead).
-diff -r -U 3 libpng-1.2.5/pngconf.h libpng-1.2.5p/pngconf.h
---- libpng-1.2.5/pngconf.h	Thu Oct  3 06:32:27 2002
-+++ libpng-1.2.5p/pngconf.h	Tue Aug  3 21:45:29 2004
-@@ -663,6 +663,13 @@
- #endif
- #endif /* PNG_1_0_X */
- 
-+#ifndef PNG_USER_WIDTH_MAX
-+#  define PNG_USER_WIDTH_MAX 1000000L
-+#endif
-+#ifndef PNG_USER_HEIGHT_MAX
-+#  define PNG_USER_HEIGHT_MAX 1000000L
-+#endif
-+
- /* These are currently experimental features, define them if you want */
- 
- /* very little testing */
-@@ -1280,6 +1287,7 @@
- #  define CVT_PTR(ptr) (png_far_to_near(png_ptr,ptr,CHECK))
- #  define CVT_PTR_NOCHECK(ptr) (png_far_to_near(png_ptr,ptr,NOCHECK))
- #  define png_strcpy _fstrcpy
-+#  define png_strncpy _fstrncpy    /* Added to v 1.2.6 */
- #  define png_strlen _fstrlen
- #  define png_memcmp _fmemcmp      /* SJT: added */
- #  define png_memcpy _fmemcpy
-@@ -1288,6 +1296,7 @@
- #  define CVT_PTR(ptr)         (ptr)
- #  define CVT_PTR_NOCHECK(ptr) (ptr)
- #  define png_strcpy strcpy
-+#  define png_strncpy strncpy   /* Added to v 1.2.6 */
- #  define png_strlen strlen
- #  define png_memcmp memcmp     /* SJT: added */
- #  define png_memcpy memcpy
-diff -r -U 3 libpng-1.2.5/pngpread.c libpng-1.2.5p/pngpread.c
---- libpng-1.2.5/pngpread.c	Thu Oct  3 06:32:28 2002
-+++ libpng-1.2.5p/pngpread.c	Tue Aug  3 21:45:22 2004
-@@ -208,7 +208,7 @@
-       }
- 
-       png_push_fill_buffer(png_ptr, chunk_length, 4);
--      png_ptr->push_length = png_get_uint_32(chunk_length);
-+      png_ptr->push_length = png_get_uint_31(png_ptr,chunk_length);
-       png_reset_crc(png_ptr);
-       png_crc_read(png_ptr, png_ptr->chunk_name, 4);
-       png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
-@@ -591,6 +591,11 @@
-       png_size_t new_max;
-       png_bytep old_buffer;
- 
-+      if (png_ptr->save_buffer_size > PNG_SIZE_MAX - 
-+         (png_ptr->current_buffer_size + 256))
-+      {
-+        png_error(png_ptr, "Potential overflow of save_buffer");
-+      }
-       new_max = png_ptr->save_buffer_size + png_ptr->current_buffer_size + 256;
-       old_buffer = png_ptr->save_buffer;
-       png_ptr->save_buffer = (png_bytep)png_malloc(png_ptr,
-@@ -637,8 +642,7 @@
-       }
- 
-       png_push_fill_buffer(png_ptr, chunk_length, 4);
--      png_ptr->push_length = png_get_uint_32(chunk_length);
--
-+      png_ptr->push_length = png_get_uint_31(png_ptr,chunk_length);
-       png_reset_crc(png_ptr);
-       png_crc_read(png_ptr, png_ptr->chunk_name, 4);
-       png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
-diff -r -U 3 libpng-1.2.5/pngread.c libpng-1.2.5p/pngread.c
---- libpng-1.2.5/pngread.c	Thu Oct  3 06:32:29 2002
-+++ libpng-1.2.5p/pngread.c	Tue Aug  3 21:45:22 2004
-@@ -384,7 +384,7 @@
-       png_uint_32 length;
- 
-       png_read_data(png_ptr, chunk_length, 4);
--      length = png_get_uint_32(chunk_length);
-+      length = png_get_uint_31(png_ptr,chunk_length);
- 
-       png_reset_crc(png_ptr);
-       png_crc_read(png_ptr, png_ptr->chunk_name, 4);
-@@ -392,9 +392,6 @@
-       png_debug2(0, "Reading %s chunk, length=%lu.\n", png_ptr->chunk_name,
-          length);
- 
--      if (length > PNG_MAX_UINT)
--         png_error(png_ptr, "Invalid chunk length.");
--
-       /* This should be a binary subdivision search or a hash for
-        * matching the chunk name rather than a linear search.
-        */
-@@ -673,10 +670,7 @@
-             png_crc_finish(png_ptr, 0);
- 
-             png_read_data(png_ptr, chunk_length, 4);
--            png_ptr->idat_size = png_get_uint_32(chunk_length);
--
--            if (png_ptr->idat_size > PNG_MAX_UINT)
--              png_error(png_ptr, "Invalid chunk length.");
-+            png_ptr->idat_size = png_get_uint_31(png_ptr,chunk_length);
- 
-             png_reset_crc(png_ptr);
-             png_crc_read(png_ptr, png_ptr->chunk_name, 4);
-@@ -946,16 +940,13 @@
- #endif /* PNG_GLOBAL_ARRAYS */
- 
-       png_read_data(png_ptr, chunk_length, 4);
--      length = png_get_uint_32(chunk_length);
-+      length = png_get_uint_31(png_ptr,chunk_length);
- 
-       png_reset_crc(png_ptr);
-       png_crc_read(png_ptr, png_ptr->chunk_name, 4);
- 
-       png_debug1(0, "Reading %s chunk.\n", png_ptr->chunk_name);
- 
--      if (length > PNG_MAX_UINT)
--         png_error(png_ptr, "Invalid chunk length.");
--
-       if (!png_memcmp(png_ptr->chunk_name, png_IHDR, 4))
-          png_handle_IHDR(png_ptr, info_ptr, length);
-       else if (!png_memcmp(png_ptr->chunk_name, png_IEND, 4))
-@@ -1298,6 +1289,9 @@
-     * PNG file before the first IDAT (image data chunk).
-     */
-    png_read_info(png_ptr, info_ptr);
-+
-+   if (info_ptr->height > PNG_UINT_32_MAX/sizeof(png_bytep))
-+      png_error(png_ptr,"Image is too high to process with png_read_png()");
- 
-    /* -------------- image transformations start here ------------------- */
- 
-diff -r -U 3 libpng-1.2.5/pngrutil.c libpng-1.2.5p/pngrutil.c
---- libpng-1.2.5/pngrutil.c	Thu Oct  3 06:32:30 2002
-+++ libpng-1.2.5p/pngrutil.c	Tue Aug  3 21:45:22 2004
-@@ -38,6 +38,14 @@
- #  endif
- #endif
- 
-+png_uint_32 /* PRIVATE */
-+png_get_uint_31(png_structp png_ptr, png_bytep buf)
-+{
-+   png_uint_32 i = png_get_uint_32(buf);
-+   if (i > PNG_UINT_31_MAX)
-+     png_error(png_ptr, "PNG unsigned integer out of range.\n");
-+   return (i);
-+}
- #ifndef PNG_READ_BIG_ENDIAN_SUPPORTED
- /* Grab an unsigned 32-bit integer from a buffer in big-endian format. */
- png_uint_32 /* PRIVATE */
-@@ -579,7 +587,7 @@
-       /* Should be an error, but we can cope with it */
-       png_warning(png_ptr, "Out of place gAMA chunk");
- 
--   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
-+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_gAMA)
- #if defined(PNG_READ_sRGB_SUPPORTED)
-       && !(info_ptr->valid & PNG_INFO_sRGB)
- #endif
-@@ -660,7 +668,7 @@
-       /* Should be an error, but we can cope with it */
-       png_warning(png_ptr, "Out of place sBIT chunk");
-    }
--   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT))
-+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT))
-    {
-       png_warning(png_ptr, "Duplicate sBIT chunk");
-       png_crc_finish(png_ptr, length);
-@@ -729,7 +737,7 @@
-       /* Should be an error, but we can cope with it */
-       png_warning(png_ptr, "Missing PLTE before cHRM");
- 
--   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM)
-+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_cHRM)
- #if defined(PNG_READ_sRGB_SUPPORTED)
-       && !(info_ptr->valid & PNG_INFO_sRGB)
- #endif
-@@ -891,7 +899,7 @@
-       /* Should be an error, but we can cope with it */
-       png_warning(png_ptr, "Out of place sRGB chunk");
- 
--   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB))
-+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB))
-    {
-       png_warning(png_ptr, "Duplicate sRGB chunk");
-       png_crc_finish(png_ptr, length);
-@@ -977,8 +985,7 @@
-    png_bytep pC;
-    png_charp profile;
-    png_uint_32 skip = 0;
--   png_uint_32 profile_size = 0;
--   png_uint_32 profile_length = 0;
-+   png_uint_32 profile_size, profile_length;
-    png_size_t slength, prefix_length, data_length;
- 
-    png_debug(1, "in png_handle_iCCP\n");
-@@ -995,7 +1002,7 @@
-       /* Should be an error, but we can cope with it */
-       png_warning(png_ptr, "Out of place iCCP chunk");
- 
--   else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_iCCP))
-+   if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_iCCP))
-    {
-       png_warning(png_ptr, "Duplicate iCCP chunk");
-       png_crc_finish(png_ptr, length);
-@@ -1154,8 +1161,18 @@
-    }
- 
-    new_palette.nentries = data_length / entry_size;
--   new_palette.entries = (png_sPLT_entryp)png_malloc(
-+   if (new_palette.nentries > PNG_SIZE_MAX / sizeof(png_sPLT_entry))
-+   {
-+       png_warning(png_ptr, "sPLT chunk too long");
-+       return;
-+   }
-+   new_palette.entries = (png_sPLT_entryp)png_malloc_warn(
-        png_ptr, new_palette.nentries * sizeof(png_sPLT_entry));
-+   if (new_palette.entries == NULL)
-+   {
-+       png_warning(png_ptr, "sPLT chunk requires too much memory");
-+       return;
-+   }
- 
- #ifndef PNG_NO_POINTER_INDEXING
-    for (i = 0; i < new_palette.nentries; i++)
-@@ -1241,7 +1258,8 @@
-          /* Should be an error, but we can cope with it */
-          png_warning(png_ptr, "Missing PLTE before tRNS");
-       }
--      else if (length > (png_uint_32)png_ptr->num_palette)
-+      if (length > (png_uint_32)png_ptr->num_palette ||
-+          length > PNG_MAX_PALETTE_LENGTH)
-       {
-          png_warning(png_ptr, "Incorrect tRNS chunk length");
-          png_crc_finish(png_ptr, length);
-diff -r -U 3 libpng-1.2.5/pngset.c libpng-1.2.5p/pngset.c
---- libpng-1.2.5/pngset.c	Thu Oct  3 06:32:30 2002
-+++ libpng-1.2.5p/pngset.c	Tue Aug  3 21:45:29 2004
-@@ -253,6 +253,8 @@
-       png_error(png_ptr, "Image width or height is zero in IHDR");
-    if (width > PNG_MAX_UINT || height > PNG_MAX_UINT)
-       png_error(png_ptr, "Invalid image size in IHDR");
-+   if (width > PNG_USER_WIDTH_MAX || height > PNG_USER_HEIGHT_MAX)
-+      png_error(png_ptr, "image size exceeds user limits in IHDR");
- 
-    /* check other values */
-    if (bit_depth != 1 && bit_depth != 2 && bit_depth != 4 &&
diff --git a/media-libs/libpng/files/libpng-1.2.7-png_do_strip_filler.diff b/media-libs/libpng/files/libpng-1.2.7-png_do_strip_filler.diff
deleted file mode 100644
index 34906e98bfab..000000000000
--- a/media-libs/libpng/files/libpng-1.2.7-png_do_strip_filler.diff
+++ /dev/null
@@ -1,76 +0,0 @@
---- libpng-1.2.7.orig/png.h  2004-09-12 11:19:30.000000000 +0900
-+++ libpng-1.2.7/png.h     2004-11-13 13:04:49.000000000 +0900
-@@ -3090,7 +3092,7 @@
- #if defined(PNG_WRITE_FILLER_SUPPORTED) || \
-     defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
- PNG_EXTERN void png_do_strip_filler PNGARG((png_row_infop row_info,
--   png_bytep row, png_uint_32 flags));
-+   png_bytep row, png_uint_32 flags, png_uint_32 transformations));
- #endif
- 
- #if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED)
---- libpng-1.2.7.orig/pngrtran.c     2004-09-12 11:19:31.000000000 +0900
-+++ libpng-1.2.7/pngrtran.c        2004-11-13 13:04:50.000000000 +0900
-@@ -1211,7 +1211,7 @@
- #if defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
-    if (png_ptr->transformations & PNG_STRIP_ALPHA)
-       png_do_strip_filler(&(png_ptr->row_info), png_ptr->row_buf + 1,
--         PNG_FLAG_FILLER_AFTER);
-+         PNG_FLAG_FILLER_AFTER,png_ptr->transformations);
- #endif
- 
- #if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
---- libpng-1.2.7.orig/pngtrans.c     2004-09-12 11:19:31.000000000 +0900
-+++ libpng-1.2.7/pngtrans.c        2004-11-13 13:04:50.000000000 +0900
-@@ -380,7 +380,8 @@
-     defined(PNG_READ_STRIP_ALPHA_SUPPORTED)
- /* remove filler or alpha byte(s) */
- void /* PRIVATE */
--png_do_strip_filler(png_row_infop row_info, png_bytep row, png_uint_32 flags)
-+png_do_strip_filler(png_row_infop row_info, png_bytep row, png_uint_32 flags,
-+  png_uint_32 transformations)
- {
-    png_debug(1, "in png_do_strip_filler\n");
- #if defined(PNG_USELESS_TESTS_SUPPORTED)
-@@ -392,7 +393,9 @@
-       png_uint_32 row_width=row_info->width;
-       png_uint_32 i;
- 
--      if (row_info->color_type == PNG_COLOR_TYPE_RGB &&
-+      if ((row_info->color_type == PNG_COLOR_TYPE_RGB ||
-+         (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA &&
-+         (transformations & PNG_STRIP_ALPHA))) &&
-          row_info->channels == 4)
-       {
-          if (row_info->bit_depth == 8)
-@@ -471,7 +474,9 @@
-          }
-          row_info->channels = 3;
-       }
--      else if (row_info->color_type == PNG_COLOR_TYPE_GRAY &&
-+      else if ((row_info->color_type == PNG_COLOR_TYPE_GRAY ||
-+         (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA &&
-+         (transformations & PNG_STRIP_ALPHA))) &&
-           row_info->channels == 2)
-       {
-          if (row_info->bit_depth == 8)
-@@ -525,6 +530,8 @@
-          }
-          row_info->channels = 1;
-       }
-+      if (transformations & PNG_STRIP_ALPHA)
-+        row_info->color_type &= ~PNG_COLOR_MASK_ALPHA;
-    }
- }
- #endif
---- libpng-1.2.7.orig/pngwtran.c     2004-09-12 11:19:32.000000000 +0900
-+++ libpng-1.2.7/pngwtran.c        2004-11-13 13:04:50.000000000 +0900
-@@ -40,7 +40,7 @@
- #if defined(PNG_WRITE_FILLER_SUPPORTED)
-    if (png_ptr->transformations & PNG_FILLER)
-       png_do_strip_filler(&(png_ptr->row_info), png_ptr->row_buf + 1,
--         png_ptr->flags);
-+         png_ptr->flags,png_ptr->transformations);
- #endif
- #if defined(PNG_WRITE_PACKSWAP_SUPPORTED)
-    if (png_ptr->transformations & PNG_PACKSWAP)
diff --git a/media-libs/libpng/libpng-1.2.7-r1.ebuild b/media-libs/libpng/libpng-1.2.7-r1.ebuild
deleted file mode 100644
index b2719de476c6..000000000000
--- a/media-libs/libpng/libpng-1.2.7-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.7-r1.ebuild,v 1.3 2005/01/03 22:00:35 vapier Exp $
-
-inherit flag-o-matic eutils gcc
-
-DESCRIPTION="Portable Network Graphics library"
-HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="1.2"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos s390 sparc x86"
-IUSE=""
-
-DEPEND="sys-libs/zlib"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-png_do_strip_filler.diff"
-	epatch "${FILESDIR}/${PV}-gentoo.diff"
-
-	if [ "$(gcc-version)" == "3.3" -o "$(gcc-version)" == "3.2" ] ; then
-		replace-cpu-flags k6 k6-2 k6-3 i586
-	fi
-
-	if use ppc-macos ; then
-		epatch "${FILESDIR}/macos.patch" # implements strnlen
-		sed \
-			-e "s:ZLIBLIB=.*:ZLIBLIB=/usr/$(get_libdir):" \
-			-e "s:ZLIBINC=.*:ZLIBINC=/usr/include:" \
-			-e "s:-O3:${CFLAGS}:" \
-			-e "s:prefix=/usr/local:prefix=/usr:" \
-			scripts/makefile.darwin > Makefile
-	else
-		sed \
-			-e "s:ZLIBLIB=.*:ZLIBLIB=/usr/$(get_libdir):" \
-			-e "s:ZLIBINC=.*:ZLIBINC=/usr/include:" \
-			-e "s:-O3:${CFLAGS}:" \
-			-e "s:prefix=/usr/local:prefix=/usr:" \
-			-e "s:OBJSDLL = :OBJSDLL = -lz -lm :" \
-			scripts/makefile.linux > Makefile
-	fi
-}
-
-src_compile() {
-	emake \
-		CC="$(gcc-getCC)" \
-		CXX="$(gcc-getCXX)" \
-		|| die "emake failed"
-}
-
-src_install() {
-	dodir /usr/include /usr/$(get_libdir) /usr/share/man
-	make DESTDIR="${D}" MANPATH="/usr/share/man" LIBPATH="/usr/$(get_libdir)" install || die
-	doman libpng.3 libpngpf.3 png.5
-	dodoc ANNOUNCE CHANGES KNOWNBUG README TODO Y2KINFO
-}
-
-pkg_postinst() {
-	# the libpng authors really screwed around between 1.2.1 and 1.2.3
-	if [ -f "${ROOT}/usr/$(get_libdir)/libpng.so.3.1.2.1" ] ; then
-		rm "${ROOT}/usr/$(get_libdir)/libpng.so.3.1.2.1"
-	fi
-}
diff --git a/media-libs/libpng/libpng-1.2.7.ebuild b/media-libs/libpng/libpng-1.2.7.ebuild
deleted file mode 100644
index 6004c738f682..000000000000
--- a/media-libs/libpng/libpng-1.2.7.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.7.ebuild,v 1.10 2005/01/03 21:58:47 vapier Exp $
-
-inherit flag-o-matic eutils gcc
-
-DESCRIPTION="Portable Network Graphics library"
-HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="1.2"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ~ppc ~ppc64 ~ppc-macos s390 sparc x86"
-IUSE=""
-
-DEPEND="sys-libs/zlib"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PV}-gentoo.diff"
-
-	if [ "$(gcc-version)" == "3.3" -o "$(gcc-version)" == "3.2" ] ; then
-		replace-cpu-flags k6 k6-2 k6-3 i586
-	fi
-
-	if use ppc-macos ; then
-		epatch "${FILESDIR}/macos.patch" # implements strnlen
-		sed \
-			-e "s:ZLIBLIB=.*:ZLIBLIB=/usr/$(get_libdir):" \
-			-e "s:ZLIBINC=.*:ZLIBINC=/usr/include:" \
-			-e "s:-O3:${CFLAGS}:" \
-			-e "s:prefix=/usr/local:prefix=/usr:" \
-			scripts/makefile.darwin > Makefile
-	else
-		sed \
-			-e "s:ZLIBLIB=.*:ZLIBLIB=/usr/$(get_libdir):" \
-			-e "s:ZLIBINC=.*:ZLIBINC=/usr/include:" \
-			-e "s:-O3:${CFLAGS}:" \
-			-e "s:prefix=/usr/local:prefix=/usr:" \
-			-e "s:OBJSDLL = :OBJSDLL = -lz -lm :" \
-			scripts/makefile.linux > Makefile
-	fi
-}
-
-src_compile() {
-	emake \
-		CC="$(gcc-getCC)" \
-		CXX="$(gcc-getCXX)" \
-		|| die "emake failed"
-}
-
-src_install() {
-	dodir /usr/include /usr/$(get_libdir) /usr/share/man
-	make DESTDIR="${D}" MANPATH="/usr/share/man" LIBPATH="/usr/$(get_libdir)" install || die
-	doman libpng.3 libpngpf.3 png.5
-	dodoc ANNOUNCE CHANGES KNOWNBUG README TODO Y2KINFO
-}
-
-pkg_postinst() {
-	# the libpng authors really screwed around between 1.2.1 and 1.2.3
-	if [ -f "${ROOT}/usr/$(get_libdir)/libpng.so.3.1.2.1" ] ; then
-		rm "${ROOT}/usr/$(get_libdir)/libpng.so.3.1.2.1"
-	fi
-}