old

(Portage version: 2.1.2_rc1-r5)
 (Unsigned Manifest commit)

17 files changed, 4 insertions, 960 deletions

diff --git a/net-misc/vnc/Manifest b/net-misc/vnc/Manifest
index 17b58001208e..2eb176a3494c 100644
--- a/net-misc/vnc/Manifest
+++ b/net-misc/vnc/Manifest
@@ -1,85 +1,18 @@
-AUX vnc-4.0/imake-tmpdir.patch 1062 RMD160 13b17c4d33f724e27802f8f849ee713b2ce824a4 SHA1 49e5fe6384a9ac406551c9ceb22b87321031cb42 SHA256 390d3f94d014b9e428907771e6982426e69a1b4c27ef28333042ddca56ce9f78
-MD5 33601310b3a1040e1d836d1648e84b41 files/vnc-4.0/imake-tmpdir.patch 1062
-RMD160 13b17c4d33f724e27802f8f849ee713b2ce824a4 files/vnc-4.0/imake-tmpdir.patch 1062
-SHA256 390d3f94d014b9e428907771e6982426e69a1b4c27ef28333042ddca56ce9f78 files/vnc-4.0/imake-tmpdir.patch 1062
-AUX vnc-4.0/vnc-cookie.patch 819 RMD160 9066fa77745fee77065391c6e4d831b0626d0a26 SHA1 49afe105a6d38dad44acb00d5b523551ae6b3cdb SHA256 f74424d66d340ec9e2a902498d1826cf5ddb58a4e4d600ad63c720c6f853c278
-MD5 0959d633e7ca36b8995398b1ba1e315c files/vnc-4.0/vnc-cookie.patch 819
-RMD160 9066fa77745fee77065391c6e4d831b0626d0a26 files/vnc-4.0/vnc-cookie.patch 819
-SHA256 f74424d66d340ec9e2a902498d1826cf5ddb58a4e4d600ad63c720c6f853c278 files/vnc-4.0/vnc-cookie.patch 819
-AUX vnc-4.0/vnc-def.patch 365 RMD160 4e600d3244f846135069ae9cc73cb4daba2f171e SHA1 b1102e5b0287693661432d830a73325fe7e83ca7 SHA256 71940051a5846823db8e37bd41fcd2319e3815e1900ffad148c70abf11b90524
-MD5 5f386c352a0c2fb8298434174b7f4691 files/vnc-4.0/vnc-def.patch 365
-RMD160 4e600d3244f846135069ae9cc73cb4daba2f171e files/vnc-4.0/vnc-def.patch 365
-SHA256 71940051a5846823db8e37bd41fcd2319e3815e1900ffad148c70abf11b90524 files/vnc-4.0/vnc-def.patch 365
-AUX vnc-4.0/vnc-fPIC.patch 2401 RMD160 3e60b426295a00ab32724a414de5f6a923c9537f SHA1 3654fec4b280485152d2a0b2ba1d31a376366cdb SHA256 e9a8bab1588426fa29fe566640748ba75baddd784f509b18290a7bf0653cc510
-MD5 ff4f3d8258e8e4612c637b86fcc50605 files/vnc-4.0/vnc-fPIC.patch 2401
-RMD160 3e60b426295a00ab32724a414de5f6a923c9537f files/vnc-4.0/vnc-fPIC.patch 2401
-SHA256 e9a8bab1588426fa29fe566640748ba75baddd784f509b18290a7bf0653cc510 files/vnc-4.0/vnc-fPIC.patch 2401
-AUX vnc-4.0/vnc-gcc34.patch 5911 RMD160 a5af1b012e6a6c316179867d10a26cf747a01535 SHA1 4543aa4319265e0d472ee8e5b5cde77353050fcd SHA256 9d7f21dfca8f20d6ceb920bcae9f6566c7e6f3b1147687a47b5a13688451abb7
-MD5 7237b4f63e22a412ecba796be21e218d files/vnc-4.0/vnc-gcc34.patch 5911
-RMD160 a5af1b012e6a6c316179867d10a26cf747a01535 files/vnc-4.0/vnc-gcc34.patch 5911
-SHA256 9d7f21dfca8f20d6ceb920bcae9f6566c7e6f3b1147687a47b5a13688451abb7 files/vnc-4.0/vnc-gcc34.patch 5911
-AUX vnc-4.0/vnc-idle.patch 482 RMD160 d7a3422e15aa01d88d55f709e6b5b3c4debfb471 SHA1 68e8996f9753fee488cd435ff7c402225cf55681 SHA256 fb95fcfb98c717670b5759981787c54f23269aee4274b9cd50cf16743fc847c5
-MD5 ec954c0400a90b9de9d5d59db4c7eefb files/vnc-4.0/vnc-idle.patch 482
-RMD160 d7a3422e15aa01d88d55f709e6b5b3c4debfb471 files/vnc-4.0/vnc-idle.patch 482
-SHA256 fb95fcfb98c717670b5759981787c54f23269aee4274b9cd50cf16743fc847c5 files/vnc-4.0/vnc-idle.patch 482
-AUX vnc-4.0/vnc-restart.patch 698 RMD160 cf29badf0a4d4ca2fb281910c6fd42ef9678e95d SHA1 a6bee8a1ecc9594a62a827f3a64c90030f4e26b5 SHA256 c4ef05353f23fc0ca3131ea3969feef865eb0b1059e5f225e8a6a02dac2315c8
-MD5 79e22af66b56cf67fa9e517ad69c8f71 files/vnc-4.0/vnc-restart.patch 698
-RMD160 cf29badf0a4d4ca2fb281910c6fd42ef9678e95d files/vnc-4.0/vnc-restart.patch 698
-SHA256 c4ef05353f23fc0ca3131ea3969feef865eb0b1059e5f225e8a6a02dac2315c8 files/vnc-4.0/vnc-restart.patch 698
-AUX vnc-4.0/vnc-sparc.patch 1244 RMD160 7052ef221c0a1135afa5bb326b3d3384c9a5d05c SHA1 db6810037356e19617d554bb5de631ab9b9b1e66 SHA256 70ac3cfb9fc4398bd6a5193f9b4e3f4c6ad05a24a8fbb384920f1a11ff803b84
-MD5 999db9342ac0003537daee1f4193fd92 files/vnc-4.0/vnc-sparc.patch 1244
-RMD160 7052ef221c0a1135afa5bb326b3d3384c9a5d05c files/vnc-4.0/vnc-sparc.patch 1244
-SHA256 70ac3cfb9fc4398bd6a5193f9b4e3f4c6ad05a24a8fbb384920f1a11ff803b84 files/vnc-4.0/vnc-sparc.patch 1244
-AUX vnc-4.0/vnc-via.patch 5681 RMD160 f800fc75de1df0b7eb473be622e86f7c43a3ef12 SHA1 16201cc4f0ff1d4968b8ce0c32e61d7bbb79593d SHA256 54d3bfafa52e8642a17849b3243486f7f704268459e75555cd0bf216f7b920a3
-MD5 6572073121cd6b24eb72ec9df69927e0 files/vnc-4.0/vnc-via.patch 5681
-RMD160 f800fc75de1df0b7eb473be622e86f7c43a3ef12 files/vnc-4.0/vnc-via.patch 5681
-SHA256 54d3bfafa52e8642a17849b3243486f7f704268459e75555cd0bf216f7b920a3 files/vnc-4.0/vnc-via.patch 5681
-AUX vnc-4.0/vnc-xclients.patch 557 RMD160 04107dfc685c99d40ff140eb1dc75ba9cc5b35cd SHA1 2584eca8fa99aee56207aac6eed7af0aa5cc6313 SHA256 522b1fe5913cae8f13533467a2f8d9c7d22348313e1500cefb2668feb2c90daa
-MD5 a47315b0d740135ce27a952e00a0438f files/vnc-4.0/vnc-xclients.patch 557
-RMD160 04107dfc685c99d40ff140eb1dc75ba9cc5b35cd files/vnc-4.0/vnc-xclients.patch 557
-SHA256 522b1fe5913cae8f13533467a2f8d9c7d22348313e1500cefb2668feb2c90daa files/vnc-4.0/vnc-xclients.patch 557
-AUX vnc-4.0/vnc-xorg-x11-fixes.patch 1216 RMD160 f3bea5b08ec07160c98ad6acb39b1fbeb1033d7b SHA1 2133ca63213786808f09f45469fe9ff4e6f1a206 SHA256 f176d3027f71e4608cab72bbf0100ff6f720f69bef30f1a3a6ab7a85703c91c9
-MD5 1e5a138be84b8e2c04c8c35b3e59f2d2 files/vnc-4.0/vnc-xorg-x11-fixes.patch 1216
-RMD160 f3bea5b08ec07160c98ad6acb39b1fbeb1033d7b files/vnc-4.0/vnc-xorg-x11-fixes.patch 1216
-SHA256 f176d3027f71e4608cab72bbf0100ff6f720f69bef30f1a3a6ab7a85703c91c9 files/vnc-4.0/vnc-xorg-x11-fixes.patch 1216
-AUX vnc-4.0/vnc-xorg.patch 3440 RMD160 a51cc3d25885d3f2d68b51a13742b6e1d0d062dd SHA1 74ace3913026eac20460426117a2a83c2ac62746 SHA256 4fb4dcdf6d6a76769a9dbff30568681b2ee04f9825c9569fa8f398c37edfbe8a
-MD5 43179a2e046f430fea7d2bc617dce6b0 files/vnc-4.0/vnc-xorg.patch 3440
-RMD160 a51cc3d25885d3f2d68b51a13742b6e1d0d062dd files/vnc-4.0/vnc-xorg.patch 3440
-SHA256 4fb4dcdf6d6a76769a9dbff30568681b2ee04f9825c9569fa8f398c37edfbe8a files/vnc-4.0/vnc-xorg.patch 3440
-AUX xc.patch-cfbglblt8.patch 1738 RMD160 c8f4cc61fb0a65b483a68a35e70a027a71a95744 SHA1 7c0cbe8f820647b19fd4f342aed01f3e8813d9fc SHA256 4e3421c8c22e3accb18c446b7ea2ba8ddd18ac98977bccae3dfa249eafe0e644
-MD5 7c75fc548aa928b203396bc80a301d6c files/xc.patch-cfbglblt8.patch 1738
-RMD160 c8f4cc61fb0a65b483a68a35e70a027a71a95744 files/xc.patch-cfbglblt8.patch 1738
-SHA256 4e3421c8c22e3accb18c446b7ea2ba8ddd18ac98977bccae3dfa249eafe0e644 files/xc.patch-cfbglblt8.patch 1738
-AUX xc.patch-eieio.patch 703 RMD160 f4c9813ce8b81e376e21c9dd333b76937bb2cebd SHA1 18af8436fbf826b43b7a8a71e0893ca31c2f5406 SHA256 03a5f8d61b99379b631fbc22a3c2f344a315a5ce884ee9fd23542f4446dfb8f4
-MD5 2132dc5ea4e5a5349f5ec193ea3667c6 files/xc.patch-eieio.patch 703
-RMD160 f4c9813ce8b81e376e21c9dd333b76937bb2cebd files/xc.patch-eieio.patch 703
-SHA256 03a5f8d61b99379b631fbc22a3c2f344a315a5ce884ee9fd23542f4446dfb8f4 files/xc.patch-eieio.patch 703
-DIST X11R6.8.1-src1.tar.gz 30562401 RMD160 3873afcaff4d5eece7b8243d26211c86c138c849 SHA1 027d16317e07d9df166c0176a1f28b2614f38cc9 SHA256 cba581759249a292996ae552e98c7803ef1692ce81c1b06bed472f3b3d465b70
-DIST X11R6.8.1-src2.tar.gz 5808949 RMD160 adcc1bf6dcb61cb9e5f1ecb1c15b4bc29404ac67 SHA1 17f543f49599290b6e4cd4d963c643cd8c19158a SHA256 43f07d35e48be59d771b3730ef859a428110eeb0b42d7279d04ef97ec30991a5
-DIST X11R6.8.1-src3.tar.gz 10014808 RMD160 46144cd9dd47569509fe7255c7148231d8098731 SHA1 e17afc90b0c43f4f40b2ff7410f4ff5d4297de28 SHA256 179d798f46dcd2cbe7f25baf2091996b3b9a12588ed37f8146c39617126a94f9
-DIST vnc-4.0-unixsrc.tar.gz 482518 RMD160 dc95a7de6b59f148dae99b7977572a88e8c52a2a SHA1 f3b7f3e67d4554d53c37b8805b357f84563428b7 SHA256 5d0842a3aa3af04e43790ce0e63b9758b636267eb13269927440123cf131b275
 DIST vnc-4.1.2-patches-1.tar.bz2 13689 RMD160 a2f6926c09d7dff5644e6b4b2849d830b7bb9f92 SHA1 7c9554f79bff0db858ab3fd9bde35993828c5090 SHA256 072bdda38a146e3fc72805646b233c1477714059f79cdfb87e9eb487b9d054ff
 DIST vnc-4_1_2-unixsrc.tar.gz 537713 RMD160 2a2d615825e6ac74aca5f0c29d025e576b725dc3 SHA1 9d8d8d93f4120b2e60c0ec0fce7e81ea302614e7 SHA256 ed73cd1abf4c4044032929fa2dd023d851f5fe37f88009523d3b08b7d836d542
 DIST xorg-server-1.1.1.tar.bz2 6252103 RMD160 17675c45b1e6ec8ed025f73efcf481c60ff42941 SHA1 eb29dd4fea9f184321cbb5512f68b674ada4daf7 SHA256 9d2df9eaced491dfe14f3ebccb15035ff8f2bc2b12f1124974adea90642dfd6c
