fix up the patch names and remove old ebuilds

(Portage version: 2.1.6.4/cvs/Linux 2.6.28.1 i686)

12 files changed, 19 insertions, 1151 deletions

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index 5416cc3636c0..175364c54429 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.157 2009/02/17 18:03:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.158 2009/02/17 18:15:39 mr_bones_ Exp $
+
+  17 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/libsdl-1.2.11-audioConv.patch,
+  -files/libsdl-1.2.11-cdrom-correct-free-func.patch,
+  -files/libsdl-1.2.11-fbcon-page-header.patch,
+  -files/libsdl-1.2.11-libcaca-new-api.patch,
+  -files/libsdl-1.2.11-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch,
+  -files/libsdl-1.2.11-sdl-config.patch,
+  -files/libsdl-1.2.11-xinerama-head-0.patch,
+  -files/libsdl-1.2.11-yasm-checks.patch,
+  +files/libsdl-1.2.13-sdl-config.patch,
+  +files/libsdl-1.2.13-xinerama-head-0.patch, -libsdl-1.2.11-r2.ebuild,
+  -libsdl-1.2.13.ebuild, libsdl-1.2.13-r1.ebuild:
+  fix up the patch names and remove old ebuilds
 
   17 Feb 2009; Raúl Porcel <armin76@gentoo.org> libsdl-1.2.13-r1.ebuild:
   arm/ia64/sh stable wrt #258230
