repoman'd

56 files changed, 228 insertions, 830 deletions

diff --git a/media-sound/cdcd/cdcd-0.5.0-r1.ebuild b/media-sound/cdcd/cdcd-0.5.0-r1.ebuild
index 090273ba336b..68efffdd2dfe 100644
--- a/media-sound/cdcd/cdcd-0.5.0-r1.ebuild
+++ b/media-sound/cdcd/cdcd-0.5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdcd/cdcd-0.5.0-r1.ebuild,v 1.2 2002/07/18 14:52:39 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdcd/cdcd-0.5.0-r1.ebuild,v 1.3 2002/07/21 03:07:45 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="a simple yet powerful command line cd player"
@@ -11,6 +11,10 @@ DEPEND="virtual/glibc
 	>=sys-libs/readline-4.0
 	>=media-libs/libcdaudio-0.99.4"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${S}
diff --git a/media-sound/cdcd/cdcd-0.6.4.ebuild b/media-sound/cdcd/cdcd-0.6.4.ebuild
index 42db85046c32..0271df71e5f9 100644
--- a/media-sound/cdcd/cdcd-0.6.4.ebuild
+++ b/media-sound/cdcd/cdcd-0.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cdcd/cdcd-0.6.4.ebuild,v 1.1 2002/07/19 13:13:39 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cdcd/cdcd-0.6.4.ebuild,v 1.2 2002/07/21 03:07:45 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="a simple yet powerful command line cd player"
@@ -11,6 +11,10 @@ DEPEND="virtual/glibc
 	>=sys-libs/readline-4.0
 	>=media-libs/libcdaudio-0.99.4"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 src_compile() {
 
 	econf || die
diff --git a/media-sound/easytag/easytag-0.21.ebuild b/media-sound/easytag/easytag-0.21.ebuild
index cdc5a0ca5e1f..9784131c754b 100644
--- a/media-sound/easytag/easytag-0.21.ebuild
+++ b/media-sound/easytag/easytag-0.21.ebuild
@@ -1,39 +1,36 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-0.21.ebuild,v 1.2 2002/07/11 06:30:40 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-0.21.ebuild,v 1.3 2002/07/21 03:07:45 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="EasyTAG mp3/ogg tag editor"
 SRC_URI="mirror://sourceforge/easytag/${P}.tar.gz"
 HOMEPAGE="http://easytag.sourceforge.net/"
 
-RDEPEND="=x11-libs/gtk+-1.2*
-	     >=media-libs/id3lib-3.7.13
-	     oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-	
-DEPEND="${RDEPEND}"
+DEPEND="=x11-libs/gtk+-1.2*
+	>=media-libs/id3lib-3.7.13
+	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_compile() {
 	local myconf
-	if [ "use oggvorbis" ] ; then
-		myconf=""
-	else
-		myconf="--disable-ogg"
-	fi
+
+	use oggvorbis || myconf="--disable-ogg"
 	
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man ${myconf} || die
+	econf ${myconf} || die
 
 	emake || die
 }
 
 src_install() {                               
-	make prefix=${D}/usr 						\
-	     mandir=${D}/usr/share/man					\
-	     sysconfdir=${D}/etc					\
-	     sysdir=${D}/usr/share/applets/Multimedia 			\
-	     GNOME_SYSCONFDIR=${D}/etc					\
+	make prefix=${D}/usr \
+	     mandir=${D}/usr/share/man \
+	     sysconfdir=${D}/etc \
+	     sysdir=${D}/usr/share/applets/Multimedia \
+	     GNOME_SYSCONFDIR=${D}/etc \
 	     install || die
 
 	dodoc AUTHORS ChangeLog COPYING FAQ NEWS README TODO 
diff --git a/media-sound/gamix/gamix-1.99_p13.ebuild b/media-sound/gamix/gamix-1.99_p13.ebuild
index ab6d14dbb993..35963c275371 100644
--- a/media-sound/gamix/gamix-1.99_p13.ebuild
+++ b/media-sound/gamix/gamix-1.99_p13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gamix/gamix-1.99_p13.ebuild,v 1.1 2002/05/24 02:57:19 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gamix/gamix-1.99_p13.ebuild,v 1.2 2002/07/21 03:07:45 seemant Exp $
 
 P_V=${P/_p/.p}
 S=${WORKDIR}/${P_V}
@@ -9,28 +9,27 @@ SRC_URI="http://www1.tcnet.ne.jp/fmurata/linux/down/${P_V}.tar.gz"
 HOMEPAGE="http://www1.tcnet.ne.jp/fmurata/linux/down"
 LICENSE="GPL-2"
 
-DEPEND="virtual/glibc 
-		>=media-sound/alsa-driver-0.9_rc1 
+DEPEND=" >=media-sound/alsa-driver-0.9_rc1 
 		>=media-libs/alsa-lib-0.9_rc1
 		x11-libs/gtk+ 
 		dev-libs/glib"
+
 SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
+	econf || die "./configure failed"
 	emake || die
 }
 
 src_install () {
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
+
+#	make \
+#		prefix=${D}/usr \
+#		mandir=${D}/usr/share/man \
+#		infodir=${D}/usr/share/info \
+		einstall || die
 		dodoc README README.euc TODO NEWS INSTALL AUTHORS ABOUT-NLS COPYING
 }
 
diff --git a/media-sound/glame/files/digest-glame-0.5.2-r1 b/media-sound/glame/files/digest-glame-0.5.2-r1
deleted file mode 100644
index fdc046d72095..000000000000
--- a/media-sound/glame/files/digest-glame-0.5.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c38d8be93ccefdc28d395c944af46b4a glame-0.5.2.tar.gz 742803
diff --git a/media-sound/glame/files/digest-glame-0.5.3 b/media-sound/glame/files/digest-glame-0.5.3
deleted file mode 100644
index c614e97537bd..000000000000
--- a/media-sound/glame/files/digest-glame-0.5.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a57183ec77edadf13b6c52d5dccb3216 glame-0.5.3.tar.gz 1101650
diff --git a/media-sound/glame/glame-0.5.2-r1.ebuild b/media-sound/glame/glame-0.5.2-r1.ebuild
deleted file mode 100644
index 2af8a25374b9..000000000000
--- a/media-sound/glame/glame-0.5.2-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# /home/cvsroot/gentoo-x86/skel.build,v 1.5 2001/07/24 22:30:35 lordjoe Exp
-# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/glame-0.5.2-r1.ebuild,v 1.2 2002/07/11 06:30:40 drobbins Exp $
-
-
-
-#inside ${WORKDIR}
-A=${PN}-0.5.2.tar.gz
-S=${WORKDIR}/${PN}-0.5.2
-DESCRIPTION="Glame is an audio file editing utility."
-SRC_URI="http://download.sourceforge.net/glame/${A}"
-HOMEPAGE="http://glame.sourceforge.net/glame/"
-
-#build-time dependencies
-DEPEND=">=dev-util/guile-1.4-r3
-         >=dev-libs/libxml-1.8.15
-         >=media-libs/audiofile-0.2.1"
-
-
-#run-time dependencies, same as DEPEND if RDEPEND isn't defined:
-#RDEPEND="$DEPEND"
-
-
-src_compile() {
-
-    try ./configure --infodir=/usr/share/info --mandir=/usr/share/man 
---host=${CHOST}
-
-    try emake
-}
-
-
-src_install () {
-
-    try make DESTDIR=${D} install
-    dodoc AUTHORS BUGS COPYING CREDITS Changelog INSTALL MAINTAINERS NEWS 
-README TODO
-}
-
diff --git a/media-sound/glame/glame-0.5.3.ebuild b/media-sound/glame/glame-0.5.3.ebuild
deleted file mode 100644
index b23dfcf3bc22..000000000000
--- a/media-sound/glame/glame-0.5.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/glame-0.5.3.ebuild,v 1.2 2002/07/11 06:30:40 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Glame is an audio file editing utility."
-SRC_URI="http://download.sourceforge.net/glame/${P}.tar.gz"
-HOMEPAGE="http://glame.sourceforge.net/glame/"
-
-DEPEND="virtual/glibc
-	>=dev-util/guile-1.4-r3
-	>=dev-util/glade-0.6.2
-        >=dev-libs/libxml-1.8.16
-        >=media-libs/audiofile-0.2.1"
-
-src_compile() {
-
-	./configure --infodir=/usr/share/info --mandir=/usr/share/man --prefix=/usr --host=${CHOST} || die
-	emake || die
-
-}
-
-
-src_install () {
-
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS BUGS COPYING CREDITS Changelog INSTALL MAINTAINERS NEWS README TODO
-
-}
diff --git a/media-sound/glame/glame-0.6.0.ebuild b/media-sound/glame/glame-0.6.0.ebuild
index 53fff31d67b3..e190ece1904a 100644
--- a/media-sound/glame/glame-0.6.0.ebuild
+++ b/media-sound/glame/glame-0.6.0.ebuild
@@ -1,21 +1,24 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/glame-0.6.0.ebuild,v 1.2 2002/07/11 06:30:40 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/glame/glame-0.6.0.ebuild,v 1.3 2002/07/21 03:07:45 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Glame is an audio file editing utility."
 SRC_URI="http://download.sourceforge.net/glame/${P}.tar.gz"
 HOMEPAGE="http://glame.sourceforge.net/glame/"
 
