8 files changed, 13 insertions, 101 deletions
diff --git a/media-libs/fmod/ChangeLog b/media-libs/fmod/ChangeLog
index 6b2e57f1dcb8..83337701de51 100644
--- a/media-libs/fmod/ChangeLog
+++ b/media-libs/fmod/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/fmod
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fmod/ChangeLog,v 1.12 2004/07/07 10:02:28 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fmod/ChangeLog,v 1.13 2004/07/13 08:20:59 eradicator Exp $
+
+  13 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> -fmod-3.61.ebuild,
+  -fmod-3.62.ebuild, -fmod-3.70.ebuild:
+  Stable x86.  ~amd64.  Added amd64 compat libs as DEP.
 
   07 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> :
   Fixed digest because of crazy upstream devs not bumping versions.
diff --git a/media-libs/fmod/files/digest-fmod-3.61 b/media-libs/fmod/files/digest-fmod-3.61
deleted file mode 100644
index ce6650c6acc4..000000000000
--- a/media-libs/fmod/files/digest-fmod-3.61
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e0fe671109cd49128168b8a17011637d fmodapi361linux.tar.gz 744936
diff --git a/media-libs/fmod/files/digest-fmod-3.62 b/media-libs/fmod/files/digest-fmod-3.62
deleted file mode 100644
index 49d16d6e6514..000000000000
--- a/media-libs/fmod/files/digest-fmod-3.62
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 83ce4fe4034613d312bda105bffa943a /fmod-3.62.ebuild 808
-MD5 a189abe9ee49a9511ed52e5eb7a1371c fmodapi362linux.tar.gz 794058
diff --git a/media-libs/fmod/files/digest-fmod-3.70 b/media-libs/fmod/files/digest-fmod-3.70
deleted file mode 100644
index 7ed6ef0d852e..000000000000
--- a/media-libs/fmod/files/digest-fmod-3.70
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6953eba64111d76461e04584067b145d fmodapi370linux.tar.gz 855145
diff --git a/media-libs/fmod/fmod-3.61.ebuild b/media-libs/fmod/fmod-3.61.ebuild
deleted file mode 100644
index fe8451d3cd04..000000000000
--- a/media-libs/fmod/fmod-3.61.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fmod/fmod-3.61.ebuild,v 1.6 2004/06/24 22:59:50 agriffis Exp $
-
-MY_P="fmodapi${PV/.}linux"
-DESCRIPTION="music and sound effects library, and a sound processing system"
-SRC_URI="http://www.fmod.org/files/${MY_P}.tar.gz"
-HOMEPAGE="http://www.fmod.org/"
-
-IUSE=""
-
-SLOT="0"
-LICENSE="fmod"
-KEYWORDS="x86 -ppc -sparc -mips -alpha -hppa"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	dolib api/libfmod-${PV}.so
-	dosym /usr/lib/libfmod-${PV}.so /usr/lib/libfmod.so
-
-	insinto /usr/include
-	doins api/inc/*
-
-	insinto /usr/share/${PN}/media
-	doins media/*
-	cp -r samples ${D}/usr/share/${PN}/
-
-	dohtml -r documentation/*
-	dodoc README.TXT documentation/Revision.txt
-}
diff --git a/media-libs/fmod/fmod-3.62.ebuild b/media-libs/fmod/fmod-3.62.ebuild
deleted file mode 100644
index e357bc6de9e5..000000000000
--- a/media-libs/fmod/fmod-3.62.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fmod/fmod-3.62.ebuild,v 1.7 2004/06/24 22:59:50 agriffis Exp $
-
-MY_P="fmodapi${PV/.}linux"
-DESCRIPTION="music and sound effects library, and a sound processing system"
-SRC_URI="http://www.fmod.org/files/${MY_P}.tar.gz"
-HOMEPAGE="http://www.fmod.org/"
-
-IUSE=""
-
-SLOT="0"
-LICENSE="fmod"
-KEYWORDS="x86 ppc -sparc -mips -alpha -hppa"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	dolib api/libfmod-${PV}.so
-	dosym /usr/lib/libfmod-${PV}.so /usr/lib/libfmod.so
-
-	insinto /usr/include
-	doins api/inc/*
-
-	insinto /usr/share/${PN}/media
-	doins media/*
-	cp -r samples ${D}/usr/share/${PN}/
-
-	dohtml -r documentation/*
-	dodoc README.TXT documentation/Revision.txt
-}
diff --git a/media-libs/fmod/fmod-3.70.ebuild b/media-libs/fmod/fmod-3.70.ebuild
deleted file mode 100644
index 8022f1d67ef2..000000000000
--- a/media-libs/fmod/fmod-3.70.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fmod/fmod-3.70.ebuild,v 1.6 2004/06/24 22:59:50 agriffis Exp $
-
-MY_P="fmodapi${PV/.}linux"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="music and sound effects library, and a sound processing system"
-SRC_URI="http://www.fmod.org/files/${MY_P}.tar.gz"
-HOMEPAGE="http://www.fmod.org/"
-
-IUSE=""
-
-SLOT="0"
-LICENSE="fmod"
-KEYWORDS="x86 -sparc ~ppc ~mips ~alpha ~hppa ~amd64"
-
-src_install() {
-	dolib api/libfmod-${PV}.so
-	dosym /usr/lib/libfmod-${PV}.so /usr/lib/libfmod.so
-
-	insinto /usr/include
-	doins api/inc/*
-
-	insinto /usr/share/${PN}/media
-	doins media/*
-	cp -r samples ${D}/usr/share/${PN}/
-
-	dohtml -r documentation/*
-	dodoc README.TXT documentation/Revision.txt
-}
diff --git a/media-libs/fmod/fmod-3.73.ebuild b/media-libs/fmod/fmod-3.73.ebuild
index 9ee931f7849a..a21c3eccc812 100644
--- a/media-libs/fmod/fmod-3.73.ebuild
+++ b/media-libs/fmod/fmod-3.73.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fmod/fmod-3.73.ebuild,v 1.2 2004/06/24 22:59:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fmod/fmod-3.73.ebuild,v 1.3 2004/07/13 08:20:59 eradicator Exp $
+
+IUSE=""
 
 MY_P="fmodapi${PV/.}linux"
 S=${WORKDIR}/${MY_P}
@@ -8,11 +10,13 @@ DESCRIPTION="music and sound effects library, and a sound processing system"
 SRC_URI="http://www.fmod.org/files/${MY_P}.tar.gz"
 HOMEPAGE="http://www.fmod.org/"
 
-IUSE=""
-
 SLOT="0"
 LICENSE="fmod"
-KEYWORDS="~x86"
+KEYWORDS="-* x86 ~amd64"
+
+DEPEND"virtual/libc"
+RDEPEND="${DEPEND}
+	 amd64? ( app-emulation/emul-linux-x86-baselibs )"
 
 src_install() {
 	dolib api/libfmod-${PV}.so