old

Package-Manager: portage-2.1.6.11/cvs/Linux i686

4 files changed, 6 insertions, 98 deletions

diff --git a/media-libs/sdl-image/ChangeLog b/media-libs/sdl-image/ChangeLog
index 0b932f9deb28..635eb9b12bc1 100644
--- a/media-libs/sdl-image/ChangeLog
+++ b/media-libs/sdl-image/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/sdl-image
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-image/ChangeLog,v 1.50 2009/04/30 12:27:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-image/ChangeLog,v 1.51 2009/04/30 15:12:37 mr_bones_ Exp $
+
+  30 Apr 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/sdl-image-1.2.6-DOS.patch, -sdl-image-1.2.6-r1.ebuild:
+  clean out old files
 
   30 Apr 2009; Jeroen Roovers <jer@gentoo.org> sdl-image-1.2.7.ebuild:
   Stable for HPPA (bug #264906).
diff --git a/media-libs/sdl-image/Manifest b/media-libs/sdl-image/Manifest
index a86d2f32aa9a..d83a1e0665d8 100644
--- a/media-libs/sdl-image/Manifest
+++ b/media-libs/sdl-image/Manifest
@@ -1,7 +1,4 @@
-AUX sdl-image-1.2.6-DOS.patch 1405 RMD160 c79ebcd36e2a9e676e28e15c86729b96f68fef47 SHA1 517c0c2f6705bf86258fc6309fba4fa26d17b43d SHA256 bfea5f5b91d1f0c7560c8901ecd27f3c9ac3ab451e986c31ec0eb1e83c740dbd
-DIST SDL_image-1.2.6.tar.gz 1308812 RMD160 8aea5f07216eb887f599c0908f8ea2c2f9eeac93 SHA1 5045df31e4db29d8890110fd18024c9d08efca30 SHA256 88fcb1dbf934af33163667a6677312065c7d0a7f01cd764e3374c4c19b386ec4
 DIST SDL_image-1.2.7.tar.gz 1315517 RMD160 d54233077c0a49f075bf11dc1cc2cfe7c0a64efa SHA1 0cffd05e41014651e7114d7fea309c9f37ef2d8a SHA256 14e4d9932ae2af03d814cca9e56ab9ba0091ffe06c9387dde74dfb03a4dde3b3
-EBUILD sdl-image-1.2.6-r1.ebuild 1266 RMD160 02e168bc7b7a93c21dba14f284b79b628303f7c6 SHA1 171d0786e9f4f0735e5a9303d5ce5963049388c8 SHA256 28d5e873fce95ea1941aecbf34765eec71827af8cd8077f364b3d7a2722e9ee8
 EBUILD sdl-image-1.2.7.ebuild 1176 RMD160 84684f988a4498232c37ce7265c6ce468635f216 SHA1 23b7415815e2e623eae1bc741c3fb25a0d4c6348 SHA256 cbe17d8918bdfa209765077da59ffa002932ab0b22cefea09cb6f6559191d2bf
-MISC ChangeLog 6404 RMD160 99670746305ee07e308ff1be1710eb45f1047725 SHA1 b071cb747327cb8712bd35fd3e253b38a69da582 SHA256 0d529950d0801419b8a876b44324fe875abb4c79fcc6c1d67795d1fd3633861e
+MISC ChangeLog 6552 RMD160 734b1c177ae73b6ec6b06630acb578e976144961 SHA1 6b1e891d63aa25c1406efa45164c4522e87b5132 SHA256 8ab7c4be662c5b10072a08484f6c28cd1f6f3c2e696e73ca7e4c7f5887e61470
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/media-libs/sdl-image/files/sdl-image-1.2.6-DOS.patch b/media-libs/sdl-image/files/sdl-image-1.2.6-DOS.patch
deleted file mode 100644
index ec648a6ecfb3..000000000000
--- a/media-libs/sdl-image/files/sdl-image-1.2.6-DOS.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- trunk/SDL_image/IMG_gif.c	2007/02/13 10:09:17	2970
-+++ trunk/SDL_image/IMG_gif.c	2007/12/28 16:43:56	3462
-@@ -418,6 +418,10 @@
-     static int stack[(1 << (MAX_LWZ_BITS)) * 2], *sp;
-     register int i;
- 
-+    /* Fixed buffer overflow found by Michael Skladnikiewicz */
-+    if (input_code_size > MAX_LWZ_BITS)
-+        return -1;
-+
-     if (flag) {
- 	set_code_size = input_code_size;
- 	code_size = set_code_size + 1;
---- trunk/SDL_image/IMG_lbm.c	2007/07/20 04:37:11	3341
-+++ trunk/SDL_image/IMG_lbm.c	2008/01/03 20:05:34	3521
-@@ -28,6 +28,7 @@
-    EHB and HAM (specific Amiga graphic chip modes) support added by Marc Le Douarain
-    (http://www.multimania.com/mavati) in December 2003.
-    Stencil and colorkey fixes by David Raulo (david.raulo AT free DOT fr) in February 2004.
-+   Buffer overflow fix in RLE decompression by David Raulo in January 2008.
- */
- 
- #include <stdio.h>
-@@ -328,7 +329,7 @@
- 						count ^= 0xFF;
- 						count += 2; /* now it */
- 
--						if ( !SDL_RWread( src, &color, 1, 1 ) )
-+						if ( ( count > remainingbytes ) || !SDL_RWread( src, &color, 1, 1 ) )
- 						{
- 						   error="error reading BODY chunk";
- 							goto done;
-@@ -339,7 +340,7 @@
- 					{
- 						++count;
- 
--						if ( !SDL_RWread( src, ptr, count, 1 ) )
-+						if ( ( count > remainingbytes ) || !SDL_RWread( src, ptr, count, 1 ) )
- 						{
- 						   error="error reading BODY chunk";
- 							goto done;
diff --git a/media-libs/sdl-image/sdl-image-1.2.6-r1.ebuild b/media-libs/sdl-image/sdl-image-1.2.6-r1.ebuild
deleted file mode 100644
index 75f81a16d12f..000000000000
--- a/media-libs/sdl-image/sdl-image-1.2.6-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-image/sdl-image-1.2.6-r1.ebuild,v 1.2 2008/01/29 21:55:55 grobian Exp $
-
-inherit eutils flag-o-matic
-
-MY_P="${P/sdl-/SDL_}"
-DESCRIPTION="image file loading library"
-HOMEPAGE="http://www.libsdl.org/projects/SDL_image/index.html"
-SRC_URI="http://www.libsdl.org/projects/SDL_image/release/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="gif jpeg tiff png"
-
-DEPEND="sys-libs/zlib
-	>=media-libs/libsdl-1.2.10
-	png? ( >=media-libs/libpng-1.2.1 )
-	jpeg? ( >=media-libs/jpeg-6b )
-	tiff? ( media-libs/tiff )"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-DOS.patch"
-}
-
-src_compile() {
-	econf \
-		$(use_enable gif) \
-		$(use_enable jpeg jpg) \
-		$(use_enable tiff tif) \
-		$(use_enable png) \
-		$(use_enable png pnm) \
-		--enable-bmp \
-		--enable-lbm \
-		--enable-pcx \
-		--enable-tga \
-		--enable-xcf \
-		--enable-xpm \
-		|| die
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dobin .libs/showimage || die "dobin failed"
-	dodoc CHANGES README
-}