work around wonky logic for mikmod support in configure (bug #140152)

Package-Manager: portage-2.1.1_pre3-r1

4 files changed, 45 insertions, 22 deletions

diff --git a/media-libs/sdl-mixer/ChangeLog b/media-libs/sdl-mixer/ChangeLog
index 068cacc2424f..2aa337cfeb26 100644
--- a/media-libs/sdl-mixer/ChangeLog
+++ b/media-libs/sdl-mixer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/sdl-mixer
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.40 2006/05/19 18:07:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.41 2006/07/24 08:30:56 mr_bones_ Exp $
+
+  24 Jul 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/sdl-mixer-1.2.7-libmikmod.patch, sdl-mixer-1.2.7.ebuild:
+  work around wonky logic for mikmod support in configure (bug #140152)
 
 *sdl-mixer-1.2.7 (19 May 2006)
 
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index 2aac404f26da..e159a21fec8c 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.2.5-gcc3.patch 1235 RMD160 a5b0f0ff9e314e471a5645832826f54685161cd8 SHA1 4d7b08b45c1c123bba4f45eab493bd37e65594b7 SHA256 fe3a4b07248783029d14d7ef4e45283b70d187891ba03bec9a81b1c742d5b3cf
 MD5 f026901e029ec31037b0bca6dc7f07d8 files/1.2.5-gcc3.patch 1235
 RMD160 a5b0f0ff9e314e471a5645832826f54685161cd8 files/1.2.5-gcc3.patch 1235
@@ -13,6 +10,10 @@ AUX sdl-mixer-1.2.6-mikmod-music-init.patch 260 RMD160 7d53b04ec50bd48c4b85b4381
 MD5 85c429a982fe437337599502a8fa6c1d files/sdl-mixer-1.2.6-mikmod-music-init.patch 260
 RMD160 7d53b04ec50bd48c4b85b4381640b741aba25c36 files/sdl-mixer-1.2.6-mikmod-music-init.patch 260
 SHA256 743e1c76daf96eb1f2497ba4159677103ebb8a786902b91a01800b7bb9d91a5f files/sdl-mixer-1.2.6-mikmod-music-init.patch 260
+AUX sdl-mixer-1.2.7-libmikmod.patch 932 RMD160 0979baa8f90c84e265fac39c007eb128af521b6b SHA1 b2852043c0cbc8286570650cefe9e547cdcce8be SHA256 75b27d778d4e0e6af70f97e86fdb5c0f729097619ef2ef7a5496134ff8be146d
+MD5 391fd7a206858c1f1be34c7d6f24c6b2 files/sdl-mixer-1.2.7-libmikmod.patch 932
+RMD160 0979baa8f90c84e265fac39c007eb128af521b6b files/sdl-mixer-1.2.7-libmikmod.patch 932
+SHA256 75b27d778d4e0e6af70f97e86fdb5c0f729097619ef2ef7a5496134ff8be146d files/sdl-mixer-1.2.7-libmikmod.patch 932
 DIST SDL_mixer-1.2.5.tar.gz 936765 RMD160 e47e216fae13ce93179971de2937076acaa7f3a9 SHA1 48c7c7143f0a0a21e94e743ca0fafd7ae33f62dd SHA256 9a0462535df85f8fd90d726427129e0999605908cba8d1478465d35caea43b9b
 DIST SDL_mixer-1.2.6.tar.gz 1147838 RMD160 f20e3b7db266d9a0da75f2319dcc403d869907e6 SHA1 d8e09d87a750c4bd989f0a3e4f1b6baff601b8f1 SHA256 89f94840b1b42ddfe53a8aee415331516f1bbdd942b42d25e74906a332cdf22a
 DIST SDL_mixer-1.2.7.tar.gz 1960614 RMD160 cacb218f966d35cc66c663c0ce65b148869c08c3 SHA1 42b351360ea9debb2bec23e7e67ba355ec3762a9 SHA256 bb3197285d8dc95a09068bbddefdf34c8b08ded8975bcc169050ff2bfded2ea4
@@ -28,14 +29,14 @@ EBUILD sdl-mixer-1.2.6.ebuild 1236 RMD160 aab79c4d370877748ec265e79432f1ceac5343
 MD5 f84eb8e4df8c2d8e6cc02b8f50990127 sdl-mixer-1.2.6.ebuild 1236
 RMD160 aab79c4d370877748ec265e79432f1ceac534387 sdl-mixer-1.2.6.ebuild 1236
 SHA256 97d1363aee8e73ec729dbddda961fbf51ac4598745bf067b580c7c57ff1b3624 sdl-mixer-1.2.6.ebuild 1236
-EBUILD sdl-mixer-1.2.7.ebuild 1407 RMD160 2e8fed69e21571323b0c972a8d01facadc1ba6c3 SHA1 e3ce38060ddb0661dc7c0d9b6bf82c3d50c98870 SHA256 a17481cc367e3a556d2fcec26fb2761d33d6d5be1b630096f2edea45fb24f4fa
-MD5 800f8b3c484833f969bc1cb3a760ca48 sdl-mixer-1.2.7.ebuild 1407
-RMD160 2e8fed69e21571323b0c972a8d01facadc1ba6c3 sdl-mixer-1.2.7.ebuild 1407
-SHA256 a17481cc367e3a556d2fcec26fb2761d33d6d5be1b630096f2edea45fb24f4fa sdl-mixer-1.2.7.ebuild 1407
-MISC ChangeLog 5726 RMD160 d72449af37003237ab07ea4ad53009fb441ec157 SHA1 b10aefb2e015e6eb116b136ecd0fa7ee47e72e67 SHA256 77639b46477ecb93f2555654ea7d9794c17a333b39140eb761c5f6c60fbee713
-MD5 aea3d20b1ec7ba1bf33b370306bd636a ChangeLog 5726
-RMD160 d72449af37003237ab07ea4ad53009fb441ec157 ChangeLog 5726
-SHA256 77639b46477ecb93f2555654ea7d9794c17a333b39140eb761c5f6c60fbee713 ChangeLog 5726
+EBUILD sdl-mixer-1.2.7.ebuild 1524 RMD160 815a97e040e3e5aeee36cd88df59a93a689a8318 SHA1 d00b1586a214ae4b0633868309af6dba4fbb69df SHA256 869955cce7f2c0c8bd55cb78daf2fbb839efd00734dfe83d0641d1f49db7aef1
+MD5 43b8be949c7cdf78810634c0124eae95 sdl-mixer-1.2.7.ebuild 1524
+RMD160 815a97e040e3e5aeee36cd88df59a93a689a8318 sdl-mixer-1.2.7.ebuild 1524
+SHA256 869955cce7f2c0c8bd55cb78daf2fbb839efd00734dfe83d0641d1f49db7aef1 sdl-mixer-1.2.7.ebuild 1524
+MISC ChangeLog 5920 RMD160 d3c6d949b4c5d10e2a3379c7fcc962f72a55c77d SHA1 d2af718f515c86b1084a097f4f0f53ecba8db4f6 SHA256 0c19ac350aab2701d540175e1770886e5f8db3d50e695f62cee21b94cb5d8aa0
+MD5 ca19f3843d722c4896c917594431964a ChangeLog 5920
+RMD160 d3c6d949b4c5d10e2a3379c7fcc962f72a55c77d ChangeLog 5920
+SHA256 0c19ac350aab2701d540175e1770886e5f8db3d50e695f62cee21b94cb5d8aa0 ChangeLog 5920
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -52,10 +53,3 @@ SHA256 447d23b557caac8fbc320df2e9502ec7f8f4665aa4242546b033b2e58ce07485 files/di
 MD5 92e880cd1db6ddbfe807d6ac1e0b64e6 files/digest-sdl-mixer-1.2.7 250
 RMD160 b898af252d4997a9bdc14763ddcd594bda846b1f files/digest-sdl-mixer-1.2.7 250
 SHA256 bd1aa4af8da233bf091beea02b8019d953d2db2ced855a28dbd80dbf165b4e75 files/digest-sdl-mixer-1.2.7 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEvuUCamhnQswr0vIRAjcaAJ0eSCbvh5GTEn+xkaMKF6Rak1xK0wCgq423
-us/59ac8z7fEnvyFEK2htyU=
-=q7ro
------END PGP SIGNATURE-----
diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.7-libmikmod.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.7-libmikmod.patch
new file mode 100644
index 000000000000..7681bb2c33ac
--- /dev/null
+++ b/media-libs/sdl-mixer/files/sdl-mixer-1.2.7-libmikmod.patch
@@ -0,0 +1,20 @@
+--- configure.in.orig	2006-07-24 04:18:18.000000000 -0400
++++ configure.in	2006-07-24 04:21:23.000000000 -0400
+@@ -155,7 +155,7 @@
+ 	printf("no\n*** libmikmod is older than %d.%d.%d, not using.\n",maj,min,rev);
+ 	return 1;
+ }
+-],,CFLAGS="$CFLAGS_SAVED";LIBS="$LIBS_SAVED",
++],EXTRA_CFLAGS="$EXTRA_CFLAGS -DLIBMIKMOD_MUSIC `$LIBMIKMOD_CONFIG --cflags`";EXTRA_LDFLAGS="$EXTRA_LDFLAGS `$LIBMIKMOD_CONFIG --libs`",CFLAGS="$CFLAGS_SAVED";LIBS="$LIBS_SAVED",
+ [echo $ac_n "cross compiling; assumed OK... $ac_c"])
+ 	fi
+ fi
+@@ -163,7 +163,7 @@
+ AC_ARG_ENABLE([music-mod],
+ AC_HELP_STRING([--enable-music-mod], [enable MOD music via mikmod [[default=yes]]]),
+               [], [enable_music_mod=$no_libmikmod])
+-if test x$enable_music_mod = xyes; then
++if test x$enable_music_mod = xyes -a x$enable_music_libmikmod = xno; then
+     EXTRA_CFLAGS="$EXTRA_CFLAGS -DMOD_MUSIC -I\$(srcdir)/mikmod"
+     SOURCES="$SOURCES $srcdir/mikmod/*.c"
+ fi
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.7.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.7.ebuild
index b574af1417b6..c582818261c0 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.7.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.7.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.7.ebuild,v 1.2 2006/07/20 02:05:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.7.ebuild,v 1.3 2006/07/24 08:30:56 mr_bones_ Exp $
+
+inherit eutils
 
 MY_P=${P/sdl-/SDL_}
 DESCRIPTION="Simple Direct Media Layer Mixer Library"
@@ -23,17 +25,20 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}/${P}-libmikmod.patch"
 	sed -i \
 		-e 's:/usr/local/lib/timidity:/usr/share/timidity:' \
 		timidity/config.h \
 		|| die "sed timidity/config.h failed"
+	aclocal && autoconf || die "autotools failed"
 }
 
 src_compile() {
-	# don't use the internal mikmod library, use the system one if USE=mikmod
 	econf \
-		--disable-music-mod \
+		--disable-dependency-tracking \
+		$(use_enable timidity music-midi) \
 		$(use_enable timidity timidity-midi) \
+		$(use_enable mikmod music-mod) \
 		$(use_enable mikmod music-libmikmod) \
 		$(use_enable mp3 music-mp3) \
 		$(use_enable vorbis music-ogg) \