Use global mms USE flag

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

10 files changed, 48 insertions, 44 deletions

diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 3f5ef0a0aead..c19abf515d4c 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mpd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.259 2011/07/17 15:37:10 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.260 2011/07/17 16:08:37 angelos Exp $
+
+  17 Jul 2011; Christoph Mende <angelos@gentoo.org> mpd-0.15.8.ebuild,
+  mpd-0.15.15.ebuild, mpd-0.15.16.ebuild, mpd-0.16.2.ebuild, mpd-0.16.3.ebuild,
+  mpd-0.16.3-r1.ebuild, mpd-9999.ebuild, metadata.xml:
+  Use global mms USE flag
 
 *mpd-9999 (17 Jul 2011)
 
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 989c7d3be031..9f682ec5329f 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -12,19 +12,19 @@ DIST mpd-0.15.16.tar.bz2 392986 RMD160 8b5e627e9a52702003e0cd57806d78a195d711af
 DIST mpd-0.15.8.tar.bz2 390489 RMD160 8b98e16e84b19bf0174ffffb8a59c88e605523b4 SHA1 a6503a4fde45d19c550febd0a84e329bf83dfcfb SHA256 5de1bac0af52c6d2d2744a8c8c84bb1423de4eff2351790068173cf4f287aad7
 DIST mpd-0.16.2.tar.bz2 478096 RMD160 74e63fe4514eb8309bf2b2e4e4012566e14b6262 SHA1 ce0b8cd473f8acb45c06d73f41c18fc4dabbe440 SHA256 59a3c191bbfcbbbc119f4b1e44bcb62ce15e45bc4d5041153408acc3074cb1d5
 DIST mpd-0.16.3.tar.bz2 477517 RMD160 860a308ec443896da43c7421db8895c5aff9bd91 SHA1 7990bad609064752175127527fcf2ecf8066e36f SHA256 58df79cfa89b365413ee720f3f605ff01a9aa32be1e176d523243954648731d2
