summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/xmms2/ChangeLog12
-rw-r--r--media-sound/xmms2/metadata.xml1
-rw-r--r--media-sound/xmms2/xmms2-0.7-r1.ebuild (renamed from media-sound/xmms2/xmms2-0.7.ebuild)15
3 files changed, 18 insertions, 10 deletions
diff --git a/media-sound/xmms2/ChangeLog b/media-sound/xmms2/ChangeLog
index 3240e6c39f04..6dc265d781f4 100644
--- a/media-sound/xmms2/ChangeLog
+++ b/media-sound/xmms2/ChangeLog
@@ -1,6 +1,16 @@
# ChangeLog for media-sound/xmms2
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/ChangeLog,v 1.1 2010/06/30 05:30:53 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/ChangeLog,v 1.2 2010/06/30 17:20:13 slyfox Exp $
+
+*xmms2-0.7-r1 (30 Jun 2010)
+
+ 30 Jun 2010; Sergei Trofimovich <slyfox@gentoo.org> -xmms2-0.7.ebuild,
+ +xmms2-0.7-r1.ebuild, metadata.xml:
+ Revision bump. Renamed USE flags to comform to other packages in tree:
+ libmad: 'mp3' -> 'mad'
+ mpg123: 'libmpg123' -> 'mp3'
+ faad2: 'mp4' -> 'aac'
+ Thanks to Samuli Suominen.
*xmms2-0.7 (30 Jun 2010)
diff --git a/media-sound/xmms2/metadata.xml b/media-sound/xmms2/metadata.xml
index 849e014d5233..cc4facf45622 100644
--- a/media-sound/xmms2/metadata.xml
+++ b/media-sound/xmms2/metadata.xml
@@ -38,7 +38,6 @@
<flag name="ices">Icecast source output plugin</flag>
<flag name="mac">Support for Monkey's Audio (APE) format with help of <pkg>media-sound/mac</pkg></flag>
<flag name="mms">Support for Microsoft Media Server (MMS) streams via libmms</flag>
- <flag name="mpg123">Support for libmpg123 decoder for MPEG 1.0/2.0/2.5 layer 1/2/3</flag>
<flag name="ofa">Support for Open Fingerprint Architecture (OFA)</flag>
<flag name="phonehome">This client sends anonymous usage-statistics to the xmms2</flag>
<flag name="server">Build xmms2 player daemon (otherwise only clients are built)</flag>
diff --git a/media-sound/xmms2/xmms2-0.7.ebuild b/media-sound/xmms2/xmms2-0.7-r1.ebuild
index ff42ec3e5eea..7bf76110bb37 100644
--- a/media-sound/xmms2/xmms2-0.7.ebuild
+++ b/media-sound/xmms2/xmms2-0.7-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.7.ebuild,v 1.1 2010/06/30 05:30:53 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.7-r1.ebuild,v 1.1 2010/06/30 17:20:13 slyfox Exp $
EAPI=2
inherit base eutils python
@@ -16,7 +16,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="aac airplay +alsa ao asf avahi cdda curl cxx ffmpeg flac gvfs ices
-jack mac mlib-update mms +mp3 mp4 modplug mpg123 musepack ofa oss
+jack mac mlib-update mms +mad modplug mp3 musepack ofa oss
perl phonehome pulseaudio python ruby
samba +server sid speex +vorbis vocoder wavpack xml"
@@ -42,9 +42,8 @@ RDEPEND="server? (
mms? ( media-video/ffmpeg
>=media-libs/libmms-0.3 )
modplug? ( media-libs/libmodplug )
- mp3? ( media-sound/madplay )
- mp4? ( >=media-libs/faad2-2.0 )
- mpg123? ( >=media-sound/mpg123-1.5.1 )
+ mad? ( media-sound/madplay )
+ mp3? ( >=media-sound/mpg123-1.5.1 )
musepack? ( media-sound/musepack-tools )
ofa? ( media-libs/libofa )
pulseaudio? ( media-sound/pulseaudio )
@@ -162,9 +161,9 @@ src_configure() {
"ENABLED m3u"
" mac"
" mms"
- "mp3 mad"
- " mp4"
- " mpg123"
+ " mad"
+ "aac mp4"
+ "mp3 mpg123"
" modplug"
" musepack"
"DISABLED nms" # not in tree