--- nas-1.9.3.ebuild	2012-12-09 17:31:19.000000000 +0100
+++ nas-1.9.3-r1.ebuild	2013-04-12 19:33:32.135335551 +0200
@@ -1,8 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/nas/nas-1.9.3.ebuild,v 1.3 2012/12/09 16:16:36 hasufell Exp $
+# $Header: $
 
-inherit eutils toolchain-funcs
+EAPI=5
+
+inherit eutils toolchain-funcs multilib-minimal
 
 DESCRIPTION="Network Audio System"
 HOMEPAGE="http://radscan.com/nas.html"
@@ -13,32 +15,32 @@
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc static-libs"
 
-RDEPEND="x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXaw
-	x11-libs/libXp
+RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]
+	x11-libs/libXau[${MULTILIB_USEDEP}]
+	x11-libs/libXaw[${MULTILIB_USEDEP}]
+	x11-libs/libXp[${MULTILIB_USEDEP}]
 	x11-libs/libXres
-	x11-libs/libXt
+	x11-libs/libXt[${MULTILIB_USEDEP}]
 	x11-libs/libXTrap"
 DEPEND="${RDEPEND}
 	app-text/rman
 	x11-misc/gccmakedep
 	x11-misc/imake
-	x11-proto/xproto"
+	x11-proto/xproto[${MULTILIB_USEDEP}]"
+
+ECONF_SOURCE=${S}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-1.9.2-asneeded.patch \
 		"${FILESDIR}"/${PN}-1.9.2-implicit-inet_ntoa-amd64.patch
-}
 
-src_compile() {
-	xmkmf -a || die
+	multilib_copy_sources
+}
 
-# I *think* this was because of missing -a switch in xmkmf, lets test without:
-#	touch doc/man/lib/tmp.{_man,man}
+multilib_src_compile() {
+	# multilib fails without setting CC
+	CC="$(tc-getCC)" xmkmf -a || die
 
 	# EXTRA_LDOPTIONS, SHLIBGLOBALSFLAGS #336564#c2
 	local emakeopts=(
@@ -63,9 +65,12 @@
 	emake "${emakeopts[@]}" World || die
 }
 
-src_install() {
+multilib_src_install() {
 	# ranlib is used at install phase too wrt #446600
 	emake RANLIB="$(tc-getRANLIB)" DESTDIR="${D}" install install.man || die
+}
+
+multilib_src_install_all() {
 	dodoc BUILDNOTES FAQ HISTORY README RELEASE TODO
 
 	if use doc; then