Sync from nx overlay

Package-Manager: portage-2.0.54

13 files changed, 754 insertions, 137 deletions

diff --git a/net-misc/nx-x11/ChangeLog b/net-misc/nx-x11/ChangeLog
index a5d634e4794c..b6069da55be2 100644
--- a/net-misc/nx-x11/ChangeLog
+++ b/net-misc/nx-x11/ChangeLog
@@ -1,6 +1,47 @@
 # ChangeLog for net-misc/nx-x11
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/ChangeLog,v 1.12 2006/03/05 13:21:33 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/ChangeLog,v 1.13 2006/04/30 17:16:01 stuart Exp $
+
+*nx-x11-1.5.0-r8 (30 Apr 2006)
+
+  30 Apr 2006; Stuart Herbert <stuart@gentoo.org>
+  -files/1.5.0/nxcomp-gcc4.patch,
+  +files/1.5.0/nxcompext-1.5.0-nxcomp-fix.patch,
+  +files/1.5.0/nxdesktop-1.5.0-nxcomp-fix.patch,
+  +files/1.5.0/nxviewer-1.5.0-nxcomp-fix.patch,
+  +files/1.5.0/nx-x11-1.5.0-plastik-render-fix.patch, -files/1.5.0/50nx-x11,
+  +files/1.5.0/nx-x11-1.5.0-nxcomp-fix.patch,
+  +files/1.5.0/nx-x11-1.5.0-xorg7-font-fix.patch, -nx-x11-1.5.0-r5.ebuild,
+  +nx-x11-1.5.0-r8.ebuild:
+  Huge thanks to Jon Scruggs for all of the following changes:
+  
+  * Changed the download load address
+  * removed nxesd from the list of files to download, unpack, and install.
+  (Moved
+  to it's own ebuild) (Thanks to Jon Severinsson for suggesting that)
+  * Cleaned up the dependency list
+  * Added two use flags: rdesktop and vnc to control building of those
+  components
+  only if the user needs them.
+  * Added in the plastik render fix patch to fix the redraw issue when resuming
+  and using the plastix window decoration (Thanks to Eike Hein)
+  * Added in the nxcomp pic patch to ad the -fPIC compile flag
+  * nxcomp and nxesd are no longer installed by this ebuild. Be careful when
+  updating to make sure nxcomp and nxesd components are not uninstalled. To be
+  on the safe side emerge nxcomp nxesd again. :)
+  * Cleaned up the install code.
+  * Added xorg 7 font directory fix. #123449
+  * Removed "dodir /var/lib/nxserver"
+  * Added a depend option to not include nx-x11-bin
+  * I was able to remove nxcomp completely from the ebuild and remove it from
+  being compiled by nx-x11. This means that nxcomp is no longer compiled twice.
+  This saves timne and is much better, imho.
+  * Added option to block all previous versions so that the new install won't
+  delete the needed nxcomp files. :) This is really important.
+
+  05 Mar 2006; Stuart Herbert <stuart@gentoo.org> nx-x11-1.5.0-r5.ebuild:
+  Re-use already compiled libXcomp from nxcomp-1.5 package; thanks to Jon
+  Severinsson <jon@severinsson.net> for the patch
 
 *nx-x11-1.5.0-r5 (05 Mar 2006)
 
diff --git a/net-misc/nx-x11/Manifest b/net-misc/nx-x11/Manifest
index ed54b1479689..12f9be48b213 100644
--- a/net-misc/nx-x11/Manifest
+++ b/net-misc/nx-x11/Manifest
@@ -1,13 +1,17 @@
-MD5 775fd205558083b0dc7450d32ad4c36b ChangeLog 2372
-MD5 a2e15c37686ddad8dd3854b2b9b70700 files/1.5.0/50nx-x11 57
+MD5 e96a4e910a0b5f30e367ebf23ac99b91 ChangeLog 4391
+MD5 1b2af928e4694faf7b78f267bd670f61 files/1.5.0/nx-x11-1.5.0-nxcomp-fix.patch 3479
+MD5 196a4104b3be214d69bc1a9ef841597c files/1.5.0/nx-x11-1.5.0-plastik-render-fix.patch 694
+MD5 5895e099c63cb7b52258ccc29814d9b8 files/1.5.0/nx-x11-1.5.0-xorg7-font-fix.patch 19674
 MD5 24e6e57f80b89abab29d9e19128d8353 files/1.5.0/nx-x11-windows-linux-resume.patch 1355
