gentoo resync : 01.12.2017

4 files changed, 2 insertions, 834 deletions

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index defd83fdb19a..359d07a55b8e 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,13 +1,8 @@
-AUX tigervnc-1.7.1-xserver119-compat.patch 13889 BLAKE2B 0e8bc1023713c671a25d5f461f691aa61ec4497255b7716c89fb9864db02ed5e4bd7c459653acd2538dd497798d326e340fb6e452466c8a599016553191e85d3 SHA512 3be73f862020220b82de65e03c5678c623b2295f44a70afd577136b0c8358b8512b08604753c74dcd7a49977ed164e6a2e76f6c400b304f8aad7f8b2d999e544
 AUX tigervnc.confd 346 BLAKE2B b21fe4537e186cd4de89f54b42006f0adbe4d6968c87dcb81981b02af27eec5ce06ad3aa76d9a747aeda481a5e422dfc8a122bc266660a240833863043cf81b0 SHA512 204ab170de8b76d72d6fd2c3fcfab19cb2750eca231956f53cdfc81270baaef9ae31b08ce53b103a737045ccca8ce0b7f9649fb7cbd582ee0acff437ff5c85b4
 AUX tigervnc.initd 1974 BLAKE2B bb909f75ecbb7f33db4a0e3a7a1ee59bf9c60d5cbef4d432efa9e741f10d341e1a76e2c2a9780ecc7bdbd4a3e78c6286e9749f24a1d07b768584ad6203931477 SHA512 b0d43352551cf3cbcfe404dcbfe5617965e08674d5af0f7ec801c9124d7ab0279d9bb8f76b6141b5ad96a70df9c99d5b6cfff0ba29211a37a344906d105e1bc8
 AUX xserver119.patch 3681 BLAKE2B 04a4bac19c1e7463b916647e92017ea14af4a9e1140db229383d574381a24f30e68042b6b383fdf18cb0dee90b4d535183121076a6638fb8454222013dae85a8 SHA512 531c3b99c5402a66f95ed5743dd37ae9de493cd9bb2e63b39afdd2d536ae438b3c5e2618226f070adc62e41b169837ae7a3302b7bb131b181361a7b142a9e93f
-DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 SHA256 21c77708d303192108ffeef02acc0e7310461b4910bb49ae78c8a944e52c436e SHA512 86235aba8e735e4afed21d2940cee8ea2f4f1bc951db79aaf481ae79ab81d4518add6be2619ce9371f77fd068c8dbf069754ecc0168e5afe9e8505d3d61cc573 WHIRLPOOL 97a8c1719e7959ce8abd29f9ad249c7acf1b5a21ef36c0ce00b6e3bae8e6e78e9cdb0b34a23da6bd44c9e513e95f22716b286c5ec57bf1a854101c4810c7b481
-DIST tigervnc-1.7.1.tar.gz 1406032 SHA256 3c021ec0bee4611020c0bcbab995b0ef2f6f1a46127a52b368827f3275527ccc SHA512 babdc362b28d7af80c7efbb3a1aadf158d7f29621afe36d785748af45e515e2718cf1011359db7b39c218770b3f3ee2767e08abc58091f018c08ba9739a3e68d WHIRLPOOL 178d6b3fb7569cfb2de5dd144031b441b02a865574928d20f1589fd6f933b9276477292182cde56e948ab75d2fc0bea4d79f71bcddb33f6057970a7caa08b2cc
-DIST tigervnc-1.8.0.tar.gz 1433830 SHA256 9951dab0e10f8de03996ec94bec0d938da9f36d48dca8c954e8bbc95c16338f8 SHA512 c066e9781622e342667bf03fd6bbb94ed17b412b07c46764b7b73b2eb308c285e865cf1e901f7d218db05a0486fb3f8877e75da3c939ef0d020247713779327a WHIRLPOOL 4001182ec2da3551b0eb2d6ee863c225340b474dc6d32cbe4c0941e421852a10913ee80706009b1a59043b6983ac2bc42f070d1a5aa97eefe1cff3c97497b2f0
-DIST tigervnc.png 4958 SHA256 e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e SHA512 97f9a42e9b9f50f1c91de3b7d7991aa8965240fe4958d6da4e9f72f9baa4510ad615765f7c59d6e0a90c9d4b5fe53ad1547c766f2da45e4a6b6e29b03ced2b8b WHIRLPOOL bbf01f6702724bc4329d053bd3fbf856103371abce20f6f74aa3c2e5eed0eebcdcccd287788b1efbb8de3008cb484a8da5ccd1bd667727e4b0861f3bb550529c
+DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 BLAKE2B 5e4aed97f3b1e88488f1f080b11afb515d70fcf5b9a20074436a97b3a54a89bd308bacec5584263a7cd72ef3f8b8863102cbd8ab3685cb3251764f5f23f4a037 SHA512 86235aba8e735e4afed21d2940cee8ea2f4f1bc951db79aaf481ae79ab81d4518add6be2619ce9371f77fd068c8dbf069754ecc0168e5afe9e8505d3d61cc573
+DIST tigervnc-1.8.0.tar.gz 1433830 BLAKE2B bdbe0e11a1459dc6328c7c54e8062f0628b952e33fcbe6ffe93c1b2148b52a17fd99fcae333b2eddf5256ffd0376a83634521473c2cd8937ba95b69bf133c796 SHA512 c066e9781622e342667bf03fd6bbb94ed17b412b07c46764b7b73b2eb308c285e865cf1e901f7d218db05a0486fb3f8877e75da3c939ef0d020247713779327a
 DIST xorg-server-1.19.1.tar.bz2 6041792 BLAKE2B 1c67fe74812af15cb77d2e128c92466e11b3da7c984f585cdf58aa5f157a4b254ab2a58ce2f74e87d454ef1e0bf665f2b34a189c98b194c4c5e801b31f006d8c SHA512 37d413fdd96ce6b15ae20ca5028331498586044cfc7a6ab0acb99201b04063c69bcd06867f2dc33237b244ce2870a1c5a4be3cbe4560f2461894f46f8d5dbdd7
