Add libXcomposite depend, remove vulnerable NX 2.1 versions bug #192712

Package-Manager: portage-2.1.3.9

6 files changed, 17 insertions, 311 deletions

diff --git a/net-misc/nx/ChangeLog b/net-misc/nx/ChangeLog
index 9444401f544b..d11e486b7203 100644
--- a/net-misc/nx/ChangeLog
+++ b/net-misc/nx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/nx
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.10 2007/09/20 12:24:24 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/ChangeLog,v 1.11 2007/09/20 23:13:27 voyageur Exp $
+
+  20 Sep 2007; Bernard Cafarelli <voyageur@gentoo.org>
+  -files/nx-2.1.0-nxagent-mem-leaks.patch, -nx-2.1.0.ebuild,
+  nx-3.0.0.ebuild:
+  Add libXcomposite depend, bug #193216
+  Remove vulnerable NX 2.1 versions, security bug #192712
 
   20 Sep 2007; Christian Faulhammer <opfer@gentoo.org> nx-3.0.0.ebuild:
   stable x86, security bug 192712
diff --git a/net-misc/nx/Manifest b/net-misc/nx/Manifest
index 7c2e29bba939..480b12c8613b 100644
--- a/net-misc/nx/Manifest
+++ b/net-misc/nx/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
@@ -17,51 +14,25 @@ AUX nx-2.1.0-invalid-options.patch 978 RMD160 34e8c167b60e20032363ac57e4019a77ac
 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
-AUX nx-2.1.0-nxagent-mem-leaks.patch 3384 RMD160 db6a81a9cbccc49c372df6a40a83b4196a98ab64 SHA1 e0be9d2e8e0415a4ba58638397f7106ca61862be SHA256 6a033b36db8fb5e9456f23516a16a5cbb3ad775ac5b3a06d8d68055766356b39
-MD5 e9c59c55f7c0ac98387f1cd97155cec3 files/nx-2.1.0-nxagent-mem-leaks.patch 3384
-RMD160 db6a81a9cbccc49c372df6a40a83b4196a98ab64 files/nx-2.1.0-nxagent-mem-leaks.patch 3384
-SHA256 6a033b36db8fb5e9456f23516a16a5cbb3ad775ac5b3a06d8d68055766356b39 files/nx-2.1.0-nxagent-mem-leaks.patch 3384
-DIST nx-X11-2.1.0-3.tar.gz 32532518 RMD160 69c4b24f8279d9c92bb3ef22a4399806b5fb8050 SHA1 3cb5bfa0bed63b71077d9c38b8e0fdf54f2f00e1 SHA256 dabec82696c23d0c9da0d1a66fee12fd6ffe232e7aecf10f0929e968fe0703f4
 DIST nx-X11-3.0.0-37.tar.gz 20183918 RMD160 2d8ba625a698d4bd1d8f262a012dcaa9f92d5f20 SHA1 8e875243758722cae03bc8697fd678c08e5e3eb9 SHA256 8f0de96431d17987e1926b800f7aa409efbd02898756fe55b978e1304c32e5df
-DIST nxagent-2.1.0-18.tar.gz 950859 RMD160 b9d5e50ba2a3b385ee9adc463bb02481ce32db51 SHA1 af405ccae2164f6f9a9a5dc4c28394bab67b8651 SHA256 fc9836702039690ca94e44cefb5ec0edce1f968f55666b8afc66ec15456eae33
 DIST nxagent-3.0.0-85.tar.gz 1537674 RMD160 5c80dbf2c016fafe9e20816c3e7b0fd5291f368c SHA1 f8a18851346454b4c05491db1fe067c812fed717 SHA256 3d5b223e7bd0ae3ba4348fe5afee62d22cf457412f254c33fd11ae5898a716d9
-DIST nxauth-2.1.0-2.tar.gz 30296 RMD160 e20dbac668d98e59d42359d71a1be4947a64d492 SHA1 5027488e7c7252d74971934600cbf9eaf90fec7b SHA256 a3231b42daf1e5add3aaa876f5f99dae0dcf196c2122ad0db11c317851e75799
 DIST nxauth-3.0.0-6.tar.gz 30474 RMD160 e71ae1b83b78f47f9bacf6d85cca529bfda8b2d0 SHA1 4813adbfb99908da73979456fa381a40fea7489e SHA256 09868f985ab71f9cefa61ddd0e809cb41583b31af5098a0b4cdc7a0f4d7fdd62