-MD5 cf67a8d2074fa0a92afa2be056b537e2 files/1.5.0/nxcomp-gcc4.patch 315
+MD5 ee6c1d91c7ece709afefb215707c9c59 files/1.5.0/nxcompext-1.5.0-nxcomp-fix.patch 900
+MD5 b9f8022ade3c7576a7dc3e7286d7fed0 files/1.5.0/nxdesktop-1.5.0-nxcomp-fix.patch 1233
+MD5 128d5c3ea98630a520fcce1e194f1af5 files/1.5.0/nxviewer-1.5.0-nxcomp-fix.patch 647
 MD5 b1b175fda7a68efc0ea21ac829c6449c files/digest-nx-x11-1.4.0-r3 539
 MD5 bf8eb265e3f2cd6cf59883917c7ba833 files/digest-nx-x11-1.4.0-r4 540
-MD5 5cd268cce9fa3af2c378d17876402d9a files/digest-nx-x11-1.5.0-r5 543
+MD5 2d2915546efeae4ee981440403e903b4 files/digest-nx-x11-1.5.0-r8 411
 MD5 a9b28f3b18188232c59a035fb2f0812b files/nx-x11-1.4.0-gcc4.patch 384
 MD5 d2caae40bdf5748d68ca46ad1d0ec951 files/nx-x11-1.4.0.xprint.patch 341
 MD5 77fd36d93b0a1b9f35abbe6a1c146561 metadata.xml 482
 MD5 dd061df9cf4e99f32835ce0c74fc024e nx-x11-1.4.0-r3.ebuild 2847
 MD5 02c0cb9a393c005800a850130c417b22 nx-x11-1.4.0-r4.ebuild 2917
