Fix building with USE="sid" and sys-devel/gcc >= 4.4.x wrt #362347 by "Boris". Remove deprecated media-sound/esound support. One of USE oss or sdl must be enabled; use REQUIRED_USE

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 61 insertions, 33 deletions

diff --git a/media-sound/mp3blaster/ChangeLog b/media-sound/mp3blaster/ChangeLog
index 15342a7f34c1..2da5357a91fe 100644
--- a/media-sound/mp3blaster/ChangeLog
+++ b/media-sound/mp3blaster/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mp3blaster
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/ChangeLog,v 1.50 2010/11/01 01:53:47 xmw Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/ChangeLog,v 1.51 2012/01/09 17:13:54 ssuominen Exp $
+
+  09 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> mp3blaster-3.2.5.ebuild,
+  +files/mp3blaster-3.2.5-gcc44.patch:
+  Fix building with USE="sid" and sys-devel/gcc >= 4.4.x wrt #362347 by
+  "Boris". Remove deprecated media-sound/esound support. One of USE oss or sdl
+  must be enabled; use REQUIRED_USE
 
   01 Nov 2010; Michael Weber <xmw@gentoo.org> mp3blaster-3.2.5.ebuild:
   arm stable
diff --git a/media-sound/mp3blaster/Manifest b/media-sound/mp3blaster/Manifest
index bc6a3aa93ebd..fd749706ce04 100644
--- a/media-sound/mp3blaster/Manifest
+++ b/media-sound/mp3blaster/Manifest
@@ -1,4 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX mp3blaster-3.2.5-gcc44.patch 325 RMD160 5c803f8a5b39a968c27d34564d3eb240f2a02008 SHA1 933055e11482bf6c7083d13edf99dce9a2bd145e SHA256 6ea92fc75f7d3582ca0f65caba3953aa2070655c21639cb935611fddbd3349c8
 DIST mp3blaster-3.2.5.tar.gz 329407 RMD160 8aca362a6212a93cad26e428480b233766b1888b SHA1 6a0fc892e0739a409735e85b18089c0e25fcc577 SHA256 129115742c77362cc3508eb7782702cfb44af2463a5453e8d19ea68abccedc29
