gentoo resync : 06.04.2022

5 files changed, 47 insertions, 33 deletions

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 5ec8aea513cb..d46b09b07de2 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -2,7 +2,7 @@ AUX tigervnc-1.11.0-install-java-viewer.patch 788 BLAKE2B b3da744d21030bf988dc21
 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 1525706e3e60727ed0f3eeb0dcfc849ea2b92463d9c4bff09eb9e644e51aa7665ff96d0f0c5ec321014145f8227d7c7b94578a97d948bfc94cacbc4087ebc184 SHA512 bced660d691f559ab9392aef7ea0040ea5f435d7f1cfef9b82983395c10103b8607e90a03de67d330371d641bf249ec61200b9d28d48600f7548978b7ee367c6
-AUX tigervnc-1.12.0.initd 2119 BLAKE2B 95fd8f318b9f070d361f99533cdac6720343db0cbc1c50c8d50e1609fd98793ddad4e0630c98f0f50a73a93fa8c7bf46cbd54035ee9cdf127bbc02c994096154 SHA512 abba02324513875910c57e495adcc130f1e383ef2ef210b8e61a47066f23cebbbee35f9c6bc591021d1f88d25afbe0fd3d5a6e7786386fdc364134684e64206e
+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
@@ -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-r3.ebuild 4836 BLAKE2B f63bdd34a19c69841cf92e267d261c156db4887c9f9cfc11b58e2fff68001ba2e269a9809f652c35cee9886871c60695667b0b080646042e7c9b76075e0f7061 SHA512 d2d1d9086e89b1d40721b688e5441a5ad12f34be1a1da4d71285ee2c64e58bf6b6d7049d384c0e6ba0f7903ec9d1d8c15c4cc12406e0c67d48ef23e60c785645
+EBUILD tigervnc-1.12.0-r5.ebuild 4912 BLAKE2B ce619fccea148d0c1cb54ee4ca1f8d750f6ba9026c40d8e382e5f58ae727c8d1f0179e644118592df85ffa2ada6a229c942b1138e3f0b1c20c25f3b39a935618 SHA512 ed2267828aeaeada0234d0003ddb683e4bcacd7df4e9fbdf561f3e92cdeb71f8ce98e2119f72941f508bfa918ad5adeb0bbea9bdc0680bfc0340c0e2259aa7ad
 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
+EBUILD tigervnc-9999.ebuild 4072 BLAKE2B 8d9d1d942146ee2fd64e597bb362b444b88933fdbbf0412dcca117dc2be6abbb77e4260788fba900a00698e5b61b8742905d64c5587f2e1470aa6631cbcf72ef SHA512 a7e0a4b8a74a52296e157577c34de37bb70202171e37d2ea36af68860fdc86b72c4ee79bec18edf413e39ee98716444f44313a5e01c07674494bed963a59ab4a
+MISC metadata.xml 706 BLAKE2B 221033648808798dd4d0be5db1374b76552a2a92eb5dc7b57f11c3feb7774e8fd85fd81f740753e3007bfd431fee4d4686210a5c1f2e967c2a67b76dfe03bb7f SHA512 f69cadf29c700280cae57028179c5e94eca3a3a71c82093bb7236e908d4407e149622aa39fc0a71ab25eab93a6250750cc95cdaa7ae933fd7f332de50250f845
diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0.initd b/net-misc/tigervnc/files/tigervnc-1.12.0.initd
index c27d9c01bd7e..187b3c7296b4 100644
--- a/net-misc/tigervnc/files/tigervnc-1.12.0.initd
+++ b/net-misc/tigervnc/files/tigervnc-1.12.0.initd
@@ -12,7 +12,8 @@ checkconfig() {
 	if [ -n "${DISPLAYS}" ]; then
 		if [ "$1" = "start" ]; then
 			for user in $DISPLAYS; do
-				if eval [ ! -f "~${user%%:*}/.vnc/passwd" ]; then
+				# bug #690046
+				if ! runuser -l "${user%%:*}" -c "[ -f ~/.vnc/passwd ]"; then
 					eerror "There are no passwords defined for user ${user%%:*}."
 					return 1
 				elif [ -e "/tmp/.X11-unix/X${user##*:}" ]; then
diff --git a/net-misc/tigervnc/metadata.xml b/net-misc/tigervnc/metadata.xml
index 18e35d3fa75e..9717615f517c 100644
--- a/net-misc/tigervnc/metadata.xml
+++ b/net-misc/tigervnc/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>ceamac.paragon@gmail.com</email>
+		<name>Viorel Munteanu</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="drm">Build with DRM support</flag>
 		<flag name="server">Build TigerVNC server</flag>
diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r3.ebuild b/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
index a87123a7d275..0b98ec1f8f59 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r3.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
@@ -9,7 +9,7 @@ inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
 XSERVER_VERSION="21.1.1"
 
 DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
+HOMEPAGE="https://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.xz
@@ -20,33 +20,40 @@ 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 )"
 
 CDEPEND="
 	virtual/jpeg:0
 	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/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}
@@ -57,27 +64,21 @@ RDEPEND="${CDEPEND}
 	)"
 
 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
+	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
@@ -181,6 +182,9 @@ src_install() {
 		# 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
@@ -189,12 +193,14 @@ 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() {
-	local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
+	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}
diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild
index 53fc1b9c571d..90b341d3f1e9 100644
--- a/net-misc/tigervnc/tigervnc-9999.ebuild
+++ b/net-misc/tigervnc/tigervnc-9999.ebuild
@@ -9,7 +9,7 @@ inherit autotools cmake flag-o-matic git-r3 systemd xdg
 XSERVER_VERSION="21.1.1"
 
 DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
+HOMEPAGE="https://www.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/"