Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/mp3blaster: mp3blaster-3.2.5.ebuild ChangeLog
Date: Mon, 09 Jan 2012 17:14:03
Message-Id: 20120109171354.5A5192004B@flycatcher.gentoo.org
1 ssuominen 12/01/09 17:13:54
2
3 Modified: mp3blaster-3.2.5.ebuild ChangeLog
4 Log:
5 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
6
7 (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.9 media-sound/mp3blaster/mp3blaster-3.2.5.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.2.5.ebuild?rev=1.9&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.2.5.ebuild?rev=1.9&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.2.5.ebuild?r1=1.8&r2=1.9
15
16 Index: mp3blaster-3.2.5.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.2.5.ebuild,v
19 retrieving revision 1.8
20 retrieving revision 1.9
21 diff -u -r1.8 -r1.9
22 --- mp3blaster-3.2.5.ebuild 1 Nov 2010 01:53:47 -0000 1.8
23 +++ mp3blaster-3.2.5.ebuild 9 Jan 2012 17:13:54 -0000 1.9
24 @@ -1,7 +1,8 @@
25 -# Copyright 1999-2010 Gentoo Foundation
26 +# Copyright 1999-2012 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.2.5.ebuild,v 1.8 2010/11/01 01:53:47 xmw Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.2.5.ebuild,v 1.9 2012/01/09 17:13:54 ssuominen Exp $
30
31 +EAPI=4
32 inherit eutils
33
34 DESCRIPTION="Text console based program for playing audio files"
35 @@ -11,33 +12,29 @@
36 LICENSE="GPL-2"
37 SLOT="0"
38 KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86 ~x86-fbsd"
39 -IUSE="esd lirc oss sdl sid vorbis"
40 +IUSE="lirc oss sdl sid vorbis"
41
42 -RDEPEND=">=sys-libs/ncurses-5.2
43 +RDEPEND=">=sys-libs/ncurses-5.7-r7
44 lirc? ( app-misc/lirc )
45 - vorbis? ( >=media-libs/libvorbis-1 )
46 + sdl? ( media-libs/libsdl )
47 sid? ( =media-libs/libsidplay-1* )
48 - esd? ( media-sound/esound )
49 - sdl? ( media-libs/libsdl )"
50 + vorbis? ( >=media-libs/libvorbis-1 )"
51 DEPEND="${RDEPEND}
52 x11-misc/imake"
53
54 -src_unpack() {
55 - unpack ${A}
56 - cd "${S}"
57 - # File collision with media-sound/splay.
58 - sed -i -e "s:splay.1:splay_mp3blaster.1:" Makefile.in
59 - mv splay.1 splay_mp3blaster.1
60 -}
61 +REQUIRED_USE="|| ( oss sdl )"
62 +
63 +DOCS="AUTHORS BUGS ChangeLog CREDITS FAQ NEWS README TODO"
64
65 -src_compile() {
66 - local myconf
67 - if ! use esd && ! use sdl && ! use oss ; then
68 - ewarn "You've disabled esd, sdl, and oss. Enabling oss for you."
69 - myconf="--with-oss"
70 - fi
71 +src_prepare() {
72 + epatch "${FILESDIR}"/${P}-gcc44.patch
73 + # file collision with media-sound/splay
74 + sed -i -e 's:splay.1:splay_mp3blaster.1:' Makefile.in || die
75 + mv -vf splay.1 splay_mp3blaster.1 || die
76 +}
77
78 - # newthreads and libpth support is broken.
79 +src_configure() {
80 + # libpth and newthreads support are both broken
81 econf \
82 --disable-newthreads \
83 --without-pth \
84 @@ -45,16 +42,13 @@
85 $(use_with lirc) \
86 $(use_with vorbis oggvorbis) \
87 $(use_with sid sidplay) \
88 - $(use_with esd) \
89 + --without-esd \
90 $(use_with sdl) \
91 - $(use_with oss) \
92 - ${myconf}
93 - emake || die "emake failed."
94 + $(use_with oss)
95 }
96
97 src_install() {
98 - emake DESTDIR="${D}" install || die "emake install failed."
99 - # File collision with media-sound/splay.
100 - mv "${D}"/usr/bin/splay "${D}"/usr/bin/splay_mp3blaster || die
101 - dodoc AUTHORS BUGS ChangeLog CREDITS FAQ NEWS README TODO
102 + default
103 + # file collision with media-sound/splay
104 + mv -vf "${ED}"usr/bin/splay "${ED}"usr/bin/splay_mp3blaster || die
105 }
106
107
108
109 1.51 media-sound/mp3blaster/ChangeLog
110
111 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mp3blaster/ChangeLog?rev=1.51&view=markup
112 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mp3blaster/ChangeLog?rev=1.51&content-type=text/plain
113 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/mp3blaster/ChangeLog?r1=1.50&r2=1.51
114
115 Index: ChangeLog
116 ===================================================================
117 RCS file: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/ChangeLog,v
118 retrieving revision 1.50
119 retrieving revision 1.51
120 diff -u -r1.50 -r1.51
121 --- ChangeLog 1 Nov 2010 01:53:47 -0000 1.50
122 +++ ChangeLog 9 Jan 2012 17:13:54 -0000 1.51
123 @@ -1,6 +1,12 @@
124 # ChangeLog for media-sound/mp3blaster
125 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
126 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/ChangeLog,v 1.50 2010/11/01 01:53:47 xmw Exp $
127 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
128 +# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/ChangeLog,v 1.51 2012/01/09 17:13:54 ssuominen Exp $
129 +
130 + 09 Jan 2012; Samuli Suominen <ssuominen@g.o> mp3blaster-3.2.5.ebuild,
131 + +files/mp3blaster-3.2.5-gcc44.patch:
132 + Fix building with USE="sid" and sys-devel/gcc >= 4.4.x wrt #362347 by
133 + "Boris". Remove deprecated media-sound/esound support. One of USE oss or sdl
134 + must be enabled; use REQUIRED_USE
135
136 01 Nov 2010; Michael Weber <xmw@g.o> mp3blaster-3.2.5.ebuild:
137 arm stable
Report Message
Find on MARC Find on Google Groups