-EBUILD mp3blaster-3.2.5.ebuild 1634 RMD160 4db5656aff35f82346aea72cf9955eac4983d506 SHA1 12c8638cb5a358b7613e3cf65c697378161f210e SHA256 ec5fd4f3be9a57de1fc410cd4215fc5e6fb89d47c8f1170227987138f1b1092a
-MISC ChangeLog 6757 RMD160 3e658332d7dc0b7e40ce5d73aae215037225fcec SHA1 83213d98082153fa95d3b0bbbdf022504f1ae1d3 SHA256 9bdf92dacd2db4ab14aed03df869a871c0fc1f592b1c0a23563cbc45d1a90ae1
+EBUILD mp3blaster-3.2.5.ebuild 1438 RMD160 ceb3f90078f50b391ea6dad6554475ded72effe1 SHA1 c450021d368f96cdcb91529212ab34f41cee4cc3 SHA256 0cf4b02a134c1b810b40af2bbb6225c38dc07bba5315ed323c332ec93234d98e
+MISC ChangeLog 7069 RMD160 cf741560e607b71e5c9919776d1bed1c79fe1391 SHA1 aa909b1f73967642be68587112dfffeb238cf64f SHA256 f65f0953c377b40d3104d9e7e207bdd918430115a653f6127b84f5a7a6953b23
 MISC metadata.xml 249 RMD160 053e31dbee7ebb042316ebe35284efda8a99ecf1 SHA1 00c981a528eff3ed991c5fd2e3f1ac0018fe82d2 SHA256 e31b65ec4e3e20698e1a4f52154b6fb1e9524c27b695547426ec369864612e03
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPCx//AAoJEEdUh39IaPFN7bgIAI0uS4yb1+LhzvnAVQ+uAUtb
+8/beSXpr1eub80BHN4jCVA09U4RGJ17cjwh9aDA9jw7KCoS5jKgkPFPeyCewXGRY
+H4B6RnWsNu2hPNT5cNFrM+DqD3q5pypaRR7lpGTLJKPfjME3jKSAEvfrAW6RHOVb
+U0xdbA5gDZ8OPk7JYbs9omkOH2tjdYCPEEbUV6niMIJ+J/GAgaIbp4IuT1+OXQm8
+RLtk1aspVPcD7wYGEWGwOt6gduOAXlhEt04bHMN9V95wOv16l7MefDJiwItQ2ZsN
+x+wYv6+ktOTjXNVOgPUPLJXQmRHJAiNzWGviczz4wKq5kao/Hg3GgDduponwbes=
+=wZii
+-----END PGP SIGNATURE-----
diff --git a/media-sound/mp3blaster/files/mp3blaster-3.2.5-gcc44.patch b/media-sound/mp3blaster/files/mp3blaster-3.2.5-gcc44.patch
new file mode 100644
index 000000000000..fc1a6c8d053e
--- /dev/null
+++ b/media-sound/mp3blaster/files/mp3blaster-3.2.5-gcc44.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/362347
+
+--- src/global.cc
++++ src/global.cc
+@@ -371,7 +371,7 @@
+ is_sid(const char *filename)
+ {
+ #ifdef HAVE_SIDPLAYER
+-	char *ext = strrchr(filename, '.');
++	const char *ext = strrchr(filename, '.');
+ 	if (ext) {
+ 		if (!strcasecmp(ext, ".psid")) return 1;
+ 		if (!strcasecmp(ext, ".sid")) return 1;
diff --git a/media-sound/mp3blaster/mp3blaster-3.2.5.ebuild b/media-sound/mp3blaster/mp3blaster-3.2.5.ebuild
index 5ba10e791ab9..c438e4cd91b3 100644
--- a/media-sound/mp3blaster/mp3blaster-3.2.5.ebuild
+++ b/media-sound/mp3blaster/mp3blaster-3.2.5.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.2.5.ebuild,v 1.8 2010/11/01 01:53:47 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.2.5.ebuild,v 1.9 2012/01/09 17:13:54 ssuominen Exp $
 
+EAPI=4
 inherit eutils
 
 DESCRIPTION="Text console based program for playing audio files"
@@ -11,33 +12,29 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="esd lirc oss sdl sid vorbis"
+IUSE="lirc oss sdl sid vorbis"
 
-RDEPEND=">=sys-libs/ncurses-5.2
+RDEPEND=">=sys-libs/ncurses-5.7-r7
 	lirc? ( app-misc/lirc )
-	vorbis? ( >=media-libs/libvorbis-1 )
+	sdl? ( media-libs/libsdl )
 	sid? ( =media-libs/libsidplay-1* )
-	esd? ( media-sound/esound )
-	sdl? ( media-libs/libsdl )"
+	vorbis? ( >=media-libs/libvorbis-1 )"
 DEPEND="${RDEPEND}
 	x11-misc/imake"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# File collision with media-sound/splay.
-	sed -i -e "s:splay.1:splay_mp3blaster.1:" Makefile.in
-	mv splay.1 splay_mp3blaster.1
-}
+REQUIRED_USE="|| ( oss sdl )"
+
+DOCS="AUTHORS BUGS ChangeLog CREDITS FAQ NEWS README TODO"
 
-src_compile() {
-	local myconf
-	if ! use esd && ! use sdl && ! use oss ; then
-		ewarn "You've disabled esd, sdl, and oss.  Enabling oss for you."
-		myconf="--with-oss"
-	fi
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc44.patch
+	# file collision with media-sound/splay
+	sed -i -e 's:splay.1:splay_mp3blaster.1:' Makefile.in || die
+	mv -vf splay.1 splay_mp3blaster.1 || die
+}
 
-	# newthreads and libpth support is broken.
+src_configure() {
+	# libpth and newthreads support are both broken
 	econf \
 		--disable-newthreads \
 		--without-pth \
@@ -45,16 +42,13 @@ src_compile() {
 		$(use_with lirc) \
 		$(use_with vorbis oggvorbis) \
 		$(use_with sid sidplay) \
-		$(use_with esd) \
+		--without-esd \
 		$(use_with sdl) \
-		$(use_with oss) \
-		${myconf}
-	emake || die "emake failed."
+		$(use_with oss)
 }
 
 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 || die
-	dodoc AUTHORS BUGS ChangeLog CREDITS FAQ NEWS README TODO
+	default
+	# file collision with media-sound/splay
+	mv -vf "${ED}"usr/bin/splay "${ED}"usr/bin/splay_mp3blaster || die
 }