add a midi-related warning (bug #412035); more midi-related dep cleanup from James Le Cuirot

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

3 files changed, 41 insertions, 19 deletions

diff --git a/media-libs/sdl-mixer/ChangeLog b/media-libs/sdl-mixer/ChangeLog
index 8c816e3a346c..101e0b683562 100644
--- a/media-libs/sdl-mixer/ChangeLog
+++ b/media-libs/sdl-mixer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/sdl-mixer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.94 2012/04/16 20:37:53 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.95 2012/04/17 14:46:13 mr_bones_ Exp $
+
+  17 Apr 2012; Michael Sterrett <mr_bones_@gentoo.org> sdl-mixer-1.2.12.ebuild:
+  more midi-related dep cleanup from James Le Cuirot
+
+  17 Apr 2012; Michael Sterrett <mr_bones_@gentoo.org> sdl-mixer-1.2.12.ebuild:
+  add a midi-related warning (bug #412035)
 
   16 Apr 2012; Markus Meier <maekke@gentoo.org> sdl-mixer-1.2.12.ebuild:
   arm stable, bug #411531
diff --git a/media-libs/sdl-mixer/Manifest b/media-libs/sdl-mixer/Manifest
index 4a470f0c0e60..289707849807 100644
--- a/media-libs/sdl-mixer/Manifest
+++ b/media-libs/sdl-mixer/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX sdl-mixer-1.2.11-midi.patch 779 RMD160 aaeeb0e11e002f5648f6079943c2969cd668436a SHA1 8c2cf4d016781f317c328526ac6edff41b18d06f SHA256 267535c82e1e97f4407b02cf7a21c98a1f89fdd431a8698cffa69afacdd44ef5
 AUX sdl-mixer-1.2.11-multilib.patch 1247 RMD160 76f4d4c32bcfd1367dda5e82816d5adc7ff9c1f4 SHA1 05fc2f40e177fd92c27f67a7661f273efca53169 SHA256 76ab56747d29bdae932394f8e501ce22f470096268e0b8cc63ea4335c837976c
 AUX sdl-mixer-1.2.12-wav.patch 796 RMD160 ea730d60020bcb237b7cb3e4474c0147f3958e41 SHA1 f2ba6fa45376d1f68172be2592ccd537d3741021 SHA256 7d455c08d79c4a957a8ae25e83f7253c5ff307a7fdc2c4d433b482dc3b7d70b9
@@ -8,13 +5,6 @@ DIST SDL_mixer-1.2.11.tar.gz 2690654 RMD160 559355116a1c380edf71879da0dbcf5359f0
 DIST SDL_mixer-1.2.12.tar.gz 3707781 RMD160 99089725824095398bfb34fd9ccb7c16674192d8 SHA1 a20fa96470ad9e1052f1957b77ffa68fb090b384 SHA256 1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a
 EBUILD sdl-mixer-1.2.11-r1.ebuild 1951 RMD160 ed55ecb18b9953302b1a13088539a7a4c5e342a3 SHA1 e2fd96ad1f66c58af006ebbef62850ac8de324c8 SHA256 7b43f2fb558ed816b37da24eb4d62346518ceb791a3eb67dee1c479631f68431
 EBUILD sdl-mixer-1.2.11-r2.ebuild 2001 RMD160 00f8791f2c6db5d1f3758a60028bef62f832762d SHA1 e1ed9b39f3da70fb2be3c757cb5a031414dba5b6 SHA256 abee677cae29900fd4f72b379299367629ba25b4e0f68454c5891f4fb62c2ca8
-EBUILD sdl-mixer-1.2.12.ebuild 2193 RMD160 6746396bcd8c551c73eba069c261133744356420 SHA1 f1d0eb9c3b1e0c367e50e4af1378c5f32490b9e9 SHA256 625913f43fbab99e80e5e54558590d30f2cdad9fb081c89ed55e377f1878a9ad
-MISC ChangeLog 12575 RMD160 b3d431841a15a59f557397433c0fbf9d8de5de7e SHA1 962cd2b2257470c087e1150f7d6c8ff3b87088d9 SHA256 c66ef7bccb4b08e7882bcdcb7660473baad8c9ed5e95126a178475030dfc3feb
+EBUILD sdl-mixer-1.2.12.ebuild 2781 RMD160 4f451bbaf262f23f4ffaf9918a14f597c584351c SHA1 70764eef920a8ff9b96ed12ab153d4abf71a6f0b SHA256 9aff0d1f5543d92cac94f99abd1e4791048d65885c48dc356742ee0567ec5c90
+MISC ChangeLog 12836 RMD160 15380892722058142ea9bc918929c3ffdd4c52e8 SHA1 aff3557aea59970d5c0cd3c2fc646cf9247bbae7 SHA256 f96de50f0c21607c2da06e66cc87d6898609a595de48e817cf959615644e8bf0
 MISC metadata.xml 444 RMD160 18310115d9bb10e27fd06a98140761690c0d5d0b SHA1 c664c68d70101827efe3dfbf3b4ba1b455ce1829 SHA256 8d05f3c14ea95b51318a3cc7fb0727d2e69b9eaee8d7e75e3abaf75a47e2ef0a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEARECAAYFAk+Mg9QACgkQkKaRLQcq0GJdFACfRmGws6LpBBOQtLeeCG0xCDT8
-VMIAn2v3raaqWb5rVmH8DAong6Qjonwn
-=+W76
------END PGP SIGNATURE-----
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild
index 0d900b3e60e1..b5bfd296c5e0 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.12.ebuild,v 1.10 2012/04/16 20:37:53 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild,v 1.11 2012/04/17 14:46:13 mr_bones_ Exp $
 
 EAPI=4
 inherit eutils
@@ -18,8 +18,10 @@ REQUIRED_USE="midi? ( || ( timidity fluidsynth ) )"
 
 DEPEND=">=media-libs/libsdl-1.2.10
 	flac? ( media-libs/flac )
-	fluidsynth? ( media-sound/fluidsynth )
-	timidity? ( media-sound/timidity++ )
+	midi? (
+		fluidsynth? ( media-sound/fluidsynth )
+		timidity? ( media-sound/timidity++ )
+	)
 	mad? ( media-libs/libmad )
 	!mad? ( mp3? ( >=media-libs/smpeg-0.4.4-r1 ) )
 	modplug? ( media-libs/libmodplug )
@@ -36,6 +38,13 @@ src_prepare() {
 }
 
 src_configure() {
+	local myconf
+
+	if use midi; then
+		myconf=$(use_enable timidity music-timidity-midi) \
+			$(use_enable fluidsynth music-fluidsynth-midi)
+	fi
+
 	econf \
 		--disable-dependency-tracking \
 		--disable-music-flac-shared \
@@ -44,15 +53,14 @@ src_configure() {
 		--disable-music-mp3-shared \
 		--disable-music-ogg-shared \
 		$(use_enable wav music-wave) \
-		$(use_enable timidity music-timidity-midi) \
-		$(use_enable fluidsynth music-fluidsynth-midi) \
 		$(use_enable vorbis music-ogg) \
 		$(use_enable mikmod music-mod) \
 		$(use_enable modplug music-mod-modplug) \
 		$(use_enable flac music-flac) \
 		$(use_enable static-libs static) \
 		$(use mad && echo --disable-music-mp3 || use_enable mp3 music-mp3) \
-		$(use_enable mad music-mp3-mad-gpl)
+		$(use_enable mad music-mp3-mad-gpl) \
+		${myconf}
 }
 
 src_install() {
@@ -66,3 +74,21 @@ src_install() {
 			|| die "la removal failed"
 	fi
 }
+
+pkg_postinst() {
+	# bug 412035
+	# https://bugs.gentoo.org/show_bug.cgi?id=412035
+	if use midi ; then
+		if use fluidsynth; then
+			ewarn "FluidSynth support requires you to set the SDL_SOUNDFONTS"
+			ewarn "environment variable to the location of a SoundFont file"
+			ewarn "unless the game or application happens to do this for you."
+
+			if use timidity; then
+				ewarn "Failing to do so will result in Timidity being used instead."
+			else
+				ewarn "Failing to do so will result in silence."
+			fi
+		fi
+	fi
+}