Version bump.

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

11 files changed, 431 insertions, 75 deletions

diff --git a/media-libs/libmikmod/ChangeLog b/media-libs/libmikmod/ChangeLog
index eefbd62fdf9f..4b17413df2ed 100644
--- a/media-libs/libmikmod/ChangeLog
+++ b/media-libs/libmikmod/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/libmikmod
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.54 2009/01/17 00:26:39 aballier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/ChangeLog,v 1.55 2009/07/23 18:07:55 ssuominen Exp $
+
+*libmikmod-3.2.0_beta2 (23 Jul 2009)
+
+  23 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +libmikmod-3.2.0_beta2.ebuild, +files/libmikmod-3.2.0_beta2-64bit.patch,
+  +files/libmikmod-3.2.0_beta2-autotools.patch,
+  +files/libmikmod-3.2.0_beta2-doubleRegister.patch,
+  +files/libmikmod-3.2.0_beta2-info.patch:
+  Version bump.
 
   17 Jan 2009; Alexis Ballier <aballier@gentoo.org>
   libmikmod-3.1.11-r5.ebuild:
diff --git a/media-libs/libmikmod/Manifest b/media-libs/libmikmod/Manifest
index 438dbb49abf5..da009d539726 100644
--- a/media-libs/libmikmod/Manifest
+++ b/media-libs/libmikmod/Manifest
@@ -1,24 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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.2.0_beta2-64bit.patch 1044 RMD160 5d16f56caae168d875a5bb607f098118cef16242 SHA1 7d6ac6f5b5773968a9d6ecfeefc2a9bef66e2cf5 SHA256 552d9edc4c4aedef74142d180f3ba91e242fa9cf3a24feefc5588716e9e12a3f
+AUX libmikmod-3.2.0_beta2-autotools.patch 10094 RMD160 93e4806f06773df18b448e15fadd362162171dca SHA1 e877534500b21aac9593267df4e5a71e2ed7d377 SHA256 dad473607527fa10356731c226df2d302227d766d6b440a241f4df4179351910
+AUX libmikmod-3.2.0_beta2-doubleRegister.patch 722 RMD160 9b40114b4a966747af2905aaa38f3b1ee7e1d263 SHA1 f57811b14706dc31ece6206bc472a3ed7288f422 SHA256 f658d3459ef5bebf8daea407961cfa5f5059035a5fbbb56f81b26807fbe907f2
+AUX libmikmod-3.2.0_beta2-info.patch 1405 RMD160 7ce4c47e7ec34c5d2f33bd538d59a7f991563b0b SHA1 675cff9d348a3c03b5c2672a863688a6ad986301 SHA256 d116a38ad10292c5ee0c37a04e1ed3cd9436e432d5d6b4128721d168199b4be1
 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
