add patches from upstream to address security bug #207933; force stabilize all

Package-Manager: portage-2.1.3.19

13 files changed, 78 insertions, 274 deletions

diff --git a/media-libs/sdl-image/ChangeLog b/media-libs/sdl-image/ChangeLog
index f2ce3bdc2124..3330fc5fde2d 100644
--- a/media-libs/sdl-image/ChangeLog
+++ b/media-libs/sdl-image/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-libs/sdl-image
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-image/ChangeLog,v 1.40 2007/07/21 19:36:37 vapier Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-image/ChangeLog,v 1.41 2008/01/29 08:54:30 mr_bones_ Exp $
+
+*sdl-image-1.2.6-r1 (29 Jan 2008)
+
+  29 Jan 2008; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/sdl-image-1.2.6-DOS.patch, -sdl-image-1.2.3-r1.ebuild,
+  -sdl-image-1.2.4.ebuild, -sdl-image-1.2.5.ebuild,
+  -sdl-image-1.2.5-r1.ebuild, -sdl-image-1.2.6.ebuild,
+  +sdl-image-1.2.6-r1.ebuild:
+  add patches from upstream to address security bug #207933; force stabilize all
+  previously stable archs and remove older, vulnerable versions
 
 *sdl-image-1.2.6 (21 Jul 2007)
 
@@ -148,7 +158,7 @@
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
+  updated in any way. This changelog is target's to users. This means that the
   comments should well explained and written in clean English. The details about
   writing correct changelogs are explained in the skel.ChangeLog file which you
   can find in the root directory of the portage repository.
diff --git a/media-libs/sdl-image/Manifest b/media-libs/sdl-image/Manifest
index 84e1acb78516..27f6ab7b3680 100644
--- a/media-libs/sdl-image/Manifest
+++ b/media-libs/sdl-image/Manifest
@@ -1,58 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST SDL_image-1.2.3.tar.gz 636747 RMD160 ef488b0d731170336f6a3b5254e24c69726e0d92 SHA1 a6610edd6ea4afb0ff351c7911c46034e161076d SHA256 2f710b94f547ec7e39844f7872e1fe8d6fe2a434c896cc8a54b5540854bb5a69
-DIST SDL_image-1.2.4.tar.gz 841885 RMD160 0c42fecde17e841a98ffc6d7b4f6473e30447df1 SHA1 64664c43a105ca6532f2b7d7f45d24f17388b5da SHA256 c295b5fdb8c51fd363a351b9ca66b1d3c50f99d5610a0629d719757a35139032
-DIST SDL_image-1.2.5.tar.gz 1308637 RMD160 3dabd3de4259519412e6fdc5c83d268dfa0b1ec0 SHA1 2cd7d825953de64bf903ad711be5613f79259422 SHA256 8a665d136fb17cc9fedcd8e42d21fcab553bd7ab67b6cafea2c6c7efe1adb308
+AUX sdl-image-1.2.6-DOS.patch 1405 RMD160 c79ebcd36e2a9e676e28e15c86729b96f68fef47 SHA1 517c0c2f6705bf86258fc6309fba4fa26d17b43d SHA256 bfea5f5b91d1f0c7560c8901ecd27f3c9ac3ab451e986c31ec0eb1e83c740dbd
+MD5 61dfb71991a3bb05541cd9c888b8a058 files/sdl-image-1.2.6-DOS.patch 1405
+RMD160 c79ebcd36e2a9e676e28e15c86729b96f68fef47 files/sdl-image-1.2.6-DOS.patch 1405
+SHA256 bfea5f5b91d1f0c7560c8901ecd27f3c9ac3ab451e986c31ec0eb1e83c740dbd files/sdl-image-1.2.6-DOS.patch 1405
 DIST SDL_image-1.2.6.tar.gz 1308812 RMD160 8aea5f07216eb887f599c0908f8ea2c2f9eeac93 SHA1 5045df31e4db29d8890110fd18024c9d08efca30 SHA256 88fcb1dbf934af33163667a6677312065c7d0a7f01cd764e3374c4c19b386ec4
