Removed old, buggy versions

(Portage version: 2.1.2_pre2-r9)
 (Unsigned Manifest commit)

18 files changed, 4 insertions, 807 deletions

diff --git a/net-misc/nxserver-freenx/Manifest b/net-misc/nxserver-freenx/Manifest
index 47dd829c3548..0792a378522f 100644
--- a/net-misc/nxserver-freenx/Manifest
+++ b/net-misc/nxserver-freenx/Manifest
@@ -2,14 +2,6 @@ AUX 50nxserver 80 RMD160 204c4cffc4832609451e69a78a75d0572b74b0f1 SHA1 02c98a293
 MD5 41f95f92c9e230d7cd356504a8e56269 files/50nxserver 80
 RMD160 204c4cffc4832609451e69a78a75d0572b74b0f1 files/50nxserver 80
 SHA256 7572b8195b5b1ba83f429ddc11be44b3496810e05adbc1c233788085bcf8e365 files/50nxserver 80
-AUX fixes.diff 1078 RMD160 780b0dd88789dc57c7ac7e412f5e17747f220dec SHA1 e0ce545cef2b9c1ff895286dcf74b47ef8b9adf1 SHA256 d611a7bb9065f6731f03fd59db52dfd72faef8d63219ac279f0764543d329b81
-MD5 8f0fb766970dd9dce29e468cec2e796e files/fixes.diff 1078
-RMD160 780b0dd88789dc57c7ac7e412f5e17747f220dec files/fixes.diff 1078
-SHA256 d611a7bb9065f6731f03fd59db52dfd72faef8d63219ac279f0764543d329b81 files/fixes.diff 1078
-AUX freenx-0.4.4-adduser-fix.patch 562 RMD160 a6dcc853d73cf13cf395cc346fa5da86a00ec4ec SHA1 3334d2bd2d5617891ed04481ea88472829a1f41d SHA256 f5cbff53a8fe403e7068b43bc4c3005132e578e14effcbd3063ccf5da112ed17
-MD5 925fd2cad3adceb556bf1de6cf866ed0 files/freenx-0.4.4-adduser-fix.patch 562
-RMD160 a6dcc853d73cf13cf395cc346fa5da86a00ec4ec files/freenx-0.4.4-adduser-fix.patch 562
-SHA256 f5cbff53a8fe403e7068b43bc4c3005132e578e14effcbd3063ccf5da112ed17 files/freenx-0.4.4-adduser-fix.patch 562
 AUX freenx-0.5.0-fullscreen.patch 742 RMD160 051282cd14faa40a8dffed131aaaee7b9a786dde SHA1 982c4494dab50270c52ecb37ee82703dcf70e6d0 SHA256 5b207a3282fb5dee52f271668af306df82cd2f14593f48497a895fec397e0e45
 MD5 46aacff8b2ed5e40ae9545fc51f7c72c files/freenx-0.5.0-fullscreen.patch 742
 RMD160 051282cd14faa40a8dffed131aaaee7b9a786dde files/freenx-0.5.0-fullscreen.patch 742
@@ -18,79 +10,19 @@ AUX freenx-0.5.0-startup.patch 614 RMD160 77a71ec51e6cb781f927363dd21014b900a324
 MD5 24ec695b0851ee0a329a0a3af5b3849f files/freenx-0.5.0-startup.patch 614
 RMD160 77a71ec51e6cb781f927363dd21014b900a3247b files/freenx-0.5.0-startup.patch 614
 SHA256 31f4bc50e63fd03eb48b6e90fc17062c0f45073b9578c0514ae7c209a1714042 files/freenx-0.5.0-startup.patch 614
-AUX nxserver-freenx-0.4.4-xorg7.patch 569 RMD160 b67f4245d974cc1ea632797832d68effd7a43c12 SHA1 89d6f214e91e5d0ae634309b283242c9613329b7 SHA256 2495be930c061b4389e5287979e78ada02c754d6252c33af5a2e6564d2df2dc5
-MD5 0fcfdb1adc7a94eece68cfd65a522b7f files/nxserver-freenx-0.4.4-xorg7.patch 569
-RMD160 b67f4245d974cc1ea632797832d68effd7a43c12 files/nxserver-freenx-0.4.4-xorg7.patch 569
-SHA256 2495be930c061b4389e5287979e78ada02c754d6252c33af5a2e6564d2df2dc5 files/nxserver-freenx-0.4.4-xorg7.patch 569
-AUX nxserver-freenx-xorg7.patch 590 RMD160 ad610f08f19fed4365903883e9ac58c8765566ba SHA1 21444d5e71e66f8cf24b9292d8aa35dec6c98c49 SHA256 f690fa88b718e47c9d545f185bfa88ce8cf2c96ed0de26cd2ca27118c711e225
-MD5 2a253055c0eef647a0a8b922f321842d files/nxserver-freenx-xorg7.patch 590
-RMD160 ad610f08f19fed4365903883e9ac58c8765566ba files/nxserver-freenx-xorg7.patch 590
-SHA256 f690fa88b718e47c9d545f185bfa88ce8cf2c96ed0de26cd2ca27118c711e225 files/nxserver-freenx-xorg7.patch 590
-AUX nxserver-path.diff 718 RMD160 6ddec39e9005fefd475e208f369b231e9501c5c7 SHA1 c84fc802a151bbc64a56548b9f49a095868b12e7 SHA256 7fd2616f3f9a3165fbd12a1a05ab1081d7da8c6efe139029b5d401b04bbe1985
-MD5 f58cf7014a645ce96afd27989a893c2f files/nxserver-path.diff 718
-RMD160 6ddec39e9005fefd475e208f369b231e9501c5c7 files/nxserver-path.diff 718
-SHA256 7fd2616f3f9a3165fbd12a1a05ab1081d7da8c6efe139029b5d401b04bbe1985 files/nxserver-path.diff 718
-DIST FreeNX-0_5_0-LWE.tar.gz 347935
-DIST freenx-0.2.7.tar.gz 26013
-DIST freenx-0.2.8.tar.gz 26180
-DIST freenx-0.4.0.tar.gz 42771
-DIST freenx-0.4.4.tar.gz 46111
 DIST freenx-0.5.0-5.fc5.i386.rpm 62859 RMD160 1c7bef90d5610ab265d9a66253d2bda1663e6e1a SHA1 b8845b592ee3818f028b3201b17912ce1820d45b SHA256 8d5224e825191d330e85996815f1b2ecb8b733853c24e7704cf0ea7b52237016
