Import ABI slotted libmikmod.so.2 wrt #307893.

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

12 files changed, 352 insertions, 182 deletions

diff --git a/media-libs/libmikmod/ChangeLog b/media-libs/libmikmod/ChangeLog
index 0c0d59787a5c..c3647653a506 100644
--- a/media-libs/libmikmod/ChangeLog
+++ b/media-libs/libmikmod/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libmikmod
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.71 2010/03/01 22:44:52 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.72 2010/03/06 19:07:30 ssuominen Exp $
+
+*libmikmod-3.1.12 (06 Mar 2010)
+
+  06 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +libmikmod-3.1.12.ebuild, +files/libmikmod-3.1.12-64bit.patch,
+  +files/libmikmod-3.1.12-autotools.patch:
+  Import ABI slotted libmikmod.so.2 wrt #307893.
 
 *libmikmod-3.2.0_beta2-r2 (01 Mar 2010)
 
diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest
index be72603b9863..d16c3a2d8a1f 100644
--- a/media-libs/libmikmod/Manifest
+++ b/media-libs/libmikmod/Manifest
@@ -1,9 +1,5 @@
-AUX libmikmod-3.1.11-alsa.patch 816 RMD160 829c9a979849e1f770166f06674015a79be6d4bf SHA1 c6104ca5bfd56ef49565cf718f92db32ca7fd001 SHA256 4b6fa98756681b6a26d9207ed065a6b3f4d821df288c694b43f91e2d9c83930a
-AUX libmikmod-3.1.11-amd64-archdef.patch 490 RMD160 eeba4322c3cc54391acc35c6cfb9e544d32b5daa SHA1 c14d486348347e6608580dd94a94a7f3a75b33a3 SHA256 59101a6b5c25a4a8af7a18a7d9b206e3183380c80f490c251f9bb4140bcd7b6d
-AUX libmikmod-3.1.11-amd64-ppc64-archdef.patch 516 RMD160 3d5a063b7327c17b87790dae2b6399811403a602 SHA1 0773ab390f4ef2a30d921031b782b5ec3fb57f9e SHA256 206fe12a3d4460d6cf3e10b6c6476e3a569078e7b0bc101017ac6348d8a3b567
-AUX libmikmod-3.1.11-doubleRegister.patch 544 RMD160 c16e61ccc75d97781ce8d2d60a8541432b0fd7d9 SHA1 9bf47cc969c35bd0837e2780aef28e359cf3683e SHA256 efe5559c9fdc32a21ae77450e851114207c893450e0ee97d86bc506ff9716361
-AUX libmikmod-3.1.11-m4.patch 268 RMD160 b11341869880ae7880318247efa7d771f741a152 SHA1 ccb57f72afaac800cfc73cd85ea3006bebbc6a45 SHA256 cd9b3a93005b332f298af392537651f2430df7f6400d68983a19788c33d401aa
-AUX libmikmod-3.1.11-respectflags.patch 1637 RMD160 b166b5e82e7683717afbfdbac89571c10fd01595 SHA1 895b5ab9ac850c004f00ff8f13ba18606fe110b7 SHA256 cec50c01cdf9ee1ea4df792444a3dd1b6c9317ccc3fb1ec48a9c37d90e72a55b
+AUX libmikmod-3.1.12-64bit.patch 1025 RMD160 5b69f9753e472d9e5ca2dd7371ebdcc180bb6fc9 SHA1 ede03c4c7f7d347273234eed537becc5549166ec SHA256 46bbd80f4a1c3f1cec562b2c1b6052350183cae8e248f108fb32eeb0e66d3f4e
+AUX libmikmod-3.1.12-autotools.patch 9689 RMD160 cf73d9554c55788424c1aae4ba2c9d6daff9cee2 SHA1 60eefe73e495d699b762ca51a69cbd07587d8e74 SHA256 fc35b99db670935dc76d3f511bfd9027a3698c070021e4ba2a6ee6222cd98f72
 AUX libmikmod-3.2.0_beta2-64bit.patch 1044 RMD160 5d16f56caae168d875a5bb607f098118cef16242 SHA1 7d6ac6f5b5773968a9d6ecfeefc2a9bef66e2cf5 SHA256 552d9edc4c4aedef74142d180f3ba91e242fa9cf3a24feefc5588716e9e12a3f
 AUX libmikmod-3.2.0_beta2-autotools.patch 10264 RMD160 ea1718aaf0e75464522ba25b6aa8fd609a783667 SHA1 bb9ffc1164e01cb9ddb171573888501d647e3747 SHA256 fa0b1b75420efb86ad7ac627d1ac9b82ba233f594672879fcaa65778b7dc7513
 AUX libmikmod-3.2.0_beta2-doubleRegister.patch 722 RMD160 9b40114b4a966747af2905aaa38f3b1ee7e1d263 SHA1 f57811b14706dc31ece6206bc472a3ed7288f422 SHA256 f658d3459ef5bebf8daea407961cfa5f5059035a5fbbb56f81b26807fbe907f2
