Changing mad dep to madplay.

47 files changed, 140 insertions, 79 deletions

diff --git a/media-sound/apollo/ChangeLog b/media-sound/apollo/ChangeLog
index 5c7d527b0425..1109d8f487ce 100644
--- a/media-sound/apollo/ChangeLog
+++ b/media-sound/apollo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/apollo
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/apollo/ChangeLog,v 1.11 2004/03/31 18:04:23 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/apollo/ChangeLog,v 1.12 2004/05/04 02:13:01 eradicator Exp $
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org> apollo-1.4.1.ebuild,
+  apollo-1.4.2.ebuild:
+  Changing mad dep to madplay.
 
   31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> apollo-1.4.2.ebuild:
   epatch instead of patch.
diff --git a/media-sound/apollo/apollo-1.4.1.ebuild b/media-sound/apollo/apollo-1.4.1.ebuild
index fc80253f7cf7..75bdc2bf2dbe 100644
--- a/media-sound/apollo/apollo-1.4.1.ebuild
+++ b/media-sound/apollo/apollo-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/apollo/apollo-1.4.1.ebuild,v 1.6 2004/02/23 23:58:31 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/apollo/apollo-1.4.1.ebuild,v 1.7 2004/05/04 02:13:01 eradicator Exp $
 
 IUSE="kde qt"
 
@@ -15,7 +15,7 @@ KEYWORDS="x86"
 
 DEPEND="virtual/mpg123
 	media-libs/id3lib
-	media-sound/mad
+	media-sound/madplay
 	qt?	( x11-libs/qt )
 	kde?	( kde-base/kdelibs )"
 #	dev-libs/STLport
diff --git a/media-sound/apollo/apollo-1.4.2.ebuild b/media-sound/apollo/apollo-1.4.2.ebuild
index 0b4892fea788..b9b10bfebb88 100644
--- a/media-sound/apollo/apollo-1.4.2.ebuild
+++ b/media-sound/apollo/apollo-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/apollo/apollo-1.4.2.ebuild,v 1.6 2004/03/31 18:04:23 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/apollo/apollo-1.4.2.ebuild,v 1.7 2004/05/04 02:13:01 eradicator Exp $
 
 inherit eutils
 
@@ -20,7 +20,7 @@ KEYWORDS="x86"
 
 DEPEND="virtual/mpg123
 	media-libs/id3lib
