--- /usr/portage/media-sound/musepack-tools/musepack-tools-1.15r.ebuild	2004-04-27 21:45:05.000000000 +0300
+++ /usr/local/portage/media-sound/musepack-tools/musepack-tools-1.15r.ebuild	2004-06-01 21:58:20.733258840 +0300
@@ -12,14 +12,14 @@
 KEYWORDS="~x86"
 SLOT="0"
 LICENSE="GPL-2 LGPL-2.1"
-RESTRICT="nomirror"
 IUSE="static esd oss"
-SRC_URI="http://corecodec.org/download.php/196/mpcsv7-src-${PV}.tar.gz"
+SRC_URI="http://corecodec.org/download.php/196/mpcsv7-src-${PV}.tar.gz
+	http://www.saunalahti.fi/cse/seed/downloads/mpcsv7-src-${PV}.tar.gz"
 
-RDEPEND="media-sound/esound
-	media-libs/id3lib"
+RDEPEND="media-sound/esound"
 
 DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
 	virtual/glibc"
 
 src_unpack() {
@@ -50,6 +50,7 @@
 }
 
 src_install() {
+	into /opt
 	dobin mppenc mppdec replaygain tagger
 	dodoc COPYING* README doc/ChangeLog doc/MANUAL.TXT doc/NEWS doc/SV7.txt doc/TODO*
 }