Renamed USE flags to comform to other packages in tree:

libmad: 'mp3'       -> 'mad'
mpg123: 'libmpg123' -> 'mp3'
faad2:  'mp4'       -> 'aac'
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 21 insertions, 13 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/Manifest b/media-sound/xmms2/Manifest
index c08a36dbb862..d264365b0e5a 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -1,5 +1,5 @@
 AUX xmms2-0.7DrNo-windres-build-fix.patch 1929 RMD160 61f8840d4e4349b5459f6760b94f0a439b6cfa87 SHA1 41ccd4db5c48d70a860d59ebb323796f243774bf SHA256 f71546af163b017678282a9ded8ec8e70ea486b95f96c68a62ad5a3edf0db39f
 DIST xmms2-0.7DrNo.tar.bz2 1519973 RMD160 3a526df9fa1ed5103b6a252c34c0394bf0e4f156 SHA1 4999568654a0d2aba84bda4b22145058bbd3fcb2 SHA256 59c58d9380e6b002920a8dc75f0fd4629ab175b82f29b6637f7816fdc9832b2c
-EBUILD xmms2-0.7.ebuild 6127 RMD160 69fd5b619771f861b00fd782319cadc68e73462c SHA1 faa3fa1612d1d8196b57ad980fb0fedb5dd117c2 SHA256 a158b0320c9e5c29637995cedd91700b7e63dff24b19bbe65b738b9e5e952750
-MISC ChangeLog 531 RMD160 b053b8c68f2dc054926b56927cd9d5af29e29a80 SHA1 4e4cc1cc592265a9d466719d6660eb30296004de SHA256 ec2ce28c7238372acd8a4770d07d57f3fe88a7eac0552dd43d62d3132193945b
-MISC metadata.xml 2635 RMD160 4e21c3a15d52896fbaf6443fdd5ade035cfb6ea3 SHA1 757705224cec31f0c4cd1e19e576e836960effc5 SHA256 57ea59adba5d23b264a50ddcaf60dddf38b9f3433a58ef1ce0f9517448979906
+EBUILD xmms2-0.7-r1.ebuild 6089 RMD160 17531e6decb4f81d3c4e52319d94301516aa6239 SHA1 8ee32901c82e6d7de2f1dbc59d8cd8a563053228 SHA256 8f4f31b16c2ca9944af97d57dec5f38ae5e65065143f6b3438ae8b4feffdcf06
+MISC ChangeLog 854 RMD160 fcd2021c33699f8ae7fe289644f7dfa03ef8bacf SHA1 a5cf8898ce80ea42f5c7bb9e8efd3ef8e04f69a4 SHA256 026765411712458144b17171ccb7f36d6dea84582c17f980541c1ef7b74578a9
+MISC metadata.xml 2543 RMD160 880160906497e70efe5a12415bcb7a97a2677fcd SHA1 37318858b1a48b7030fc2e4186b756bcb0dd4094 SHA256 62ab3169c4051f6df1393fcfdb1d70e6ba14acf23be1f18120b8f4cf6c3787fb
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