-	media-sound/mad
+	media-sound/madplay
 	qt?		( x11-libs/qt )"
 
 src_compile() {
diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index a661eae8fec7..73532e903058 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/audacity
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.20 2004/04/05 07:17:25 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.21 2004/05/04 02:08:29 eradicator Exp $
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  audacity-1.1.3.ebuild, audacity-1.2.0-r1.ebuild:
+  Changing mad dep to madplay.
 
 *audacity-1.2.0-r1 (04 Apr 2004)
 
diff --git a/media-sound/audacity/audacity-1.1.3.ebuild b/media-sound/audacity/audacity-1.1.3.ebuild
index b39ba66209a2..00b209b9c8e0 100644
--- a/media-sound/audacity/audacity-1.1.3.ebuild
+++ b/media-sound/audacity/audacity-1.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.1.3.ebuild,v 1.7 2004/02/28 19:31:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.1.3.ebuild,v 1.8 2004/05/04 02:08:29 eradicator Exp $
 
 inherit eutils
 
@@ -27,7 +27,7 @@ DEPEND=">=x11-libs/wxGTK-2.2.9
 	>=media-libs/ladspa-sdk-1.12
 	flac? ( media-libs/flac )
 	oggvorbis? ( >=media-libs/libvorbis-1.0 )
-	mad? ( >=media-sound/mad-0.14 )
+	mad? ( >=media-sound/madplay-0.14 )
 	encode? ( >=media-sound/lame-3.92 )"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-sound/audacity/audacity-1.2.0-r1.ebuild b/media-sound/audacity/audacity-1.2.0-r1.ebuild
index a077a8cfcfd6..0f4a250399f6 100644
--- a/media-sound/audacity/audacity-1.2.0-r1.ebuild
+++ b/media-sound/audacity/audacity-1.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.2.0-r1.ebuild,v 1.1 2004/04/05 07:17:25 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.2.0-r1.ebuild,v 1.2 2004/05/04 02:08:29 eradicator Exp $
 
 inherit eutils
 
@@ -26,7 +26,7 @@ DEPEND=">=x11-libs/wxGTK-2.2.9
 	>=media-libs/ladspa-sdk-1.12
 	flac? ( media-libs/flac )
 	oggvorbis? ( >=media-libs/libvorbis-1.0 )
-	mad? ( >=media-sound/mad-0.14 )
+	mad? ( >=media-sound/madplay-0.14 )
 	encode? ( >=media-sound/lame-3.92 )"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-sound/beast/ChangeLog b/media-sound/beast/ChangeLog
index 553bbd27de02..d93ac9e4c98d 100644
--- a/media-sound/beast/ChangeLog
+++ b/media-sound/beast/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/beast
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/beast/ChangeLog,v 1.11 2004/04/22 08:13:33 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beast/ChangeLog,v 1.12 2004/05/04 02:08:53 eradicator Exp $
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org> beast-0.5.4.ebuild,
+  beast-0.6.0.ebuild:
+  Changing mad dep to madplay.
 
   22 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> beast-0.5.4.ebuild,
   beast-0.6.0.ebuild:
diff --git a/media-sound/beast/beast-0.5.4.ebuild b/media-sound/beast/beast-0.5.4.ebuild
index 62aff263cffa..ac81cd158f1d 100644
--- a/media-sound/beast/beast-0.5.4.ebuild
+++ b/media-sound/beast/beast-0.5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/beast/beast-0.5.4.ebuild,v 1.4 2004/04/22 08:13:33 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beast/beast-0.5.4.ebuild,v 1.5 2004/05/04 02:08:53 eradicator Exp $
 
 inherit eutils
 
@@ -22,7 +22,7 @@ RDEPEND=">=dev-libs/glib-2.0
 	>=gnome-base/libgnomecanvas-2.0
 	>=media-libs/libogg-1.0
 	>=media-libs/libvorbis-1.0
-	mad? ( media-sound/mad )"
+	mad? ( media-sound/madplay )"
 
 DEPEND="dev-util/pkgconfig
 	dev-lang/perl
diff --git a/media-sound/beast/beast-0.6.0.ebuild b/media-sound/beast/beast-0.6.0.ebuild
index ac4cd930b404..6a9027fe7a46 100644
--- a/media-sound/beast/beast-0.6.0.ebuild
+++ b/media-sound/beast/beast-0.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/beast/beast-0.6.0.ebuild,v 1.2 2004/04/22 08:13:33 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/beast/beast-0.6.0.ebuild,v 1.3 2004/05/04 02:08:53 eradicator Exp $
 
 inherit eutils
 
@@ -22,7 +22,7 @@ RDEPEND=">=dev-libs/glib-2.0
 	>=gnome-base/libgnomecanvas-2.0
 	>=media-libs/libogg-1.0
 	>=media-libs/libvorbis-1.0
-	mad? ( media-sound/mad )"
+	mad? ( media-sound/madplay )"
 
 DEPEND="dev-util/pkgconfig
 	dev-lang/perl
diff --git a/media-sound/bossogg/ChangeLog b/media-sound/bossogg/ChangeLog
index 1ae4c8ced395..71fa135b2dd6 100644
--- a/media-sound/bossogg/ChangeLog
+++ b/media-sound/bossogg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/bossogg
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/ChangeLog,v 1.5 2004/04/27 19:58:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/ChangeLog,v 1.6 2004/05/04 02:14:51 eradicator Exp $
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  bossogg-0.13.5.ebuild, bossogg-0.13.6.ebuild:
+  Changing mad dep to madplay.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> bossogg-0.13.6.ebuild:
   Add inherit eutils
diff --git a/media-sound/bossogg/bossogg-0.13.5.ebuild b/media-sound/bossogg/bossogg-0.13.5.ebuild
index 645a2d109bb3..09cbd6c243e2 100644
--- a/media-sound/bossogg/bossogg-0.13.5.ebuild
+++ b/media-sound/bossogg/bossogg-0.13.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/bossogg-0.13.5.ebuild,v 1.3 2004/04/17 16:36:06 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/bossogg-0.13.5.ebuild,v 1.4 2004/05/04 02:14:51 eradicator Exp $
 
 inherit eutils
 
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 
 DEPEND=">=media-libs/libao-0.8.3
 	oggvorbis? ( media-libs/libvorbis )
-	mad? ( media-sound/mad media-libs/id3lib )"
+	mad? ( media-sound/madplay media-libs/id3lib )"
 
 RDEPEND="${DEPEND}
 	 dev-python/pysqlite"
diff --git a/media-sound/bossogg/bossogg-0.13.6.ebuild b/media-sound/bossogg/bossogg-0.13.6.ebuild
index 1cef22309c60..e238a5be831a 100644
--- a/media-sound/bossogg/bossogg-0.13.6.ebuild
+++ b/media-sound/bossogg/bossogg-0.13.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/bossogg-0.13.6.ebuild,v 1.2 2004/04/27 19:58:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/bossogg/bossogg-0.13.6.ebuild,v 1.3 2004/05/04 02:14:51 eradicator Exp $
 
 inherit eutils
 
@@ -19,7 +19,7 @@ DEPEND=">=media-libs/libao-0.8.3
 	media-libs/libshout
 	flac? ( media-libs/flac )
 	oggvorbis? ( media-libs/libvorbis )
-	mad? ( media-sound/mad media-libs/id3lib )"
+	mad? ( media-sound/madplay media-libs/id3lib )"
 
 RDEPEND="${DEPEND}
 	 dev-python/pysqlite"
diff --git a/media-sound/glame/ChangeLog b/media-sound/glame/ChangeLog
index 67330156b227..62a9d7491bb3 100644
--- a/media-sound/glame/ChangeLog
+++ b/media-sound/glame/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/glame
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/ChangeLog,v 1.15 2004/04/20 16:44:18 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/ChangeLog,v 1.16 2004/05/04 02:09:45 eradicator Exp $
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org> glame-1.0.1.ebuild,
+  glame-1.0.2.ebuild:
+  Changing mad dep to madplay.
 
   20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> glame-1.0.2.ebuild:
   QA fix.
diff --git a/media-sound/glame/glame-1.0.1.ebuild b/media-sound/glame/glame-1.0.1.ebuild
index adedcd5dccfd..4dfae924b39e 100644
--- a/media-sound/glame/glame-1.0.1.ebuild
+++ b/media-sound/glame/glame-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/glame-1.0.1.ebuild,v 1.7 2004/03/27 03:14:00 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/glame-1.0.1.ebuild,v 1.8 2004/05/04 02:09:45 eradicator Exp $
 
 IUSE="nls gnome oggvorbis"
 
@@ -17,7 +17,7 @@ RDEPEND=">=dev-util/guile-1.4-r3
 	dev-libs/libxml2
 	>=media-sound/esound-0.2
 	media-libs/audiofile
-	media-sound/mad
+	media-sound/madplay
 	oggvorbis? ( media-sound/vorbis-tools )
 	gnome? ( <gnome-base/libglade-2 gnome-base/gnome-libs )"
 
diff --git a/media-sound/glame/glame-1.0.2.ebuild b/media-sound/glame/glame-1.0.2.ebuild
index 0ed07b8142a7..d9ba4f05be66 100644
--- a/media-sound/glame/glame-1.0.2.ebuild
+++ b/media-sound/glame/glame-1.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/glame-1.0.2.ebuild,v 1.5 2004/04/20 16:44:18 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/glame-1.0.2.ebuild,v 1.6 2004/05/04 02:09:45 eradicator Exp $
 
 inherit eutils
 
@@ -20,7 +20,7 @@ RDEPEND=">=dev-util/guile-1.4-r3
 	>=media-sound/esound-0.2
 	>=media-libs/audiofile-0.2.2
 	=dev-libs/fftw-2*
-	media-sound/mad
+	media-sound/madplay
 	media-libs/ladspa-sdk
 	oggvorbis? ( >=media-libs/libvorbis-1.0 )
 	gnome? ( <gnome-base/libglade-2 gnome-base/gnome-libs )
diff --git a/media-sound/liteamp/ChangeLog b/media-sound/liteamp/ChangeLog
index 9a7a3969b2a9..5004b9fc7887 100644
--- a/media-sound/liteamp/ChangeLog
+++ b/media-sound/liteamp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/liteamp
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/liteamp/ChangeLog,v 1.12 2004/04/20 17:26:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/liteamp/ChangeLog,v 1.13 2004/05/04 02:12:40 eradicator Exp $
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org> liteamp-0.2.1.ebuild,
+  liteamp-0.2.2.ebuild, liteamp-0.2.3.2.ebuild, liteamp-0.2.4.1.ebuild:
+  Changing mad dep to madplay.
 
   20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> liteamp-0.2.1.ebuild,
   liteamp-0.2.2.ebuild, liteamp-0.2.3.2.ebuild, liteamp-0.2.4.1.ebuild:
diff --git a/media-sound/liteamp/liteamp-0.2.1.ebuild b/media-sound/liteamp/liteamp-0.2.1.ebuild
index 31f5f5bec889..ea2d922f4f70 100644
--- a/media-sound/liteamp/liteamp-0.2.1.ebuild
+++ b/media-sound/liteamp/liteamp-0.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/liteamp/liteamp-0.2.1.ebuild,v 1.5 2004/04/20 17:26:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/liteamp/liteamp-0.2.1.ebuild,v 1.6 2004/05/04 02:12:40 eradicator Exp $
 
 IUSE=""
 
@@ -16,7 +16,7 @@ KEYWORDS="x86 ppc"
 
 DEPEND=">=x11-libs/gtk+-2.0.0
 	>=gnome-base/libgnomeui-2.0
-	>=media-sound/mad-0.14
+	>=media-sound/madplay-0.14
 	>=media-libs/libvorbis-1.0
 	media-libs/libao
 	media-libs/libogg"
diff --git a/media-sound/liteamp/liteamp-0.2.2.ebuild b/media-sound/liteamp/liteamp-0.2.2.ebuild
index 47464174d488..ce718f1c7745 100644
--- a/media-sound/liteamp/liteamp-0.2.2.ebuild
+++ b/media-sound/liteamp/liteamp-0.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/liteamp/liteamp-0.2.2.ebuild,v 1.4 2004/04/20 17:26:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/liteamp/liteamp-0.2.2.ebuild,v 1.5 2004/05/04 02:12:40 eradicator Exp $
 
 IUSE=""
 
@@ -16,7 +16,7 @@ KEYWORDS="~x86 ~ppc"
 
 DEPEND=">=x11-libs/gtk+-2.0.0
 	>=gnome-base/libgnomeui-2.0
-	>=media-sound/mad-0.14
+	>=media-sound/madplay-0.14
 	>=media-libs/libvorbis-1.0
 	media-libs/libao
 	media-libs/libogg"
diff --git a/media-sound/liteamp/liteamp-0.2.3.2.ebuild b/media-sound/liteamp/liteamp-0.2.3.2.ebuild
index b41dd08e7f55..bce9697683da 100644
--- a/media-sound/liteamp/liteamp-0.2.3.2.ebuild
+++ b/media-sound/liteamp/liteamp-0.2.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/liteamp/liteamp-0.2.3.2.ebuild,v 1.4 2004/04/20 17:26:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/liteamp/liteamp-0.2.3.2.ebuild,v 1.5 2004/05/04 02:12:40 eradicator Exp $
 
 IUSE=""
 
@@ -17,7 +17,7 @@ KEYWORDS="~x86 ~ppc"
 DEPEND=">=x11-libs/gtk+-2.0.0
 	>=gnome-base/libgnomeui-2.0
 	>=media-libs/libvorbis-1.0
-	>=media-sound/mad-0.14.2b
+	>=media-sound/madplay-0.14.2b
 	media-libs/libao
 	media-libs/libogg"
 
diff --git a/media-sound/liteamp/liteamp-0.2.4.1.ebuild b/media-sound/liteamp/liteamp-0.2.4.1.ebuild
index fd6ddc66e456..8b6eac521291 100644
--- a/media-sound/liteamp/liteamp-0.2.4.1.ebuild
+++ b/media-sound/liteamp/liteamp-0.2.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/liteamp/liteamp-0.2.4.1.ebuild,v 1.3 2004/04/20 17:26:30 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/liteamp/liteamp-0.2.4.1.ebuild,v 1.4 2004/05/04 02:12:40 eradicator Exp $
 
 IUSE=""
 
@@ -17,7 +17,7 @@ KEYWORDS="x86 ~ppc"
 DEPEND=">=x11-libs/gtk+-2.0.0
 	>=gnome-base/libgnomeui-2.0
 	>=media-libs/libvorbis-1.0
-	>=media-sound/mad-0.14.2b
+	>=media-sound/madplay-0.14.2b
 	media-libs/libao
 	media-libs/libogg"
 
diff --git a/media-sound/mixxx/ChangeLog b/media-sound/mixxx/ChangeLog
index 871f0c84099a..f23518bb11f1 100644
--- a/media-sound/mixxx/ChangeLog
+++ b/media-sound/mixxx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mixxx
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/ChangeLog,v 1.17 2004/04/20 17:28:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/ChangeLog,v 1.18 2004/05/04 02:10:47 eradicator Exp $
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org> mixxx-0.9.2.ebuild,
+  mixxx-1.1-r1.ebuild, mixxx-1.1.ebuild, mixxx-1.2.1.ebuild:
+  Changing mad dep to madplay.
 
   20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> mixxx-0.9.2.ebuild,
   mixxx-1.1-r1.ebuild, mixxx-1.1.ebuild:
diff --git a/media-sound/mixxx/mixxx-0.9.2.ebuild b/media-sound/mixxx/mixxx-0.9.2.ebuild
index c17a18cbb29a..3d6da56fab90 100644
--- a/media-sound/mixxx/mixxx-0.9.2.ebuild
+++ b/media-sound/mixxx/mixxx-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-0.9.2.ebuild,v 1.6 2004/04/20 17:28:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-0.9.2.ebuild,v 1.7 2004/05/04 02:10:47 eradicator Exp $
 
 IUSE=""
 
@@ -16,7 +16,7 @@ SLOT="0"
 DEPEND="virtual/glibc
 	>=x11-libs/qt-3.0.3
 	media-libs/portaudio
-	media-sound/mad
+	media-sound/madplay
 	media-libs/audiofile"
 
 S=${WORKDIR}/${P}/src
diff --git a/media-sound/mixxx/mixxx-1.1-r1.ebuild b/media-sound/mixxx/mixxx-1.1-r1.ebuild
index 784228fa2e3d..3f2539d05828 100644
--- a/media-sound/mixxx/mixxx-1.1-r1.ebuild
+++ b/media-sound/mixxx/mixxx-1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.1-r1.ebuild,v 1.3 2004/04/20 17:28:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.1-r1.ebuild,v 1.4 2004/05/04 02:10:47 eradicator Exp $
 
 IUSE=""
 
@@ -15,7 +15,7 @@ SLOT="0"
 
 DEPEND="virtual/glibc
 	>=x11-libs/qt-3.1.0
-	media-sound/mad
+	media-sound/madplay
 	=dev-libs/fftw-2.1.5
 	media-libs/libogg
 	media-libs/libvorbis
diff --git a/media-sound/mixxx/mixxx-1.1.ebuild b/media-sound/mixxx/mixxx-1.1.ebuild
index 5b6066ef1b52..afaa249f7d51 100644
--- a/media-sound/mixxx/mixxx-1.1.ebuild
+++ b/media-sound/mixxx/mixxx-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.1.ebuild,v 1.5 2004/04/20 17:28:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.1.ebuild,v 1.6 2004/05/04 02:10:47 eradicator Exp $
 
 IUSE=""
 
@@ -15,7 +15,7 @@ SLOT="0"
 
 DEPEND="virtual/glibc
 	>=x11-libs/qt-3.1.0
-	media-sound/mad
+	media-sound/madplay
 	=dev-libs/fftw-2.1.5
 	media-libs/libogg
 	media-libs/libvorbis
diff --git a/media-sound/mixxx/mixxx-1.2.1.ebuild b/media-sound/mixxx/mixxx-1.2.1.ebuild
index 0343d9f77f5d..28f5f892feeb 100644
--- a/media-sound/mixxx/mixxx-1.2.1.ebuild
+++ b/media-sound/mixxx/mixxx-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.2.1.ebuild,v 1.2 2004/03/31 18:49:50 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mixxx/mixxx-1.2.1.ebuild,v 1.3 2004/05/04 02:10:47 eradicator Exp $
 
 IUSE="jack"
 
@@ -15,7 +15,7 @@ SLOT="0"
 
 DEPEND="virtual/glibc
 	>=x11-libs/qt-3.1.0
-	media-sound/mad
+	media-sound/madplay
 	=dev-libs/fftw-2*
 	media-libs/libogg
 	media-libs/libvorbis
diff --git a/media-sound/mp3splt/ChangeLog b/media-sound/mp3splt/ChangeLog
index 71d54cd66fd9..d9368e162b5e 100644
--- a/media-sound/mp3splt/ChangeLog
+++ b/media-sound/mp3splt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mp3splt
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/ChangeLog,v 1.7 2004/04/01 07:45:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/ChangeLog,v 1.8 2004/05/04 02:13:30 eradicator Exp $
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org> mp3splt-1.9.ebuild,
+  mp3splt-2.0.ebuild:
+  Changing mad dep to madplay.
 
   31 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> mp3splt-1.9.ebuild,
   mp3splt-2.0.ebuild:
diff --git a/media-sound/mp3splt/mp3splt-1.9.ebuild b/media-sound/mp3splt/mp3splt-1.9.ebuild
index 5f45415f8dcf..59d1e2d7f598 100644
--- a/media-sound/mp3splt/mp3splt-1.9.ebuild
+++ b/media-sound/mp3splt/mp3splt-1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/mp3splt-1.9.ebuild,v 1.4 2004/04/01 07:45:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/mp3splt-1.9.ebuild,v 1.5 2004/05/04 02:13:30 eradicator Exp $
 
 IUSE=""
 
@@ -14,7 +14,7 @@ KEYWORDS="~x86"
 
 DEPEND="media-libs/libogg
 	media-libs/libvorbis
-	media-sound/mad"
+	media-sound/madplay"
 
 src_compile() {
 	econf || die
diff --git a/media-sound/mp3splt/mp3splt-2.0.ebuild b/media-sound/mp3splt/mp3splt-2.0.ebuild
index a0d51cfa8f77..e0b2206736d9 100644
--- a/media-sound/mp3splt/mp3splt-2.0.ebuild
+++ b/media-sound/mp3splt/mp3splt-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/mp3splt-2.0.ebuild,v 1.2 2004/04/01 07:45:04 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3splt/mp3splt-2.0.ebuild,v 1.3 2004/05/04 02:13:30 eradicator Exp $
 
 IUSE=""
 
@@ -14,7 +14,7 @@ KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64"
 
 DEPEND="media-libs/libogg
 	media-libs/libvorbis
-	media-sound/mad"
+	media-sound/madplay"
 
 src_compile() {
 	econf || die
diff --git a/media-sound/mpd/ChangeLog b/media-sound/mpd/ChangeLog
index 6374dd667d01..420c4dc653bd 100644
--- a/media-sound/mpd/ChangeLog
+++ b/media-sound/mpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mpd
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.25 2004/04/25 17:46:59 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/ChangeLog,v 1.26 2004/05/04 02:06:59 eradicator Exp $
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org> mpd-0.10.3.ebuild,
+  mpd-0.9.4.ebuild:
+  Changing mad dep to madplay.
 
   25 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> mpd-0.10.2.ebuild,
   mpd-0.10.3.ebuild:
diff --git a/media-sound/mpd/mpd-0.10.3.ebuild b/media-sound/mpd/mpd-0.10.3.ebuild
index 1e00c6e46a67..b53b12dad5b4 100644
--- a/media-sound/mpd/mpd-0.10.3.ebuild
+++ b/media-sound/mpd/mpd-0.10.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.10.3.ebuild,v 1.6 2004/04/25 17:46:59 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.10.3.ebuild,v 1.7 2004/05/04 02:06:59 eradicator Exp $
 
 IUSE="oggvorbis mad aac audiofile ipv6 flac"
 
@@ -14,7 +14,7 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="oggvorbis? ( media-libs/libvorbis )
-	mad? ( media-sound/mad )
+	mad? ( media-sound/madplay )
 	aac? ( >=media-libs/faad2-2.0_rc2 )
 	audiofile? ( media-libs/audiofile )
 	flac? ( >=media-libs/flac-1.1.0 )
diff --git a/media-sound/mpd/mpd-0.9.4.ebuild b/media-sound/mpd/mpd-0.9.4.ebuild
index 3db68b7bf230..cded7c6d48b4 100644
--- a/media-sound/mpd/mpd-0.9.4.ebuild
+++ b/media-sound/mpd/mpd-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.9.4.ebuild,v 1.4 2004/04/20 07:50:56 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpd/mpd-0.9.4.ebuild,v 1.5 2004/05/04 02:06:59 eradicator Exp $
 
 IUSE="oggvorbis mad"
 
@@ -14,7 +14,7 @@ SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND="oggvorbis? ( media-libs/libvorbis )
-	mad? ( media-sound/mad )
+	mad? ( media-sound/madplay )
 	>=media-libs/flac-1.1.0
 	>=media-libs/libao-0.8.4
 	sys-libs/zlib"
diff --git a/media-sound/mpg321/ChangeLog b/media-sound/mpg321/ChangeLog
index 85a0cb4130d5..bf9fb75b5b78 100644
--- a/media-sound/mpg321/ChangeLog
+++ b/media-sound/mpg321/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/mpg321
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/ChangeLog,v 1.15 2004/04/26 22:18:16 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/ChangeLog,v 1.16 2004/05/04 02:14:28 eradicator Exp $
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mpg321-0.2.10-r1.ebuild:
+  Changing mad dep to madplay.
 
   26 Apr 2004; Stephen P. Becker <geoman@gentoo.org> mpg321-0.2.10-r1.ebuild:
   Marked stable on mips.
diff --git a/media-sound/mpg321/mpg321-0.2.10-r1.ebuild b/media-sound/mpg321/mpg321-0.2.10-r1.ebuild
index f7ac34f92ed7..76f11754a52d 100644
--- a/media-sound/mpg321/mpg321-0.2.10-r1.ebuild
+++ b/media-sound/mpg321/mpg321-0.2.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/mpg321-0.2.10-r1.ebuild,v 1.17 2004/04/26 22:18:16 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/mpg321-0.2.10-r1.ebuild,v 1.18 2004/05/04 02:14:28 eradicator Exp $
 
 IUSE=""
 
@@ -8,7 +8,7 @@ DESCRIPTION="Free MP3 player, drop-in replacement for mpg123"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://sourceforge.net/projects/mpg321/"
 
-DEPEND=">=media-sound/mad-0.14.2b
+DEPEND=">=media-sound/madplay-0.14.2b
 	>=media-libs/libao-0.8.0"
 
 SLOT="0"
diff --git a/media-sound/normalize/ChangeLog b/media-sound/normalize/ChangeLog
index 8014562b500d..83664c0a2b40 100644
--- a/media-sound/normalize/ChangeLog
+++ b/media-sound/normalize/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/normalize
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/normalize/ChangeLog,v 1.12 2004/04/28 16:49:07 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/normalize/ChangeLog,v 1.13 2004/05/04 02:10:14 eradicator Exp $
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  normalize-0.7.4.ebuild, normalize-0.7.6-r1.ebuild,
+  normalize-0.7.6-r2.ebuild:
+  Changing mad dep to madplay.
 
   28 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
   normalize-0.7.6-r2.ebuild:
diff --git a/media-sound/normalize/normalize-0.7.4.ebuild b/media-sound/normalize/normalize-0.7.4.ebuild
index 9d32477cc28c..6d4cd10b3fa9 100644
--- a/media-sound/normalize/normalize-0.7.4.ebuild
+++ b/media-sound/normalize/normalize-0.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/normalize/normalize-0.7.4.ebuild,v 1.9 2004/03/01 05:37:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/normalize/normalize-0.7.4.ebuild,v 1.10 2004/05/04 02:10:14 eradicator Exp $
 
 IUSE="xmms"
 
@@ -14,7 +14,7 @@ KEYWORDS="x86 ppc"
 
 RDEPEND="xmms? ( >=media-sound/xmms-1.2.7-r6 )
 	>=media-libs/audiofile-0.2.3-r1
-	>=media-sound/mad-0.14.2b-r1"
+	>=media-sound/madplay-0.14.2b-r1"
 
 # NOTE: the "audiofile" and "mad" dependencies are NOT
 # actually *required*, they are optional, but there are no
diff --git a/media-sound/normalize/normalize-0.7.6-r1.ebuild b/media-sound/normalize/normalize-0.7.6-r1.ebuild
index b31bdea5f2e3..327f90e25fad 100644
--- a/media-sound/normalize/normalize-0.7.6-r1.ebuild
+++ b/media-sound/normalize/normalize-0.7.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/normalize/normalize-0.7.6-r1.ebuild,v 1.8 2004/03/14 21:54:01 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/normalize/normalize-0.7.6-r1.ebuild,v 1.9 2004/05/04 02:10:14 eradicator Exp $
 
 DESCRIPTION="Audio file volume normalizer"
 HOMEPAGE="http://www.cs.columbia.edu/~cvaill/normalize"
@@ -12,7 +12,7 @@ KEYWORDS="x86 ~ppc sparc amd64"
 IUSE="xmms mad"
 
 RDEPEND="xmms? ( >=media-sound/xmms-1.2.7-r6 )
-	mad? ( >=media-sound/mad-0.14.2b )
+	mad? ( >=media-sound/madplay-0.14.2b )
 	>=media-libs/audiofile-0.2.3-r1"
 
 src_compile() {
diff --git a/media-sound/normalize/normalize-0.7.6-r2.ebuild b/media-sound/normalize/normalize-0.7.6-r2.ebuild
index 3d0d0cbe84ac..616e5dc72030 100644
--- a/media-sound/normalize/normalize-0.7.6-r2.ebuild
+++ b/media-sound/normalize/normalize-0.7.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/normalize/normalize-0.7.6-r2.ebuild,v 1.2 2004/04/28 16:49:07 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/normalize/normalize-0.7.6-r2.ebuild,v 1.3 2004/05/04 02:10:14 eradicator Exp $
 
 DESCRIPTION="Audio file volume normalizer"
 HOMEPAGE="http://www.cs.columbia.edu/~cvaill/normalize"
@@ -12,7 +12,7 @@ KEYWORDS="x86 ~ppc sparc amd64"
 IUSE="xmms mad audiofile"
 
 DEPEND="xmms? ( >=media-sound/xmms-1.2.7-r6 )
-	mad? ( >=media-sound/mad-0.14.2b )
+	mad? ( >=media-sound/madplay-0.14.2b )
 	audiofile? ( >=media-libs/audiofile-0.2.3-r1 )"
 
 src_compile() {
diff --git a/media-sound/qmbtagger/ChangeLog b/media-sound/qmbtagger/ChangeLog
index 4ae1c5710e01..9929975274d6 100644
--- a/media-sound/qmbtagger/ChangeLog
+++ b/media-sound/qmbtagger/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/qmbtagger
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmbtagger/ChangeLog,v 1.4 2004/04/29 08:26:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmbtagger/ChangeLog,v 1.5 2004/05/04 02:14:04 eradicator Exp $
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  qmbtagger-0.04.ebuild, qmbtagger-0.05.ebuild, qmbtagger-0.06.ebuild:
+  Changing mad dep to madplay.
 
 *qmbtagger-0.06 (29 Apr 2004)
 
diff --git a/media-sound/qmbtagger/qmbtagger-0.04.ebuild b/media-sound/qmbtagger/qmbtagger-0.04.ebuild
index 22cc22d36567..e190b18d9218 100644
--- a/media-sound/qmbtagger/qmbtagger-0.04.ebuild
+++ b/media-sound/qmbtagger/qmbtagger-0.04.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmbtagger/qmbtagger-0.04.ebuild,v 1.1 2004/02/11 20:56:13 anti Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmbtagger/qmbtagger-0.04.ebuild,v 1.2 2004/05/04 02:14:04 eradicator Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ LICENSE="LGPL-2"
 
 DEPEND=">=x11-libs/qt-3.1.2
 	media-libs/musicbrainz
-	media-sound/mad
+	media-sound/madplay
 	media-libs/flac
 	media-libs/id3lib
 	oggvorbis? ( media-sound/vorbis-tools )"
diff --git a/media-sound/qmbtagger/qmbtagger-0.05.ebuild b/media-sound/qmbtagger/qmbtagger-0.05.ebuild
index 4731f6de3870..1cd5cd7d1c90 100644
--- a/media-sound/qmbtagger/qmbtagger-0.05.ebuild
+++ b/media-sound/qmbtagger/qmbtagger-0.05.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmbtagger/qmbtagger-0.05.ebuild,v 1.2 2004/04/09 14:00:36 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmbtagger/qmbtagger-0.05.ebuild,v 1.3 2004/05/04 02:14:04 eradicator Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ LICENSE="LGPL-2"
 
 DEPEND=">=x11-libs/qt-3.1.2
 	media-libs/musicbrainz
-	media-sound/mad
+	media-sound/madplay
 	media-libs/flac
 	media-libs/id3lib
 	oggvorbis? ( media-sound/vorbis-tools )"
diff --git a/media-sound/qmbtagger/qmbtagger-0.06.ebuild b/media-sound/qmbtagger/qmbtagger-0.06.ebuild
index a64b92d2757c..0d5442ce8c1b 100644
--- a/media-sound/qmbtagger/qmbtagger-0.06.ebuild
+++ b/media-sound/qmbtagger/qmbtagger-0.06.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qmbtagger/qmbtagger-0.06.ebuild,v 1.1 2004/04/29 08:26:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qmbtagger/qmbtagger-0.06.ebuild,v 1.2 2004/05/04 02:14:04 eradicator Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 
 DEPEND=">=x11-libs/qt-3.1.2
 	media-libs/musicbrainz
-	media-sound/mad
+	media-sound/madplay
 	media-libs/flac
 	media-libs/id3lib
 	oggvorbis? ( media-sound/vorbis-tools )"
diff --git a/media-sound/sox/ChangeLog b/media-sound/sox/ChangeLog
index eaaa923d3137..9e610a9ebaad 100644
--- a/media-sound/sox/ChangeLog
+++ b/media-sound/sox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/sox
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.19 2004/04/20 17:35:41 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.20 2004/05/04 02:07:47 eradicator Exp $
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  sox-12.17.4-r1.ebuild:
+  Changing mad dep to madplay.
 
   20 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
   sox-12.17.3-r3.ebuild:
diff --git a/media-sound/sox/sox-12.17.4-r1.ebuild b/media-sound/sox/sox-12.17.4-r1.ebuild
index 437754ebd6e1..b77dde7b83a3 100644
--- a/media-sound/sox/sox-12.17.4-r1.ebuild
+++ b/media-sound/sox/sox-12.17.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.4-r1.ebuild,v 1.8 2004/04/12 00:43:47 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-12.17.4-r1.ebuild,v 1.9 2004/05/04 02:07:47 eradicator Exp $
 
 DESCRIPTION="The swiss army knife of sound processing programs"
 HOMEPAGE="http://sox.sourceforge.net"
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1"
 
 DEPEND="virtual/glibc
 	oggvorbis? media-libs/libvorbis
-	mad? media-sound/mad"
+	mad? media-sound/madplay"
 
 src_compile () {
 	# 12.17.4 has mp3 encoding/decoding if you have madlibs and lame
diff --git a/media-sound/sweep/ChangeLog b/media-sound/sweep/ChangeLog
index 9072b06f48f1..91bf1b5f7c7c 100644
--- a/media-sound/sweep/ChangeLog
+++ b/media-sound/sweep/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/sweep
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sweep/ChangeLog,v 1.9 2004/04/26 04:06:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sweep/ChangeLog,v 1.10 2004/05/04 02:11:25 eradicator Exp $
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  sweep-0.8.2-r1.ebuild:
+  Changing mad dep to madplay.
 
   26 Apr 2004; Aron Griffis <agriffis@gentoo.org> sweep-0.8.2-r1.ebuild:
   Add die following econf for bug 48950
diff --git a/media-sound/sweep/sweep-0.8.2-r1.ebuild b/media-sound/sweep/sweep-0.8.2-r1.ebuild
index 3ac59a97374e..e59eb9328c57 100644
--- a/media-sound/sweep/sweep-0.8.2-r1.ebuild
+++ b/media-sound/sweep/sweep-0.8.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sweep/sweep-0.8.2-r1.ebuild,v 1.8 2004/04/26 04:06:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sweep/sweep-0.8.2-r1.ebuild,v 1.9 2004/05/04 02:11:25 eradicator Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ IUSE="oggvorbis alsa nls"
 
 DEPEND=">=media-libs/libsndfile-1.0*
 		>=x11-libs/gtk+-1.2*
-		>=media-sound/mad-0.14.2b
+		>=media-sound/madplay-0.14.2b
 		dev-libs/tdb
 		media-libs/libsamplerate
 		media-libs/speex
diff --git a/media-sound/terminatorx/ChangeLog b/media-sound/terminatorx/ChangeLog
index c8fb48e772de..38bcbe860793 100644
--- a/media-sound/terminatorx/ChangeLog
+++ b/media-sound/terminatorx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/terminatorx
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/terminatorx/ChangeLog,v 1.10 2004/04/26 04:06:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/terminatorx/ChangeLog,v 1.11 2004/05/04 02:11:57 eradicator Exp $
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  terminatorx-3.81.ebuild:
+  Changing mad dep to madplay.
 
   26 Apr 2004; Aron Griffis <agriffis@gentoo.org> terminatorx-3.81.ebuild:
   Add die following econf for bug 48950
diff --git a/media-sound/terminatorx/terminatorx-3.81.ebuild b/media-sound/terminatorx/terminatorx-3.81.ebuild
index 7c066d315126..1486b5fc5b06 100644
--- a/media-sound/terminatorx/terminatorx-3.81.ebuild
+++ b/media-sound/terminatorx/terminatorx-3.81.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/terminatorx/terminatorx-3.81.ebuild,v 1.8 2004/04/26 04:06:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/terminatorx/terminatorx-3.81.ebuild,v 1.9 2004/05/04 02:11:57 eradicator Exp $
 
 inherit gnome2
 
@@ -16,7 +16,7 @@ KEYWORDS="x86 ~amd64"
 IUSE="3dnow alsa mpeg oggvorbis oss sox"
 
 DEPEND="alsa? ( >=media-libs/alsa-lib-0.9 )
-	mpeg? ( media-sound/mad )
+	mpeg? ( media-sound/madplay )
 	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )
 	sox? ( media-sound/sox )
 	>=x11-libs/gtk+-2.2.0