64bit native compilation for nx, warning message cleanups from bug #154132

svn path=/testing/; revision=127

12 files changed, 302 insertions, 59 deletions

diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 05f85ec..f468a1c 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -1,7 +1,3 @@
-AUX 1.5.0/nx-x11-1.5.0-amd64.patch 508 RMD160 1f4a00d45e36e9647e68f98ccf978e015a672317 SHA1 bfd182ff9748247e62a8f3be5e17d042fdf03683 SHA256 1ed16d56ed1faee9d1225550050cb3e63a40bc236af595961e86eba0744016b7
-MD5 e105922ff9b5e036bd61b244fc52393e files/1.5.0/nx-x11-1.5.0-amd64.patch 508
-RMD160 1f4a00d45e36e9647e68f98ccf978e015a672317 files/1.5.0/nx-x11-1.5.0-amd64.patch 508
-SHA256 1ed16d56ed1faee9d1225550050cb3e63a40bc236af595961e86eba0744016b7 files/1.5.0/nx-x11-1.5.0-amd64.patch 508
 AUX 1.5.0/nx-x11-1.5.0-tmp-exec.patch 349 RMD160 083862e5563962764e9d78f50a37576bac9913cc SHA1 97402172c1039e4f86b977f27a4571a8a77d1c6b SHA256 bbaeeb4e04c04da96f37dfb7ab5e494094d61a390ef2ae24813a5f49b3c44971
 MD5 66ed4c7f2907fac164c9b54d29b39841 files/1.5.0/nx-x11-1.5.0-tmp-exec.patch 349
 RMD160 083862e5563962764e9d78f50a37576bac9913cc files/1.5.0/nx-x11-1.5.0-tmp-exec.patch 349
@@ -10,6 +6,18 @@ AUX 1.5.0/nxcomp-1.5.0-pic.patch 522 RMD160 2016856cb86605ca7ccb6b2c17a1c096c8e8
 MD5 3bd5746a479e0ebddad94ba11fe3899b files/1.5.0/nxcomp-1.5.0-pic.patch 522
 RMD160 2016856cb86605ca7ccb6b2c17a1c096c8e80cea files/1.5.0/nxcomp-1.5.0-pic.patch 522
 SHA256 d4fb814d5ee3bd13c39e535b731caab0acb9e552cea471c602c8ff9c8e6d535e files/1.5.0/nxcomp-1.5.0-pic.patch 522
+AUX nx-2.1.0-64bit-clean.patch 2900 RMD160 2eb20644b842ba03c7a9ab231a5e0964f7101065 SHA1 8999806e14c5653594d580ba86fe233ee7d60bb8 SHA256 de461ce475bab864a612de2ec5f0caaa8131275c485f4dad726a3f2a3caf4829
+MD5 45c9d8271c5d3c89f506f09cc643f47a files/nx-2.1.0-64bit-clean.patch 2900
+RMD160 2eb20644b842ba03c7a9ab231a5e0964f7101065 files/nx-2.1.0-64bit-clean.patch 2900
+SHA256 de461ce475bab864a612de2ec5f0caaa8131275c485f4dad726a3f2a3caf4829 files/nx-2.1.0-64bit-clean.patch 2900
+AUX nx-2.1.0-deprecated-headers.patch 3095 RMD160 1814ed18966606dcdb962c024cc9bc02ca3dd09a SHA1 fc41d3539af12dd3d5a1dafc63b0ca40893fbf1b SHA256 bf00914ec72786701ae5d8e56e18388cbe62eb7280ab11799f840680082cb973
+MD5 a61a10fdf2346b908a7a9bc6638ac3ac files/nx-2.1.0-deprecated-headers.patch 3095
+RMD160 1814ed18966606dcdb962c024cc9bc02ca3dd09a files/nx-2.1.0-deprecated-headers.patch 3095
+SHA256 bf00914ec72786701ae5d8e56e18388cbe62eb7280ab11799f840680082cb973 files/nx-2.1.0-deprecated-headers.patch 3095
+AUX nx-2.1.0-invalid-options.patch 978 RMD160 34e8c167b60e20032363ac57e4019a77accd8cb1 SHA1 453dbdaa4682d2051f67a17d586983b659ebb628 SHA256 d466e4abb4a1acdadcb9eddfc5651a7914d6b721e0d59e9df20ea4e19e78bd01
+MD5 08d051f5c082efc3ab71dabbd384d543 files/nx-2.1.0-invalid-options.patch 978
+RMD160 34e8c167b60e20032363ac57e4019a77accd8cb1 files/nx-2.1.0-invalid-options.patch 978
+SHA256 d466e4abb4a1acdadcb9eddfc5651a7914d6b721e0d59e9df20ea4e19e78bd01 files/nx-2.1.0-invalid-options.patch 978
 DIST nx-X11-2.1.0-2.tar.gz 32497962 RMD160 6357204659cca8abdf679c70f39cd02390d377e7 SHA1 9b98d45d083e232b3d2f6139de88c82997998d49 SHA256 3487eabac737c7f65b67cf2d301e4142e1a406ac73d1fe8242a81802a7817b35
 DIST nxagent-2.1.0-17.tar.gz 944209 RMD160 df2d270b5d46c8768fed1da237f2100ddfc3242f SHA1 79215792e89275d809b38b1ceb3a20b7016aae37 SHA256 f4576f2d437586268dff33face2f550cce2d4c5d175022c0562c346e20b106e3
 DIST nxauth-2.1.0-1.tar.gz 23324 RMD160 c6ad7a568c91a2fcffb49366bf71eb8995f7acb4 SHA1 fbeeda1bbcc542fd27c7d1c7fab8d59d5c0e2523 SHA256 05cde299d298551a2f41efadbff2267b1c830b926c0df5bd272ec76af3c83f56