-EBUILD tigervnc-1.7.1-r2.ebuild 4653 BLAKE2B 439466d1369b798df4747bdd1ca14917f0dd3c57457f0d513b2cdbd61f55520dc8e49b6760a6438949c177cdb381a7903a7bced71c4a0163a0c87d8a706ace2f SHA512 22cc6f1fd7db870a615b88ebd775fe8afe41021c48278c12d5a3258196b08fe30ac529010f42cce2f3ac0839fbf1f63aaa8878c61d5fb3bc18e688fc7e3ae458
-EBUILD tigervnc-1.7.1-r4.ebuild 4738 BLAKE2B 8d64b8bcc40079df7d07de5a724ca5198690f571f255d88e841a211d7da3840e83ce81e2cbddc8342bf15ed478d01ca5401ef94d5760e3675aa018514d648df3 SHA512 96805da2397ac252fb7238cd7ddb06af21e78e3b6c0af8d54dbe49ee99645f49f871e55cc7bc44369656c5f356c8192c08e89516b962dfa5c6b8e948d8ea313f
 EBUILD tigervnc-1.8.0.ebuild 4541 BLAKE2B 69e2048ec440910bf941f0d60826243d1ee3c156d614c2abb1a0bb32b62887119fad4d02e6babd0888f339864bf1ca054cb93f4f5bd034ce958e752b48eb770d SHA512 24fc22d60a36d37c5c62df2cf2e20f0852c4797285baf4ab50d5a97395ee7129cfde1758fe280101f3664320e14aceb7548d4265cefbb48351ac3cd0526a8d45
 MISC metadata.xml 671 BLAKE2B 6c11feefea25aaeea974f4cc73eaf39d9303f4755bfe4515afc069490a6d742e4299f9dd70189ddf45ff04ed1a346fa0857f09092fe016b2db1a1b8bd70f2372 SHA512 e2416162e344db1025f15b89754c6f84f9b69217b86abe15bb6d048ae80bcc0a84df6943ada53c71f6bc6236f13f7add3e5f03a9e52cc61da060a391b8a69a44
