gentoo resync : 29.12.2022

10 files changed, 71 insertions, 536 deletions

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 019f6e20ba0e..6f62f4ef974c 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -3,18 +3,9 @@ AUX tigervnc-1.12.0-xorg-1.21.patch 1756 BLAKE2B c872216f03b595f61e91d876546c573
 AUX tigervnc-1.12.0-xsession-path.patch 973 BLAKE2B c193ccc5ad0d8e04f8cd9f755c9d5b4a013af8bd4f9bbf9de4afbf21482fc62cbe1d57cc0274c5810588177db17b6cf1c69f5336e40cd3ccdefe0fa21bb1f736 SHA512 916e4f114834bcd4ccb2375ce35f7b36ad13496599e1a8aa736edf31627cd95eaab8b29e0fb9cfb07aa56856b2defbf916c23218debe1d62522d8dbac8674f38
 AUX tigervnc-1.12.0.confd 665 BLAKE2B 1525706e3e60727ed0f3eeb0dcfc849ea2b92463d9c4bff09eb9e644e51aa7665ff96d0f0c5ec321014145f8227d7c7b94578a97d948bfc94cacbc4087ebc184 SHA512 bced660d691f559ab9392aef7ea0040ea5f435d7f1cfef9b82983395c10103b8607e90a03de67d330371d641bf249ec61200b9d28d48600f7548978b7ee367c6
 AUX tigervnc-1.12.0.initd 2149 BLAKE2B 7d7389128816ad07ba0890d57c113834fc325b00729a5e3979dca5c25e9940690aab9e10d7e6a94a8645002cc15dcbd54137636b373c99f86454a5873870ed72 SHA512 c1047acf1211c4073a4581d5bfe78dec00320e0749b44608224cc478ac335233cd7beacbd161f61330fe28c2a6fa8de137b2c80e9ebda9d92f90b062f489eecb
-AUX tigervnc-1.9.0-030_manpages.patch 1978 BLAKE2B c9054f599b503d68d19dab1bd5c588ed19e96f3d547482c10acf84acc81fb59089497d1a282d6f8108132c8ed2fc412af9153c1305d6b04fdecf227c4ad42180 SHA512 dd58ab7987e2e619cc544cae77d7234575dbb812073f730ca0abda24e05c95fcc62449f96472a7962202725d2c9277432cf2289ff930d9841852c858977bf44e
-AUX tigervnc-1.9.0-055_xstartup.patch 1188 BLAKE2B 99f9371fffd6fdddef86b821152833ea7b24b9d121a51e85e04f1b25411a14f629513ed211b1c13f38f60dc48708db40891f1c36eea6b24e7b239f1e480540fe SHA512 b16cbd2360c6eba6210362d138ff5406f472bd4d81277def69460b846169f49cb3f98d29193c4fbc89d7ab06fb04052c2b94f7ceab6003f2b9b17c5b6c51151c
-AUX tigervnc.confd 346 BLAKE2B b21fe4537e186cd4de89f54b42006f0adbe4d6968c87dcb81981b02af27eec5ce06ad3aa76d9a747aeda481a5e422dfc8a122bc266660a240833863043cf81b0 SHA512 204ab170de8b76d72d6fd2c3fcfab19cb2750eca231956f53cdfc81270baaef9ae31b08ce53b103a737045ccca8ce0b7f9649fb7cbd582ee0acff437ff5c85b4
-AUX tigervnc.initd 1974 BLAKE2B bb909f75ecbb7f33db4a0e3a7a1ee59bf9c60d5cbef4d432efa9e741f10d341e1a76e2c2a9780ecc7bdbd4a3e78c6286e9749f24a1d07b768584ad6203931477 SHA512 b0d43352551cf3cbcfe404dcbfe5617965e08674d5af0f7ec801c9124d7ab0279d9bb8f76b6141b5ad96a70df9c99d5b6cfff0ba29211a37a344906d105e1bc8
-AUX xserver120-drmfourcc-header.patch 1300 BLAKE2B d1be2072020a4eff663e56e1210b8ffadacd7c394f0bd5ac82a0d5b6a023c020a5125112807762b5260f07180f591009bd22eeb6d9a1324bae64caca7dd6aaba SHA512 aa980e28568df01f4589c258e293df1499c8d7d8d2e37a0bb52c240efb0fcb45f862f382633c389ba60283b6776e33e642acf3544bb89832bd2980bb80908e30
-AUX xserver120.patch 3699 BLAKE2B f85933c025dc0347040261710e820232fbb21a572cf311bf8b37e8e1873046919fbecf1023f0178793e939ba33e834b55c6e8277f88bd2b145716badc8b4a5c4 SHA512 bf69a4b65742c5f2351b7d0f0b7ad44f44050dd8f54972d9545ea873f27f8fe88314b016b07746b31ac75bde6648b249f523a1f3d9948a9cb26001d6096d4f3d
 DIST tigervnc-1.12.0-xserver-21.patch 3642 BLAKE2B 690860c51d9d2e4606b16318237f86e5a042410dd5778e3d99a01df3fedd7f1993b4fc1eaeb9d193ef9e54d5b25b1d99bfb0bedc8cfb6673983625d9b45c2f92 SHA512 8e9a667557d22e908b1f4e58017f822e98bc608d1e27a09e6b8cfb3b01fe0c5cf9bf484fa634e4109eb7a32234df67fcfdeaca92d4ff982de0e83778c359034d
 DIST tigervnc-1.12.0.tar.gz 1561898 BLAKE2B 891934e48e3c4f2c36c280ad1562874d3c22ca3118e8eda2f68f9ad7cca978c76b8825100f540774b7a6553e981bd9264e0f717c8313585553741d31706cafad SHA512 a16b15e9cda552a49a3934e4174e49d186d06494d90d11582599ab82559014332662aed7760619a6dfb32a8c95f7d63c68ac7d632c29dd662a6b713f036672bb
-DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a SHA512 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d
-DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
 DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d
-EBUILD tigervnc-1.12.0-r5.ebuild 4907 BLAKE2B b3b7f361196e6b58fbfac738b45f6ac1a873eee1af28db51054856829cff620f75c06d44a24ebb0eeca2348873afe517f6451616b90620bd4a37eefdd1557f93 SHA512 a00d73c9212f8ffb8208a391ae5c375841cc525bb62091d90386b9d5d2c2356ab5e3936bc56e358f18f31240744ad3d4a7dff6c769bf893f989f0532618f6769
-EBUILD tigervnc-1.9.0-r2.ebuild 4221 BLAKE2B 5d9ee5be8f6a8b23c62959105a5dafac0db043e6c76462b9c8aa5c1fb9ee56985d08d750f754f030055796980ef3e2987d41af6247bc07431403e5494a0cbd19 SHA512 9937b4ef4d969d329fd04ed372cbc079e4f1f17397cc22d41c08cb464625e9ee6cf6f771cef2e5c6d45e947ebe28851bd45dae08186bcd489c418ff1be8642c0
-EBUILD tigervnc-9999.ebuild 4072 BLAKE2B 8d9d1d942146ee2fd64e597bb362b444b88933fdbbf0412dcca117dc2be6abbb77e4260788fba900a00698e5b61b8742905d64c5587f2e1470aa6631cbcf72ef SHA512 a7e0a4b8a74a52296e157577c34de37bb70202171e37d2ea36af68860fdc86b72c4ee79bec18edf413e39ee98716444f44313a5e01c07674494bed963a59ab4a
+EBUILD tigervnc-1.12.0-r6.ebuild 4869 BLAKE2B fcc19219cd2e0ee342688d559c8617ff5389175fea7207e644a4340edc0dcf513352a8d8bcace7337a826ae1903d16a7d5cbb647ef15340c95cf778beeee0036 SHA512 6e298bf5dd7753e9a7273a6fd9521d101db8dfe052d2c1c8c6812ce0be57e31f2eeea94cc11ad19d620e9deceab14e3c429de81127163232c8404ad7af9b7baa
+EBUILD tigervnc-9999.ebuild 4772 BLAKE2B 3178336b98683506997a61e608e808176ff1cda1146935f07036a8616a2bf9117a63cafb94155cb2389a79ce7a48a9139ffb18bc683d6aabe893d72ea6aa3b46 SHA512 0e7881455d578c887b5455c78786d0af3337ffdd149aeb837102a4ee7473ca127e0e6f92a676f6bdc2808f84102155ee3fe437c7a614763ea7cf8df15ccf830c
 MISC metadata.xml 706 BLAKE2B 221033648808798dd4d0be5db1374b76552a2a92eb5dc7b57f11c3feb7774e8fd85fd81f740753e3007bfd431fee4d4686210a5c1f2e967c2a67b76dfe03bb7f SHA512 f69cadf29c700280cae57028179c5e94eca3a3a71c82093bb7236e908d4407e149622aa39fc0a71ab25eab93a6250750cc95cdaa7ae933fd7f332de50250f845