-DIST freenx-0.5.0-test-2006-03-11-7.tar.gz 50703 RMD160 28c4fde550ecb2b6a25bbfb56e16b763ee02b6a3 SHA1 75f149f077eb0c4ad58f5316351e58317d8955f7 SHA256 89e63681955d98382e04798d5a9f8d8d0064ca999bbb155907b4a262c59a4f0e
-EBUILD nxserver-freenx-0.2.7.ebuild 2744 RMD160 1026628a7dd94d965075ebd8a2648468b54d7f6f SHA1 d9a255e42fcc56c43753e1f5422df5213a1befc6 SHA256 ef68c9db8ea46f275edb2b611ae06f761e2a4706c5a93dff4f45f43e6e266207
-MD5 95bc5eb4659bbab6c1b40fe962683ee5 nxserver-freenx-0.2.7.ebuild 2744
-RMD160 1026628a7dd94d965075ebd8a2648468b54d7f6f nxserver-freenx-0.2.7.ebuild 2744
-SHA256 ef68c9db8ea46f275edb2b611ae06f761e2a4706c5a93dff4f45f43e6e266207 nxserver-freenx-0.2.7.ebuild 2744
-EBUILD nxserver-freenx-0.2.8.ebuild 2932 RMD160 a49e739b6fb99532607d47b765834ee1c43e8475 SHA1 7668e5e32f5fc4d3f20fb252256f9db473d4ed6d SHA256 b685afbdeea7747a46ca2ab11e56deaf82ac2e2cd4050ed1a22412ea89704b9c
-MD5 04d7b917ab2c64f2732141f4e8af10ec nxserver-freenx-0.2.8.ebuild 2932
-RMD160 a49e739b6fb99532607d47b765834ee1c43e8475 nxserver-freenx-0.2.8.ebuild 2932
-SHA256 b685afbdeea7747a46ca2ab11e56deaf82ac2e2cd4050ed1a22412ea89704b9c nxserver-freenx-0.2.8.ebuild 2932
-EBUILD nxserver-freenx-0.4.0.ebuild 2905 RMD160 d919d7c10f299bb7e3375197de67879e32400479 SHA1 f4ff49325f170345c4e1d9a33b7a4f4dd162de37 SHA256 bd39f3cfd9c050942111db1d5e51456b755abd301fba33182fe0fcf8751639d5
-MD5 8e4563ab87d9d2099bcb111d74c4a0b2 nxserver-freenx-0.4.0.ebuild 2905
-RMD160 d919d7c10f299bb7e3375197de67879e32400479 nxserver-freenx-0.4.0.ebuild 2905
-SHA256 bd39f3cfd9c050942111db1d5e51456b755abd301fba33182fe0fcf8751639d5 nxserver-freenx-0.4.0.ebuild 2905
-EBUILD nxserver-freenx-0.4.4-r1.ebuild 4436 RMD160 6daca0d04bb9b4113c94d3ca4f3120e0db6cd3ab SHA1 fac14e4447c399a0574a94ad6048d80257621b49 SHA256 8a9f5eed85fc01ab187e9429476e7a14ddcf09c2027c549fd8ecf66ee0fd1a40
-MD5 aac5b06dcaff3997372d3ad50e4d9004 nxserver-freenx-0.4.4-r1.ebuild 4436
-RMD160 6daca0d04bb9b4113c94d3ca4f3120e0db6cd3ab nxserver-freenx-0.4.4-r1.ebuild 4436
-SHA256 8a9f5eed85fc01ab187e9429476e7a14ddcf09c2027c549fd8ecf66ee0fd1a40 nxserver-freenx-0.4.4-r1.ebuild 4436
 EBUILD nxserver-freenx-0.5.0-r1.ebuild 3281 RMD160 da387b20eec64a774892491c812b02b938835cfd SHA1 bdc06a17c9eede06363d6641d8baee9a58594edf SHA256 007a69d29ee824849b1b2f50b15c65aa66910c4c3abb47cec9e90de62a296ff7
 MD5 e5ae77e91d1a3026f9f3a5ae9d188da1 nxserver-freenx-0.5.0-r1.ebuild 3281
 RMD160 da387b20eec64a774892491c812b02b938835cfd nxserver-freenx-0.5.0-r1.ebuild 3281
 SHA256 007a69d29ee824849b1b2f50b15c65aa66910c4c3abb47cec9e90de62a296ff7 nxserver-freenx-0.5.0-r1.ebuild 3281
-EBUILD nxserver-freenx-0.5.0.20060311-r1.ebuild 4125 RMD160 091a2321186c108a17f8b703bbf898e93e6da137 SHA1 7f4d7dfe4fefdf5e47941bdecd178f13f8084ffd SHA256 64c257f44df7c4f34bb9e21ed7af78143550a1fe460888337516c09498310a7c
-MD5 b499beadc1cab73a28850abf506feb2b nxserver-freenx-0.5.0.20060311-r1.ebuild 4125
-RMD160 091a2321186c108a17f8b703bbf898e93e6da137 nxserver-freenx-0.5.0.20060311-r1.ebuild 4125
-SHA256 64c257f44df7c4f34bb9e21ed7af78143550a1fe460888337516c09498310a7c nxserver-freenx-0.5.0.20060311-r1.ebuild 4125
-EBUILD nxserver-freenx-0.5.0.ebuild 3116 RMD160 41e03b55cbafdf87cacf4d719f62fd7e29058449 SHA1 042d8eac8f3cffc9fc9dbeba69eb84e10e336ed6 SHA256 5cbae026d6403540654804b2fdb9e8bdf17192d0d7fd32173fe47ed882590171
-MD5 bd9ca4ace1427f2cd7380549e5302a9b nxserver-freenx-0.5.0.ebuild 3116
-RMD160 41e03b55cbafdf87cacf4d719f62fd7e29058449 nxserver-freenx-0.5.0.ebuild 3116
-SHA256 5cbae026d6403540654804b2fdb9e8bdf17192d0d7fd32173fe47ed882590171 nxserver-freenx-0.5.0.ebuild 3116
-MISC ChangeLog 4607 RMD160 bb8e8e01897b74c7c4eac050f10a5e830eca95ca SHA1 6de6baca96f194ffc95ebc62f86bc23810f65bc9 SHA256 1afef215e211a68f211b745193b6c8e60f00e8f7708ff1b09e96d0d1a22785b5
-MD5 9f12a5fb9ace5509bf85fb378050f17f ChangeLog 4607
-RMD160 bb8e8e01897b74c7c4eac050f10a5e830eca95ca ChangeLog 4607
-SHA256 1afef215e211a68f211b745193b6c8e60f00e8f7708ff1b09e96d0d1a22785b5 ChangeLog 4607
+MISC ChangeLog 5064 RMD160 96be1f663bb0b78255c326e55d89a83fe799c4ca SHA1 1ce8100a4230afa584da226856dcb7be3f0184a7 SHA256 848b3fcb2e68ee9ee130bc95ac3bdf50564db1c2f931e1c43e16912319552569
+MD5 fd3d08d53b66af531850886396267416 ChangeLog 5064
+RMD160 96be1f663bb0b78255c326e55d89a83fe799c4ca ChangeLog 5064
+SHA256 848b3fcb2e68ee9ee130bc95ac3bdf50564db1c2f931e1c43e16912319552569 ChangeLog 5064
 MISC metadata.xml 482 RMD160 43d7ffbdffac6f9862dfea8535446439e8c03cc7 SHA1 a2003ef81f5113c3b1bffd54510a0b5417e30c0e SHA256 a057fa4844b9a4b9a6213a3dad7e620bee77a1e36bc0571ea948ecf585c17e45
 MD5 77fd36d93b0a1b9f35abbe6a1c146561 metadata.xml 482
 RMD160 43d7ffbdffac6f9862dfea8535446439e8c03cc7 metadata.xml 482
 SHA256 a057fa4844b9a4b9a6213a3dad7e620bee77a1e36bc0571ea948ecf585c17e45 metadata.xml 482