-EBUILD libmikmod-3.1.11-r2.ebuild 1235 RMD160 df80af1420d1e25545d42729ed2774de553ad50e SHA1 07c1d94c31345d262a1d0e2fd9c7f313fba1c13a SHA256 569e515d1a4918674c4612ae6baab33f7c1cea16da32dee92afa58730085ef1d
-EBUILD libmikmod-3.1.11-r3.ebuild 1250 RMD160 8502e50cfae46cd5e466e4ecb690a417e4e359c1 SHA1 72f4e4d7a1809c57aab1558b86ac06ff903a0958 SHA256 eb9cd3db1a0fe139a860124027713bcff69533d9d0414d73a068b4234a41c6ca
-EBUILD libmikmod-3.1.11-r4.ebuild 1307 RMD160 5df2ce3ebdbf64137ff1999b8eaec7347175f642 SHA1 684f65e6c98abcefb4c0ee437289279a828cf6fc SHA256 db7852d64d3709339f1101674b0f448ebd58129f485ab342172e6b231e6fe5d6
-EBUILD libmikmod-3.1.11-r5.ebuild 1343 RMD160 5a1110c2836afb83588da62acdef73eb140f125a SHA1 e4b5f094dc1477f5dc1c05cb75e1aa6b8a0b96ae SHA256 c6ef4cc4c49fd6b81da5c6fb99186f16b1da447ac91723d8a7c75eaadde33f25
-MISC ChangeLog 7492 RMD160 47d495b892dec3abdfdd2dd9e00ebdf25b3d5f2a SHA1 347d840a8196a60acb59649ab9945330b62447a5 SHA256 4cc0c2f2b186fd1231ac4fa8edf640e57f9a069b85e1ad5c33dc1f895d1689a1
+DIST libmikmod-3.2.0-beta2.tar.gz 760967 RMD160 db2cb3510874f50663528507a2d7598b6137bc3c SHA1 86ba141daf37ce059f83483aabaecddc0d504c73 SHA256 857b66ef04d695f70414188b985e08b04f1f62cc250d72a43d0e0609dfbdba03
+EBUILD libmikmod-3.1.11-r2.ebuild 1199 RMD160 ff3bc8394e9f1c731bc7bbe351549ade95addf5e SHA1 9642cf24a95738592bb6cc8588c01b4844ac237e SHA256 96d49c0db1ce1922af6823a36ce9f219536185bd02a4cbbc0e9699cf24968d2f
+EBUILD libmikmod-3.1.11-r4.ebuild 1329 RMD160 6d01a48d87109b899fbcd851e0677ba17fdd7321 SHA1 2058308d2afe935db68db31fd43cf98b6a45e6e1 SHA256 2e5d5a56686e7eefa38c43d540449e6f1f609bf4e5de1eec5b35666dcdd6a44c
+EBUILD libmikmod-3.1.11-r5.ebuild 1365 RMD160 b691f511712e94159440eb9fdf5fd6332946aa97 SHA1 5301f400e3a56b1ff4b0b2efae281757019cb931 SHA256 9ece9800a367a668b6cc4563dba7308e18865dfda62f276cc122cfc06b57c334
+EBUILD libmikmod-3.2.0_beta2.ebuild 1131 RMD160 c143a18c0138e05a6155dca92a128b673704e6df SHA1 bd007be121927d1c60390c92b56a5182a04498de SHA256 2441a964126c194e0833bc93910ec3e50136c98263c0a60dd5bcfd0217fdfbf1
+MISC ChangeLog 7821 RMD160 208e7788edf3d6d2a4dea6be2c3c89f31ad44003 SHA1 f8f09cb3c3b802d2adbc8196e705eadd46304002 SHA256 1edd22ae222838f53f5a3ed1b64526a2348e50325b81df33ffc6fb1853aef416
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklxJcYACgkQvFcC4BYPU0qCcQCgxu2GndwSDSepUccCH6UJFWQd
-Rg0AnjKhV+PxWjktUF87MMSKo57/PfKM
-=H6jx
------END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..19e62d5ddae5
--- /dev/null
+++ b/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-64bit.patch
@@ -0,0 +1,26 @@
+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-autotools.patch b/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-autotools.patch
new file mode 100644
index 000000000000..19bd32987d1a
--- /dev/null
+++ b/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-autotools.patch
@@ -0,0 +1,271 @@
+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:00:52.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
+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 20:56:26.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:00:48.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) $(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:00:48.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:00:35.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
new file mode 100644
index 000000000000..333cd98c34fb
--- /dev/null
+++ b/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-doubleRegister.patch
@@ -0,0 +1,20 @@
+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-info.patch b/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-info.patch
new file mode 100644
index 000000000000..ed869b160de0
--- /dev/null
+++ b/media-libs/libmikmod/files/libmikmod-3.2.0_beta2-info.patch
@@ -0,0 +1,36 @@
+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/libmikmod-3.1.11-r2.ebuild b/media-libs/libmikmod/libmikmod-3.1.11-r2.ebuild
index 00fd505cad76..c628f0f6ca95 100644
--- a/media-libs/libmikmod/libmikmod-3.1.11-r2.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.1.11-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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-r2.ebuild,v 1.13 2008/01/16 18:07:17 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.1.11-r2.ebuild,v 1.14 2009/07/23 18:07:55 ssuominen Exp $
 
 WANT_AUTOMAKE="1.5"
 
@@ -13,12 +13,13 @@ SRC_URI="http://mikmod.raphnet.net/files/${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"
+KEYWORDS="hppa"
 IUSE="oss esd alsa"
 
-DEPEND=">=media-libs/audiofile-0.2.3
+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}
diff --git a/media-libs/libmikmod/libmikmod-3.1.11-r3.ebuild b/media-libs/libmikmod/libmikmod-3.1.11-r3.ebuild
deleted file mode 100644
index 43b0fb40f8ad..000000000000
--- a/media-libs/libmikmod/libmikmod-3.1.11-r3.ebuild
+++ /dev/null
@@ -1,49 +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/libmikmod/libmikmod-3.1.11-r3.ebuild,v 1.3 2008/01/16 18:07:17 grobian Exp $
-
-WANT_AUTOMAKE="1.5"
-
-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"
-
-DEPEND=">=media-libs/audiofile-0.2.3
-	alsa? ( >=media-libs/alsa-lib-0.5.9 )
-	esd? ( >=media-sound/esound-0.2.19 )"
-
-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
-	AT_M4DIR="${S}/m4" eautoreconf
-}
-
-src_compile() {
-	econf \
-		--enable-af \
-		$(use_enable esd) \
-		$(use_enable alsa) \
-		$(use_enable oss) \
-		|| die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README TODO
-	dohtml docs/*.html
-}
diff --git a/media-libs/libmikmod/libmikmod-3.1.11-r4.ebuild b/media-libs/libmikmod/libmikmod-3.1.11-r4.ebuild
index 660e44e2c205..2e0d6487785d 100644
--- a/media-libs/libmikmod/libmikmod-3.1.11-r4.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.1.11-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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-r4.ebuild,v 1.8 2008/03/25 21:46:36 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.1.11-r4.ebuild,v 1.9 2009/07/23 18:07:55 ssuominen Exp $
 
 WANT_AUTOMAKE="1.5"
 
@@ -16,9 +16,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="oss esd alsa"
 
-DEPEND=">=media-libs/audiofile-0.2.3
+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}
diff --git a/media-libs/libmikmod/libmikmod-3.1.11-r5.ebuild b/media-libs/libmikmod/libmikmod-3.1.11-r5.ebuild
index f2abf2ba95dd..898b11fae480 100644
--- a/media-libs/libmikmod/libmikmod-3.1.11-r5.ebuild
+++ b/media-libs/libmikmod/libmikmod-3.1.11-r5.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/libmikmod/libmikmod-3.1.11-r5.ebuild,v 1.3 2009/01/17 00:26:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmikmod/libmikmod-3.1.11-r5.ebuild,v 1.4 2009/07/23 18:07:55 ssuominen Exp $
 
 inherit flag-o-matic eutils libtool autotools
 
@@ -14,9 +14,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="oss esd alsa"
 
-DEPEND=">=media-libs/audiofile-0.2.3
+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}
diff --git a/media-libs/libmikmod/libmikmod-3.2.0_beta2.ebuild b/media-libs/libmikmod/libmikmod-3.2.0_beta2.ebuild
new file mode 100644
index 000000000000..b24bb5995437
--- /dev/null
+++ b/media-libs/libmikmod/libmikmod-3.2.0_beta2.ebuild
@@ -0,0 +1,45 @@
+# 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.2.0_beta2.ebuild,v 1.1 2009/07/23 18:07:55 ssuominen Exp $
+
+EAPI=2
+MY_P=${P/_/-}
+
+inherit autotools eutils
+
+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"
+IUSE="alsa oss"
+
+RDEPEND="media-libs/audiofile
+	alsa? ( media-libs/alsa-lib )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-64bit.patch \
+		"${FILESDIR}"/${P}-autotools.patch \
+		"${FILESDIR}"/${P}-info.patch \
+		"${FILESDIR}"/${P}-doubleRegister.patch
+	AT_M4DIR=${S} eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-af \
+		$(use_enable alsa) \
+		--disable-esd \
+		$(use_enable oss)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS NEWS README TODO
+	dohtml docs/*.html
+}