--- media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r1.ebuild		2005-02-17 13:41:11.000000000 +0100
+++ media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.99.0-r1.ebuild.new	2005-03-08 03:31:25.000000000 +0100
@@ -4,7 +4,7 @@
 
 IUSE="altivec alsa caps doc debug jack-tmpfs oss portaudio"
 
-inherit flag-o-matic eutils
+inherit flag-o-matic eutils multilib
 
 DESCRIPTION="A low-latency audio server"
 HOMEPAGE="http://jackit.sourceforge.net/"
@@ -18,6 +18,7 @@
 	dev-libs/glib
 	dev-util/pkgconfig
 	sys-libs/ncurses
+	amd64? ( >=app-emulation/emul-linux-x86-soundlibs )
 	!ppc64? ( !alpha? ( !ia64? ( portaudio? ( media-libs/portaudio ) ) ) )
 	!sparc? ( alsa? ( >=media-libs/alsa-lib-0.9.1 ) )
 	caps? ( sys-libs/libcap )
@@ -36,9 +37,37 @@
 		epatch ${FILESDIR}/${PN}-0.98.1-configure.patch && WANT_AUTOCONF=2.5 autoconf \
 			|| die
 	fi
+
+	if use amd64 && has_multilib_profile; then
+		cp -ar ${S} ${S}-x86
+		mv ${S} ${S}-amd64
+	fi
 }
 
 src_compile() {
+	if use amd64 && has_multilib_profile; then
+		local OPWD=${PWD}
+		local OABI=${ABI}
+		local OLDFLAGS="${LDFLAGS}"
+		cd ${S}-x86
+		ABI="x86"
+		LDFLAGS="${OLDFLAGS} -L/usr/lib32"
+		src_compile-multi --libdir=/usr/lib32
+		cd ${S}-amd64
+		ABI="amd64"
+		LDFLAGS="${OLDFLAGS}"
+		src_compile-multi --libdir=/usr/lib64
+		ABI=${OABI}
+		cd ${OPWD}
+		unset OLDFLAGS
+		unset OPWD
+		unset OABI
+	else
+		src_compile-multi
+	fi
+}
+
+src_compile-multi() {
 	local myconf
 	local myarch
 
@@ -60,11 +89,31 @@
 
 	myconf="${myconf} `use_enable altivec` `use_enable alsa` `use_enable oss` `use_enable portaudio`"
 
-	econf ${myconf} || die "configure failed"
+	econf ${1} ${myconf} || die "configure failed"
 	emake || die "compilation failed"
 }
 
 src_install() {
+	if use amd64 && has_multilib_profile; then
+		local OPWD=${PWD}
+		local OABI=${ABI}
+		cd ${S}-x86
+		ABI="x86"
+		src_install-multi
+		cd ${S}-amd64
+		ABI="amd64"
+		src_install-multi
+		ABI=${OABI}
+		cd ${OPWD}
+		unset OPWD
+		unset OABI
+	else
+		src_install-multi
+	fi
+	src_install-doc
+}
+
+src_install-multi() {
 	make DESTDIR=${D} \
 		datadir=${D}/usr/share \
 		install || die
@@ -73,7 +122,9 @@
 		keepdir /var/run/jack
 		chmod 4777 ${D}/var/run/jack
 	fi
+}
 
+src_install_doc() {
 	if use doc; then
 		mv ${D}/usr/share/doc/${PF}/reference/html \
 		   ${D}/usr/share/doc/${PF}/