-MD5 3210d19111775fb0cf59fb578879c5c2 files/digest-nxserver-freenx-0.2.7 63
-RMD160 a2335acfa0cdb6aeafa902ff34f5f2188330ea85 files/digest-nxserver-freenx-0.2.7 63
-SHA256 a89dba1cdfec543eac8f700b7b2406d0bfd54df8aee7f05d425be831e12ad919 files/digest-nxserver-freenx-0.2.7 63
-MD5 68fcece75aaa5f55ad36a18960a56806 files/digest-nxserver-freenx-0.2.8 63
-RMD160 c51c7162ff5d2f029e41852d25b88345fec06fbd files/digest-nxserver-freenx-0.2.8 63
-SHA256 3e201c39caff114825858a8d84e0d45e2c6caa0bdeebb5e82cd7463417c2f758 files/digest-nxserver-freenx-0.2.8 63
-MD5 113c67a0f8b1fb7bc3d06e118148b5cc files/digest-nxserver-freenx-0.4.0 63
-RMD160 5b1df337f9d78e834429a681fb20c6554707c9b7 files/digest-nxserver-freenx-0.4.0 63
-SHA256 93e4ad339577b2d283b0ecd55167c71756629b1e558974514102696570f8ff61 files/digest-nxserver-freenx-0.4.0 63
-MD5 02eda4039532351fcb86f05b76ec6c71 files/digest-nxserver-freenx-0.4.4-r1 63
-RMD160 9e46c9dc33face1c301249e50e1db13de56e6ff0 files/digest-nxserver-freenx-0.4.4-r1 63
-SHA256 0f966a86b918df42aaf9a551b13c72d2e945099075a3c162f13ee90488ee4a0d files/digest-nxserver-freenx-0.4.4-r1 63
-MD5 af8c0526caa55cfa9351550578b7dd6e files/digest-nxserver-freenx-0.5.0 68
-RMD160 e7821afb7cca9c8608c3fbcfae22da7baf33e7a2 files/digest-nxserver-freenx-0.5.0 68
-SHA256 3d9a5881dbd550f15f3210de39fd0352663b69d7f34c90749195e6aa56ee3db4 files/digest-nxserver-freenx-0.5.0 68
 MD5 6c95395d73159a977cb252ca79283e16 files/digest-nxserver-freenx-0.5.0-r1 259
 RMD160 e40911d7dbe507a6946045b0edf6adae50b6aea7 files/digest-nxserver-freenx-0.5.0-r1 259
 SHA256 32a053208d0c362191602daff58fecb0fae0fa297ff75ad39686e42de35b18d5 files/digest-nxserver-freenx-0.5.0-r1 259
