gentoo resync : 25.03.2022

4 files changed, 17 insertions, 21 deletions

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index c663baaca179..5ec8aea513cb 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,8 +1,8 @@
 AUX tigervnc-1.11.0-install-java-viewer.patch 788 BLAKE2B b3da744d21030bf988dc21bca66a17811b1180ad89fcbc6e3ca8b70b8803c284456cc14393dddf5f2f395d9044d90e8ac8ee50d155be7779b08c14d7bbcb270b SHA512 5f9650a6f8589ab952506cbf6a67f603fc720a70dd76a505da69812c039fb9a0a4137c9667ce11e253a35bade056a18d2fa584ac23cda8111ff1fe17e90f025a
 AUX tigervnc-1.12.0-xorg-1.21.patch 1756 BLAKE2B c872216f03b595f61e91d876546c573ed572b20e9ead1e4ded7d830c739dc172a016784902d447dbe8aa78bb5a2e69c4ef6a4357f446af53f7bc569d56108dac SHA512 533ff06e9619cd63ee83dcb3e6a5a35f02f092b32b194f89e2c06f2f17aaf59a3c2adab27d3e87c4a0773f3f82cfec82492d6b031b3a9050d5f0ad4fcf0a0da0
 AUX tigervnc-1.12.0-xsession-path.patch 973 BLAKE2B c193ccc5ad0d8e04f8cd9f755c9d5b4a013af8bd4f9bbf9de4afbf21482fc62cbe1d57cc0274c5810588177db17b6cf1c69f5336e40cd3ccdefe0fa21bb1f736 SHA512 916e4f114834bcd4ccb2375ce35f7b36ad13496599e1a8aa736edf31627cd95eaab8b29e0fb9cfb07aa56856b2defbf916c23218debe1d62522d8dbac8674f38
-AUX tigervnc-1.12.0.confd 665 BLAKE2B ee1b7296c221538bf8babb4906bf3a5104501e2fe941a5851216e3a32fa308a63a2c9cfcb081ae39737ae0c566e26b2c4e16fd8d237d0514c78cb68da1fbfd57 SHA512 f9f097cacc43596f18dabb793a8a3f23ab54a460d8e7625aebd253a21a56ff5c736a6ef843355a73fc3fa9317dc83414fe0cb8601bc3ad19e46e8fc1e355046a
-AUX tigervnc-1.12.0.initd 2202 BLAKE2B dce7b2c613cc2d2fb11376f9bff23b10e5fbbbb031ffd9bbef1ecc58328026d6a626b75a69f01d4c51ea906ae6ecef8f0e30485cb8ea151b60427991ea857620 SHA512 80a95ea9d053491dc3046ec7fc887d12421086f9d9366e1c6eefc13e04fd2fd2ba692a2f00fcae984f589db1ed0e9bb3fd21f4276df40f55fe83db4ec94d4a8d
+AUX tigervnc-1.12.0.confd 665 BLAKE2B 1525706e3e60727ed0f3eeb0dcfc849ea2b92463d9c4bff09eb9e644e51aa7665ff96d0f0c5ec321014145f8227d7c7b94578a97d948bfc94cacbc4087ebc184 SHA512 bced660d691f559ab9392aef7ea0040ea5f435d7f1cfef9b82983395c10103b8607e90a03de67d330371d641bf249ec61200b9d28d48600f7548978b7ee367c6
+AUX tigervnc-1.12.0.initd 2119 BLAKE2B 95fd8f318b9f070d361f99533cdac6720343db0cbc1c50c8d50e1609fd98793ddad4e0630c98f0f50a73a93fa8c7bf46cbd54035ee9cdf127bbc02c994096154 SHA512 abba02324513875910c57e495adcc130f1e383ef2ef210b8e61a47066f23cebbbee35f9c6bc591021d1f88d25afbe0fd3d5a6e7786386fdc364134684e64206e
 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
@@ -14,7 +14,7 @@ DIST tigervnc-1.12.0.tar.gz 1561898 BLAKE2B 891934e48e3c4f2c36c280ad1562874d3c22
 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-r2.ebuild 4836 BLAKE2B f63bdd34a19c69841cf92e267d261c156db4887c9f9cfc11b58e2fff68001ba2e269a9809f652c35cee9886871c60695667b0b080646042e7c9b76075e0f7061 SHA512 d2d1d9086e89b1d40721b688e5441a5ad12f34be1a1da4d71285ee2c64e58bf6b6d7049d384c0e6ba0f7903ec9d1d8c15c4cc12406e0c67d48ef23e60c785645