diff --git a/net-misc/tigervnc/files/tigervnc-1.9.0-030_manpages.patch b/net-misc/tigervnc/files/tigervnc-1.9.0-030_manpages.patch
deleted file mode 100644
index 8a30f18d7d92..000000000000
--- a/net-misc/tigervnc/files/tigervnc-1.9.0-030_manpages.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/unix/vncserver b/unix/vncserver
-index 9e7a6ac5..139f9601 100755
---- a/unix/vncserver
-+++ b/unix/vncserver
-@@ -684,6 +684,7 @@ sub Usage
- 	"                 [-geometry <width>x<height>]\n".
- 	"                 [-pixelformat rgbNNN|bgrNNN]\n".
- 	"                 [-fp <font-path>]\n".
-+	"                 [-cc <visual>]\n".
- 	"                 [-fg]\n".
- 	"                 [-autokill]\n".
- 	"                 [-noxstartup]\n".
-diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx
-index f076565f..05669a42 100644
---- a/vncviewer/vncviewer.cxx
-+++ b/vncviewer/vncviewer.cxx
-@@ -352,6 +352,11 @@ static void usage(const char *programName)
-           "       %s [parameters] -listen [port] [parameters]\n"
-           "       %s [parameters] [.tigervnc file]\n",
-           programName, programName, programName);
-+  fprintf(stderr,"\n"
-+	  "Options:\n\n"
-+	  "  -display Xdisplay - Specifies the X display for the viewer window\n"
-+	  "  -geometry geometry - Standard X position and sizing specification.\n");
-+
-   fprintf(stderr,"\n"
-           "Parameters can be turned on with -<param> or off with -<param>=0\n"
-           "Parameters which take a value can be specified as "
-diff --git a/vncviewer/vncviewer.man b/vncviewer/vncviewer.man
-index 729c01d6..07dc58f1 100644
---- a/vncviewer/vncviewer.man
-+++ b/vncviewer/vncviewer.man
-@@ -240,6 +240,10 @@ This option specifies the preferred encoding to use from one of "Tight", "ZRLE",
- Disable lossy JPEG compression in Tight encoding. Default is off.
- .
- .TP
-+.B \-ImprovedHextile
-+Try harder to compress data (default).
-+.
-+.TP
- .B \-QualityLevel \fIlevel\fP
- JPEG quality level. 0 = Low, 9 = High. May be adjusted automatically if
- \fB-AutoSelect\fP is turned on. Default is 8.
-@@ -296,6 +300,11 @@ respectively.
- .B \-AlertOnFatalError
- Display a dialog with any fatal error before exiting. Default is on.
- 
-+.
-+.TP
-+.B \-ZlibLevel
-+Zlib compression level.
-+
- .SH FILES
- .TP
- $HOME/.vnc/default.tigervnc
diff --git a/net-misc/tigervnc/files/tigervnc-1.9.0-055_xstartup.patch b/net-misc/tigervnc/files/tigervnc-1.9.0-055_xstartup.patch
deleted file mode 100644
index 8b50d8ccf159..000000000000
--- a/net-misc/tigervnc/files/tigervnc-1.9.0-055_xstartup.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/unix/vncserver b/unix/vncserver
-index 9e7a6ac5..fff53bdb 100755
---- a/unix/vncserver
-+++ b/unix/vncserver
-@@ -63,27 +63,7 @@ $defaultXStartup
-     = ("#!/bin/sh\n\n".
-        "unset SESSION_MANAGER\n".
-        "unset DBUS_SESSION_BUS_ADDRESS\n".
--       "OS=`uname -s`\n".
--       "if [ \$OS = 'Linux' ]; then\n".
--       "  case \"\$WINDOWMANAGER\" in\n".
--       "    \*gnome\*)\n".
--       "      if [ -e /etc/SuSE-release ]; then\n".
--       "        PATH=\$PATH:/opt/gnome/bin\n".
--       "        export PATH\n".
--       "      fi\n".
--       "      ;;\n".
--       "  esac\n".
--       "fi\n".
--       "if [ -x /etc/X11/xinit/xinitrc ]; then\n".
--       "  exec /etc/X11/xinit/xinitrc\n".
--       "fi\n".
--       "if [ -f /etc/X11/xinit/xinitrc ]; then\n".
--       "  exec sh /etc/X11/xinit/xinitrc\n".
--       "fi\n".
--       "[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n".
--       "xsetroot -solid grey\n".
--       "xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n".
--       "twm &\n");
-+       "exec /etc/X11/xinit/xinitrc\n");
- 
- $defaultConfig
-     = ("## Supported server options to pass to vncserver upon invocation can be listed\n".
diff --git a/net-misc/tigervnc/files/tigervnc.confd b/net-misc/tigervnc/files/tigervnc.confd
deleted file mode 100644
index e651dbbe7889..000000000000
--- a/net-misc/tigervnc/files/tigervnc.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# Config file for /etc/init.d/tigervnc
-
-# Specify the user(s) Xvnc(1) should be run for. The syntax is: "username:display".
-# example: "DISPLAYS="foo:1 bar:2" You can specify more users separated by space.
-# DISPLAYS="myuser:1"
-
-# Specify any of vncserver(1) and Xvnc(1) options. See the respective man pages for more information.
-# VNC_OPTS=""
-
diff --git a/net-misc/tigervnc/files/tigervnc.initd b/net-misc/tigervnc/files/tigervnc.initd
deleted file mode 100644
index 06a154257e6f..000000000000
--- a/net-misc/tigervnc/files/tigervnc.initd
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ -n "${DISPLAYS}" ]; then
-		if [ $1 = "start" ]; then
-			local user
-			for user in $DISPLAYS; do
-				if eval [ ! -f "~${user%%:*}/.vnc/passwd" ]; then
-					eerror "There are no passwords defined for user ${user%%:*}."
-					return 1
-				elif [ -e "/tmp/.X11-unix/X${user##*:}" ]; then
-					eerror "Display :${user##*:} appears to be already in use because of /tmp/.X11-unix/X${user##*:}"
-					eerror "Remove this file if there is no X server $HOSTNAME:${user##*:}"
-					return 1
-				elif [ -e "/tmp/.X${user##*:}-lock" ]; then
-					eerror "Display :${user##*:} appears to be already in use because of /tmp/.X${user##*:}-lock"
-					eerror "Remove this file if there is no X server $HOSTNAME:${user##*:}"
-					return 1
-				fi
-			done
-		fi
-		return 0
-	else
-		eerror 'Please define $DISPLAYS in /etc/conf.d/tigervnc'
-		return 1
-	fi
-}
-
-start() {
-	checkconfig start || return 1
-	ebegin "Starting TigerVNC server"
-	for user in $DISPLAYS; do
-		usrname=${user%%:*}
-		usropts=VNC_OPTS_${usrname}
-		usrdisp=${user##*:}
-		usrvar=$usropts"["$usrdisp"]"
-		[ -z ${!usrvar} ] && vnc_opts=$VNC_OPTS || vnc_opts=${!usrvar}
-
-		# A user may have an invalid shell, so we default to /bin/sh if its the case
-		if [ -x /usr/bin/getent ] ; then
-			usrshell=`getent passwd ${user%%:*} | cut -d: -f 7`
-			case "$usrshell" in
-				*/bash|*/ksh|*/sh|*/csh|*/tcsh) ;;          
-				*) shell="-s /bin/sh" ;;
-			esac
-			echo $usrshell $shell
-		fi
-
-		su ${shell} ${user%%:*} -c "source /etc/profile && cd ~${user%%:*} && vncserver :${user##*:} $vnc_opts" &>/dev/null
-	done
-	eend $?
-}
-
-stop() {
-	checkconfig stop || return 2
-	ebegin "Stopping TigerVNC server"
-	for user in $DISPLAYS; do
-		su -s /bin/sh ${user%%:*} -c "vncserver -kill :${user##*:}" &>/dev/null
-	done
-	eend $?
-}
-
-restart() {
-        svc_stop
-        svc_start
-}
diff --git a/net-misc/tigervnc/files/xserver120-drmfourcc-header.patch b/net-misc/tigervnc/files/xserver120-drmfourcc-header.patch
deleted file mode 100644
index 4028ebb74518..000000000000
--- a/net-misc/tigervnc/files/xserver120-drmfourcc-header.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -urpN xorg-server-1.20.0.orig/dri3/dri3.c xorg-server-1.20.0/dri3/dri3.c
---- xorg-server-1.20.0.orig/dri3/dri3.c	2018-05-10 09:32:34.000000000 -0700
-+++ xorg-server-1.20.0/dri3/dri3.c	2018-06-13 19:32:52.131915519 -0700
-@@ -26,7 +26,7 @@
- 
- #include "dri3_priv.h"
- 
--#include <drm_fourcc.h>
-+#include <libdrm/drm_fourcc.h>
- 
- static int dri3_request;
- DevPrivateKeyRec dri3_screen_private_key;
-diff -urpN xorg-server-1.20.0.orig/dri3/dri3_request.c xorg-server-1.20.0/dri3/dri3_request.c
---- xorg-server-1.20.0.orig/dri3/dri3_request.c	2018-05-10 09:32:34.000000000 -0700
-+++ xorg-server-1.20.0/dri3/dri3_request.c	2018-06-13 19:33:46.164444267 -0700
-@@ -30,7 +30,7 @@
- #include <xace.h>
- #include "../Xext/syncsdk.h"
- #include <protocol-versions.h>
--#include <drm_fourcc.h>
-+#include <libdrm/drm_fourcc.h>
- 
- static Bool
- dri3_screen_can_one_point_two(ScreenPtr screen)
-diff -urpN xorg-server-1.20.0.orig/dri3/dri3_screen.c xorg-server-1.20.0/dri3/dri3_screen.c
---- xorg-server-1.20.0.orig/dri3/dri3_screen.c	2018-05-10 09:32:34.000000000 -0700
-+++ xorg-server-1.20.0/dri3/dri3_screen.c	2018-06-13 19:33:13.885725528 -0700
-@@ -29,7 +29,7 @@
- #include <misync.h>
- #include <misyncshm.h>
- #include <randrstr.h>
--#include <drm_fourcc.h>
-+#include <libdrm/drm_fourcc.h>
- #include <unistd.h>
- 
- int
diff --git a/net-misc/tigervnc/files/xserver120.patch b/net-misc/tigervnc/files/xserver120.patch
deleted file mode 100644
index e823a651ae03..000000000000
--- a/net-misc/tigervnc/files/xserver120.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -urpN xorg-server-1.20.0.orig/configure.ac xorg-server-1.20.0/configure.ac
---- xorg-server-1.20.0.orig/configure.ac	2018-05-10 09:32:34.000000000 -0700
-+++ xorg-server-1.20.0/configure.ac	2018-06-13 19:04:47.536413626 -0700
-@@ -74,6 +74,7 @@ dnl forcing an entire recompile.x
- AC_CONFIG_HEADERS(include/version-config.h)
- 
- AM_PROG_AS
-+AC_PROG_CXX
- AC_PROG_LN_S
- LT_PREREQ([2.2])
- LT_INIT([disable-static win32-dll])
-@@ -1777,6 +1778,10 @@ if test "x$XVFB" = xyes; then
- 	AC_SUBST([XVFB_SYS_LIBS])
- fi
- 
-+dnl Xvnc DDX
-+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"])
-+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"])
-+AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"])
- 
- dnl Xnest DDX
- 
-@@ -1812,6 +1817,8 @@ if test "x$XORG" = xauto; then
- fi
- AC_MSG_RESULT([$XORG])
- 
-+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
-+
- if test "x$XORG" = xyes; then
- 	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
- 	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
-@@ -2029,7 +2036,6 @@ if test "x$XORG" = xyes; then
- 	AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
- 	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
- 	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
--	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
- 	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
- 	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
- 	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
-@@ -2565,6 +2571,7 @@ hw/dmx/Makefile
- hw/dmx/man/Makefile
- hw/vfb/Makefile
- hw/vfb/man/Makefile
-+hw/vnc/Makefile
- hw/xnest/Makefile
- hw/xnest/man/Makefile
- hw/xwin/Makefile
-diff -urpN xorg-server-1.20.0.orig/hw/Makefile.am xorg-server-1.20.0/hw/Makefile.am
---- xorg-server-1.20.0.orig/hw/Makefile.am	2018-05-10 09:32:34.000000000 -0700
-+++ xorg-server-1.20.0/hw/Makefile.am	2018-06-13 19:04:47.536413626 -0700
-@@ -38,7 +38,8 @@ SUBDIRS =			\
- 	$(DMX_SUBDIRS)		\
- 	$(KDRIVE_SUBDIRS)	\
- 	$(XQUARTZ_SUBDIRS)	\
--	$(XWAYLAND_SUBDIRS)
-+	$(XWAYLAND_SUBDIRS)	\
-+	vnc
- 
- DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xwayland
- 
-diff -urpN xorg-server-1.20.0.orig/include/os.h xorg-server-1.20.0/include/os.h
---- xorg-server-1.20.0.orig/include/os.h	2018-05-10 09:32:36.000000000 -0700
-+++ xorg-server-1.20.0/include/os.h	2018-06-13 19:04:47.537413618 -0700
-@@ -633,7 +633,7 @@ LogSetDisplay(void);
- extern _X_EXPORT void
- LogClose(enum ExitCode error);
- extern _X_EXPORT Bool
--LogSetParameter(LogParameter param, int value);
-+LogSetParameter(enum _LogParameter param, int value);
- extern _X_EXPORT void
- LogVWrite(int verb, const char *f, va_list args)
- _X_ATTRIBUTE_PRINTF(2, 0);
-diff -urpN xorg-server-1.20.0.orig/mi/miinitext.c xorg-server-1.20.0/mi/miinitext.c
---- xorg-server-1.20.0.orig/mi/miinitext.c	2018-05-10 09:32:37.000000000 -0700
-+++ xorg-server-1.20.0/mi/miinitext.c	2018-06-13 19:05:14.742200675 -0700
-@@ -107,8 +107,15 @@ SOFTWARE.
- #include "os.h"
- #include "globals.h"
- 
-+#ifdef TIGERVNC
-+extern void vncExtensionInit(INITARGS);
-+#endif
-+
- /* List of built-in (statically linked) extensions */
- static const ExtensionModule staticExtensions[] = {
-+#ifdef TIGERVNC
-+    {vncExtensionInit, "VNC-EXTENSION", NULL},
-+#endif
-     {GEExtensionInit, "Generic Event Extension", &noGEExtension},
-     {ShapeExtensionInit, "SHAPE", NULL},
- #ifdef MITSHM
diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild b/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
index 5a4087287b50..5bbb399656a0 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
@@ -19,11 +19,14 @@ SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
-IUSE="dri3 +drm gnutls java nls +opengl server xinerama +xorgmodule"
-REQUIRED_USE="dri3? ( drm )"
+IUSE="dri3 +drm gnutls java nls +opengl +server xinerama"
+REQUIRED_USE="
+	dri3? ( drm )
+	opengl? ( server )
+"
 
 CDEPEND="
-	virtual/jpeg:0
+	media-libs/libjpeg-turbo:=
 	sys-libs/zlib:=
 	x11-libs/fltk:1
 	x11-libs/libX11
@@ -52,7 +55,6 @@ CDEPEND="
 		x11-apps/xsetroot
 		x11-misc/xkeyboard-config
 		opengl? ( media-libs/libglvnd[X] )
-		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
 	)
 	"
 