@@ -18,10 +26,10 @@ DIST nxcompext-2.1.0-4.tar.gz 95995 RMD160 8c388a79f825351787d810797408c0ba693b3
 DIST nxdesktop-2.1.0-8.tar.gz 526529 RMD160 fe3f8f0e0b38ad963570fb741bac98e092cc861e SHA1 f115217b27aec3751c1d0e04fbf18a77d1b076a8 SHA256 3d6710693ad10dea97c3b5e3d7975e225680cef857485c723aa781d3fa6a9306
 DIST nxproxy-2.1.0-2.tar.gz 75843 RMD160 6b0711d8f95b178402fca99b046e597d82fe2e02 SHA1 6c206c44e626ef29b2edcb99494b917792252526 SHA256 30db34375cf6bab3d65317ff0a5e533eb31d5c1c9a47922717478902c62c0e7b
 DIST nxviewer-2.1.0-11.tar.gz 239141 RMD160 0057a569c4e6b1969158d08a5a8e0a48995a7f8b SHA1 bb2626478b24aa69855f39da65c89a528d37c89e SHA256 55386c51a1e0c08c8598040dc6dfe4a1ebd7ff06280fa94371a050b78607fdb1
-EBUILD nx-2.1.0.ebuild 3325 RMD160 531c758cf1cd985c692b43f659140a25030f121f SHA1 2f3adf12efe171027b0372339e0054d6a40dda37 SHA256 a67e2d60d4fc19a222f9635481092894dafd2436838c49d279ead2ba523c2395
-MD5 28bffb4e40aa82f846b839838cf32fed nx-2.1.0.ebuild 3325
-RMD160 531c758cf1cd985c692b43f659140a25030f121f nx-2.1.0.ebuild 3325
-SHA256 a67e2d60d4fc19a222f9635481092894dafd2436838c49d279ead2ba523c2395 nx-2.1.0.ebuild 3325
+EBUILD nx-2.1.0.ebuild 3313 RMD160 6867dcfac726933f498ae20b501966e2f8af921b SHA1 1438c170d866816425ae7799c5ac048ca415eb13 SHA256 5731af667a992ff1b1515a54e5c19d86b76986a415a75bc5c756f494f049b78f
+MD5 bfb6b06a1d89fdc64e8c74fb44bd3446 nx-2.1.0.ebuild 3313
+RMD160 6867dcfac726933f498ae20b501966e2f8af921b nx-2.1.0.ebuild 3313
+SHA256 5731af667a992ff1b1515a54e5c19d86b76986a415a75bc5c756f494f049b78f nx-2.1.0.ebuild 3313
 MD5 b83c623c71cbc341fae644a89282b44d files/digest-nx-2.1.0 1985
 RMD160 34e4e75a659854855b102b21b972cb2bf337f453 files/digest-nx-2.1.0 1985
 SHA256 6691e7f8d5652e63454aa58001acd03af8b2d6dd5be4844341cc41d74fb0253e files/digest-nx-2.1.0 1985
