old

(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

19 files changed, 18 insertions, 1144 deletions

diff --git a/media-libs/libmikmod/ChangeLog b/media-libs/libmikmod/ChangeLog
index 730fccff95d1..e8d587bb734d 100644
--- a/media-libs/libmikmod/ChangeLog
+++ b/media-libs/libmikmod/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for media-libs/libmikmod
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.103 2013/01/01 19:09:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.104 2013/01/16 07:56:57 ssuominen Exp $
+
+  16 Jan 2013; Samuli Suominen <ssuominen@gentoo.org>
+  -libmikmod-3.1.12-r1.ebuild, -files/libmikmod-3.1.12-64bit.patch,
+  -files/libmikmod-3.1.12-autotools.patch, -libmikmod-3.2.0_beta2-r3.ebuild,
+  -libmikmod-3.2.0_beta2-r5.ebuild, -files/libmikmod-3.2.0_beta2-64bit.patch,
+  -files/libmikmod-3.2.0_beta2-CVE-2009-3995-3996.patch,
+  -files/libmikmod-3.2.0_beta2-CVE-2010-2546-2971.patch,
+  -files/libmikmod-3.2.0_beta2-autotools.patch,
+  -files/libmikmod-3.2.0_beta2-doubleRegister.patch,
+  -files/libmikmod-3.2.0_beta2-fix-unload-crash.patch,
+  -files/libmikmod-3.2.0_beta2-fix-vol-crash.patch,
+  -files/libmikmod-3.2.0_beta2-info.patch,
+  -files/libmikmod-3.2.0_beta2-no-drv_raw.patch,
+  -files/libmikmod-3.2.0_beta2-pa-workaround.patch,
+  -files/libmikmod-3.2.0_beta2-shell.patch,
+  -files/libmikmod-CVE-2007-6720.patch, -files/libmikmod-CVE-2009-0179.patch:
+  old
 
   01 Jan 2013; Raúl Porcel <armin76@gentoo.org> libmikmod-3.2.0.ebuild:
   sh stable wrt #445556
diff --git a/media-libs/libmikmod/files/libmikmod-3.1.12-64bit.patch b/media-libs/libmikmod/files/libmikmod-3.1.12-64bit.patch
deleted file mode 100644
index fdc8bad616c9..000000000000
--- a/media-libs/libmikmod/files/libmikmod-3.1.12-64bit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur libmikmod-3.1.12.orig/include/mikmod.h.in libmikmod-3.1.12/include/mikmod.h.in
---- libmikmod-3.1.12.orig/include/mikmod.h.in	2007-12-15 11:24:19.000000000 +0200
-+++ libmikmod-3.1.12/include/mikmod.h.in	2010-03-06 20:42:09.000000000 +0200
-@@ -85,7 +85,8 @@
- 
- @DOES_NOT_HAVE_SIGNED@
- 
--#if defined(__arch64__) || defined(__alpha) || defined(__x86_64)
-+#include <stdint.h>
-+#if __WORDSIZE == 64
- /* 64 bit architectures */
- 
- typedef signed char     SBYTE;      /* 1 byte, signed */
-diff -ur libmikmod-3.1.12.orig/include/mikmod_internals.h libmikmod-3.1.12/include/mikmod_internals.h
---- libmikmod-3.1.12.orig/include/mikmod_internals.h	2007-12-15 14:24:51.000000000 +0200
-+++ libmikmod-3.1.12/include/mikmod_internals.h	2010-03-06 20:42:42.000000000 +0200
-@@ -50,7 +50,8 @@
- /*========== More type definitions */
- 
- /* SLONGLONG: 64bit, signed */
--#if defined (__arch64__) || defined(__alpha)
-+#include <stdint.h>
-+#if __WORDSIZE == 64
- typedef long		SLONGLONG;
- #define NATIVE_64BIT_INT
- #elif defined(__WATCOMC__)
diff --git a/media-libs/libmikmod/files/libmikmod-3.1.12-autotools.patch b/media-libs/libmikmod/files/libmikmod-3.1.12-autotools.patch
deleted file mode 100644
index f516324a918e..000000000000
--- a/media-libs/libmikmod/files/libmikmod-3.1.12-autotools.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-diff -ruN libmikmod-3.1.12.orig/configure.in libmikmod-3.1.12/configure.in
---- libmikmod-3.1.12.orig/configure.in	2007-12-15 11:22:57.000000000 +0200
-+++ libmikmod-3.1.12/configure.in	2010-03-06 21:06:09.000000000 +0200
-@@ -257,10 +257,10 @@
- if test "`uname`" = "Linux" && test $libmikmod_driver_alsa = yes
- then
- 	libmikmod_driver_alsa=no
--	AC_CHECK_HEADERS(sys/asoundlib.h)
--	if test $ac_cv_header_sys_asoundlib_h = yes
-+	AC_CHECK_HEADERS(alsa/asoundlib.h)
-+	if test $ac_cv_header_alsa_asoundlib_h = yes
- 	then
--		AC_CHECK_LIB(asound,snd_cards,libmikmod_driver_alsa=yes)
-+		AC_CHECK_LIB(asound,snd_card_load,libmikmod_driver_alsa=yes)
- 	fi
- else
- 	libmikmod_driver_alsa=no
-@@ -616,16 +616,16 @@
- 	libmikmod_cv_gcc_inline_safe=yes,
- 	libmikmod_cv_gcc_inline_safe=no,
- 	libmikmod_cv_gcc_inline_safe=no))
--	if test $libmikmod_cv_gcc_inline_safe = yes
-+	if test x$libmikmod_cv_gcc_inline_safe != xyes
- 	then
- 		CFLAGS="$CFLAGS -finline-functions"
- 	else
- 		CFLAGS="$CFLAGS -fno-strength-reduce"
- 	fi
- 	CFLAGS="$CFLAGS -funroll-loops -ffast-math"
--	if test $libmikmod_debug = yes
-+	if test x$libmikmod_debug = xyes
- 	then
--		CFLAGS="$CFLAGS -Wall -Werror"
-+		CFLAGS="$CFLAGS -Wall -g"
- 	else
- 		CFLAGS="$CFLAGS -Wall"
- 	fi
-@@ -663,7 +663,7 @@
- 	if test $libmikmod_cv_gcc_pthread = yes
- 	then
- 		REENTRANT="-pthread $REENTRANT"
--		LIB_LDADD="-pthread"
-+		LIB_LDADD="-pthread -lm"
- 	fi
- fi
- 		
-diff -ruN libmikmod-3.1.12.orig/esd.m4 libmikmod-3.1.12/esd.m4
---- libmikmod-3.1.12.orig/esd.m4	1970-01-01 02:00:00.000000000 +0200
-+++ libmikmod-3.1.12/esd.m4	2010-03-06 21:01:17.000000000 +0200
-@@ -0,0 +1,194 @@
-+# Configure paths for ESD
-+# Manish Singh    98-9-30
-+# stolen back from Frank Belew
-+# stolen from Manish Singh
-+# Shamelessly stolen from Owen Taylor
-+
-+dnl AM_PATH_ESD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-+dnl Test for ESD, and define ESD_CFLAGS and ESD_LIBS
-+dnl
-+AC_DEFUN([AM_PATH_ESD],
-+[dnl 
-+dnl Get the cflags and libraries from the esd-config script
-+dnl
-+AC_ARG_WITH(esd-prefix,[  --with-esd-prefix=PFX   Prefix where ESD is installed (optional)],
-+            esd_prefix="$withval", esd_prefix="")
-+AC_ARG_WITH(esd-exec-prefix,[  --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)],
-+            esd_exec_prefix="$withval", esd_exec_prefix="")
-+AC_ARG_ENABLE(esdtest, [  --disable-esdtest       Do not try to compile and run a test ESD program],
-+		    , enable_esdtest=yes)
-+
-+  if test x$esd_exec_prefix != x ; then
-+     esd_args="$esd_args --exec-prefix=$esd_exec_prefix"
-+     if test x${ESD_CONFIG+set} != xset ; then
-+        ESD_CONFIG=$esd_exec_prefix/bin/esd-config
-+     fi
-+  fi
-+  if test x$esd_prefix != x ; then
-+     esd_args="$esd_args --prefix=$esd_prefix"
-+     if test x${ESD_CONFIG+set} != xset ; then
-+        ESD_CONFIG=$esd_prefix/bin/esd-config
-+     fi
-+  fi
-+
-+  AC_PATH_PROG(ESD_CONFIG, esd-config, no)
-+  min_esd_version=ifelse([$1], ,0.2.7,$1)
-+  AC_MSG_CHECKING(for ESD - version >= $min_esd_version)
-+  no_esd=""
-+  if test "$ESD_CONFIG" = "no" ; then
-+    no_esd=yes
-+  else
-+    AC_LANG_SAVE
-+    AC_LANG_C
-+    ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
-+    ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
-+
-+    esd_major_version=`$ESD_CONFIG $esd_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+    esd_minor_version=`$ESD_CONFIG $esd_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+    esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+    if test "x$enable_esdtest" = "xyes" ; then
-+      ac_save_CFLAGS="$CFLAGS"
-+      ac_save_LIBS="$LIBS"
-+      CFLAGS="$CFLAGS $ESD_CFLAGS"
-+      LIBS="$LIBS $ESD_LIBS"
-+dnl
-+dnl Now check if the installed ESD is sufficiently new. (Also sanity
-+dnl checks the results of esd-config to some extent
-+dnl
-+      rm -f conf.esdtest
-+      AC_TRY_RUN([
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <esd.h>
-+
-+char*
-+my_strdup (char *str)
-+{
-+  char *new_str;
-+  
-+  if (str)
-+    {
-+      new_str = malloc ((strlen (str) + 1) * sizeof(char));
-+      strcpy (new_str, str);
-+    }
-+  else
-+    new_str = NULL;
-+  
-+  return new_str;
-+}
-+
-+int main ()
-+{
-+  int major, minor, micro;
-+  char *tmp_version;
-+
-+  system ("touch conf.esdtest");
-+
-+  /* HP/UX 9 (%@#!) writes to sscanf strings */
-+  tmp_version = my_strdup("$min_esd_version");
-+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-+     printf("%s, bad version string\n", "$min_esd_version");
-+     exit(1);
-+   }
-+
-+   if (($esd_major_version > major) ||
-+      (($esd_major_version == major) && ($esd_minor_version > minor)) ||
-+      (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro)))
-+    {
-+      return 0;
-+    }
-+  else
-+    {
-+      printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version);
-+      printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro);
-+      printf("*** best to upgrade to the required version.\n");
-+      printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n");
-+      printf("*** to point to the correct copy of esd-config, and remove the file\n");
-+      printf("*** config.cache before re-running configure\n");
-+      return 1;
-+    }
-+}
-+
-+],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+       CFLAGS="$ac_save_CFLAGS"
-+       LIBS="$ac_save_LIBS"
-+       AC_LANG_RESTORE
-+     fi
-+  fi
-+  if test "x$no_esd" = x ; then
-+     AC_MSG_RESULT(yes)
-+     ifelse([$2], , :, [$2])     
-+  else
-+     AC_MSG_RESULT(no)
-+     if test "$ESD_CONFIG" = "no" ; then
-+       echo "*** The esd-config script installed by ESD could not be found"
-+       echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in"
-+       echo "*** your path, or set the ESD_CONFIG environment variable to the"
-+       echo "*** full path to esd-config."
-+     else
-+       if test -f conf.esdtest ; then
-+        :
-+       else
-+          echo "*** Could not run ESD test program, checking why..."
-+          CFLAGS="$CFLAGS $ESD_CFLAGS"
-+          LIBS="$LIBS $ESD_LIBS"
-+          AC_LANG_SAVE
-+          AC_LANG_C
-+          AC_TRY_LINK([
-+#include <stdio.h>
-+#include <esd.h>
-+],      [ return 0; ],
-+        [ echo "*** The test program compiled, but did not run. This usually means"
-+          echo "*** that the run-time linker is not finding ESD or finding the wrong"
-+          echo "*** version of ESD. If it is not finding ESD, you'll need to set your"
-+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-+          echo "*** is required on your system"
-+	  echo "***"
-+          echo "*** If you have an old version installed, it is best to remove it, although"
-+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-+          echo "*** exact error that occured. This usually means ESD was incorrectly installed"
-+          echo "*** or that you have moved ESD since it was installed. In the latter case, you"
-+          echo "*** may want to edit the esd-config script: $ESD_CONFIG" ])
-+          CFLAGS="$ac_save_CFLAGS"
-+          LIBS="$ac_save_LIBS"
-+          AC_LANG_RESTORE
-+       fi
-+     fi
-+     ESD_CFLAGS=""
-+     ESD_LIBS=""
-+     ifelse([$3], , :, [$3])
-+  fi
-+  AC_SUBST(ESD_CFLAGS)
-+  AC_SUBST(ESD_LIBS)
-+  rm -f conf.esdtest
-+])
-+
-+dnl AM_ESD_SUPPORTS_MULTIPLE_RECORD([ACTION-IF-SUPPORTS [, ACTION-IF-NOT-SUPPORTS]])
-+dnl Test, whether esd supports multiple recording clients (version >=0.2.21)
-+dnl
-+AC_DEFUN([AM_ESD_SUPPORTS_MULTIPLE_RECORD],
-+[dnl
-+  AC_MSG_NOTICE([whether installed esd version supports multiple recording clients])
-+  ac_save_ESD_CFLAGS="$ESD_CFLAGS"
-+  ac_save_ESD_LIBS="$ESD_LIBS"
-+  AM_PATH_ESD(0.2.21,
-+    ifelse([$1], , [
-+      AM_CONDITIONAL(ESD_SUPPORTS_MULTIPLE_RECORD, true)
-+      AC_DEFINE(ESD_SUPPORTS_MULTIPLE_RECORD, 1,
-+	[Define if you have esound with support of multiple recording clients.])],
-+    [$1]),
-+    ifelse([$2], , [AM_CONDITIONAL(ESD_SUPPORTS_MULTIPLE_RECORD, false)], [$2])
-+    if test "x$ac_save_ESD_CFLAGS" != x ; then
-+       ESD_CFLAGS="$ac_save_ESD_CFLAGS"
-+    fi
-+    if test "x$ac_save_ESD_LIBS" != x ; then
-+       ESD_LIBS="$ac_save_ESD_LIBS"
-+    fi
-+  )
-+])
-diff -ruN libmikmod-3.1.12.orig/libmikmod/Makefile.in libmikmod-3.1.12/libmikmod/Makefile.in
---- libmikmod-3.1.12.orig/libmikmod/Makefile.in	2004-01-21 19:43:52.000000000 +0200
-+++ libmikmod-3.1.12/libmikmod/Makefile.in	2010-03-06 21:02:44.000000000 +0200
-@@ -72,7 +72,7 @@
- 	rm -f Makefile
- 
- $(LIB): $(OBJ)
--	$(LIBTOOL) --mode=link $(CC) -version-info 2:4:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info 2:4:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
- 
- dl_hpux.lo:	$(top_srcdir)/dlapi/dl_hpux.c \
- 			$(top_srcdir)/dlapi/dlfcn.h
-diff -ruN libmikmod-3.1.12.orig/libmikmod-config.in libmikmod-3.1.12/libmikmod-config.in
---- libmikmod-3.1.12.orig/libmikmod-config.in	2004-01-21 19:43:52.000000000 +0200
-+++ libmikmod-3.1.12/libmikmod-config.in	2010-03-06 21:03:10.000000000 +0200
-@@ -50,7 +50,7 @@
- 	;;
- 	--libs)
- 		libdir=-L${exec_prefix}/lib
--		echo $libdir -lmikmod @LIBRARY_LIB@
-+		echo $libdir -lmikmod
- 	;;
- 	*)
- 		echo "${usage}" 1>&2
diff --git a/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-64bit.patch b/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-64bit.patch
deleted file mode 100644
index 19e62d5ddae5..000000000000
--- a/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-64bit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur libmikmod-3.2.0-beta2.orig/include/mikmod.h.in libmikmod-3.2.0-beta2/include/mikmod.h.in
---- libmikmod-3.2.0-beta2.orig/include/mikmod.h.in	2004-02-18 16:10:39.000000000 +0200
-+++ libmikmod-3.2.0-beta2/include/mikmod.h.in	2009-07-23 20:38:39.000000000 +0300
-@@ -85,7 +85,8 @@
- 
- @DOES_NOT_HAVE_SIGNED@
- 
--#if defined(__arch64__) || defined(__alpha)
-+#include <stdint.h>
-+#if __WORDSIZE == 64
- /* 64 bit architectures */
- 
- typedef signed char     SBYTE;      /* 1 byte, signed */
-diff -ur libmikmod-3.2.0-beta2.orig/include/mikmod_internals.h libmikmod-3.2.0-beta2/include/mikmod_internals.h
---- libmikmod-3.2.0-beta2.orig/include/mikmod_internals.h	2004-02-18 15:29:17.000000000 +0200
-+++ libmikmod-3.2.0-beta2/include/mikmod_internals.h	2009-07-23 20:38:39.000000000 +0300
-@@ -50,7 +50,8 @@
- /*========== More type definitions */
- 
- /* SLONGLONG: 64bit, signed */
--#if defined (__arch64__) || defined(__alpha)
-+#include <stdint.h>
-+#if __WORDSIZE == 64
- typedef long		SLONGLONG;
- #define NATIVE_64BIT_INT
- #elif defined(__WATCOMC__)
diff --git a/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-CVE-2009-3995-3996.patch b/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-CVE-2009-3995-3996.patch
deleted file mode 100644
index 1161e898e20d..000000000000
--- a/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-CVE-2009-3995-3996.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## CVE-2009-3995f.dpatch by  <aw@linux.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch for CVE-2009-3995 and CVE-2009-3996
-
-@DPATCH@
-
-diff -Ndurp libmikmod-3.1.11/loaders/load_it.c libmikmod-3.1.11-fixed/loaders/load_it.c
---- libmikmod-3.1.11/loaders/load_it.c	2010-05-31 14:10:34.000000000 +0200
-+++ libmikmod-3.1.11-fixed/loaders/load_it.c	2010-05-31 14:10:10.000000000 +0200
-@@ -862,6 +862,10 @@ BOOL IT_Load(BOOL curious)
- #endif
- 
- 				IT_ProcessEnvelope(vol);
-+				/* fix for CVE-2009-3995 - snatched from SuSe's fix -- AW */
-+				if (ih.volpts>= ENVPOINTS)
-+					ih.volpts = ENVPOINTS-1;
-+
- 				for(u=0;u<ih.volpts;u++)
- 					d->volenv[u].val=(ih.volnode[u]<<2);
- 
-diff -Ndurp libmikmod-3.1.11/loaders/load_ult.c libmikmod-3.1.11-fixed/loaders/load_ult.c
---- libmikmod-3.1.11/loaders/load_ult.c	2010-05-31 14:10:34.000000000 +0200
-+++ libmikmod-3.1.11-fixed/loaders/load_ult.c	2010-05-31 14:10:10.000000000 +0200
-@@ -224,6 +224,9 @@ BOOL ULT_Load(BOOL curious)
- 	for(u=0;u<of.numchn;u++)
- 		for(t=0;t<of.numpat;t++)
- 			of.patterns[(t*of.numchn)+u]=tracks++;
-+	/* fix for CVE-2009-3996 - snatched from SuSe's fix -- AW */
-+    if (of.numchn>=UF_MAXCHAN)
-+		of.numchn=UF_MAXCHAN - 1;
- 
- 	/* read pan position table for v1.5 and higher */
- 	if(mh.id[14]>='3') {
diff --git a/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-CVE-2010-2546-2971.patch b/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-CVE-2010-2546-2971.patch
deleted file mode 100644
index 7e3bff18b25b..000000000000
--- a/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-CVE-2010-2546-2971.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Related: https://bugzilla.redhat.com/show_bug.cgi?id=614643#c6
-Gentoo-bug: http://bugs.gentoo.org/335892
---- loaders/load_it.c.orig	2010-07-22 16:02:16.000000000 +0200
-+++ loaders/load_it.c	2010-07-22 16:07:48.000000000 +0200
-@@ -743,6 +743,8 @@ BOOL IT_Load(BOOL curious)
- #define IT_LoadEnvelope(name,type) 										\
- 				ih. name##flg   =_mm_read_UBYTE(modreader);				\
- 				ih. name##pts   =_mm_read_UBYTE(modreader);				\
-+				if (ih. name##pts > ITENVCNT)							\
-+					ih. name##pts = ITENVCNT;							\
- 				ih. name##beg   =_mm_read_UBYTE(modreader);				\
- 				ih. name##end   =_mm_read_UBYTE(modreader);				\
- 				ih. name##susbeg=_mm_read_UBYTE(modreader);				\
-@@ -756,6 +758,8 @@ BOOL IT_Load(BOOL curious)
- #define IT_LoadEnvelope(name,type) 										\
- 				ih. name/**/flg   =_mm_read_UBYTE(modreader);			\
- 				ih. name/**/pts   =_mm_read_UBYTE(modreader);			\
-+				if (ih. name/**/pts > ITENVCNT)							\
-+					ih. name/**/pts = ITENVCNT;							\
- 				ih. name/**/beg   =_mm_read_UBYTE(modreader);			\
- 				ih. name/**/end   =_mm_read_UBYTE(modreader);			\
- 				ih. name/**/susbeg=_mm_read_UBYTE(modreader);			\
-@@ -862,10 +866,6 @@ BOOL IT_Load(BOOL curious)
- #endif
- 
- 				IT_ProcessEnvelope(vol);
--				/* fix for CVE-2009-3995 - snatched from SuSe's fix -- AW */
--				if (ih.volpts>= ENVPOINTS)
--					ih.volpts = ENVPOINTS-1;
--
- 				for(u=0;u<ih.volpts;u++)
- 					d->volenv[u].val=(ih.volnode[u]<<2);
- 
diff --git a/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-autotools.patch b/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-autotools.patch
deleted file mode 100644
index 78ce941aeb5e..000000000000
--- a/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-autotools.patch
+++ /dev/null
@@ -1,280 +0,0 @@
-diff -ruN libmikmod-3.2.0-beta2.orig/configure.in libmikmod-3.2.0-beta2/configure.in
---- libmikmod-3.2.0-beta2.orig/configure.in	2004-02-21 00:08:30.000000000 +0200
-+++ libmikmod-3.2.0-beta2/configure.in	2009-07-23 21:35:57.000000000 +0300
-@@ -296,10 +296,10 @@
- if test "`uname`" = "Linux" && test $libmikmod_driver_alsa = yes
- then
- 	libmikmod_driver_alsa=no
--	AC_CHECK_HEADERS(sys/asoundlib.h)
--	if test $ac_cv_header_sys_asoundlib_h = yes
-+	AC_CHECK_HEADERS(alsa/asoundlib.h)
-+	if test $ac_cv_header_alsa_asoundlib_h = yes
- 	then
--		AC_CHECK_LIB(asound,snd_cards,libmikmod_driver_alsa=yes)
-+		AC_CHECK_LIB(asound,snd_card_load,libmikmod_driver_alsa=yes)
- 	fi
- else
- 	libmikmod_driver_alsa=no
-@@ -676,16 +676,13 @@
- 	libmikmod_cv_gcc_inline_safe=yes,
- 	libmikmod_cv_gcc_inline_safe=no,
- 	libmikmod_cv_gcc_inline_safe=no))
--	if test $libmikmod_cv_gcc_inline_safe = yes
-+	if test x$libmikmod_cv_gcc_inline_safe != xyes
- 	then
--		CFLAGS="$CFLAGS -finline-functions"
--	else
- 		CFLAGS="$CFLAGS -fno-strength-reduce"
- 	fi
--	CFLAGS="$CFLAGS -funroll-loops -ffast-math"
--	if test $libmikmod_debug = yes
-+	if test x$libmikmod_debug = xyes
- 	then
--		CFLAGS="$CFLAGS -Wall -Werror"
-+		CFLAGS="$CFLAGS -Wall -g"
- 	else
- 		CFLAGS="$CFLAGS -Wall"
- 	fi
-@@ -727,7 +724,7 @@
- 		if test "`uname`" != "Darwin"
- 		then
- 			REENTRANT="-pthread $REENTRANT"
--			LIB_LDADD="-pthread"
-+			LIB_LDADD="-pthread -lm"
- 		fi
- 	fi
- fi
-diff -ruN libmikmod-3.2.0-beta2.orig/esd.m4 libmikmod-3.2.0-beta2/esd.m4
---- libmikmod-3.2.0-beta2.orig/esd.m4	1970-01-01 02:00:00.000000000 +0200
-+++ libmikmod-3.2.0-beta2/esd.m4	2009-07-23 21:35:45.000000000 +0300
-@@ -0,0 +1,194 @@
-+# Configure paths for ESD
-+# Manish Singh    98-9-30
-+# stolen back from Frank Belew
-+# stolen from Manish Singh
-+# Shamelessly stolen from Owen Taylor
-+
-+dnl AM_PATH_ESD([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-+dnl Test for ESD, and define ESD_CFLAGS and ESD_LIBS
-+dnl
-+AC_DEFUN([AM_PATH_ESD],
-+[dnl 
-+dnl Get the cflags and libraries from the esd-config script
-+dnl
-+AC_ARG_WITH(esd-prefix,[  --with-esd-prefix=PFX   Prefix where ESD is installed (optional)],
-+            esd_prefix="$withval", esd_prefix="")
-+AC_ARG_WITH(esd-exec-prefix,[  --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)],
-+            esd_exec_prefix="$withval", esd_exec_prefix="")
-+AC_ARG_ENABLE(esdtest, [  --disable-esdtest       Do not try to compile and run a test ESD program],
-+		    , enable_esdtest=yes)
-+
-+  if test x$esd_exec_prefix != x ; then
-+     esd_args="$esd_args --exec-prefix=$esd_exec_prefix"
-+     if test x${ESD_CONFIG+set} != xset ; then
-+        ESD_CONFIG=$esd_exec_prefix/bin/esd-config
-+     fi
-+  fi
-+  if test x$esd_prefix != x ; then
-+     esd_args="$esd_args --prefix=$esd_prefix"
-+     if test x${ESD_CONFIG+set} != xset ; then
-+        ESD_CONFIG=$esd_prefix/bin/esd-config
-+     fi
-+  fi
-+
-+  AC_PATH_PROG(ESD_CONFIG, esd-config, no)
-+  min_esd_version=ifelse([$1], ,0.2.7,$1)
-+  AC_MSG_CHECKING(for ESD - version >= $min_esd_version)
-+  no_esd=""
-+  if test "$ESD_CONFIG" = "no" ; then
-+    no_esd=yes
-+  else
-+    AC_LANG_SAVE
-+    AC_LANG_C
-+    ESD_CFLAGS=`$ESD_CONFIG $esdconf_args --cflags`
-+    ESD_LIBS=`$ESD_CONFIG $esdconf_args --libs`
-+
-+    esd_major_version=`$ESD_CONFIG $esd_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+    esd_minor_version=`$ESD_CONFIG $esd_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+    esd_micro_version=`$ESD_CONFIG $esd_config_args --version | \
-+           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+    if test "x$enable_esdtest" = "xyes" ; then
-+      ac_save_CFLAGS="$CFLAGS"
-+      ac_save_LIBS="$LIBS"
-+      CFLAGS="$CFLAGS $ESD_CFLAGS"
-+      LIBS="$LIBS $ESD_LIBS"
-+dnl
-+dnl Now check if the installed ESD is sufficiently new. (Also sanity
-+dnl checks the results of esd-config to some extent
-+dnl
-+      rm -f conf.esdtest
-+      AC_TRY_RUN([
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <esd.h>
-+
-+char*
-+my_strdup (char *str)
-+{
-+  char *new_str;
-+  
-+  if (str)
-+    {
-+      new_str = malloc ((strlen (str) + 1) * sizeof(char));
-+      strcpy (new_str, str);
-+    }
-+  else
-+    new_str = NULL;
-+  
-+  return new_str;
-+}
-+
-+int main ()
-+{
-+  int major, minor, micro;
-+  char *tmp_version;
-+
-+  system ("touch conf.esdtest");
-+
-+  /* HP/UX 9 (%@#!) writes to sscanf strings */
-+  tmp_version = my_strdup("$min_esd_version");
-+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-+     printf("%s, bad version string\n", "$min_esd_version");
-+     exit(1);
-+   }
-+
-+   if (($esd_major_version > major) ||
-+      (($esd_major_version == major) && ($esd_minor_version > minor)) ||
-+      (($esd_major_version == major) && ($esd_minor_version == minor) && ($esd_micro_version >= micro)))
-+    {
-+      return 0;
-+    }
-+  else
-+    {
-+      printf("\n*** 'esd-config --version' returned %d.%d.%d, but the minimum version\n", $esd_major_version, $esd_minor_version, $esd_micro_version);
-+      printf("*** of ESD required is %d.%d.%d. If esd-config is correct, then it is\n", major, minor, micro);
-+      printf("*** best to upgrade to the required version.\n");
-+      printf("*** If esd-config was wrong, set the environment variable ESD_CONFIG\n");
-+      printf("*** to point to the correct copy of esd-config, and remove the file\n");
-+      printf("*** config.cache before re-running configure\n");
-+      return 1;
-+    }
-+}
-+
-+],, no_esd=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+       CFLAGS="$ac_save_CFLAGS"
-+       LIBS="$ac_save_LIBS"
-+       AC_LANG_RESTORE
-+     fi
-+  fi
-+  if test "x$no_esd" = x ; then
-+     AC_MSG_RESULT(yes)
-+     ifelse([$2], , :, [$2])     
-+  else
-+     AC_MSG_RESULT(no)
-+     if test "$ESD_CONFIG" = "no" ; then
-+       echo "*** The esd-config script installed by ESD could not be found"
-+       echo "*** If ESD was installed in PREFIX, make sure PREFIX/bin is in"
-+       echo "*** your path, or set the ESD_CONFIG environment variable to the"
-+       echo "*** full path to esd-config."
-+     else
-+       if test -f conf.esdtest ; then
-+        :
-+       else
-+          echo "*** Could not run ESD test program, checking why..."
-+          CFLAGS="$CFLAGS $ESD_CFLAGS"
-+          LIBS="$LIBS $ESD_LIBS"
-+          AC_LANG_SAVE
-+          AC_LANG_C
-+          AC_TRY_LINK([
-+#include <stdio.h>
-+#include <esd.h>
-+],      [ return 0; ],
-+        [ echo "*** The test program compiled, but did not run. This usually means"
-+          echo "*** that the run-time linker is not finding ESD or finding the wrong"
-+          echo "*** version of ESD. If it is not finding ESD, you'll need to set your"
-+          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-+          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-+          echo "*** is required on your system"
-+	  echo "***"
-+          echo "*** If you have an old version installed, it is best to remove it, although"
-+          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-+        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-+          echo "*** exact error that occured. This usually means ESD was incorrectly installed"
-+          echo "*** or that you have moved ESD since it was installed. In the latter case, you"
-+          echo "*** may want to edit the esd-config script: $ESD_CONFIG" ])
-+          CFLAGS="$ac_save_CFLAGS"
-+          LIBS="$ac_save_LIBS"
-+          AC_LANG_RESTORE
-+       fi
-+     fi
-+     ESD_CFLAGS=""
-+     ESD_LIBS=""
-+     ifelse([$3], , :, [$3])
-+  fi
-+  AC_SUBST(ESD_CFLAGS)
-+  AC_SUBST(ESD_LIBS)
-+  rm -f conf.esdtest
-+])
-+
-+dnl AM_ESD_SUPPORTS_MULTIPLE_RECORD([ACTION-IF-SUPPORTS [, ACTION-IF-NOT-SUPPORTS]])
-+dnl Test, whether esd supports multiple recording clients (version >=0.2.21)
-+dnl
-+AC_DEFUN([AM_ESD_SUPPORTS_MULTIPLE_RECORD],
-+[dnl
-+  AC_MSG_NOTICE([whether installed esd version supports multiple recording clients])
-+  ac_save_ESD_CFLAGS="$ESD_CFLAGS"
-+  ac_save_ESD_LIBS="$ESD_LIBS"
-+  AM_PATH_ESD(0.2.21,
-+    ifelse([$1], , [
-+      AM_CONDITIONAL(ESD_SUPPORTS_MULTIPLE_RECORD, true)
-+      AC_DEFINE(ESD_SUPPORTS_MULTIPLE_RECORD, 1,
-+	[Define if you have esound with support of multiple recording clients.])],
-+    [$1]),
-+    ifelse([$2], , [AM_CONDITIONAL(ESD_SUPPORTS_MULTIPLE_RECORD, false)], [$2])
-+    if test "x$ac_save_ESD_CFLAGS" != x ; then
-+       ESD_CFLAGS="$ac_save_ESD_CFLAGS"
-+    fi
-+    if test "x$ac_save_ESD_LIBS" != x ; then
-+       ESD_LIBS="$ac_save_ESD_LIBS"
-+    fi
-+  )
-+])
-diff -ruN libmikmod-3.2.0-beta2.orig/libmikmod/Makefile.in libmikmod-3.2.0-beta2/libmikmod/Makefile.in
---- libmikmod-3.2.0-beta2.orig/libmikmod/Makefile.in	2004-02-19 15:34:00.000000000 +0200
-+++ libmikmod-3.2.0-beta2/libmikmod/Makefile.in	2009-07-23 21:36:14.000000000 +0300
-@@ -73,7 +73,7 @@
- 	rm -f Makefile
- 
- $(LIB): $(OBJ)
--	$(LIBTOOL) --mode=link $(CC) -version-info 3:0:0 -o $@ $(OBJ) $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -version-info 3:0:0 -o $@ $(OBJ) -lm $(LIBRARY_LIB) -rpath $(DESTDIR)$(libdir)
- 
- dl_hpux.lo:	$(top_srcdir)/dlapi/dl_hpux.c \
- 			$(top_srcdir)/dlapi/dlfcn.h
-diff -ruN libmikmod-3.2.0-beta2.orig/libmikmod-config.in libmikmod-3.2.0-beta2/libmikmod-config.in
---- libmikmod-3.2.0-beta2.orig/libmikmod-config.in	2004-01-21 03:36:34.000000000 +0200
-+++ libmikmod-3.2.0-beta2/libmikmod-config.in	2009-07-23 21:35:45.000000000 +0300
-@@ -50,7 +50,7 @@
- 	;;
- 	--libs)
- 		libdir=-L${exec_prefix}/lib
--		echo $libdir -lmikmod @LIBRARY_LIB@
-+		echo $libdir -lmikmod
- 	;;
- 	*)
- 		echo "${usage}" 1>&2
-diff -ruN libmikmod-3.2.0-beta2.orig/libmikmod.m4 libmikmod-3.2.0-beta2/libmikmod.m4
---- libmikmod-3.2.0-beta2.orig/libmikmod.m4	2004-01-21 03:36:34.000000000 +0200
-+++ libmikmod-3.2.0-beta2/libmikmod.m4	2009-07-23 21:35:45.000000000 +0300
-@@ -8,7 +8,7 @@
- dnl Test for libmikmod, and define LIBMIKMOD_CFLAGS, LIBMIKMOD_LIBS and
- dnl LIBMIKMOD_LDADD
- dnl
--AC_DEFUN(AM_PATH_LIBMIKMOD,
-+AC_DEFUN([AM_PATH_LIBMIKMOD],
- [dnl 
- dnl Get the cflags and libraries from the libmikmod-config script
- dnl
diff --git a/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-doubleRegister.patch b/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-doubleRegister.patch
deleted file mode 100644
index 333cd98c34fb..000000000000
--- a/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-doubleRegister.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Do not register a driver twice.
-
-diff -ur libmikmod-3.2.0-beta2.orig/playercode/mdriver.c libmikmod-3.2.0-beta2/playercode/mdriver.c
---- libmikmod-3.2.0-beta2.orig/playercode/mdriver.c	2004-02-18 15:29:19.000000000 +0200
-+++ libmikmod-3.2.0-beta2/playercode/mdriver.c	2009-07-23 20:46:13.000000000 +0300
-@@ -202,7 +202,13 @@
- 	/* don't register a MISSING() driver */
- 	if ((drv->Name) && (drv->Version)) {
- 		if (cruise) {
--			while (cruise->next) cruise = cruise->next;
-+			// Check if the drv is already there.
-+			// Discard it in that case
-+			if (cruise==drv) return;
-+			while (cruise->next) {
-+				cruise = cruise->next;
-+				if (cruise==drv) return;
-+			}
- 			cruise->next = drv;
- 		} else
- 			firstdriver = drv; 
diff --git a/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-fix-unload-crash.patch b/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-fix-unload-crash.patch
deleted file mode 100644
index 90d2a3bd2ac5..000000000000
--- a/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-fix-unload-crash.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Date: 15 Apr 2002 11:01:19 +0200
-From: Guillaume Cottenceau <gc@mandrakesoft.com>
-
-Unfortunately, I should have double checked that the following
-fix (authored by Dave Goehrig <dave@cthulhu-burger.org>, not me),
-was really in the CVS... it's not, as of stable 1.2.3 at least.
-Please include it, it fixes a segfault on exiting a program which
-disabled MOD music during its execution.
-
-Gentoo-bug: http://bugs.gentoo.org/300525
-diff -ru libmikmod-3.1.12.orig/playercode/virtch_common.c libmikmod-3.1.12/playercode/virtch_common.c
---- libmikmod-3.1.12.orig/playercode/virtch_common.c	2007-12-15 01:26:53.000000000 -0800
-+++ libmikmod-3.1.12/playercode/virtch_common.c	2009-10-05 00:37:12.000000000 -0700
-@@ -347,7 +347,7 @@
- 
- void VC1_SampleUnload(SWORD handle)
- {
--	if (handle<MAXSAMPLEHANDLES) {
-+	if (Samples && handle<MAXSAMPLEHANDLES) {
- 		if (Samples[handle])
- 			free(Samples[handle]);
- 		Samples[handle]=NULL;
diff --git a/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-fix-vol-crash.patch b/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-fix-vol-crash.patch
deleted file mode 100644
index 7e05b2fb4aca..000000000000
--- a/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-fix-vol-crash.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Yi-Huang Han - Wed Oct 24 21:55:47 PDT 2001
- * Fixed MOD music volume when looping
-
-Gentoo-bug: http://bugs.gentoo.org/300525
-diff -ru libmikmod-3.1.12.orig/playercode/mplayer.c libmikmod-3.1.12/playercode/mplayer.c
---- libmikmod-3.1.12.orig/playercode/mplayer.c	2009-10-05 00:19:59.000000000 -0700
-+++ libmikmod-3.1.12/playercode/mplayer.c	2009-10-05 00:44:35.000000000 -0700
-@@ -3019,7 +3019,7 @@
- {
- 	MUTEX_LOCK(vars);
- 	if (pf)
--		pf->volume=(volume<0)?0:(volume>128)?128:volume;
-+		pf->volume=pf->initvolume=(volume<0)?0:(volume>128)?128:volume;
- 	MUTEX_UNLOCK(vars);
- }
- 
diff --git a/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-info.patch b/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-info.patch
deleted file mode 100644
index ed869b160de0..000000000000
--- a/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-info.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Fix MikMod_InfoLoader() and MikMod_InfoDriver() functions, fixing mikmod -n output.
-
-diff -ur libmikmod-3.2.0-beta2.orig/playercode/mdriver.c libmikmod-3.2.0-beta2/playercode/mdriver.c
---- libmikmod-3.2.0-beta2.orig/playercode/mdriver.c	2004-02-18 15:29:19.000000000 +0200
-+++ libmikmod-3.2.0-beta2/playercode/mdriver.c	2009-07-23 20:40:26.000000000 +0300
-@@ -185,11 +185,12 @@
- 
- 	if(len)
- 		if((list=_mm_malloc(len*sizeof(CHAR)))) {
-+			char *_list = list;
- 			list[0]=0;
- 			/* list all registered device drivers : */
- 			for(t=1,l=firstdriver;l;l=l->next,t++)
--				sprintf(list,(l->next)?"%s%2d %s\n":"%s%2d %s",
--				    list,t,l->Version);
-+				_list += sprintf(_list,(l->next)?"%2d %s\n":"%2d %s",
-+						 t,l->Version);
- 		}
- 	MUTEX_UNLOCK(lists);
- 	return list;
-diff -ur libmikmod-3.2.0-beta2.orig/playercode/mloader.c libmikmod-3.2.0-beta2/playercode/mloader.c
---- libmikmod-3.2.0-beta2.orig/playercode/mloader.c	2004-01-21 03:36:35.000000000 +0200
-+++ libmikmod-3.2.0-beta2/playercode/mloader.c	2009-07-23 20:40:26.000000000 +0300
-@@ -67,10 +67,11 @@
- 
- 	if(len)
- 		if((list=_mm_malloc(len*sizeof(CHAR)))) {
-+			char *_list = list;
- 			list[0]=0;
- 			/* list all registered module loders */
- 			for(l=firstloader;l;l=l->next)
--				sprintf(list,(l->next)?"%s%s\n":"%s%s",list,l->version);
-+				_list += sprintf(_list,(l->next)?"%s\n":"%s",l->version);
- 		}
- 	MUTEX_UNLOCK(lists);
- 	return list;
diff --git a/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-no-drv_raw.patch b/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-no-drv_raw.patch
deleted file mode 100644
index 3bbd2294f475..000000000000
--- a/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-no-drv_raw.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-http://bugs.gentoo.org/266885
-
---- drivers/drv_raw.c
-+++ drivers/drv_raw.c
-@@ -44,6 +44,8 @@
- 
- #include "mikmod_internals.h"
- 
-+#ifdef DRV_RAW
-+
- #define BUFFERSIZE 32768
- #define FILENAME "music.raw"
- 
-@@ -171,4 +173,10 @@
- 	VC_VoiceRealVolume
- };
- 
-+#else
-+
-+MISSING(drv_raw);
-+
-+#endif
-+
- /* ex:set ts=4: */
diff --git a/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-pa-workaround.patch b/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-pa-workaround.patch
deleted file mode 100644
index 6e35912e6513..000000000000
--- a/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-pa-workaround.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Under padsp wrapper mikmod returns
-    buffinf.fragments = -1; buffinf.bytes = -65535.
-Buggy oss emulation layer in pulseaudio.
-More details in upstream report:
-
-Gentoo-bug: http://bugs.gentoo.org/300525
-Upstream-bug: https://bugs.freedesktop.org/show_bug.cgi?id=45643
-diff --git a/drivers/drv_oss.c b/drivers/drv_oss.c
-index 27766f2..74864c2 100644
---- a/drivers/drv_oss.c
-+++ b/drivers/drv_oss.c
-@@ -327,7 +327,7 @@ static void OSS_Update(void)
- 			buffinf.fragments--;
- 			buffinf.fragsize = buffinf.bytes = buffersize;
- 		}
--		if(!buffinf.fragments)
-+		if(buffinf.fragments < 1)
- 			break;
- 		done=VC_WriteBytes(audiobuffer,buffinf.fragsize>buffinf.bytes?
- 						   buffinf.bytes:buffinf.fragsize);
diff --git a/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-shell.patch b/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-shell.patch
deleted file mode 100644
index a5aa1157266a..000000000000
--- a/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-shell.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Upstream didn't ship Makefile.am so we have to patch bits by hands.
-$(SHELL) is needed to run libtool properly (contains bashisms).
-LIBTOOL variable uses $(SHELL) in it's definition.
-
-Gentoo-bug: http://bugs.gentoo.org/401329
-Reported by: Anthony Parsons
-diff --git a/libmikmod/Makefile.in b/libmikmod/Makefile.in
-index c0638de..070134a 100644
---- a/libmikmod/Makefile.in
-+++ b/libmikmod/Makefile.in
-@@ -27,6 +27,7 @@ CC=@CC@
- INSTALL=@INSTALL@
- LIBTOOL=@LIBTOOL@
- MKINSTALLDIRS=${top_srcdir}/mkinstalldirs
-+SHELL=@SHELL@
- 
- DEFS=@DEFS@
- CFLAGS=@CFLAGS@ -Dunix
diff --git a/media-libs/libmikmod/files/libmikmod-CVE-2007-6720.patch b/media-libs/libmikmod/files/libmikmod-CVE-2007-6720.patch
deleted file mode 100644
index 45cc355aee43..000000000000
--- a/media-libs/libmikmod/files/libmikmod-CVE-2007-6720.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-This patch fixes "buffer overflow due to md_numchn - ID: 1630158"
-
-diff -ru libmikmod-3.1.12.orig/playercode/mplayer.c libmikmod-3.1.12/playercode/mplayer.c
---- libmikmod-3.1.12.orig/playercode/mplayer.c	2007-12-15 01:26:28.000000000 -0800
-+++ libmikmod-3.1.12/playercode/mplayer.c	2009-10-04 23:48:36.000000000 -0700
-@@ -52,6 +52,8 @@
-    will wait */
- /*static*/ MODULE *pf = NULL;
- 
-+#define NUMVOICES(mod)	(md_sngchn < (mod)->numvoices ? md_sngchn : (mod)->numvoices)
-+
- #define	HIGH_OCTAVE		2	/* number of above-range octaves */
- 
- static	UWORD oldperiods[OCTAVE*2]={
-@@ -248,14 +250,14 @@
- 	MP_VOICE *a;
- 	ULONG t,k,tvol,pp;
- 
--	for (t=0;t<md_sngchn;t++)
-+	for (t=0;t<NUMVOICES(mod);t++)
- 		if (((mod->voice[t].main.kick==KICK_ABSENT)||
- 			 (mod->voice[t].main.kick==KICK_ENV))&&
- 		   Voice_Stopped_internal(t))
- 			return t;
- 
- 	tvol=0xffffffUL;t=-1;a=mod->voice;
--	for (k=0;k<md_sngchn;k++,a++) {
-+	for (k=0;k<NUMVOICES(mod);k++,a++) {
- 		/* allow us to take over a nonexisting sample */
- 		if (!a->main.s)
- 			return k;
-@@ -2249,12 +2251,12 @@
- 
- 	switch (dat) {
- 	case 0x0: /* past note cut */
--		for (t=0;t<md_sngchn;t++)
-+		for (t=0;t<NUMVOICES(mod);t++)
- 			if (mod->voice[t].master==a)
- 				mod->voice[t].main.fadevol=0;
- 		break;
- 	case 0x1: /* past note off */
--		for (t=0;t<md_sngchn;t++)
-+		for (t=0;t<NUMVOICES(mod);t++)
- 			if (mod->voice[t].master==a) {
- 				mod->voice[t].main.keyoff|=KEY_OFF;
- 				if ((!(mod->voice[t].venv.flg & EF_ON))||
-@@ -2263,7 +2265,7 @@
- 			}
- 		break;
- 	case 0x2: /* past note fade */
--		for (t=0;t<md_sngchn;t++)
-+		for (t=0;t<NUMVOICES(mod);t++)
- 			if (mod->voice[t].master==a)
- 				mod->voice[t].main.keyoff|=KEY_FADE;
- 		break;
-@@ -2318,7 +2320,7 @@
- 	SAMPLE *s;
- 
- 	mod->totalchn=mod->realchn=0;
--	for (channel=0;channel<md_sngchn;channel++) {
-+	for (channel=0;channel<NUMVOICES(mod);channel++) {
- 		aout=&mod->voice[channel];
- 		i=aout->main.i;
- 		s=aout->main.s;
-@@ -2736,7 +2738,7 @@
- 			if (a->dct!=DCT_OFF) {
- 				int t;
- 
--				for (t=0;t<md_sngchn;t++)
-+				for (t=0;t<NUMVOICES(mod);t++)
- 					if ((!Voice_Stopped_internal(t))&&
- 					   (mod->voice[t].masterchn==channel)&&
- 					   (a->main.sample==mod->voice[t].main.sample)) {
-@@ -2978,6 +2980,11 @@
- 	if (!(mod->voice=(MP_VOICE*)_mm_calloc(md_sngchn,sizeof(MP_VOICE))))
- 		return 1;
- 
-+	/* mod->numvoices was used during loading to clamp md_sngchn.
-+	   After loading it's used to remember how big mod->voice is.
-+	*/
-+	mod->numvoices = md_sngchn;
-+
- 	Player_Init_internal(mod);
- 	return 0;
- }
-@@ -3086,7 +3093,7 @@
- 		pf->patbrk=0;
- 		pf->vbtick=pf->sngspd;
- 
--		for (t=0;t<md_sngchn;t++) {
-+		for (t=0;t<NUMVOICES(pf);t++) {
- 			Voice_Stop_internal(t);
- 			pf->voice[t].main.i=NULL;
- 			pf->voice[t].main.s=NULL;
-@@ -3111,7 +3118,7 @@
- 		pf->patbrk=0;
- 		pf->vbtick=pf->sngspd;
- 
--		for (t=0;t<md_sngchn;t++) {
-+		for (t=0;t<NUMVOICES(pf);t++) {
- 			Voice_Stop_internal(t);
- 			pf->voice[t].main.i=NULL;
- 			pf->voice[t].main.s=NULL;
-@@ -3138,7 +3145,7 @@
- 		pf->sngpos=pos;
- 		pf->vbtick=pf->sngspd;
- 
--		for (t=0;t<md_sngchn;t++) {
-+		for (t=0;t<NUMVOICES(pf);t++) {
- 			Voice_Stop_internal(t);
- 			pf->voice[t].main.i=NULL;
- 			pf->voice[t].main.s=NULL;
diff --git a/media-libs/libmikmod/files/libmikmod-CVE-2009-0179.patch b/media-libs/libmikmod/files/libmikmod-CVE-2009-0179.patch
deleted file mode 100644
index 0c47e6545575..000000000000
--- a/media-libs/libmikmod/files/libmikmod-CVE-2009-0179.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur libmikmod-3.1.11.orig/loaders/load_xm.c libmikmod-3.1.11/loaders/load_xm.c
---- libmikmod-3.1.11.orig/loaders/load_xm.c	2004-01-21 18:43:53.000000000 +0100
-+++ libmikmod-3.1.11/loaders/load_xm.c	2008-04-16 04:30:45.000000000 +0200
-@@ -622,7 +622,8 @@
- 				/* read the remainder of the header */
- 				for(u=headend-_mm_ftell(modreader);u;u--) _mm_read_UBYTE(modreader);
- 
--				if(_mm_eof(modreader)) {
-+				/* last instrument is at the end of file in version 0x0104 */
-+				if(_mm_eof(modreader) && (mh->version<0x0104 || t<of.numins-1)) {
- 					free(nextwav);free(wh);
- 					nextwav=NULL;wh=NULL;
- 					_mm_errno = MMERR_LOADING_SAMPLEINFO;
-diff -ur libmikmod-3.1.11.orig/playercode/mloader.c libmikmod-3.1.11/playercode/mloader.c
---- libmikmod-3.1.11.orig/playercode/mloader.c	2004-01-21 18:43:53.000000000 +0100
-+++ libmikmod-3.1.11/playercode/mloader.c	2008-04-16 04:30:45.000000000 +0200
-@@ -450,10 +450,12 @@
- 	if (!l->Init || l->Init()) {
- 		_mm_rewind(modreader);
- 		ok = l->Load(curious);
--		/* propagate inflags=flags for in-module samples */
--		for (t = 0; t < of.numsmp; t++)
--			if (of.samples[t].inflags == 0)
--				of.samples[t].inflags = of.samples[t].flags;
-+		if (ok) {
-+			/* propagate inflags=flags for in-module samples */
-+			for (t = 0; t < of.numsmp; t++)
-+				if (of.samples[t].inflags == 0)
-+					of.samples[t].inflags = of.samples[t].flags;
-+		}
- 	} else
- 		ok = 0;
- 
diff --git a/media-libs/libmikmod/libmikmod-3.1.12-r1.ebuild b/media-libs/libmikmod/libmikmod-3.1.12-r1.ebuild
deleted file mode 100644
index 903830c78756..000000000000
--- a/media-libs/libmikmod/libmikmod-3.1.12-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.1.12-r1.ebuild,v 1.3 2012/03/02 20:02:43 ssuominen Exp $
-
-# this ebuild is only for the libmikmod.so.2 SONAME for ABI compat
-
-EAPI=2
-inherit autotools eutils flag-o-matic multilib
-
-DESCRIPTION="A library to play a wide range of module formats"
-HOMEPAGE="http://mikmod.raphnet.net/"
-SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 LGPL-2 )"
-SLOT="2"
-KEYWORDS="amd64 x86"
-IUSE="+oss raw"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-64bit.patch \
-		"${FILESDIR}"/${P}-autotools.patch \
-		"${FILESDIR}"/${PN}-3.2.0_beta2-info.patch \
-		"${FILESDIR}"/${PN}-3.2.0_beta2-doubleRegister.patch \
-		"${FILESDIR}"/${PN}-CVE-2007-6720.patch \
-		"${FILESDIR}"/${PN}-CVE-2009-0179.patch \
-		"${FILESDIR}"/${PN}-3.2.0_beta2-no-drv_raw.patch \
-		"${FILESDIR}"/${PN}-3.2.0_beta2-fix-vol-crash.patch \
-		"${FILESDIR}"/${PN}-3.2.0_beta2-fix-unload-crash.patch \
-		"${FILESDIR}"/${PN}-3.2.0_beta2-CVE-2009-3995-3996.patch \
-		"${FILESDIR}"/${PN}-3.2.0_beta2-CVE-2010-2546-2971.patch \
-		"${FILESDIR}"/${PN}-3.2.0_beta2-pa-workaround.patch
-
-	AT_M4DIR=${S} eautoreconf
-}
-
-src_configure() {
-	use raw && append-flags -DDRV_RAW
-
-	econf \
-		--disable-af \
-		--disable-alsa \
-		--disable-esd \
-		$(use_enable oss) \
-		--disable-static
-}
-
-src_install() {
-	exeinto /usr/$(get_libdir)
-	newexe ${PN}/.libs/${PN}.so.2.0.4 ${PN}.so.2 || die
-}
-
-pkg_postinst() {
-	use oss || ewarn "No audio output will be available because of USE=\"-oss\"."
-}
diff --git a/media-libs/libmikmod/libmikmod-3.2.0_beta2-r3.ebuild b/media-libs/libmikmod/libmikmod-3.2.0_beta2-r3.ebuild
deleted file mode 100644
index 8860049b2589..000000000000
--- a/media-libs/libmikmod/libmikmod-3.2.0_beta2-r3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.2.0_beta2-r3.ebuild,v 1.9 2012/03/02 20:00:23 ssuominen Exp $
-
-EAPI=2
-MY_P=${P/_/-}
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="A library to play a wide range of module formats"
-HOMEPAGE="http://mikmod.raphnet.net/"
-SRC_URI="http://mikmod.raphnet.net/files/${MY_P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 LGPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-# Enable OSS by default since ALSA support isn't available, look below
-IUSE="+oss raw"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-64bit.patch \
-		"${FILESDIR}"/${P}-autotools.patch \
-		"${FILESDIR}"/${P}-info.patch \
-		"${FILESDIR}"/${P}-doubleRegister.patch \
-		"${FILESDIR}"/${PN}-CVE-2007-6720.patch \
-		"${FILESDIR}"/${PN}-CVE-2009-0179.patch \
-		"${FILESDIR}"/${P}-no-drv_raw.patch \
-		"${FILESDIR}"/${P}-fix-vol-crash.patch \
-		"${FILESDIR}"/${P}-fix-unload-crash.patch \
-		"${FILESDIR}"/${P}-CVE-2009-3995-3996.patch \
-		"${FILESDIR}"/${P}-CVE-2010-2546-2971.patch \
-		"${FILESDIR}"/${P}-pa-workaround.patch
-
-	AT_M4DIR=${S} eautoreconf
-}
-
-src_configure() {
-	use raw && append-flags -DDRV_RAW
-
-	# * af is something called AF/AFlib.h and -lAF, not audiofile in tree
-	# * alsa support is for deprecated API and doesn't work
-	econf \
-		--disable-af \
-		--disable-alsa \
-		--disable-esd \
-		$(use_enable oss)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README TODO
-	dohtml docs/*.html
-}
-
-pkg_postinst() {
-	use oss || ewarn "No audio output will be available because of USE=\"-oss\"."
-}
diff --git a/media-libs/libmikmod/libmikmod-3.2.0_beta2-r5.ebuild b/media-libs/libmikmod/libmikmod-3.2.0_beta2-r5.ebuild
deleted file mode 100644
index ffc3a86298f4..000000000000
--- a/media-libs/libmikmod/libmikmod-3.2.0_beta2-r5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.2.0_beta2-r5.ebuild,v 1.1 2012/02/09 18:27:38 slyfox Exp $
-
-EAPI=2
-MY_P=${P/_/-}
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="A library to play a wide range of module formats"
-HOMEPAGE="http://mikmod.raphnet.net/"
-SRC_URI="http://mikmod.raphnet.net/files/${MY_P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 LGPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-# Enable OSS by default since ALSA support isn't available, look below
-IUSE="+oss raw static-libs"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-64bit.patch \
-		"${FILESDIR}"/${P}-autotools.patch \
-		"${FILESDIR}"/${P}-info.patch \
-		"${FILESDIR}"/${P}-doubleRegister.patch \
-		"${FILESDIR}"/${PN}-CVE-2007-6720.patch \
-		"${FILESDIR}"/${PN}-CVE-2009-0179.patch \
-		"${FILESDIR}"/${P}-no-drv_raw.patch \
-		"${FILESDIR}"/${P}-fix-vol-crash.patch \
-		"${FILESDIR}"/${P}-fix-unload-crash.patch \
-		"${FILESDIR}"/${P}-CVE-2009-3995-3996.patch \
-		"${FILESDIR}"/${P}-CVE-2010-2546-2971.patch \
-		"${FILESDIR}"/${P}-pa-workaround.patch \
-		"${FILESDIR}"/${P}-shell.patch
-
-	AT_M4DIR=${S} eautoreconf
-}
-
-src_configure() {
-	use raw && append-flags -DDRV_RAW
-
-	# * af is something called AF/AFlib.h and -lAF, not audiofile in tree
-	# * alsa support is for deprecated API and doesn't work
-	econf \
-		--disable-af \
-		--disable-alsa \
-		--disable-esd \
-		$(use_enable oss) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README TODO
-	dohtml docs/*.html
-
-	use static-libs || find "${ED}" -name '*.la' -delete
-}
-
-pkg_postinst() {
-	use oss || ewarn "No audio output will be available because of USE=\"-oss\"."
-}