@@ -168,11 +170,7 @@ src_install() {
 
 	if use server; then
 		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
-		if ! use xorgmodule; then
-			rm -rv "${ED}"/usr/$(get_libdir)/xorg || die
-		else
-			rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
-		fi
+		rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
 
 		newconfd "${FILESDIR}"/${PN}-${PV}.confd ${PN}
 		newinitd "${FILESDIR}"/${PN}-${PV}.initd ${PN}
@@ -202,6 +200,7 @@ pkg_postinst() {
 
 	local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
 	use server && \
+		optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \
 		optfeature_header "Install any additional display manager package:" && \
 		optfeature "proper session support" ${OPTIONAL_DM}
 }
diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
deleted file mode 100644
index 8b4f9d535a12..000000000000
--- a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit autotools cmake flag-o-matic java-pkg-opt-2 systemd xdg
-
-XSERVER_VERSION="1.20.0"
-
-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
-	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
-IUSE="dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule"
-
-CDEPEND="
-	virtual/jpeg:0
-	sys-libs/zlib:=
-	>=x11-libs/fltk-1.3.1
-	gnutls? ( net-libs/gnutls:= )
-	nls? ( virtual/libiconv )
-	pam? ( sys-libs/pam )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	server? (
-		x11-libs/libXau
-		x11-libs/libXdamage
-		x11-libs/libXdmcp
-		x11-libs/libXfont2
-		x11-libs/libXtst
-		>=x11-libs/pixman-0.27.2
-		>=x11-apps/xauth-1.0.3
-		x11-apps/xsetroot
-		>=x11-misc/xkeyboard-config-2.4.1-r3
-		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-		drm? ( x11-libs/libdrm )
-		dev-libs/openssl:0=
-	)
-	xinerama? ( x11-libs/libXinerama )
-	"
-
-RDEPEND="${CDEPEND}
-	java? ( virtual/jre:1.8 )"
-
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	java? ( virtual/jdk:1.8 )
-	x11-base/xorg-proto
-	media-libs/fontconfig
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXi
-	server? (
-		dev-libs/libbsd
-		x11-libs/libxkbfile
-		x11-libs/libxshmfence
-		virtual/pkgconfig
-		media-fonts/font-util
-		x11-misc/util-macros
-		>=x11-libs/xtrans-1.3.3
-		opengl? ( >=media-libs/mesa-10.3.4-r1 )
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-030_manpages.patch
-	"${FILESDIR}"/${P}-055_xstartup.patch
-)
-
-src_prepare() {
-	if use server ; then
-		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
-	fi
-
-	# do not rely on the build system to install docs
-	sed -i 's:^\(install(.* DESTINATION ${DOC_DIR})\):#\1:' \
-		cmake/BuildPackages.cmake || die
-
-	cmake_src_prepare
-
-	if use server ; then
-		cd unix/xserver || die
-		eapply "${FILESDIR}"/xserver120.patch
-		eapply "${FILESDIR}"/xserver120-drmfourcc-header.patch
-		sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	if use arm || use hppa ; then
-		append-flags "-fPIC"
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_GNUTLS=$(usex gnutls)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_PAM=$(usex pam)
-		-DBUILD_JAVA=$(usex java)
-	)
-
-	cmake_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 \
-			$(use_enable dri3) \
-			--disable-glamor \
-			--disable-kdrive \
-			--disable-libunwind \
-			--disable-linux-acpi \
-			--disable-record \
-			--disable-selective-werror \
-			--disable-static \
-			--disable-unit-tests \
-			--disable-xephyr \
-			$(use_enable xinerama) \
-			--disable-xnest \
-			--disable-xorg \
-			--disable-xvfb \
-			--disable-xwin \
-			--disable-xwayland \
-			--enable-dri2 \
-			--with-pic \
-			--without-dtrace \
-			--disable-present \
-			--with-sha1=libcrypto
-	fi
-}
-
-src_compile() {
-	cmake_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 "") $(usev dri3) 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_src_install
-
-	if use server ; then
-		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
-		if ! use xorgmodule; then
-			rm -rv "${ED}"/usr/$(get_libdir)/xorg || die
-		else
-			rm -v "${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
-}
diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild
index 90b341d3f1e9..903570b2dd06 100644
--- a/net-misc/tigervnc/tigervnc-9999.ebuild
+++ b/net-misc/tigervnc/tigervnc-9999.ebuild
@@ -2,74 +2,85 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CMAKE_IN_SOURCE_BUILD=1
 