@@ -11,11 +7,10 @@ AUX libmikmod-3.2.0_beta2-info.patch 1405 RMD160 7ce4c47e7ec34c5d2f33bd538d59a7f
 AUX libmikmod-3.2.0_beta2-no-drv_raw.patch 312 RMD160 a3be6c7f01ebe90a14f016a0fa23de33578fc445 SHA1 a72b8ff78940218e589a4566c9349ad951b33f1a SHA256 6201e46dba0a7e3c5ab793b85e9db8469c467b44df0aa04201029939dee63947
 AUX libmikmod-CVE-2007-6720.patch 3178 RMD160 8c9e8493f609e79dc6981b6182c17a645220a5fe SHA1 311cbe9412eeeb576afed3425e28d6aae3abd822 SHA256 580ca0d63d94a7bd009346da49cf731e8d837a723af30f530be57c0084e2b8ab
 AUX libmikmod-CVE-2009-0179.patch 1401 RMD160 0c4967c39d5c67b6d677b05d7f223785b7d53c6a SHA1 fbfa3648f9368a2ad010a504f2650792797ea8a7 SHA256 386b8430c38c21e8c558db88fa1e1844459df1381e610843a39e6763cd6329fd
-DIST libmikmod-3.1.11-esdm4.patch.bz2 2944 RMD160 8abf8e31a5e3cb9ebee45a04b52ef04024894e25 SHA1 63e03cb0f34d3ece66af2403d9c2d5c463affe7b SHA256 3dc3d413a9c617b919523866768559bee487a240670040f987825305609987da
-DIST libmikmod-3.1.11.tar.gz 611590 RMD160 79b144cce51340b4c9abe09d1110dba2333d7bfb SHA1 ca18fff19348d3bcf3550aa920b129b082c5069a SHA256 2d7598cd2a8c61c023f27c9c7c1aca8bbfd92aadbee2f98b7a6d421eae35c929
+DIST libmikmod-3.1.12.tar.gz 618011 RMD160 561bb8d189d0e3a69f318b629489aa652f63fd52 SHA1 782113f8ec5c9960cacadadc7b0bea8ae607fae4 SHA256 891a2b780306e6ef86e381f459e71a085d4e7f56c970a879d3bf341c01bdfc32
 DIST libmikmod-3.2.0-beta2.tar.gz 760967 RMD160 db2cb3510874f50663528507a2d7598b6137bc3c SHA1 86ba141daf37ce059f83483aabaecddc0d504c73 SHA256 857b66ef04d695f70414188b985e08b04f1f62cc250d72a43d0e0609dfbdba03
-EBUILD libmikmod-3.1.11-r5.ebuild 1354 RMD160 3b8411c1c78ad2a184017b4e730f7dcd44527d63 SHA1 5a3e6f5748c1ec443f0a200a3003700eb3ad3a72 SHA256 0310aff7ed7c929906130c6093178288fe2b3a57fb6786fe46e378518efc507d
+EBUILD libmikmod-3.1.12.ebuild 1217 RMD160 71ccc0cca00f8b349c58435d47738ac5df1c2bd8 SHA1 8f6d6348f0823a8377dad511aa1144498be60156 SHA256 12703591ab410e936426b569d4e47e21168c6a2cff9e41fdff992787bbddbe6f
 EBUILD libmikmod-3.2.0_beta2-r1.ebuild 1353 RMD160 79898fecb97e16d8e4d98f43155e887fbb588f03 SHA1 390a4470e0291845e5330da9bc6279a4c01264de SHA256 03a03186e4851b8b7092de26116888b677d6f011af960dcd1a3202656ba29b79
 EBUILD libmikmod-3.2.0_beta2-r2.ebuild 1460 RMD160 c7081b619a3560f9e4911ec74790ff4eadfe8884 SHA1 bcd5e1dbf9f28e625c8b406fda01a3963fd2bac7 SHA256 7757d1e9b0491693edf384e39e345c0d79de562aa1156c925e4bb03c853d4ce2
