Initial import; replaces nx-x11 and nx-x11-bin

Package-Manager: portage-2.1.2_pre2-r9

13 files changed, 803 insertions, 0 deletions

diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog
new file mode 100644
index 000000000000..9124c621166d
--- /dev/null
+++ b/net-misc/nx/ChangeLog
@@ -0,0 +1,7 @@
+# ChangeLog for net-misc/nx
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.1 2006/11/08 21:27:10 stuart Exp $
+
+  08 Nov 2006; Stuart Herbert <stuart@gentoo.org> ChangeLog:
+  Initial import; replaces net-misc/nx-x11 and net-misc/nx-x11-bin
+
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
new file mode 100644
index 000000000000..195186787324
--- /dev/null
+++ b/net-misc/nx/Manifest
@@ -0,0 +1,55 @@
+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-plastik-render-fix.patch 694 RMD160 68969a64f3ec28e14bf597c21f7557bbc31f8e48 SHA1 348fb41bfb4d01ea3819ee62df6398b4536f21d1 SHA256 2a96e171729d447f4083ccee9b55b13cc12f8ba9b540a630cfd1d47f8336cccf
+MD5 196a4104b3be214d69bc1a9ef841597c files/1.5.0/nx-x11-1.5.0-plastik-render-fix.patch 694
+RMD160 68969a64f3ec28e14bf597c21f7557bbc31f8e48 files/1.5.0/nx-x11-1.5.0-plastik-render-fix.patch 694
+SHA256 2a96e171729d447f4083ccee9b55b13cc12f8ba9b540a630cfd1d47f8336cccf files/1.5.0/nx-x11-1.5.0-plastik-render-fix.patch 694
+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
+SHA256 bbaeeb4e04c04da96f37dfb7ab5e494094d61a390ef2ae24813a5f49b3c44971 files/1.5.0/nx-x11-1.5.0-tmp-exec.patch 349
+AUX 1.5.0/nx-x11-1.5.0-xorg7-font-fix.patch 19674 RMD160 687c82d505d69961312c9f894a6f6e969c26533d SHA1 c35736a9b3d2e03cc066b5b8379414d94d224383 SHA256 3cf6987a589e42f9528e296a64a9180142e7cc7bff059c816d3161b819a35f65
+MD5 5895e099c63cb7b52258ccc29814d9b8 files/1.5.0/nx-x11-1.5.0-xorg7-font-fix.patch 19674
+RMD160 687c82d505d69961312c9f894a6f6e969c26533d files/1.5.0/nx-x11-1.5.0-xorg7-font-fix.patch 19674
+SHA256 3cf6987a589e42f9528e296a64a9180142e7cc7bff059c816d3161b819a35f65 files/1.5.0/nx-x11-1.5.0-xorg7-font-fix.patch 19674
+AUX 1.5.0/nx-x11-windows-linux-resume.patch 1355 RMD160 58013844583714f69143778a2941b7300266ca59 SHA1 a5f1e867b6acf2e904b954e38e127dabf075c982 SHA256 e6209e2a23ba79998f3d8eca768321082bd1487a421e9814077b88cab9c915e2
+MD5 24e6e57f80b89abab29d9e19128d8353 files/1.5.0/nx-x11-windows-linux-resume.patch 1355
+RMD160 58013844583714f69143778a2941b7300266ca59 files/1.5.0/nx-x11-windows-linux-resume.patch 1355
+SHA256 e6209e2a23ba79998f3d8eca768321082bd1487a421e9814077b88cab9c915e2 files/1.5.0/nx-x11-windows-linux-resume.patch 1355
+AUX 1.5.0/nxcomp-1.5.0-gcc4.patch 315 RMD160 04008ba3a33e2495dd449d77e780f9770f66d2bd SHA1 03322d3eb2eb6df8a2ef7a926475dac8c023a94d SHA256 45056ebfa8215290b777365e66b1e58398e8ab5a2c875a9610f78dd2db6b1d8e
+MD5 cf67a8d2074fa0a92afa2be056b537e2 files/1.5.0/nxcomp-1.5.0-gcc4.patch 315
+RMD160 04008ba3a33e2495dd449d77e780f9770f66d2bd files/1.5.0/nxcomp-1.5.0-gcc4.patch 315
+SHA256 45056ebfa8215290b777365e66b1e58398e8ab5a2c875a9610f78dd2db6b1d8e files/1.5.0/nxcomp-1.5.0-gcc4.patch 315
+AUX 1.5.0/nxcomp-1.5.0-pic.patch 522 RMD160 2016856cb86605ca7ccb6b2c17a1c096c8e80cea SHA1 f3febd574eb07c244a6fc91323631f99fad5fa34 SHA256 d4fb814d5ee3bd13c39e535b731caab0acb9e552cea471c602c8ff9c8e6d535e
+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 1.5.0/nxwrapper 136 RMD160 ca7f9cf47c4f5ad31f76f4f8b3c567d6c40196ef SHA1 f3c7a1b305eca691af6b7014d3c6a28954a224b5 SHA256 fa3f44295ba003f897076fc1ea2f665f7d1d8ce73e3bcb1fca934477292e7125
+MD5 e4786ac74a1db0ea674655dd4df0147d files/1.5.0/nxwrapper 136
+RMD160 ca7f9cf47c4f5ad31f76f4f8b3c567d6c40196ef files/1.5.0/nxwrapper 136
+SHA256 fa3f44295ba003f897076fc1ea2f665f7d1d8ce73e3bcb1fca934477292e7125 files/1.5.0/nxwrapper 136
+DIST nx-X11-1.5.0-21.tar.gz 32390668 RMD160 adaf757f20c59d39c2700f9082e414eefdc2c62f SHA1 2fe4ed9de7047dc35b9b606551fda5f099fc4dba SHA256 075570e59aa749fe4f11fca6ebf7579e5785b24b89cb8c62a368f4e2fe7d9123
+DIST nxagent-1.5.0-112.tar.gz 818946 RMD160 a0c3f5cd8f459ba46c3bb1161a2330df2589351d SHA1 421cc364cb09f6e06b036b179b419efb1457fcbf SHA256 f6008505a38cf6f3f7c06b0e97cbf0309c5f43dff99a21fd610a592c4326755d
+DIST nxauth-1.5.0-1.tar.gz 23077 RMD160 53c14a8195a39ecc7a1ea4151214921a6148ed41 SHA1 b08315749472cfd2926b2168a54153e7712a7f15 SHA256 42549f5767627378653d11f1d16d7334a6e08f3b1ecdd5edd0188aaaa7c36e4d
+DIST nxcomp-1.5.0-80.tar.gz 525688 RMD160 7a367ef235c50c143b4a25cd78aedd9fe83c8772 SHA1 b3bea98e5e47ba7d540491e7160f842338d1af61 SHA256 2a93eb6c32436028b11b8b5ef5be58a7138bc14cefb68e74b96cc7049f5a0367
+DIST nxcompext-1.5.0-20.tar.gz 124036 RMD160 4c7bfe55df09e4726eadb2498e94475a059aac7f SHA1 b5d1937d83bbf8eb40b2a3bd5ea0c4a632fe50f2 SHA256 468944ea3e605468a032dd56c58570029a56c489a60b504b3cd16018f6ccb760
+DIST nxdesktop-1.5.0-78.tar.gz 201893 RMD160 15ee898cbfd2fa02c2259f90ca5383657759fd41 SHA1 0bbc6385d550c3e53863c27cb69531dce4366a0d SHA256 5f35aecf1cc12940d0a00afe19879278bc886c7fd3ab70b8b779f3cfcd324719
+DIST nxproxy-1.5.0-9.tar.gz 73470 RMD160 e6104a85893b28453b3e4f96cfa7b1c193dca6b6 SHA1 16c29ac815c1ec91a0dd7b9796b62be66cf01ad0 SHA256 33227370c90cdb5e65824001255f4df5a20eecff19f75483df21bf55ab888d4a
+DIST nxviewer-1.5.0-15.tar.gz 86414 RMD160 c13a693a6b528f2d5703d38ac22b390439ae691c SHA1 ca598dc3e7df851037ee7e43ed2622df975cee1a SHA256 31d05d083b591a22bacbd4407cfec717116756eb2e0ba327b74a209f5eb09b56
+EBUILD nx-1.5.0.ebuild 4031 RMD160 322d3fada6c86904ecbfffa8cdf17c3e3c8d96cc SHA1 eb95a4061039f03c269fc9eba201586974db52d6 SHA256 2820b22dc81019cead45dfae5f924a92f5aae182d9583b3a7517cf1241e3a9be
+MD5 1f468a67e1a03a49fcb832b0cb8b2677 nx-1.5.0.ebuild 4031
+RMD160 322d3fada6c86904ecbfffa8cdf17c3e3c8d96cc nx-1.5.0.ebuild 4031
+SHA256 2820b22dc81019cead45dfae5f924a92f5aae182d9583b3a7517cf1241e3a9be nx-1.5.0.ebuild 4031
+MISC ChangeLog 324 RMD160 8ea8319349ff9e141960b99c634da3166ae7bfd8 SHA1 30cdda987f87f6e56f44e152e29df42e76af1746 SHA256 d3ae437414b51a9f587e9957d79499ddc136da308e05d0dab1c09df5a10199c7
+MD5 e8006bc18a6ad9bf9ba74182d97b9771 ChangeLog 324
+RMD160 8ea8319349ff9e141960b99c634da3166ae7bfd8 ChangeLog 324
+SHA256 d3ae437414b51a9f587e9957d79499ddc136da308e05d0dab1c09df5a10199c7 ChangeLog 324
+MISC metadata.xml 387 RMD160 42222cedea6294068e347b0341931357ae5a540f SHA1 d99dfd8cef289ba5b66e061f0a50af6555dcf8df SHA256 1d2541ed26ed866efcd25eb28bf7be9f0464cee324e780572a65cdeabf6d81b8
+MD5 d3b7b7070e6ddff287e1f70bbb1f8efd metadata.xml 387
+RMD160 42222cedea6294068e347b0341931357ae5a540f metadata.xml 387
+SHA256 1d2541ed26ed866efcd25eb28bf7be9f0464cee324e780572a65cdeabf6d81b8 metadata.xml 387
+MD5 4afb4893a484c52696b828567eb2fca0 files/digest-nx-1.5.0 2000
+RMD160 b1dd9e28dc90d09b26b500eca2f2157607e2bd90 files/digest-nx-1.5.0 2000
+SHA256 191116a943ddec07072d5032c7152fc2b4fc1f3a27a47d5eb086e9b829aaa014 files/digest-nx-1.5.0 2000
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
new file mode 100644
index 000000000000..0c7279b6ece2
--- /dev/null
+++ b/net-misc/nx/files/1.5.0/nx-x11-1.5.0-amd64.patch
@@ -0,0 +1,15 @@
+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/1.5.0/nx-x11-1.5.0-plastik-render-fix.patch b/net-misc/nx/files/1.5.0/nx-x11-1.5.0-plastik-render-fix.patch
new file mode 100644
index 000000000000..640c9a7d0c4f
--- /dev/null
+++ b/net-misc/nx/files/1.5.0/nx-x11-1.5.0-plastik-render-fix.patch
@@ -0,0 +1,20 @@
+--- nx-X11/programs/Xserver/hw/nxagent/GCOps.c~ 2005-11-25 21:42:23.000000000 +0100
++++ nx-X11/programs/Xserver/hw/nxagent/GCOps.c  2006-03-08 11:28:43.000000000 +0100
+@@ -2385,7 +2385,7 @@
+   {
+     if ((pDrawable)->type == DRAWABLE_PIXMAP)
+     {
+-      miPolySegment(nxagentVirtualDrawable(pDrawable), pGC, nSegments, pSegments);
++      fbPolySegment(nxagentVirtualDrawable(pDrawable), pGC, nSegments, pSegments);
+     }
+
+     return;
+@@ -2423,7 +2423,7 @@
+     }
+
+     nxagentGCTrap++;
+-    miPolySegment(nxagentVirtualDrawable(pDrawable), pGC, nSegments, pSegments);
++    fbPolySegment(nxagentVirtualDrawable(pDrawable), pGC, nSegments, pSegments);
+     nxagentGCTrap--;
+     return;
+   }
diff --git a/net-misc/nx/files/1.5.0/nx-x11-1.5.0-tmp-exec.patch b/net-misc/nx/files/1.5.0/nx-x11-1.5.0-tmp-exec.patch
new file mode 100644
index 000000000000..ece22145c47f
--- /dev/null
+++ b/net-misc/nx/files/1.5.0/nx-x11-1.5.0-tmp-exec.patch
@@ -0,0 +1,11 @@
+--- nx-X11/config/imake/imake.c.orig	2006-11-05 00:10:49.000000000 +0000
++++ nx-X11/config/imake/imake.c	2006-11-05 00:11:49.000000000 +0000
+@@ -974,7 +974,7 @@
+ static void
+ get_libc_version(FILE *inFile)
+ {
+-  char aout[] = "/tmp/imakeXXXXXX";
++  char aout[] = "./imakeXXXXXX";
+   FILE *fp;
+   const char *format = "%s -o %s -x c -";
+   char *cc;
diff --git a/net-misc/nx/files/1.5.0/nx-x11-1.5.0-xorg7-font-fix.patch b/net-misc/nx/files/1.5.0/nx-x11-1.5.0-xorg7-font-fix.patch
new file mode 100644
index 000000000000..cb270246b379
--- /dev/null
+++ b/net-misc/nx/files/1.5.0/nx-x11-1.5.0-xorg7-font-fix.patch
@@ -0,0 +1,424 @@
+diff -purN nx-X11.orig/lib/fontconfig/fonts.conf.in nx-X11/lib/fontconfig/fonts.conf.in
+--- nx-X11.orig/lib/fontconfig/fonts.conf.in	2002-10-03 17:06:28.000000000 -0500
++++ nx-X11/lib/fontconfig/fonts.conf.in	2006-03-21 08:15:22.000000000 -0600
+@@ -24,7 +24,7 @@
+   Common X11R6 font directories
+ -->
+ 
+-	<dir>/usr/X11R6/lib/X11/fonts</dir>
++	<dir>/usr/share/fonts</dir>
+  	<dir>/usr/share/fonts</dir>
+ 	<dir>~/.fonts</dir>
+ 
+diff -purN nx-X11.orig/lib/fontconfig/src/fontconfig.man nx-X11/lib/fontconfig/src/fontconfig.man
+--- nx-X11.orig/lib/fontconfig/src/fontconfig.man	2003-02-16 11:44:36.000000000 -0600
++++ nx-X11/lib/fontconfig/src/fontconfig.man	2006-03-21 08:15:22.000000000 -0600
+@@ -1352,8 +1352,8 @@ This is an example of a system-wide conf
+ <!-- 
+ 	Find fonts in these directories
+ -->
+-<dir>/usr/X11R6/lib/X11/fonts/truetype</dir>
+-<dir>/usr/X11R6/lib/X11/fonts/Type1</dir>
++<dir>/usr/share/fonts/truetype</dir>
++<dir>/usr/share/fonts/Type1</dir>
+ 
+ <!--
+ 	Accept deprecated 'mono' alias, replacing it with 'monospace'
+diff -purN nx-X11.orig/programs/Xserver/hw/nxagent/Font.c nx-X11/programs/Xserver/hw/nxagent/Font.c
+--- nx-X11.orig/programs/Xserver/hw/nxagent/Font.c	2005-12-12 10:51:51.000000000 -0600
++++ nx-X11/programs/Xserver/hw/nxagent/Font.c	2006-03-21 08:14:17.000000000 -0600
+@@ -60,13 +60,13 @@ is" without express or implied warranty.
+ #undef  TEST
+ #undef  DEBUG
+ 
+-#define NXAGENT_DEFAULT_FONT_DIR    "/usr/X11R6/lib/X11/fonts"
++#define NXAGENT_DEFAULT_FONT_DIR    "/usr/share/fonts"
+ #define NXAGENT_ALTERNATE_FONT_DIR  "/usr/share/X11/fonts"
+ 
+ #define NXAGENT_DEFAULT_FONT_PATH  \
+-"/usr/X11R6/lib/X11/fonts/misc/,/usr/X11R6/lib/X11/fonts/Speedo/,\
+-/usr/X11R6/lib/X11/fonts/Type1/,/usr/X11R6/lib/X11/fonts/75dpi/,\
+-/usr/X11R6/lib/X11/fonts/100dpi/,/usr/X11R6/lib/X11/fonts/TTF/"
++"/usr/share/fonts/misc/,/usr/share/fonts/Speedo/,\
++/usr/share/fonts/Type1/,/usr/share/fonts/75dpi/,\
++/usr/share/fonts/100dpi/,/usr/share/fonts/TTF/"
+ 
+ #define NXAGENT_ALTERNATE_FONT_PATH  \
+ "/usr/share/X11/fonts/misc/,/usr/share/X11/fonts/Speedo/,\
+@@ -1008,7 +1008,7 @@ void nxagentVerifyDefaultFontPath(void)
+           S_ISDIR(dirStat.st_mode) != 0)
+   {
+     /*
+-     * Let's use the old "/usr/X11R6/lib/X11/fonts" style.
++     * Let's use the old "/usr/share/fonts" style.
+      */
+ 
+     #ifdef TEST
+diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/doc/Install nx-X11/programs/Xserver/hw/xfree86/doc/Install
+--- nx-X11.orig/programs/Xserver/hw/xfree86/doc/Install	2003-02-24 23:29:10.000000000 -0600
++++ nx-X11/programs/Xserver/hw/xfree86/doc/Install	2006-03-21 08:14:26.000000000 -0600
+@@ -318,7 +318,7 @@ tion procedure for this case is as follo
+      chmod ug-w /usr/X11R6/lib           # Make sure the permissions are OK
+      /sbin/ldconfig /usr/X11R6/lib       # For Linux
+      /sbin/ldconfig -m /usr/X11R6/lib    # For FreeBSD, NetBSD, OpenBSD
+-     /usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc
++     /usr/X11R6/bin/mkfontdir /usr/share/fonts/misc
+ 
+ 4.2  Installing over an old installation
+ 
+@@ -378,7 +378,7 @@ Once that's done, the main part of the i
+      chmod ug-w /usr/X11R6/lib           # Make sure the permissions are OK
+      /sbin/ldconfig /usr/X11R6/lib       # For Linux
+      /sbin/ldconfig -m /usr/X11R6/lib    # For FreeBSD, NetBSD, OpenBSD
+-     /usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc
++     /usr/X11R6/bin/mkfontdir /usr/share/fonts/misc
+ 
+      Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml,v 1.17 2003/02/24 17:09:16 dawes Exp $
+ 
+diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/doc/Japanese/man/XF86Config.man nx-X11/programs/Xserver/hw/xfree86/doc/Japanese/man/XF86Config.man
+--- nx-X11.orig/programs/Xserver/hw/xfree86/doc/Japanese/man/XF86Config.man	1998-04-04 20:28:40.000000000 -0600
++++ nx-X11/programs/Xserver/hw/xfree86/doc/Japanese/man/XF86Config.man	2006-03-21 08:14:26.000000000 -0600
+@@ -99,16 +99,16 @@ EndSection
+ .\" X11R6 allows the X server to request fonts from a font server.  A
+ .\" font server is specified by placing a "<trans>/<hostname>:<port_number>"
+ .\" entry into the fontpath.  For example, the fontpath
+-.\" "/usr/X11R6/lib/X11/fonts/misc/,tcp/zok:7100" tells the X server
++.\" "/usr/share/fonts/misc/,tcp/zok:7100" tells the X server
+ .\" to first try to locate the font in the local directory
+-.\" /usr/X11R6/lib/X11/fonts/misc.  If that fails, then request the
++.\" /usr/share/fonts/misc.  If that fails, then request the
+ .\" font from the \fIfont server\fP running on machine zok listening
+ .\" for connections on TCP port number 7100.
+ X11R6 は X サーバがフォントサーバにフォントを要求することが可能
+ になりました。フォントサーバは場所を "<trans>/<hostname>:<port_number>"
+ とフォントパスに指定します。例えば、フォントパス
+-"/usr/X11R6/lib/X11/fonts/misc/,tcp/zok:7100" はまず最初にローカル
+-ディレクトリ /usr/X11R6/lib/X11/fonts/misc を X サーバに伝えます。
++"/usr/share/fonts/misc/,tcp/zok:7100" はまず最初にローカル
++ディレクトリ /usr/share/fonts/misc を X サーバに伝えます。
+ これが失敗したときに、ポート番号 7100 から TCP で接続して聞いて
+ (listening) いる zok というホストで動作している \fIフォントサーバ\fP 
+ にフォントを要求します。
+diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/doc/Japanese/sgml/RELNOTE.sgml nx-X11/programs/Xserver/hw/xfree86/doc/Japanese/sgml/RELNOTE.sgml
+--- nx-X11.orig/programs/Xserver/hw/xfree86/doc/Japanese/sgml/RELNOTE.sgml	1997-01-25 22:34:24.000000000 -0600
++++ nx-X11/programs/Xserver/hw/xfree86/doc/Japanese/sgml/RELNOTE.sgml	2006-03-21 08:14:26.000000000 -0600
+@@ -1372,7 +1372,7 @@ However, if you didn't install <tt>X312D
+ 3.1.2D (or are not sure if you installed it), you should run the following:
+ 
+ <tscreen><verb>
+-	/usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc
++	/usr/X11R6/bin/mkfontdir /usr/share/fonts/misc
+ </verb></tscreen>
+  
+ An up-to-date version of the xterm termcap and terminfo entries is
+diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/doc/README.SVR4 nx-X11/programs/Xserver/hw/xfree86/doc/README.SVR4
+--- nx-X11.orig/programs/Xserver/hw/xfree86/doc/README.SVR4	2000-02-29 19:48:14.000000000 -0600
++++ nx-X11/programs/Xserver/hw/xfree86/doc/README.SVR4	2006-03-21 08:14:27.000000000 -0600
+@@ -295,9 +295,9 @@ you need to do:
+                 for i in *pc???.bdf
+                 do
+                     /usr/X11R6/bin/bdftopcf $i > \
+-                          /usr/X11R6/lib/X11/fonts/misc/`basename $i .bdf`.pcf
++                          /usr/share/fonts/misc/`basename $i .bdf`.pcf
+                 done
+-                cd /usr/X11R6/lib/X11/fonts/misc
++                cd /usr/share/fonts/misc
+                 /usr/X11R6/bin/mkfontdir
+                 # Do this only if the server is already running.
+                 /usr/X11R6/bin/xset fp rehash
+diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/doc/README.fonts nx-X11/programs/Xserver/hw/xfree86/doc/README.fonts
+--- nx-X11.orig/programs/Xserver/hw/xfree86/doc/README.fonts	2003-01-19 22:10:02.000000000 -0600
++++ nx-X11/programs/Xserver/hw/xfree86/doc/README.fonts	2006-03-21 08:14:27.000000000 -0600
+@@ -253,7 +253,7 @@ CMap `UniKS-UCS2-H' is called
+ 
+ The CIDFont code in XFree86 requires a very rigid directory structure.  The
+ main directory must be called `CID' (its location defaults to
+-`/usr/X11R6/lib/X11/fonts/CID' but it may be located anywhere), and it should
++`/usr/share/fonts/CID' but it may be located anywhere), and it should
+ contain a subdirectory for every CID collection.  Every subdirectory must
+ contain subdirectories called CIDFont (containing the actual CIDFont files),
+ CMap (containing all the needed CMaps), AFM (containing the font metric
+@@ -398,7 +398,7 @@ dard fonts in a number of regional encod
+ 
+ For example, the font file
+ 
+-     /usr/X11R6/lib/X11/fonts/misc/6x13.bdf
++     /usr/share/fonts/misc/6x13.bdf
+ 
+ with XLFD
+ 
+@@ -442,7 +442,7 @@ The main ClearlyU font has the XLFD
+ 
+ and resides in the font file
+ 
+-     /usr/X11R6/lib/X11/fonts/misc/cu12.pcf.gz
++     /usr/share/fonts/misc/cu12.pcf.gz
+ 
+ Additional ClearlyU fonts include
+ 
+@@ -480,7 +480,7 @@ Standard Encoding.  These fonts have XLF
+ 
+ and reside in the font files
+ 
+-     /usr/X11R6/lib/X11/fonts/Type1/cour*.pfa
++     /usr/share/fonts/Type1/cour*.pfa
+ 
+ The Adobe Utopia set of fonts only cover ISO 8859-1 as well as Adobe Standard
+ Encoding.  These fonts have XLFD
+@@ -489,7 +489,7 @@ Encoding.  These fonts have XLFD
+ 
+ and reside in the font files
+ 
+-     /usr/X11R6/lib/X11/fonts/Type1/UT*.pfa
++     /usr/share/fonts/Type1/UT*.pfa
+ 
+ Finally, XFree86 also comes with Type 1 versions of Bitstream Courier and
+ Charter.  These fonts have XLFD
+@@ -499,7 +499,7 @@ Charter.  These fonts have XLFD
+ 
+ and reside in the font files
+ 
+-     /usr/X11R6/lib/X11/fonts/Type1/c*bt_.pfb
++     /usr/share/fonts/Type1/c*bt_.pfb
+ 
+ 3.3.2  Standard Speedo fonts
+ 
+@@ -515,7 +515,7 @@ XLFD name
+ 
+ and reside in the font files
+ 
+-     /usr/X11R6/lib/X11/fonts/Speedo/font*.spd
++     /usr/share/fonts/Speedo/font*.spd
+ 
+ 3.4  The Bigelow & Holmes Luxi family
+ 
+@@ -699,7 +699,7 @@ The Speedo backend limits all encodings 
+ In order to use a font in an encoding that the font backend does not know
+ about, you need to have an `encodings.dir' file either in the same directory
+ as the font file used or in a system-wide location
+-(`/usr/X11R6/lib/X11/fonts/encodings/' by default).
++(`/usr/share/fonts/encodings/' by default).
+ 
+ The `encodings.dir' file has a similar format to `fonts.dir'.  Its first line
+ specifies the number of encodings, while every successive line has two
+@@ -709,9 +709,9 @@ should agree with the encoding name defi
+ ple,
+ 
+      3
+-     mulearabic-0 /usr/X11R6/lib/X11/fonts/encodings/mulearabic-0.enc
+-     mulearabic-1 /usr/X11R6/lib/X11/fonts/encodings/mulearabic-1.enc
+-     mulearabic-2 /usr/X11R6/lib/X11/fonts/encodings/mulearabic-2.enc
++     mulearabic-0 /usr/share/fonts/encodings/mulearabic-0.enc
++     mulearabic-1 /usr/share/fonts/encodings/mulearabic-1.enc
++     mulearabic-2 /usr/share/fonts/encodings/mulearabic-2.enc
+ 
+ The name of an encoding must be specified in the encoding file's `STARTENCOD-
+ ING' or `ALIAS' line.  It is not enough to create an `encodings.dir' entry.
+diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml nx-X11/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml
+--- nx-X11.orig/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml	2003-02-24 11:09:16.000000000 -0600
++++ nx-X11/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml	2006-03-21 08:14:26.000000000 -0600
+@@ -432,7 +432,7 @@ ln -s /etc/X11/xserver /usr/X11R6/lib/X1
+ chmod ug-w /usr/X11R6/lib           # Make sure the permissions are OK
+ /sbin/ldconfig /usr/X11R6/lib       # For Linux
+ /sbin/ldconfig -m /usr/X11R6/lib    # For FreeBSD, NetBSD, OpenBSD
+-/usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc
++/usr/X11R6/bin/mkfontdir /usr/share/fonts/misc
+ </verb></tscreen>
+ 
+ <sect1>Installing over an old installation
+@@ -511,7 +511,7 @@ Once that's done, the main part of the i
+ chmod ug-w /usr/X11R6/lib           # Make sure the permissions are OK
+ /sbin/ldconfig /usr/X11R6/lib       # For Linux
+ /sbin/ldconfig -m /usr/X11R6/lib    # For FreeBSD, NetBSD, OpenBSD
+-/usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc
++/usr/X11R6/bin/mkfontdir /usr/share/fonts/misc
+ </verb></tscreen>
+ 
+ ]]>
+diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml nx-X11/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml
+--- nx-X11.orig/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml	1999-08-23 01:38:52.000000000 -0500
++++ nx-X11/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml	2006-03-21 08:14:26.000000000 -0600
+@@ -328,9 +328,9 @@ things you need to do:
+ 	for i in *pc???.bdf
+ 	do
+ 	    /usr/X11R6/bin/bdftopcf $i > \
+-			/usr/X11R6/lib/X11/fonts/misc/`basename $i .bdf`.pcf
++			/usr/share/fonts/misc/`basename $i .bdf`.pcf
+ 	done
+-	cd /usr/X11R6/lib/X11/fonts/misc
++	cd /usr/share/fonts/misc
+ 	/usr/X11R6/bin/mkfontdir
+ 	# Do this only if the server is already running.
+ 	/usr/X11R6/bin/xset fp rehash
+diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml nx-X11/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml
+--- nx-X11.orig/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml	2003-01-19 21:43:08.000000000 -0600
++++ nx-X11/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml	2006-03-21 08:14:26.000000000 -0600
+@@ -296,7 +296,7 @@ Munhwa-Regular--UniKS-UCS2-H
+ 
+ The CIDFont code in XFree86 requires a very rigid directory
+ structure.  The main directory must be called `<tt/CID/' (its location
+-defaults to `<tt>/usr/X11R6/lib/X11/fonts/CID</tt>' but it may be
++defaults to `<tt>/usr/share/fonts/CID</tt>' but it may be
+ located anywhere), and it should contain a subdirectory for every CID
+ collection.  Every subdirectory <it/must/ contain subdirectories
+ called <tt/CIDFont/ (containing the actual CIDFont files), <tt/CMap/
+@@ -457,7 +457,7 @@ with no duplication of work.
+ 
+ For example, the font file
+ <tscreen><verb>
+-/usr/X11R6/lib/X11/fonts/misc/6x13.bdf
++/usr/share/fonts/misc/6x13.bdf
+ </verb></tscreen>
+ with XLFD
+ <tscreen><verb>
+@@ -502,7 +502,7 @@ The main ClearlyU font has the XLFD
+ </verb></tscreen>
+ and resides in the font file
+ <tscreen><verb>
+-/usr/X11R6/lib/X11/fonts/misc/cu12.pcf.gz 
++/usr/share/fonts/misc/cu12.pcf.gz 
+ </verb></tscreen>
+ Additional ClearlyU fonts include
+ <tscreen><verb>
+@@ -542,7 +542,7 @@ XLFD
+ </verb></tscreen>
+ and reside in the font files
+ <tscreen><verb>
+-/usr/X11R6/lib/X11/fonts/Type1/cour*.pfa
++/usr/share/fonts/Type1/cour*.pfa
+ </verb></tscreen>
+ 
+ The Adobe Utopia set of fonts only cover ISO&nbsp;8859-1 as well as
+@@ -552,7 +552,7 @@ Adobe Standard Encoding.  These fonts ha
+ </verb></tscreen>
+ and reside in the font files
+ <tscreen><verb>
+-/usr/X11R6/lib/X11/fonts/Type1/UT*.pfa
++/usr/share/fonts/Type1/UT*.pfa
+ </verb></tscreen>
+ 
+ Finally, XFree86 also comes with Type&nbsp;1 versions of Bitstream
+@@ -563,7 +563,7 @@ Courier and Charter.  These fonts have X
+ </verb></tscreen>
+ and reside in the font files
+ <tscreen><verb>
+-/usr/X11R6/lib/X11/fonts/Type1/c*bt_.pfb
++/usr/share/fonts/Type1/c*bt_.pfb
+ </verb></tscreen>
+ 
+ <sect2>Standard Speedo fonts
+@@ -581,7 +581,7 @@ ISO&nbsp;8859-2.  They have XLFD name
+ </verb></tscreen>
+ and reside in the font files
+ <tscreen><verb>
+-/usr/X11R6/lib/X11/fonts/Speedo/font*.spd
++/usr/share/fonts/Speedo/font*.spd
+ </verb></tscreen>
+ 
+ <sect1>The Bigelow &amp; Holmes Luxi family
+@@ -770,7 +770,7 @@ The Speedo backend limits all encodings 
+ <p>In order to use a font in an encoding that the font backend does
+ not know about, you need to have an `<tt/encodings.dir/' file either
+ in the same directory as the font file used or in a system-wide
+-location (`<tt>/usr/X11R6/lib/X11/fonts/encodings/</tt>' by default).
++location (`<tt>/usr/share/fonts/encodings/</tt>' by default).
+ 
+ The `<tt/encodings.dir/' file has a similar format to
+ `<tt/fonts.dir/'.  Its first line specifies the number of encodings,
+@@ -781,9 +781,9 @@ encoding name defined in the encoding fi
+ 
+ <tscreen><verb>
+ 3
+-mulearabic-0 /usr/X11R6/lib/X11/fonts/encodings/mulearabic-0.enc
+-mulearabic-1 /usr/X11R6/lib/X11/fonts/encodings/mulearabic-1.enc
+-mulearabic-2 /usr/X11R6/lib/X11/fonts/encodings/mulearabic-2.enc
++mulearabic-0 /usr/share/fonts/encodings/mulearabic-0.enc
++mulearabic-1 /usr/share/fonts/encodings/mulearabic-1.enc
++mulearabic-2 /usr/share/fonts/encodings/mulearabic-2.enc
+ </verb></tscreen>
+ 
+ The name of an encoding <it/must/ be specified in the encoding file's
+diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/drivers/newport/XF86Config.indy nx-X11/programs/Xserver/hw/xfree86/drivers/newport/XF86Config.indy
+--- nx-X11.orig/programs/Xserver/hw/xfree86/drivers/newport/XF86Config.indy	2003-02-19 22:05:16.000000000 -0600
++++ nx-X11/programs/Xserver/hw/xfree86/drivers/newport/XF86Config.indy	2006-03-21 08:14:34.000000000 -0600
+@@ -52,15 +52,15 @@ Section "Files"
+ # as well as specifying multiple comma-separated entries in one FontPath
+ # command (or a combination of both methods)
+ 
+-    FontPath	"/usr/X11R6/lib/X11/fonts/local/"
+-    FontPath	"/usr/X11R6/lib/X11/fonts/misc/"
+-    FontPath	"/usr/X11R6/lib/X11/fonts/75dpi/:unscaled"
+-    FontPath	"/usr/X11R6/lib/X11/fonts/100dpi/:unscaled"
+-    FontPath	"/usr/X11R6/lib/X11/fonts/Type1/"
+-    FontPath	"/usr/X11R6/lib/X11/fonts/CID/"
+-    FontPath	"/usr/X11R6/lib/X11/fonts/Speedo/"
+-    FontPath	"/usr/X11R6/lib/X11/fonts/75dpi/"
+-    FontPath	"/usr/X11R6/lib/X11/fonts/100dpi/"
++    FontPath	"/usr/share/fonts/local/"
++    FontPath	"/usr/share/fonts/misc/"
++    FontPath	"/usr/share/fonts/75dpi/:unscaled"
++    FontPath	"/usr/share/fonts/100dpi/:unscaled"
++    FontPath	"/usr/share/fonts/Type1/"
++    FontPath	"/usr/share/fonts/CID/"
++    FontPath	"/usr/share/fonts/Speedo/"
++    FontPath	"/usr/share/fonts/75dpi/"
++    FontPath	"/usr/share/fonts/100dpi/"
+ 
+ # ModulePath can be used to set a search path for the X server modules.
+ # The default path is shown here.
+diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/etc/install.sv3 nx-X11/programs/Xserver/hw/xfree86/etc/install.sv3
+--- nx-X11.orig/programs/Xserver/hw/xfree86/etc/install.sv3	1999-03-28 09:32:52.000000000 -0600
++++ nx-X11/programs/Xserver/hw/xfree86/etc/install.sv3	2006-03-21 08:14:25.000000000 -0600
+@@ -549,9 +549,9 @@ then
+     read answer
+     [ "$answer" = "y" -o "$answer" = "Y" ] && {
+     sed -e 's/FONT 8x16/FONT vga/' </usr/lib/loadfont/vga437.bdf \
+-    | bdftopcf -t >/usr/X11R6/lib/X11/fonts/misc/vga.pcf
+-    chmod 644 /usr/X11R6/lib/X11/fonts/misc/fonts.dir
+-    mkfontdir /usr/X11R6/lib/X11/fonts/misc
++    | bdftopcf -t >/usr/share/fonts/misc/vga.pcf
++    chmod 644 /usr/share/fonts/misc/fonts.dir
++    mkfontdir /usr/share/fonts/misc
+     }
+ fi
+ }
+diff -purN nx-X11.orig/programs/mkcfm/mkcfm.c nx-X11/programs/mkcfm/mkcfm.c
+--- nx-X11.orig/programs/mkcfm/mkcfm.c	2002-12-09 11:30:12.000000000 -0600
++++ nx-X11/programs/mkcfm/mkcfm.c	2006-03-21 08:14:10.000000000 -0600
+@@ -48,7 +48,7 @@
+ static void CIDFillVals(FontScalablePtr);
+ static Bool DoDirectory(char *dirName);
+  
+-#define DEFAULTCID "/usr/X11R6/lib/X11/fonts/CID"
++#define DEFAULTCID "/usr/share/fonts/CID"
+ #define DECIPOINTSPERINCH 722.7
+ #define DEFAULTRES 75
+ #define DEFAULTPOINTSIZE 120
+diff -purN nx-X11.orig/programs/mkcfm/mkcfm.man nx-X11/programs/mkcfm/mkcfm.man
+--- nx-X11.orig/programs/mkcfm/mkcfm.man	1999-05-15 07:10:38.000000000 -0500
++++ nx-X11/programs/mkcfm/mkcfm.man	2006-03-21 08:14:10.000000000 -0600
+@@ -24,7 +24,7 @@ mkcfm - create summaries of font metric 
+ [\fICID-font-directory-name\fP]
+ .SH DESCRIPTION
+ There is usually only one CID font directory on the X font path. It is
+-usually called \fI/usr/X11R6/lib/X11/fonts/CID\fP. If you do not specify
++usually called \fI/usr/share/fonts/CID\fP. If you do not specify
+ an argument, \fImkcfm\fP will try to go through the subdirectories of
+ that directory, and create one summary of font metric files for each
+ CIDFont (character descriptions) file and each CMap (Character Maps) file
+diff -purN nx-X11.orig/programs/xfs/xfs.man nx-X11/programs/xfs/xfs.man
+--- nx-X11.orig/programs/xfs/xfs.man	2001-12-14 14:01:32.000000000 -0600
++++ nx-X11/programs/xfs/xfs.man	2006-03-21 08:14:56.000000000 -0600
+@@ -186,9 +186,9 @@ XCOMM where to look for fonts
+ XCOMM the first is a set of Speedo outlines, the second is a set of 
+ XCOMM misc bitmaps and the last is a set of 100dpi bitmaps
+ XCOMM
+-catalogue = /usr/X11R6/lib/X11/fonts/speedo,
+-	/usr/X11R6/lib/X11/fonts/misc,
+-	/usr/X11R6/lib/X11/fonts/100dpi/
++catalogue = /usr/share/fonts/speedo,
++	/usr/share/fonts/misc,
++	/usr/share/fonts/100dpi/
+ 
+ XCOMM in 12 points, decipoints
+ default-point-size = 120
diff --git a/net-misc/nx/files/1.5.0/nx-x11-windows-linux-resume.patch b/net-misc/nx/files/1.5.0/nx-x11-windows-linux-resume.patch
new file mode 100644
index 000000000000..97b248588846
--- /dev/null
+++ b/net-misc/nx/files/1.5.0/nx-x11-windows-linux-resume.patch
@@ -0,0 +1,37 @@
+--- nx-X11/programs/Xserver/hw/nxagent/Display.c.orig	2005-07-29 09:01:11.000000000 -0700
++++ nx-X11/programs/Xserver/hw/nxagent/Display.c	2005-07-30 07:16:06.000000000 -0700
+@@ -1531,11 +1531,12 @@
+   reconnectDisplayState = NOTHING;
+ }
+ 
++#define WARNING
+ static Bool reloadVisuals(int flexibility)
+ {
+   int i, nitems;
+   XVisualInfo *newVisuals, *vi;
+-  unsigned long mask = VisualAllMask & ~VisualIDMask;
++  unsigned long mask = VisualAllMask & ~VisualIDMask & ~VisualBitsPerRGBMask;
+ 
+   newVisuals = malloc(sizeof(XVisualInfo) * nxagentNumVisuals);
+ 
+@@ -1577,6 +1578,10 @@
+     }
+   }
+ 
++        #ifdef WARNING
++        fprintf(stderr, "matched for %d visuals and found %d matching\n", nxagentNumVisuals,i);
++        #endif
++
+   if (i == nxagentNumVisuals)
+   {
+     nxagentVisuals = newVisuals;
+--- nx-X11/programs/Xserver/hw/nxagent/Visual.c.orig	2005-07-30 07:17:40.000000000 -0700
++++ nx-X11/programs/Xserver/hw/nxagent/Visual.c	2005-07-30 07:17:44.000000000 -0700
+@@ -48,7 +48,6 @@
+   for (i = 0; i < nxagentNumVisuals; i++)
+   {
+     if (pVisual->class == nxagentVisuals[i].class &&
+-        pVisual->bitsPerRGBValue == nxagentVisuals[i].bits_per_rgb &&
+         pVisual->ColormapEntries == nxagentVisuals[i].colormap_size &&
+         pVisual->nplanes == nxagentVisuals[i].depth &&
+         pVisual->redMask == nxagentVisuals[i].red_mask &&
diff --git a/net-misc/nx/files/1.5.0/nxcomp-1.5.0-gcc4.patch b/net-misc/nx/files/1.5.0/nxcomp-1.5.0-gcc4.patch
new file mode 100644
index 000000000000..96da04209118
--- /dev/null
+++ b/net-misc/nx/files/1.5.0/nxcomp-1.5.0-gcc4.patch
@@ -0,0 +1,12 @@
+--- nxcomp/RenderExtension.h.orig       2005-02-19 18:23:32.000000000 +0000
++++ nxcomp/RenderExtension.h    2005-08-27 23:16:05.000000000 +0100
+@@ -68,6 +68,8 @@
+ // The message class.
+ //
+
++class RenderMinorExtensionStore;
++
+ class RenderExtensionMessage : public Message
+ {
+   friend class RenderExtensionStore;
+
diff --git a/net-misc/nx/files/1.5.0/nxcomp-1.5.0-pic.patch b/net-misc/nx/files/1.5.0/nxcomp-1.5.0-pic.patch
new file mode 100644
index 000000000000..2ccaf978dd09
--- /dev/null
+++ b/net-misc/nx/files/1.5.0/nxcomp-1.5.0-pic.patch
@@ -0,0 +1,20 @@
+--- nxcomp/Makefile.in.agriffis	2005-11-12 12:48:42.000000000 -0500
++++ nxcomp/Makefile.in	2005-12-15 12:24:46.000000000 -0500
+@@ -32,7 +32,7 @@
+ 
+ CXX         = @CXX@
+ CXXFLAGS    = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \
+-              -Wall -Wpointer-arith
++              -Wall -Wpointer-arith -fPIC
+ CXXINCLUDES =
+ CXXDEFINES  =
+ 
+@@ -42,7 +42,7 @@
+ 
+ CC          = @CC@
+ CCFLAGS     = @CFLAGS@ @X_CFLAGS@ @DEFS@ \
+-              -Wall -Wpointer-arith
++              -Wall -Wpointer-arith -fPIC
+ CCINCLUDES  =
+ CCDEFINES   =
+ 
diff --git a/net-misc/nx/files/1.5.0/nxwrapper b/net-misc/nx/files/1.5.0/nxwrapper
new file mode 100644
index 000000000000..b93407b78702
--- /dev/null
+++ b/net-misc/nx/files/1.5.0/nxwrapper
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+NXCOMMAND=$(basename $0)
+
+export LD_LIBRARY_PATH=/usr/lib/NX/lib:$LD_LIBRARY_PATH
+exec /usr/lib/NX/bin/$NXCOMMAND ${1+"$@"}
+
diff --git a/net-misc/nx/files/digest-nx-1.5.0 b/net-misc/nx/files/digest-nx-1.5.0
new file mode 100644
index 000000000000..7eac0e183b7b
--- /dev/null
+++ b/net-misc/nx/files/digest-nx-1.5.0
@@ -0,0 +1,24 @@
+MD5 11877c3357732a957e3bf7e3d2f2ca0a nx-X11-1.5.0-21.tar.gz 32390668
+RMD160 adaf757f20c59d39c2700f9082e414eefdc2c62f nx-X11-1.5.0-21.tar.gz 32390668
+SHA256 075570e59aa749fe4f11fca6ebf7579e5785b24b89cb8c62a368f4e2fe7d9123 nx-X11-1.5.0-21.tar.gz 32390668
+MD5 160726ed67698a9694b707950c49e19e nxagent-1.5.0-112.tar.gz 818946
+RMD160 a0c3f5cd8f459ba46c3bb1161a2330df2589351d nxagent-1.5.0-112.tar.gz 818946
+SHA256 f6008505a38cf6f3f7c06b0e97cbf0309c5f43dff99a21fd610a592c4326755d nxagent-1.5.0-112.tar.gz 818946
+MD5 a7c5e68e9678cb5c722c334b33baf660 nxauth-1.5.0-1.tar.gz 23077
+RMD160 53c14a8195a39ecc7a1ea4151214921a6148ed41 nxauth-1.5.0-1.tar.gz 23077
+SHA256 42549f5767627378653d11f1d16d7334a6e08f3b1ecdd5edd0188aaaa7c36e4d nxauth-1.5.0-1.tar.gz 23077
+MD5 782f04870142c9fc5b2e1f654fd0a5d7 nxcomp-1.5.0-80.tar.gz 525688
+RMD160 7a367ef235c50c143b4a25cd78aedd9fe83c8772 nxcomp-1.5.0-80.tar.gz 525688
+SHA256 2a93eb6c32436028b11b8b5ef5be58a7138bc14cefb68e74b96cc7049f5a0367 nxcomp-1.5.0-80.tar.gz 525688
+MD5 6a5b8b79b9e0cc81b88233b18c4f227f nxcompext-1.5.0-20.tar.gz 124036
+RMD160 4c7bfe55df09e4726eadb2498e94475a059aac7f nxcompext-1.5.0-20.tar.gz 124036
+SHA256 468944ea3e605468a032dd56c58570029a56c489a60b504b3cd16018f6ccb760 nxcompext-1.5.0-20.tar.gz 124036
+MD5 6c20c1300ca6b4d362237ef44cfee7f7 nxdesktop-1.5.0-78.tar.gz 201893
+RMD160 15ee898cbfd2fa02c2259f90ca5383657759fd41 nxdesktop-1.5.0-78.tar.gz 201893
+SHA256 5f35aecf1cc12940d0a00afe19879278bc886c7fd3ab70b8b779f3cfcd324719 nxdesktop-1.5.0-78.tar.gz 201893
+MD5 d2e3c1a109db336dfa497f4c2004f2d5 nxproxy-1.5.0-9.tar.gz 73470
+RMD160 e6104a85893b28453b3e4f96cfa7b1c193dca6b6 nxproxy-1.5.0-9.tar.gz 73470
+SHA256 33227370c90cdb5e65824001255f4df5a20eecff19f75483df21bf55ab888d4a nxproxy-1.5.0-9.tar.gz 73470
+MD5 ff3e5a4c1601b58f5fc405f990691bdf nxviewer-1.5.0-15.tar.gz 86414
+RMD160 c13a693a6b528f2d5703d38ac22b390439ae691c nxviewer-1.5.0-15.tar.gz 86414
+SHA256 31d05d083b591a22bacbd4407cfec717116756eb2e0ba327b74a209f5eb09b56 nxviewer-1.5.0-15.tar.gz 86414
diff --git a/net-misc/nx/metadata.xml b/net-misc/nx/metadata.xml
new file mode 100644
index 000000000000..1c1b39051824
--- /dev/null
+++ b/net-misc/nx/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>nx</herd>
+<maintainer>
+  <email>stuart@gentoo.org</email>
+  <name>Stuart Herbert</name>
+  <description>Maintainer</description> 
+</maintainer>
+<longdescription>Special versions of the X11 libraries to support NX compression</longdescription>
+</pkgmetadata>
diff --git a/net-misc/nx/nx-1.5.0.ebuild b/net-misc/nx/nx-1.5.0.ebuild
new file mode 100644
index 000000000000..ba1a4bcc39d2
--- /dev/null
+++ b/net-misc/nx/nx-1.5.0.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-1.5.0.ebuild,v 1.1 2006/11/08 21:27:10 stuart Exp $
+
+inherit eutils
+
+DESCRIPTION="A special version of the X11 libraries supporting NX compression technology"
+HOMEPAGE="http://www.nomachine.com/developers.php"
+
+URI_BASE="http://web04.nomachine.com/download/1.5.0/sources"
+SRC_NX_X11="nx-X11-$PV-21.tar.gz"
+SRC_NXAGENT="nxagent-$PV-112.tar.gz"
+SRC_NXAUTH="nxauth-$PV-1.tar.gz"
+SRC_NXCOMP="nxcomp-$PV-80.tar.gz"
+SRC_NXCOMPEXT="nxcompext-$PV-20.tar.gz"
+SRC_NXDESKTOP="nxdesktop-$PV-78.tar.gz"
+SRC_NXVIEWER="nxviewer-$PV-15.tar.gz"
+SRC_NXPROXY="nxproxy-$PV-9.tar.gz"
+
+SRC_URI="$URI_BASE/$SRC_NX_X11 $URI_BASE/$SRC_NXAGENT $URI_BASE/$SRC_NXPROXY
+	$URI_BASE/$SRC_NXAUTH $URI_BASE/$SRC_NXCOMPEXT $URI_BASE/$SRC_NXCOMP
+	rdesktop? ( $URI_BASE/$SRC_NXDESKTOP )
+	vnc? ( $URI_BASE/$SRC_NXVIEWER )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="rdesktop vnc"
+
+RDEPEND="|| ( ( x11-libs/libX11
+				x11-libs/libFS
+				x11-libs/libXvMC
+				x11-libs/libICE
+				x11-libs/libXmu
+				x11-libs/libXdmcp
+				x11-libs/libSM
+				x11-libs/libXt
+				x11-libs/libXau
+				x11-libs/libXaw
+				x11-libs/libXp
+				x11-libs/libXpm
+				x11-libs/libXext
+				dev-libs/openssl
+				media-libs/mesa
+			)
+			virtual/x11
+		)
+		>=media-libs/jpeg-6b-r4
+		>=media-libs/libpng-1.2.8
+		>=sys-libs/zlib-1.2.3
+		virtual/libc"
+
+DEPEND="${RDEPEND}
+		|| ( ( x11-proto/xproto
+				x11-proto/xf86vidmodeproto
+				x11-proto/glproto
+				x11-proto/videoproto
+				x11-proto/xextproto
+				x11-proto/fontsproto
+
+				x11-misc/gccmakedep
+				x11-misc/imake
+
+				app-text/rman
+			)
+			virtual/x11
+		)
+		app-text/rman
+		!net-misc/nx-x11
+		!net-misc/nx-x11-bin
+		!net-misc/nxcomp
+		!net-misc/nxproxy
+		!net-misc/nxssh
+		"
+S=${WORKDIR}/${PN//x11/X11}
+
+src_unpack() {
+	# we can't use ${A} because of bug #61977
+	unpack ${SRC_NX_X11}
+	unpack ${SRC_NXAGENT}
+	unpack ${SRC_NXAUTH}
+	unpack ${SRC_NXCOMPEXT}
+	unpack ${SRC_NXCOMP}
+	unpack ${SRC_NXPROXY}
+	use rdesktop && unpack ${SRC_NXDESKTOP}
+	use vnc && unpack ${SRC_NXVIEWER}
+
+	cd ${S}
+	epatch ${FILESDIR}/1.5.0/nx-x11-windows-linux-resume.patch
+	epatch ${FILESDIR}/1.5.0/nx-x11-1.5.0-plastik-render-fix.patch
+	epatch ${FILESDIR}/1.5.0/nx-x11-1.5.0-xorg7-font-fix.patch
+	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
+
+	cd ${WORKDIR}/nxcomp
+	epatch ${FILESDIR}/1.5.0/nxcomp-1.5.0-pic.patch
+	epatch ${FILESDIR}/1.5.0/nxcomp-1.5.0-gcc4.patch
+}
+
+src_compile() {
+	cd ${WORKDIR}/nxcomp || die
+	./configure || die
+	emake || die
+
+	cd ${WORKDIR}/nxproxy || die
+	./configure || die
+	emake || die
+
+	cd ${WORKDIR}/nx-X11 || die
+	emake World || die
+
+	cd ${WORKDIR}/nxcompext || die
+	./configure || die
+	emake || die
+
+	if use vnc ; then
+		cd ${WORKDIR}/nxviewer || die
+		xmkmf -a || die
+		emake World || die
+	fi
+
+	if use rdesktop ; then
+		cd ${WORKDIR}/nxdesktop || die
+		./configure || die
+		emake || die
+	fi
+}
+
+src_install() {
+	newbin ${FILESDIR}/1.5.0/nxwrapper nxagent || die
+	newbin ${FILESDIR}/1.5.0/nxwrapper nxauth  || die
+	newbin ${FILESDIR}/1.5.0/nxwrapper nxproxy || die
+	if use vnc ; then
+		newbin ${FILESDIR}/1.5.0/nxwrapper nxviewer || die
+		newbin ${FILESDIR}/1.5.0/nxwrapper nxpasswd || die
+	fi
+	if use rdesktop ; then
+		newbin ${FILESDIR}/1.5.0/nxwrapper nxdesktop || die
+	fi
+
+	into /usr/lib/NX
+	dobin ${WORKDIR}/nx-X11/programs/Xserver/nxagent || die
+	dobin ${WORKDIR}/nx-X11/programs/nxauth/nxauth || die
+	dobin ${WORKDIR}/nxproxy/nxproxy || die
+
+	if use vnc ; then
+		dobin ${WORKDIR}/nxviewer/nxviewer/nxviewer || die
+		dobin ${WORKDIR}/nxviewer/nxpasswd/nxpasswd || die
+	fi
+
+	if use rdesktop ; then
+		dobin ${WORKDIR}/nxdesktop/nxdesktop || die
+	fi
+
+	dolib.so ${WORKDIR}/nx-X11/lib/X11/libX11.so* || die
+	dolib.so ${WORKDIR}/nx-X11/lib/Xext/libXext.so* || die
+	dolib.so ${WORKDIR}/nx-X11/lib/Xrender/libXrender.so* || die
+	dolib.so ${WORKDIR}/nxcomp/libXcomp.so* || die
+	dolib.so ${WORKDIR}/nxcompext/libXcompext.so* || die
+}