-EBUILD mpd-0.15.15.ebuild 4833 RMD160 859d911ea5db836142a0da2a6b6c8219f024de69 SHA1 a5e839f1202f638426457d74a940e936d001b225 SHA256 68b4f58fd9cbf80551c05d691ff21aab041ea6f8cdbba643877cdffbe29da574
-EBUILD mpd-0.15.16.ebuild 4839 RMD160 4b3cf4b3db6212a0992e0dcf4d0fc54a8ef7116d SHA1 5e7a1b2bacd9fdb778658e8e89488f0032c3eb7f SHA256 75773c396c115123ebe91e242da866096d69356e4a702ed09cdee22c366ded85
-EBUILD mpd-0.15.8.ebuild 4882 RMD160 406585c67e2abbfcd9382bf8003e986b3cab4ad9 SHA1 689dd2fa032b79c270d33741d64f1a7b04fb1dba SHA256 3771dc288a179a1aa5cb4ee1aa2ae6cc8d43111abee6d457689552dc0bc50d11
-EBUILD mpd-0.16.2.ebuild 5444 RMD160 77829190d17229581eb24160e68022eee2ce406e SHA1 7da1a25b2fc88481dcdcefe58ddb3767ca3035ea SHA256 4209d85caa04c3cebe852fab143c43d2a2f5e7e36577bdb75ecd665aebc16f59
-EBUILD mpd-0.16.3-r1.ebuild 5485 RMD160 f1456787e5fed6270b2cb44481bd9b20f07a1b32 SHA1 01290c08339d8d8d4db55042e2d4c03e6b0042d1 SHA256 2ab974d9933879c3b175afd8297677464919b8072f98421e87af393d805cf2d2
-EBUILD mpd-0.16.3.ebuild 5446 RMD160 f31ce378c915eecb19ce8a02e746a57963743401 SHA1 2fad6efa07b61a02c177c26a1d89caf6a367636d SHA256 8d1154dd89a9d97917e1b12efe93e10d8f74419dd31175c4eb246784dbd53bc3
-EBUILD mpd-9999.ebuild 5505 RMD160 ee8f9d04d6ac489d90c18fe05db4dff9ee7f6600 SHA1 0525b84bb196f4b1980351612d22c6481c02b78f SHA256 58e14b69de185bf62d3efc98eadea69fd5a891beaff7c3166777fc5006538dfb
-MISC ChangeLog 37620 RMD160 13b3e2b23b561af8fc4afa9f6d8aa6bb52f80cee SHA1 9a6e0f6ea7bcda07cd6d9d84c9ba7b90dc7c8413 SHA256 aae70b84389b9f234bcc254883d5c3b10c21b53a6b1991003ab3e5fa2f6bbee5
-MISC metadata.xml 1522 RMD160 b201defb9a09c68c1754c0babddfffd2eb1e090a SHA1 14f708cab1e2802912802e8bd74fc68ecdc39b7f SHA256 5e148274f669b966cf88e9b5f99cd7a6db55b4f8f2e42c3c1128e394f33d6652
+EBUILD mpd-0.15.15.ebuild 4820 RMD160 6f757b0468d5317182944a18a8b43492f43ed8a6 SHA1 f98ae1cd55f4955bdd7cc1dbb030ac01228a0762 SHA256 f0274ceebc48bc022fed56b2ce8fa83ef74f0a5edb3754fbc61c9e153916c938
+EBUILD mpd-0.15.16.ebuild 4826 RMD160 ea933fd21e86c00bc859ac0e71af05ba295bca51 SHA1 86f9749a35c8293392a847a814042d3c3128d985 SHA256 f692c231c6679786f7863ff179714789c56ae38e95f2420438fe9e341d8c35bb
+EBUILD mpd-0.15.8.ebuild 4869 RMD160 df8a93041787d4e7bcf6acc0c381a906d0effc2f SHA1 dcedcb1dbb6000fbb5dfc4a7cf9342290775e600 SHA256 df3c0735bf1f4016c44c63df1cc821cc27ebb856c58aacc09c94c4e4af6b2961
+EBUILD mpd-0.16.2.ebuild 5428 RMD160 bf1da268d5f78d8705d9d520572e0be791244e48 SHA1 1b7d4fba84318e779ed0eb1c3c0fed73a52d49f9 SHA256 a9c8e5ccd751ecdc2f2896f0ed9235c37416d40f41991e367601c5776443433c
+EBUILD mpd-0.16.3-r1.ebuild 5472 RMD160 8241721e65c37bd0a211c18327facec83f299ec7 SHA1 cc6f0c0ed19840b23f8e1ba8444ad88692f03ca2 SHA256 f7dad7bb1a5c722fabfe3e1a50ba7a41012af1149a35060198535575d4c36b09
+EBUILD mpd-0.16.3.ebuild 5437 RMD160 a2beeb2abebaa03af7e27a530e81f2c7a4a5cfb8 SHA1 2d282e96c220c2e9cc061f9dcd359388f128dfe3 SHA256 8d0b07c896ed8e3c87d4cb87e66645293ece826c3c7944925fde23c25e49c5a4
+EBUILD mpd-9999.ebuild 5492 RMD160 9cdc4093fd888d445f1b5c63c0cdf41a5a644c3d SHA1 8eb1ee71a902e8c663c8ef36da8c003ee9c2f321 SHA256 0b3f2c11cb59b7027e489035222fe0e9e77451b902b75e0f7714b7ccead95df4
+MISC ChangeLog 37853 RMD160 e7e0ee48083d20bde013bc3f90a63dc42df85907 SHA1 0ccaf74b31d7e1ff97fcaa64f237cb188aceec45 SHA256 ab75f835849590dac7b278bd5fd549604c8386755b9a7ba956c0bd676ad30a3a
+MISC metadata.xml 1434 RMD160 170e2d23e96fb26f832a6fa64d77f9260326e62b SHA1 02b0ce06f5fea588ed924a837d1d375fe7f2a8e9 SHA256 781c3f6bdd130a2638b390f513395447500d609682750748c13b8a7cd9d17034
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4jAaoACgkQmWq1bYTyC0NMywD7BLM17tUnB1qBMazUCP+KKZnX
-JLWk1NDDoagrEElTgbYBAJNnyES8ecc8bDmR5pue8+k0BNFtgBNcYWKoZMztUnmj
-=/dgZ
+iF4EAREIAAYFAk4jCQoACgkQmWq1bYTyC0PVGgD/QKyhlm0n0p0NWrRvE9uhIUY4
+HEuGQaN9MoF2jkPk6H4BAIvi/UDaePibj0+k2zR0MjXjEn/R3WM7+rRjys37YLbK
+=qJpy
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index 13655ccba384..2cbdc1927a22 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -21,7 +21,6 @@
 	<flag name="lame">Support for MP3 streaming via Icecast2</flag>
 	<flag name="lastfmradio">Support listening to last.fm radio stations</flag>
 	<flag name="twolame">Support twolame MPEG-2 encoding</flag>