diff --git a/net-misc/nx/files/1.5.0/nx-x11-1.5.0-amd64.patch b/net-misc/nx/files/1.5.0/nx-x11-1.5.0-amd64.patch
deleted file mode 100644
index 0c7279b..0000000
--- a/net-misc/nx/files/1.5.0/nx-x11-1.5.0-amd64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru nx-X11-orig/lib/X11/XlcDL.c nx-X11/lib/X11/XlcDL.c
---- nx-X11-orig/lib/X11/XlcDL.c	2006-10-04 16:51:54.000000000 -0600
-+++ nx-X11/lib/X11/XlcDL.c	2006-10-04 16:52:55.000000000 -0600
-@@ -58,10 +58,8 @@
- #ifdef _LP64
- # if defined(__sparcv9)
- #  define	_MACH64_NAME		"sparcv9"
--# elif defined(__ia64__) 
--#  undef MACH64_NAME
- # else
--#  error "Unknown architecture"
-+#  undef MACH64_NAME
- # endif /* defined(__sparcv9) */
- # ifdef _MACH64_NAME
- #  define	_MACH64_NAME_LEN	(sizeof (_MACH64_NAME) - 1)
diff --git a/net-misc/nx/files/nx-2.1.0-64bit-clean.patch b/net-misc/nx/files/nx-2.1.0-64bit-clean.patch
new file mode 100644
index 0000000..67dbb76
--- /dev/null
+++ b/net-misc/nx/files/nx-2.1.0-64bit-clean.patch
@@ -0,0 +1,102 @@
+--- nxcomp.old/NXproto.h	2006-06-19 19:55:56.000000000 +0200
++++ nxcomp/NXproto.h	2007-02-12 18:17:41.000000000 +0100
+@@ -26,6 +26,30 @@
+ #include <X11/Xmd.h>
+ #include <X11/Xproto.h>
+ 
++/*
++  Copied from Xproto.h
++ */
++
++/* For the purpose of the structure definitions in this file,
++we must redefine the following types in terms of Xmd.h's types, which may
++include bit fields.  All of these are #undef'd at the end of this file,
++restoring the definitions in X.h.  */
++
++#define Window CARD32
++#define Drawable CARD32
++#define Font CARD32
++#define Pixmap CARD32
++#define Cursor CARD32
++#define Colormap CARD32
++#define GContext CARD32
++#define Atom CARD32
++#define VisualID CARD32
++#define Time CARD32
++#define KeyCode CARD8
++#define KeySym CARD32
++
++/* End copied from Xproto.h */
++
+ #define sz_xNXGetControlParametersReq           4
+ #define sz_xNXGetCleanupParametersReq           4
+ #define sz_xNXGetImageParametersReq             4
+@@ -343,9 +367,9 @@
+     CARD8    dstDepth;
+     CARD32   srcLength B32;
+     CARD32   dstLength B32;
+-    INT16    srcX B16, srcY B16;
++    CARD16    srcX B16, srcY B16;
+     CARD16   srcWidth B16, srcHeight B16;
+-    INT16    dstX B16, dstY B16;
++    CARD16    dstX B16, dstY B16;
+     CARD16   dstWidth B16, dstHeight B16;
+ } xNXPutPackedImageReq;
+ 
+@@ -463,4 +487,20 @@
+ }
+ #endif
+ 
++/* Copied from Xproto.h */
++
++/* restore these definitions back to the typedefs in X.h */
++#undef Window
++#undef Drawable
++#undef Font
++#undef Pixmap
++#undef Cursor
++#undef Colormap
++#undef GContext
++#undef Atom
++#undef VisualID
++#undef Time
++#undef KeyCode
++#undef KeySym
++
+ #endif /* NXproto_H */
+diff -ur nx-X11/programs/Xserver/hw/nxagent.old/Millis.c nx-X11/programs/Xserver/hw/nxagent/Millis.c
+--- nx-X11/programs/Xserver/hw/nxagent.old/Millis.c	2006-05-25 11:37:31.000000000 +0200
++++ nx-X11/programs/Xserver/hw/nxagent/Millis.c	2007-02-12 19:10:10.000000000 +0100
+@@ -22,7 +22,7 @@
+ #include "Millis.h"
+ 
+ #ifdef DDXTIME
+-unsigned long GetTimeInMillis()
++CARD32 GetTimeInMillis()
+ {
+   struct timeval ts;
+ 
+diff -ur nx-X11/programs/Xserver/hw/nxagent.old/Millis.h nx-X11/programs/Xserver/hw/nxagent/Millis.h
+--- nx-X11/programs/Xserver/hw/nxagent.old/Millis.h	2006-05-22 15:02:16.000000000 +0200
++++ nx-X11/programs/Xserver/hw/nxagent/Millis.h	2007-02-12 19:22:26.000000000 +0100
+@@ -18,7 +18,7 @@
+ #ifndef __Millis_H__
+ #define __Millis_H__
+ 
+-unsigned long GetTimeInMillis(void);
++#include "os.h"
+ 
+ const char *GetTimeInMillisAsString(void);
+ 
+diff -ur lib.old/X11/XlcDL.c lib/X11/XlcDL.c
+--- nx-X11.old/lib/X11/XlcDL.c	2006-06-19 16:20:46.000000000 +0200
++++ nx-X11/lib/X11/XlcDL.c	2007-02-12 06:32:53.000000000 +0100
+@@ -61,7 +61,7 @@
+ # elif defined(__ia64__) 
+ #  undef MACH64_NAME
+ # else
+-#  error "Unknown architecture"
++#  undef MACH64_NAME
+ # endif /* defined(__sparcv9) */
+ # ifdef _MACH64_NAME
+ #  define	_MACH64_NAME_LEN	(sizeof (_MACH64_NAME) - 1)
diff --git a/net-misc/nx/files/nx-2.1.0-deprecated-headers.patch b/net-misc/nx/files/nx-2.1.0-deprecated-headers.patch
new file mode 100644
index 0000000..c9741d5
--- /dev/null
+++ b/net-misc/nx/files/nx-2.1.0-deprecated-headers.patch
@@ -0,0 +1,111 @@
+diff -urN BlockCacheSet.cpp BlockCacheSet.cpp
+--- BlockCacheSet.cpp	2006-11-05 13:22:45.963189321 +0000
++++ BlockCacheSet.cpp	2006-11-05 13:23:25.000000000 +0000
+@@ -15,7 +15,9 @@
+ /*                                                                        */
+ /**************************************************************************/
+ 
+-#include <iostream.h>
++using namespace std;
++
++#include <iostream>
+ #include "BlockCacheSet.h"
+ 
+ 
+diff -urN Loop.cpp Loop.cpp
+--- Loop.cpp	2006-11-05 13:22:45.854205948 +0000
++++ Loop.cpp	2006-11-05 13:23:25.000000000 +0000
+@@ -15,6 +15,8 @@
+ /*                                                                        */
+ /**************************************************************************/
+ 
++using namespace std;
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -29,7 +31,7 @@
+ #include <dirent.h>
+ #include <pwd.h>
+ 
+-#include <fstream.h>
++#include <fstream>
+ #include <fcntl.h>
+ 
+ #include <sys/types.h>
+diff -urN Message.cpp Message.cpp
+--- Message.cpp	2006-11-05 13:22:45.963189321 +0000
++++ Message.cpp	2006-11-05 13:23:25.000000000 +0000
+@@ -15,8 +15,10 @@
+ /*                                                                        */
+ /**************************************************************************/
+ 
++using namespace std;
++
+ #include <stdio.h>
+-#include <fstream.h>
++#include <fstream>
+ #include <unistd.h>
+ #include <string.h>
+ 
+diff -urN Misc.cpp Misc.cpp
+--- Misc.cpp	2006-11-05 13:22:45.701229285 +0000
++++ Misc.cpp	2006-11-05 13:23:25.000000000 +0000
+@@ -15,7 +15,9 @@
+ /*                                                                        */
+ /**************************************************************************/
+ 
+-#include <iostream.h>
++using namespace std;
++
++#include <iostream>
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <stdlib.h>
+diff -urN Misc.h Misc.h
+--- Misc.h	2006-11-05 13:22:45.643238132 +0000
++++ Misc.h	2006-11-05 13:23:25.000000000 +0000
+@@ -18,8 +18,10 @@
+ #ifndef Misc_H
+ #define Misc_H
+ 
+-#include <iostream.h>
+-#include <fstream.h>
++using namespace std;
++
++#include <iostream>
++#include <fstream>
+ 
+ #include <errno.h>
+ #include <string.h>
+diff -urN Proxy.cpp Proxy.cpp
+--- Proxy.cpp	2006-11-05 13:22:45.856205642 +0000
++++ Proxy.cpp	2006-11-05 13:23:25.000000000 +0000
+@@ -15,10 +15,12 @@
+ /*                                                                        */
+ /**************************************************************************/
+ 
++using namespace std;
++
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+-#include <fstream.h>
++#include <fstream>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 
+diff -urN Split.cpp Split.cpp
+--- Split.cpp	2006-11-05 13:22:45.797214643 +0000
++++ Split.cpp	2006-11-05 13:23:25.000000000 +0000
+@@ -15,7 +15,9 @@
+ /*                                                                        */
+ /**************************************************************************/
+ 
+-#include <fstream.h>
++using namespace std;
++
++#include <fstream>
+ #include <unistd.h>
+ #include <string.h>
+ #include <sys/stat.h>
diff --git a/net-misc/nx/files/nx-2.1.0-invalid-options.patch b/net-misc/nx/files/nx-2.1.0-invalid-options.patch
new file mode 100644
index 0000000..17e4f43
--- /dev/null
+++ b/net-misc/nx/files/nx-2.1.0-invalid-options.patch
@@ -0,0 +1,38 @@
+--- configure.in	2006-11-04 19:37:56.000000000 +0000
++++ configure.in	2006-11-04 19:38:23.000000000 +0000
+@@ -52,35 +52,6 @@
+ AC_PROG_CC
+ AC_LANG_CPLUSPLUS
+ 
+-dnl Check whether option -Wno-deprecated
+-dnl is needed by GCC compiler.
+-
+-AC_MSG_CHECKING([whether compiler needs -Wno-deprecated])
+-gcc_version=`${CC} --version | grep 'gcc (GCC) [[3-4]].' | head -n 1`
+-case "${gcc_version}" in
+-     gcc*)
+-        AC_MSG_RESULT([yes])
+-        CXXFLAGS="$CXXFLAGS -Wno-deprecated"
+-        ;;
+-
+-     *)
+-        AC_MSG_RESULT([no])
+-        ;;
+-esac
+-
+-AC_MSG_CHECKING([whether compiler accepts -Wmissing-declarations and -Wnested-externs])
+-gcc_version=`${CC} --version | grep 'gcc (GCC) [[3-4]].' | head -n 1`
+-case "${gcc_version}" in
+-     gcc*)
+-        AC_MSG_RESULT([no])
+-        ;;
+-
+-     *)
+-        AC_MSG_RESULT([yes])
+-        CXXFLAGS="$CXXFLAGS -Wmissing-declarations -Wnested-externs"
+-        ;;
+-esac
+-
+ dnl Check for BSD compatible install.
+ 
+ AC_PROG_INSTALL
diff --git a/net-misc/nx/nx-2.1.0.ebuild b/net-misc/nx/nx-2.1.0.ebuild
index 84b4e8f..eb48494 100644
--- a/net-misc/nx/nx-2.1.0.ebuild
+++ b/net-misc/nx/nx-2.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit eutils multilib
+inherit autotools eutils multilib
 
 DESCRIPTION="NX compression technology core libraries"
 HOMEPAGE="http://www.nomachine.com/developers.php"
