Properly control oss/sdl according to USE flags.

Package-Manager: portage-2.1.3.9

3 files changed, 32 insertions, 23 deletions

diff --git a/media-sound/mp3blaster/ChangeLog b/media-sound/mp3blaster/ChangeLog
index aaf55f5b84a2..a5feac5f6bc8 100644
--- a/media-sound/mp3blaster/ChangeLog
+++ b/media-sound/mp3blaster/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mp3blaster
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/ChangeLog,v 1.33 2007/08/28 15:31:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/ChangeLog,v 1.34 2007/09/08 22:48:18 vapier Exp $
+
+  08 Sep 2007; Mike Frysinger <vapier@gentoo.org>
+  mp3blaster-3.2.3-r1.ebuild:
+  Properly control oss/sdl according to USE flags.
 
   28 Aug 2007; Mike Frysinger <vapier@gentoo.org>
   mp3blaster-3.2.3-r1.ebuild:
diff --git a/media-sound/mp3blaster/Manifest b/media-sound/mp3blaster/Manifest
index 77d9c500a4cc..1bf3bbda5875 100644
--- a/media-sound/mp3blaster/Manifest
+++ b/media-sound/mp3blaster/Manifest
@@ -7,14 +7,14 @@ EBUILD mp3blaster-3.2.0.ebuild 1782 RMD160 d876df9828a40c1f1de361b7b466f68f8306e
 MD5 ccb2b9344fe60ddd94d2d3bd849b7b00 mp3blaster-3.2.0.ebuild 1782
 RMD160 d876df9828a40c1f1de361b7b466f68f8306e84b mp3blaster-3.2.0.ebuild 1782
 SHA256 2d9bcc7d07ea90f203df3ccb158c4a121985c8309232496bb3a30a3a580e41d5 mp3blaster-3.2.0.ebuild 1782
-EBUILD mp3blaster-3.2.3-r1.ebuild 1547 RMD160 a0d3c62e8066b09d94fac1f43f12418876324d9b SHA1 de472118263aac52312ac375be78fff58bae8a4c SHA256 d7d9c6f34aa0135e1a1fdab23f8f7b3fcc791f2c9bf18ccf77dfdae9ae249628
-MD5 241cafcbc0acda45fafccc8b8d1bd5f1 mp3blaster-3.2.3-r1.ebuild 1547
-RMD160 a0d3c62e8066b09d94fac1f43f12418876324d9b mp3blaster-3.2.3-r1.ebuild 1547
-SHA256 d7d9c6f34aa0135e1a1fdab23f8f7b3fcc791f2c9bf18ccf77dfdae9ae249628 mp3blaster-3.2.3-r1.ebuild 1547
-MISC ChangeLog 4689 RMD160 100f8a77dff74215fe4bd1885486f75c3e63af8a SHA1 0815a65f996e899e8a6855e817879172ae32b2c3 SHA256 bc1109b46b067bec9fe8aaee246172ce6a1bb09eab34a6d953a58dc2ec6dd506
-MD5 77457f625790e583becbae01f1bed1da ChangeLog 4689
-RMD160 100f8a77dff74215fe4bd1885486f75c3e63af8a ChangeLog 4689
-SHA256 bc1109b46b067bec9fe8aaee246172ce6a1bb09eab34a6d953a58dc2ec6dd506 ChangeLog 4689
+EBUILD mp3blaster-3.2.3-r1.ebuild 1627 RMD160 e37158798837ac0a0fcfe2db1a6b3bf3e32ae631 SHA1 0296c14f869945538a42af3b5fbd2d5359878f3c SHA256 1bf55729ba06361c447a4255053188b03aca88ba022feeb6ed1452eb4938ba7f
+MD5 5d594a21325291078f7feabb93094f96 mp3blaster-3.2.3-r1.ebuild 1627
+RMD160 e37158798837ac0a0fcfe2db1a6b3bf3e32ae631 mp3blaster-3.2.3-r1.ebuild 1627
+SHA256 1bf55729ba06361c447a4255053188b03aca88ba022feeb6ed1452eb4938ba7f mp3blaster-3.2.3-r1.ebuild 1627
+MISC ChangeLog 4821 RMD160 14072dd83bcb5fd5fea8a31e12cd4b055ae54902 SHA1 0ac8cc08247f523535576b962bdde539101d1d44 SHA256 c83014569d80e36a62aa7f326ff74fdbd89f217f3b7c9a6f83138404f36aa10a
+MD5 536f07931d841c845153317b59371ab4 ChangeLog 4821
+RMD160 14072dd83bcb5fd5fea8a31e12cd4b055ae54902 ChangeLog 4821
+SHA256 c83014569d80e36a62aa7f326ff74fdbd89f217f3b7c9a6f83138404f36aa10a ChangeLog 4821
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -28,7 +28,7 @@ SHA256 d3b88b27fe0396ab7d869ac13623e9649213db898bc4c423663fb4d954ec56a7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.6 (GNU/Linux)
 