-	<flag name="libmms">Support for Microsoft Media Server (MMS) streams via libmms</flag>
     <flag name="mpg123">Enable support for mp3 decoding over media-sound/mpg123</flag>
 	<flag name="network">Enables network streaming support</flag>
 	<flag name="pipe">Support writing audio to a pipe</flag>
diff --git a/media-sound/mpd/mpd-0.15.15.ebuild b/media-sound/mpd/mpd-0.15.15.ebuild
index acc702c74616..7bd35c3ed530 100644
--- a/media-sound/mpd/mpd-0.15.15.ebuild
+++ b/media-sound/mpd/mpd-0.15.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15.15.ebuild,v 1.13 2011/06/25 17:47:22 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15.15.ebuild,v 1.14 2011/07/17 16:08:37 angelos Exp $
 
 EAPI=2
 inherit eutils flag-o-matic multilib
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm hppa ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="aac +alsa ao audiofile avahi bzip2 cdio cue +curl debug +fifo +ffmpeg flac
-fluidsynth profile +id3tag ipv6 jack lame lastfmradio libmms libsamplerate +mad
+fluidsynth profile +id3tag ipv6 jack lame lastfmradio mms libsamplerate +mad
 mikmod modplug musepack +network ogg oss pipe pulseaudio sid sqlite unicode
 vorbis wavpack wildmidi zip"
 
@@ -35,7 +35,7 @@ RDEPEND="!<sys-cluster/mpich2-1.4_rc2
 	id3tag? ( media-libs/libid3tag )
 	jack? ( media-sound/jack-audio-connection-kit )
 	lame? ( network? ( media-sound/lame ) )
-	libmms? ( >=media-libs/libmms-0.4 )
+	mms? ( >=media-libs/libmms-0.4 )
 	libsamplerate? ( media-libs/libsamplerate )
 	mad? ( media-libs/libmad )
 	mikmod? ( media-libs/libmikmod )