-EBUILD vnc-4.0-r1.ebuild 3033 RMD160 4460a3b0355206751d4835e61682c987c8413c2d SHA1 56a61f2c82620721376b11506f93c984c8cb9c45 SHA256 50cb37be0d6788a63e8a0fb2e3ab27ab244047528360ebe2c600059c58907186
-MD5 7659aa4bd1d3fbeafb3c414995936a41 vnc-4.0-r1.ebuild 3033
-RMD160 4460a3b0355206751d4835e61682c987c8413c2d vnc-4.0-r1.ebuild 3033
-SHA256 50cb37be0d6788a63e8a0fb2e3ab27ab244047528360ebe2c600059c58907186 vnc-4.0-r1.ebuild 3033
 EBUILD vnc-4.1.2.ebuild 4013 RMD160 f29262db95a679589082c0436163d728f21013fb SHA1 9bca031819d5b7aabd0cec113a3802ecc5e079d5 SHA256 244ff37d7b1d14bb0b6c34d8969c45e2592a75517104365be65e593bbc432633
 MD5 040740fd590b18a6cacf31cd32518da4 vnc-4.1.2.ebuild 4013
 RMD160 f29262db95a679589082c0436163d728f21013fb vnc-4.1.2.ebuild 4013
 SHA256 244ff37d7b1d14bb0b6c34d8969c45e2592a75517104365be65e593bbc432633 vnc-4.1.2.ebuild 4013
-MISC ChangeLog 10013 RMD160 0b6bbc675d48bb155169e463bd0fb9904882b49a SHA1 8000f458ce2ed16d66cce3b0349ae552092b674a SHA256 5a1981822b76123d69e75f14cb0b28093eb7f9d79350595f718e0081356e6610
-MD5 0c92ebf78102fc9159ed120055a916a3 ChangeLog 10013
-RMD160 0b6bbc675d48bb155169e463bd0fb9904882b49a ChangeLog 10013
-SHA256 5a1981822b76123d69e75f14cb0b28093eb7f9d79350595f718e0081356e6610 ChangeLog 10013
+MISC ChangeLog 10568 RMD160 2f59b6dc5b8480da417d74ade9efb94d1009c389 SHA1 24d898954ec89979ca79c1648f4dfbce33234ab4 SHA256 4f0dd62874b5137be500e08c3f00404e72be10ffba424dbc36985f28aa359c37
+MD5 db856fd1ed7724d1cbee998de938bfd1 ChangeLog 10568
+RMD160 2f59b6dc5b8480da417d74ade9efb94d1009c389 ChangeLog 10568
+SHA256 4f0dd62874b5137be500e08c3f00404e72be10ffba424dbc36985f28aa359c37 ChangeLog 10568
 MISC metadata.xml 368 RMD160 7efa0a810fb47607d22b2d70748ff6ae3f720d73 SHA1 3880053f5f781c739c63f8bbbee09ab0f3e5cbc2 SHA256 15a31fdb7efc5cf54a012174b301640ce901b2b5c5dbe641696e918b9d075837
 MD5 d2ff7fec546f8f3f629704747ce1445d metadata.xml 368
 RMD160 7efa0a810fb47607d22b2d70748ff6ae3f720d73 metadata.xml 368
 SHA256 15a31fdb7efc5cf54a012174b301640ce901b2b5c5dbe641696e918b9d075837 metadata.xml 368