-inherit autotools cmake flag-o-matic git-r3 systemd xdg
+CMAKE_IN_SOURCE_BUILD=1
+inherit autotools cmake flag-o-matic git-r3 java-pkg-opt-2 optfeature systemd xdg
 
 XSERVER_VERSION="21.1.1"
 
 DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="https://www.tigervnc.org"
+HOMEPAGE="https://tigervnc.org"
 SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )"
 EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="dri3 +drm gnutls nls +opengl server xinerama +xorgmodule"
+IUSE="dri3 +drm gnutls java nls +opengl server xinerama +xorgmodule"
 
 CDEPEND="
-	virtual/jpeg:0
+	media-libs/libjpeg-turbo:=
 	sys-libs/zlib:=
-	>=x11-libs/fltk-1.3.1
-	sys-libs/pam
+	x11-libs/fltk:1
 	x11-libs/libX11
 	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrandr
 	x11-libs/libXrender
-	x11-libs/libxcvt
 	x11-libs/pixman
 	gnutls? ( net-libs/gnutls:= )
 	nls? ( virtual/libiconv )
 	server? (
+		dev-libs/libbsd
+		dev-libs/openssl:0=
+		sys-libs/pam
 		x11-libs/libXau
 		x11-libs/libXdamage
 		x11-libs/libXdmcp
+		x11-libs/libXfixes
 		x11-libs/libXfont2
 		x11-libs/libXtst
-		>=x11-libs/pixman-0.27.2
-		>=x11-apps/xauth-1.0.3
+		x11-libs/pixman
+		x11-libs/xtrans
+		x11-apps/xauth
+		x11-apps/xinit
+		x11-apps/xkbcomp
 		x11-apps/xsetroot
-		>=x11-misc/xkeyboard-config-2.4.1-r3
+		x11-misc/xkeyboard-config
+		opengl? ( media-libs/libglvnd[X] )
 		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-		drm? ( x11-libs/libdrm )
-		dev-libs/openssl:0=
 	)