-MISC ChangeLog 9980 RMD160 1b88e693db1a5ae817ab27a055fbcb27d7d6ea9d SHA1 74dc5336320d9c22e694de0d7b7a791877e9ee2f SHA256 9b2040af8326b47d1f1b8948a72c47f6138b234d62f4af2e9c7db50cb1629ca2
+MISC ChangeLog 10225 RMD160 b8f567e9535106bf9f3648d800abfe5c6de18bee SHA1 c2165f0f43fbe903229f89ee779ee2ec008d3047 SHA256 1294b72bf6eea4893a2fa639e975ebad04cda78856db4e949f421318eb933954
 MISC metadata.xml 236 RMD160 3969babbfba2230d4e8beec6e5a070dcad100a50 SHA1 57c9f2d501b5459469f2b43c6696e96275887507 SHA256 51c287082d15bcb9fa6e0464614f5bb1490dc3a3c533468de8a6523e46c85d0b
diff --git a/media-libs/libmikmod/files/libmikmod-3.1.11-alsa.patch b/media-libs/libmikmod/files/libmikmod-3.1.11-alsa.patch
deleted file mode 100644
index 1f14fc27f5d1..000000000000
--- a/media-libs/libmikmod/files/libmikmod-3.1.11-alsa.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur libmikmod-3.1.11.orig/configure.in libmikmod-3.1.11/configure.in
---- libmikmod-3.1.11.orig/configure.in	2004-01-22 02:43:52.000000000 +0900
-+++ libmikmod-3.1.11/configure.in	2007-01-14 11:32:35.000000000 +0900
-@@ -6,7 +6,7 @@
- 
- LIBMIKMOD_MAJOR_VERSION=3
- LIBMIKMOD_MINOR_VERSION=1
--LIBMIKMOD_MICRO_VERSION=10
-+LIBMIKMOD_MICRO_VERSION=11
- 
- BETA=
- 
-@@ -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
diff --git a/media-libs/libmikmod/files/libmikmod-3.1.11-amd64-archdef.patch b/media-libs/libmikmod/files/libmikmod-3.1.11-amd64-archdef.patch
deleted file mode 100644
index b66af05b0ae0..000000000000
--- a/media-libs/libmikmod/files/libmikmod-3.1.11-amd64-archdef.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru libmikmod-3.1.11-old/include/mikmod.h.in libmikmod-3.1.11/include/mikmod.h.in
---- libmikmod-3.1.11-old/include/mikmod.h.in	2004-05-21 13:26:08.824106896 -0500
-+++ libmikmod-3.1.11/include/mikmod.h.in	2004-05-21 13:26:39.024515736 -0500
-@@ -85,7 +85,7 @@
- 
- @DOES_NOT_HAVE_SIGNED@
- 
--#if defined(__arch64__) || defined(__alpha)
-+#if defined(__arch64__) || defined(__alpha) || defined(__x86_64)
- /* 64 bit architectures */
- 
- typedef signed char     SBYTE;      /* 1 byte, signed */
diff --git a/media-libs/libmikmod/files/libmikmod-3.1.11-amd64-ppc64-archdef.patch b/media-libs/libmikmod/files/libmikmod-3.1.11-amd64-ppc64-archdef.patch
deleted file mode 100644
index 3947a55cd15b..000000000000
--- a/media-libs/libmikmod/files/libmikmod-3.1.11-amd64-ppc64-archdef.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru libmikmod-3.1.11-old/include/mikmod.h.in libmikmod-3.1.11/include/mikmod.h.in
---- libmikmod-3.1.11-old/include/mikmod.h.in	2004-05-21 13:26:08.824106896 -0500
-+++ libmikmod-3.1.11/include/mikmod.h.in	2004-05-21 13:26:39.024515736 -0500
-@@ -85,7 +85,7 @@
- 
- @DOES_NOT_HAVE_SIGNED@
- 
--#if defined(__arch64__) || defined(__alpha)
-+#if defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__)
- /* 64 bit architectures */
- 
- typedef signed char     SBYTE;      /* 1 byte, signed */
diff --git a/media-libs/libmikmod/files/libmikmod-3.1.11-doubleRegister.patch b/media-libs/libmikmod/files/libmikmod-3.1.11-doubleRegister.patch
deleted file mode 100644
index 7a384fb74a65..000000000000
--- a/media-libs/libmikmod/files/libmikmod-3.1.11-doubleRegister.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- playercode/mdriver.c.old	2007-10-07 10:15:38.000000000 +0200
-+++ playercode/mdriver.c	2007-10-07 10:21:23.000000000 +0200
-@@ -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.1.11-m4.patch b/media-libs/libmikmod/files/libmikmod-3.1.11-m4.patch
deleted file mode 100644
index c4a1c100e385..000000000000
--- a/media-libs/libmikmod/files/libmikmod-3.1.11-m4.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Fix aclocal warning:
-/usr/share/aclocal/libmikmod.m4:11: warning: underquoted definition of AM_PATH_LIBMIKMOD
---- libmikmod-3.1.11/libmikmod.m4
-+++ libmikmod-3.1.11/libmikmod.m4
-@@ -10,3 +10,3 @@
- dnl
--AC_DEFUN(AM_PATH_LIBMIKMOD,
-+AC_DEFUN([AM_PATH_LIBMIKMOD],
- [dnl 
diff --git a/media-libs/libmikmod/files/libmikmod-3.1.11-respectflags.patch b/media-libs/libmikmod/files/libmikmod-3.1.11-respectflags.patch
deleted file mode 100644
index f8238b757fbb..000000000000
--- a/media-libs/libmikmod/files/libmikmod-3.1.11-respectflags.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: libmikmod-3.1.11/configure.in
-===================================================================
---- libmikmod-3.1.11.orig/configure.in
-+++ libmikmod-3.1.11/configure.in
-@@ -616,14 +616,11 @@ int main()
- 	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"
- 	else
-Index: libmikmod-3.1.11/libmikmod-config.in
-===================================================================
---- libmikmod-3.1.11.orig/libmikmod-config.in
-+++ libmikmod-3.1.11/libmikmod-config.in
-@@ -50,7 +50,7 @@ while test $# -gt 0 ; do
- 	;;
- 	--libs)
- 		libdir=-L${exec_prefix}/lib
--		echo $libdir -lmikmod @LIBRARY_LIB@
-+		echo $libdir -lmikmod
- 	;;
- 	*)
- 		echo "${usage}" 1>&2
-Index: libmikmod-3.1.11/libmikmod/Makefile.in
-===================================================================
---- libmikmod-3.1.11.orig/libmikmod/Makefile.in
-+++ libmikmod-3.1.11/libmikmod/Makefile.in
-@@ -72,7 +72,7 @@ distclean:	clean
- 	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 --git a/media-libs/libmikmod/files/libmikmod-3.1.12-64bit.patch b/media-libs/libmikmod/files/libmikmod-3.1.12-64bit.patch
new file mode 100644
index 000000000000..fdc8bad616c9
--- /dev/null
+++ b/media-libs/libmikmod/files/libmikmod-3.1.12-64bit.patch
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 000000000000..f516324a918e
--- /dev/null
+++ b/media-libs/libmikmod/files/libmikmod-3.1.12-autotools.patch
@@ -0,0 +1,268 @@
+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/libmikmod-3.1.11-r5.ebuild b/media-libs/libmikmod/libmikmod-3.1.11-r5.ebuild
deleted file mode 100644
index 4fb323248860..000000000000
--- a/media-libs/libmikmod/libmikmod-3.1.11-r5.ebuild
+++ /dev/null
@@ -1,48 +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/libmikmod/libmikmod-3.1.11-r5.ebuild,v 1.10 2009/09/12 16:24:21 armin76 Exp $
-
-inherit flag-o-matic eutils libtool autotools
-
-DESCRIPTION="A library to play a wide range of module formats"
-HOMEPAGE="http://mikmod.raphnet.net/"
-SRC_URI="http://mikmod.raphnet.net/files/${P}.tar.gz
-	mirror://gentoo/${P}-esdm4.patch.bz2"
-
-LICENSE="|| ( LGPL-2.1 LGPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="oss esd alsa"
-
-RDEPEND=">=media-libs/audiofile-0.2.3
-	alsa? ( >=media-libs/alsa-lib-0.5.9 )
-	esd? ( >=media-sound/esound-0.2.19 )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${DISTDIR}"/${P}-esdm4.patch.bz2
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-m4.patch
-	epatch "${FILESDIR}"/${P}-amd64-ppc64-archdef.patch
-	epatch "${FILESDIR}"/${P}-respectflags.patch
-	epatch "${FILESDIR}"/${P}-alsa.patch
-	epatch "${FILESDIR}"/${P}-doubleRegister.patch
-	AT_M4DIR="${S}/m4" eautoreconf
-}
-
-src_compile() {
-	econf --enable-af \
-		$(use_enable esd) \
-		$(use_enable alsa) \
-		$(use_enable oss)
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS NEWS README TODO
-	dohtml docs/*.html
-}
diff --git a/media-libs/libmikmod/libmikmod-3.1.12.ebuild b/media-libs/libmikmod/libmikmod-3.1.12.ebuild
new file mode 100644
index 000000000000..e99e79adeee4
--- /dev/null
+++ b/media-libs/libmikmod/libmikmod-3.1.12.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 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.ebuild,v 1.1 2010/03/06 19:07:30 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
+
+	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
+}