-DIST nxcomp-2.1.0-8.tar.gz 556291 RMD160 b8960b616eb48521404e9ee39cf7e6f64e060394 SHA1 a5465b9062aab9e0db5dcab7dbc86c81b40cae37 SHA256 74ad4bf63602c3e50622d74420c3840f2e7f0d690b2176c0331ad2011756e776
 DIST nxcomp-3.0.0-43.tar.gz 530677 RMD160 8d0d04333b1a90d10da0d4653e196c1754dcab28 SHA1 af6554c2748691f6d5206d23215b6acc45141f9b SHA256 cff0ae97284b8a6d32f57cf20617e6aa021565fe3595545e888eeaaaf5aef48e
-DIST nxcompext-2.1.0-5.tar.gz 102588 RMD160 f9c7ea4ca0013063406d18b2e3e928ebfa600169 SHA1 788690ac52eebd2613e6d774679ab133270ff172 SHA256 acd81ab9f0ab74317a9d34902d77f5978432d3488664c501a42378577b81f06c
 DIST nxcompext-3.0.0-18.tar.gz 89984 RMD160 8b4e483e0226041d758920957b4a20626342b797 SHA1 ef7021673fbbe11ed5635c1f58052127c0d7466a SHA256 a6c2bb400d6a970e94db453491d345cbeebd4be0a1b3969b38281a658f6fa554
 DIST nxcompshad-3.0.0-19.tar.gz 71747 RMD160 0a0d1142024544956eece74d0ea5929ebdb67ec8 SHA1 37519203e0a12762607f64c3978f01383dab81df SHA256 0011b7cff616001e7e9f846ed4f128b39ed6a4a0a40aa62138afc13fbb0c6cec
-DIST nxdesktop-2.1.0-9.tar.gz 823225 RMD160 5b42c2e55856d5cd3873b18dfbb6fb128497d5f6 SHA1 4db4756aad23d3cfa3b99b0cfac841c896843fe7 SHA256 35cd77ea63d7381bad5745224bd93635a53bfe4b3e545085f09bf512075c08db
-DIST nxproxy-2.1.0-3.tar.gz 82753 RMD160 71c9a069cb9b8ede2505753656cd5b83fff80f8e SHA1 2ec0bafb9546bbde155baeb844454da704aabcc9 SHA256 3c2db68cb0fa931db1b2ef74c76c848357d332ada8397c511719215bd8eeabac
 DIST nxproxy-3.0.0-4.tar.gz 82730 RMD160 b96e8752fce7015da88e2e304c8647abc6591892 SHA1 b4e22c541f3ae6f08f16c0239494475519de4045 SHA256 e2a838697d79b8621851e1fbe12dd699699f6ab62fa2caa92c53a0fefe901954