-	xinerama? ( x11-libs/libXinerama )
 	"
 
-RDEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}
+	java? ( virtual/jre:1.8 )
+	server? (
+		dev-lang/perl
+		sys-process/psmisc
+	)"
 
 DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )
-	x11-base/xorg-proto
-	media-libs/fontconfig
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXft
-	x11-libs/libXi
+	drm? ( x11-libs/libdrm )
 	server? (
-		dev-libs/libbsd
-		x11-libs/libxkbfile
-		x11-libs/libxshmfence
-		virtual/pkgconfig
 		media-fonts/font-util
+		x11-base/xorg-proto
+		x11-libs/libxcvt
+		x11-libs/libxkbfile
 		x11-misc/util-macros
-		>=x11-libs/xtrans-1.3.3
-		opengl? ( >=media-libs/mesa-10.3.4-r1 )
+		opengl? ( media-libs/mesa )
 	)"
 
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	"
+
+PATCHES=(
+	# Restore Java viewer
+	"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
+	"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
+)
+
 src_unpack() {
 	git-r3_src_unpack
 	unpack xorg-server-${XSERVER_VERSION}.tar.xz
@@ -100,7 +111,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DENABLE_GNUTLS=$(usex gnutls)
 		-DENABLE_NLS=$(usex nls)
-		-DBUILD_JAVA=no
+		-DBUILD_JAVA=$(usex java)
 	)
 
 	cmake_src_configure