-MD5 883a1719972b04d1e7c0b254a47b5ef8 files/digest-vnc-4.0-r1 994
-RMD160 1de7f8bfacba1add40b999a6b7f7b9ea9ad69743 files/digest-vnc-4.0-r1 994
-SHA256 1e694d4447a1e2c8c532281c1eca8ae0026c92ccaca7727b37077731d073b0b7 files/digest-vnc-4.0-r1 994
 MD5 bcb7ad8ddc08c70d8bc3784881744a61 files/digest-vnc-4.1.2 771
 RMD160 0f6b7d9d71582f332be5921e4409e51f4245d0f0 files/digest-vnc-4.1.2 771
 SHA256 c3a13cfc07fb44ef982f138a19d4ae3780691308bdae0415c9bb16177bf73db6 files/digest-vnc-4.1.2 771
diff --git a/net-misc/vnc/files/digest-vnc-4.0-r1 b/net-misc/vnc/files/digest-vnc-4.0-r1
deleted file mode 100644
index c58aedcd7656..000000000000
--- a/net-misc/vnc/files/digest-vnc-4.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-MD5 e352319d423391ff2c03bb7f81fe8d2b X11R6.8.1-src1.tar.gz 30562401
-RMD160 3873afcaff4d5eece7b8243d26211c86c138c849 X11R6.8.1-src1.tar.gz 30562401
-SHA256 cba581759249a292996ae552e98c7803ef1692ce81c1b06bed472f3b3d465b70 X11R6.8.1-src1.tar.gz 30562401
-MD5 6ba36becf1133c61a88c92e1d60c19ed X11R6.8.1-src2.tar.gz 5808949
-RMD160 adcc1bf6dcb61cb9e5f1ecb1c15b4bc29404ac67 X11R6.8.1-src2.tar.gz 5808949
-SHA256 43f07d35e48be59d771b3730ef859a428110eeb0b42d7279d04ef97ec30991a5 X11R6.8.1-src2.tar.gz 5808949
-MD5 8578e566e909e7c40300f44b6f0e88d3 X11R6.8.1-src3.tar.gz 10014808
-RMD160 46144cd9dd47569509fe7255c7148231d8098731 X11R6.8.1-src3.tar.gz 10014808
-SHA256 179d798f46dcd2cbe7f25baf2091996b3b9a12588ed37f8146c39617126a94f9 X11R6.8.1-src3.tar.gz 10014808
-MD5 e8e79964b76e09e3a19c35cceb9e24b3 vnc-4.0-unixsrc.tar.gz 482518
-RMD160 dc95a7de6b59f148dae99b7977572a88e8c52a2a vnc-4.0-unixsrc.tar.gz 482518
-SHA256 5d0842a3aa3af04e43790ce0e63b9758b636267eb13269927440123cf131b275 vnc-4.0-unixsrc.tar.gz 482518
diff --git a/net-misc/vnc/files/vnc-4.0/imake-tmpdir.patch b/net-misc/vnc/files/vnc-4.0/imake-tmpdir.patch
deleted file mode 100644
index 209cb15bf543..000000000000
--- a/net-misc/vnc/files/vnc-4.0/imake-tmpdir.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- xc/config/imake/imake.c.orig	2001-12-14 20:53:18.000000000 +0100
-+++ xc/config/imake/imake.c	2003-09-12 15:00:10.000000000 +0200
-@@ -985,13 +985,23 @@
- static void
- get_libc_version(FILE *inFile)
- {
--  char aout[] = "/tmp/imakeXXXXXX";
-+  char aout[4096], *tmpdir;
-   FILE *fp;
-   const char *format = "%s -o %s -x c -";
-   char *cc;
-   int len;
-   char *command;
- 
-+  /* If $TMPDIR is defined and has an acceptable length,
-+   * use that as tmp dir, else use /tmp.  That fixes 
-+   * problems with /tmp mounted "noexec".
-+   */
-+  if((tmpdir = getenv("TMPDIR")) != NULL && strlen(tmpdir) < (4096-13))
-+    strcpy(aout, tmpdir);
-+  else
-+    strcpy(aout, "/tmp");
-+  strcat(aout, "/imakeXXXXXX");
-+
-   /* Pre-create temp file safely */
-   {
-     /* Linux + ELF has mkstemp() */
-@@ -1007,7 +1017,8 @@
-     cc = "gcc";
-   len = strlen (aout) + strlen (format) + strlen (cc);
-   if (len < 128) len = 128;
--  command = alloca (len);
-+  if((command = alloca (len)) == NULL)
-+    abort();
- 
-   if (snprintf (command , len, format, cc, aout) == len)
-     abort ();
diff --git a/net-misc/vnc/files/vnc-4.0/vnc-cookie.patch b/net-misc/vnc/files/vnc-4.0/vnc-cookie.patch
deleted file mode 100644
index 55795766db59..000000000000
--- a/net-misc/vnc/files/vnc-4.0/vnc-cookie.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- vnc-4.0b3-unixsrc/vncserver.orig	2003-07-28 13:57:25.000000000 +0100
-+++ vnc-4.0b3-unixsrc/vncserver	2003-07-31 17:43:33.000000000 +0100
-@@ -116,16 +116,8 @@
- $desktopLog = "$vncUserDir/$host:$displayNumber.log";
- unlink($desktopLog);
- 
--# Make an X server cookie - use as the seed the sum of the current time, our
--# PID and part of the encrypted form of the password.  Ideally we'd use
--# /dev/urandom, but that's only available on Linux.
--
--srand(time+$$+unpack("L",`cat $vncUserDir/passwd`));
--$cookie = "";
--for (1..16) {
--    $cookie .= sprintf("%02x", int(rand(256)) % 256);
--}
--    
-+# Make an X server cookie - use mcookie
-+$cookie = `/usr/bin/mcookie`;
- system("xauth -f $xauthorityFile add $host:$displayNumber . $cookie");
- system("xauth -f $xauthorityFile add $host/unix:$displayNumber . $cookie"); 
- 
diff --git a/net-misc/vnc/files/vnc-4.0/vnc-def.patch b/net-misc/vnc/files/vnc-4.0/vnc-def.patch
deleted file mode 100644
index 3b11aedc948e..000000000000
--- a/net-misc/vnc/files/vnc-4.0/vnc-def.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- vnc-4.0b5-unixsrc/xc/config/cf/vnc.def.def	2003-07-07 10:51:22.000000000 +0100
-+++ vnc-4.0b5-unixsrc/xc/config/cf/vnc.def	2004-05-27 13:24:02.489007854 +0100
-@@ -6,7 +6,8 @@
- #define BuildNls NO
- #define BuildXIE NO
- #define BuildGlxExt NO
--#define XnestServer NO
-+#define XnestServer YES
-+#define XF86Server NO
- #define XprtServer NO
- 
- #ifdef SunArchitecture
diff --git a/net-misc/vnc/files/vnc-4.0/vnc-fPIC.patch b/net-misc/vnc/files/vnc-4.0/vnc-fPIC.patch
deleted file mode 100644
index db749361a5d5..000000000000
--- a/net-misc/vnc/files/vnc-4.0/vnc-fPIC.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- vnc-4.0b3-unixsrc/Xregion/Makefile.in.fPIC	2003-03-31 16:07:29.000000000 +0100
-+++ vnc-4.0b3-unixsrc/Xregion/Makefile.in	2003-08-01 10:35:14.000000000 +0100
-@@ -12,4 +12,5 @@
- 	$(AR) $(library) $(OBJS)
- 	$(RANLIB) $(library)
- 
-+DIR_CFLAGS = -DPIC -fPIC
- # followed by boilerplate.mk
---- vnc-4.0b3-unixsrc/network/Makefile.in.fPIC	2002-10-28 15:09:54.000000000 +0000
-+++ vnc-4.0b3-unixsrc/network/Makefile.in	2003-08-01 10:35:14.000000000 +0100
-@@ -14,4 +14,5 @@
- 	$(AR) $(library) $(OBJS)
- 	$(RANLIB) $(library)
- 
-+DIR_CXXFLAGS = -DPIC -fPIC
- # followed by boilerplate.mk
---- vnc-4.0b3-unixsrc/rdr/Makefile.in.fPIC	2003-08-01 10:45:29.000000000 +0100
-+++ vnc-4.0b3-unixsrc/rdr/Makefile.in	2003-08-01 10:45:41.000000000 +0100
-@@ -16,4 +16,5 @@
- 	$(AR) $(library) $(OBJS)
- 	$(RANLIB) $(library)
- 
-+DIR_CXXFLAGS = -DPIC -fPIC
- # followed by boilerplate.mk
---- vnc-4.0b3-unixsrc/rfb/Makefile.in.fPIC	2003-07-23 18:25:29.000000000 +0100
-+++ vnc-4.0b3-unixsrc/rfb/Makefile.in	2003-08-01 10:35:14.000000000 +0100
-@@ -62,4 +62,6 @@
- 	$(AR) $(library) $(OBJS)
- 	$(RANLIB) $(library)
- 
-+DIR_CFLAGS = -DPIC -fPIC
-+DIR_CXXFLAGS = -DPIC -fPIC
- # followed by boilerplate.mk
---- vnc-4.0b3-unixsrc/xc/programs/Xserver/vnc/module/Imakefile.fPIC	2003-06-03 10:09:12.000000000 +0100
-+++ vnc-4.0b3-unixsrc/xc/programs/Xserver/vnc/module/Imakefile	2003-08-01 10:35:14.000000000 +0100
-@@ -20,7 +20,8 @@
- LinkSourceFile(xf86vncModule.cc,..)
- LinkSourceFile(XserverDesktop.cc,..)
- 
--ModuleObjectRule()
-+.CCsuf.Osuf:
-+	NormalSharedLibObjCplusplusCompile($(_NOOP_))
- /*
-  LibraryModuleTarget(vnc,$(OBJS) $(VNCLIBS))
-  InstallLibraryModule(vnc,$(MODULEDIR),extensions)
---- vnc-4.0b3-unixsrc/xc/programs/Xserver/vnc/Imakefile.fPIC	2003-06-12 10:48:43.000000000 +0100
-+++ vnc-4.0b3-unixsrc/xc/programs/Xserver/vnc/Imakefile	2003-08-01 10:35:14.000000000 +0100
-@@ -35,8 +35,8 @@
- NormalLintTarget($(SRCS))
- 
- NormalLibraryObjectRule()
--NormalCplusplusObjectRule()
--
-+.CCsuf.Osuf:
-+	NormalSharedLibObjCplusplusCompile($(_NOOP_))
- 
- MakeSubdirs($(SUBDIRS))
- DependSubdirs($(SUBDIRS))
---- vnc-4.0b3-unixsrc/boilerplate.mk.fPIC	2002-08-30 11:38:22.000000000 +0100
-+++ vnc-4.0b3-unixsrc/boilerplate.mk	2003-08-01 10:35:14.000000000 +0100
-@@ -15,7 +15,7 @@
- CFLAGS = @CFLAGS@ $(DIR_CFLAGS)
- CCLD = $(CC)
- CXX = @CXX@
--CXXFLAGS = @CXXFLAGS@
-+CXXFLAGS = @CXXFLAGS@ $(DIR_CXXFLAGS)
- CXXLD = $(CXX)
- CPPFLAGS = @CPPFLAGS@
- DEFS = @DEFS@
diff --git a/net-misc/vnc/files/vnc-4.0/vnc-gcc34.patch b/net-misc/vnc/files/vnc-4.0/vnc-gcc34.patch
deleted file mode 100644
index ca7fdbc58cf0..000000000000
--- a/net-misc/vnc/files/vnc-4.0/vnc-gcc34.patch
+++ /dev/null
@@ -1,162 +0,0 @@
---- vnc-4.0b5-unixsrc/rfb/Rect.h.gcc34	2003-06-30 21:50:25.000000000 +0100
-+++ vnc-4.0b5-unixsrc/rfb/Rect.h	2004-05-20 14:43:56.299371046 +0100
-@@ -21,13 +21,7 @@
- #ifndef __RFB_RECT_INCLUDED__
- #define __RFB_RECT_INCLUDED__
- 
--#ifndef max
--#define max(a,b)            (((a) > (b)) ? (a) : (b))
--#endif
--
--#ifndef min
--#define min(a,b)            (((a) < (b)) ? (a) : (b))
--#endif
-+#include <algorithm>
- 
- namespace rfb {
- 
-@@ -70,20 +64,20 @@
-     }
-     inline Rect intersect(const Rect &r) const {
-       Rect result;
--      result.tl.x = max(tl.x, r.tl.x);
--      result.tl.y = max(tl.y, r.tl.y);
--      result.br.x = max(min(br.x, r.br.x), result.tl.x);
--      result.br.y = max(min(br.y, r.br.y), result.tl.y);
-+      result.tl.x = std::max(tl.x, r.tl.x);
-+      result.tl.y = std::max(tl.y, r.tl.y);
-+      result.br.x = std::max(std::min(br.x, r.br.x), result.tl.x);
-+      result.br.y = std::max(std::min(br.y, r.br.y), result.tl.y);
-       return result;
-     }
-     inline Rect union_boundary(const Rect &r) const {
-       if (r.is_empty()) return *this;
-       if (is_empty()) return r;
-       Rect result;
--      result.tl.x = min(tl.x, r.tl.x);
--      result.tl.y = min(tl.y, r.tl.y);
--      result.br.x = max(br.x, r.br.x);
--      result.br.y = max(br.y, r.br.y);
-+      result.tl.x = std::min(tl.x, r.tl.x);
-+      result.tl.y = std::min(tl.y, r.tl.y);
-+      result.br.x = std::max(br.x, r.br.x);
-+      result.br.y = std::max(br.y, r.br.y);
-       return result;
-     }
-     inline Rect translate(const Point &p) const {
---- vnc-4.0b5-unixsrc/rfb/ComparingUpdateTracker.cxx.gcc34	2004-05-18 17:16:51.000000000 +0100
-+++ vnc-4.0b5-unixsrc/rfb/ComparingUpdateTracker.cxx	2004-05-20 14:44:48.225445585 +0100
-@@ -60,7 +60,7 @@
-     // since in effect the entire framebuffer has changed.
-     oldFb.setSize(fb->width(), fb->height());
-     for (int y=0; y<fb->height(); y+=BLOCK_SIZE) {
--      Rect pos(0, y, fb->width(), min(fb->height(), y+BLOCK_SIZE));
-+      Rect pos(0, y, fb->width(), std::min(fb->height(), y+BLOCK_SIZE));
-       int srcStride;
-       const rdr::U8* srcData = fb->getPixelsR(pos, &srcStride);
-       oldFb.imageRect(pos, srcData, srcStride);
-@@ -100,20 +100,20 @@
-   for (int blockTop = r.tl.y; blockTop < r.br.y; blockTop += BLOCK_SIZE)
-   {
-     // Get a strip of the source buffer
--    Rect pos(r.tl.x, blockTop, r.br.x, min(r.br.y, blockTop+BLOCK_SIZE));
-+    Rect pos(r.tl.x, blockTop, r.br.x, std::min(r.br.y, blockTop+BLOCK_SIZE));
-     int fbStride;
-     const rdr::U8* newBlockPtr = fb->getPixelsR(pos, &fbStride);
-     int newStrideBytes = fbStride * bytesPerPixel;
- 
-     rdr::U8* oldBlockPtr = oldData;
--    int blockBottom = min(blockTop+BLOCK_SIZE, r.br.y);
-+    int blockBottom = std::min(blockTop+BLOCK_SIZE, r.br.y);
- 
-     for (int blockLeft = r.tl.x; blockLeft < r.br.x; blockLeft += BLOCK_SIZE)
-     {
-       const rdr::U8* newPtr = newBlockPtr;
-       rdr::U8* oldPtr = oldBlockPtr;
- 
--      int blockRight = min(blockLeft+BLOCK_SIZE, r.br.x);
-+      int blockRight = std::min(blockLeft+BLOCK_SIZE, r.br.x);
-       int blockWidthInBytes = (blockRight-blockLeft) * bytesPerPixel;
- 
-       for (int y = blockTop; y < blockBottom; y++)
---- vnc-4.0b5-unixsrc/rfb/hextileDecode.h.gcc34	2003-07-31 19:03:38.000000000 +0100
-+++ vnc-4.0b5-unixsrc/rfb/hextileDecode.h	2004-05-20 14:43:56.337363784 +0100
-@@ -52,11 +52,11 @@
- 
-   for (t.tl.y = r.tl.y; t.tl.y < r.br.y; t.tl.y += 16) {
- 
--    t.br.y = min(r.br.y, t.tl.y + 16);
-+    t.br.y = std::min(r.br.y, t.tl.y + 16);
- 
-     for (t.tl.x = r.tl.x; t.tl.x < r.br.x; t.tl.x += 16) {
- 
--      t.br.x = min(r.br.x, t.tl.x + 16);
-+      t.br.x = std::min(r.br.x, t.tl.x + 16);
- 
-       int tileType = is->readU8();
- 
---- vnc-4.0b5-unixsrc/rfb/hextileEncode.h.gcc34	2003-07-31 19:03:38.000000000 +0100
-+++ vnc-4.0b5-unixsrc/rfb/hextileEncode.h	2004-05-20 14:43:56.340363210 +0100
-@@ -60,11 +60,11 @@
- 
-   for (t.tl.y = r.tl.y; t.tl.y < r.br.y; t.tl.y += 16) {
- 
--    t.br.y = min(r.br.y, t.tl.y + 16);
-+    t.br.y = std::min(r.br.y, t.tl.y + 16);
- 
-     for (t.tl.x = r.tl.x; t.tl.x < r.br.x; t.tl.x += 16) {
- 
--      t.br.x = min(r.br.x, t.tl.x + 16);
-+      t.br.x = std::min(r.br.x, t.tl.x + 16);
- 
-       GET_IMAGE_INTO_BUF(t,buf);
- 
---- vnc-4.0b5-unixsrc/rfb/zrleEncode.h.gcc34	2004-05-18 17:16:52.000000000 +0100
-+++ vnc-4.0b5-unixsrc/rfb/zrleEncode.h	2004-05-20 14:46:54.105384909 +0100
-@@ -130,7 +130,7 @@
- 
-   for (t.tl.y = r.tl.y; t.tl.y < r.br.y; t.tl.y += 64) {
- 
--    t.br.y = min(r.br.y, t.tl.y + 64);
-+    t.br.y = std::min(r.br.y, t.tl.y + 64);
- 
-     if (os->length() + worstCaseLine > maxLen) {
-       if (t.tl.y == r.tl.y)
-@@ -143,7 +143,7 @@
- 
-     for (t.tl.x = r.tl.x; t.tl.x < r.br.x; t.tl.x += 64) {
- 
--      t.br.x = min(r.br.x, t.tl.x + 64);
-+      t.br.x = std::min(r.br.x, t.tl.x + 64);
- 
-       GET_IMAGE_INTO_BUF(t,buf);
- 
---- vnc-4.0b5-unixsrc/rfb/zrleDecode.h.gcc34	2003-07-31 19:03:38.000000000 +0100
-+++ vnc-4.0b5-unixsrc/rfb/zrleDecode.h	2004-05-20 14:43:56.352360917 +0100
-@@ -61,11 +61,11 @@
- 
-   for (t.tl.y = r.tl.y; t.tl.y < r.br.y; t.tl.y += 64) {
- 
--    t.br.y = min(r.br.y, t.tl.y + 64);
-+    t.br.y = std::min(r.br.y, t.tl.y + 64);
- 
-     for (t.tl.x = r.tl.x; t.tl.x < r.br.x; t.tl.x += 64) {
- 
--      t.br.x = min(r.br.x, t.tl.x + 64);
-+      t.br.x = std::min(r.br.x, t.tl.x + 64);
- 
-       int mode = zis->readU8();
-       bool rle = mode & 128;
---- vnc-4.0b5-unixsrc/tx/TXImage.cxx.gcc34	2004-03-18 17:37:37.000000000 +0000
-+++ vnc-4.0b5-unixsrc/tx/TXImage.cxx	2004-05-20 14:43:56.355360344 +0100
-@@ -71,8 +71,8 @@
-   if (w == width() && h == height()) return;
- 
-   int oldStrideBytes = getStride() * (format.bpp/8);
--  int rowsToCopy = min(h, height());
--  int bytesPerRow = min(w, width()) * (format.bpp/8);
-+  int rowsToCopy = std::min(h, height());
-+  int bytesPerRow = std::min(w, width()) * (format.bpp/8);
-   rdr::U8* oldData = 0;
-   bool allocData = false;
- 
diff --git a/net-misc/vnc/files/vnc-4.0/vnc-idle.patch b/net-misc/vnc/files/vnc-4.0/vnc-idle.patch
deleted file mode 100644
index a559e212ce3c..000000000000
--- a/net-misc/vnc/files/vnc-4.0/vnc-idle.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vnc-4.0b3-unixsrc/rfb/ServerCore.cxx.idle	2003-08-20 17:46:58.000000000 +0100
-+++ vnc-4.0b3-unixsrc/rfb/ServerCore.cxx	2003-08-20 17:47:09.000000000 +0100
-@@ -29,7 +29,7 @@
- rfb::IntParameter rfb::Server::idleTimeout
- ("IdleTimeout",
-  "The number of seconds after which an idle VNC connection will be dropped",
-- 3600);
-+ 0);
- rfb::IntParameter rfb::Server::clientWaitTimeMillis
- ("ClientWaitTimeMillis",
-  "The number of milliseconds to wait for a client which is no longer "
diff --git a/net-misc/vnc/files/vnc-4.0/vnc-restart.patch b/net-misc/vnc/files/vnc-4.0/vnc-restart.patch
deleted file mode 100644
index 1fb45a7d52aa..000000000000
--- a/net-misc/vnc/files/vnc-4.0/vnc-restart.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- vnc-4.0b4-unixsrc/network/TcpSocket.cxx.restart	2004-01-22 15:24:34.000000000 +0000
-+++ vnc-4.0b4-unixsrc/network/TcpSocket.cxx	2004-01-22 15:27:22.000000000 +0000
-@@ -131,10 +131,14 @@
-   }
- 
-   // Attempt to connect to the remote host
--  if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) != 0) {
--    int e = errorNumber;
--    closesocket(sock);
--    throw SocketException("unable to connect to host", e);
-+  for (;;) {
-+    if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) != 0) {
-+      int e = errorNumber;
-+      if (e == EINTR)
-+	continue;
-+      closesocket(sock);
-+      throw SocketException("unable to connect to host", e);
-+    } else break;
-   }
- 
-   int one = 1;
diff --git a/net-misc/vnc/files/vnc-4.0/vnc-sparc.patch b/net-misc/vnc/files/vnc-4.0/vnc-sparc.patch
deleted file mode 100644
index d5a1e31b94a1..000000000000
--- a/net-misc/vnc/files/vnc-4.0/vnc-sparc.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- vnc-4.0b5-unixsrc/xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h.sparc	2004-06-20 18:02:36.782820000 -0400
-+++ vnc-4.0b5-unixsrc/xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h	2004-06-20 18:02:53.602820000 -0400
-@@ -27,6 +27,7 @@
- 
- #if defined(linux)
- #include <asm/types.h>
-+#include <linux/fb.h>
- #include <asm/fbio.h>
- #include <asm/openpromio.h>
- #elif defined(SVR4)
---- vnc-4.0b5-unixsrc/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c.sparc	2004-03-04 12:48:09.000000000 -0500
-+++ vnc-4.0b5-unixsrc/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c	2004-06-20 16:50:48.442820000 -0400
-@@ -117,7 +117,7 @@
- 
- static int
- KIOCSRATE_ioctl_ok(int rate, int delay) {
--#ifdef KIOCSRATE
-+#if defined(KIOCSRATE) && !defined(__sparc__)
-    struct kbd_rate kbdrate_s;
-    int fd;
- 
---- vnc-4.0b5-unixsrc/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c.sparc	2004-03-04 12:48:09.000000000 -0500
-+++ vnc-4.0b5-unixsrc/xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c	2004-06-20 16:50:48.452820000 -0400
-@@ -145,7 +145,7 @@
- 
- static int
- KIOCSRATE_ioctl_ok(int rate, int delay) {
--#ifdef KIOCSRATE
-+#if defined(KIOCSRATE) && !defined(__sparc__)
-    struct kbd_rate kbdrate_s;
-    int fd;
- 
diff --git a/net-misc/vnc/files/vnc-4.0/vnc-via.patch b/net-misc/vnc/files/vnc-4.0/vnc-via.patch
deleted file mode 100644
index 812a4fc846d0..000000000000
--- a/net-misc/vnc/files/vnc-4.0/vnc-via.patch
+++ /dev/null
@@ -1,185 +0,0 @@
---- vnc-4.0b4-unixsrc/network/TcpSocket.cxx.via	2003-09-04 14:04:39.000000000 +0100
-+++ vnc-4.0b4-unixsrc/network/TcpSocket.cxx	2003-11-27 18:13:31.000000000 +0000
-@@ -57,6 +57,29 @@
- 
- static rfb::LogWriter vlog("TcpSocket");
- 
-+/* Tunnelling support. */
-+int network::findFreeTcpPort (void)
-+{
-+  int sock, port;
-+  struct sockaddr_in addr;
-+  memset(&addr, 0, sizeof(addr));
-+  addr.sin_family = AF_INET;
-+  addr.sin_addr.s_addr = INADDR_ANY;
-+
-+  if ((sock = socket (AF_INET, SOCK_STREAM, 0)) < 0)
-+    throw SocketException ("unable to create socket", errorNumber);
-+
-+  for (port = TUNNEL_PORT_OFFSET + 99; port > TUNNEL_PORT_OFFSET; port--) {
-+    addr.sin_port = htons ((unsigned short) port);
-+    if (bind (sock, (struct sockaddr *)&addr, sizeof (addr)) == 0) {
-+      close (sock);
-+      return port;
-+    }
-+  }
-+  throw SocketException ("no free port in range", 0);
-+  return 0;
-+}
-+
- 
- void
- TcpSocket::initTcpSockets() {
---- vnc-4.0b4-unixsrc/network/TcpSocket.h.via	2003-08-11 10:44:53.000000000 +0100
-+++ vnc-4.0b4-unixsrc/network/TcpSocket.h	2003-11-27 18:13:31.000000000 +0000
-@@ -27,8 +27,14 @@
- 
- #include <list>
- 
-+/* Tunnelling support. */
-+#define TUNNEL_PORT_OFFSET 5500
-+
- namespace network {
- 
-+  /* Tunnelling support. */
-+  int findFreeTcpPort (void);
-+
-   class TcpSocket : public Socket {
-   public:
-     TcpSocket(int sock, bool close=true);
---- vnc-4.0b4-unixsrc/vncviewer/vncviewer.cxx.via	2003-09-04 14:04:40.000000000 +0100
-+++ vnc-4.0b4-unixsrc/vncviewer/vncviewer.cxx	2003-11-27 18:18:53.000000000 +0000
-@@ -39,6 +39,7 @@
- 
- using namespace network;
- using namespace rfb;
-+using namespace std;
- 
- IntParameter wmDecorationWidth("WMDecorationWidth", "Width of window manager "
-                                "decoration around a window", 6);
-@@ -90,6 +91,9 @@
- StringParameter geometry("geometry", "X geometry specification", 0);
- StringParameter displayname("display", "The X display", 0);
- 
-+/* Support for tunnelling */
-+StringParameter via("via", "Gateway to tunnel via", "");
-+
- char aboutText[256];
- char* programName;
- extern char buildtime[];
-@@ -157,6 +161,61 @@
-   exit(1);
- }
- 
-+/* Tunnelling support. */
-+static void
-+interpretViaParam (char **gatewayHost, char **remoteHost,
-+		   int *remotePort, char **vncServerName,
-+		   int localPort)
-+{
-+  const int SERVER_PORT_OFFSET = 5900;
-+  char *pos = strchr (*vncServerName, ':');
-+  if (pos == NULL)
-+    *remotePort = SERVER_PORT_OFFSET;
-+  else {
-+    int portOffset = SERVER_PORT_OFFSET;
-+    size_t len;
-+    *pos++ = '\0';
-+    len = strlen (pos);
-+    if (*pos == ':') {
-+      /* Two colons is an absolute port number, not an offset. */
-+      pos++;
-+      len--;
-+      portOffset = 0;
-+    }
-+    if (!len || strspn (pos, "-0123456789") != len )
-+      usage ();
-+    *remotePort = atoi (pos) + portOffset;
-+  }
-+
-+  if (**vncServerName != '\0')
-+    *remoteHost = *vncServerName;
-+
-+  *gatewayHost = strDup (via.getValueStr ());
-+  *vncServerName = new char[50];
-+  sprintf (*vncServerName, "localhost::%d", localPort);
-+}
-+
-+static void
-+createTunnel (const char *gatewayHost, const char *remoteHost,
-+	      int remotePort, int localPort)
-+{
-+  char *cmd = getenv ("VNC_VIA_CMD");
-+  char *percent;
-+  char lport[10], rport[10];
-+  sprintf (lport, "%d", localPort);
-+  sprintf (rport, "%d", remotePort);
-+  setenv ("G", gatewayHost, 1);
-+  setenv ("H", remoteHost, 1);
-+  setenv ("R", rport, 1);
-+  setenv ("L", lport, 1);
-+  if (!cmd)
-+    cmd = "/usr/bin/ssh -f -L \"$L\":\"$H\":\"$R\" \"$G\" sleep 20";
-+  /* Compatibility with TightVNC's method. */
-+  while ((percent = strchr (cmd, '%')) != NULL)
-+    *percent = '$';
-+  system (cmd);
-+}
-+
- int main(int argc, char** argv)
- {
-   sprintf(aboutText, "VNC viewer for X version 4.0b4 - built %s\n"
-@@ -197,14 +256,25 @@
-       usage();
-     }
- 
--    if (vncServerName)
--      usage();
-     vncServerName = argv[i];
-   }
- 
-   try {
-     TcpSocket::initTcpSockets();
- 
-+    /* Tunnelling support. */
-+    if (strlen (via.getValueStr ()) > 0) {
-+      char *gatewayHost = "";
-+      char *remoteHost = "localhost";
-+      int localPort = findFreeTcpPort ();
-+      int remotePort;
-+      if (!vncServerName)
-+        usage();
-+      interpretViaParam (&gatewayHost, &remoteHost, &remotePort,
-+			 &vncServerName, localPort);
-+      createTunnel (gatewayHost, remoteHost, remotePort, localPort);
-+    }
-+
-     Socket* sock = 0;
- 
-     if (listenMode) {
---- vnc-4.0b4-unixsrc/vncviewer/vncviewer.man.via	2003-08-07 10:45:06.000000000 +0100
-+++ vnc-4.0b4-unixsrc/vncviewer/vncviewer.man	2003-11-27 18:13:31.000000000 +0000
-@@ -162,6 +162,23 @@
- specific source file if you know the name of its "LogWriter".  Default is
- \fB*:stderr:30\fP.
- 
-+.TP
-+\fB\-via\fR \fIgateway\fR
-+Automatically create encrypted TCP tunnel to the \fIgateway\fR machine
-+before connection, connect to the \fIhost\fR through that tunnel
-+(TightVNC\-specific). By default, this option invokes SSH local port
-+forwarding, assuming that SSH client binary can be accessed as
-+/usr/bin/ssh. Note that when using the \fB\-via\fR option, the host
-+machine name should be specified as known to the gateway machine, e.g. 
-+"localhost" denotes the \fIgateway\fR, not the machine where vncviewer
-+was launched. The environment variable \fIVNC_VIA_CMD\fR can override
-+the default tunnel command of
-+\fB/usr/bin/ssh\ -f\ -L\ "$L":"$H":"$R"\ "$G"\ sleep\ 20\fR.  The tunnel
-+command is executed with the environment variables \fIH\fR, \fIL\fR, \fIH\fR,
-+\fIR\fR, and \fIG\fR taken the values of the local port number, the remote
-+host, the port number on the remote host, and the gateway machine
-+respectively.
-+
- .SH SEE ALSO
- .BR Xvnc (1)
- .BR vncconfig (1),
diff --git a/net-misc/vnc/files/vnc-4.0/vnc-xclients.patch b/net-misc/vnc/files/vnc-4.0/vnc-xclients.patch
deleted file mode 100644
index 8357305cd1d6..000000000000
--- a/net-misc/vnc/files/vnc-4.0/vnc-xclients.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- vnc-4.0b3-unixsrc/vncserver.xclients	2003-08-06 11:15:30.000000000 +0100
-+++ vnc-4.0b3-unixsrc/vncserver	2003-08-06 11:16:41.000000000 +0100
-@@ -42,6 +42,10 @@
- 
- $defaultXStartup
-     = ("#!/bin/sh\n\n".
-+       "# Uncomment the following two lines for normal desktop:\n".
-+       "# unset SESSION_MANAGER\n".
-+       "# exec /etc/X11/xinit/xinitrc\n\n".
-+       "[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup\n".
-        "[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n".
-        "xsetroot -solid grey\n".
-        "vncconfig -iconic &\n".
diff --git a/net-misc/vnc/files/vnc-4.0/vnc-xorg-x11-fixes.patch b/net-misc/vnc/files/vnc-4.0/vnc-xorg-x11-fixes.patch
deleted file mode 100644
index a4cb39e32d0e..000000000000
--- a/net-misc/vnc/files/vnc-4.0/vnc-xorg-x11-fixes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- vnc-4.0-unixsrc/xc/programs/Xserver/hw/xfree86/Imakefile.xorg-x11-fixes	2004-11-18 16:17:02.808464254 +0000
-+++ vnc-4.0-unixsrc/xc/programs/Xserver/hw/xfree86/Imakefile	2004-11-18 16:17:03.925252687 +0000
-@@ -92,7 +92,7 @@
-           $(XF8_32BPPDIR) $(XF8_16BPPDIR) $(XF24_32BPPDIR) $(SHADOWFBDIR) \
- 	  drivers $(LOADERDIR) $(VGAHWDIR) $(FBDEVHWDIR) $(RAMDACDIR) \
- 	  $(RACDIR) $(DDCDIR) $(INPUTDIR) $(INT10DIR) $(VBEDIR) parser \
--          scanpci doc dummylib $(XF86CFGDIRS) etc $(DRIVERSDK) \
-+          scanpci doc dummylib $(XF86CFGDIRS) $(DRIVERSDK) \
- 	  $(XF8_32WIDDIR) getconfig
- 
- #if !defined(OS2Architecture) && !defined(cygwinArchitecture)
---- vnc-4.0-unixsrc/xc/extras/rman/rman.c.xorg-x11-fixes	2004-04-23 19:42:56.000000000 +0100
-+++ vnc-4.0-unixsrc/xc/extras/rman/rman.c	2004-11-18 09:53:56.000000000 +0000
-@@ -211,7 +211,7 @@
- const char TABLEOFCONTENTS[] = "Table of Contents";
- const char HEADERANDFOOTER[] = "Header and Footer";
- char manName[80] = "man page";
--char manSect[10] = "1";
-+char manSect[30] = "1";
- const char PROVENANCE[] =
- 	"manual page source format generated by PolyglotMan v" POLYGLOTMANVERSION;
- const char HOME[] = "available at http://polyglotman.sourceforge.net/";
diff --git a/net-misc/vnc/files/vnc-4.0/vnc-xorg.patch b/net-misc/vnc/files/vnc-4.0/vnc-xorg.patch
deleted file mode 100644
index cd749c5398c3..000000000000
--- a/net-misc/vnc/files/vnc-4.0/vnc-xorg.patch
+++ /dev/null
@@ -1,101 +0,0 @@
---- vnc-4.0b4-unixsrc/xc/programs/Xserver/vnc/XserverDesktop.cc.xorg	2003-09-04 14:04:40.000000000 +0100
-+++ vnc-4.0b4-unixsrc/xc/programs/Xserver/vnc/XserverDesktop.cc	2004-03-22 17:50:05.000000000 +0000
-@@ -376,25 +376,6 @@
-   }
- }
- 
--static void printRegion(RegionPtr reg)
--{
--  int nrects = REGION_NUM_RECTS(reg);
--
--  fprintf(stderr,"Region num rects %2d extents %3d,%3d %3dx%3d\n",nrects,
--          (REGION_EXTENTS(pScreen,reg))->x1,
--          (REGION_EXTENTS(pScreen,reg))->y1,
--          (REGION_EXTENTS(pScreen,reg))->x2-(REGION_EXTENTS(pScreen,reg))->x1,
--          (REGION_EXTENTS(pScreen,reg))->y2-(REGION_EXTENTS(pScreen,reg))->y1);
--
--  for (int i = 0; i < nrects; i++) {
--    fprintf(stderr,"    rect %3d,%3d %3dx%3d\n",
--            REGION_RECTS(reg)[i].x1,
--            REGION_RECTS(reg)[i].y1,
--            REGION_RECTS(reg)[i].x2-REGION_RECTS(reg)[i].x1,
--            REGION_RECTS(reg)[i].y2-REGION_RECTS(reg)[i].y1);
--  }
--}
--
- CARD32 XserverDesktop::deferredUpdateTimerCallback(OsTimerPtr timer,
-                                                    CARD32 now, pointer arg)
- {
---- vnc-4.0b4-unixsrc/xc/programs/Xserver/Imakefile.xorg	2004-03-04 17:47:16.000000000 +0000
-+++ vnc-4.0b4-unixsrc/xc/programs/Xserver/Imakefile	2004-03-22 17:50:05.000000000 +0000
-@@ -119,7 +119,7 @@
-        LIBREGEX = RegexLibrary
- 
- #if DoLoadableServer
--    LIBCWRAPPER = os/libcwrapper.o
-+    LIBCWRAPPER = os/libcwrapper.o os/libos.a
- #endif
- 
- #if BuildXprint
---- vnc-4.0b5-unixsrc/xc/programs/Xserver/vnc/RegionHelper.h.xorg	2003-05-30 11:42:38.000000000 +0100
-+++ vnc-4.0b5-unixsrc/xc/programs/Xserver/vnc/RegionHelper.h	2004-05-27 11:26:06.499536143 +0100
-@@ -36,7 +36,7 @@
-   RegionHelper(ScreenPtr pScreen_, RegionPtr pRegion)
-     : pScreen(pScreen_), reg(&regRec)
-   {
--    REGION_INIT(pScreen, reg, NullBox, 0);
-+    REGION_NULL(pScreen, reg);
-     REGION_COPY(pScreen, reg, pRegion);
-   }
- 
-@@ -54,8 +54,8 @@
- 
-   void init(BoxPtr rect, int size) {
-     reg = &regRec;
--    if (rect && (rect->x2 == rect->x1 || rect->y2 == rect->y1)) {
--      REGION_INIT(pScreen, reg, NullBox, 0);
-+    if (!rect || (rect->x2 == rect->x1 || rect->y2 == rect->y1)) {
-+      REGION_NULL(pScreen, reg);
-     } else {
-       REGION_INIT(pScreen, reg, rect, size);
-     }
---- vnc-4.0-unixsrc/xc.patch.xorg	2004-08-25 16:10:52.131987786 +0100
-+++ vnc-4.0-unixsrc/xc.patch	2004-08-25 16:12:23.896276533 +0100
-@@ -8,11 +8,11 @@
- + XCOMM
- + XCOMM X VNC server
- + XCOMM
--+ MFBDIR = mfb
--+ CFB8DIR = cfb
--+ CFB16DIR = cfb16
--+ CFB24DIR = cfb24
--+ CFB32DIR = cfb32
-++ MFBSUBDIR = mfb
-++ CFB8SUBDIR = cfb
-++ CFB16SUBDIR = cfb16
-++ CFB24SUBDIR = cfb24
-++ CFB32SUBDIR = cfb32
- + XVNCDDXDIR = vnc/Xvnc
- + XVNCDIRS = $(STDDIRS) $(MFBDIR) \
- +          $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \
---- vnc-4.0-unixsrc/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.xorg	2004-08-31 14:24:12.140503335 +0100
-+++ vnc-4.0-unixsrc/xc/programs/Xserver/vnc/Xvnc/xvnc.cc	2004-08-31 14:24:45.189675775 +0100
-@@ -201,6 +201,7 @@
- }
- 
- extern "C" {
-+  void ddxInitGlobals() {}
-   void ddxGiveUp()
-   {
-     int i;
---- vnc-4.0-unixsrc/xc/config/cf/vnc.def	2004-09-29 15:55:57.732303799 +0100
-+++ vnc-4.0-unixsrc/xc/config/cf/vnc.def	2004-09-29 15:56:30.495034234 +0100
-@@ -9,6 +9,8 @@
- #define XnestServer YES
- #define XF86Server NO
- #define XprtServer NO
-+#define BuildXFree86ConfigTools NO
-+#define BuildScanpci NO
- 
- #ifdef SunArchitecture
- #define ProjectRoot /usr/openwin
diff --git a/net-misc/vnc/files/xc.patch-cfbglblt8.patch b/net-misc/vnc/files/xc.patch-cfbglblt8.patch
deleted file mode 100644
index e39ebe50f8e1..000000000000
--- a/net-misc/vnc/files/xc.patch-cfbglblt8.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- xc.patch	2004-08-25 11:13:06.749688613 +0000
-+++ xc.patch	2004-08-25 11:13:37.307230320 +0000
-@@ -116,60 +116,6 @@
- !     nlwMiddle >>= 3; \
-       while (h--) { \
-   	srcpix = psrc[srcy]; \
--*** xc/programs/Xserver/cfb/cfbglblt8.c.orig	Fri Dec 14 19:59:23 2001
----- xc/programs/Xserver/cfb/cfbglblt8.c	Tue Aug 12 10:05:57 2003
--***************
--*** 284,288 ****
--      register glyphPointer   glyphBits;
--      register int	xoff;
--! #if defined(USE_LEFT_BITS) || (!defined(STIPPLE) && !defined(USE_STIPPLE_CODE))
--      register CfbBits	*dst;
--  #endif
----- 284,288 ----
--      register glyphPointer   glyphBits;
--      register int	xoff;
--! #if defined(USE_LEFTBITS) || (!defined(STIPPLE) && !defined(USE_STIPPLE_CODE))
--      register CfbBits	*dst;
--  #endif
--***************
--*** 292,296 ****
--      CfbBits		*dstLine;
--      CfbBits		*pdstBase;
--! #ifdef USE_LEFT_BITS
--      CARD32		*cTmp;
--  #endif
----- 292,296 ----
--      CfbBits		*dstLine;
--      CfbBits		*pdstBase;
--! #ifdef USE_LEFTBITS
--      CARD32		*cTmp;
--  #endif
--***************
--*** 399,403 ****
--  	    	} while (--hTmp);
--  	    	break;
--! #else /* !USE_LEFT_BITS */
--  	    	{
--  		    int h;
----- 399,403 ----
--  	    	} while (--hTmp);
--  	    	break;
--! #else /* !USE_LEFTBITS */
--  	    	{
--  		    int h;
--***************
--*** 412,416 ****
--  	    	glyphBits = clips;
--  	    	/* fall through */
--! #endif /* USE_LEFT_BITS */
--  	    case rgnIN:
--  #ifdef STIPPLE
----- 412,416 ----
--  	    	glyphBits = clips;
--  	    	/* fall through */
--! #endif /* USE_LEFTBITS */
--  	    case rgnIN:
--  #ifdef STIPPLE
- *** xc/programs/Xserver/cfb/cfbcppl.c.orig	Fri Dec 14 19:59:22 2001
- --- xc/programs/Xserver/cfb/cfbcppl.c	Sun Apr 18 12:53:36 2004
- ***************
diff --git a/net-misc/vnc/files/xc.patch-eieio.patch b/net-misc/vnc/files/xc.patch-eieio.patch
deleted file mode 100644
index cb6966e6c25d..000000000000
--- a/net-misc/vnc/files/xc.patch-eieio.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- xc.orig/programs/Xserver/hw/xfree86/common/compiler.h	2004-12-22 08:24:22.364106000 -0800
-+++ xc/programs/Xserver/hw/xfree86/common/compiler.h	2004-12-22 08:26:39.869202576 -0800
-@@ -1076,7 +1076,12 @@
- 
- extern volatile unsigned char *ioBase;
- 
--#    define eieio()		__asm__ __volatile__ ("eieio" ::: "memory")
-+#if defined(linux) && defined(__powerpc64__)
-+# include <asm/memory.h>
-+#endif /* defined(linux) && defined(__powerpc64__) */
-+#ifndef eieio /* We deal with arch-specific eieio() routines above... */
-+# define eieio() __asm__ __volatile__ ("eieio" ::: "memory")
-+#endif /* eieio */
- 
- static __inline__ unsigned char
- xf86ReadMmio8(__volatile__ void *base, const unsigned long offset)
-
diff --git a/net-misc/vnc/vnc-4.0-r1.ebuild b/net-misc/vnc/vnc-4.0-r1.ebuild
deleted file mode 100644
index 8782a032cec1..000000000000
--- a/net-misc/vnc/vnc-4.0-r1.ebuild
+++ /dev/null
@@ -1,111 +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/vnc/vnc-4.0-r1.ebuild,v 1.19 2006/02/19 21:38:17 kumba Exp $
-
-inherit eutils toolchain-funcs multilib
-
-X_VERSION="6.8.1"
-
-MY_P="${P}-unixsrc"
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.realvnc.com/"
-SRC_URI="http://www.realvnc.com/dist/${MY_P}.tar.gz
-	server? (
-		http://xorg.freedesktop.org/X11R${X_VERSION}/src/X11R${X_VERSION}-src1.tar.gz
-		http://xorg.freedesktop.org/X11R${X_VERSION}/src/X11R${X_VERSION}-src2.tar.gz
-		http://xorg.freedesktop.org/X11R${X_VERSION}/src/X11R${X_VERSION}-src3.tar.gz
-	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
-IUSE="server"
-
-RDEPEND="sys-libs/zlib
-	media-libs/freetype
-	|| ( ( x11-libs/libSM
-			x11-libs/libXtst
-		)
-		virtual/x11
-	)
-	server? ( || ( ( x11-libs/libXi
-				x11-libs/libXmu
-				x11-libs/libXrender
-			)
-			virtual/x11
-		)
-	)
-	!net-misc/tightvnc"
-DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xextproto
-		)
-		virtual/x11
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz ; cd ${S}
-
-	epatch ${FILESDIR}/${P}/vnc-gcc34.patch
-	epatch ${FILESDIR}/${P}/vnc-cookie.patch
-	epatch ${FILESDIR}/${P}/vnc-fPIC.patch
-	epatch ${FILESDIR}/${P}/vnc-idle.patch
-	epatch ${FILESDIR}/${P}/vnc-restart.patch
-	epatch ${FILESDIR}/${P}/vnc-via.patch
-
-	if use server; then
-		unpack X11R${X_VERSION}-src1.tar.gz
-		unpack X11R${X_VERSION}-src2.tar.gz
-		unpack X11R${X_VERSION}-src3.tar.gz
-
-		# patches from Redhat
-		epatch ${FILESDIR}/${P}/vnc-sparc.patch
-		epatch ${FILESDIR}/${P}/vnc-xorg-x11-fixes.patch
-		epatch ${FILESDIR}/${P}/vnc-def.patch
-		epatch ${FILESDIR}/${P}/vnc-xclients.patch
-		epatch ${FILESDIR}/${P}/vnc-xorg.patch
-		epatch ${FILESDIR}/${P}/imake-tmpdir.patch
-
-		epatch ${FILESDIR}/xc.patch-cfbglblt8.patch
-		epatch ${FILESDIR}/xc.patch-eieio.patch
-		epatch xc.patch
-
-		HOSTCONF="${S}/xc/config/cf/vnc.def"
-		echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
-		echo "#define FontDir /usr/share/fonts" >> ${HOSTCONF}
-		echo "#define LibDir /usr/$(get_libdir)/X11" >> ${HOSTCONF}
-		echo "#define UsrLibDir /usr/$(get_libdir)" >> ${HOSTCONF}
-	fi
-}
-
-src_compile() {
-	econf --with-installed-zlib || die
-	emake || die
-
-	if use server; then
-		cd ${S}/xc
-		make CDEBUGFLAGS="${CFLAGS}" CXXDEBUGFLAGS="${CXXFLAGS}" World FAST=1 || die
-	fi
-}
-
-src_install() {
-	dodir /usr/bin /usr/share/man/man1
-	use server && dodir /usr/$(get_libdir)/modules/extensions
-
-	./vncinstall ${D}/usr/bin ${D}/usr/share/man ${D}/usr/$(get_libdir)/modules/extensions || die
-	dodoc LICENCE.TXT README
-
-	use server || (
-		rm ${D}/usr/bin/vncserver
-		rm ${D}/usr/bin/x0vncserver
-		rm ${D}/usr/share/man/man1/vncpasswd.1.gz
-		rm ${D}/usr/bin/vncpasswd
-		rm ${D}/usr/share/man/man1/vncconfig.1.gz
-		rm ${D}/usr/bin/vncconfig
-		rm ${D}/usr/share/man/man1/vncserver.1.gz
-		rm ${D}/usr/share/man/man1/x0vncserver.1.gz
-	)
-
-	ewarn "Note that the free VNC release is not designed for use on untrusted networks"
-}