diff --git a/media-libs/libsdl/files/libsdl-1.2.11-audioConv.patch b/media-libs/libsdl/files/libsdl-1.2.11-audioConv.patch
deleted file mode 100644
index 308df3fb61fd..000000000000
--- a/media-libs/libsdl/files/libsdl-1.2.11-audioConv.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix segfault when auto converting stream #151991
-
---- src/audio/SDL_audio.c
-+++ src/audio/SDL_audio.c
-@@ -591,7 +591,7 @@
- 			return(-1);
- 		}
- 		if ( audio->convert.needed ) {
--			audio->convert.len = desired->size;
-+			audio->convert.len = desired->size / audio->convert.len_ratio;
- 			audio->convert.buf =(Uint8 *)SDL_AllocAudioMem(
- 			   audio->convert.len*audio->convert.len_mult);
- 			if ( audio->convert.buf == NULL ) {
diff --git a/media-libs/libsdl/files/libsdl-1.2.11-cdrom-correct-free-func.patch b/media-libs/libsdl/files/libsdl-1.2.11-cdrom-correct-free-func.patch
deleted file mode 100644
index 90b35faf19c2..000000000000
--- a/media-libs/libsdl/files/libsdl-1.2.11-cdrom-correct-free-func.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-http://bugs.gentoo.org/169477
-
-Revision 2744
-Modified Tue Sep 5 19:31:48 2006 UTC (6 months, 1 week ago) by pmandin
-Use correct function to free allocated mem
-
---- branches/SDL-1.2/src/cdrom/linux/SDL_syscdrom.c	2006/07/10 21:03:59	2608
-+++ branches/SDL-1.2/src/cdrom/linux/SDL_syscdrom.c	2006/09/05 19:31:48	2744
-@@ -218,7 +218,7 @@
- 			if ( SDL_strcmp(mnt_type, MNTTYPE_SUPER) == 0 ) {
- 				tmp = SDL_strstr(mntent->mnt_opts, "fs=");
- 				if ( tmp ) {
--					SDL_free(mnt_type);
-+					SDL_stack_free(mnt_type);
- 					mnt_type = SDL_strdup(tmp + SDL_strlen("fs="));
- 					if ( mnt_type ) {
- 						tmp = SDL_strchr(mnt_type, ',');
-@@ -229,7 +229,7 @@
- 				}
- 				tmp = SDL_strstr(mntent->mnt_opts, "dev=");
- 				if ( tmp ) {
--					SDL_free(mnt_dev);
-+					SDL_stack_free(mnt_dev);
- 					mnt_dev = SDL_strdup(tmp + SDL_strlen("dev="));
- 					if ( mnt_dev ) {
- 						tmp = SDL_strchr(mnt_dev, ',');
diff --git a/media-libs/libsdl/files/libsdl-1.2.11-fbcon-page-header.patch b/media-libs/libsdl/files/libsdl-1.2.11-fbcon-page-header.patch
deleted file mode 100644
index bd5c6adc3fb5..000000000000
--- a/media-libs/libsdl/files/libsdl-1.2.11-fbcon-page-header.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Backport from current libsdl svn so we can work with newer kernel headers
-
-http://bugs.gentoo.org/159923
-http://bugs.gentoo.org/169388
-
---- configure.in
-+++ configure.in
-@@ -807,6 +807,7 @@
-         ])
-         AC_MSG_RESULT($video_fbcon)
-         if test x$video_fbcon = xyes; then
-+            AC_CHECK_FUNCS(getpagesize)
-             AC_DEFINE(SDL_VIDEO_DRIVER_FBCON)
-             SOURCES="$SOURCES $srcdir/src/video/fbcon/*.c"
-             have_video=yes
---- include/SDL_config.h.in
-+++ include/SDL_config.h.in
-@@ -302,4 +302,6 @@
- #undef SDL_HERMES_BLITTERS
- #undef SDL_ALTIVEC_BLITTERS
- 
-+#undef HAVE_GETPAGESIZE
-+
- #endif /* _SDL_config_h */
---- src/video/fbcon/SDL_fbvideo.c
-+++ src/video/fbcon/SDL_fbvideo.c
-@@ -29,7 +29,9 @@
- #include <unistd.h>
- #include <sys/ioctl.h>
- #include <sys/mman.h>
-+#ifndef HAVE_GETPAGESIZE
- #include <asm/page.h>		/* For definition of PAGE_SIZE */
-+#endif
- #include <linux/vt.h>
- 
- #include "SDL_video.h"
-@@ -149,6 +151,18 @@
-                                   struct fb_var_screeninfo *vinfo);
- static void FB_RestorePalette(_THIS);
- 
-+static int SDL_getpagesize(void)
-+{
-+#ifdef HAVE_GETPAGESIZE
-+    return getpagesize();
-+#elif defined(PAGE_SIZE)
-+    return PAGE_SIZE;
-+#else
-+#error Can not determine system page size.
-+    return 4096;  /* this is what it USED to be in Linux... */
-+#endif
-+}
-+
- /* Small wrapper for mmap() so we can play nicely with no-mmu hosts
-  * (non-mmu hosts disallow the MAP_SHARED flag) */
- 
-@@ -547,7 +561,7 @@
- 
- 	/* Memory map the device, compensating for buggy PPC mmap() */
- 	mapped_offset = (((long)finfo.smem_start) -
--	                (((long)finfo.smem_start)&~(PAGE_SIZE-1)));
-+	                (((long)finfo.smem_start)&~(SDL_getpagesize()-1)));
- 	mapped_memlen = finfo.smem_len+mapped_offset;
- 	mapped_mem = do_mmap(NULL, mapped_memlen,
- 	                  PROT_READ|PROT_WRITE, MAP_SHARED, console_fd, 0);
---- src/video/Xext/Xxf86dga/XF86DGA.c	2007/03/13 23:11:02	1.1
-+++ src/video/Xext/Xxf86dga/XF86DGA.c	2007/03/13 23:15:14
-@@ -18,7 +18,8 @@ Copyright (c) 1995,1996  The XFree86 Pro
- #define HAS_MMAP_ANON
- #include <sys/types.h>
- #include <sys/mman.h>
--#include <asm/page.h>   /* PAGE_SIZE */
-+/* kernel header doesn't work with -ansi */
-+/* #include <asm/page.h> */   /* PAGE_SIZE */
- #define HAS_SC_PAGESIZE /* _SC_PAGESIZE may be an enum for Linux */
- #define HAS_GETPAGESIZE
- #endif /* linux */
diff --git a/media-libs/libsdl/files/libsdl-1.2.11-libcaca-new-api.patch b/media-libs/libsdl/files/libsdl-1.2.11-libcaca-new-api.patch
deleted file mode 100644
index 65be7dcb590e..000000000000
--- a/media-libs/libsdl/files/libsdl-1.2.11-libcaca-new-api.patch
+++ /dev/null
@@ -1,608 +0,0 @@
-diff -Naur SDL-1.2.11-vanilla/configure.in SDL-1.2.11/configure.in
---- SDL-1.2.11-vanilla/configure.in	2006-06-27 06:48:33.000000000 +0200
-+++ SDL-1.2.11/configure.in	2006-09-28 00:59:04.485910345 +0200
-@@ -1338,6 +1338,38 @@
-     fi
- }
- 
-+dnl Find the libcaca includes
-+CheckCaca()
-+{
-+    AC_ARG_ENABLE(video-caca,
-+AC_HELP_STRING([--enable-video-caca], [use libcaca video driver [[default=no]]]),
-+                  , enable_video_caca=no)
-+    if test x$enable_video = xyes -a x$enable_video_caca = xyes; then
-+        video_caca=no
-+        AC_PATH_PROG(CACACONFIG, caca-config, no)
-+        if test x$CACACONFIG != xno; then
-+            AC_MSG_CHECKING(for libcaca support)
-+            CACA_CFLAGS=`$CACACONFIG --cflags`
-+            CACA_LDFLAGS=`$CACACONFIG --libs`
-+            save_CFLAGS="$CFLAGS"
-+            AC_TRY_COMPILE([
-+             #include <caca.h>
-+            ],[
-+            ],[
-+             video_caca=yes
-+            ])
-+            CFLAGS="$save_CFLAGS"
-+            AC_MSG_RESULT($video_caca)
-+            if test x$video_caca = xyes; then
-+                AC_DEFINE(SDL_VIDEO_DRIVER_CACA)
-+                EXTRA_CFLAGS="$EXTRA_CFLAGS $CACA_CFLAGS"
-+                EXTRA_LDFLAGS="$EXTRA_LDFLAGS $CACA_LDFLAGS"
-+                SOURCES="$SOURCES $srcdir/src/video/caca/*.c"
-+            fi
-+        fi
-+    fi
-+}
-+
- dnl Set up the QTopia video driver if enabled
- CheckQtopia()
- {
-@@ -2152,6 +2184,7 @@
-         CheckVGL
-         CheckWscons
-         CheckAAlib
-+        CheckCaca
-         CheckQtopia
-         CheckPicoGUI
-         CheckOpenGLX11
-diff -Naur SDL-1.2.11-vanilla/src/video/caca/SDL_cacaevents.c SDL-1.2.11/src/video/caca/SDL_cacaevents.c
---- SDL-1.2.11-vanilla/src/video/caca/SDL_cacaevents.c	1970-01-01 01:00:00.000000000 +0100
-+++ SDL-1.2.11/src/video/caca/SDL_cacaevents.c	2006-09-28 01:00:37.750731937 +0200
-@@ -0,0 +1,101 @@
-+/*
-+    SDL - Simple DirectMedia Layer
-+    Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002  Sam Lantinga
-+
-+    This library is free software; you can redistribute it and/or
-+    modify it under the terms of the GNU Library General Public
-+    License as published by the Free Software Foundation; either
-+    version 2 of the License, or (at your option) any later version.
-+
-+    This library 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
-+    Library General Public License for more details.
-+
-+    You should have received a copy of the GNU Library General Public
-+    License along with this library; if not, write to the Free
-+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+
-+    Sam Lantinga
-+    slouken@libsdl.org
-+*/
-+
-+#ifdef SAVE_RCSID
-+static char rcsid =
-+ "@(#) $Id: libsdl-1.2.11-libcaca-new-api.patch,v 1.1 2006/09/27 23:24:55 hanno Exp $";
-+#endif
-+
-+#include <stdio.h>
-+
-+#include <caca.h>
-+#ifdef CACA_API_VERSION_1
-+#include <caca0.h>
-+#endif
-+
-+#include "SDL.h"
-+#include "../../events/SDL_sysevents.h"
-+#include "../../events/SDL_events_c.h"
-+#include "SDL_cacavideo.h"
-+#include "SDL_cacaevents_c.h"
-+
-+void Caca_PumpEvents(_THIS)
-+{
-+	int posted = 0;
-+	int event;
-+	SDL_keysym keysym;
-+
-+	if( ! this->screen ) /* Wait till we got the screen initialised */
-+	  return;
-+
-+	do {
-+		posted = 0;
-+
-+		/* Get libcaca event */
-+		SDL_mutexP(Caca_mutex);
-+		event = caca_get_event(CACA_EVENT_ANY);
-+		SDL_mutexV(Caca_mutex);
-+
-+		if ( event & (CACA_EVENT_KEY_PRESS | CACA_EVENT_KEY_RELEASE)) {
-+			int key;
-+			switch ( event & 0xffffff )
-+			{
-+				case CACA_KEY_LEFT: key = SDLK_LEFT; break;
-+				case CACA_KEY_RIGHT: key = SDLK_RIGHT; break;
-+				case CACA_KEY_UP: key = SDLK_UP; break;
-+				case CACA_KEY_DOWN: key = SDLK_DOWN; break;
-+				default: key = event & 0xff; break;
-+			}
-+			/* Key pressed */
-+/*    		printf("Key pressed: %d (%c)\n", key, key); */
-+			keysym.scancode = key;
-+			keysym.sym = key;
-+			keysym.mod = KMOD_NONE;
-+			keysym.unicode = 0;
-+			if ( SDL_TranslateUNICODE ) {
-+				keysym.unicode = key;
-+			}
-+			posted += SDL_PrivateKeyboard((event & CACA_EVENT_KEY_PRESS) ? SDL_PRESSED : SDL_RELEASED, &keysym);
-+		}
-+		else if ( event & (CACA_EVENT_MOUSE_PRESS | CACA_EVENT_MOUSE_RELEASE) ) {
-+			/* FIXME: we currently ignore the button type! */
-+			int button = event & 0x00ffffff;
-+			if ( button > 3 ) {
-+				button = 1;
-+			}
-+			posted += SDL_PrivateMouseButton((event & CACA_EVENT_MOUSE_PRESS) ? SDL_PRESSED : SDL_RELEASED, button, 0, 0);
-+		}
-+		else if ( event & CACA_EVENT_MOUSE_MOTION ) {
-+			int new_x = 0, new_y = 0;
-+			new_x = ((event & 0x00fff000) >> 12) * Caca_w / caca_get_width();
-+			new_y = ((event & 0x00000fff) >> 0) * Caca_h / caca_get_height();
-+			posted += SDL_PrivateMouseMotion(0, 0, new_x, new_y);
-+		}
-+	} while ( posted );
-+}
-+
-+void Caca_InitOSKeymap(_THIS)
-+{
-+    return;
-+}
-+
-+
-diff -Naur SDL-1.2.11-vanilla/src/video/caca/SDL_cacaevents_c.h SDL-1.2.11/src/video/caca/SDL_cacaevents_c.h
---- SDL-1.2.11-vanilla/src/video/caca/SDL_cacaevents_c.h	1970-01-01 01:00:00.000000000 +0100
-+++ SDL-1.2.11/src/video/caca/SDL_cacaevents_c.h	2006-09-28 00:59:04.516905633 +0200
-@@ -0,0 +1,35 @@
-+/*
-+    SDL - Simple DirectMedia Layer
-+    Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002  Sam Lantinga
-+
-+    This library is free software; you can redistribute it and/or
-+    modify it under the terms of the GNU Library General Public
-+    License as published by the Free Software Foundation; either
-+    version 2 of the License, or (at your option) any later version.
-+
-+    This library 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
-+    Library General Public License for more details.
-+
-+    You should have received a copy of the GNU Library General Public
-+    License along with this library; if not, write to the Free
-+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+
-+    Sam Lantinga
-+    slouken@libsdl.org
-+*/
-+
-+#ifdef SAVE_RCSID
-+static char rcsid =
-+ "@(#) $Id: libsdl-1.2.11-libcaca-new-api.patch,v 1.1 2006/09/27 23:24:55 hanno Exp $";
-+#endif
-+
-+#include "SDL_cacavideo.h"
-+
-+/* Variables and functions exported by SDL_sysevents.c to other parts.
-+   of the native video subsystem (SDL_sysvideo.c)
-+*/
-+extern void Caca_PumpEvents(_THIS);
-+extern void Caca_InitOSKeymap(_THIS);
-+
-diff -Naur SDL-1.2.11-vanilla/src/video/caca/SDL_cacavideo.c SDL-1.2.11/src/video/caca/SDL_cacavideo.c
---- SDL-1.2.11-vanilla/src/video/caca/SDL_cacavideo.c	1970-01-01 01:00:00.000000000 +0100
-+++ SDL-1.2.11/src/video/caca/SDL_cacavideo.c	2006-09-28 01:00:37.994694849 +0200
-@@ -0,0 +1,304 @@
-+/*
-+    SDL - Simple DirectMedia Layer
-+    Copyright (C) 2003  Sam Hocevar
-+
-+    This library is free software; you can redistribute it and/or
-+    modify it under the terms of the GNU Library General Public
-+    License as published by the Free Software Foundation; either
-+    version 2 of the License, or (at your option) any later version.
-+
-+    This library 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
-+    Library General Public License for more details.
-+
-+    You should have received a copy of the GNU Library General Public
-+    License along with this library; if not, write to the Free
-+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+
-+    Sam Hocevar
-+    sam@zoy.org
-+*/
-+
-+#ifdef SAVE_RCSID
-+static char rcsid =
-+ "@(#) $Id: libsdl-1.2.11-libcaca-new-api.patch,v 1.1 2006/09/27 23:24:55 hanno Exp $";
-+#endif
-+
-+/* libcaca based SDL video driver implementation.
-+*/
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <sys/stat.h>
-+
-+
-+#include "SDL.h"
-+#include "SDL_error.h"
-+#include "SDL_video.h"
-+#include "SDL_mouse.h"
-+#include "../SDL_sysvideo.h"
-+#include "../SDL_pixels_c.h"
-+#include "../../events/SDL_events_c.h"
-+
-+#include "SDL_cacavideo.h"
-+#include "SDL_cacaevents_c.h"
-+
-+#include <caca.h>
-+#ifdef CACA_API_VERSION_1
-+#include <caca0.h>
-+#endif
-+
-+/* Initialization/Query functions */
-+static int Caca_VideoInit(_THIS, SDL_PixelFormat *vformat);
-+static SDL_Rect **Caca_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags);
-+static SDL_Surface *Caca_SetVideoMode(_THIS, SDL_Surface *current, int width, int height, int bpp, Uint32 flags);
-+static void Caca_VideoQuit(_THIS);
-+
-+/* Hardware surface functions */
-+static int Caca_AllocHWSurface(_THIS, SDL_Surface *surface);
-+static int Caca_LockHWSurface(_THIS, SDL_Surface *surface);
-+static int Caca_FlipHWSurface(_THIS, SDL_Surface *surface);
-+static void Caca_UnlockHWSurface(_THIS, SDL_Surface *surface);
-+static void Caca_FreeHWSurface(_THIS, SDL_Surface *surface);
-+
-+/* Cache the VideoDevice struct */
-+static struct SDL_VideoDevice *local_this;
-+
-+/* libcaca driver bootstrap functions */
-+
-+static int Caca_Available(void)
-+{
-+	return 1; /* Always available ! */
-+}
-+
-+static void Caca_DeleteDevice(SDL_VideoDevice *device)
-+{
-+	free(device->hidden);
-+	free(device);
-+}
-+static SDL_VideoDevice *Caca_CreateDevice(int devindex)
-+{
-+	SDL_VideoDevice *device;
-+
-+	/* Initialize all variables that we clean on shutdown */
-+	device = (SDL_VideoDevice *)malloc(sizeof(SDL_VideoDevice));
-+	if ( device ) {
-+		memset(device, 0, (sizeof *device));
-+		device->hidden = (struct SDL_PrivateVideoData *)
-+				malloc((sizeof *device->hidden));
-+	}
-+	if ( (device == NULL) || (device->hidden == NULL) ) {
-+		SDL_OutOfMemory();
-+		if ( device ) {
-+			free(device);
-+		}
-+		return(0);
-+	}
-+	memset(device->hidden, 0, (sizeof *device->hidden));
-+
-+	/* Set the function pointers */
-+	device->VideoInit = Caca_VideoInit;
-+	device->ListModes = Caca_ListModes;
-+	device->SetVideoMode = Caca_SetVideoMode;
-+	device->CreateYUVOverlay = NULL;
-+	device->SetColors = NULL;
-+	device->UpdateRects = NULL;
-+	device->VideoQuit = Caca_VideoQuit;
-+	device->AllocHWSurface = Caca_AllocHWSurface;
-+	device->CheckHWBlit = NULL;
-+	device->FillHWRect = NULL;
-+	device->SetHWColorKey = NULL;
-+	device->SetHWAlpha = NULL;
-+	device->LockHWSurface = Caca_LockHWSurface;
-+	device->UnlockHWSurface = Caca_UnlockHWSurface;
-+	device->FlipHWSurface = NULL;
-+	device->FreeHWSurface = Caca_FreeHWSurface;
-+	device->SetCaption = NULL;
-+	device->SetIcon = NULL;
-+	device->IconifyWindow = NULL;
-+	device->GrabInput = NULL;
-+	device->GetWMInfo = NULL;
-+	device->InitOSKeymap = Caca_InitOSKeymap;
-+	device->PumpEvents = Caca_PumpEvents;
-+
-+	device->free = Caca_DeleteDevice;
-+
-+	return device;
-+}
-+
-+VideoBootStrap Caca_bootstrap = {
-+	"caca", "Color ASCII Art Library",
-+	Caca_Available, Caca_CreateDevice
-+};
-+
-+int Caca_VideoInit(_THIS, SDL_PixelFormat *vformat)
-+{
-+	int i;
-+
-+	/* Initialize all variables that we clean on shutdown */
-+	for ( i=0; i<SDL_NUMMODES; ++i ) {
-+		SDL_modelist[i] = malloc(sizeof(SDL_Rect));
-+		SDL_modelist[i]->x = SDL_modelist[i]->y = 0;
-+	}
-+	/* Modes sorted largest to smallest */
-+	SDL_modelist[0]->w = 1024; SDL_modelist[0]->h = 768;
-+	SDL_modelist[1]->w = 800; SDL_modelist[1]->h = 600;
-+	SDL_modelist[2]->w = 640; SDL_modelist[2]->h = 480;
-+	SDL_modelist[3]->w = 320; SDL_modelist[3]->h = 400;
-+	SDL_modelist[4]->w = 320; SDL_modelist[4]->h = 240;
-+	SDL_modelist[5]->w = 320; SDL_modelist[5]->h = 200;
-+	SDL_modelist[6] = NULL;
-+
-+	Caca_mutex = SDL_CreateMutex();
-+
-+	/* Initialize the library */
-+	if ( caca_init() != 0 ) {
-+		SDL_SetError("Unable to initialize libcaca");
-+		return(-1);
-+	}
-+
-+	/* Initialize private variables */
-+	Caca_lastkey = 0;
-+	Caca_bitmap = NULL;
-+	Caca_buffer = NULL;
-+
-+	local_this = this;
-+
-+	/* Determine the screen depth (use default 8-bit depth) */
-+	vformat->BitsPerPixel = 8;
-+	vformat->BytesPerPixel = 1;
-+
-+	/* We're done! */
-+	return(0);
-+}
-+
-+SDL_Rect **Caca_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags)
-+{
-+     if(format->BitsPerPixel != 8)
-+ 		return NULL;
-+
-+	 if ( flags & SDL_FULLSCREEN ) {
-+		 return SDL_modelist;
-+	 } else {
-+		 return (SDL_Rect **) -1;
-+	 }
-+}
-+
-+/* Various screen update functions available */
-+static void Caca_DirectUpdate(_THIS, int numrects, SDL_Rect *rects);
-+
-+SDL_Surface *Caca_SetVideoMode(_THIS, SDL_Surface *current,
-+				int width, int height, int bpp, Uint32 flags)
-+{
-+	if ( Caca_buffer ) {
-+		free( Caca_buffer );
-+		Caca_buffer = NULL;
-+	}
-+
-+	if ( Caca_bitmap ) {
-+		caca_free_bitmap( Caca_bitmap );
-+		Caca_bitmap = NULL;
-+	}
-+
-+	Caca_buffer = malloc(2 * ((width + 15) & ~15) * height);
-+	if ( ! Caca_buffer ) {
-+		SDL_SetError("Couldn't allocate buffer for requested mode");
-+		return(NULL);
-+	}
-+
-+	memset(Caca_buffer, 0, 2 * ((width + 15) & ~15) * height);
-+
-+	/* Allocate the new pixel format for the screen */
-+	if ( ! SDL_ReallocFormat(current, 16, 0xf800, 0x07e0, 0x001f, 0) ) {
-+		return(NULL);
-+	}
-+
-+	/* Set up the new mode framebuffer */
-+	current->flags = SDL_FULLSCREEN;
-+	Caca_w = current->w = width;
-+	Caca_h = current->h = height;
-+	current->pitch = 2 * ((width + 15) & ~15);
-+	current->pixels = Caca_buffer;
-+
-+	/* Create the libcaca bitmap */
-+	Caca_bitmap = caca_create_bitmap( 16, width, height, current->pitch, 0xf800, 0x07e0, 0x001f, 0x0000 );
-+	if ( ! Caca_bitmap ) {
-+		SDL_SetError("Couldn't allocate libcaca bitmap");
-+		return(NULL);
-+	}
-+
-+	/* Set the blit function */
-+	this->UpdateRects = Caca_DirectUpdate;
-+
-+	/* We're done */
-+	return(current);
-+}
-+
-+/* We don't actually allow hardware surfaces other than the main one */
-+static int Caca_AllocHWSurface(_THIS, SDL_Surface *surface)
-+{
-+	return(-1);
-+}
-+static void Caca_FreeHWSurface(_THIS, SDL_Surface *surface)
-+{
-+	return;
-+}
-+
-+/* We need to wait for vertical retrace on page flipped displays */
-+static int Caca_LockHWSurface(_THIS, SDL_Surface *surface)
-+{
-+	/* TODO ? */
-+	return(0);
-+}
-+static void Caca_UnlockHWSurface(_THIS, SDL_Surface *surface)
-+{
-+	return;
-+}
-+
-+/* FIXME: How is this done with libcaca? */
-+static int Caca_FlipHWSurface(_THIS, SDL_Surface *surface)
-+{
-+	SDL_mutexP(Caca_mutex);
-+	caca_refresh();
-+	SDL_mutexV(Caca_mutex);
-+	return(0);
-+}
-+
-+static void Caca_DirectUpdate(_THIS, int numrects, SDL_Rect *rects)
-+{
-+	SDL_mutexP(Caca_mutex);
-+	caca_draw_bitmap( 0, 0, caca_get_width() - 1, caca_get_height() - 1,
-+			  Caca_bitmap, Caca_buffer );
-+	caca_refresh();
-+	SDL_mutexV(Caca_mutex);
-+	return;
-+}
-+
-+/* Note:  If we are terminated, this could be called in the middle of
-+   another SDL video routine -- notably UpdateRects.
-+*/
-+void Caca_VideoQuit(_THIS)
-+{
-+	int i;
-+
-+	/* Free video mode lists */
-+	for ( i=0; i<SDL_NUMMODES; ++i ) {
-+		if ( SDL_modelist[i] != NULL ) {
-+			free(SDL_modelist[i]);
-+			SDL_modelist[i] = NULL;
-+		}
-+	}
-+
-+	if ( Caca_bitmap ) {
-+		caca_free_bitmap( Caca_bitmap );
-+		Caca_bitmap = NULL;
-+	}
-+
-+	caca_end();
-+
-+	SDL_DestroyMutex(Caca_mutex);
-+}
-+
-diff -Naur SDL-1.2.11-vanilla/src/video/caca/SDL_cacavideo.h SDL-1.2.11/src/video/caca/SDL_cacavideo.h
---- SDL-1.2.11-vanilla/src/video/caca/SDL_cacavideo.h	1970-01-01 01:00:00.000000000 +0100
-+++ SDL-1.2.11/src/video/caca/SDL_cacavideo.h	2006-09-28 01:00:38.360639217 +0200
-@@ -0,0 +1,76 @@
-+/*
-+    SDL - Simple DirectMedia Layer
-+    Copyright (C) 2003  Sam Hocevar
-+
-+    This library is free software; you can redistribute it and/or
-+    modify it under the terms of the GNU Library General Public
-+    License as published by the Free Software Foundation; either
-+    version 2 of the License, or (at your option) any later version.
-+
-+    This library 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
-+    Library General Public License for more details.
-+
-+    You should have received a copy of the GNU Library General Public
-+    License along with this library; if not, write to the Free
-+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+
-+    Sam Hocevar
-+    sam@zoy.org
-+*/
-+
-+#ifdef SAVE_RCSID
-+static char rcsid =
-+ "@(#) $Id: libsdl-1.2.11-libcaca-new-api.patch,v 1.1 2006/09/27 23:24:55 hanno Exp $";
-+#endif
-+
-+#ifndef _SDL_cacavideo_h
-+#define _SDL_cacavideo_h
-+
-+#include "SDL_mouse.h"
-+#include "../SDL_sysvideo.h"
-+#include "SDL_mutex.h"
-+
-+#include <sys/time.h>
-+#include <time.h>
-+
-+#include <caca.h>
-+#ifdef CACA_API_VERSION_1
-+#include <caca0.h>
-+#endif
-+
-+/* Hidden "this" pointer for the video functions */
-+#define _THIS	SDL_VideoDevice *this
-+
-+#define SDL_NUMMODES 6
-+
-+/* Private display data */
-+struct SDL_PrivateVideoData {
-+	SDL_Rect *SDL_modelist[SDL_NUMMODES+1];
-+	SDL_mutex *mutex;
-+
-+	struct caca_bitmap *bitmap;
-+	void *buffer;
-+	int w, h;
-+
-+	int lastkey;
-+	struct timeval lasttime;
-+};
-+
-+/* Old variable names */
-+#define SDL_modelist		(this->hidden->SDL_modelist)
-+#define Caca_palette		    (this->hidden->palette)
-+#define Caca_bitmap		    (this->hidden->bitmap)
-+#define Caca_buffer		    (this->hidden->buffer)
-+
-+#define Caca_w		    (this->hidden->w)
-+#define Caca_h		    (this->hidden->h)
-+
-+#define Caca_lastkey		    (this->hidden->lastkey)
-+#define Caca_lasttime		    (this->hidden->lasttime)
-+
-+#define Caca_mutex		    (this->hidden->mutex)
-+
-+#endif /* _SDL_cacavideo_h */
-+
-diff -Naur SDL-1.2.11-vanilla/src/video/SDL_sysvideo.h SDL-1.2.11/src/video/SDL_sysvideo.h
---- SDL-1.2.11-vanilla/src/video/SDL_sysvideo.h	2006-05-01 10:02:48.000000000 +0200
-+++ SDL-1.2.11/src/video/SDL_sysvideo.h	2006-09-28 00:59:04.519905177 +0200
-@@ -404,6 +404,9 @@
- #if SDL_VIDEO_DRIVER_AALIB
- extern VideoBootStrap AALIB_bootstrap;
- #endif
-+#if SDL_VIDEO_DRIVER_CACA
-+extern VideoBootStrap CACA_bootstrap;
-+#endif
- #if SDL_VIDEO_DRIVER_DUMMY
- extern VideoBootStrap DUMMY_bootstrap;
- #endif
-diff -Naur SDL-1.2.11-vanilla/src/video/SDL_video.c SDL-1.2.11/src/video/SDL_video.c
---- SDL-1.2.11-vanilla/src/video/SDL_video.c	2006-05-01 10:02:48.000000000 +0200
-+++ SDL-1.2.11/src/video/SDL_video.c	2006-09-28 00:59:04.522904721 +0200
-@@ -120,6 +120,9 @@
- #if SDL_VIDEO_DRIVER_AALIB
- 	&AALIB_bootstrap,
- #endif
-+#if SDL_VIDEO_DRIVER_CACA
-+	&CACA_bootstrap,
-+#endif
- #if SDL_VIDEO_DRIVER_DUMMY
- 	&DUMMY_bootstrap,
- #endif
diff --git a/media-libs/libsdl/files/libsdl-1.2.11-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch b/media-libs/libsdl/files/libsdl-1.2.11-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch
deleted file mode 100644
index 22695aa4d7fd..000000000000
--- a/media-libs/libsdl/files/libsdl-1.2.11-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/148186
-
---- src/video/SDL_blit_A.c
-+++ src/video/SDL_blit_A.c
-@@ -1621,7 +1621,7 @@ BlitRGBtoRGBPixelAlpha(SDL_BlitInfo * in
- 
- #if GCC_ASMBLIT
- /* fast (as in MMX with prefetch) ARGB888->(A)RGB888 blending with pixel alpha */
--inline static void BlitRGBtoRGBPixelAlphaMMX3DNOW(SDL_BlitInfo *info)
-+static void BlitRGBtoRGBPixelAlphaMMX3DNOW(SDL_BlitInfo *info)
- {
- 	int width = info->d_width;
- 	int height = info->d_height;
diff --git a/media-libs/libsdl/files/libsdl-1.2.11-yasm-checks.patch b/media-libs/libsdl/files/libsdl-1.2.11-yasm-checks.patch
deleted file mode 100644
index f4a470cf954d..000000000000
--- a/media-libs/libsdl/files/libsdl-1.2.11-yasm-checks.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-make sure the yasm we have supports all the required features
-
-http://bugs.gentoo.org/163053
-http://bugzilla.libsdl.org/show_bug.cgi?id=393
-
-Index: configure.in
-===================================================================
---- configure.in	(revision 2987)
-+++ configure.in	(working copy)
-@@ -640,38 +640,56 @@ CheckNASM()
- AC_HELP_STRING([--enable-nasm], [use nasm assembly blitters on x86 [[default=yes]]]),
-                   , enable_nasm=yes)
-     if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_nasm = xyes; then
-+        CompileNASM()
-+        {
-+            # Usage: CompileNASM <filename>
-+            AC_MSG_CHECKING(to see if $NASM supports $1)
-+            if $NASM $NASMFLAGS $1 -o $1.o >&AS_MESSAGE_LOG_FD 2>&1; then
-+                CompileNASM_ret="yes"
-+            else
-+                CompileNASM_ret="no"
-+            fi
-+            rm -f $1 $1.o
-+            AC_MSG_RESULT($CompileNASM_ret)
-+            test "$CompileNASM_ret" = "yes"
-+        }
-+
-+        if test x"$NASMFLAGS" = x; then
-+            case $ARCH in
-+              win32)
-+                  NASMFLAGS="-f win32"
-+                  ;;
-+              openbsd)
-+                  NASMFLAGS="-f aoutb"
-+                  ;;
-+              macosx)
-+                  NASMFLAGS="-f macho"
-+                  ;;
-+              *)
-+                  NASMFLAGS="-f elf"
-+                  ;;
-+            esac
-+        fi
-+
-         AC_PATH_PROG(NASM, yasm)
-+        echo "%ifidn __OUTPUT_FORMAT__,elf" > unquoted-sections
-+        echo "section .note.GNU-stack noalloc noexec nowrite progbits" >> unquoted-sections
-+        echo "%endif" >> unquoted-sections
-+        CompileNASM unquoted-sections || NASM=""
-+
-         if test "x$NASM" = x -o "x$NASM" = x'"$NASM"'; then
-+            $as_unset ac_cv_path_NASM
-             AC_PATH_PROG(NASM, nasm)
-         fi
-         if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then
-             AC_DEFINE(SDL_HERMES_BLITTERS)
-             SOURCES="$SOURCES $srcdir/src/hermes/*.asm"
--            if test x"$NASMFLAGS" = x; then
--                case $ARCH in
--                  win32)
--                      NASMFLAGS="-f win32"
--                      ;;
--                  openbsd)
--                      NASMFLAGS="-f aoutb"
--                      ;;
--                  macosx)
--                      NASMFLAGS="-f macho"
--                      ;;
--                  *)
--                      NASMFLAGS="-f elf"
--                      ;;
--                esac
--            fi
-             NASMFLAGS="$NASMFLAGS -i $srcdir/src/hermes/"
- 
-             dnl See if hidden visibility is supported
--            echo "GLOBAL _bar:function hidden" > nasm_vis.asm
--            echo "_bar:" >>nasm_vis.asm
--            if $NASM $NASMFLAGS nasm_vis.asm -o nasm_vis.o >&AS_MESSAGE_LOG_FD 2>&1; then
--                NASMFLAGS="$NASMFLAGS -DHIDDEN_VISIBILITY"
--            fi
--            rm -f nasm_vis.asm nasm_vis.o
-+            echo "GLOBAL _bar:function hidden" > symbol-visibility
-+            echo "_bar:" >> symbol-visibility
-+            CompileNASM symbol-visibility && NASMFLAGS="$NASMFLAGS -DHIDDEN_VISIBILITY"
- 
-             AC_SUBST(NASM)
-             AC_SUBST(NASMFLAGS)
diff --git a/media-libs/libsdl/files/libsdl-1.2.11-sdl-config.patch b/media-libs/libsdl/files/libsdl-1.2.13-sdl-config.patch
index f430428e6e90..f430428e6e90 100644
--- a/media-libs/libsdl/files/libsdl-1.2.11-sdl-config.patch
+++ b/media-libs/libsdl/files/libsdl-1.2.13-sdl-config.patch
diff --git a/media-libs/libsdl/files/libsdl-1.2.11-xinerama-head-0.patch b/media-libs/libsdl/files/libsdl-1.2.13-xinerama-head-0.patch
index 56c8af1a6a4b..56c8af1a6a4b 100644
--- a/media-libs/libsdl/files/libsdl-1.2.11-xinerama-head-0.patch
+++ b/media-libs/libsdl/files/libsdl-1.2.13-xinerama-head-0.patch
diff --git a/media-libs/libsdl/libsdl-1.2.11-r2.ebuild b/media-libs/libsdl/libsdl-1.2.11-r2.ebuild
deleted file mode 100644
index 244c1a5846ae..000000000000
--- a/media-libs/libsdl/libsdl-1.2.11-r2.ebuild
+++ /dev/null
@@ -1,171 +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/libsdl/libsdl-1.2.11-r2.ebuild,v 1.13 2008/04/20 08:51:31 vapier Exp $
-
-inherit flag-o-matic toolchain-funcs eutils libtool
-
-DESCRIPTION="Simple Direct Media Layer"
-HOMEPAGE="http://www.libsdl.org/"
-SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-# WARNING:
-# if you have the noaudio, novideo, nojoystick, or custom-cflags use flags
-# in USE and something breaks, you pick up the pieces.  Be prepared for
-# bug reports to be marked INVALID.
-IUSE="oss alsa esd arts nas X dga xv xinerama fbcon directfb ggi svga aalib opengl libcaca noaudio novideo nojoystick custom-cflags"
-
-RDEPEND="!noaudio? ( >=media-libs/audiofile-0.1.9 )
-	alsa? ( media-libs/alsa-lib )
-	esd? ( >=media-sound/esound-0.2.19 )
-	arts? ( kde-base/arts )
-	nas? (
-		media-libs/nas
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libX11
-	)
-	X? (
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libXrandr
-	)
-	directfb? ( >=dev-libs/DirectFB-0.9.19 )
-	ggi? ( >=media-libs/libggi-2.0_beta3 )
-	svga? ( >=media-libs/svgalib-1.4.2 )
-	aalib? ( media-libs/aalib )
-	libcaca? ( >=media-libs/libcaca-0.9-r1 )
-	opengl? ( virtual/opengl virtual/glu )"
-DEPEND="${RDEPEND}
-	nas? (
-		x11-proto/xextproto
-		x11-proto/xproto
-	)
-	X? (
-		x11-proto/xextproto
-		x11-proto/xproto
-	)
-	x86? ( >=dev-lang/nasm-0.98.39-r3 )"
-
-S=${WORKDIR}/SDL-${PV}
-
-pkg_setup() {
-	if use noaudio || use novideo || use nojoystick ; then
-		ewarn "Since you've chosen to turn off some of libsdl's functionality,"
-		ewarn "don't bother filing libsdl-related bugs until trying to remerge"
-		ewarn "libsdl without the no* flags in USE.  You need to know what"
-		ewarn "you're doing to selectively turn off parts of libsdl."
-		epause 30
-	fi
-	if use custom-cflags ; then
-		ewarn "Since you've chosen to use possibly unsafe CFLAGS,"
-		ewarn "don't bother filing libsdl-related bugs until trying to remerge"
-		ewarn "libsdl without the custom-cflags use flag in USE."
-		epause 10
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-libcaca-new-api.patch #40224
-	epatch "${FILESDIR}"/${P}-sdl-config.patch
-	epatch "${FILESDIR}"/${P}-xinerama-head-0.patch #145917
-	epatch "${FILESDIR}"/${P}-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch #148186
-	epatch "${FILESDIR}"/${P}-audioConv.patch #151991
-	epatch "${FILESDIR}"/${P}-fbcon-page-header.patch #159923 #169388
-	epatch "${FILESDIR}"/${P}-yasm-checks.patch #163053
-	epatch "${FILESDIR}"/${P}-cdrom-correct-free-func.patch #169477
-	epatch "${FILESDIR}"/${PN}-1.2.13-cld.patch #217097
-
-	# add yasm-compatible defines to nasm code (hopefully we
-	# can get this killed soonish)
-	local f
-	for f in "${S}"/src/hermes/*.asm ; do
-		cat <<-EOF >> "${f}"
-		%ifidn __YASM_OBJFMT__,elf
-		section ".note.GNU-stack" noalloc noexec nowrite progbits
-		%endif
-		EOF
-	done
-
-	# yasm does not understand -i
-	# bug #147201
-	sed -i \
-		-e 's:NASMFLAGS -i:NASMFLAGS -I:' \
-		configure.in \
-		|| die "sed failed"
-
-	./autogen.sh || die "autogen failed"
-	elibtoolize
-}
-
-src_compile() {
-	local myconf=
-	if [[ $(tc-arch) != "x86" ]] ; then
-		myconf="${myconf} --disable-nasm"
-	else
-		myconf="${myconf} --enable-nasm"
-	fi
-	use custom-cflags || strip-flags
-	use noaudio && myconf="${myconf} --disable-audio"
-	use novideo \
-		&& myconf="${myconf} --disable-video" \
-		|| myconf="${myconf} --enable-video-dummy"
-	use nojoystick && myconf="${myconf} --disable-joystick"
-
-	local directfbconf="--disable-video-directfb"
-	if use directfb ; then
-		# since DirectFB can link against SDL and trigger a
-		# dependency loop, only link against DirectFB if it
-		# isn't broken #61592
-		echo 'int main(){}' > directfb-test.c
-		$(tc-getCC) directfb-test.c -ldirectfb 2>/dev/null \
-			&& directfbconf="--enable-video-directfb" \
-			|| ewarn "Disabling DirectFB since libdirectfb.so is broken"
-	fi
-
-	myconf="${myconf} ${directfbconf}"
-
-	econf \
-		--disable-dependency-tracking \
-		--disable-rpath \
-		--enable-events \
-		--enable-cdrom \
-		--enable-threads \
-		--enable-timers \
-		--enable-endian \
-		--enable-file \
-		--enable-cpuinfo \
-		$(use_enable oss) \
-		$(use_enable alsa) \
-		$(use_enable esd) \
-		$(use_enable arts) \
-		$(use_enable nas) \
-		$(use_enable X video-x11) \
-		$(use_enable dga) \
-		$(use_enable xv video-x11-xv) \
-		$(use_enable xinerama video-x11-xinerama) \
-		$(use_enable X video-x11-xrandr) \
-		$(use_enable dga video-dga) \
-		$(use_enable fbcon video-fbcon) \
-		$(use_enable ggi video-ggi) \
-		$(use_enable svga video-svga) \
-		$(use_enable aalib video-aalib) \
-		$(use_enable libcaca video-caca) \
-		$(use_enable opengl video-opengl) \
-		$(use_with X x) \
-		--disable-video-x11-xme \
-		${myconf} || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc BUGS CREDITS README README-SDL.txt README.CVS TODO WhatsNew
-	dohtml -r ./
-}
diff --git a/media-libs/libsdl/libsdl-1.2.13-r1.ebuild b/media-libs/libsdl/libsdl-1.2.13-r1.ebuild
index 3a645c994b3c..f8c057a12618 100644
--- a/media-libs/libsdl/libsdl-1.2.13-r1.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.13-r1.ebuild,v 1.11 2009/02/17 18:03:44 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.13-r1.ebuild,v 1.12 2009/02/17 18:15:39 mr_bones_ Exp $
 
 EAPI=2
 inherit flag-o-matic toolchain-funcs eutils libtool
@@ -73,9 +73,9 @@ pkg_setup() {
 src_prepare() {
 	# patches for bugs #40224 #145917 #198147 #217097
 	epatch \
-		"${FILESDIR}"/${PN}-1.2.13-libcaca-new-api.patch \
-		"${FILESDIR}"/${PN}-1.2.11-sdl-config.patch \
-		"${FILESDIR}"/${PN}-1.2.11-xinerama-head-0.patch \
+		"${FILESDIR}"/${P}-libcaca-new-api.patch \
+		"${FILESDIR}"/${P}-sdl-config.patch \
+		"${FILESDIR}"/${P}-xinerama-head-0.patch \
 		"${FILESDIR}"/${P}-pulseaudio.patch \
 		"${FILESDIR}"/${P}-cld.patch
 
diff --git a/media-libs/libsdl/libsdl-1.2.13.ebuild b/media-libs/libsdl/libsdl-1.2.13.ebuild
deleted file mode 100644
index 854326d470d6..000000000000
--- a/media-libs/libsdl/libsdl-1.2.13.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.13.ebuild,v 1.10 2009/02/09 21:51:48 mr_bones_ Exp $
-
-inherit flag-o-matic toolchain-funcs eutils libtool
-
-DESCRIPTION="Simple Direct Media Layer"
-HOMEPAGE="http://www.libsdl.org/"
-SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 sh sparc x86 ~x86-fbsd"
-# WARNING:
-# if you have the noaudio, novideo, nojoystick, or custom-cflags use flags
-# in USE and something breaks, you pick up the pieces.  Be prepared for
-# bug reports to be marked INVALID.
-IUSE="oss alsa esd arts nas X dga xv xinerama fbcon directfb ggi svga aalib opengl libcaca noaudio novideo nojoystick custom-cflags pulseaudio"
-
-RDEPEND="!noaudio? ( >=media-libs/audiofile-0.1.9 )
-	alsa? ( media-libs/alsa-lib )
-	esd? ( >=media-sound/esound-0.2.19 )
-	arts? ( kde-base/arts )
-	nas? (
-		media-libs/nas
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libX11
-	)
-	X? (
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libX11
-		x11-libs/libXrandr
-	)
-	directfb? ( >=dev-libs/DirectFB-0.9.19 )
-	ggi? ( >=media-libs/libggi-2.0_beta3 )
-	svga? ( >=media-libs/svgalib-1.4.2 )
-	aalib? ( media-libs/aalib )
-	libcaca? ( >=media-libs/libcaca-0.9-r1 )
-	opengl? ( virtual/opengl virtual/glu )
-	pulseaudio? ( media-sound/pulseaudio )"
-DEPEND="${RDEPEND}
-	nas? (
-		x11-proto/xextproto
-		x11-proto/xproto
-	)
-	X? (
-		x11-proto/xextproto
-		x11-proto/xproto
-	)
-	x86? ( || ( >=dev-lang/yasm-0.6.0 >=dev-lang/nasm-0.98.39-r3 ) )"
-
-S=${WORKDIR}/SDL-${PV}
-
-pkg_setup() {
-	if use noaudio || use novideo || use nojoystick ; then
-		ewarn "Since you've chosen to turn off some of libsdl's functionality,"
-		ewarn "don't bother filing libsdl-related bugs until trying to remerge"
-		ewarn "libsdl without the no* flags in USE.  You need to know what"
-		ewarn "you're doing to selectively turn off parts of libsdl."
-		epause 30
-	fi
-	if use custom-cflags ; then
-		ewarn "Since you've chosen to use possibly unsafe CFLAGS,"
-		ewarn "don't bother filing libsdl-related bugs until trying to remerge"
-		ewarn "libsdl without the custom-cflags use flag in USE."
-		epause 10
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${PN}-1.2.13-libcaca-new-api.patch #40224
-	epatch "${FILESDIR}"/${PN}-1.2.11-sdl-config.patch
-	epatch "${FILESDIR}"/${PN}-1.2.11-xinerama-head-0.patch #145917
-	epatch "${FILESDIR}"/${P}-pulseaudio.patch #198147
-	epatch "${FILESDIR}"/${P}-cld.patch #217097
-
-	./autogen.sh
-	elibtoolize
-}
-
-src_compile() {
-	local myconf=
-	if [[ $(tc-arch) != "x86" ]] ; then
-		myconf="${myconf} --disable-nasm"
-	else
-		myconf="${myconf} --enable-nasm"
-	fi
-	use custom-cflags || strip-flags
-	use noaudio && myconf="${myconf} --disable-audio"
-	use novideo \
-		&& myconf="${myconf} --disable-video" \
-		|| myconf="${myconf} --enable-video-dummy"
-	use nojoystick && myconf="${myconf} --disable-joystick"
-
-	local directfbconf="--disable-video-directfb"
-	if use directfb ; then
-		# since DirectFB can link against SDL and trigger a
-		# dependency loop, only link against DirectFB if it
-		# isn't broken #61592
-		echo 'int main(){}' > directfb-test.c
-		$(tc-getCC) directfb-test.c -ldirectfb 2>/dev/null \
-			&& directfbconf="--enable-video-directfb" \
-			|| ewarn "Disabling DirectFB since libdirectfb.so is broken"
-	fi
-
-	myconf="${myconf} ${directfbconf}"
-
-	econf \
-		--disable-dependency-tracking \
-		--disable-rpath \
-		--enable-events \
-		--enable-cdrom \
-		--enable-threads \
-		--enable-timers \
-		--enable-endian \
-		--enable-file \
-		--enable-cpuinfo \
-		$(use_enable oss) \
-		$(use_enable alsa) \
-		$(use_enable esd) \
-		$(use_enable pulseaudio) \
-		$(use_enable arts) \
-		$(use_enable nas) \
-		$(use_enable X video-x11) \
-		$(use_enable dga) \
-		$(use_enable xv video-x11-xv) \
-		$(use_enable xinerama video-x11-xinerama) \
-		$(use_enable X video-x11-xrandr) \
-		$(use_enable dga video-dga) \
-		$(use_enable fbcon video-fbcon) \
-		$(use_enable ggi video-ggi) \
-		$(use_enable svga video-svga) \
-		$(use_enable aalib video-aalib) \
-		$(use_enable libcaca video-caca) \
-		$(use_enable opengl video-opengl) \
-		$(use_with X x) \
-		--disable-video-x11-xme \
-		${myconf} || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc BUGS CREDITS README README-SDL.txt README.CVS TODO WhatsNew
-	dohtml -r ./
-}