-DEPEND="virtual/glibc
-	>=dev-util/guile-1.4-r3
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND=">=dev-util/guile-1.4-r3
 	>=dev-util/glade-0.6.2
 	>=dev-libs/libxml-1.8.16
 	>=media-libs/audiofile-0.2.1"
 
 src_compile() {
 
-	econf --host=${CHOST} || die
+	econf || die
 	emake || die
 
 }
@@ -23,6 +26,6 @@ src_compile() {
 src_install () {
 
 	einstall || die
-	dodoc AUTHORS BUGS COPYING CREDITS Changelog INSTALL MAINTAINERS NEWS README TODO
+	dodoc AUTHORS BUGS COPYING CREDITS Changelog MAINTAINERS NEWS README TODO
 
 }
diff --git a/media-sound/gnomeradio/gnomeradio-1.2.ebuild b/media-sound/gnomeradio/gnomeradio-1.2.ebuild
index e69a2a5ff932..6359482763f3 100644
--- a/media-sound/gnomeradio/gnomeradio-1.2.ebuild
+++ b/media-sound/gnomeradio/gnomeradio-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomeradio/gnomeradio-1.2.ebuild,v 1.1 2002/07/16 13:50:00 stroke Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnomeradio/gnomeradio-1.2.ebuild,v 1.2 2002/07/21 03:07:46 seemant Exp $ 
 
 # Do _NOT_ strip symbols in the build! Need both lines for Portage 1.8.9+
 DEBUG="yes"
@@ -13,8 +13,9 @@ S=${WORKDIR}/${P}
 DESCRIPTION="A GNOME2 radio tuner"
 SRC_URI="http://mfcn.ilo.de/gnomeradio/${P}.tar.gz"
 HOMEPAGE="http://mfcn.ilo.de/gnomeradio/"
-LICENSE="GPL-2"
+
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86"
 
 DEPEND=">=dev-libs/glib-2.0.4
@@ -30,11 +31,7 @@ DEPEND=">=dev-libs/glib-2.0.4
 RDEPEND="${DEPEND} >=dev-util/pkgconfig-0.12.0"
 
 src_compile() {
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
+	econf
 		--localstatedir=/var/lib \
 		--enable-platform-gnome-2 \
 		--enable-debug=yes || die "configure failed"
diff --git a/media-sound/gnump3d/gnump3d-0.9.9.4.ebuild b/media-sound/gnump3d/gnump3d-0.9.9.4.ebuild
index 9741f3acc67c..2232b832433b 100644
--- a/media-sound/gnump3d/gnump3d-0.9.9.4.ebuild
+++ b/media-sound/gnump3d/gnump3d-0.9.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/gnump3d-0.9.9.4.ebuild,v 1.3 2002/07/11 06:30:40 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnump3d/gnump3d-0.9.9.4.ebuild,v 1.4 2002/07/21 03:07:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A streaming server for MP3, OGG vorbis and other streamable files"
@@ -8,8 +8,11 @@ SRC_URI="mirror://sourceforge/gnump3d/${P}.tar.gz"
 HOMEPAGE="http://gnump3d.sourceforge.net/"
 
 DEPEND="virtual/glibc"
-RDEPEND="${DEPEND}
-	>=sys-devel/perl-5.6.1"
+RDEPEND=">=sys-devel/perl-5.6.1"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_unpack() {
 	unpack ${A}
diff --git a/media-sound/gogo/ChangeLog b/media-sound/gogo/ChangeLog
index 8bcacfd6431f..74a2d700d92f 100644
--- a/media-sound/gogo/ChangeLog
+++ b/media-sound/gogo/ChangeLog
@@ -1,12 +1,12 @@
 # ChangeLog for media-sound/gogo
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gogo/ChangeLog,v 1.3 2002/07/02 03:08:13 lamer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gogo/ChangeLog,v 1.4 2002/07/21 03:07:46 seemant Exp $
 
 *gogo-3.10-r1 (1 Jul 2002)
-	1 Jul 2002; Ben Lutgens <lamer@gentoo.org> gogo-3.10-r1.ebuild :
+  1 Jul 2002; Ben Lutgens <lamer@gentoo.org> gogo-3.10-r1.ebuild :
 
-	The workdir was wrong, removed the src_unpack() because it was useless
-	and corrected the dodoc stuff at the end of src_install()
+    The workdir was wrong, removed the src_unpack() because it was useless
+    and corrected the dodoc stuff at the end of src_install()
 
 
 *gogo-3.10 (20 Jun 2002)
diff --git a/media-sound/gogo/files/digest-gogo-3.10 b/media-sound/gogo/files/digest-gogo-3.10
deleted file mode 100644
index b5987ee89ed1..000000000000
--- a/media-sound/gogo/files/digest-gogo-3.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a8900ca2480d22ffc446c9453b141004 petit310pl3.tgz 362389
diff --git a/media-sound/gogo/gogo-3.10-r1.ebuild b/media-sound/gogo/gogo-3.10-r1.ebuild
index 166d08badc74..f9c1db1e9167 100644
--- a/media-sound/gogo/gogo-3.10-r1.ebuild
+++ b/media-sound/gogo/gogo-3.10-r1.ebuild
@@ -1,19 +1,22 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gogo/gogo-3.10-r1.ebuild,v 1.2 2002/07/11 06:30:40 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gogo/gogo-3.10-r1.ebuild,v 1.3 2002/07/21 03:07:46 seemant Exp $
 
 S=${WORKDIR}/petit310pl3
 DESCRIPTION="GoGo is an assembly optimized version of LAME 3.91"
 SRC_URI="http://member.nifty.ne.jp/~pen/free/gogo3/down/petit310pl3.tgz"
 HOMEPAGE="http://member.nifty.ne.jp/~pen/free/gogo3/mct_gogo.htm"
 
-DEPEND="virtual/glibc
-	dev-lang/nasm"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 -ppc -sparc -sparc64"
+
+DEPEND="dev-lang/nasm"
 #	>=sys-libs/ncurses-5.H2
 #	gtk?    ( =x11-libs/gtk+-1.2* )"
 #	oggvorbis? ( >=media-libs/libvorbis-1.0_rc3 )"
 # Oggvorbis support breaks with -rc3 
-RDEPEND="virtual/glibc"
+#RDEPEND="virtual/glibc"
 #	>=sys-libs/ncurses-5.2
 #	gtk?    ( =x11-libs/gtk+-1.2* )"
 #	oggvorbis? ( >=media-libs/libvorbis-1.0_rc3 )"
@@ -36,8 +39,7 @@ src_compile() {
 		myconf="$myconf --enable-debug=no"
 	fi
 	
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
+	econf \
 		--enable-shared \
 		--enable-nasm \
 		--enable-extopt=full \
@@ -48,13 +50,12 @@ src_compile() {
 
 src_install () {
 
-	cd /var/tmp/portage/gogo-${PV}/work/petit310pl3
 	patch -p0 < ${FILESDIR}/make-work-3.10pl3.patch || die
-	mkdir ${D}/usr
-	mkdir ${D}/usr/bin
-	mkdir ${D}/usr/share
-	mkdir ${D}/usr/share/man
-	mkdir ${D}/usr/share/doc
+
+	dodir /usr/bin
+	dodir /usr/share/man
+	dodir /usr/share/doc
+
 	make exec_prefix=${D}usr \
 		mandir=${D}usr/share/man \
 		install || die
diff --git a/media-sound/gogo/gogo-3.10.ebuild b/media-sound/gogo/gogo-3.10.ebuild
deleted file mode 100644
index 756cd9f58566..000000000000
--- a/media-sound/gogo/gogo-3.10.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gogo/gogo-3.10.ebuild,v 1.2 2002/07/11 06:30:40 drobbins Exp $
-
-S=${WORKDIR}/gogo-${PV}
-DESCRIPTION="GoGo is an assembly optimized version of LAME 3.91"
-SRC_URI="http://member.nifty.ne.jp/~pen/free/gogo3/down/petit310pl3.tgz"
-HOMEPAGE="http://member.nifty.ne.jp/~pen/free/gogo3/mct_gogo.htm"
-
-DEPEND="virtual/glibc
-	dev-lang/nasm"
-#	>=sys-libs/ncurses-5.H2
-#	gtk?    ( =x11-libs/gtk+-1.2* )"
-#	oggvorbis? ( >=media-libs/libvorbis-1.0_rc3 )"
-# Oggvorbis support breaks with -rc3 
-RDEPEND="virtual/glibc"
-#	>=sys-libs/ncurses-5.2
-#	gtk?    ( =x11-libs/gtk+-1.2* )"
-#	oggvorbis? ( >=media-libs/libvorbis-1.0_rc3 )"
-
-src_unpack() {
-	unpack ${A}
-	cd petit310pl3
-}
-
-src_compile() {
-
-	local myconf=""
-#	if [ "`use oggvorbis`" ] ; then
-#		myconf="--with-vorbis"
-		myconf="--without-vorbis"
-#	else
-#		myconf="--without-vorbis"
-#	fi
-#	if [ "`use gtk`" ] ; then
-#		myconf="$myconf --enable-mp3x"
-#	fi
-	if [ "$DEBUG" ] ; then
-		myconf="$myconf --enable-debug=yes"
-	else
-		myconf="$myconf --enable-debug=no"
-	fi
-	
-	cd /var/tmp/portage/gogo-${PV}/work/petit310pl3
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--enable-shared \
-		--enable-nasm \
-		--enable-extopt=full \
-		$myconf || die
-		
-	emake || die
-}
-
-src_install () {
-
-	cd /var/tmp/portage/gogo-${PV}/work/petit310pl3
-	patch -p0 < ${FILESDIR}/make-work-3.10pl3.patch || die
-	mkdir ${D}/usr
-	mkdir ${D}/usr/bin
-	mkdir ${D}/usr/share
-	mkdir ${D}/usr/share/man
-	mkdir ${D}/usr/share/doc
-	make exec_prefix=${D}usr \
-		mandir=${D}usr/share/man \
-		install || die
-
-	dodoc API COPYING HACKING PRESETS.draft LICENSE README* TODO USAGE
-	dohtml -r ./
-}
diff --git a/media-sound/gom/gom-0.29.103-r1.ebuild b/media-sound/gom/gom-0.29.103-r1.ebuild
index 3a08f160c251..e1bd2f881b4b 100644
--- a/media-sound/gom/gom-0.29.103-r1.ebuild
+++ b/media-sound/gom/gom-0.29.103-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gom/gom-0.29.103-r1.ebuild,v 1.4 2002/07/11 06:30:40 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gom/gom-0.29.103-r1.ebuild,v 1.5 2002/07/21 03:07:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Console Mixer Program for OSS"
@@ -9,24 +9,29 @@ HOMEPAGE="http://www.fh-worms.de/~inf222"
 
 DEPEND=">=sys-libs/ncurses-5.2"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 src_compile() {
 
-    try ./configure --prefix=/usr --mandir=/usr/share/man
-    try make CFLAGS="${CFLAGS}"
+	econf || die
+	make CFLAGS="${CFLAGS}" || die
 
 }
 
 src_install () {
 
-    try make DESTDIR=${D} install
-    dodoc NEWS ChangeLog README
-    docinto examples
-    dodoc README 
-    docinto examples/default
-    dodoc examples/default/*
-    docinto examples/standard
-    dodoc examples/standard/*
-    docinto examples/two-mixers
-    dodoc examples/two-mixers/*
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS NEWS ChangeLog README
+	docinto examples
+	dodoc README 
+	docinto examples/default
+	dodoc examples/default/*
+	docinto examples/standard
+	dodoc examples/standard/*
+	docinto examples/two-mixers
+	dodoc examples/two-mixers/*
 
 }
diff --git a/media-sound/gradio/gradio-1.0.1.ebuild b/media-sound/gradio/gradio-1.0.1.ebuild
index ca92b5787c84..f6634f2badc9 100644
--- a/media-sound/gradio/gradio-1.0.1.ebuild
+++ b/media-sound/gradio/gradio-1.0.1.ebuild
@@ -1,13 +1,14 @@
-# Copyright 2002 Gentoo 
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gradio/gradio-1.0.1.ebuild,v 1.1 2002/07/17 22:47:13 bass Exp $
+# Copyright 2002, Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2.
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gradio/gradio-1.0.1.ebuild,v 1.2 2002/07/21 03:07:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GTK based app for radio tuner cards"
 SRC_URI="ftp://ftp.foobazco.org/pub/gradio/${P}.tar.gz"
-
 HOMEPAGE="http://foobazco.org/projects/gradio/"
-LICENSE="GPL-2"
+
 SLOT="0"
+LICENSE="GPL-2"
 KEYWORDS="x86"
 
 DEPEND="=x11-libs/gtk+-1.2*"
@@ -23,9 +24,10 @@ src_install () {
 	
 	dodir /usr/bin
 	dodir /usr/share/man/man1
+
 	einstall \
-	BINDIR=${D}/usr/bin \
-	MANDIR=${D}/usr/share/man/man1 || die
+		BINDIR=${D}/usr/bin \
+		MANDIR=${D}/usr/share/man/man1 || die
 	
 	dodoc Changes COPYING README
 }
diff --git a/media-sound/grip/files/digest-grip-2.98.6 b/media-sound/grip/files/digest-grip-2.98.6
deleted file mode 100644
index 7d38e6efa615..000000000000
--- a/media-sound/grip/files/digest-grip-2.98.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b442daf999d1a159e8e1305bc693bc51 grip-2.98.6.tar.gz 788660
diff --git a/media-sound/grip/files/digest-grip-2.98.6-r1 b/media-sound/grip/files/digest-grip-2.98.6-r1
deleted file mode 100644
index 7d38e6efa615..000000000000
--- a/media-sound/grip/files/digest-grip-2.98.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b442daf999d1a159e8e1305bc693bc51 grip-2.98.6.tar.gz 788660
diff --git a/media-sound/grip/files/digest-grip-3.0.0 b/media-sound/grip/files/digest-grip-3.0.0
deleted file mode 100644
index 71b2ffcd1d74..000000000000
--- a/media-sound/grip/files/digest-grip-3.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a3d0fa657fd7c70656fe6d8b63a75527 grip-3.0.0.tar.gz 829086
diff --git a/media-sound/grip/files/digest-grip-3.0.0-r1 b/media-sound/grip/files/digest-grip-3.0.0-r1
deleted file mode 100644
index 71b2ffcd1d74..000000000000
--- a/media-sound/grip/files/digest-grip-3.0.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a3d0fa657fd7c70656fe6d8b63a75527 grip-3.0.0.tar.gz 829086
diff --git a/media-sound/grip/grip-2.98.6-r1.ebuild b/media-sound/grip/grip-2.98.6-r1.ebuild
deleted file mode 100644
index f2ec3d5f039d..000000000000
--- a/media-sound/grip/grip-2.98.6-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/grip-2.98.6-r1.ebuild,v 1.3 2002/07/11 06:30:40 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GTK+ based Audio CD Ripper"
-SRC_URI="http://www.nostatic.org/grip/${P}.tar.gz"
-HOMEPAGE="http://www.nostatic.org/grip"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	media-sound/lame
-	media-sound/cdparanoia
-	media-libs/id3lib
-	gnome-base/gnome-libs
-	gnome-base/ORBit
-	gnome-base/libghttp
-	oggvorbis? ( media-sound/vorbis-tools )
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf
-
-	use nls || myconf="--disable-nls"
-
-	# apply CFLAGS
-	mv Makefile.in Makefile.in.old
-	sed -e "s/CFLAGS = -g -O2/CFLAGS = ${CFLAGS}/" \
-		Makefile.in.old > Makefile.in
-
-	# fix cdparanoia libs not linking
-	mv src/Makefile.in src/Makefile.in.orig
-	sed -e "s/LDFLAGS =/LDFLAGS = -lcdda_interface -lcdda_paranoia/" \
-		src/Makefile.in.orig > src/Makefile.in
-
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install () {
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		sysconfdir=${D}/etc \
-		install || die
-
-	dodoc ABOUT-NLS AUTHORS CREDITS LICENSE CHANGES README TODO
-}
diff --git a/media-sound/grip/grip-2.98.6.ebuild b/media-sound/grip/grip-2.98.6.ebuild
deleted file mode 100644
index 3751eab4b76c..000000000000
--- a/media-sound/grip/grip-2.98.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/grip-2.98.6.ebuild,v 1.3 2002/07/11 06:30:40 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GTK+ based Audio CD Ripper"
-SRC_URI="http://www.nostatic.org/grip/${P}.tar.gz"
-HOMEPAGE="http://www.nostatic.org/grip"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	media-sound/lame
-	media-sound/cdparanoia
-	media-libs/id3lib
-	virtual/x11
-	gnome-base/gnome-libs
-	gnome-base/ORBit
-	gnome-base/libghttp
-	ogg? ( media-sound/vorbis-tools )
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf
-
-	if [ -z "`use nls`" ] ; then
-		myconf="--disable-nls"
-	fi
-
-	# apply CFLAGS
-	mv Makefile.in Makefile.in.old
-	sed -e "s/CFLAGS = -g -O2/CFLAGS = ${CFLAGS}/" \
-		Makefile.in.old > Makefile.in
-
-	# fix cdparanoia libs not linking
-	mv src/Makefile.in src/Makefile.in.orig
-	sed -e "s/LDFLAGS =/LDFLAGS = -lcdda_interface -lcdda_paranoia/" \
-		src/Makefile.in.orig > src/Makefile.in
-
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install () {
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		sysconfdir=${D}/etc \
-		install || die
-
-	dodoc ABOUT-NLS AUTHORS CREDITS LICENSE CHANGES README TODO
-}
diff --git a/media-sound/grip/grip-3.0.0-r1.ebuild b/media-sound/grip/grip-3.0.0-r1.ebuild
deleted file mode 100644
index 5611b1d1e346..000000000000
--- a/media-sound/grip/grip-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/grip-3.0.0-r1.ebuild,v 1.3 2002/07/11 06:30:40 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GTK+ based Audio CD Ripper"
-SRC_URI="http://www.nostatic.org/grip/${P}.tar.gz"
-HOMEPAGE="http://www.nostatic.org/grip"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	=sys-libs/db-1*
-	media-sound/lame
-	media-sound/cdparanoia
-	media-libs/id3lib
-	gnome-base/gnome-libs
-	gnome-base/ORBit
-	gnome-base/libghttp
-	oggvorbis? ( media-sound/vorbis-tools )
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf
-
-	use nls || myconf="--disable-nls"
-
-	# apply CFLAGS
-	mv Makefile.in Makefile.in.old
-	sed -e "s/CFLAGS = -g -O2/CFLAGS = ${CFLAGS}/" \
-		Makefile.in.old > Makefile.in
-
-	# fix cdparanoia libs not linking
-	mv src/Makefile.in src/Makefile.in.orig
-	sed -e "s/LDFLAGS =/LDFLAGS = -lcdda_interface -lcdda_paranoia/" \
-		src/Makefile.in.orig > src/Makefile.in
-
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install () {
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		sysconfdir=${D}/etc \
-		install || die
-
-	dodoc ABOUT-NLS AUTHORS CREDITS LICENSE CHANGES README TODO
-}
diff --git a/media-sound/grip/grip-3.0.0.ebuild b/media-sound/grip/grip-3.0.0.ebuild
deleted file mode 100644
index 48b2a98d15bc..000000000000
--- a/media-sound/grip/grip-3.0.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/grip-3.0.0.ebuild,v 1.3 2002/07/11 06:30:40 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="GTK+ based Audio CD Ripper"
-SRC_URI="http://www.nostatic.org/grip/${P}.tar.gz"
-HOMEPAGE="http://www.nostatic.org/grip"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	media-sound/lame
-	media-sound/cdparanoia
-	media-libs/id3lib
-	gnome-base/gnome-libs
-	gnome-base/ORBit
-	gnome-base/libghttp
-	oggvorbis? ( media-sound/vorbis-tools )
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf
-
-	use nls || myconf="--disable-nls"
-
-	# apply CFLAGS
-	mv Makefile.in Makefile.in.old
-	sed -e "s/CFLAGS = -g -O2/CFLAGS = ${CFLAGS}/" \
-		Makefile.in.old > Makefile.in
-
-	# fix cdparanoia libs not linking
-	mv src/Makefile.in src/Makefile.in.orig
-	sed -e "s/LDFLAGS =/LDFLAGS = -lcdda_interface -lcdda_paranoia/" \
-		src/Makefile.in.orig > src/Makefile.in
-
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install () {
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		sysconfdir=${D}/etc \
-		install || die
-
-	dodoc ABOUT-NLS AUTHORS CREDITS LICENSE CHANGES README TODO
-}
diff --git a/media-sound/grip/grip-3.0.1.ebuild b/media-sound/grip/grip-3.0.1.ebuild
index 4acef3e42ce4..0159f1ffe5ea 100644
--- a/media-sound/grip/grip-3.0.1.ebuild
+++ b/media-sound/grip/grip-3.0.1.ebuild
@@ -1,12 +1,16 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/grip-3.0.1.ebuild,v 1.2 2002/07/11 06:30:40 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/grip/grip-3.0.1.ebuild,v 1.3 2002/07/21 03:07:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GTK+ based Audio CD Ripper"
 SRC_URI="http://www.nostatic.org/grip/${P}.tar.gz"
 HOMEPAGE="http://www.nostatic.org/grip"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND="=x11-libs/gtk+-1.2*
 	=sys-libs/db-1*
 	media-sound/lame
@@ -33,12 +37,7 @@ src_compile() {
 	sed -e "s/LDFLAGS =/LDFLAGS = -lcdda_interface -lcdda_paranoia/" \
 		src/Makefile.in.orig > src/Makefile.in
 
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc \
-		${myconf} || die
-
+	econf ${myconf} || die
 	emake || die
 }
 
@@ -49,5 +48,5 @@ src_install () {
 		sysconfdir=${D}/etc \
 		install || die
 
-	dodoc ABOUT-NLS AUTHORS CREDITS LICENSE CHANGES README TODO
+	dodoc AUTHORS CREDITS COPYING ChangeLog README TODO NEWS
 }
diff --git a/media-sound/id3/id3-0.12-r1.ebuild b/media-sound/id3/id3-0.12-r1.ebuild
index 27c0d39869b7..60bc4e5bb9a8 100644
--- a/media-sound/id3/id3-0.12-r1.ebuild
+++ b/media-sound/id3/id3-0.12-r1.ebuild
@@ -1,22 +1,28 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/id3/id3-0.12-r1.ebuild,v 1.4 2002/07/11 06:30:40 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/id3/id3-0.12-r1.ebuild,v 1.5 2002/07/21 03:07:46 seemant Exp $
 
-A=${PN}_${PV}.orig.tar.gz
 S=${WORKDIR}/${P}
 DESCRIPTION="changes the id3 tag in an mp3 file"
-SRC_URI="http://lly.org/~rcw/id3/${A}"
+SRC_URI="http://lly.org/~rcw/id3/${PN}_${PV}.orig.tar.gz"
 HOMEPAGE="http://lly.org/~rcw/abcde/page/"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_compile() {
 
-    try make CFLAGS="${CFLAGS}"
+	make CFLAGS="${CFLAGS}" || die
 }
 
 src_install () {
 
-    try make DESTDIR=${D} INSTALL="/bin/install -c" install
-    dodoc COPYING README
+	make \
+		DESTDIR=${D} \
+		INSTALL="/bin/install -c" \
+		install || die
+
+	dodoc COPYING README
 
 }
diff --git a/media-sound/id3v2/id3v2-0.1.7.ebuild b/media-sound/id3v2/id3v2-0.1.7.ebuild
index 8997e87d57c5..a77986412064 100644
--- a/media-sound/id3v2/id3v2-0.1.7.ebuild
+++ b/media-sound/id3v2/id3v2-0.1.7.ebuild
@@ -1,14 +1,17 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/id3v2/id3v2-0.1.7.ebuild,v 1.2 2002/05/22 20:26:30 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/id3v2/id3v2-0.1.7.ebuild,v 1.3 2002/07/21 03:07:46 seemant Exp $
 
+S=${WORKDIR}/${P}
 DESCRIPTION="A command line editor for id3v2 tags."
 HOMEPAGE="http://id3v2.sourceforge.net/"
+SRC_URI="http://unc.dl.sourceforge.net/sourceforge/id3v2/${P}.tar.gz"
 
 DEPEND="media-libs/id3lib"
 
-SRC_URI="http://unc.dl.sourceforge.net/sourceforge/id3v2/${P}.tar.gz"
-S=${WORKDIR}/${P}
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_unpack()
 {
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.34.0.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.34.0.ebuild
index 5226de1e7636..536a208fe0a8 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.34.0.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.34.0.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.34.0.ebuild,v 1.1 2002/06/06 12:22:31 stroke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.34.0.ebuild,v 1.2 2002/07/21 03:07:46 seemant Exp $
 
+S=${WORKDIR}/${P}
 DESCRIPTION="A low-latency audio server"
 HOMEPAGE="http://jackit.sourceforge.net/"
+SRC_URI="http://download.sf.net/jackit/${P}.tar.gz"
 
 # libjack is LGPL, the rest is GPL
-LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="x86"
 
 DEPEND="dev-libs/glib
-        >=media-libs/alsa-lib-0.9.0_rc1"
+	>=media-libs/alsa-lib-0.9.0_rc1"
 
 RDEPEND="${DEPEND}"
 
-SRC_URI="http://download.sf.net/jackit/${P}.tar.gz"
-
 src_compile() {
 
 	econf || die "./configure failed"
diff --git a/media-sound/kmms/kmms-0.7_beta6.ebuild b/media-sound/kmms/kmms-0.7_beta6.ebuild
index 7956e559ff03..516fb9683ea9 100644
--- a/media-sound/kmms/kmms-0.7_beta6.ebuild
+++ b/media-sound/kmms/kmms-0.7_beta6.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kmms/kmms-0.7_beta6.ebuild,v 1.5 2002/07/11 06:30:40 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kmms/kmms-0.7_beta6.ebuild,v 1.6 2002/07/21 03:07:46 seemant Exp $
 
 inherit kde-base || die
 
 need-kde 2.2
 
-LICENSE="GPL-2"
 S="${WORKDIR}/kmms-0.7beta6"
 SRC_URI="mirror://sourceforge/kmms/kmms-0.7beta6.tar.gz"
 HOMEPAGE="http://www.base2.de/"
 DESCRIPTION="A KDE-Taskbar DockApplet control and title display for XMMS." 
 
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
diff --git a/media-sound/lilypond/lilypond-1.5.15.ebuild b/media-sound/lilypond/lilypond-1.5.15.ebuild
index 8aae6ef1d85d..f0af36fe9846 100644
--- a/media-sound/lilypond/lilypond-1.5.15.ebuild
+++ b/media-sound/lilypond/lilypond-1.5.15.ebuild
@@ -1,26 +1,30 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-1.5.15.ebuild,v 1.2 2002/07/11 06:30:40 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lilypond/lilypond-1.5.15.ebuild,v 1.3 2002/07/21 03:07:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GNU Music Typesetter"
-SRC_URI="http://www.lilypond.org/ftp/LilyPond/development/$P.tar.gz"
+SRC_URI="http://www.lilypond.org/ftp/LilyPond/development/${P}.tar.gz"
 HOMEPAGE="http://lilypond.org/"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 DEPEND=">=dev-lang/python-2.0-r4
-        >=dev-util/guile-1.4-r3
+	>=dev-util/guile-1.4-r3
 	>=sys-devel/flex-2.5.4a-r4
 	>=sys-devel/bison-1.28-r3
 	>=sys-apps/texinfo-4.0-r3
 	>=app-text/tetex-1.0.7-r2"
 
 src_compile() {
-    ./configure \
-	--infodir=/usr/share/info --mandir=/usr/share/man --prefix=/usr \
-	--host=${CHOST} || die
-    emake || die
+	econf || die
+	emake || die
 }
 
 src_install () {
-    make prefix=${D}/usr install || die
+	make prefix=${D}/usr install || die
+
+	dodoc AUTHORS* CHANGES DEDICATION NEWS README.txt ROADMAP FAQ* VERSION
 }
diff --git a/media-sound/mad/files/digest-mad-0.13.0b b/media-sound/mad/files/digest-mad-0.13.0b
deleted file mode 100644
index afcee984d012..000000000000
--- a/media-sound/mad/files/digest-mad-0.13.0b
+++ /dev/null
@@ -1 +0,0 @@
-MD5 46c6b090e534b2a710a96c6dfc1d95fe mad-0.13.0b.tar.gz 552379
diff --git a/media-sound/mad/files/digest-mad-0.14.2b b/media-sound/mad/files/digest-mad-0.14.2b
deleted file mode 100644
index 4d4bba1ea629..000000000000
--- a/media-sound/mad/files/digest-mad-0.14.2b
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eb3bfbe634ba9d5b4928aa11e0f6819d mad-0.14.2b.tar.gz 721345
diff --git a/media-sound/mad/files/digest-mad-0.14.2b-r2 b/media-sound/mad/files/digest-mad-0.14.2b-r2
deleted file mode 100644
index 4d4bba1ea629..000000000000
--- a/media-sound/mad/files/digest-mad-0.14.2b-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 eb3bfbe634ba9d5b4928aa11e0f6819d mad-0.14.2b.tar.gz 721345
diff --git a/media-sound/mad/mad-0.13.0b.ebuild b/media-sound/mad/mad-0.13.0b.ebuild
deleted file mode 100644
index cb078eaf0708..000000000000
--- a/media-sound/mad/mad-0.13.0b.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mad/mad-0.13.0b.ebuild,v 1.3 2002/07/11 06:30:40 drobbins Exp $
-
-S=${WORKDIR}/${P}
-SRC_URI="ftp://ftp.mars.org/pub/mpeg/${P}.tar.gz"
-
-HOMEPAGE="http://www.mars.org/home/rob/proj/mpeg/"
-DESCRIPTION="A high-quality mp3 decoder"
-
-DEPEND="sys-devel/gcc virtual/glibc sys-devel/ld.so"
-RDEPEND="virtual/glibc sys-devel/ld.so"
-
-src_compile() {
-    
-    confopts="--infodir=/usr/share/info --mandir=/usr/share/man \
-			  --prefix=/usr --host=${CHOST} --enable-static \
-			  --disable-debugging --enable-shared --enable-fpm=intel"
-    
-    try ./configure ${confopts}
-    
-    try emake
-
-}
-
-src_install () {
-
-    try make DESTDIR=${D} install
-
-}
-
diff --git a/media-sound/mad/mad-0.14.2b-r1.ebuild b/media-sound/mad/mad-0.14.2b-r1.ebuild
index b74842c65dce..8d5eb1fd7816 100644
--- a/media-sound/mad/mad-0.14.2b-r1.ebuild
+++ b/media-sound/mad/mad-0.14.2b-r1.ebuild
@@ -1,30 +1,35 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mad/mad-0.14.2b-r1.ebuild,v 1.3 2002/07/11 06:30:40 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mad/mad-0.14.2b-r1.ebuild,v 1.4 2002/07/21 03:07:46 seemant Exp $
 
 S=${WORKDIR}/${P}
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
 HOMEPAGE="http://mad.sourceforge.net/"
 DESCRIPTION="A high-quality MP3 decoder"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-DEPEND="sys-devel/gcc 
-		virtual/glibc 
-		sys-devel/ld.so
-		nls? ( sys-devel/gettext )"
-RDEPEND="virtual/glibc sys-devel/ld.so"
+DEPEND="sys-devel/ld.so
+	esd? ( media-sound/esound )"
+RDEPEND="nls? ( sys-devel/gettext )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc"
 
 src_compile() {
-	confopts="--infodir=/usr/share/info --mandir=/usr/share/man \
-			  --prefix=/usr --host=${CHOST} --enable-static \
-			  --disable-debugging --enable-shared --enable-fpm=intel"
+	local myconf
 
-	use nls || confopts="${confopts} --disable-nls"
+	use esd || myconf="${myconf} --without-esd"
+	use nls || myconf="${myconf} --disable-nls"
 
-	./configure ${confopts} || die
+	econf \
+		--enable-static \
+		--enable-shared \
+		${myconf} || die
 	emake || die
 }
 
 src_install () {
 	make DESTDIR=${D} install || die
+
+	dodoc CHANGES COPY* CREDITS README TODO VERSION
 }
diff --git a/media-sound/mad/mad-0.14.2b-r2.ebuild b/media-sound/mad/mad-0.14.2b-r2.ebuild
deleted file mode 100644
index 3f82513ee781..000000000000
--- a/media-sound/mad/mad-0.14.2b-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mad/mad-0.14.2b-r2.ebuild,v 1.1 2002/07/07 19:22:51 gerk Exp $
-
-S=${WORKDIR}/${P}
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-HOMEPAGE="http://mad.sourceforge.net/"
-DESCRIPTION="A high-quality MP3 decoder"
-
-DEPEND="sys-devel/gcc 
-		virtual/glibc 
-		sys-devel/ld.so
-		nls? ( sys-devel/gettext )"
-RDEPEND="virtual/glibc sys-devel/ld.so"
-SLOT="0"
-LICENSE="GPL-2"
-
-src_compile() {
-	confopts="--infodir=/usr/share/info --mandir=/usr/share/man \
-			  --prefix=/usr --host=${CHOST} --enable-static \
-			  --disable-debugging --enable-shared"
-
-	use nls || confopts="${confopts} --disable-nls"
-
-	# set proper ARCH in configure options
-	case ${ARCH} in
-		x86)
-			confopts="${confopts} --enable-fpm=intel"
-			;;
-		ppc)
-			confopts="${confopts} --enable-fpm=ppc"
-			;;
-		sparc*)
-			confopts="${confopts} --enable-fpm=sparc"
-			;;
-	esac
-
-	./configure ${confopts} || die
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-}
diff --git a/media-sound/mad/mad-0.14.2b.ebuild b/media-sound/mad/mad-0.14.2b.ebuild
deleted file mode 100644
index 98d88044575e..000000000000
--- a/media-sound/mad/mad-0.14.2b.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mad/mad-0.14.2b.ebuild,v 1.3 2002/07/11 06:30:40 drobbins Exp $
-
-S=${WORKDIR}/${P}
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-HOMEPAGE="http://mad.sourceforge.net/"
-DESCRIPTION="A high-quality MP3 decoder"
-
-DEPEND="sys-devel/gcc virtual/glibc sys-devel/ld.so"
-RDEPEND="virtual/glibc sys-devel/ld.so"
-
-src_compile() {
-	confopts="--infodir=/usr/share/info --mandir=/usr/share/man \
-			  --prefix=/usr --host=${CHOST} --enable-static \
-			  --disable-debugging --enable-shared --enable-fpm=intel"
-	./configure ${confopts} || die
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-}
diff --git a/media-sound/mbrola/files/digest-mbrola-3.0.1h b/media-sound/mbrola/files/digest-mbrola-3.0.1h
deleted file mode 100644
index f512954f0d13..000000000000
--- a/media-sound/mbrola/files/digest-mbrola-3.0.1h
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 083e3e93c6d6b7d238d4e8c9b80f6111 mbr301h.zip 289370
-MD5 1b21560b45c5566cf4672e8eb7393490 us1-980512.zip 6562915
-MD5 185045d55456694f4f104173e43bbb89 us2-980812.zip 6387442
-MD5 544840204a6e120cef67176769629ecb us3-990208.zip 6195800
diff --git a/media-sound/mbrola/mbrola-3.0.1h-r1.ebuild b/media-sound/mbrola/mbrola-3.0.1h-r1.ebuild
index 9bb186e3a1bf..6d6a6a4a0af6 100644
--- a/media-sound/mbrola/mbrola-3.0.1h-r1.ebuild
+++ b/media-sound/mbrola/mbrola-3.0.1h-r1.ebuild
@@ -14,6 +14,10 @@ HOMEPAGE="http://tcts.fpms.ac.be/synthesis/mbrola.html"
 
 DEPEND=">=media-sound/festival-1.4.2"
 
+SLOT="0"
+LICENSE="MBROLA"
+KEYWORDS="x86"
+
 src_install () {
 
 	# Take care of main binary
diff --git a/media-sound/mbrola/mbrola-3.0.1h.ebuild b/media-sound/mbrola/mbrola-3.0.1h.ebuild
deleted file mode 100644
index 59d2ec2e78ac..000000000000
--- a/media-sound/mbrola/mbrola-3.0.1h.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# /space/gentoo/cvsroot/gentoo-x86/media-sound/mbrola/mbrola-3.0.1h.ebuild,v 1.0
-# 2002/05/18 17:25:12 naz Exp
-
-S=${WORKDIR}
-URL="http://tcts.fpms.ac.be/synthesis/mbrola"
-DESCRIPTION="us1, us2, and us3 mbrola voice libraries for Festival TTS"
-SRC_URI="${URL}/bin/pclinux/mbr301h.zip
-${URL}/dba/us1/us1-980512.zip
-${URL}/dba/us2/us2-980812.zip
-${URL}/dba/us3/us3-990208.zip"
-HOMEPAGE="http://tcts.fpms.ac.be/synthesis/mbrola.html"
-
-DEPEND=">=media-sound/festival-1.4.2"
-
-src_install () {
-
-	# Take care of main binary
-	mv mbrola-linux-i386 mbrola
-	dobin mbrola
-	dodoc readme.txt
-
-	# Now install the vioces
-	FESTLIB=/usr/lib/festival/voices/english
-	insinto ${FESTLIB}/us1_mbrola
-	doins us1/us1 us1/us1mrpa
-	insinto ${FESTLIB}/us1_mbrola/TEST
-	doins us1/TEST/*
-	dodoc us1/us1.txt
-
-	insinto ${FESTLIB}/us2_mbrola
-	doins us2/us2
-	insinto ${FESTLIB}/us2_mbrola/TEST
-	doins us2/TEST/*
-	dodoc us2/us2.txt
-
-	insinto ${FESTLIB}/us3_mbrola
-	doins us3/us3
-	insinto ${FESTLIB}/us3_mbrola/TEST
-	doins us3/TEST/*
-	dodoc us3/us3.txt
-
-}
-
diff --git a/media-sound/mix2000/mix2000-1.0.ebuild b/media-sound/mix2000/mix2000-1.0.ebuild
index 1f3dc579f188..fb0f522df033 100644
--- a/media-sound/mix2000/mix2000-1.0.ebuild
+++ b/media-sound/mix2000/mix2000-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mix2000/mix2000-1.0.ebuild,v 1.1 2002/06/18 20:55:28 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mix2000/mix2000-1.0.ebuild,v 1.2 2002/07/21 03:07:46 seemant Exp $
 
 S=${WORKDIR}/mix-2000
 DESCRIPTION="The OSS sound mixer from the bcast2000 people; now orphaned."
@@ -9,17 +9,21 @@ DESCRIPTION="The OSS sound mixer from the bcast2000 people; now orphaned."
 #SRC_URI="http://www.tux.org/pub/packages/orphaned/broadcast2000/mix2000.tar.gz"
 SRC_URI="http://diddl.firehead.org/software/unix/media/heroine/mix-2000-src.tar.gz"
 
-DEPEND="virtual/glibc				
-		virtual/x11					
-		>=dev-libs/glib-1.2.0		
-		>=media-libs/libpng-1.0.3	
-		>=sys-libs/zlib-1.1.4"
+DEPEND=" virtual/x11	
+	media-libs/libpng
+	sys-libs/zlib
+	>=dev-libs/glib-1.2.0"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_compile() {
 	cp configure configure.orig
 	sed -e '/^CFLAGS +=/s:$: -I/usr/X11R6/include:'	\
-		-e '/^LIBS =/s/-lglib/$(glib-config --libs)/'	\
+		-e '/^LIBS =/s/-lglib/$(glib-config --libs)/' \
 		< configure.orig > configure
+
 	./configure || die
 	make || die
 }
diff --git a/media-sound/mp3_check/mp3_check-1.98.ebuild b/media-sound/mp3_check/mp3_check-1.98.ebuild
index a25a4f1c165c..4cadf92683e0 100644
--- a/media-sound/mp3_check/mp3_check-1.98.ebuild
+++ b/media-sound/mp3_check/mp3_check-1.98.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3_check/mp3_check-1.98.ebuild,v 1.1 2002/06/28 16:27:52 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3_check/mp3_check-1.98.ebuild,v 1.2 2002/07/21 03:07:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="MP3 consistancy checker"
 HOMEPAGE="http://sourceforge.net/projects/mp3check/"
-SRC_URI="http://telia.dl.sourceforge.net/sourceforge/mp3check/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/mp3check/${P}.tar.gz"
+
 DEPEND="virtual/glibc"
-RDEPEND="${DEPEND}"
-LICENSE="GPL"
+
 SLOT="0"
+LICENSE="GPL"
+KEYWORDS="x86"
 
 src_unpack() {
 	unpack ${A}
@@ -24,5 +26,5 @@ src_compile() {
 }
 src_install () {
 	dobin mp3_check
-	dodoc WISHLIST TODO THANKYOU README NOTES MY_NOTES FOR_TESTING GOALS MILESTONE MILESTONE.INTRO
+	dodoc WISHLIST TODO THANKYOU README *NOTES FOR_TESTING GOALS MILESTONE*
 }
diff --git a/media-sound/mp3blaster/files/digest-mp3blaster-3.0_p7 b/media-sound/mp3blaster/files/digest-mp3blaster-3.0_p7
deleted file mode 100644
index 3dc0f91867bd..000000000000
--- a/media-sound/mp3blaster/files/digest-mp3blaster-3.0_p7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e3c9f44f7ac9a02ced53bd6c6dfb8c74 mp3blaster-3.0p7.tar.gz 236248
diff --git a/media-sound/mp3blaster/files/digest-mp3blaster-3.0_p8 b/media-sound/mp3blaster/files/digest-mp3blaster-3.0_p8
deleted file mode 100644
index 485ae26e7bbf..000000000000
--- a/media-sound/mp3blaster/files/digest-mp3blaster-3.0_p8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ac8d30b18cfd7b67efe1a3847c62fe17 mp3blaster-3.0p8.tar.gz 242285
diff --git a/media-sound/mp3blaster/mp3blaster-3.0_p7.ebuild b/media-sound/mp3blaster/mp3blaster-3.0_p7.ebuild
deleted file mode 100644
index 3f4f6ce4b075..000000000000
--- a/media-sound/mp3blaster/mp3blaster-3.0_p7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.0_p7.ebuild,v 1.5 2002/07/11 06:30:40 drobbins Exp $
-
-
-A=${PN}-3.0p7.tar.gz
-S=${WORKDIR}/mp3blaster-3.0p7/
-DESCRIPTION="MP3 command line player"
-SRC_URI="ftp://mud.stack.nl/pub/mp3blaster/${A}"
-HOMEPAGE="http://www.stack.nl/~brama/mp3blaster"
-
-DEPEND=">=sys-libs/ncurses-5.2
-	nas? ( >=media-libs/nas-1.4.1 )
-	mysql? ( >=dev-db/mysql-3.23.36 )"
-
-
-src_compile() {
-    local myconf
-    if [ "`use nas`" ] ; then
-	myconf="--with-nas"
-    fi
-    if [ "`use mysql`" ] ; then
-	myconf="$myconf --with-mysql"
-    fi
-    try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} ${myconf}
-    if [ "`use nas`" ] ; then
-	cd src
-	cp Makefile Makefile.orig
-	sed -e "s:^INCLUDES =:INCLUDES = -I/usr/X11R6/include:" \
-	    -e "s:^splay_LDADD =:splay_LDADD = \$(NAS_LIBS):" Makefile.orig > Makefile
-	cd ..
-    fi
-    try make 
-
-}
-
-src_install () {
-    try make DESTDIR=${D} install
-
-    dodoc ANNOUNCE AUTHORS COPYING CREDITS ChangeLog FAQ NEWS README TODO
-
-}
-
diff --git a/media-sound/mp3blaster/mp3blaster-3.0_p8.ebuild b/media-sound/mp3blaster/mp3blaster-3.0_p8.ebuild
deleted file mode 100644
index 9f2b87c0dbf4..000000000000
--- a/media-sound/mp3blaster/mp3blaster-3.0_p8.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.0_p8.ebuild,v 1.5 2002/07/11 06:30:41 drobbins Exp $
-
-A=${PN}-3.0p8.tar.gz
-S=${WORKDIR}/${PN}-3.0p8
-DESCRIPTION="MP3 command line player"
-SRC_URI="ftp://mud.stack.nl/pub/mp3blaster/${A}"
-HOMEPAGE="http://www.stack.nl/~brama/mp3blaster"
-
-DEPEND=">=sys-libs/ncurses-5.2
-        nas? ( >=media-libs/nas-1.4.1 )
-        mysql? ( >=dev-db/mysql-3.23.36 )
-        oggvorbis? ( >=media-libs/libvorbis-1.0_beta1 )"
-
-src_compile() {
-	local myconf
-	use nas && myconf="${myconf} --with-nas"
-	use mysql && myconf="${myconf} --with-mysql"
-	use oggvorbis || myconf="${myconf} --without-oggvorbis"
-
-	./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} ${myconf} || die
-
-	if [ "`use nas`" ] ; then
-		cd src
-		sed -e "s:^INCLUDES =:INCLUDES = -I/usr/X11R6/include:" \
-			-e "s:^splay_LDADD =:splay_LDADD = \$(NAS_LIBS):" Makefile | cat > Makefile
-		cd ..
-	fi
-
-	# parallel make does not work
-	make CC="gcc ${CFLAGS}" CXX="c++ ${CXXFLAGS}" || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc ANNOUNCE AUTHORS COPYING CREDITS ChangeLog FAQ NEWS README TODO
-}
diff --git a/media-sound/mp3blaster/mp3blaster-3.1.1.ebuild b/media-sound/mp3blaster/mp3blaster-3.1.1.ebuild
index 06fb111afe38..1fff8306fdf5 100644
--- a/media-sound/mp3blaster/mp3blaster-3.1.1.ebuild
+++ b/media-sound/mp3blaster/mp3blaster-3.1.1.ebuild
@@ -1,17 +1,20 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.1.1.ebuild,v 1.2 2002/07/10 18:25:52 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3blaster/mp3blaster-3.1.1.ebuild,v 1.3 2002/07/21 03:07:46 seemant Exp $
 
-A=${PN}-3.1.1.tar.gz
-S=${WORKDIR}/${PN}-3.1.1
+S=${WORKDIR}/${P}
 DESCRIPTION="MP3 command line player"
-SRC_URI="ftp://mud.stack.nl/pub/mp3blaster/${A}"
+SRC_URI="ftp://mud.stack.nl/pub/mp3blaster/${P}.tar.gz"
 HOMEPAGE="http://www.stack.nl/~brama/mp3blaster"
 
 DEPEND=">=sys-libs/ncurses-5.2
-        nas? ( >=media-libs/nas-1.4.1 )
-        mysql? ( >=dev-db/mysql-3.23.36 )
-        oggvorbis? ( >=media-libs/libvorbis-1.0_beta1 )"
+	nas? ( >=media-libs/nas-1.4.1 )
+	mysql? ( >=dev-db/mysql-3.23.36 )
+	oggvorbis? ( >=media-libs/libvorbis-1.0_beta1 )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_compile() {
 	local myconf
@@ -21,13 +24,15 @@ src_compile() {
 
 	(cd src;patch -l <${FILESDIR}/mp3blaster-3.1.1-gcc3.1-fixes_cl.patch)
 
-	./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} ${myconf} || die
+	econf ${myconf} || die
 
-	if [ "`use nas`" ] ; then
+	use nas && ( \
 		cd src
 		sed -e "s:^INCLUDES =:INCLUDES = -I/usr/X11R6/include:" \
-			-e "s:^splay_LDADD =:splay_LDADD = \$(NAS_LIBS):" Makefile | cat > Makefile
-		cd ..
+			-e "s:^splay_LDADD =:splay_LDADD = \$(NAS_LIBS):" \
+			Makefile | cat > Makefile
+
+		cd ${S}
 	fi
 
 	# parallel make does not work
diff --git a/media-sound/mp3c/mp3c-0.27.ebuild b/media-sound/mp3c/mp3c-0.27.ebuild
index 87108696ba7b..d15b80a21fe4 100644
--- a/media-sound/mp3c/mp3c-0.27.ebuild
+++ b/media-sound/mp3c/mp3c-0.27.ebuild
@@ -1,22 +1,21 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3c/mp3c-0.27.ebuild,v 1.3 2002/07/11 06:30:41 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3c/mp3c-0.27.ebuild,v 1.4 2002/07/21 03:07:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="console based mp3 ripper, with cddb support"
 HOMEPAGE="http://mp3c.wspse.de/WSPse/Linux-MP3c.php3?lang=en"
-LICENSE="GPL-2"
 SRC_URI="ftp://excelsior.kullen.rwth-aachen.de/pub/linux/wspse/${P}.tar.gz"
 DEPEND=">=media-sound/bladeenc-0.94.2 \
 	>=media-sound/cdparanoia-3.9.8 \
 	>=media-sound/mp3info-0.8.4-r1"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
 src_compile() {
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
+	econf || die "./configure failed"
 	emake || die
 }
 
@@ -26,5 +25,5 @@ src_install () {
 		mandir=${D}/usr/share/man \
 		infodir=${D}/usr/share/info \
 		install || die
-	dodoc ABOUT-NLS AUTHORS BATCH.README BUGS CDDB_HOWTO COPYING ChangeLog FAQ INSTALL NEWS OTHERS README TODO          
+	dodoc AUTHORS *README BUGS CDDB_HOWTO COPYING ChangeLog FAQ NEWS OTHERS TODO          
 }
diff --git a/media-sound/mp3info/files/digest-mp3info-0.8.4 b/media-sound/mp3info/files/digest-mp3info-0.8.4
deleted file mode 100644
index 59a50f2f672a..000000000000
--- a/media-sound/mp3info/files/digest-mp3info-0.8.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 879d0ced8ede5ec9fbaff4813851ea3f mp3info-0.8.4.tgz 38773
diff --git a/media-sound/mp3info/mp3info-0.8.4-r1.ebuild b/media-sound/mp3info/mp3info-0.8.4-r1.ebuild
index c9628de71a7c..4f1dcbee3663 100644
--- a/media-sound/mp3info/mp3info-0.8.4-r1.ebuild
+++ b/media-sound/mp3info/mp3info-0.8.4-r1.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3info/mp3info-0.8.4-r1.ebuild,v 1.3 2002/07/11 06:30:41 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3info/mp3info-0.8.4-r1.ebuild,v 1.4 2002/07/21 03:07:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="An MP3 technical info viewer and ID3 1.x tag editor"
-SRC_URI="ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/${PN}/${P}.tgz"
+SRC_URI="http://ibiblio.org/pub/linux/apps/sound/mp3-utils/${PN}/${P}.tgz"
 HOMEPAGE="http://ibiblio.org/mp3info/"
 
-DEPEND="virtual/glibc
-	gtk? ( =x11-libs/gtk+-1.2* )"
+DEPEND="gtk? ( =x11-libs/gtk+-1.2* )"
 
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_unpack() {
 
diff --git a/media-sound/mp3info/mp3info-0.8.4.ebuild b/media-sound/mp3info/mp3info-0.8.4.ebuild
deleted file mode 100644
index cd8f85eb89b2..000000000000
--- a/media-sound/mp3info/mp3info-0.8.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3info/mp3info-0.8.4.ebuild,v 1.3 2002/07/11 06:30:41 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="An MP3 technical info viewer and ID3 1.x tag editor"
-SRC_URI="ftp://ftp.ibiblio.org/pub/linux/apps/sound/mp3-utils/${PN}/${P}.tgz"
-HOMEPAGE="http://ibiblio.org/mp3info/"
-
-DEPEND="virtual/glibc
-	gtk? ( =x11-libs/gtk+-1.2* )"
-
-
-src_unpack() {
-
-	unpack ${A}
-	
-	cd ${S}
-	cp Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:" Makefile.orig > Makefile
-}
-
-src_compile() {
-
-	emake mp3info || die
-	use gtk && emake gmp3info || die
-}
-
-src_install() {
-
-	dobin mp3info
-	use gtk && dobin gmp3info
-	
-	dodoc ChangeLog INSTALL LICENSE README
-	doman mp3info.1
-}
diff --git a/media-sound/mpg321/files/digest-mpg321-0.2.10 b/media-sound/mpg321/files/digest-mpg321-0.2.10
deleted file mode 100644
index 7332a87bdc5f..000000000000
--- a/media-sound/mpg321/files/digest-mpg321-0.2.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bb403b35c2d25655d55f0f616b8f47bb mpg321-0.2.10.tar.gz 113449
diff --git a/media-sound/mpg321/mpg321-0.2.10-r1.ebuild b/media-sound/mpg321/mpg321-0.2.10-r1.ebuild
index 416a74e9e444..115e38446fba 100644
--- a/media-sound/mpg321/mpg321-0.2.10-r1.ebuild
+++ b/media-sound/mpg321/mpg321-0.2.10-r1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/mpg321-0.2.10-r1.ebuild,v 1.2 2002/07/11 06:30:41 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/mpg321-0.2.10-r1.ebuild,v 1.3 2002/07/21 03:07:46 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Free MP3 player, drop-in replacement for mpg123"
 SRC_URI="http://unc.dl.sourceforge.net/sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://sourceforge.net/projects/mpg321/"
 
-DEPEND="virtual/glibc
-	>=media-sound/mad-0.14.2b
+DEPEND=">=media-sound/mad-0.14.2b
 	>=media-libs/libao-0.8.0"
 
 SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86"
 
 MPG123="false"
 
diff --git a/media-sound/mpg321/mpg321-0.2.10.ebuild b/media-sound/mpg321/mpg321-0.2.10.ebuild
deleted file mode 100644
index 91a35c74763d..000000000000
--- a/media-sound/mpg321/mpg321-0.2.10.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg321/mpg321-0.2.10.ebuild,v 1.2 2002/07/11 06:30:41 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Free MP3 player, drop-in replacement for mpg123"
-SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz"
-HOMEPAGE="http://sourceforge.net/projects/${P}/"
-
-DEPEND="virtual/glibc
-	>=media-sound/mad-0.14.2b
-	>=media-libs/libao-0.8.0"
-
-src_compile() {
-	./configure --build=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info || die
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	# don't create mpg123 symlink -- conflicts with media-sound/mpg123
-	rm -f ${D}/usr/bin/mpg123
-}
diff --git a/media-sound/mup/mup-4.3.ebuild b/media-sound/mup/mup-4.3.ebuild
index b624b2f51a4a..12746f575b74 100644
--- a/media-sound/mup/mup-4.3.ebuild
+++ b/media-sound/mup/mup-4.3.ebuild
@@ -1,17 +1,21 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/mup-4.3.ebuild,v 1.4 2002/07/11 06:30:41 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/mup-4.3.ebuild,v 1.5 2002/07/21 03:07:47 seemant Exp $
 
 S=${WORKDIR}/${P}
-
+MY_P="${PN}43"
 DESCRIPTION="Mup is a shareware program for printing music. It takes an input file containing ordinary (ASCII) text describing music, and produces PostScript output for printing the musical score described by the input."
-SRC_URI="ftp://ftp.arkkra.com/pub/unix/mup43src.tar.gz ftp://ftp.arkkra.com/pub/unix/mup43doc.tar.gz"
+SRC_URI="ftp://ftp.arkkra.com/pub/unix/${MY_P}src.tar.gz
+ftp://ftp.arkkra.com/pub/unix/${MY_P}doc.tar.gz"
 HOMEPAGE="http://www.arkkra.com"
 
-DEPEND="virtual/glibc
-	virtual/x11
+DEPEND="virtual/x11
 	>=media-libs/svgalib-1.4.3"
 
+SLOT="0"
+LICENSE="Arkkra"
+KEYWORDS="x86"
+
 src_unpack() {
 
 	mkdir ${P}