-DIST nxviewer-2.1.0-12.tar.gz 228158 RMD160 0462706c5ea0f49700e4ccdfc2adba1278b0e3ec SHA1 af1f6dc337cd13739037c45d9284c7596e87c732 SHA256 dc41c4f3cc6f6e4e7985a37d5b3cddf9c9571b8e9752fbb056a4d6e4c9b59178
-EBUILD nx-2.1.0.ebuild 3194 RMD160 010d63ac38e576408d6307fe8556a133db0df1e8 SHA1 4087fcf504b975741eb5018d59f865fb2fd83a09 SHA256 9e69c64798e6915b5ba3c50595075caf5b2f208b16635bc6b2274b0f8c4bd926
-MD5 4309a1c9e019c0aab414b9bfb59ecc6c nx-2.1.0.ebuild 3194
-RMD160 010d63ac38e576408d6307fe8556a133db0df1e8 nx-2.1.0.ebuild 3194
-SHA256 9e69c64798e6915b5ba3c50595075caf5b2f208b16635bc6b2274b0f8c4bd926 nx-2.1.0.ebuild 3194
-EBUILD nx-3.0.0.ebuild 2850 RMD160 6fec5f16e44312cdb60efc7d00107626f54b88b5 SHA1 94259b28c4c635bafdbee87d7facb8f4a76544ae SHA256 d33af44995dcd3b4c8a6522f0edd02fb8478c8896de7425506208de9ca1476f3
-MD5 a652602039cb9eb97089627ebfbda0f9 nx-3.0.0.ebuild 2850
-RMD160 6fec5f16e44312cdb60efc7d00107626f54b88b5 nx-3.0.0.ebuild 2850
-SHA256 d33af44995dcd3b4c8a6522f0edd02fb8478c8896de7425506208de9ca1476f3 nx-3.0.0.ebuild 2850
-MISC ChangeLog 1863 RMD160 b05087cf3daad29888bdeb8017ef81bcacd690c4 SHA1 7072eda56916c11fe123e9c55072a66c1f6740eb SHA256 64f6a066d0fe335188160fc9035c71e1c1d8d3dd1175e33fd51d05dc9c8bfd85
-MD5 27386e05db9417dd6d8b3e2626b00e0d ChangeLog 1863
-RMD160 b05087cf3daad29888bdeb8017ef81bcacd690c4 ChangeLog 1863
-SHA256 64f6a066d0fe335188160fc9035c71e1c1d8d3dd1175e33fd51d05dc9c8bfd85 ChangeLog 1863
+EBUILD nx-3.0.0.ebuild 2877 RMD160 c63d57674c85dcfe30c41180a621de3db7ffb248 SHA1 9dd04ddb92173eda8afa750105c15c1f64b1c46a SHA256 4ae2434ac53802d29d93ade86e3634915840eb5436e2849524ba8cc5fdfcccbe
+MD5 44fe006e3f6bba525cef39d01911e8eb nx-3.0.0.ebuild 2877
+RMD160 c63d57674c85dcfe30c41180a621de3db7ffb248 nx-3.0.0.ebuild 2877
+SHA256 4ae2434ac53802d29d93ade86e3634915840eb5436e2849524ba8cc5fdfcccbe nx-3.0.0.ebuild 2877
+MISC ChangeLog 2100 RMD160 b29aa413e0e54fdb0b0ccea1ec8488112866789b SHA1 23f9bd50c46e127c85b5416ae9d8517f01967440 SHA256 43ea9d63833da5170dfe99338bdbc97f806ca7d25e79ec38f7d05f9ed6999c76
+MD5 2f3a4c09237544f5ff9336e67313f65a ChangeLog 2100
+RMD160 b29aa413e0e54fdb0b0ccea1ec8488112866789b ChangeLog 2100
+SHA256 43ea9d63833da5170dfe99338bdbc97f806ca7d25e79ec38f7d05f9ed6999c76 ChangeLog 2100
 MISC metadata.xml 254 RMD160 b79639a7a5027cb4342c18c2c5f0999bdd56f81f SHA1 d4bc63a27b50efd4593005361dc2e6032a34b1a8 SHA256 2952f5071f21b100d9704142bb38a3e126a2ed3f41b4232e213ce607f7780033
 MD5 a2d70e2a73718e9fc4f8b89eecc1952b metadata.xml 254
 RMD160 b79639a7a5027cb4342c18c2c5f0999bdd56f81f metadata.xml 254
 SHA256 2952f5071f21b100d9704142bb38a3e126a2ed3f41b4232e213ce607f7780033 metadata.xml 254