-DIST sdl-image1.2_1.2.5-2.diff.gz 11430 RMD160 4b34099e5805841ff8ed068155e20b0c91ea21db SHA1 e395699cf1e8ae1354d3381792240575dce3c99b SHA256 ab4b63f5b459cf0d7505a4f6210c1c5e05175193095ae6d6cd3810ecf71d6176
-EBUILD sdl-image-1.2.3-r1.ebuild 1115 RMD160 d0b654763135e90ddfcc521e8761bbbc1c837583 SHA1 2e6fb503959dc210b87ef4d2e0150212d015ec6a SHA256 b795311798be9b7528c88d99a5b48d0b35ee444a78609af0ed43fb758f46857a
-MD5 3a69e82889ab1fc10074f059bf4c2407 sdl-image-1.2.3-r1.ebuild 1115
-RMD160 d0b654763135e90ddfcc521e8761bbbc1c837583 sdl-image-1.2.3-r1.ebuild 1115
-SHA256 b795311798be9b7528c88d99a5b48d0b35ee444a78609af0ed43fb758f46857a sdl-image-1.2.3-r1.ebuild 1115
-EBUILD sdl-image-1.2.4.ebuild 1229 RMD160 3e28eeca0826ec486d78769009d6d094e5ea3d6d SHA1 ffdf80b06ce8708131bfdac65a5514df7a8a0c48 SHA256 636a89e8f5c9f6fbecffe4bd9657517b3b6b86ee3e8bb4622b2f9fda053323d5
-MD5 55307bdf6235b14d8907231084647916 sdl-image-1.2.4.ebuild 1229
-RMD160 3e28eeca0826ec486d78769009d6d094e5ea3d6d sdl-image-1.2.4.ebuild 1229
-SHA256 636a89e8f5c9f6fbecffe4bd9657517b3b6b86ee3e8bb4622b2f9fda053323d5 sdl-image-1.2.4.ebuild 1229
-EBUILD sdl-image-1.2.5-r1.ebuild 1354 RMD160 87c1d7508df21d47869c9efaf5ff3d53d457da88 SHA1 6735f4cec277a739ea5b12c78c82bd9d9285580d SHA256 32a5959d6da7b6013c66fdbbae65d16d3da027dfc4b2deec05a3eb2c5fc4bb44
-MD5 e1bc62cf98226d76615e3205dbfa80d9 sdl-image-1.2.5-r1.ebuild 1354
-RMD160 87c1d7508df21d47869c9efaf5ff3d53d457da88 sdl-image-1.2.5-r1.ebuild 1354
-SHA256 32a5959d6da7b6013c66fdbbae65d16d3da027dfc4b2deec05a3eb2c5fc4bb44 sdl-image-1.2.5-r1.ebuild 1354
-EBUILD sdl-image-1.2.5.ebuild 1360 RMD160 d7317f7bf74a7b4840aaa80f2dbee2df524b06bb SHA1 a8b847f46d8bc0772749b62ad05aae2f1155a44a SHA256 160624b09fde3a20950b4306da4134ef80507384418fc0b3611f646a569048df
-MD5 cbe05ac8ddb1b934d4a170abf774388d sdl-image-1.2.5.ebuild 1360
-RMD160 d7317f7bf74a7b4840aaa80f2dbee2df524b06bb sdl-image-1.2.5.ebuild 1360
-SHA256 160624b09fde3a20950b4306da4134ef80507384418fc0b3611f646a569048df sdl-image-1.2.5.ebuild 1360
-EBUILD sdl-image-1.2.6.ebuild 1203 RMD160 1ee18fe0b7d8db537c271edfc467f72cf66f5ffa SHA1 64c08eb9430eacf7e250d7e72a252e79295bb321 SHA256 a088fffb5346bb9b1f71a66ba9504347814b9c0185def9f97b496328bbc6a6df
-MD5 87b7ef5e18cd8db27d7e49d456152e25 sdl-image-1.2.6.ebuild 1203
-RMD160 1ee18fe0b7d8db537c271edfc467f72cf66f5ffa sdl-image-1.2.6.ebuild 1203
-SHA256 a088fffb5346bb9b1f71a66ba9504347814b9c0185def9f97b496328bbc6a6df sdl-image-1.2.6.ebuild 1203
-MISC ChangeLog 5022 RMD160 b2f5d51cbc986c598a8f0afe7715f47c1f3096e6 SHA1 30382dba89f0f1d8ddc74d82d7dee59098d0677c SHA256 e38439d652e5db0ed2dcbc9a032dd9d134d90db9cc0043b3b1c5df79480de627
-MD5 8db4c736214a9da4efb3c9a97661c979 ChangeLog 5022
-RMD160 b2f5d51cbc986c598a8f0afe7715f47c1f3096e6 ChangeLog 5022
-SHA256 e38439d652e5db0ed2dcbc9a032dd9d134d90db9cc0043b3b1c5df79480de627 ChangeLog 5022
+EBUILD sdl-image-1.2.6-r1.ebuild 1278 RMD160 33250cf99d4064e114fc554181a2963946ae3f92 SHA1 27082198e6b6dfa2344a32379a06a00c0a6c110c SHA256 967785aff7d89d49975271e337b2e356fe70e3771d1feddf9bc69237675fa6c6
+MD5 a24e56a15ee4c333355ea7dd6fc54c3e sdl-image-1.2.6-r1.ebuild 1278
+RMD160 33250cf99d4064e114fc554181a2963946ae3f92 sdl-image-1.2.6-r1.ebuild 1278
+SHA256 967785aff7d89d49975271e337b2e356fe70e3771d1feddf9bc69237675fa6c6 sdl-image-1.2.6-r1.ebuild 1278
+MISC ChangeLog 5461 RMD160 268cae107ff532e5325bca0df71c7263a0279ec5 SHA1 46922d790a9b5138466ed3050c880b2a02e92cea SHA256 79099c9f4558aa0fbf31e08765d541da390542fa62aba1a307683ba42e5f6024
+MD5 588dbdde450cac2984670c11eace4b1f ChangeLog 5461
+RMD160 268cae107ff532e5325bca0df71c7263a0279ec5 ChangeLog 5461
+SHA256 79099c9f4558aa0fbf31e08765d541da390542fa62aba1a307683ba42e5f6024 ChangeLog 5461
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 9f8a9f9b7401cdd5f6ab6525049a1f17 files/digest-sdl-image-1.2.3-r1 247
-RMD160 d3af8165821ea8e99b2211dc3b88a9bd096b624c files/digest-sdl-image-1.2.3-r1 247
-SHA256 f71cb62299f4d7d738dc3922af3453aec11938a047afadd27f1406b44e85483f files/digest-sdl-image-1.2.3-r1 247
-MD5 6086a9ebe5b00b1d4326855da6b17046 files/digest-sdl-image-1.2.4 247
-RMD160 d46e33b74e93b26eeb8f206b66337984651af8e1 files/digest-sdl-image-1.2.4 247
-SHA256 d1279c4e65f3cc7158c969f69db2af24416b894d0fbb60c2d7c1191f63019486 files/digest-sdl-image-1.2.4 247
-MD5 6d659c3c908cda8bc7098ca47a835a16 files/digest-sdl-image-1.2.5 512
-RMD160 9fd1824a85e1eef2e88ab4fa4ece94d68022e4b1 files/digest-sdl-image-1.2.5 512
-SHA256 03ff6e558e4d903d7e2ecf7e51fd7208b6b55f838ac63b76d23277a3f2aefa77 files/digest-sdl-image-1.2.5 512
-MD5 6d659c3c908cda8bc7098ca47a835a16 files/digest-sdl-image-1.2.5-r1 512
-RMD160 9fd1824a85e1eef2e88ab4fa4ece94d68022e4b1 files/digest-sdl-image-1.2.5-r1 512
-SHA256 03ff6e558e4d903d7e2ecf7e51fd7208b6b55f838ac63b76d23277a3f2aefa77 files/digest-sdl-image-1.2.5-r1 512
-MD5 8b9660fb4d48c59bbe50038a20d05bd6 files/digest-sdl-image-1.2.6 250
-RMD160 238bf98a9b0f71368a62ce30ffdee7d97f528c61 files/digest-sdl-image-1.2.6 250
-SHA256 628a9cb677e6f7578d4c75d92e23780c2d317ef81ce424a19bbae4f8f861a047 files/digest-sdl-image-1.2.6 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
-
-iD4DBQFGomBgp/wUKkr7RBoRAoMlAKCAHTQo6pv0xDWISowYQIIhYbzAAQCWPS4z
-uP075b1/FM9QvrhJ4QXagw==
-=FBes
------END PGP SIGNATURE-----
+MD5 8b9660fb4d48c59bbe50038a20d05bd6 files/digest-sdl-image-1.2.6-r1 250
+RMD160 238bf98a9b0f71368a62ce30ffdee7d97f528c61 files/digest-sdl-image-1.2.6-r1 250
+SHA256 628a9cb677e6f7578d4c75d92e23780c2d317ef81ce424a19bbae4f8f861a047 files/digest-sdl-image-1.2.6-r1 250
diff --git a/media-libs/sdl-image/files/digest-sdl-image-1.2.3-r1 b/media-libs/sdl-image/files/digest-sdl-image-1.2.3-r1
deleted file mode 100644
index c57a8516f5bb..000000000000
--- a/media-libs/sdl-image/files/digest-sdl-image-1.2.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d55826ffbd2bdc48b09cc64a9ed9e59e SDL_image-1.2.3.tar.gz 636747
-RMD160 ef488b0d731170336f6a3b5254e24c69726e0d92 SDL_image-1.2.3.tar.gz 636747
-SHA256 2f710b94f547ec7e39844f7872e1fe8d6fe2a434c896cc8a54b5540854bb5a69 SDL_image-1.2.3.tar.gz 636747
diff --git a/media-libs/sdl-image/files/digest-sdl-image-1.2.4 b/media-libs/sdl-image/files/digest-sdl-image-1.2.4
deleted file mode 100644
index 03f05bfc34da..000000000000
--- a/media-libs/sdl-image/files/digest-sdl-image-1.2.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 70bf617f99e51a2c94550fc79d542f0b SDL_image-1.2.4.tar.gz 841885
-RMD160 0c42fecde17e841a98ffc6d7b4f6473e30447df1 SDL_image-1.2.4.tar.gz 841885
-SHA256 c295b5fdb8c51fd363a351b9ca66b1d3c50f99d5610a0629d719757a35139032 SDL_image-1.2.4.tar.gz 841885
diff --git a/media-libs/sdl-image/files/digest-sdl-image-1.2.5 b/media-libs/sdl-image/files/digest-sdl-image-1.2.5
deleted file mode 100644
index a8686610e756..000000000000
--- a/media-libs/sdl-image/files/digest-sdl-image-1.2.5
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 cd006109a73bf7dcc93e1c3ed15ee782 SDL_image-1.2.5.tar.gz 1308637
-RMD160 3dabd3de4259519412e6fdc5c83d268dfa0b1ec0 SDL_image-1.2.5.tar.gz 1308637
-SHA256 8a665d136fb17cc9fedcd8e42d21fcab553bd7ab67b6cafea2c6c7efe1adb308 SDL_image-1.2.5.tar.gz 1308637
-MD5 6ba5a176c3f93a1d916e87005d049c28 sdl-image1.2_1.2.5-2.diff.gz 11430
-RMD160 4b34099e5805841ff8ed068155e20b0c91ea21db sdl-image1.2_1.2.5-2.diff.gz 11430
-SHA256 ab4b63f5b459cf0d7505a4f6210c1c5e05175193095ae6d6cd3810ecf71d6176 sdl-image1.2_1.2.5-2.diff.gz 11430
diff --git a/media-libs/sdl-image/files/digest-sdl-image-1.2.5-r1 b/media-libs/sdl-image/files/digest-sdl-image-1.2.5-r1
deleted file mode 100644
index a8686610e756..000000000000
--- a/media-libs/sdl-image/files/digest-sdl-image-1.2.5-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 cd006109a73bf7dcc93e1c3ed15ee782 SDL_image-1.2.5.tar.gz 1308637
-RMD160 3dabd3de4259519412e6fdc5c83d268dfa0b1ec0 SDL_image-1.2.5.tar.gz 1308637
-SHA256 8a665d136fb17cc9fedcd8e42d21fcab553bd7ab67b6cafea2c6c7efe1adb308 SDL_image-1.2.5.tar.gz 1308637
-MD5 6ba5a176c3f93a1d916e87005d049c28 sdl-image1.2_1.2.5-2.diff.gz 11430
-RMD160 4b34099e5805841ff8ed068155e20b0c91ea21db sdl-image1.2_1.2.5-2.diff.gz 11430
-SHA256 ab4b63f5b459cf0d7505a4f6210c1c5e05175193095ae6d6cd3810ecf71d6176 sdl-image1.2_1.2.5-2.diff.gz 11430
diff --git a/media-libs/sdl-image/files/digest-sdl-image-1.2.6 b/media-libs/sdl-image/files/digest-sdl-image-1.2.6-r1
index c3c6a2b24ffd..c3c6a2b24ffd 100644
--- a/media-libs/sdl-image/files/digest-sdl-image-1.2.6
+++ b/media-libs/sdl-image/files/digest-sdl-image-1.2.6-r1
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
new file mode 100644
index 000000000000..ec648a6ecfb3
--- /dev/null
+++ b/media-libs/sdl-image/files/sdl-image-1.2.6-DOS.patch
@@ -0,0 +1,41 @@
+--- 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.3-r1.ebuild b/media-libs/sdl-image/sdl-image-1.2.3-r1.ebuild
deleted file mode 100644
index 5e28d50bdb76..000000000000
--- a/media-libs/sdl-image/sdl-image-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 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.3-r1.ebuild,v 1.8 2007/07/12 03:10:24 mr_bones_ Exp $
-
-MY_P="${P/sdl-/SDL_}"
-S=${WORKDIR}/${MY_P}
-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"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
-IUSE="gif jpeg tiff png"
-
-DEPEND="sys-libs/zlib
-	>=media-libs/libsdl-1.2.4
-	png? ( >=media-libs/libpng-1.2.1 )
-	jpeg? ( >=media-libs/jpeg-6b )
-	tiff? ( media-libs/tiff )"
-
-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
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	into /usr
-	dobin .libs/showimage
-	dodoc CHANGES README
-}
diff --git a/media-libs/sdl-image/sdl-image-1.2.4.ebuild b/media-libs/sdl-image/sdl-image-1.2.4.ebuild
deleted file mode 100644
index d4e252da7dd8..000000000000
--- a/media-libs/sdl-image/sdl-image-1.2.4.ebuild
+++ /dev/null
@@ -1,47 +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/sdl-image/sdl-image-1.2.4.ebuild,v 1.7 2006/04/11 19:44:15 flameeyes Exp $
-
-inherit 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"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="gif jpeg tiff png"
-
-DEPEND="sys-libs/zlib
-	>=media-libs/libsdl-1.2.4
-	png? ( >=media-libs/libpng-1.2.1 )
-	jpeg? ( >=media-libs/jpeg-6b )
-	tiff? ( media-libs/tiff )"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	econf \
-		--disable-dependency-tracking \
-		$(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() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dobin .libs/showimage || die "dobin failed"
-	dodoc CHANGES README
-}
diff --git a/media-libs/sdl-image/sdl-image-1.2.5-r1.ebuild b/media-libs/sdl-image/sdl-image-1.2.5-r1.ebuild
deleted file mode 100644
index b2486a01fb44..000000000000
--- a/media-libs/sdl-image/sdl-image-1.2.5-r1.ebuild
+++ /dev/null
@@ -1,53 +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/sdl-image/sdl-image-1.2.5-r1.ebuild,v 1.12 2006/10/31 01:00:06 nyhm 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
-	mirror://debian/pool/main/s/sdl-image1.2/sdl-image1.2_${PV}-2.diff.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc-macos 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 "${WORKDIR}/sdl-image1.2_${PV}-2.diff"
-}
-
-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() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dobin .libs/showimage || die "dobin failed"
-	dodoc CHANGES README
-}
diff --git a/media-libs/sdl-image/sdl-image-1.2.5.ebuild b/media-libs/sdl-image/sdl-image-1.2.5.ebuild
deleted file mode 100644
index 02fce291969b..000000000000
--- a/media-libs/sdl-image/sdl-image-1.2.5.ebuild
+++ /dev/null
@@ -1,53 +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/sdl-image/sdl-image-1.2.5.ebuild,v 1.4 2006/10/31 01:00:06 nyhm 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
-	mirror://debian/pool/main/s/sdl-image1.2/sdl-image1.2_${PV}-2.diff.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~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 "${WORKDIR}/sdl-image1.2_${PV}-2.diff"
-}
-
-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() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dobin .libs/showimage || die "dobin failed"
-	dodoc CHANGES README
-}
diff --git a/media-libs/sdl-image/sdl-image-1.2.6.ebuild b/media-libs/sdl-image/sdl-image-1.2.6-r1.ebuild
index 048f1af53d47..1b5d80ff3f62 100644
--- a/media-libs/sdl-image/sdl-image-1.2.6.ebuild
+++ b/media-libs/sdl-image/sdl-image-1.2.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.ebuild,v 1.1 2007/07/21 19:36:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-image/sdl-image-1.2.6-r1.ebuild,v 1.1 2008/01/29 08:54:30 mr_bones_ Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,7 +11,7 @@ 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 ~ppc-macos ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc-macos ppc64 sparc x86 ~x86-fbsd"
 IUSE="gif jpeg tiff png"
 
 DEPEND="sys-libs/zlib
@@ -22,6 +22,12 @@ DEPEND="sys-libs/zlib
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-DOS.patch"
+}
+
 src_compile() {
 	econf \
 		$(use_enable gif) \