@@ -113,7 +124,6 @@ src_configure() {
 			--disable-config-hal \
 			--disable-config-udev \
 			--disable-devel-docs \
-			--disable-dmx \
 			--disable-dri \
 			$(use_enable dri3) \
 			--disable-glamor \
@@ -130,7 +140,6 @@ src_configure() {
 			--disable-xorg \
 			--disable-xvfb \
 			--disable-xwin \
-			--disable-xwayland \
 			--enable-dri2 \
 			--with-pic \
 			--without-dtrace \
@@ -165,10 +174,17 @@ src_install() {
 			rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
 		fi
 
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+		newconfd "${FILESDIR}"/${PN}-1.12.0.confd ${PN}
+		newinitd "${FILESDIR}"/${PN}-1.12.0.initd ${PN}
 
 		systemd_douserunit unix/vncserver/vncserver@.service
+
+		# comment out pam_selinux.so, the server does not start if missing
+		# part of bug #746227
+		sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die
+
+		# install vncserver to /usr/bin too, see bug #836620
+		dosym -r /usr/libexec/vncserver /usr/bin/vncserver
 	else
 		local f
 		for f in x0vncserver vncconfig; do
@@ -177,5 +193,15 @@ src_install() {
 		done
 		rm -r "${ED}"/usr/{sbin,libexec} || die
 		rm -r "${ED}"/usr/share/man/man8 || die
+		rm -r "${ED}"/etc || die
 	fi
 }
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
+	use server && \
+		optfeature_header "Install any additional display manager package:" && \
+		optfeature "proper session support" ${OPTIONAL_DM}
+}