--- ../../nx-overlay/net-misc/nxserver-freenx/nxserver-freenx-0.4.4-r1.ebuild	2006-03-12 17:35:28.000000000 +0100
+++ nxserver-freenx/nxserver-freenx-0.4.4-r2.ebuild	2006-03-12 20:51:46.000000000 +0100
@@ -1,15 +1,15 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.4.4.ebuild,v 1.1 2005/05/23 19:10:14 stuart Exp $
+# $Header: $
 
-inherit eutils
+inherit multilib eutils
 
 DESCRIPTION="An X11/RDP/VNC proxy server especially well suited to low bandwidth links such as ISDN or modem"
 HOMEPAGE="http://freenx.berlios.de/"
 SRC_URI="http://debian.tu-bs.de/knoppix/nx/freenx-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~amd64 ~ppc"
 RESTRICT="nomirror strip"
 IUSE="commercial"
 DEPEND="virtual/ssh
@@ -17,9 +17,11 @@
 	net-analyzer/gnu-netcat
 	x86? ( commercial? ( >=net-misc/nxclient-1.4* )
 	      !commercial? ( !net-misc/nxclient ) )
-	!x86? ( !net-misc/nxclient )
+	amd64? ( commercial? ( >=net-misc/nxclient-1.4* )
+	      !commercial? ( !net-misc/nxclient ) )
+	!x86? ( !amd64? ( !net-misc/nxclient ) )
 	>=net-misc/nxproxy-1.4.0
-	>=net-misc/nx-x11-1.4.0
+	|| ( >=net-misc/nx-x11-1.4.0 >=net-misc/nx-x11-bin-1.4.0 )
 	!net-misc/nxserver-personal
 	!net-misc/nxserver-business
 	!net-misc/nxserver-enterprise"
@@ -36,10 +38,10 @@
 	epatch gentoo-nomachine.diff
 	# Patch to fix the adduser error
 	epatch $FILESDIR/freenx-0.4.4-adduser-fix.patch
-
-	cp ${FILESDIR}/nxserver-freenx-xorg7.patch ${T}/nxserver-freenx-xorg7.patch
-	sed -i 's/\-a "$1" != "\-\-agent" //' ${T}/nxserver-freenx-xorg7.patch
-	epatch ${T}/nxserver-freenx-xorg7.patch
+	epatch $FILESDIR/freenx-0.4.4-xorg7.patch
+	# fix to make sure 32 bit libraries are used by nx-x11 on amd64
+	has_multilib_profile && \
+		sed -i "/PATH_LIB=/s/lib/$(get_abi_LIBDIR x86)/" nxloadconfig
 }
 
 src_compile() {
@@ -60,8 +62,8 @@
 	dobin nxkeygen
 	dobin nxloadconfig
 	dobin nxsetup
-	( use x86 && use commercial ) || dobin nxprint
-	( use x86 && use commercial ) || dobin nxclient
+	( ( use x86 || use amd64 ) && use commercial ) || dobin nxprint
+	( ( use x86 || use amd64 ) && use commercial ) || dobin nxclient
 
 	dodir ${NX_ETC_DIR}
 	for x in passwords passwords.orig ; do