-MD5 7331228d43bfbad61df36b7330424c8e files/digest-nxserver-freenx-0.5.0.20060311-r1 289
-RMD160 c878c332c3b86e04428b2a5ae84bcbd776424344 files/digest-nxserver-freenx-0.5.0.20060311-r1 289
-SHA256 e5907d10423769e2a53586e6a14c24fdb7dcadf1adb4c787771c4e8d63526d2c files/digest-nxserver-freenx-0.5.0.20060311-r1 289
diff --git a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.2.7 b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.2.7
deleted file mode 100644
index 33779085b20a..000000000000
--- a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.2.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 982a4828417d15bce0b0096c22f85ec3 freenx-0.2.7.tar.gz 26013
diff --git a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.2.8 b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.2.8
deleted file mode 100644
index 19a96542d005..000000000000
--- a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.2.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 db4c4a9f91619f4d9ac30fdea10925e8 freenx-0.2.8.tar.gz 26180
diff --git a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.4.0 b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.4.0
deleted file mode 100644
index 0009e0697eb2..000000000000
--- a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a57046e79fb980b4720ec6ae67ed1f19 freenx-0.4.0.tar.gz 42771
diff --git a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.4.4-r1 b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.4.4-r1
deleted file mode 100644
index 3197a7a87dba..000000000000
--- a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.4.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4d92f80718edbaacd875404bcb2850b6 freenx-0.4.4.tar.gz 46111
diff --git a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.5.0 b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.5.0
deleted file mode 100644
index 93aa9bdf73dd..000000000000
--- a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 83ae22508076bdae2a45f7900dea071e FreeNX-0_5_0-LWE.tar.gz 347935
diff --git a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.5.0.20060311-r1 b/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.5.0.20060311-r1
deleted file mode 100644
index 6352416f21c5..000000000000
--- a/net-misc/nxserver-freenx/files/digest-nxserver-freenx-0.5.0.20060311-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b627433904cd6eed38b14524d3b45cbd freenx-0.5.0-test-2006-03-11-7.tar.gz 50703
-RMD160 28c4fde550ecb2b6a25bbfb56e16b763ee02b6a3 freenx-0.5.0-test-2006-03-11-7.tar.gz 50703
-SHA256 89e63681955d98382e04798d5a9f8d8d0064ca999bbb155907b4a262c59a4f0e freenx-0.5.0-test-2006-03-11-7.tar.gz 50703
diff --git a/net-misc/nxserver-freenx/files/fixes.diff b/net-misc/nxserver-freenx/files/fixes.diff
deleted file mode 100644
index b82e9ce63580..000000000000
--- a/net-misc/nxserver-freenx/files/fixes.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -u --recursive freenx-0.2.8-orig/nxclient freenx-0.2.8/nxclient
---- freenx-0.2.8-orig/nxclient	2005-02-17 20:03:15.000000000 +0000
-+++ freenx-0.2.8/nxclient	2005-02-18 18:59:20.843775240 +0000
-@@ -8,7 +8,9 @@
- #       it does check it someday.
- 
- # First check if the commercial nxclient is available and use it
--[ -x /usr/NX/bin/nxclient ] && exec /usr/NX/bin/nxclient "$@"
-+# but check that it isn't this script to prevent a loop!
-+NXCLIENT="/usr/NX/bin/nxclient"
-+[ -x ${NXCLIENT} -a "`file -bi ${NXCLIENT}`" != 'application/x-shellscript' ] && exec ${NXCLIENT} "$@"
- 
- TEMP=`getopt -a -o d: --long local,noautokill,dialog:,caption:,message:,display: -n $(basename $0) -- "$@"`
- 
-diff -u --recursive freenx-0.2.8-orig/nxserver freenx-0.2.8/nxserver
---- freenx-0.2.8-orig/nxserver	2005-02-17 20:03:15.000000000 +0000
-+++ freenx-0.2.8/nxserver	2005-02-18 19:01:54.465015048 +0000
-@@ -495,7 +495,7 @@
- 
- server_nxnode_start_wait()
- {
--	server_nxnode_start $@ | while read CMD
-+	server_nxnode_start "$@" | while read CMD
- 	do
- 		case "$CMD" in 
- 			"NX> 1006"*|"NX> 1005"*)
diff --git a/net-misc/nxserver-freenx/files/freenx-0.4.4-adduser-fix.patch b/net-misc/nxserver-freenx/files/freenx-0.4.4-adduser-fix.patch
deleted file mode 100644
index 773ef3a28e4b..000000000000
--- a/net-misc/nxserver-freenx/files/freenx-0.4.4-adduser-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -purN freenx-0.4.4.org/nxsetup freenx-0.4.4.new/nxsetup
---- freenx-0.4.4.org/nxsetup	2005-08-02 12:29:59.000000000 -0500
-+++ freenx-0.4.4.new/nxsetup	2005-08-07 19:17:08.000000000 -0500
-@@ -116,7 +116,11 @@ useradd_nx()
- 	# no, its a "normal" useradd
- 	else
- 		USERADD_OPTIONS="-d $NX_HOME_DIR -s $PATH_BIN/nxserver"
--		[ -n $SETUP_GID ] && USERADD_OPTIONS="-g $SETUP_GID $USERADD_OPTIONS"
-+		# gid specified?
-+		if [ -n "$SETUP_GID" ]
-+		then
-+			USERADD_OPTIONS="-g $SETUP_GID $USERADD_OPTIONS"
-+		fi
- 		# uid specified?
- 		if [ -n "$SETUP_UID" ]
- 		then
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-0.4.4-xorg7.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-0.4.4-xorg7.patch
deleted file mode 100644
index 297befea92f2..000000000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-0.4.4-xorg7.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- freenx-server/nxnode	2005-08-07 12:53:57.000000000 +0300
-+++ freenx-server/nxnode	2006-02-02 00:00:25.000000000 +0200
-@@ -22,6 +22,15 @@
- 
- echo "NX> 1000 NXNODE - Version $NX_VERSION $NX_LICENSE"
- 
-+### Patch for Xorg-x11 >=7.0 by Oskari Rauta begins here ###
-+
-+if test `X -version 2>&1 | grep "X Window System Version" | awk '{ print $5 }' | awk -F. '{ print $1 }'` -ge 7
-+	then
-+		export XKEYSYMDB=/usr/share/X11/XKeysymDB
-+	fi
-+
-+### Patch for Xorg-x11 >= 7.0 by Oskari Rauta ends here..
-+
- if [ "$1" != "--check" -a "$1" != "--setkey" ]
- then 
- 	read CMDLINE
diff --git a/net-misc/nxserver-freenx/files/nxserver-freenx-xorg7.patch b/net-misc/nxserver-freenx/files/nxserver-freenx-xorg7.patch
deleted file mode 100644
index 9884756c0af6..000000000000
--- a/net-misc/nxserver-freenx/files/nxserver-freenx-xorg7.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- freenx-server/nxnode	2005-08-07 12:53:57.000000000 +0300
-+++ freenx-server/nxnode	2006-02-02 00:00:25.000000000 +0200
-@@ -22,6 +22,15 @@
- 
- echo "NX> 1000 NXNODE - Version $NX_VERSION $NX_LICENSE"
- 
-+### Patch for Xorg-x11 >=7.0 by Oskari Rauta begins here ###
-+
-+if test `X -version 2>&1 | grep "X Window System Version" | awk '{ print $5 }' | awk -F. '{ print $1 }'` -ge 7
-+	then
-+		export XKEYSYMDB=/usr/share/X11/XKeysymDB
-+	fi
-+
-+### Patch for Xorg-x11 >= 7.0 by Oskari Rauta ends here..
-+
- if [ "$1" != "--check" -a "$1" != "--setkey" -a "$1" != "--agent" ]
- then 
- 	read CMDLINE
diff --git a/net-misc/nxserver-freenx/files/nxserver-path.diff b/net-misc/nxserver-freenx/files/nxserver-path.diff
deleted file mode 100644
index 1e734c9cc36a..000000000000
--- a/net-misc/nxserver-freenx/files/nxserver-path.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- nxserver.orig	2004-12-12 15:51:12.283474376 -0500
-+++ nxserver	2004-12-12 15:51:46.385290112 -0500
-@@ -487,7 +487,7 @@
- 	# Use nxnode-login?
- 	if [ "$PAM_LOGIN_METHOD" = "1" ]
- 	then
--	  echo $PAM_PASS | nxnode-login "$USER" 127.0.0.1 "-p$SSHD_AUTH_PORT" "$CMD" "$@" 2>&1 | log_tee
-+	  echo $PAM_PASS | $NX_DIR/bin/nxnode-login "$USER" 127.0.0.1 "-p$SSHD_AUTH_PORT" "$CMD" "$@" 2>&1 | log_tee
- 	else
- 	  echo "$@" | ssh -l "$USER" 127.0.0.1 -p $SSHD_AUTH_PORT -x -2 -i $NX_ETC_DIR/users.id_dsa -o 'PubkeyAuthentication yes' -o 'RSAAuthentication yes' -o 'RhostsAuthentication no' -o 'PasswordAuthentication no' -o 'RhostsRSAAuthentication no' -o 'StrictHostKeyChecking no' $NX_DIR/bin/nxnode "$CMD" | log_tee
- 	fi
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.2.7.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.2.7.ebuild
deleted file mode 100644
index 79a0effe8737..000000000000
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.2.7.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.2.7.ebuild,v 1.2 2005/10/02 14:43:31 flameeyes Exp $
-
-inherit eutils
-
-DESCRIPTION="Windows Remote Desktop for X11"
-HOMEPAGE="http://www.kalyxo.org/twiki/bin/view/Main/FreeNX"
-SRC_URI="http://debian.tu-bs.de/knoppix/nx/freenx-${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND="net-misc/nx-x11
-		=net-misc/nxclient-1.4*
-		dev-tcltk/expect
-		net-analyzer/gnu-netcat"
-
-S=${WORKDIR}/freenx-${PV}
-
-pkg_setup () {
-	enewuser nx -1 -1 /usr/NX/home/nx
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch gentoo-nomachine.diff
-	epatch ${FILESDIR}/nxserver-path.diff
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-
-	NX_ROOT_DIR="/usr/NX"
-	NX_BIN_DIR=${NX_ROOT_DIR}/bin
-	NX_ETC_DIR=${NX_ROOT_DIR}/etc
-	NX_HOME_ROOT=${NX_ROOT_DIR}/home
-	NX_HOME_DIR=${NX_HOME_ROOT}/nx
-	NX_SSH_DIR=${NX_HOME_DIR}/.ssh
-	NX_SESS_DIR=${NX_ROOT_DIR}/var/db
-
-	# our job here is to make this package look as much like the commercial
-	# nxserver as possible
-	#
-	# this means we only have to maintain the one pkg_postinst() function
-	# for both the commercial and gpl'd servers :)
-
-	into $NX_ROOT_DIR
-	dobin nxserver
-	dobin nxnode
-	dobin nxnode-login
-	dobin nxkeygen
-
-	dodir ${NX_ETC_DIR}
-	for x in passwords passwords.orig ; do
-		touch ${D}${NX_ETC_DIR}/$x
-		chmod 600 ${D}${NX_ETC_DIR}/$x
-	done
-
-	ssh-keygen -f ${D}${NX_ETC_DIR}/users.id_dsa -t dsa -N "" -q
-
-	for x in closed running failed ; do
-		keepdir ${NX_SESS_DIR}/$x
-		fperms 0700 ${NX_SESS_DIR}/$x
-	done
-
-	dodir ${NX_SSH_DIR}
-	fperms 0700 ${NX_HOME_DIR}
-	fperms 0700 ${NX_SSH_DIR}
-
-	cat << EOF >${D}${NX_SSH_DIR}/server.id_dsa.pub.key
-ssh-dss AAAAB3NzaC1kc3MAAACBAJe/0DNBePG9dYLWq7cJ0SqyRf1iiZN/IbzrmBvgPTZnBa5FT/0Lcj39sRYt1paAlhchwUmwwIiSZaON5JnJOZ6jKkjWIuJ9MdTGfdvtY1aLwDMpxUVoGwEaKWOyin02IPWYSkDQb6cceuG9NfPulS9iuytdx0zIzqvGqfvudtufAAAAFQCwosRXR2QA8OSgFWSO6+kGrRJKiwAAAIEAjgvVNAYWSrnFD+cghyJbyx60AAjKtxZ0r/Pn9k94Qt2rvQoMnGgt/zU0v/y4hzg+g3JNEmO1PdHh/wDPVOxlZ6Hb5F4IQnENaAZ9uTZiFGqhBO1c8Wwjiq/MFZy3jZaidarLJvVs8EeT4mZcWxwm7nIVD4lRU2wQ2lj4aTPcepMAAACANlgcCuA4wrC+3Cic9CFkqiwO/Rn1vk8dvGuEQqFJ6f6LVfPfRTfaQU7TGVLk2CzY4dasrwxJ1f6FsT8DHTNGnxELPKRuLstGrFY/PR7KeafeFZDf+fJ3mbX5nxrld3wi5titTnX+8s4IKv29HJguPvOK/SI7cjzA+SqNfD7qEo8= root@nettuno
-EOF
-	fperms 0600 ${NX_SSH_DIR}/server.id_dsa.pub.key
-	cp ${D}${NX_SSH_DIR}/server.id_dsa.pub.key ${D}${NX_SSH_DIR}/authorized_keys2
-	fperms 0600 ${NX_SSH_DIR}/authorized_keys2
-
-	echo -n "127.0.0.1" ${D}${NX_SSH_DIR}/known_hosts
-
-	chown -R nx:root ${D}/usr/NX
-
-}
-
-pkg_postinst () {
-	usermod -s /usr/NX/bin/nxserver nx || die "Unable to set login shell of nx user!!"
-}
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.2.8.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.2.8.ebuild
deleted file mode 100644
index 90f6524a6fe3..000000000000
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.2.8.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nxserver-freenx/nxserver-freenx-0.2.8.ebuild,v 1.2 2005/10/02 14:43:31 flameeyes Exp $
-
-inherit eutils
-
-DESCRIPTION="Windows Remote Desktop for X11"
-HOMEPAGE="http://www.kalyxo.org/twiki/bin/view/Main/FreeNX"
-SRC_URI="http://debian.tu-bs.de/knoppix/nx/freenx-${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE="commercial"
-DEPEND="net-misc/nx-x11
-		!ppc? ( commercial? ( =net-misc/nxclient-1.4* ) )
-		!commercial? ( =net-misc/nxssh-1.4* =net-misc/nxproxy-1.4* !net-misc/nxclient )
-		dev-tcltk/expect
-		net-analyzer/gnu-netcat"
-
-S=${WORKDIR}/freenx-${PV}
-
-pkg_setup () {
-	enewuser nx -1 -1 /usr/NX/home/nx
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch gentoo-nomachine.diff
-	epatch ${FILESDIR}/nxserver-path.diff
-	epatch ${FILESDIR}/fixes.diff
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-
-	NX_ROOT_DIR="/usr/NX"
-	NX_BIN_DIR=${NX_ROOT_DIR}/bin
-	NX_ETC_DIR=${NX_ROOT_DIR}/etc
-	NX_HOME_ROOT=${NX_ROOT_DIR}/home
-	NX_HOME_DIR=${NX_HOME_ROOT}/nx
-	NX_SSH_DIR=${NX_HOME_DIR}/.ssh
-	NX_SESS_DIR=${NX_ROOT_DIR}/var/db
-
-	# our job here is to make this package look as much like the commercial
-	# nxserver as possible
-	#
-	# this means we only have to maintain the one pkg_postinst() function
-	# for both the commercial and gpl'd servers :)
-
-	into $NX_ROOT_DIR
-	dobin nxserver
-	dobin nxnode
-	dobin nxnode-login
-	dobin nxkeygen
-	useq commercial ||  dobin nxclient
-
-	dodir ${NX_ETC_DIR}
-	for x in passwords passwords.orig ; do
-		touch ${D}${NX_ETC_DIR}/$x
-		chmod 600 ${D}${NX_ETC_DIR}/$x
-	done
-
-	ssh-keygen -f ${D}${NX_ETC_DIR}/users.id_dsa -t dsa -N "" -q
-
-	for x in closed running failed ; do
-		keepdir ${NX_SESS_DIR}/$x
-		fperms 0700 ${NX_SESS_DIR}/$x
-	done
-
-	dodir ${NX_SSH_DIR}
-	fperms 0700 ${NX_HOME_DIR}
-	fperms 0700 ${NX_SSH_DIR}
-
-	cat << EOF >${D}${NX_SSH_DIR}/server.id_dsa.pub.key
-ssh-dss AAAAB3NzaC1kc3MAAACBAJe/0DNBePG9dYLWq7cJ0SqyRf1iiZN/IbzrmBvgPTZnBa5FT/0Lcj39sRYt1paAlhchwUmwwIiSZaON5JnJOZ6jKkjWIuJ9MdTGfdvtY1aLwDMpxUVoGwEaKWOyin02IPWYSkDQb6cceuG9NfPulS9iuytdx0zIzqvGqfvudtufAAAAFQCwosRXR2QA8OSgFWSO6+kGrRJKiwAAAIEAjgvVNAYWSrnFD+cghyJbyx60AAjKtxZ0r/Pn9k94Qt2rvQoMnGgt/zU0v/y4hzg+g3JNEmO1PdHh/wDPVOxlZ6Hb5F4IQnENaAZ9uTZiFGqhBO1c8Wwjiq/MFZy3jZaidarLJvVs8EeT4mZcWxwm7nIVD4lRU2wQ2lj4aTPcepMAAACANlgcCuA4wrC+3Cic9CFkqiwO/Rn1vk8dvGuEQqFJ6f6LVfPfRTfaQU7TGVLk2CzY4dasrwxJ1f6FsT8DHTNGnxELPKRuLstGrFY/PR7KeafeFZDf+fJ3mbX5nxrld3wi5titTnX+8s4IKv29HJguPvOK/SI7cjzA+SqNfD7qEo8= root@nettuno
-EOF
-	fperms 0600 ${NX_SSH_DIR}/server.id_dsa.pub.key
-	cp ${D}${NX_SSH_DIR}/server.id_dsa.pub.key ${D}${NX_SSH_DIR}/authorized_keys2
-	fperms 0600 ${NX_SSH_DIR}/authorized_keys2
-
-	echo -n "127.0.0.1" ${D}${NX_SSH_DIR}/known_hosts
-
-	chown -R nx:root ${D}/usr/NX
-}
-
-pkg_postinst () {
-	usermod -s /usr/NX/bin/nxserver nx || die "Unable to set login shell of nx user!!"
-}
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.4.0.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.4.0.ebuild
deleted file mode 100644
index 29c591d12d0d..000000000000
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.4.0.ebuild
+++ /dev/null
@@ -1,94 +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/nxserver-freenx/nxserver-freenx-0.4.0.ebuild,v 1.3 2006/01/11 04:43:26 weeve Exp $
-
-inherit eutils
-
-DESCRIPTION="An X11/RDP/VNC proxy server especially well suited to low bandwidth links such as ISDN or modem"
-HOMEPAGE="http://freenx.berlios.de/"
-SRC_URI="http://debian.tu-bs.de/knoppix/nx/freenx-${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~sparc ~x86"
-RESTRICT="nomirror strip"
-IUSE="commercial"
-DEPEND="virtual/ssh
-	dev-tcltk/expect
-	net-analyzer/gnu-netcat
-	x86? ( commercial? ( =net-misc/nxclient-1.4* )
-	      !commercial? ( !net-misc/nxclient ) )
-	!x86? ( !net-misc/nxclient )
-	>=net-misc/nxproxy-1.4.0
-	=net-misc/nx-x11-1.4*
-	!net-misc/nxserver-personal
-	!net-misc/nxserver-business
-	!net-misc/nxserver-enterprise"
-
-S=${WORKDIR}/freenx-${PV}
-
-pkg_setup () {
-	enewuser nx -1 -1 /usr/NX/home/nx
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch gentoo-nomachine.diff
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-
-	NX_DIR=/usr/NX
-	NX_ETC_DIR=$NX_DIR/etc
-	NX_SESS_DIR=$NX_DIR/var/db
-	NX_HOME_DIR=$NX_DIR/home/nx
-
-	into ${NX_DIR}
-	dobin nxserver
-	dobin nxnode
-	dobin nxnode-login
-	dobin nxkeygen
-	dobin nxloadconfig
-	dobin nxsetup
-	( use x86 && use commercial ) || dobin nxprint
-	( use x86 && use commercial ) || dobin nxclient
-
-	dodir ${NX_ETC_DIR}
-	for x in passwords passwords.orig ; do
-		touch ${D}${NX_ETC_DIR}/$x
-		chmod 600 ${D}${NX_ETC_DIR}/$x
-	done
-
-	insinto ${NX_ETC_DIR}
-	doins node.conf.sample
-
-	ssh-keygen -f ${D}${NX_ETC_DIR}/users.id_dsa -t dsa -N "" -q
-
-	for x in closed running failed ; do
-		keepdir ${NX_SESS_DIR}/$x
-		fperms 0700 ${NX_SESS_DIR}/$x
-	done
-
-	dodir ${NX_HOME_DIR}/.ssh
-	fperms 0700 ${NX_HOME_DIR}
-	fperms 0700 ${NX_HOME_DIR}/.ssh
-
-	cat << EOF >${D}${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key
-ssh-dss AAAAB3NzaC1kc3MAAACBAJe/0DNBePG9dYLWq7cJ0SqyRf1iiZN/IbzrmBvgPTZnBa5FT/0Lcj39sRYt1paAlhchwUmwwIiSZaON5JnJOZ6jKkjWIuJ9MdTGfdvtY1aLwDMpxUVoGwEaKWOyin02IPWYSkDQb6cceuG9NfPulS9iuytdx0zIzqvGqfvudtufAAAAFQCwosRXR2QA8OSgFWSO6+kGrRJKiwAAAIEAjgvVNAYWSrnFD+cghyJbyx60AAjKtxZ0r/Pn9k94Qt2rvQoMnGgt/zU0v/y4hzg+g3JNEmO1PdHh/wDPVOxlZ6Hb5F4IQnENaAZ9uTZiFGqhBO1c8Wwjiq/MFZy3jZaidarLJvVs8EeT4mZcWxwm7nIVD4lRU2wQ2lj4aTPcepMAAACANlgcCuA4wrC+3Cic9CFkqiwO/Rn1vk8dvGuEQqFJ6f6LVfPfRTfaQU7TGVLk2CzY4dasrwxJ1f6FsT8DHTNGnxELPKRuLstGrFY/PR7KeafeFZDf+fJ3mbX5nxrld3wi5titTnX+8s4IKv29HJguPvOK/SI7cjzA+SqNfD7qEo8= root@nettuno
-EOF
-	fperms 0600 ${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key
-	cp ${D}${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key ${D}${NX_HOME_DIR}/.ssh/authorized_keys2
-	fperms 0600 ${NX_HOME_DIR}/.ssh/authorized_keys2
-
-	echo -n "127.0.0.1" ${D}${NX_HOME_DIR}/.ssh/known_hosts
-
-	chown -R nx:root ${D}${NX_DIR}
-}
-
-pkg_postinst () {
-	usermod -s /usr/NX/bin/nxserver nx || die "Unable to set login shell of nx user!!"
-}
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.4.4-r1.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.4.4-r1.ebuild
deleted file mode 100644
index a070ccc4a48a..000000000000
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.4.4-r1.ebuild
+++ /dev/null
@@ -1,134 +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/nxserver-freenx/nxserver-freenx-0.4.4-r1.ebuild,v 1.1 2006/04/30 19:38:46 stuart Exp $
-
-inherit multilib eutils
-
-DESCRIPTION="An X11/RDP/VNC proxy server especially well suited to low bandwidth links such as wireless, WANS, and worse"
-HOMEPAGE="http://freenx.berlios.de/"
-SRC_URI="http://debian.tu-bs.de/knoppix/nx/freenx-${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-RESTRICT="nomirror strip"
-IUSE="arts cups esd nxclient"
-DEPEND="virtual/ssh
-	dev-tcltk/expect
-	sys-apps/gawk
-	net-analyzer/gnu-netcat
-	x86? ( nxclient? ( >=net-misc/nxclient-1.4.0 )
-	      !nxclient? ( !net-misc/nxclient ) )
-	amd64? ( nxclient? ( >=net-misc/nxclient-1.4.0 )
-	      !nxclient? ( !net-misc/nxclient ) )
-	!x86? ( !amd64? ( !net-misc/nxclient ) )
-	>=net-misc/nxproxy-1.4.0
-	|| ( >=net-misc/nx-x11-1.4.0
-	     >=net-misc/nx-x11-bin-1.4.0 )
-	arts? ( kde-base/arts )
-	cups? ( net-print/cups )
-	esd? ( media-sound/esound )
-	!net-misc/nxserver-personal
-	!net-misc/nxserver-business
-	!net-misc/nxserver-enterprise"
-
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/freenx-${PV}
-
-pkg_setup () {
-	enewuser nx -1 -1 /usr/NX/home/nx
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch gentoo-nomachine.diff
-	# Patch to fix the adduser error
-	epatch $FILESDIR/freenx-0.4.4-adduser-fix.patch
-	epatch $FILESDIR/nxserver-freenx-0.4.4-xorg7.patch
-
-	# fix to make sure 32 bit libraries are used by nx-x11 on amd64
-	has_multilib_profile && \
-		sed -i "/PATH_LIB=/s/lib/$(get_abi_LIBDIR x86)/" nxloadconfig
-
-	# Change the defaults in nxloadconfig to meet the users needs.
-	if has_version "~net-misc/nx-x11-1.5.0" || has_version "~net-misc/nx-x11-bin-1.5.0" ; then
-		einfo "Enabling the NX 1.5.0 backend support."
-		sed -i '/ENABLE_1_5_0_BACKEND=/s/"0"/"1"/' nxloadconfig
-		sed -i '/ENABLE_1_5_0_BACKEND=/s/"0"/"1"/' node.conf.sample
-	fi
-	if use arts ; then
-		einfo "Enabling arts support."
-		sed -i '/ENABLE_ARTSD_PRELOAD=/s/"0"/"1"/' nxloadconfig
-		sed -i '/ENABLE_ARTSD_PRELOAD=/s/"0"/"1"/' node.conf.sample
-	fi
-	if use esd ; then
-		einfo "Enabling esd support."
-		sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' nxloadconfig
-		sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' node.conf.sample
-	fi
-	if use cups ; then
-		einfo "Enabling cups support."
-		sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' nxloadconfig
-		sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' node.conf.sample
-	fi
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-
-	NX_DIR=/usr/NX
-	NX_ETC_DIR=$NX_DIR/etc
-	NX_SESS_DIR=$NX_DIR/var/db
-	NX_HOME_DIR=$NX_DIR/home/nx
-
-	into ${NX_DIR}
-	dobin nxserver
-	dobin nxnode
-	dobin nxnode-login
-	dobin nxkeygen
-	dobin nxloadconfig
-	dobin nxsetup
-	( ( use x86 || use amd64 ) && use nxclient ) || dobin nxprint
-	( ( use x86 || use amd64 ) && use nxclient ) || dobin nxclient
-
-	dodir ${NX_ETC_DIR}
-	for x in passwords passwords.orig ; do
-		touch ${D}${NX_ETC_DIR}/$x
-		chmod 600 ${D}${NX_ETC_DIR}/$x
-	done
-
-	insinto ${NX_ETC_DIR}
-	doins node.conf.sample
-
-	ssh-keygen -f ${D}${NX_ETC_DIR}/users.id_dsa -t dsa -N "" -q
-
-	for x in closed running failed ; do
-		keepdir ${NX_SESS_DIR}/$x
-		fperms 0700 ${NX_SESS_DIR}/$x
-	done
-
-	dodir ${NX_HOME_DIR}/.ssh
-	fperms 0700 ${NX_HOME_DIR}
-	fperms 0700 ${NX_HOME_DIR}/.ssh
-
-	cat << EOF >${D}${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key
-ssh-dss AAAAB3NzaC1kc3MAAACBAJe/0DNBePG9dYLWq7cJ0SqyRf1iiZN/IbzrmBvgPTZnBa5FT/0Lcj39sRYt1paAlhchwUmwwIiSZaON5JnJOZ6jKkjWIuJ9MdTGfdvtY1aLwDMpxUVoGwEaKWOyin02IPWYSkDQb6cceuG9NfPulS9iuytdx0zIzqvGqfvudtufAAAAFQCwosRXR2QA8OSgFWSO6+kGrRJKiwAAAIEAjgvVNAYWSrnFD+cghyJbyx60AAjKtxZ0r/Pn9k94Qt2rvQoMnGgt/zU0v/y4hzg+g3JNEmO1PdHh/wDPVOxlZ6Hb5F4IQnENaAZ9uTZiFGqhBO1c8Wwjiq/MFZy3jZaidarLJvVs8EeT4mZcWxwm7nIVD4lRU2wQ2lj4aTPcepMAAACANlgcCuA4wrC+3Cic9CFkqiwO/Rn1vk8dvGuEQqFJ6f6LVfPfRTfaQU7TGVLk2CzY4dasrwxJ1f6FsT8DHTNGnxELPKRuLstGrFY/PR7KeafeFZDf+fJ3mbX5nxrld3wi5titTnX+8s4IKv29HJguPvOK/SI7cjzA+SqNfD7qEo8= root@nettuno
-EOF
-	fperms 0600 ${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key
-	cp ${D}${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key ${D}${NX_HOME_DIR}/.ssh/authorized_keys2
-	fperms 0600 ${NX_HOME_DIR}/.ssh/authorized_keys2
-
-	echo -n "127.0.0.1" ${D}${NX_HOME_DIR}/.ssh/known_hosts
-
-	chown -R nx:root ${D}${NX_DIR}
-}
-
-pkg_postinst () {
-	usermod -s /usr/NX/bin/nxserver nx || die "Unable to set login shell of nx user!!"
-
-	ewarn "NOTE: The commercial use flag was changed to nxclient."
-}
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.5.0.20060311-r1.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.5.0.20060311-r1.ebuild
deleted file mode 100644
index 6fe60fc74a55..000000000000
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.5.0.20060311-r1.ebuild
+++ /dev/null
@@ -1,127 +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/nxserver-freenx/nxserver-freenx-0.5.0.20060311-r1.ebuild,v 1.1 2006/04/30 19:38:46 stuart Exp $
-
-inherit multilib eutils
-
-DESCRIPTION="An X11/RDP/VNC proxy server especially well suited to low bandwidth links such as wireless, WANS, and worse"
-HOMEPAGE="http://freenx.berlios.de/"
-URI_BASE="http://studwww.ira.uka.de/~s_franz2/freenx"
-SRC_URI="$URI_BASE/freenx-0.5.0-test-2006-03-11-7.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-RESTRICT="nomirror strip"
-IUSE="arts cups esd nxclient"
-DEPEND="virtual/ssh
-	dev-tcltk/expect
-	sys-apps/gawk
-	net-analyzer/gnu-netcat
-	x86? ( nxclient? ( =net-misc/nxclient-1.5* )
-	      !nxclient? ( !net-misc/nxclient ) )
-	amd64? ( nxclient? ( =net-misc/nxclient-1.5* )
-	        !nxclient? ( !net-misc/nxclient ) )
-	!x86? ( !amd64? ( !net-misc/nxclient ) )
-	|| ( =net-misc/nx-x11-1.5*
-	     =net-misc/nx-x11-bin-1.5* )
-	arts? ( kde-base/arts )
-	cups? ( net-print/cups )
-	esd? ( media-sound/esound )
-	!net-misc/nxserver-personal
-	!net-misc/nxserver-business
-	!net-misc/nxserver-enterprise"
-
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/freenx-0.5.0-test-2006-03-11-7
-
-pkg_setup () {
-	enewuser nx -1 -1 /usr/NX/home/nx
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch gentoo-nomachine.diff
-	epatch $FILESDIR/nxserver-freenx-xorg7.patch
-
-	# fix to make sure 32 bit libraries are used by nx-x11 on amd64
-	has_multilib_profile && \
-		sed -i "/PATH_LIB=/s/lib/$(get_abi_LIBDIR x86)/" nxloadconfig
-
-	# Change the defaults in nxloadconfig to meet the users needs.
-	if use arts ; then
-		einfo "Enabling arts support."
-		sed -i '/ENABLE_ARTSD_PRELOAD=/s/"0"/"1"/' nxloadconfig
-		sed -i '/ENABLE_ARTSD_PRELOAD=/s/"0"/"1"/' node.conf.sample
-	fi
-	if use esd ; then
-		einfo "Enabling esd support."
-		sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' nxloadconfig
-		sed -i '/ENABLE_ESD_PRELOAD=/s/"0"/"1"/' node.conf.sample
-	fi
-	if use cups ; then
-		einfo "Enabling cups support."
-		sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' nxloadconfig
-		sed -i '/ENABLE_KDE_CUPS=/s/"0"/"1"/' node.conf.sample
-	fi
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-
-	NX_DIR=/usr/NX
-	NX_ETC_DIR=$NX_DIR/etc
-	NX_SESS_DIR=$NX_DIR/var/db
-	NX_HOME_DIR=$NX_DIR/home/nx
-
-	into ${NX_DIR}
-	dobin nxserver
-	dobin nxnode
-	dobin nxnode-login
-	dobin nxkeygen
-	dobin nxloadconfig
-	dobin nxsetup
-	( ( use x86 || use amd64 ) && use nxclient ) || dobin nxprint
-	( ( use x86 || use amd64 ) && use nxclient ) || dobin nxclient
-
-	dodir ${NX_ETC_DIR}
-	for x in passwords passwords.orig ; do
-		touch ${D}${NX_ETC_DIR}/$x
-		chmod 600 ${D}${NX_ETC_DIR}/$x
-	done
-
-	insinto ${NX_ETC_DIR}
-	doins node.conf.sample
-
-	ssh-keygen -f ${D}${NX_ETC_DIR}/users.id_dsa -t dsa -N "" -q
-
-	for x in closed running failed ; do
-		keepdir ${NX_SESS_DIR}/$x
-		fperms 0700 ${NX_SESS_DIR}/$x
-	done
-
-	dodir ${NX_HOME_DIR}/.ssh
-	fperms 0700 ${NX_HOME_DIR}
-	fperms 0700 ${NX_HOME_DIR}/.ssh
-
-	cat << EOF >${D}${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key
-ssh-dss AAAAB3NzaC1kc3MAAACBAJe/0DNBePG9dYLWq7cJ0SqyRf1iiZN/IbzrmBvgPTZnBa5FT/0Lcj39sRYt1paAlhchwUmwwIiSZaON5JnJOZ6jKkjWIuJ9MdTGfdvtY1aLwDMpxUVoGwEaKWOyin02IPWYSkDQb6cceuG9NfPulS9iuytdx0zIzqvGqfvudtufAAAAFQCwosRXR2QA8OSgFWSO6+kGrRJKiwAAAIEAjgvVNAYWSrnFD+cghyJbyx60AAjKtxZ0r/Pn9k94Qt2rvQoMnGgt/zU0v/y4hzg+g3JNEmO1PdHh/wDPVOxlZ6Hb5F4IQnENaAZ9uTZiFGqhBO1c8Wwjiq/MFZy3jZaidarLJvVs8EeT4mZcWxwm7nIVD4lRU2wQ2lj4aTPcepMAAACANlgcCuA4wrC+3Cic9CFkqiwO/Rn1vk8dvGuEQqFJ6f6LVfPfRTfaQU7TGVLk2CzY4dasrwxJ1f6FsT8DHTNGnxELPKRuLstGrFY/PR7KeafeFZDf+fJ3mbX5nxrld3wi5titTnX+8s4IKv29HJguPvOK/SI7cjzA+SqNfD7qEo8= root@nettuno
-EOF
-	fperms 0600 ${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key
-	cp ${D}${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key ${D}${NX_HOME_DIR}/.ssh/authorized_keys2
-	fperms 0600 ${NX_HOME_DIR}/.ssh/authorized_keys2
-
-	echo -n "127.0.0.1" ${D}${NX_HOME_DIR}/.ssh/known_hosts
-
-	chown -R nx:root ${D}${NX_DIR}
-}
-
-pkg_postinst () {
-	usermod -s /usr/NX/bin/nxserver nx || die "Unable to set login shell of nx user!!"
-
-	ewarn "NOTE: The commercial use flag was changed to nxclient."
-}
diff --git a/net-misc/nxserver-freenx/nxserver-freenx-0.5.0.ebuild b/net-misc/nxserver-freenx/nxserver-freenx-0.5.0.ebuild
deleted file mode 100644
index af4a1c95ec02..000000000000
--- a/net-misc/nxserver-freenx/nxserver-freenx-0.5.0.ebuild
+++ /dev/null
@@ -1,101 +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/nxserver-freenx/nxserver-freenx-0.5.0.ebuild,v 1.3 2006/03/12 22:04:57 swegener Exp $
-
-inherit eutils
-
-DESCRIPTION="An X11/RDP/VNC proxy server especially well suited to low bandwidth links such as ISDN or modem"
-HOMEPAGE="http://freenx.berlios.de/"
-SRC_URI="http://debian.tu-bs.de/knoppix/nx/lwe-release/FreeNX-0_5_0-LWE.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-RESTRICT="nomirror strip"
-IUSE="commercial"
-DEPEND="virtual/ssh
-	dev-tcltk/expect
-	net-analyzer/gnu-netcat
-	x86? ( commercial? ( >=net-misc/nxclient-1.4 )
-	      !commercial? ( !net-misc/nxclient ) )
-	!x86? ( !net-misc/nxclient )
-	>=net-misc/nxproxy-1.4.0
-	>=net-misc/nx-x11-1.4.0
-	!net-misc/nxserver-personal
-	!net-misc/nxserver-business
-	!net-misc/nxserver-enterprise"
-
-S=${WORKDIR}/FreeNX-0_5_0-LWE/freenx-server
-
-pkg_setup () {
-	enewuser nx -1 -1 /usr/NX/home/nx
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch gentoo-nomachine.diff
-}
-
-src_compile() {
-	einfo "Nothing to compile"
-}
-
-src_install() {
-
-	NX_DIR=/usr/NX
-	NX_ETC_DIR=$NX_DIR/etc
-	NX_SESS_DIR=$NX_DIR/var/db
-	NX_HOME_DIR=$NX_DIR/home/nx
-
-	into ${NX_DIR}
-	dobin nxserver
-	dobin nxnode
-	dobin nxnode-login
-	dobin nxkeygen
-	dobin nxloadconfig
-	dobin nxsetup
-	( use x86 && use commercial ) || dobin nxprint
-	( use x86 && use commercial ) || dobin nxclient
-
-	doenvd ${FILESDIR}/50nxserver
-
-	dodir ${NX_ETC_DIR}
-	for x in passwords passwords.orig ; do
-		touch ${D}${NX_ETC_DIR}/$x
-		chmod 600 ${D}${NX_ETC_DIR}/$x
-	done
-
-	insinto ${NX_ETC_DIR}
-	doins node.conf.sample
-
-	ssh-keygen -f ${D}${NX_ETC_DIR}/users.id_dsa -t dsa -N "" -q
-
-	for x in closed running failed ; do
-		keepdir ${NX_SESS_DIR}/$x
-		fperms 0700 ${NX_SESS_DIR}/$x
-	done
-
-	dodir ${NX_HOME_DIR}/.ssh
-	fperms 0700 ${NX_HOME_DIR}
-	fperms 0700 ${NX_HOME_DIR}/.ssh
-
-	cat << EOF >${D}${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key
-ssh-dss AAAAB3NzaC1kc3MAAACBAJe/0DNBePG9dYLWq7cJ0SqyRf1iiZN/IbzrmBvgPTZnBa5FT/0Lcj39sRYt1paAlhchwUmwwIiSZaON5JnJOZ6jKkjWIuJ9MdTGfdvtY1aLwDMpxUVoGwEaKWOyin02IPWYSkDQb6cceuG9NfPulS9iuytdx0zIzqvGqfvudtufAAAAFQCwosRXR2QA8OSgFWSO6+kGrRJKiwAAAIEAjgvVNAYWSrnFD+cghyJbyx60AAjKtxZ0r/Pn9k94Qt2rvQoMnGgt/zU0v/y4hzg+g3JNEmO1PdHh/wDPVOxlZ6Hb5F4IQnENaAZ9uTZiFGqhBO1c8Wwjiq/MFZy3jZaidarLJvVs8EeT4mZcWxwm7nIVD4lRU2wQ2lj4aTPcepMAAACANlgcCuA4wrC+3Cic9CFkqiwO/Rn1vk8dvGuEQqFJ6f6LVfPfRTfaQU7TGVLk2CzY4dasrwxJ1f6FsT8DHTNGnxELPKRuLstGrFY/PR7KeafeFZDf+fJ3mbX5nxrld3wi5titTnX+8s4IKv29HJguPvOK/SI7cjzA+SqNfD7qEo8= root@nettuno
-EOF
-	fperms 0600 ${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key
-	cp ${D}${NX_HOME_DIR}/.ssh/server.id_dsa.pub.key ${D}${NX_HOME_DIR}/.ssh/authorized_keys2
-	fperms 0600 ${NX_HOME_DIR}/.ssh/authorized_keys2
-
-	echo -n "127.0.0.1" ${D}${NX_HOME_DIR}/.ssh/known_hosts
-
-	chown -R nx:root ${D}${NX_DIR}
-}
-
-pkg_postinst () {
-	usermod -s /usr/NX/bin/nxserver nx || die "Unable to set login shell of nx user!!"
-
-	echo
-	einfo "If you are using NX version 1.5.0, make sure you edit the file:"
-	einfo "/usr/NX/etc/node.conf and set ENABLE_1_5_0_BACKEND to 1."
-	echo
-}