@@ -103,7 +103,7 @@ src_configure() {
 	econf \
 		$(use_enable ipv6) $(use_enable cue) \
 		$(use_enable sqlite) $(use_enable curl) \
-		$(use_enable libmms mms) $(use_enable wildmidi) \
+		$(use_enable mms) $(use_enable wildmidi) \
 		$(use_enable bzip2) $(use_enable zip) \
 		$(use_enable cdio iso9660) $(use_enable id3tag id3) \
 		$(use_enable audiofile) $(use_enable ffmpeg) \
diff --git a/media-sound/mpd/mpd-0.15.16.ebuild b/media-sound/mpd/mpd-0.15.16.ebuild
index ac6b448176fb..10df98c16e05 100644
--- a/media-sound/mpd/mpd-0.15.16.ebuild
+++ b/media-sound/mpd/mpd-0.15.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15.16.ebuild,v 1.4 2011/06/25 17:47:22 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15.16.ebuild,v 1.5 2011/07/17 16:08:37 angelos Exp $
 
 EAPI=2
 inherit eutils flag-o-matic multilib
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="aac +alsa ao audiofile avahi bzip2 cdio cue +curl debug +fifo +ffmpeg flac
-fluidsynth profile +id3tag ipv6 jack lame lastfmradio libmms libsamplerate +mad
+fluidsynth profile +id3tag ipv6 jack lame lastfmradio mms libsamplerate +mad
 mikmod modplug musepack +network ogg oss pipe pulseaudio sid sqlite unicode
 vorbis wavpack wildmidi zip"
 
@@ -35,7 +35,7 @@ RDEPEND="!<sys-cluster/mpich2-1.4_rc2
 	id3tag? ( media-libs/libid3tag )
 	jack? ( media-sound/jack-audio-connection-kit )
 	lame? ( network? ( media-sound/lame ) )
-	libmms? ( >=media-libs/libmms-0.4 )
+	mms? ( >=media-libs/libmms-0.4 )
 	libsamplerate? ( media-libs/libsamplerate )
 	mad? ( media-libs/libmad )
 	mikmod? ( media-libs/libmikmod )
@@ -103,7 +103,7 @@ src_configure() {
 	econf \
 		$(use_enable ipv6) $(use_enable cue) \
 		$(use_enable sqlite) $(use_enable curl) \
-		$(use_enable libmms mms) $(use_enable wildmidi) \
+		$(use_enable mms) $(use_enable wildmidi) \
 		$(use_enable bzip2) $(use_enable zip) \
 		$(use_enable cdio iso9660) $(use_enable id3tag id3) \
 		$(use_enable audiofile) $(use_enable ffmpeg) \
diff --git a/media-sound/mpd/mpd-0.15.8.ebuild b/media-sound/mpd/mpd-0.15.8.ebuild
index ac60b67b5a9a..0c68b62540a2 100644
--- a/media-sound/mpd/mpd-0.15.8.ebuild
+++ b/media-sound/mpd/mpd-0.15.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15.8.ebuild,v 1.10 2011/06/25 17:47:22 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.15.8.ebuild,v 1.11 2011/07/17 16:08:37 angelos Exp $
 
 EAPI=2
 inherit eutils flag-o-matic multilib
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm hppa ppc ppc64 sh sparc x86 ~x86-fbsd"
 IUSE="aac +alsa ao audiofile avahi bzip2 cdio cue +curl debug +fifo +ffmpeg flac
-fluidsynth profile +id3tag ipv6 jack lame lastfmradio libmms libsamplerate +mad
+fluidsynth profile +id3tag ipv6 jack lame lastfmradio mms libsamplerate +mad
 mikmod modplug musepack +network ogg oss pipe pulseaudio sid sqlite unicode
 vorbis wavpack zip"
 
@@ -35,7 +35,7 @@ RDEPEND="!<sys-cluster/mpich2-1.4_rc2
 	id3tag? ( media-libs/libid3tag )
 	jack? ( media-sound/jack-audio-connection-kit )
 	lame? ( network? ( media-sound/lame ) )
-	libmms? ( >=media-libs/libmms-0.4 )
+	mms? ( >=media-libs/libmms-0.4 )
 	libsamplerate? ( media-libs/libsamplerate )
 	mad? ( media-libs/libmad )
 	mikmod? ( media-libs/libmikmod )
@@ -94,7 +94,7 @@ src_configure() {
 	econf \
 		$(use_enable ipv6) $(use_enable cue) \
 		$(use_enable sqlite) $(use_enable curl) \
-		$(use_enable lastfmradio lastfm) $(use_enable libmms mms) \
+		$(use_enable lastfmradio lastfm) $(use_enable mms) \
 		$(use_enable bzip2) $(use_enable zip) \
 		$(use_enable cdio iso9660) $(use_enable id3tag id3) \
 		$(use_enable audiofile) $(use_enable ffmpeg) \
diff --git a/media-sound/mpd/mpd-0.16.2.ebuild b/media-sound/mpd/mpd-0.16.2.ebuild
index 379d7e287f54..134059e6f804 100644
--- a/media-sound/mpd/mpd-0.16.2.ebuild
+++ b/media-sound/mpd/mpd-0.16.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.2.ebuild,v 1.12 2011/07/17 10:18:06 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.2.ebuild,v 1.13 2011/07/17 16:08:37 angelos Exp $
 
 EAPI=4
 inherit eutils flag-o-matic linux-info multilib
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm hppa ppc ppc64 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="aac +alsa ao audiofile bzip2 cdio cue +curl debug +fifo +ffmpeg flac
-fluidsynth profile +id3tag inotify ipv6 jack lame lastfmradio libmms libsamplerate
+fluidsynth profile +id3tag inotify ipv6 jack lame lastfmradio mms libsamplerate
 +mad mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio sid
 sndfile sqlite tcpd twolame unicode vorbis wavpack wildmidi zeroconf zip"
 
@@ -41,7 +41,7 @@ RDEPEND="!<sys-cluster/mpich2-1.4_rc2
 	id3tag? ( media-libs/libid3tag )
 	jack? ( media-sound/jack-audio-connection-kit )
 	lame? ( network? ( media-sound/lame ) )
-	libmms? ( media-libs/libmms )
+	mms? ( media-libs/libmms )
 	libsamplerate? ( media-libs/libsamplerate )
 	mad? ( media-libs/libmad )
 	mikmod? ( media-libs/libmikmod )
@@ -126,7 +126,7 @@ src_configure() {
 		$(use_enable ipv6) \
 		$(use_enable jack) \
 		$(use_enable lastfmradio lastfm) \
-		$(use_enable libmms mms) \
+		$(use_enable mms) \
 		$(use_enable libsamplerate lsr) \
 		$(use_enable mad) \
 		$(use_enable mikmod) \
diff --git a/media-sound/mpd/mpd-0.16.3-r1.ebuild b/media-sound/mpd/mpd-0.16.3-r1.ebuild
index f9b25d2de8fd..0037769db89c 100644
--- a/media-sound/mpd/mpd-0.16.3-r1.ebuild
+++ b/media-sound/mpd/mpd-0.16.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.3-r1.ebuild,v 1.1 2011/07/03 10:30:35 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.3-r1.ebuild,v 1.2 2011/07/17 16:08:37 angelos Exp $
 
 EAPI=4
 inherit eutils flag-o-matic linux-info multilib
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="aac +alsa ao audiofile bzip2 cdio cue +curl debug +fifo +ffmpeg flac
-fluidsynth profile +id3tag inotify ipv6 jack lame lastfmradio libmms libsamplerate
+fluidsynth profile +id3tag inotify ipv6 jack lame lastfmradio mms libsamplerate
 +mad mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio sid
 sndfile sqlite tcpd twolame unicode vorbis wavpack wildmidi zeroconf zip"
 
@@ -41,7 +41,7 @@ RDEPEND="!<sys-cluster/mpich2-1.4_rc2
 	id3tag? ( media-libs/libid3tag )
 	jack? ( media-sound/jack-audio-connection-kit )
 	lame? ( network? ( media-sound/lame ) )
-	libmms? ( media-libs/libmms )
+	mms? ( media-libs/libmms )
 	libsamplerate? ( media-libs/libsamplerate )
 	mad? ( media-libs/libmad )
 	mikmod? ( media-libs/libmikmod )
@@ -127,7 +127,7 @@ src_configure() {
 		$(use_enable ipv6) \
 		$(use_enable jack) \
 		$(use_enable lastfmradio lastfm) \
-		$(use_enable libmms mms) \
+		$(use_enable mms) \
 		$(use_enable libsamplerate lsr) \
 		$(use_enable mad) \
 		$(use_enable mikmod) \
diff --git a/media-sound/mpd/mpd-0.16.3.ebuild b/media-sound/mpd/mpd-0.16.3.ebuild
index f9ee6184a8a3..2b4ae1c232c6 100644
--- a/media-sound/mpd/mpd-0.16.3.ebuild
+++ b/media-sound/mpd/mpd-0.16.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.3.ebuild,v 1.2 2011/06/25 17:47:22 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.16.3.ebuild,v 1.3 2011/07/17 16:08:37 angelos Exp $
 
 EAPI=4
 inherit eutils flag-o-matic linux-info multilib
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="aac +alsa ao audiofile bzip2 cdio cue +curl debug +fifo +ffmpeg flac
-fluidsynth profile +id3tag inotify ipv6 jack lame lastfmradio libmms libsamplerate
+fluidsynth profile +id3tag inotify ipv6 jack lame lastfmradio mms libsamplerate
 +mad mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio sid
 sndfile sqlite tcpd twolame unicode vorbis wavpack wildmidi zeroconf zip"
 
@@ -41,7 +41,7 @@ RDEPEND="!<sys-cluster/mpich2-1.4_rc2
 	id3tag? ( media-libs/libid3tag )
 	jack? ( media-sound/jack-audio-connection-kit )
 	lame? ( network? ( media-sound/lame ) )
-	libmms? ( media-libs/libmms )
+	mms? ( media-libs/libmms )
 	libsamplerate? ( media-libs/libsamplerate )
 	mad? ( media-libs/libmad )
 	mikmod? ( media-libs/libmikmod )
@@ -126,7 +126,7 @@ src_configure() {
 		$(use_enable ipv6) \
 		$(use_enable jack) \
 		$(use_enable lastfmradio lastfm) \
-		$(use_enable libmms mms) \
+		$(use_enable mms mms) \
 		$(use_enable libsamplerate lsr) \
 		$(use_enable mad) \
 		$(use_enable mikmod) \
diff --git a/media-sound/mpd/mpd-9999.ebuild b/media-sound/mpd/mpd-9999.ebuild
index 03660b1896ac..76c4e25badaf 100644
--- a/media-sound/mpd/mpd-9999.ebuild
+++ b/media-sound/mpd/mpd-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-9999.ebuild,v 1.1 2011/07/17 15:37:10 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-9999.ebuild,v 1.2 2011/07/17 16:08:37 angelos Exp $
 
 EAPI=4
 inherit autotools eutils flag-o-matic linux-info multilib git-2
@@ -13,9 +13,9 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE="aac +alsa ao audiofile bzip2 cdio cue +curl debug +fifo +ffmpeg flac
-fluidsynth profile +id3tag inotify ipv6 jack lame lastfmradio libmms libsamplerate
-+mad mikmod modplug mpg123 musepack +network ogg openal oss pipe pulseaudio sid
-sndfile sqlite tcpd twolame unicode vorbis wavpack wildmidi zeroconf zip"
+fluidsynth profile +id3tag inotify ipv6 jack lame lastfmradio libsamplerate
++mad mikmod modplug mpg123 mms musepack +network ogg openal oss pipe pulseaudio
+sid sndfile sqlite tcpd twolame unicode vorbis wavpack wildmidi zeroconf zip"
 
 REQUIRED_USE="|| ( alsa ao fifo jack network openal oss pipe pulseaudio )
 	|| ( aac audiofile ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack
@@ -41,10 +41,10 @@ RDEPEND="!<sys-cluster/mpich2-1.4_rc2
 	id3tag? ( media-libs/libid3tag )
 	jack? ( media-sound/jack-audio-connection-kit )
 	lame? ( network? ( media-sound/lame ) )
-	libmms? ( media-libs/libmms )
 	libsamplerate? ( media-libs/libsamplerate )
 	mad? ( media-libs/libmad )
 	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
 	modplug? ( media-libs/libmodplug )
 	mpg123? ( >=media-sound/mpg123-1.12.2 )
 	musepack? ( media-sound/musepack-tools )
@@ -129,10 +129,10 @@ src_configure() {
 		$(use_enable ipv6) \
 		$(use_enable jack) \
 		$(use_enable lastfmradio lastfm) \
-		$(use_enable libmms mms) \
 		$(use_enable libsamplerate lsr) \
 		$(use_enable mad) \
 		$(use_enable mikmod) \
+		$(use_enable mms) \
 		$(use_enable modplug) \
 		$(use_enable mpg123) \
 		$(use_enable musepack mpc) \