Import Debian patchset; to fix number of issues ranging from endianess to memory leaks. Upstream seems quiet.

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

3 files changed, 74 insertions, 9 deletions

diff --git a/media-sound/mp3blaster/ChangeLog b/media-sound/mp3blaster/ChangeLog
index 2da5357a91fe..75b035df7e1a 100644
--- a/media-sound/mp3blaster/ChangeLog
+++ b/media-sound/mp3blaster/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/mp3blaster
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/ChangeLog,v 1.52 2012/01/09 17:34:39 ssuominen Exp $
+
+*mp3blaster-3.2.5-r1 (09 Jan 2012)
+
+  09 Jan 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +mp3blaster-3.2.5-r1.ebuild:
+  Import Debian patchset; to fix number of issues ranging from endianess to
+  memory leaks. Upstream seems quiet.
 
   09 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> mp3blaster-3.2.5.ebuild,
   +files/mp3blaster-3.2.5-gcc44.patch:
diff --git a/media-sound/mp3blaster/Manifest b/media-sound/mp3blaster/Manifest
index 81df15b5a0a2..d430e378ff47 100644
--- a/media-sound/mp3blaster/Manifest
+++ b/media-sound/mp3blaster/Manifest
@@ -3,17 +3,19 @@ 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
+DIST mp3blaster_3.2.5-3.debian.tar.gz 11000 RMD160 e8b7f243f815e2ac47ccca5a2411c47db166ec1c SHA1 6239417fb78f61fbf2939e0725f0ba6afb18bca0 SHA256 e4d424aeccde6ccd219270f4e4f0bf8f70b97e13075447b6d6d069110ed092c9
+EBUILD mp3blaster-3.2.5-r1.ebuild 1563 RMD160 b0b63e100a0e5f34bd87605824b66e19a2c349ae SHA1 0a7c422239cb3b38f2ee47af9687f1d76730b8a3 SHA256 c7eb79ad49ad9e6b1c4122cd49e79a7d96b6a1e2f900556ed6b2f8114d56a8ca
 EBUILD mp3blaster-3.2.5.ebuild 1445 RMD160 4e99aff91253e95a82dd63508ee551bd4fa3e6c5 SHA1 3ff3810f5c8e467172926a71e5de7ba345bcc5a2 SHA256 b7a4df516f65b189363a0b71404ed61c0a816812a021fd561cb4103d218e4a7c
-MISC ChangeLog 7069 RMD160 cf741560e607b71e5c9919776d1bed1c79fe1391 SHA1 aa909b1f73967642be68587112dfffeb238cf64f SHA256 f65f0953c377b40d3104d9e7e207bdd918430115a653f6127b84f5a7a6953b23
+MISC ChangeLog 7305 RMD160 bcd94e45ea482b46a3996704ef98b97b48125eab SHA1 9f58c7d68e9b1ef50020089896daa8912b466f5f SHA256 84607720989402757e29d7decc44f20e4bd34f46e93160b356a3e695b77d8a2f
 MISC metadata.xml 249 RMD160 053e31dbee7ebb042316ebe35284efda8a99ecf1 SHA1 00c981a528eff3ed991c5fd2e3f1ac0018fe82d2 SHA256 e31b65ec4e3e20698e1a4f52154b6fb1e9524c27b695547426ec369864612e03
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPCyHsAAoJEEdUh39IaPFNT14H/3nGqVTTzmWsNG2BcQqp3jzM
-yppVc01PrBmkwAcqDJVo2+P09xZXBY0P43GRwxXc94EYSSgzto9W6GMrefcfSNxF
-xbpR9evE0uol2coxiTv1nwMHglPIB26Aj0meAfqTSRTwnet9XJMvTsC6H11UQYG2
-iLj//b/MtxUv1asZhCMZGGEZpjRtEN2jUAhrrpk03HAl72MDKU5D4LLZZ/6C5l3/
-lHvF0VR+FA1rNgEzom5Te09hA5lia1VOxBDnRDtjhiYZekpBCgeS8qJCr6hNu1pj
-xYqgoFfWS4ppF1iuz/ZeOHMcpN1kEyBOJ18hl8QuEBFiKU+JC2ebDQOHWCGmb9s=
-=uAWj
+iQEcBAEBAgAGBQJPCyTdAAoJEEdUh39IaPFNXAEH/RiDgdDS34fq6MO7SiwVs1gw
+PK1sKAjUxTh5dsJnvO1N6mEDv9kgnuaqBh5/eixeLtLUWdlphJEJMj2CBMYPeC+X
+EG6/Rz/9ZWDiLQGaIWZoyrNXsEgNtk9f3axrIjUO8LhWyvsi5Mb5EmRG8puB4x13
+Zbk9hjPS6r16mvfXls9AHopX0Y9oJiCrIZ3YVPgLHj8N2L5uuLdJ5PMhHV2YjH4z
+9GhhBrxHh1fPupFuCn36PdEepXfc5VP3E8nJ8rjUQ1qyEPjlPz3SR4RM7B/syWno
+x1dqYIMIKWue3k4ugZjDFHebqzCJNXGpenQA7P6T/MyJQq4975MtiLxy2n4Fr8o=
+=fH0E
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mp3blaster/mp3blaster-3.2.5-r1.ebuild b/media-sound/mp3blaster/mp3blaster-3.2.5-r1.ebuild
new file mode 100644
index 000000000000..7e8bdfbe9d29
--- /dev/null
+++ b/media-sound/mp3blaster/mp3blaster-3.2.5-r1.ebuild
@@ -0,0 +1,56 @@
+# 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-r1.ebuild,v 1.1 2012/01/09 17:34:39 ssuominen Exp $
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="Text console based program for playing audio files"
+HOMEPAGE="http://mp3blaster.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	mirror://debian/pool/main/m/${PN}/${PN}_${PV}-3.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="lirc oss sdl sid vorbis"
+
+RDEPEND=">=sys-libs/ncurses-5.7-r7
+	lirc? ( app-misc/lirc )
+	sdl? ( media-libs/libsdl )
+	sid? ( =media-libs/libsidplay-1* )
+	vorbis? ( >=media-libs/libvorbis-1 )"
+DEPEND="${RDEPEND}
+	x11-misc/imake
+	oss? ( virtual/os-headers )"
+
+REQUIRED_USE="|| ( oss sdl )"
+
+DOCS="AUTHORS BUGS ChangeLog CREDITS FAQ NEWS README TODO"
+
+src_prepare() {
+	EPATCH_SOURCE=${WORKDIR}/debian/patches EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
+	# file collision with media-sound/splay
+	sed -i -e 's:splay.1:splay_mp3blaster.1:' Makefile.in || die
+	mv -vf splay{,_mp3blaster}.1 || die
+}
+
+src_configure() {
+	# libpth and newthreads support are both broken
+	econf \
+		--disable-newthreads \
+		--without-pth \
+		--without-nas \
+		$(use_with lirc) \
+		$(use_with vorbis oggvorbis) \
+		$(use_with sid sidplay) \
+		--without-esd \
+		$(use_with sdl) \
+		$(use_with oss)
+}
+
+src_install() {
+	default
+	# file collision with media-sound/splay
+	mv -vf "${ED}"usr/bin/splay{,_mp3blaster} || die
+}