@@ -27,16 +27,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="rdesktop vnc"
 
-RDEPEND="x86? ( || ( ( x11-libs/libXau
+RDEPEND="|| ( ( x11-libs/libXau
 		   			 x11-libs/libXdmcp
 				     x11-libs/libXpm
-			       )
-			       virtual/x11
 				)
-				>=media-libs/jpeg-6b-r4
-				>=media-libs/libpng-1.2.8
-				>=sys-libs/zlib-1.2.3 )
-		 amd64? ( app-emulation/emul-linux-x86-xlibs )"
+				virtual/x11
+			)
+			>=media-libs/jpeg-6b-r4
+			>=media-libs/libpng-1.2.8
+			>=sys-libs/zlib-1.2.3
+			"
 
 DEPEND="${RDEPEND}
 		|| ( ( x11-proto/xproto
@@ -65,18 +65,18 @@ S=${WORKDIR}/${PN}-X11
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}
+	cd ${WORKDIR}
 	epatch ${FILESDIR}/1.5.0/nx-x11-1.5.0-tmp-exec.patch
-	epatch ${FILESDIR}/1.5.0/nx-x11-1.5.0-amd64.patch
+	epatch ${FILESDIR}/${P}-64bit-clean.patch
+	epatch ${FILESDIR}/1.5.0/nxcomp-1.5.0-pic.patch
 
 	cd ${WORKDIR}/nxcomp
-	epatch ${FILESDIR}/1.5.0/nxcomp-1.5.0-pic.patch
+	epatch ${FILESDIR}/${P}-deprecated-headers.patch
+	epatch ${FILESDIR}/${P}-invalid-options.patch
+	eautoreconf
 }
 
 src_compile() {
-	# nx-X11 will only compile in 32-bit
-	use amd64 && multilib_toolchain_setup x86
-
 	cd ${WORKDIR}/nxcomp || die
 	econf || die
 	emake || die
@@ -106,18 +106,19 @@ src_compile() {
 }
 
 src_install() {
+	NX_ROOT=/usr/$(get_libdir)/NX
 	for x in nxagent nxauth nxproxy; do
-		make_wrapper $x ./$x /usr/lib/NX/bin /usr/lib/NX/$(get_libdir) ||die
+		make_wrapper $x ./$x ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||die
 	done
 	if use vnc ; then
-		make_wrapper nxviewer ./nxviewer /usr/lib/NX/bin /usr/lib/NX/$(get_libdir) ||die
-		make_wrapper nxpasswd ./nxpasswd /usr/lib/NX/bin /usr/lib/NX/$(get_libdir) ||die
+		make_wrapper nxviewer ./nxviewer ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||die
+		make_wrapper nxpasswd ./nxpasswd ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||die
 	fi
 	if use rdesktop ; then
-		make_wrapper nxdesktop ./nxdesktop /usr/lib/NX/bin /usr/lib/NX/$(get_libdir) ||die
+		make_wrapper nxdesktop ./nxdesktop ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||die
 	fi
 
-	into /usr/lib/NX
+	into ${NX_ROOT}
 	dobin ${WORKDIR}/nx-X11/programs/Xserver/nxagent
 	dobin ${WORKDIR}/nx-X11/programs/nxauth/nxauth
 	dobin ${WORKDIR}/nxproxy/nxproxy
diff --git a/net-misc/nxnode/Manifest b/net-misc/nxnode/Manifest
index 413708e..c973585 100644
--- a/net-misc/nxnode/Manifest
+++ b/net-misc/nxnode/Manifest
@@ -7,10 +7,10 @@ MD5 82a440e1c0f91809ad5cca32066b4fd0 files/nxnode-2.1.0-setup.patch 1357
 RMD160 f5af6e093ecdb45551b95b1d047065f5f3aa9b54 files/nxnode-2.1.0-setup.patch 1357
 SHA256 ee95f966f0598e966d2cef3d8fff0888ec7880afded8d275e2f415939b1508c3 files/nxnode-2.1.0-setup.patch 1357
 DIST nxnode-2.1.0-15.i386.tar.gz 5156679 RMD160 775ce55e6a7c17db5a22e50da30e0067522c227a SHA1 95d5867c22336ac05281ae2ad5db0c1845c3baef SHA256 eadcb79a5eba169b16fd83144f89a6167bd634fbf8b7860270864d88a493b76c
-EBUILD nxnode-2.1.0.ebuild 2550 RMD160 12aeb95a855d66656ce4a5cd2bfefce4edbb4c8c SHA1 e8a27fa983c76b45545834559f5a187cdef8806b SHA256 bd4c6764cd5d64323357b2c9c11a7ea56539c3cdbc3855f42e813c34770b9c44
-MD5 93a84ad3c3089e5f53db442cf4faf9bd nxnode-2.1.0.ebuild 2550
-RMD160 12aeb95a855d66656ce4a5cd2bfefce4edbb4c8c nxnode-2.1.0.ebuild 2550
-SHA256 bd4c6764cd5d64323357b2c9c11a7ea56539c3cdbc3855f42e813c34770b9c44 nxnode-2.1.0.ebuild 2550
+EBUILD nxnode-2.1.0.ebuild 2559 RMD160 d804865797d359b93cb3b7a2953a4b38272bf6b5 SHA1 94e4a437ac7a3f06fa1b7468e100c750a0a41f53 SHA256 87113f576fddb66b252f9780fd7a339bbdda07ccd71602b41125393394fae67e
+MD5 58f0d52a16be74b2168893fad8d62cf4 nxnode-2.1.0.ebuild 2559
+RMD160 d804865797d359b93cb3b7a2953a4b38272bf6b5 nxnode-2.1.0.ebuild 2559
+SHA256 87113f576fddb66b252f9780fd7a339bbdda07ccd71602b41125393394fae67e nxnode-2.1.0.ebuild 2559
 MD5 d8cd09718b9bd0c3a7f4a943c5be33c3 files/digest-nxnode-2.1.0 265
 RMD160 b101a7c82855f101751e3285e5965cee005a982d files/digest-nxnode-2.1.0 265
 SHA256 e43eaae7b4538a03bf8e44deea5cd1a0ebe830a1ee3714f691bb7d0c06acd08e files/digest-nxnode-2.1.0 265
diff --git a/net-misc/nxnode/nxnode-2.1.0.ebuild b/net-misc/nxnode/nxnode-2.1.0.ebuild
index 69c38ba..4b24260 100644
--- a/net-misc/nxnode/nxnode-2.1.0.ebuild
+++ b/net-misc/nxnode/nxnode-2.1.0.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="nxnode provides the components that are shared between the differen
 HOMEPAGE="http://www.nomachine.com/"
 SRC_URI="http://64.34.161.181/download/2.1.0/Linux/nxnode-2.1.0-15.i386.tar.gz"
 
-LICENSE=""
+LICENSE="nomachine"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/net-misc/nxserver-freeedition/Manifest b/net-misc/nxserver-freeedition/Manifest
index 81cda67..73310cc 100644
--- a/net-misc/nxserver-freeedition/Manifest
+++ b/net-misc/nxserver-freeedition/Manifest
@@ -7,10 +7,10 @@ MD5 acbc4350a1f1fbee7d4e1aed7755e197 files/nxserver-2.1.0-setup.patch 1927
 RMD160 e0ee56dedff3dac4265d6ca920b7534f6c097ce3 files/nxserver-2.1.0-setup.patch 1927
 SHA256 2c9c934897ea31cfe6a860ad86fb9bf8e0c4b0e3dbff6b1f5472d19755030d7d files/nxserver-2.1.0-setup.patch 1927
 DIST nxserver-2.1.0-18.i386.tar.gz 5121771 RMD160 0e11165c6e888276e0fc17c6987bbe412f0664bd SHA1 ef3d7761caa906688394cd9b81f624ef009b1b24 SHA256 c6c23ccebdc4746be62448110e136a42b570aebb2d97dae2bcd548305aef90bb
-EBUILD nxserver-freeedition-2.1.0.ebuild 1856 RMD160 e605eee3c67d78cc4d6a104c68ebdb2a16b59556 SHA1 761121f5addc3761e0009bf13082815ba79ffad9 SHA256 4f1ccd8a6b8705e1b6561638b38e7bed1671c7a9e8ff002ef794f8bf7e542afc
-MD5 c3c896605250466b9ce584ee51c66775 nxserver-freeedition-2.1.0.ebuild 1856
-RMD160 e605eee3c67d78cc4d6a104c68ebdb2a16b59556 nxserver-freeedition-2.1.0.ebuild 1856
-SHA256 4f1ccd8a6b8705e1b6561638b38e7bed1671c7a9e8ff002ef794f8bf7e542afc nxserver-freeedition-2.1.0.ebuild 1856
+EBUILD nxserver-freeedition-2.1.0.ebuild 1865 RMD160 48d7e7193fcadc1ffbfcf50fe96297af00c5262f SHA1 107c0766b562cb3afc8f50dd563f6b9aa31e6e79 SHA256 ec97d3eeb2cfecf96590c48501a3307d71c89d214d222047b5c45a0458faa957
+MD5 95b2a844d7bb0b6e1ae95507f797dc13 nxserver-freeedition-2.1.0.ebuild 1865
+RMD160 48d7e7193fcadc1ffbfcf50fe96297af00c5262f nxserver-freeedition-2.1.0.ebuild 1865
+SHA256 ec97d3eeb2cfecf96590c48501a3307d71c89d214d222047b5c45a0458faa957 nxserver-freeedition-2.1.0.ebuild 1865
 MD5 b4d7fbe4c8422570000376a91c37c856 files/digest-nxserver-freeedition-2.1.0 271
 RMD160 f2d854466da37098288228ecc049317c73bc85e9 files/digest-nxserver-freeedition-2.1.0 271
 SHA256 7bba96820f219e34f8566206ecfa8e3cae6be92b706bd218f729264d55086961 files/digest-nxserver-freeedition-2.1.0 271
diff --git a/net-misc/nxserver-freeedition/nxserver-freeedition-2.1.0.ebuild b/net-misc/nxserver-freeedition/nxserver-freeedition-2.1.0.ebuild
index 29900f5..334795d 100644
--- a/net-misc/nxserver-freeedition/nxserver-freeedition-2.1.0.ebuild
+++ b/net-misc/nxserver-freeedition/nxserver-freeedition-2.1.0.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="Free edition NX server from NoMachine"
 HOMEPAGE="http://www.nomachine.com/"
 SRC_URI="http://64.34.161.181/download/2.1.0/Linux/FE/nxserver-2.1.0-18.i386.tar.gz"
 
-LICENSE=""
+LICENSE="nomachine"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index 6aeb5ef..5ff9700 100644
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -11,10 +11,10 @@ MD5 103110225d1c3c695cf6619f4c00c294 files/nxserver-freenx-0.6.0-rdesktop.patch
 RMD160 27b3ea1ac16fe20f0a516151ca057c5ad965d48a files/nxserver-freenx-0.6.0-rdesktop.patch 321
 SHA256 b6cf0b897fbbcfa535c09ba87221b8930276970202dadf662f134bb0dc01acc6 files/nxserver-freenx-0.6.0-rdesktop.patch 321
 DIST freenx-0.6.0.tar.gz 110758 RMD160 6000d5fed4d11dbb4c750b43c81626991460ccbb SHA1 c43ce0462fa6c7fe84d5c7db8e5c14dc8ab2feed SHA256 928a4be2ecdfb560abc93737d049fa5b2459e64c431d4aa43e46c6c4df52b3ca
-EBUILD nxserver-freenx-0.6.0.ebuild 2950 RMD160 2f3951623e5fc553abfe2298a91f69d0e961f65a SHA1 47951945660abe9596c0394fc155b6b072199027 SHA256 3ac9fec4dcec85e74489ee511287863458a8d4a05519cbb9cb8693dac17ddee3
-MD5 c9d6720f392c9e45a2900a17cf951872 nxserver-freenx-0.6.0.ebuild 2950
-RMD160 2f3951623e5fc553abfe2298a91f69d0e961f65a nxserver-freenx-0.6.0.ebuild 2950
-SHA256 3ac9fec4dcec85e74489ee511287863458a8d4a05519cbb9cb8693dac17ddee3 nxserver-freenx-0.6.0.ebuild 2950
+EBUILD nxserver-freenx-0.6.0.ebuild 2863 RMD160 23dd335360338d644980879ad3ee2f91870510f7 SHA1 19e526006d6e65398f672f042909d44fa1ea1763 SHA256 9530f8a78db93a05eebc286581bd4123d2d54bfd0231a1c37b39b97a438d3349
+MD5 0f50710d34fb9a22ac5f1a22635149dc nxserver-freenx-0.6.0.ebuild 2863
+RMD160 23dd335360338d644980879ad3ee2f91870510f7 nxserver-freenx-0.6.0.ebuild 2863
+SHA256 9530f8a78db93a05eebc286581bd4123d2d54bfd0231a1c37b39b97a438d3349 nxserver-freenx-0.6.0.ebuild 2863
 MD5 4ea9feb54f34954f8d43c80f44a2cd9a files/digest-nxserver-freenx-0.6.0 238
 RMD160 4d8159168dc51338e9ab715840a060628a0234b2 files/digest-nxserver-freenx-0.6.0 238
 SHA256 1d10b1f32814e055aa8289983618c869f3b5a7cc1718c5b943fe32e2e8bfd509 files/digest-nxserver-freenx-0.6.0 238
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.6.0.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.6.0.ebuild
index 257c3be..25246bf 100644
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.6.0.ebuild
+++ b/net-misc/nxserver-freenx/nxserver-freenx-0.6.0.ebuild
@@ -50,9 +50,7 @@ src_unpack() {
 	mv node.conf.sample node.conf || die
 
 	epatch ${FILESDIR}/${P}-nxloadconfig.patch
-	# on amd64, get the correct path to NX 32bit libs
-	has_multilib_profile && \
-		sed -i "/PATH_LIB=/s/NX\/lib/NX\/$(get_abi_LIBDIR x86)/" nxloadconfig
+	sed -i "/PATH_LIB=/s/NX\/lib/NX\/$(get_libdir)/" nxloadconfig
 	# Change the defaults in nxloadconfig to meet the users needs.
 	if use arts ; then
 		einfo "Enabling arts support."