-MD5 4e2861a082a95c596fdb4c1d08714bd6 nx-x11-1.5.0-r5.ebuild 2746
+MD5 6a9ab59eacc5b2748bd4085686b456e1 nx-x11-1.5.0-r8.ebuild 2620
diff --git a/net-misc/nx-x11/files/1.5.0/50nx-x11 b/net-misc/nx-x11/files/1.5.0/50nx-x11
deleted file mode 100644
index 3549ed81565b..000000000000
--- a/net-misc/nx-x11/files/1.5.0/50nx-x11
+++ /dev/null
@@ -1,3 +0,0 @@
-PATH=/usr/NX/bin
-ROOTPATH=/usr/NX/bin
-LDPATH=/usr/NX/lib
diff --git a/net-misc/nx-x11/files/1.5.0/nx-x11-1.5.0-nxcomp-fix.patch b/net-misc/nx-x11/files/1.5.0/nx-x11-1.5.0-nxcomp-fix.patch
new file mode 100644
index 000000000000..6c46d2c6202f
--- /dev/null
+++ b/net-misc/nx-x11/files/1.5.0/nx-x11-1.5.0-nxcomp-fix.patch
@@ -0,0 +1,92 @@
+diff -purN nx-X11.orig/lib/X11/Imakefile nx-X11/lib/X11/Imakefile
+--- nx-X11.orig/lib/X11/Imakefile	2006-03-21 08:29:13.000000000 -0600
++++ nx-X11/lib/X11/Imakefile	2006-03-21 08:37:27.000000000 -0600
+@@ -20,9 +20,9 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 
+ #if NXLibraries
+ 
+ #ifdef SunArchitecture
+-NX_INCLUDES = -I../../../nxcomp -I../../../nxcompext -I/usr/sfw/include
++NX_INCLUDES = -I/usr/NX/include -I../../../nxcompext -I/usr/sfw/include
+ #else
+-NX_INCLUDES = -I../../../nxcomp -I../../../nxcompext
++NX_INCLUDES = -I/usr/NX/include -I../../../nxcompext
+ #endif
+ 
+ NX_DEFINES = -DNX_CLEAN_ALLOC     \
+@@ -58,9 +58,9 @@ NX_DEFINES = -DNX_CLEAN_ALLOC     \
+ #            -DNX_CLEAN_FLUSH     \
+ #            -DNX_CLEAN_SEND      \
+ 
+-NX_XCOMPLIBTARGET = ../../../nxcomp/libXcomp.so
++NX_XCOMPLIBTARGET = /usr/NX/lib/libXcomp.so
+ 
+-NX_REQUIREDLIBS =  -L../../../nxcomp -lXcomp
++NX_REQUIREDLIBS =  -L/usr/NX/lib -lXcomp
+ 
+ #endif
+ 
+@@ -1132,18 +1132,6 @@ includes:: ks_tables.h
+ 
+ #if NXLibraries
+ 
+-#ifdef SunArchitecture
+-$(NX_XCOMPLIBTARGET):
+-	cd ../../../nxcomp && \
+-	./configure && \
+-	gmake
+-#else
+-$(NX_XCOMPLIBTARGET):
+-	cd ../../../nxcomp && \
+-	./configure && \
+-	make
+-#endif
+-
+ depend:: $(NX_XCOMPLIBTARGET) ks_tables.h
+ 
+ #else
+diff -purN nx-X11.orig/programs/Xserver/Imakefile nx-X11/programs/Xserver/Imakefile
+--- nx-X11.orig/programs/Xserver/Imakefile	2006-03-21 08:28:41.000000000 -0600
++++ nx-X11/programs/Xserver/Imakefile	2006-03-21 08:44:33.000000000 -0600
+@@ -1369,9 +1369,9 @@ $(NXAGENTOBJS) $(NXAGENTLIBS) $(NXAGENTS
+  */
+ 
+ #if defined(SunArchitecture)
+-NXAGENTNXLIBS = -L ../../../nxcomp -L ../../../nxcompext -lXcomp -lXcompext -lrt -L/usr/sfw/lib -lXrender
++NXAGENTNXLIBS = -L /usr/NX/lib -L ../../../nxcompext -lXcomp -lXcompext -lrt -L/usr/sfw/lib -lXrender
+ #else
+-NXAGENTNXLIBS = -Wl,-rpath-link,../../../nxcomp -Wl,-rpath-link,../../../nxcompext,-lXrender
++NXAGENTNXLIBS = -Wl,-rpath-link,/usr/NX/lib -Wl,-rpath-link,../../../nxcompext,-lXrender
+ #endif
+ 
+ #endif
+diff -purN nx-X11.orig/programs/Xserver/hw/nxagent/Imakefile nx-X11/programs/Xserver/hw/nxagent/Imakefile
+--- nx-X11.orig/programs/Xserver/hw/nxagent/Imakefile	2006-03-21 08:28:09.000000000 -0600
++++ nx-X11/programs/Xserver/hw/nxagent/Imakefile	2006-03-21 08:40:49.000000000 -0600
+@@ -110,13 +110,13 @@ OBJS =  NXrandr.o \
+ VFBINCLUDES = -I../../fb -I../../mfb -I../../render
+ NXFONTINCLUDES = -I../../../../lib/font/include
+ 
+-INCLUDES = -I. -I../../../../../nxcomp -I../../../../../nxcompext \
++INCLUDES = -I. -I/usr/NX/include -I../../../../../nxcompext \
+ 	   -I$(XBUILDINCDIR) -I$(FONTINCSRC) \
+ 	   -I../../mi -I../../include -I../../os \
+            -I$(EXTINCSRC) -I$(XINCLUDESRC) \
+ 	   $(VFBINCLUDES) $(NXFONTINCLUDES)
+ #ifdef SunArchitecture
+-INCLUDES = -I../../../../../nxcomp -I../../../../../nxcompext \
++INCLUDES = -I/usr/NX/include -I../../../../../nxcompext \
+ 	   -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) \
+ 	   -I/usr/sfw/include \
+ 	   -I../../mi -I../../include -I../../os \
+diff -purN nx-X11.orig/programs/Xserver/os/Imakefile nx-X11/programs/Xserver/os/Imakefile
+--- nx-X11.orig/programs/Xserver/os/Imakefile	2006-03-21 08:28:46.000000000 -0600
++++ nx-X11/programs/Xserver/os/Imakefile	2006-03-21 08:45:49.000000000 -0600
+@@ -25,7 +25,7 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 
+ 
+ #if NXLibraries
+ 
+-NX_INCLUDES = -I../../../../nxcomp
++NX_INCLUDES = -I/usr/NX/include
+ 
+ NX_DEFINES = -DNX_TRANS_SOCKET        \
+              -DNX_TRANS_PROCESS       \
diff --git a/net-misc/nx-x11/files/1.5.0/nx-x11-1.5.0-plastik-render-fix.patch b/net-misc/nx-x11/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-x11/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-x11/files/1.5.0/nx-x11-1.5.0-xorg7-font-fix.patch b/net-misc/nx-x11/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-x11/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-x11/files/1.5.0/nxcomp-gcc4.patch b/net-misc/nx-x11/files/1.5.0/nxcomp-gcc4.patch
deleted file mode 100644
index 96da04209118..000000000000
--- a/net-misc/nx-x11/files/1.5.0/nxcomp-gcc4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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-x11/files/1.5.0/nxcompext-1.5.0-nxcomp-fix.patch b/net-misc/nx-x11/files/1.5.0/nxcompext-1.5.0-nxcomp-fix.patch
new file mode 100644
index 000000000000..8b1633f85627
--- /dev/null
+++ b/net-misc/nx-x11/files/1.5.0/nxcompext-1.5.0-nxcomp-fix.patch
@@ -0,0 +1,24 @@
+diff -purN nxcompext.orig/Makefile.in nxcompext/Makefile.in
+--- nxcompext.orig/Makefile.in	2005-10-18 12:51:08.000000000 -0500
++++ nxcompext/Makefile.in	2006-03-21 09:06:31.000000000 -0600
+@@ -31,17 +31,17 @@ CXX         = @CXX@
+ CXXFLAGS    = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \
+               -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
+               -Wmissing-declarations -Wnested-externs
+-CXXINCLUDES = -I. -I../nxcomp
++CXXINCLUDES = -I. -I/usr/NX/include
+ CXXDEFINES  =
+ 
+ CC          = @CC@
+ CCFLAGS     = @CFLAGS@ @X_CFLAGS@ @DEFS@ \
+               -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
+               -Wmissing-declarations -Wnested-externs
+-CCINCLUDES  = -I. -I../nxcomp
++CCINCLUDES  = -I. -I/usr/NX/include
+ CCDEFINES   =
+ 
+-LDFLAGS     = @LDFLAGS@ -L../nxcomp
++LDFLAGS     = @LDFLAGS@ -L/usr/NX/lib
+ LIBS        = @LIBS@ -lz -lX11 -lXcomp
+ 
+ #
diff --git a/net-misc/nx-x11/files/1.5.0/nxdesktop-1.5.0-nxcomp-fix.patch b/net-misc/nx-x11/files/1.5.0/nxdesktop-1.5.0-nxcomp-fix.patch
new file mode 100644
index 000000000000..203645d9fa78
--- /dev/null
+++ b/net-misc/nx-x11/files/1.5.0/nxdesktop-1.5.0-nxcomp-fix.patch
@@ -0,0 +1,26 @@
+diff -purN nxdesktop.orig/Makefile nxdesktop/Makefile
+--- nxdesktop.orig/Makefile	2005-03-07 12:00:18.000000000 -0600
++++ nxdesktop/Makefile	2006-03-21 09:44:46.000000000 -0600
+@@ -30,8 +30,8 @@ bindir      = $(exec_prefix)/bin
+ mandir      = $(prefix)/man
+ datadir     = $(prefix)/share
+ 
+-INCLUDES = -I../nxcomp -I../nxcompext
+-LDLIBS   = -lXpm -L../nxcompext -lXcompext -L../nxcomp -lXcomp -lX11 -lXext
++INCLUDES = -I/usr/NX/include -I../nxcompext
++LDLIBS   = -lXpm -L../nxcompext -lXcompext -L/usr/NX/lib -lXcomp -lX11 -lXext
+ VERSION     = 1.5.0-2
+ KEYMAP_PATH = $(datadir)/keymaps-windows/
+ 
+diff -purN nxdesktop.orig/configure nxdesktop/configure
+--- nxdesktop.orig/configure	2005-09-09 16:28:02.000000000 -0500
++++ nxdesktop/configure	2006-03-21 09:43:56.000000000 -0600
+@@ -391,7 +391,7 @@ rpath=`echo $rpath |sed 's/^://'`
+ 
+ case `uname -s` in
+   SunOS)
+-    echo "INCLUDES	=  -I../nxcomp -I../nxcompext -I/usr/local/include -I/usr/sfw/include">> Makeconf
++    echo "INCLUDES	=  -I/usr/NX/include -I../nxcompext -I/usr/local/include -I/usr/sfw/include">> Makeconf
+     ldflags="$ldflags -L/usr/sfw/lib -lsocket -lnsl -R$rpath"
+     cflags="$cflags -DHAVE_DIRENT_H=1 -DHAVE_DECL_DIRFD=0 -DDIR_FD_MEMBER_NAME=dd_fd"
+     ;;
diff --git a/net-misc/nx-x11/files/1.5.0/nxviewer-1.5.0-nxcomp-fix.patch b/net-misc/nx-x11/files/1.5.0/nxviewer-1.5.0-nxcomp-fix.patch
new file mode 100644
index 000000000000..603914ea0e37
--- /dev/null
+++ b/net-misc/nx-x11/files/1.5.0/nxviewer-1.5.0-nxcomp-fix.patch
@@ -0,0 +1,14 @@
+diff -purN nxviewer.orig/nxviewer/Imakefile nxviewer/nxviewer/Imakefile
+--- nxviewer.orig/nxviewer/Imakefile	2005-06-14 10:33:50.000000000 -0500
++++ nxviewer/nxviewer/Imakefile	2006-03-21 09:35:05.000000000 -0600
+@@ -26,8 +26,8 @@ XCOMM seems to cause problems on Digital
+ DEFINES = -DMITSHM
+ #endif
+ 
+-NX_INC = -I../../nxcomp -I../../nxcompext -I../../nx-X11/exports/include
+-NX_LIB = -L../../nxcomp -lXcomp -L../../nxcompext -lXcompext
++NX_INC = -I/usr/NX/include -I../../nxcompext -I../../nx-X11/exports/include
++NX_LIB = -L/usr/NX/lib -lXcomp -L../../nxcompext -lXcompext
+ 
+ #ifdef SunArchitecture
+ NX_INC += -I/usr/sfw/include -I/usr/include
diff --git a/net-misc/nx-x11/files/digest-nx-x11-1.5.0-r5 b/net-misc/nx-x11/files/digest-nx-x11-1.5.0-r8
index d1f3cce88d0c..8477ff2e49b7 100644
--- a/net-misc/nx-x11/files/digest-nx-x11-1.5.0-r5
+++ b/net-misc/nx-x11/files/digest-nx-x11-1.5.0-r8
@@ -1,8 +1,6 @@
 MD5 11877c3357732a957e3bf7e3d2f2ca0a nx-X11-1.5.0-21.tar.gz 32390668
 MD5 160726ed67698a9694b707950c49e19e nxagent-1.5.0-112.tar.gz 818946
 MD5 a7c5e68e9678cb5c722c334b33baf660 nxauth-1.5.0-1.tar.gz 23077