-iD8DBQFG1EA9p/wUKkr7RBoRAhxaAKDFPBcnzOwfmS8d9nyYekY3350yyACgtOYV
-mXSDTyoMDwkQSfhBsWd4d1g=
-=ALEH
+iD8DBQFG4ycWp/wUKkr7RBoRAu40AJ9lXqKotw55625Bdkc+jxIhhihvdgCfS+58
+fNcL3/QmD3vwqzaNSCZ27Dc=
+=dCCL
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mp3blaster/mp3blaster-3.2.3-r1.ebuild b/media-sound/mp3blaster/mp3blaster-3.2.3-r1.ebuild
index fec0e836f273..73c717e314b6 100644
--- a/media-sound/mp3blaster/mp3blaster-3.2.3-r1.ebuild
+++ b/media-sound/mp3blaster/mp3blaster-3.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.2.3-r1.ebuild,v 1.6 2007/08/28 15:31:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.2.3-r1.ebuild,v 1.7 2007/09/08 22:48:18 vapier Exp $
 
 DESCRIPTION="Text console based program for playing audio files"
 HOMEPAGE="http://mp3blaster.sourceforge.net/"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 -ppc ~ppc64 ~sparc ~x86"
-IUSE="esd lirc sdl sid vorbis"
+IUSE="esd lirc oss sdl sid vorbis"
 
 RDEPEND=">=sys-libs/ncurses-5.2
 	lirc? ( app-misc/lirc )
@@ -30,25 +30,30 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-
-	# newthreads and libpth support is broken.
-	if use sdl; then
-		myconf="${myconf} --disable-newthreads --without-pth --with-sdl --with-oss"
-	else
-		myconf="${myconf} --disable-newthreads --without-pth --with-oss"
+	if ! use esd && ! use sdl && ! use oss ; then
+		ewarn "You've disabled esd, sdl, and oss.  Enabling oss for you."
+		myconf="--with-oss"
 	fi
 
-	econf --without-nas ${myconf} \
+	# newthreads and libpth support is broken.
+	econf \
+		--disable-newthreads \
+		--without-pth \
+		--without-nas \
 		$(use_with lirc) \
 		$(use_with vorbis oggvorbis) \
 		$(use_with sid sidplay) \
-		$(use_with esd)
+		$(use_with esd) \
+		$(use_with sdl) \
+		$(use_with oss) \
+		${myconf} \
+		|| die
 	emake || die "emake failed."
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed."
 	# File collision with media-sound/splay.
-	mv "${D}"/usr/bin/splay "${D}"/usr/bin/splay_mp3blaster
+	mv "${D}"/usr/bin/splay "${D}"/usr/bin/splay_mp3blaster || die
 	dodoc AUTHORS BUGS ChangeLog CREDITS FAQ NEWS README TODO
 }