diff --git a/net-misc/tigervnc/files/tigervnc-1.7.1-xserver119-compat.patch b/net-misc/tigervnc/files/tigervnc-1.7.1-xserver119-compat.patch
deleted file mode 100644
index 192344257a5e..000000000000
--- a/net-misc/tigervnc/files/tigervnc-1.7.1-xserver119-compat.patch
+++ /dev/null
@@ -1,446 +0,0 @@
-From 3fed95eda27dfbeee6535f987f5d14a66f64749b Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Wed, 5 Oct 2016 11:15:27 +0200
-Subject: [PATCH] Add xorg-xserver 1.19 support
-
----
- unix/xserver/hw/vnc/XserverDesktop.cc | 183 ++++++++++++++++++++++++++++++++++
- unix/xserver/hw/vnc/XserverDesktop.h  |   7 ++
- unix/xserver/hw/vnc/vncBlockHandler.c |  19 ++++
- unix/xserver/hw/vnc/vncExtInit.cc     |  13 +++
- unix/xserver/hw/vnc/vncExtInit.h      |   5 +
- unix/xserver/hw/vnc/vncHooks.c        |  21 +++-
- unix/xserver/hw/vnc/xorg-version.h    |   4 +-
- unix/xserver119.patch                 |  95 ++++++++++++++++++
- 8 files changed, 343 insertions(+), 4 deletions(-)
- create mode 100644 unix/xserver119.patch
-
-diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc
-index 4f82a54..8cc0b0b 100644
---- a/unix/xserver/hw/vnc/XserverDesktop.cc
-+++ b/unix/xserver/hw/vnc/XserverDesktop.cc
-@@ -90,6 +90,30 @@ class FileHTTPServer : public rfb::HTTPServer {
-   XserverDesktop* desktop;
- };
- 
-+#if XORG >= 119
-+extern "C" {
-+/*
-+ * xserver NotifyFd callbacks. Note we also expect write notifies to work,
-+ * which only works with xserver >= 1.19.
-+ */
-+#include "os.h"
-+
-+static void HandleListenFd(int fd, int xevents, void *data)
-+{
-+  XserverDesktop *desktop = (XserverDesktop *)data;
-+
-+  desktop->handleListenFd(fd);
-+}
-+
-+static void HandleSocketFd(int fd, int xevents, void *data)
-+{
-+  XserverDesktop *desktop = (XserverDesktop *)data;
-+
-+  desktop->handleSocketFd(fd, xevents);
-+}
-+
-+}
-+#endif
- 
- XserverDesktop::XserverDesktop(int screenIndex_,
-                                std::list<network::TcpListener*> listeners_,
-@@ -111,15 +135,35 @@ XserverDesktop::XserverDesktop(int screenIndex_,
- 
-   if (!httpListeners.empty ())
-     httpServer = new FileHTTPServer(this);
-+
-+#if XORG >= 119
-+  for (std::list<TcpListener*>::iterator i = listeners.begin();
-+       i != listeners.end();
-+       i++) {
-+    SetNotifyFd((*i)->getFd(), HandleListenFd, X_NOTIFY_READ, this);
-+  }
-+
-+  for (std::list<TcpListener*>::iterator i = httpListeners.begin();
-+       i != httpListeners.end();
-+       i++) {
-+    SetNotifyFd((*i)->getFd(), HandleListenFd, X_NOTIFY_READ, this);
-+  }
-+#endif
- }
- 
- XserverDesktop::~XserverDesktop()
- {
-   while (!listeners.empty()) {
-+#if XORG >= 119
-+    RemoveNotifyFd(listeners.back()->getFd());
-+#endif
-     delete listeners.back();
-     listeners.pop_back();
-   }
-   while (!httpListeners.empty()) {
-+#if XORG >= 119
-+    RemoveNotifyFd(listeners.back()->getFd());
-+#endif
-     delete httpListeners.back();
-     httpListeners.pop_back();
-   }
-@@ -389,6 +433,140 @@ void XserverDesktop::add_copied(const rfb::Region &dest, const rfb::Point &delta
-   }
- }
- 
-+#if XORG >= 119
-+void XserverDesktop::handleListenFd(int fd)
-+{
-+  std::list<TcpListener*>::iterator i;
-+  SocketServer *fd_server = NULL;
-+  bool is_http = false;
-+
-+  for (i = listeners.begin(); i != listeners.end(); i++) {
-+    if ((*i)->getFd() == fd) {
-+      fd_server = server;
-+      break;
-+    }
-+  }
-+  if (httpServer && !fd_server) {
-+    for (i = httpListeners.begin(); i != httpListeners.end(); i++) {
-+      if ((*i)->getFd() == fd) {
-+        fd_server = httpServer;
-+        is_http = true;
-+        break;
-+      }
-+    }
-+  }
-+  if (!fd_server) {
-+    vlog.error("XserverDesktop::handleListenFd: Error cannot find fd");
-+    return;
-+  }
-+
-+  Socket* sock = (*i)->accept();
-+  sock->outStream().setBlocking(false);
-+  vlog.debug("new %sclient, sock %d", is_http ? "http " : "", sock->getFd());
-+  fd_server->addSocket(sock);
-+  SetNotifyFd(sock->getFd(), HandleSocketFd, X_NOTIFY_READ, this);
-+}
-+
-+void XserverDesktop::handleSocketFd(int fd, int xevents)
-+{
-+  std::list<Socket*> sockets;
-+  std::list<Socket*>::iterator i;
-+  SocketServer *fd_server = NULL;
-+  bool is_http = false;
-+
-+  server->getSockets(&sockets);
-+  for (i = sockets.begin(); i != sockets.end(); i++) {
-+    if ((*i)->getFd() == fd) {
-+      fd_server = server;
-+      break;
-+    }
-+  }
-+  if (httpServer && !fd_server) {
-+    httpServer->getSockets(&sockets);
-+    for (i = sockets.begin(); i != sockets.end(); i++) {
-+      if ((*i)->getFd() == fd) {
-+        fd_server = httpServer;
-+        is_http = true;
-+        break;
-+      }
-+    }
-+  }
-+  if (!fd_server) {
-+    vlog.error("XserverDesktop::handleSocketFd: Error cannot find fd");
-+    return;
-+  }
-+
-+  if (xevents & X_NOTIFY_READ)
-+    fd_server->processSocketReadEvent(*i);
-+
-+  if (xevents & X_NOTIFY_WRITE)
-+    fd_server->processSocketWriteEvent(*i);
-+
-+  if ((*i)->isShutdown()) {
-+    vlog.debug("%sclient gone, sock %d", is_http ? "http " : "", fd);
-+    RemoveNotifyFd(fd);
-+    fd_server->removeSocket(*i);
-+    if (!is_http)
-+      vncClientGone(fd);
-+    delete (*i);
-+  }
-+}
-+
-+void XserverDesktop::blockHandler(int* timeout)
-+{
-+  // We don't have a good callback for when we can init input devices[1],
-+  // so we abuse the fact that this routine will be called first thing
-+  // once the dix is done initialising.
-+  // [1] Technically Xvnc has InitInput(), but libvnc.so has nothing.
-+  vncInitInputDevice();
-+
-+  try {
-+    std::list<Socket*> sockets;
-+    std::list<Socket*>::iterator i;
-+    server->getSockets(&sockets);
-+    for (i = sockets.begin(); i != sockets.end(); i++) {
-+      int fd = (*i)->getFd();
-+      if ((*i)->isShutdown()) {
-+        vlog.debug("client gone, sock %d",fd);
-+        server->removeSocket(*i);
-+        vncClientGone(fd);
-+        delete (*i);
-+      } else {
-+        /* Update existing NotifyFD to listen for write (or not) */
-+        if ((*i)->outStream().bufferUsage() > 0)
-+          SetNotifyFd(fd, HandleSocketFd, X_NOTIFY_READ | X_NOTIFY_WRITE, this);
-+        else
-+          SetNotifyFd(fd, HandleSocketFd, X_NOTIFY_READ, this);
-+      }
-+    }
-+    if (httpServer) {
-+      httpServer->getSockets(&sockets);
-+      for (i = sockets.begin(); i != sockets.end(); i++) {
-+        int fd = (*i)->getFd();
-+        if ((*i)->isShutdown()) {
-+          vlog.debug("http client gone, sock %d",fd);
-+          httpServer->removeSocket(*i);
-+          delete (*i);
-+        } else {
-+          /* Update existing NotifyFD to listen for write (or not) */
-+          if ((*i)->outStream().bufferUsage() > 0)
-+            SetNotifyFd(fd, HandleSocketFd, X_NOTIFY_READ | X_NOTIFY_WRITE, this);
-+          else
-+            SetNotifyFd(fd, HandleSocketFd, X_NOTIFY_READ, this);
-+        }
-+      }
-+    }
-+
-+    int nextTimeout = server->checkTimeouts();
-+    if (nextTimeout > 0 && (*timeout == -1 || nextTimeout < *timeout))
-+      *timeout = nextTimeout;
-+  } catch (rdr::Exception& e) {
-+    vlog.error("XserverDesktop::blockHandler: %s",e.str());
-+  }
-+}
-+
-+#else
-+
- void XserverDesktop::readBlockHandler(fd_set* fds, struct timeval ** timeout)
- {
-   // We don't have a good callback for when we can init input devices[1],
-@@ -603,10 +781,15 @@ void XserverDesktop::writeWakeupHandler(fd_set* fds, int nfds)
-   }
- }
- 
-+#endif
-+
- void XserverDesktop::addClient(Socket* sock, bool reverse)
- {
-   vlog.debug("new client, sock %d reverse %d",sock->getFd(),reverse);
-   server->addSocket(sock, reverse);
-+#if XORG >= 119
-+  SetNotifyFd(sock->getFd(), HandleSocketFd, X_NOTIFY_READ, this);
-+#endif
- }
- 
- void XserverDesktop::disconnectClients()
-diff --git a/unix/xserver/hw/vnc/XserverDesktop.h b/unix/xserver/hw/vnc/XserverDesktop.h
-index c069028..9e77627 100644
---- a/unix/xserver/hw/vnc/XserverDesktop.h
-+++ b/unix/xserver/hw/vnc/XserverDesktop.h
-@@ -38,6 +38,7 @@
- #include <rfb/VNCServerST.h>
- #include <rdr/SubstitutingInStream.h>
- #include "Input.h"
-+#include "xorg-version.h"
- 
- namespace rfb {
-   class VNCServerST;
-@@ -69,10 +70,16 @@ class XserverDesktop : public rfb::SDesktop, public rfb::FullFramePixelBuffer,
-                  const unsigned char *rgbaData);
-   void add_changed(const rfb::Region &region);
-   void add_copied(const rfb::Region &dest, const rfb::Point &delta);
-+#if XORG >= 119
-+  void handleListenFd(int fd);
-+  void handleSocketFd(int fd, int xevents);
-+  void blockHandler(int* timeout);
-+#else
-   void readBlockHandler(fd_set* fds, struct timeval ** timeout);
-   void readWakeupHandler(fd_set* fds, int nfds);
-   void writeBlockHandler(fd_set* fds, struct timeval ** timeout);
-   void writeWakeupHandler(fd_set* fds, int nfds);
-+#endif
-   void addClient(network::Socket* sock, bool reverse);
-   void disconnectClients();
- 
-diff --git a/unix/xserver/hw/vnc/vncBlockHandler.c b/unix/xserver/hw/vnc/vncBlockHandler.c
-index 4e44478..baebc3d 100644
---- a/unix/xserver/hw/vnc/vncBlockHandler.c
-+++ b/unix/xserver/hw/vnc/vncBlockHandler.c
-@@ -30,6 +30,23 @@
- 
- #include "vncExtInit.h"
- #include "vncBlockHandler.h"
-+#include "xorg-version.h"
-+
-+#if XORG >= 119
-+
-+static void vncBlockHandler(void* data, void* timeout)
-+{
-+  vncCallBlockHandlers(timeout);
-+}
-+
-+void vncRegisterBlockHandlers(void)
-+{
-+  if (!RegisterBlockAndWakeupHandlers(vncBlockHandler,
-+                                      (ServerWakeupHandlerProcPtr)NoopDDA, 0))
-+    FatalError("RegisterBlockAndWakeupHandlers() failed\n");
-+}
-+
-+#else
- 
- static void vncBlockHandler(void * data, OSTimePtr t, void * readmask);
- static void vncWakeupHandler(void * data, int nfds, void * readmask);
-@@ -144,3 +161,5 @@ static void vncWriteWakeupHandlerFallback(void)
- 
-   vncWriteWakeupHandler(ret, &fallbackFds);
- }
-+
-+#endif
-diff --git a/unix/xserver/hw/vnc/vncExtInit.cc b/unix/xserver/hw/vnc/vncExtInit.cc
-index dea3cb8..9d70e44 100644
---- a/unix/xserver/hw/vnc/vncExtInit.cc
-+++ b/unix/xserver/hw/vnc/vncExtInit.cc
-@@ -249,6 +249,17 @@ int vncExtensionIsActive(int scrIdx)
-   return (desktop[scrIdx] != NULL);
- }
- 
-+#if XORG >= 119
-+
-+void vncCallBlockHandlers(int* timeout)
-+{
-+  for (int scr = 0; scr < vncGetScreenCount(); scr++)
-+    if (desktop[scr])
-+      desktop[scr]->blockHandler(timeout);
-+}
-+
-+#else
-+
- void vncCallReadBlockHandlers(fd_set * fds, struct timeval ** timeout)
- {
-   for (int scr = 0; scr < vncGetScreenCount(); scr++)
-@@ -277,6 +288,8 @@ void vncCallWriteWakeupHandlers(fd_set * fds, int nfds)
-       desktop[scr]->writeWakeupHandler(fds, nfds);
- }
- 
-+#endif
-+
- int vncGetAvoidShiftNumLock(void)
- {
-   return (bool)avoidShiftNumLock;
-diff --git a/unix/xserver/hw/vnc/vncExtInit.h b/unix/xserver/hw/vnc/vncExtInit.h
-index 9785d11..3164528 100644
---- a/unix/xserver/hw/vnc/vncExtInit.h
-+++ b/unix/xserver/hw/vnc/vncExtInit.h
-@@ -22,6 +22,7 @@
- #include <stdint.h>
- #include <stddef.h>
- #include <sys/select.h>
-+#include "xorg-version.h"
- 
- // Only from C++
- #ifdef __cplusplus
-@@ -50,10 +51,14 @@ extern int vncInetdSock;
- void vncExtensionInit(void);
- int vncExtensionIsActive(int scrIdx);
- 
-+#if XORG >= 119
-+void vncCallBlockHandlers(int* timeout);
-+#else
- void vncCallReadBlockHandlers(fd_set * fds, struct timeval ** timeout);
- void vncCallReadWakeupHandlers(fd_set * fds, int nfds);
- void vncCallWriteBlockHandlers(fd_set * fds, struct timeval ** timeout);
- void vncCallWriteWakeupHandlers(fd_set * fds, int nfds);
-+#endif
- 
- int vncGetAvoidShiftNumLock(void);
- 
-diff --git a/unix/xserver/hw/vnc/vncHooks.c b/unix/xserver/hw/vnc/vncHooks.c
-index 22ea9ea..29f3f8b 100644
---- a/unix/xserver/hw/vnc/vncHooks.c
-+++ b/unix/xserver/hw/vnc/vncHooks.c
-@@ -128,9 +128,11 @@ static Bool vncHooksDisplayCursor(DeviceIntPtr pDev,
- #if XORG <= 112
- static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
-                                  pointer pReadmask);
--#else
-+#elif XORG <= 118
- static void vncHooksBlockHandler(ScreenPtr pScreen, void * pTimeout,
-                                  void * pReadmask);
-+#else
-+static void vncHooksBlockHandler(ScreenPtr pScreen, void * pTimeout);
- #endif
- #ifdef RENDER
- static void vncHooksComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, 
-@@ -716,9 +718,11 @@ static Bool vncHooksDisplayCursor(DeviceIntPtr pDev,
- #if XORG <= 112
- static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout,
-                                  pointer pReadmask)
--#else
-+#elif XORG <= 118
- static void vncHooksBlockHandler(ScreenPtr pScreen_, void * pTimeout,
-                                  void * pReadmask)
-+#else
-+static void vncHooksBlockHandler(ScreenPtr pScreen_, void * pTimeout)
- #endif
- {
- #if XORG <= 112
-@@ -731,8 +735,10 @@ static void vncHooksBlockHandler(ScreenPtr pScreen_, void * pTimeout,
- 
- #if XORG <= 112
-   (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
--#else
-+#elif XORG <= 118
-   (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask);
-+#else
-+  (*pScreen->BlockHandler) (pScreen, pTimeout);
- #endif
- 
-   vncHooksScreen->ignoreHooks--;
-@@ -1033,12 +1039,21 @@ static void vncHooksCopyClip(GCPtr dst, GCPtr src) {
- 
- // Unwrap and rewrap helpers
- 
-+#if XORG >= 116
-+#define GC_OP_PROLOGUE(pGC, name)\
-+    vncHooksGCPtr pGCPriv = vncHooksGCPrivate(pGC);\
-+    const GCFuncs *oldFuncs = pGC->funcs;\
-+    pGC->funcs = pGCPriv->wrappedFuncs;\
-+    pGC->ops = pGCPriv->wrappedOps; \
-+    DBGPRINT((stderr,"vncHooks" #name " called\n"))
-+#else
- #define GC_OP_PROLOGUE(pGC, name)\
-     vncHooksGCPtr pGCPriv = vncHooksGCPrivate(pGC);\
-     GCFuncs *oldFuncs = pGC->funcs;\
-     pGC->funcs = pGCPriv->wrappedFuncs;\
-     pGC->ops = pGCPriv->wrappedOps; \
-     DBGPRINT((stderr,"vncHooks" #name " called\n"))
-+#endif
- 
- #define GC_OP_EPILOGUE(pGC)\
-     pGCPriv->wrappedOps = pGC->ops;\
-diff --git a/unix/xserver/hw/vnc/xorg-version.h b/unix/xserver/hw/vnc/xorg-version.h
-index 60610cb..9d1c0eb 100644
---- a/unix/xserver/hw/vnc/xorg-version.h
-+++ b/unix/xserver/hw/vnc/xorg-version.h
-@@ -50,8 +50,10 @@
- #define XORG 117
- #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (18 * 100000) + (99 * 1000))
- #define XORG 118
-+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (19 * 100000) + (99 * 1000))
-+#define XORG 119
- #else
--#error "X.Org newer than 1.18 is not supported"
-+#error "X.Org newer than 1.19 is not supported"
- #endif
- 
- #endif
diff --git a/net-misc/tigervnc/tigervnc-1.7.1-r2.ebuild b/net-misc/tigervnc/tigervnc-1.7.1-r2.ebuild
deleted file mode 100644
index 0f71cfb4d1be..000000000000
--- a/net-misc/tigervnc/tigervnc-1.7.1-r2.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd
-
-XSERVER_VERSION="1.19.1"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2
-	mirror://gentoo/${PN}.png
-	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
-IUSE="+drm gnutls java +opengl pam server +xorgmodule"
-
-CDEPEND="virtual/jpeg:0
-	sys-libs/zlib
-	>=x11-libs/libXtst-1.0.99.2
-	>=x11-libs/fltk-1.3.1
-	gnutls? ( net-libs/gnutls:= )
-	pam? ( virtual/pam )
-	server? (
-		dev-lang/perl
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXfont-1.4.2
-		>=x11-libs/libxkbfile-1.0.4
-		x11-libs/libXrender
-		>=x11-libs/pixman-0.27.2
-		>=x11-apps/xauth-1.0.3
-		x11-apps/xsetroot
-		>=x11-misc/xkeyboard-config-2.4.1-r3
-		opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 )
-		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-		drm? ( x11-libs/libdrm )
-	)"
-
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.5:* )
-	!net-misc/vnc
-	!net-misc/tightvnc
-	!net-misc/xf4vnc"
-
-DEPEND="${CDEPEND}
-	amd64? ( dev-lang/nasm )
-	x86? ( dev-lang/nasm )
-	>=x11-proto/inputproto-2.2.99.1
-	>=x11-proto/xextproto-7.2.99.901
-	>=x11-proto/xproto-7.0.31
-	x11-libs/libXfont2
-	java? ( >=virtual/jdk-1.5 )
-	server?	(
-		virtual/pkgconfig
-		media-fonts/font-util
-		x11-misc/util-macros
-		>=x11-proto/bigreqsproto-1.1.0
-		>=x11-proto/compositeproto-0.4
-		>=x11-proto/damageproto-1.1
-		>=x11-proto/fixesproto-5.0
-		>=x11-proto/fontsproto-2.1.3
-		>=x11-proto/glproto-1.4.17
-		>=x11-proto/randrproto-1.4.0
-		>=x11-proto/renderproto-0.11
-		>=x11-proto/resourceproto-1.2.0
-		>=x11-proto/scrnsaverproto-1.1
-		>=x11-proto/videoproto-2.2.2
-		>=x11-proto/xcmiscproto-1.2.0
-		>=x11-proto/xineramaproto-1.1.3
-		>=x11-libs/xtrans-1.3.3
-		>=x11-proto/dri2proto-2.8
-		opengl? ( >=media-libs/mesa-10.3.4-r1 )
-	)"
-
-PATCHES=(
-	"${WORKDIR}"/patches/010_libvnc-os.patch
-	"${WORKDIR}"/patches/030_manpages.patch
-	"${WORKDIR}"/patches/055_xstartup.patch
-)
-
-src_prepare() {
-	if use server ; then
-		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
-	fi
-
-	cmake-utils_src_prepare
-
-	if use server; then
-		eapply "${FILESDIR}/${PN}-1.7.1-xserver119-compat.patch"
-		cd unix/xserver || die
-		eapply "${FILESDIR}/xserver119.patch"
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use arm || use hppa && append-flags "-fPIC"
-
-	local mycmakeargs=(
-		-DENABLE_GNUTLS=$(usex gnutls)
-		-DENABLE_PAM=$(usex pam)
-		-DBUILD_JAVA=$(usex java)
-	)
-
-	cmake-utils_src_configure
-
-	if use server; then
-		cd unix/xserver || die
-		econf \
-			$(use_enable opengl glx) \
-			$(use_enable drm libdrm) \
-			--disable-config-hal \
-			--disable-config-udev \
-			--disable-devel-docs \
-			--disable-dmx \
-			--disable-dri \
-			--disable-dri3 \
-			--disable-glamor \
-			--disable-kdrive \
-			--disable-libunwind \
-			--disable-linux-acpi \
-			--disable-record \
-			--disable-selective-werror \
-			--disable-silent-rules \
-			--disable-static \
-			--disable-tslib \
-			--disable-unit-tests \
-			--disable-xephyr \
-			--disable-xinerama \
-			--disable-xnest \
-			--disable-xorg \
-			--disable-xvfb \
-			--disable-xwin \
-			--disable-xwayland \
-			--enable-dri2 \
-			--with-pic \
-			--without-dtrace \
-			--disable-present \
-			--disable-unit-tests
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use server; then
-		# deps of the vnc module and the module itself
-		local d subdirs=(
-			fb xfixes Xext dbe $(usex opengl glx "") randr render damageext miext Xi xkb
-			composite dix mi os hw/vnc
-		)
-		for d in "${subdirs[@]}"; do
-			emake -C unix/xserver/"${d}"
-		done
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon "${DISTDIR}"/tigervnc.png vncviewer.png
-	make_desktop_entry vncviewer vncviewer vncviewer Network
-
-	if use server ; then
-		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
-		if ! use xorgmodule; then
-			rm -r "${ED%/}"/usr/$(get_libdir)/xorg || die
-		else
-			rm "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
-		fi
-
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-		systemd_douserunit contrib/systemd/user/vncserver@.service
-	else
-		local f
-		cd "${ED}" || die
-		for f in vncserver vncpasswd x0vncserver vncconfig; do
-			rm usr/bin/$f || die
-			rm usr/share/man/man1/$f.1 || die
-		done
-	fi
-}
diff --git a/net-misc/tigervnc/tigervnc-1.7.1-r4.ebuild b/net-misc/tigervnc/tigervnc-1.7.1-r4.ebuild
deleted file mode 100644
index 3cac464560b0..000000000000
--- a/net-misc/tigervnc/tigervnc-1.7.1-r4.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd
-
-XSERVER_VERSION="1.19.1"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2
-	mirror://gentoo/${PN}.png
-	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="+drm gnutls nls java +opengl pam server +xorgmodule"
-
-CDEPEND="virtual/jpeg:0
-	sys-libs/zlib
-	>=x11-libs/libXtst-1.0.99.2
-	>=x11-libs/fltk-1.3.1
-	gnutls? ( net-libs/gnutls:= )
-	nls? ( virtual/libiconv )
-	pam? ( virtual/pam )
-	server? (
-		dev-lang/perl
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXfont-1.4.2
-		>=x11-libs/libxkbfile-1.0.4
-		x11-libs/libXrender
-		>=x11-libs/pixman-0.27.2
-		>=x11-apps/xauth-1.0.3
-		x11-apps/xsetroot
-		>=x11-misc/xkeyboard-config-2.4.1-r3
-		opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 )
-		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-		drm? ( x11-libs/libdrm )
-	)"
-
-RDEPEND="${CDEPEND}
-	!net-misc/tightvnc
-	!net-misc/vnc
-	!net-misc/xf4vnc
-	java? ( >=virtual/jre-1.5:* )"
-
-DEPEND="${CDEPEND}
-	amd64? ( dev-lang/nasm )
-	x86? ( dev-lang/nasm )
-	>=x11-proto/inputproto-2.2.99.1
-	>=x11-proto/xextproto-7.2.99.901
-	>=x11-proto/xproto-7.0.31
-	x11-libs/libXfont2
-	nls? ( sys-devel/gettext )
-	java? ( >=virtual/jdk-1.5 )
-	server?	(
-		virtual/pkgconfig
-		media-fonts/font-util
-		x11-misc/util-macros
-		>=x11-proto/bigreqsproto-1.1.0
-		>=x11-proto/compositeproto-0.4
-		>=x11-proto/damageproto-1.1
-		>=x11-proto/fixesproto-5.0
-		>=x11-proto/fontsproto-2.1.3
-		>=x11-proto/glproto-1.4.17
-		>=x11-proto/randrproto-1.4.0
-		>=x11-proto/renderproto-0.11
-		>=x11-proto/resourceproto-1.2.0
-		>=x11-proto/scrnsaverproto-1.1
-		>=x11-proto/videoproto-2.2.2
-		>=x11-proto/xcmiscproto-1.2.0
-		>=x11-proto/xineramaproto-1.1.3
-		>=x11-libs/xtrans-1.3.3
-		>=x11-proto/dri2proto-2.8
-		opengl? ( >=media-libs/mesa-10.3.4-r1 )
-	)"
-
-PATCHES=(
-	"${WORKDIR}"/patches/010_libvnc-os.patch
-	"${WORKDIR}"/patches/030_manpages.patch
-	"${WORKDIR}"/patches/055_xstartup.patch
-)
-
-src_prepare() {
-	if use server ; then
-		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
-	fi
-
-	cmake-utils_src_prepare
-
-	if use server; then
-		eapply "${FILESDIR}/${PN}-1.7.1-xserver119-compat.patch"
-		cd unix/xserver || die
-		eapply "${FILESDIR}/xserver119.patch"
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use arm || use hppa && append-flags "-fPIC"
-
-	local mycmakeargs=(
-		-DENABLE_GNUTLS=$(usex gnutls)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_PAM=$(usex pam)
-		-DBUILD_JAVA=$(usex java)
-	)
-
-	cmake-utils_src_configure
-
-	if use server; then
-		cd unix/xserver || die
-		econf \
-			$(use_enable opengl glx) \
-			$(use_enable drm libdrm) \
-			--disable-config-hal \
-			--disable-config-udev \
-			--disable-devel-docs \
-			--disable-dmx \
-			--disable-dri \
-			--disable-dri3 \
-			--disable-glamor \
-			--disable-kdrive \
-			--disable-libunwind \
-			--disable-linux-acpi \
-			--disable-record \
-			--disable-selective-werror \
-			--disable-silent-rules \
-			--disable-static \
-			--disable-tslib \
-			--disable-unit-tests \
-			--disable-xephyr \
-			--disable-xinerama \
-			--disable-xnest \
-			--disable-xorg \
-			--disable-xvfb \
-			--disable-xwin \
-			--disable-xwayland \
-			--enable-dri2 \
-			--with-pic \
-			--without-dtrace \
-			--disable-present \
-			--disable-unit-tests
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use server; then
-		# deps of the vnc module and the module itself
-		local d subdirs=(
-			fb xfixes Xext dbe $(usex opengl glx "") randr render damageext miext Xi xkb
-			composite dix mi os hw/vnc
-		)
-		for d in "${subdirs[@]}"; do
-			emake -C unix/xserver/"${d}"
-		done
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon "${DISTDIR}"/tigervnc.png vncviewer.png
-	make_desktop_entry vncviewer vncviewer vncviewer Network
-
-	if use server ; then
-		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
-		if ! use xorgmodule; then
-			rm -r "${ED%/}"/usr/$(get_libdir)/xorg || die
-		else
-			rm "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
-		fi
-
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
-		systemd_douserunit contrib/systemd/user/vncserver@.service
-	else
-		local f
-		cd "${ED}" || die
-		for f in vncserver x0vncserver vncconfig; do
-			rm usr/bin/$f || die
-			rm usr/share/man/man1/$f.1 || die
-		done
-	fi
-}