-MD5 782f04870142c9fc5b2e1f654fd0a5d7 nxcomp-1.5.0-80.tar.gz 525688
 MD5 6a5b8b79b9e0cc81b88233b18c4f227f nxcompext-1.5.0-20.tar.gz 124036
 MD5 6c20c1300ca6b4d362237ef44cfee7f7 nxdesktop-1.5.0-78.tar.gz 201893
-MD5 fe0d5e0e78b37725336b339ba7596d0b nxesd-1.5.0-3.tar.gz 663445
 MD5 ff3e5a4c1601b58f5fc405f990691bdf nxviewer-1.5.0-15.tar.gz 86414
diff --git a/net-misc/nx-x11/nx-x11-1.5.0-r5.ebuild b/net-misc/nx-x11/nx-x11-1.5.0-r5.ebuild
deleted file mode 100644
index f5904a573173..000000000000
--- a/net-misc/nx-x11/nx-x11-1.5.0-r5.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/nx-x11-1.5.0-r5.ebuild,v 1.1 2006/03/05 13:21:33 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://64.34.161.181/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_NXVIEWER="nxviewer-$PV-15.tar.gz"
-SRC_NXDESKTOP="nxdesktop-$PV-78.tar.gz"
-SRC_NXESD="nxesd-$PV-3.tar.gz"
-SRC_URI="$URI_BASE/$SRC_NX_X11 $URI_BASE/$SRC_NXAGENT $URI_BASE/$SRC_NXAUTH $URI_BASE/$SRC_NXCOMP $URI_BASE/$SRC_NXCOMPEXT $URI_BASE/$SRC_NXVIEWER $URI_BASE/$SRC_NXDESKTOP $URI_BASE/$SRC_NXESD"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-#RESTRICT="nostrip"
-DEPEND="virtual/x11
-	media-libs/jpeg"
-#RDEPEND=""
-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_NXCOMP}
-	unpack ${SRC_NXCOMPEXT}
-	unpack ${SRC_NXVIEWER}
-	unpack ${SRC_NXDESKTOP}
-	unpack ${SRC_NXESD}
-
-	cd ${S}
-	epatch ${FILESDIR}/1.5.0/nx-x11-windows-linux-resume.patch
-	cd ../nxcomp
-	epatch ${FILESDIR}/1.5.0/nxcomp-gcc4.patch
-}
-
-src_compile() {
-	emake World || die "unable to build nx-11"
-
-	cd ../nxviewer
-	xmkmf || die "unable to create makefile for nxviewer"
-	emake World || die "unable to make nxviewer"
-
-	cd ../nxdesktop
-	./configure --prefix=/usr/NX --mandir=/usr/share/man --sharedir=/usr/share || die "Unable to configure nxdesktop"
-	emake || die "Unable to build nxdesktop"
-
-	return
-
-	# mxesd support will have to wait for a later release
-
-	cd ../nxesd
-	econf --prefix=/usr/NX || die "Unable to configure nxesd"
-	emake || die "Unable to build nxesd"
-}
-
-src_install() {
-	into /usr/NX
-
-	dobin programs/Xserver/nxagent
-	dobin programs/nxauth/nxauth
-	dobin ../nxviewer/nxviewer/nxviewer
-	dobin ../nxviewer/nxpasswd/nxpasswd
-	dobin ../nxdesktop/nxdesktop
-
-	pushd lib/X11/
-	dolib libX11.so.6.2
-	dolib libX11.so
-	popd
-
-	pushd lib/Xext/
-	dolib libXext.so.6.4
-	dolib libXext.so
-	popd
-
-	pushd lib/Xrender/
-	dolib libXrender.so.1.2
-	dolib libXrender.so
-	popd
-
-	pushd ../nxcomp/
-	dolib libXcomp.so.1.5.0
-	dolib libXcomp.so
-	popd
-
-	pushd ../nxcompext/
-	dolib libXcompext.so.1.5.0
-	dolib libXcompext.so
-	popd
-
-	preplib /usr/NX
-
-	insinto /usr/X11R6/include
-	doins ../nxcomp/NX.h
-
-	insinto /etc/env.d
-	doins ${FILESDIR}/1.5.0/50nx-x11
-
-	dodir /var/lib/nxserver
-
-	return
-
-	cd ../nxesd
-	emake DESTDIR=${D} install || die "unable to install nxesd"
-}
diff --git a/net-misc/nx-x11/nx-x11-1.5.0-r8.ebuild b/net-misc/nx-x11/nx-x11-1.5.0-r8.ebuild
new file mode 100644
index 000000000000..8246f3af1140
--- /dev/null
+++ b/net-misc/nx-x11/nx-x11-1.5.0-r8.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx-x11/nx-x11-1.5.0-r8.ebuild,v 1.1 2006/04/30 17:16:01 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_NXCOMPEXT="nxcompext-$PV-20.tar.gz"
+SRC_NXDESKTOP="nxdesktop-$PV-78.tar.gz"
+SRC_NXVIEWER="nxviewer-$PV-15.tar.gz"
+
+SRC_URI="$URI_BASE/$SRC_NX_X11 $URI_BASE/$SRC_NXAGENT
+	$URI_BASE/$SRC_NXAUTH $URI_BASE/$SRC_NXCOMPEXT
+	rdesktop? ( $URI_BASE/$SRC_NXDESKTOP )
+	vnc? ( $URI_BASE/$SRC_NXVIEWER )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~sparc ~x86"
+IUSE="rdesktop vnc"
+
+DEPEND="!<net-misc/nx-x11-1.5.0-r8
+	~net-misc/nxcomp-1.5.0
+	!net-misc/nx-x11-bin"
+
+RDEPEND="${DEPEND}"
+
+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}
+	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-nxcomp-fix.patch
+	epatch ${FILESDIR}/1.5.0/nx-x11-1.5.0-xorg7-font-fix.patch
+
+	cd ../nxcompext
+	epatch ${FILESDIR}/1.5.0/nxcompext-1.5.0-nxcomp-fix.patch
+
+	if use rdesktop ; then
+		cd ../nxdesktop
+		epatch ${FILESDIR}/1.5.0/nxdesktop-1.5.0-nxcomp-fix.patch
+	fi
+
+	if use vnc ; then
+		cd ../nxviewer
+		epatch ${FILESDIR}/1.5.0/nxviewer-1.5.0-nxcomp-fix.patch
+	fi
+}
+
+src_compile() {
+	emake World || die "unable to build nx-x11"
+
+	if use vnc ; then
+		cd ../nxviewer
+		xmkmf || die "unable to create makefile for nxviewer"
+		emake World || die "unable to make nxviewer"
+	fi
+
+	if use rdesktop ; then
+		cd ../nxdesktop
+		./configure --prefix=/usr/NX --mandir=/usr/share/man --sharedir=/usr/share || die "Unable to configure nxdesktop"
+		emake || die "Unable to build nxdesktop"
+	fi
+}
+
+src_install() {
+	into /usr/NX
+
+	dobin programs/Xserver/nxagent
+	dobin programs/nxauth/nxauth
+
+	if use vnc ; then
+		dobin ../nxviewer/nxviewer/nxviewer
+		dobin ../nxviewer/nxpasswd/nxpasswd
+	fi
+
+	if use rdesktop ; then
+		dobin ../nxdesktop/nxdesktop
+	fi
+
+	dolib.so lib/X11/libX11.so*
+
+	dolib.so lib/Xext/libXext.so*
+
+	dolib.so lib/Xrender/libXrender.so*
+
+	dolib.so ../nxcompext/libXcompext.so*
+}