+EBUILD tigervnc-1.12.0-r3.ebuild 4836 BLAKE2B f63bdd34a19c69841cf92e267d261c156db4887c9f9cfc11b58e2fff68001ba2e269a9809f652c35cee9886871c60695667b0b080646042e7c9b76075e0f7061 SHA512 d2d1d9086e89b1d40721b688e5441a5ad12f34be1a1da4d71285ee2c64e58bf6b6d7049d384c0e6ba0f7903ec9d1d8c15c4cc12406e0c67d48ef23e60c785645
 EBUILD tigervnc-1.9.0-r2.ebuild 4221 BLAKE2B 5d9ee5be8f6a8b23c62959105a5dafac0db043e6c76462b9c8aa5c1fb9ee56985d08d750f754f030055796980ef3e2987d41af6247bc07431403e5494a0cbd19 SHA512 9937b4ef4d969d329fd04ed372cbc079e4f1f17397cc22d41c08cb464625e9ee6cf6f771cef2e5c6d45e947ebe28851bd45dae08186bcd489c418ff1be8642c0
 EBUILD tigervnc-9999.ebuild 4071 BLAKE2B 77cfd1cb406bd37003946fcf5f658b41b5460ea0ca74277bff9584c8d436af0d1b5a5502bdcfc4a325e00aed2690409c85323beab93c0ce2b97e026dc8b645fe SHA512 cd5a0730258c575324ec64d124fa883ee9823a48ffad0b5d20a3d25c400db8d266a168809de23f85bbd95a30af2a89fa722bffc5b0e48578b8b9e011acffabb2
 MISC metadata.xml 471 BLAKE2B 450ab613da6c09763bd4d8ccd873b0c808617e5f9c4a95ecbba0bde24601ffc877db8b81a4290cb7574589329d654ea05eecf77195ac481c209000b7ec314773 SHA512 f6811c2155dc2079293bd335d9c6182a2ebe1853ff666f2c28dfba1141cf4d92e845ee8a99da9799aa08fd8f752e9d1d0fd0de8effac1fda9b19c8e464ee2435
diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0.confd b/net-misc/tigervnc/files/tigervnc-1.12.0.confd
index a65c991eabcc..d03da01660be 100644
--- a/net-misc/tigervnc/files/tigervnc-1.12.0.confd
+++ b/net-misc/tigervnc/files/tigervnc-1.12.0.confd
@@ -11,5 +11,5 @@
 # TIGERVNC_XSESSION_FILE="/etc/lightdm/Xsession"
 # TIGERVNC_XSESSION_FILE="/usr/share/slim/Xsession"
 
-# Specify any of vncserver(1) and Xvnc(1) options. See the respective man pages for more information.
-# VNC_OPTS=""
+# vncsession no longer supports VNC_OPTS
+# Use /etc/tigervnc/vncserver-config-defaults or $HOME/.vnc/config instead
diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0.initd b/net-misc/tigervnc/files/tigervnc-1.12.0.initd
index 59da61eed5f7..c27d9c01bd7e 100644
--- a/net-misc/tigervnc/files/tigervnc-1.12.0.initd
+++ b/net-misc/tigervnc/files/tigervnc-1.12.0.initd
@@ -2,25 +2,26 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2 or later
 
+# shellcheck shell=sh
+
 depend() {
 	need net
 }
 
 checkconfig() {
 	if [ -n "${DISPLAYS}" ]; then
-		if [ $1 = "start" ]; then
-			local user
+		if [ "$1" = "start" ]; then
 			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##*:}"
+					eerror "Remove this file if there is no X server for :${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##*:}"
+					eerror "Remove this file if there is no X server for :${user##*:}"
 					return 1
 				elif ! grep -E "^[^#]*:${user##*:}=${user%%:*}" /etc/tigervnc/vncserver.users > /dev/null 2>&1; then
 					eerror "User ${user%%:*} is not defined for display :${user##*:} in /etc/tigervnc/vncserver.users"
@@ -30,6 +31,8 @@ checkconfig() {
 		fi
 		return 0
 	else
+		# here it is intended for $DISPLAYS to not expand
+		# shellcheck disable=SC2016
 		eerror 'Please define $DISPLAYS in /etc/conf.d/tigervnc'
 		return 1
 	fi
@@ -39,15 +42,8 @@ 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}
-
 		[ -n "${TIGERVNC_XSESSION_FILE}" ] && export TIGERVNC_XSESSION_FILE
-
-		/usr/libexec/vncsession-start :${user##*:} $vnc_opts &>/dev/null
+		/usr/libexec/vncsession-start ":${user##*:}" >/dev/null 2>&1
 	done
 	eend $?
 }
@@ -59,10 +55,10 @@ stop() {
 		# vncserver no longer provides a `-kill` option
 		# killing vncsession does not work, we have to kill Xvnc
 		# run pstree to see exactly what's going on
-		sessionpid=`cat /run/vncsession-\:${user##*:}.pid`
-		serverpid=`pstree -p $sessionpid | grep Xvnc | sed -e 's/^.*Xvnc(//
-			s/).*$//'`
-		kill $serverpid &>/dev/null
+		sessionpid=$(cat /run/vncsession-:"${user##*:}".pid)
+		serverpid=$(pstree -p "$sessionpid" | grep Xvnc | sed -e 's/^.*Xvnc(//
+			s/).*$//')
+		kill "$serverpid" >/dev/null 2>&1
 	done
 	# Do not fail if a server is missing
 	/bin/true
diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r2.ebuild b/net-misc/tigervnc/tigervnc-1.12.0-r3.ebuild
index a87123a7d275..a87123a7d275 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r2.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r3.ebuild