-MD5 b831307d823d7e1b8137750fe121b380 files/digest-nx-2.1.0 1988
-RMD160 8aef196c297c83f66408cfe246a6bb280aaa2422 files/digest-nx-2.1.0 1988
-SHA256 cfd6609293f71e27c38c0b41b41aafe07e71f902f6f4435ff539191df83e0020 files/digest-nx-2.1.0 1988
 MD5 7358bc01f54e59d931d9904ea33664bf files/digest-nx-3.0.0 1747
 RMD160 1944e6fb81b119521c2e5e392cbd35085a4e13f1 files/digest-nx-3.0.0 1747
 SHA256 339e2fa700c4fbe38f8cc97d359b55c21b860858c62d8f059fd12a02ea3064d0 files/digest-nx-3.0.0 1747
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD4DBQFG8maHNQqtfCuFneMRAs/FAJUbooQjdLdfkRmlfifwl4XKPkyAAKCOjoSp
-cR/+BFz2zYPBRHjTdHT2Kg==
-=17SU
------END PGP SIGNATURE-----
diff --git a/net-misc/nx/files/digest-nx-2.1.0 b/net-misc/nx/files/digest-nx-2.1.0
deleted file mode 100644
index a1eed4aead7b..000000000000
--- a/net-misc/nx/files/digest-nx-2.1.0
+++ /dev/null
@@ -1,24 +0,0 @@
-MD5 9c6e9e4c35c4ec3a7664fcdd397eb7f0 nx-X11-2.1.0-3.tar.gz 32532518
-RMD160 69c4b24f8279d9c92bb3ef22a4399806b5fb8050 nx-X11-2.1.0-3.tar.gz 32532518
-SHA256 dabec82696c23d0c9da0d1a66fee12fd6ffe232e7aecf10f0929e968fe0703f4 nx-X11-2.1.0-3.tar.gz 32532518
-MD5 cae6005f50bab78aa7abba448fca4ed9 nxagent-2.1.0-18.tar.gz 950859
-RMD160 b9d5e50ba2a3b385ee9adc463bb02481ce32db51 nxagent-2.1.0-18.tar.gz 950859
-SHA256 fc9836702039690ca94e44cefb5ec0edce1f968f55666b8afc66ec15456eae33 nxagent-2.1.0-18.tar.gz 950859
-MD5 74811bc9ef86f2d97b3b2ba2ba53f9d3 nxauth-2.1.0-2.tar.gz 30296
-RMD160 e20dbac668d98e59d42359d71a1be4947a64d492 nxauth-2.1.0-2.tar.gz 30296
-SHA256 a3231b42daf1e5add3aaa876f5f99dae0dcf196c2122ad0db11c317851e75799 nxauth-2.1.0-2.tar.gz 30296
-MD5 7e35e48adb66786ad720ff9fbfa950a3 nxcomp-2.1.0-8.tar.gz 556291
-RMD160 b8960b616eb48521404e9ee39cf7e6f64e060394 nxcomp-2.1.0-8.tar.gz 556291
-SHA256 74ad4bf63602c3e50622d74420c3840f2e7f0d690b2176c0331ad2011756e776 nxcomp-2.1.0-8.tar.gz 556291
-MD5 d3347382860670cfd4471d228fb1b730 nxcompext-2.1.0-5.tar.gz 102588
-RMD160 f9c7ea4ca0013063406d18b2e3e928ebfa600169 nxcompext-2.1.0-5.tar.gz 102588
-SHA256 acd81ab9f0ab74317a9d34902d77f5978432d3488664c501a42378577b81f06c nxcompext-2.1.0-5.tar.gz 102588
-MD5 bbbb9b91b8bc6759d42524c3f3f5be42 nxdesktop-2.1.0-9.tar.gz 823225
-RMD160 5b42c2e55856d5cd3873b18dfbb6fb128497d5f6 nxdesktop-2.1.0-9.tar.gz 823225
-SHA256 35cd77ea63d7381bad5745224bd93635a53bfe4b3e545085f09bf512075c08db nxdesktop-2.1.0-9.tar.gz 823225
-MD5 29b0e8be069a8258f5b8774362fc7464 nxproxy-2.1.0-3.tar.gz 82753
-RMD160 71c9a069cb9b8ede2505753656cd5b83fff80f8e nxproxy-2.1.0-3.tar.gz 82753
-SHA256 3c2db68cb0fa931db1b2ef74c76c848357d332ada8397c511719215bd8eeabac nxproxy-2.1.0-3.tar.gz 82753
-MD5 e9f5b692278025856b09bd71d0966100 nxviewer-2.1.0-12.tar.gz 228158
-RMD160 0462706c5ea0f49700e4ccdfc2adba1278b0e3ec nxviewer-2.1.0-12.tar.gz 228158
-SHA256 dc41c4f3cc6f6e4e7985a37d5b3cddf9c9571b8e9752fbb056a4d6e4c9b59178 nxviewer-2.1.0-12.tar.gz 228158
diff --git a/net-misc/nx/files/nx-2.1.0-nxagent-mem-leaks.patch b/net-misc/nx/files/nx-2.1.0-nxagent-mem-leaks.patch
deleted file mode 100644
index eb9d7cf317d6..000000000000
--- a/net-misc/nx/files/nx-2.1.0-nxagent-mem-leaks.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff -uBbr new/nx-X11/programs/Xserver/hw/nxagent/Atoms.c nx-X11/programs/Xserver/hw/nxagent/Atoms.c
---- new/nx-X11/programs/Xserver/hw/nxagent/Atoms.c	2006-04-18 11:40:18.000000000 -0355
-+++ nx-X11/programs/Xserver/hw/nxagent/Atoms.c	2007-02-19 12:54:51.000000000 -0455
-@@ -785,6 +785,8 @@
- 
-     nxagentWriteAtom(local, remote, string, True);
- 
-+    XFree(string);
-+
-     return local;
-   }
- 
-diff -uBbr new/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c
---- new/nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c	2006-11-09 12:22:35.000000000 -0455
-+++ nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c	2007-02-21 13:23:59.000000000 -0455
-@@ -2521,7 +2521,7 @@
- 		err = (*fpe_functions[fpe->type].start_list_fonts_and_aliases)
- 		    ((pointer) c->client, fpe, c->current.pattern,
- 		     c->current.patlen, c->current.max_names - c->names->nnames,
--		     &c->current.private);
-+		     &c->current.private); /* FIXME: returned mem c->current.private (needed by list_next_font_or_alias) may never be freed */
- 		if (err == Suspended) {
- 		    if (!c->slept) {
- 			ClientSleep(client,
-diff -uBbr new/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
---- new/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c	2006-11-09 12:18:00.000000000 -0455
-+++ nx-X11/programs/Xserver/hw/nxagent/Pixmap.c	2007-02-21 13:28:54.000000000 -0455
-@@ -1115,6 +1115,7 @@
-     {
-       FatalError("XGetImage: Failed.\n");
- 
-+      free(data);
-       return False;
-     }
- 
-@@ -1600,6 +1601,7 @@
-         fprintf(stderr, "nxagentSynchronizeDrawableData: WARNING! Failed to create the temporary GC.\n");
-         #endif
- 
-+        xfree(data);
-         return 0;
-       }
- 
-@@ -1661,6 +1663,7 @@
-           fprintf(stderr, "nxagentSynchronizeDrawableData: WARNING! Failed to create the temporary GC.\n");
-           #endif
- 
-+          xfree(data);
-           return 0;
-         }
- 
-@@ -1772,6 +1775,7 @@
-   int useExtents;
-   int imageLength, corruptedLength;
-   int corruptedWidth, corruptedHeight;
-+  int ret = 0; /* Used by error handling. 0 is error(?, based on previous code) */
- 
-   #ifdef TEST
-   static int totalLength;
-@@ -1812,7 +1816,7 @@
-                             (void *) pDrawable);
-     #endif
- 
--    return 0;
-+    goto SR_FREE_CLIP;
-   }
- 
-   /*
-@@ -1836,7 +1840,7 @@
-                               (void *) pDrawable);
-       #endif
- 
--      return 0;
-+      goto SR_FREE_CLIP;
-     }
-   }
- 
-@@ -1861,7 +1865,7 @@
-     fprintf(stderr, "nxagentSynchronizeRegion: WARNING! Failed to allocate memory for the operation.\n");
-     #endif
- 
--    return 0;
-+    goto SR_FREE_CLIP;
-   }
- 
-   pSrcDrawable = (pDrawable -> type == DRAWABLE_PIXMAP ?
-@@ -1876,7 +1880,7 @@
-     fprintf(stderr, "nxagentSynchronizeRegion: WARNING! Failed to create the temporary GC.\n");
-     #endif
- 
--    return 0;
-+    goto SR_FREE_XALLOC;
-   }
- 
-   ValidateGC(pDrawable, pGC);
-@@ -1935,7 +1939,7 @@
- 
-     #endif
- 
--    return 1;
-+    goto SR_FREE_GC;
-   }
- 
-   /*
-@@ -2029,13 +2033,17 @@
- 
-   nxagentGCTrap = saveTrap;
- 
--  nxagentFreeRegion(pDrawable, clipRegion);
-+SR_FREE_GC:
-+  ret = 1;
-+  FreeScratchGC(pGC);
- 
-+SR_FREE_XALLOC:
-   xfree(data);
- 
--  FreeScratchGC(pGC);
-+SR_FREE_CLIP:
-+  nxagentFreeRegion(pDrawable, clipRegion);
- 
--  return 1;
-+  return ret;
- }
- 
- void nxagentSynchronizeBox(DrawablePtr pDrawable, BoxPtr pBox)
diff --git a/net-misc/nx/nx-2.1.0.ebuild b/net-misc/nx/nx-2.1.0.ebuild
deleted file mode 100644
index c97e33cb8524..000000000000
--- a/net-misc/nx/nx-2.1.0.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-2.1.0.ebuild,v 1.3 2007/07/03 11:10:53 opfer Exp $
-
-inherit autotools eutils multilib
-
-DESCRIPTION="NX compression technology core libraries"
-HOMEPAGE="http://www.nomachine.com/developers.php"
-
-URI_BASE="http://web04.nomachine.com/download/${PV}/sources"
-SRC_NX_X11="nx-X11-$PV-3.tar.gz"
-SRC_NXAGENT="nxagent-$PV-18.tar.gz"
-SRC_NXAUTH="nxauth-$PV-2.tar.gz"
-SRC_NXCOMP="nxcomp-$PV-8.tar.gz"
-SRC_NXCOMPEXT="nxcompext-$PV-5.tar.gz"
-SRC_NXDESKTOP="nxdesktop-$PV-9.tar.gz"
-SRC_NXVIEWER="nxviewer-$PV-12.tar.gz"
-SRC_NXPROXY="nxproxy-$PV-3.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="~amd64 x86"
-IUSE="rdesktop vnc"
-
-RDEPEND="x86? ( x11-libs/libXau
-		   		x11-libs/libXdmcp
-				x11-libs/libXpm
-				>=media-libs/jpeg-6b-r4
-				>=media-libs/libpng-1.2.8
-				>=sys-libs/zlib-1.2.3 )
-		 amd64? ( >=app-emulation/emul-linux-x86-xlibs-10.0 )"
-
-DEPEND="${RDEPEND}
-		x11-misc/gccmakedep
-		x11-misc/imake"
-
-S=${WORKDIR}/${PN}-X11
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${WORKDIR}
-	epatch ${FILESDIR}/1.5.0/nx-x11-1.5.0-tmp-exec.patch
-	epatch ${FILESDIR}/1.5.0/nxcomp-1.5.0-pic.patch
-	epatch ${FILESDIR}/${P}-nxagent-mem-leaks.patch
-
-	cd ${WORKDIR}/nxcomp
-	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
-
-	cd ${WORKDIR}/nxproxy || die
-	econf || die
-	emake || die
-
-	cd ${WORKDIR}/nx-X11 || die
-	emake World || die
-
-	cd ${WORKDIR}/nxcompext || die
-	econf || 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
-		CC=(tc-getCC) ./configure || die
-		emake || die
-	fi
-}
-
-src_install() {
-	NX_ROOT=/usr/$(get_libdir)/NX
-
-	for x in nxagent nxauth nxproxy; do
-		make_wrapper $x ./$x ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||die
-	done
-	if use vnc ; then
-		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 ${NX_ROOT}/bin ${NX_ROOT}/$(get_libdir) ||die
-	fi
-
-	into ${NX_ROOT}
-	dobin ${WORKDIR}/nx-X11/programs/Xserver/nxagent
-	dobin ${WORKDIR}/nx-X11/programs/nxauth/nxauth
-	dobin ${WORKDIR}/nxproxy/nxproxy
-
-	if use vnc ; then
-		dobin ${WORKDIR}/nxviewer/nxviewer/nxviewer
-		dobin ${WORKDIR}/nxviewer/nxpasswd/nxpasswd
-	fi
-
-	if use rdesktop ; then
-		dobin ${WORKDIR}/nxdesktop/nxdesktop
-	fi
-
-	dolib.so ${WORKDIR}/nx-X11/lib/X11/libX11.so*
-	dolib.so ${WORKDIR}/nx-X11/lib/Xext/libXext.so*
-	dolib.so ${WORKDIR}/nx-X11/lib/Xrender/libXrender.so*
-	dolib.so ${WORKDIR}/nxcomp/libXcomp.so*
-	dolib.so ${WORKDIR}/nxcompext/libXcompext.so*
-}
diff --git a/net-misc/nx/nx-3.0.0.ebuild b/net-misc/nx/nx-3.0.0.ebuild
index c68c2a740a4d..4b2392066f48 100644
--- a/net-misc/nx/nx-3.0.0.ebuild
+++ b/net-misc/nx/nx-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.0.0.ebuild,v 1.3 2007/09/20 12:24:24 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nx/nx-3.0.0.ebuild,v 1.4 2007/09/20 23:13:27 voyageur Exp $
 
 inherit autotools eutils multilib
 
@@ -24,6 +24,7 @@ KEYWORDS="~amd64 x86"
 IUSE="rdesktop vnc"
 
 RDEPEND="x11-libs/libXau
+	x11-libs/libXcomposite
 	x11-libs/libXdamage
 	x11-libs/libXdmcp
 	x11-libs/libXpm