gentoo auto-resync : 15:01:2023 - 11:54:40

12 files changed, 361 insertions, 48 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 6b49a1213057..71a0505fcd3a 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/tigervnc-xorg-module/Manifest b/net-misc/tigervnc-xorg-module/Manifest
index bcbe9ef64d9b..8a7e75d8b8d3 100644
--- a/net-misc/tigervnc-xorg-module/Manifest
+++ b/net-misc/tigervnc-xorg-module/Manifest
@@ -1,2 +1,3 @@
-EBUILD tigervnc-xorg-module-1.12.0.ebuild 450 BLAKE2B b0632866a0ed282dae6b0dd4d1acf566ae6708d6ed24183211e7c0929187e79dbd032cfaba4f92e74a8201a3c314d0e166a11b1244ebe70794731940be02d77c SHA512 547c1b77c7c610661dcac3e9554e3a92a6f3e8f4cb0aba8fe908334ae6fd361a9e3cab5a61d93e9a6cf27c29d0440fff2dbf0ddd0096aadf91917d4745d84e44
+EBUILD tigervnc-xorg-module-1.12.0.ebuild 452 BLAKE2B 97f1a04d5c7610ca254d4aed5270a4996267ff538f2f8205da49a407eefab3ac44c970b34e970918709c10dcd06b1b1abb1459d6dd00a02450470bef51228922 SHA512 1ce2c3fcadba4316bfab72882eed619576ea38a404499c4506e61a0952b2dc786cf9dcdfa4739e283724bc3f9595cd1ecc318de9d52d0824348f645d904892c2
+EBUILD tigervnc-xorg-module-1.12.90.ebuild 457 BLAKE2B d140db31d7fc14436d0577b9d6c5dc76f944cc085e546f6ab241d30292bf90e43715c5c8c0a9257ecb642957d60076384b93495d9a3042e693351364ff29c398 SHA512 89d7c67336ba9aef161d18a5a5210ad67dead62257b2de1f295455120fd15de472e62593fa005954cad38123ab3c91ac1337f77d96379cdbf9c7eb94a4721ddc
 MISC metadata.xml 331 BLAKE2B a429af641beadf65a9af48b70d47442530df38a6653daa75a67bae2f86dafe206ee745086336ef10af5e1d11ed6df08c017a99e2f434c0d8015549e78c8825f2 SHA512 dca884d6e2edf72771b5062195aa3d379ded3d0b9c74f9f7bd4c6f5ae432128e93d53c8b24bcfe76963b9705be325668edab703cd2f8724123b1c70fda59c786
diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild
index 3f9ee15b2f61..48f881ebf961 100644
--- a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 XSERVER_VERSION="21.1.1"
 
 DESCRIPTION="Metapackage for the xorg module provided by tigervnc"
-HOMEPAGE="https://www.tigervnc.org"
+HOMEPAGE="https://tigervnc.org/"
 
 LICENSE="metapackage"
 SLOT="0"
diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.90.ebuild b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.90.ebuild
new file mode 100644
index 000000000000..aa3265514938
--- /dev/null
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.90.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XSERVER_VERSION="21.1.1"
+
+DESCRIPTION="Metapackage for the xorg module provided by tigervnc"
+HOMEPAGE="https://tigervnc.org/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	~net-misc/tigervnc-${PV}[server]
+	=x11-base/xorg-server-${XSERVER_VERSION%.*}*
+"
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 721f4729e3bc..d2fbee4c1841 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -5,9 +5,12 @@ AUX tigervnc-1.12.0-xsession-path.patch 973 BLAKE2B c193ccc5ad0d8e04f8cd9f755c9d
 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.12.80-disable-server-and-pam.patch 1394 BLAKE2B fcda4d2199dce67a189e3b3aba7e88e41d2325e79147de7a5e0a414aff2583ac0bda1de7e372b907527177612eaeb2462294dbf578f5342701e9d274f09e4f78 SHA512 ec1fa15f70ff508636c02cf3b945b7e372fb391c674e47c6c0cbfc871400a3fc6f0847dae62cf7eb5d56afae121b9aec8d19359319ca0e7e04df03b3bec3cc5e
+AUX tigervnc-1.13.80-depend-po-files.patch 1590 BLAKE2B d1dea3c951cd636124927a1735482b94cfbc41ffc570c7a1dd82ec953fb02f7e593c542a761177d4714903e3b55d69877475b76548cd7e7b61065485e874dc19 SHA512 35d54da0c95f6c42c6a241f49988439dee2b754ac7d1d79c7616032a854d6197acc04c7857d4559c6947f14b2f0703735294146b002a36f49c4acb171511cb75
 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.12.90.tar.gz 1963656 BLAKE2B cef93c05dc0e22f67db02d62de276329102b86119263f7224cde7648d8d705ae8f82ec10c7d895a9ae99477cf437038acc3345903b61a1ac30f5649948f9adde SHA512 c9f650e9985ab073042c15f8f3fafd57d5a56b3109c15ffbcfa6ea2fe6c6e56626aa8677415b9826700374d7fbd376e05004921194408604b8550758bd402025
 DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d
 EBUILD tigervnc-1.12.0-r7.ebuild 4722 BLAKE2B a311bc7e557bf9576c34ec1f5da32f414bfd270105f086e5917bcb126fbbd77f29681a42010713628a2b611155f40ddcb48db377130c7c989144fb48598f9b51 SHA512 1182eed80fcd13c01ffc7a267f0dc91858a730ac9f57e3edd94d78db15638ace8ddc98af239292d8384c86e29849681251341f07d5fc90d7ecb1308ae1d7f1dc
-EBUILD tigervnc-9999.ebuild 4618 BLAKE2B 972a802c205587855cfe3e70a421ab83984a3175dc75cfb71dc9d3127508fe5261eb4ce284c7593ff8056fd5ab9574e9a60a5d969b9ffcb64ce15b04d11f52f1 SHA512 6db6240797c92bcd49d82c8217120406b90de1dc7fd3aa8a7f3bc94014fb32d75f1796e400873d3d58fdd33b8b6b004158ba1769bbca6edf052daf1b5996b8ef
-MISC metadata.xml 497 BLAKE2B 196be4d87d96979869779efa591a6ae6d7fe255cea642fda061743de51e0148e920adb1a7dc3504f0c7bb99f7049ad7c122c7f11ec9db476346d27ff916a4009 SHA512 d62e59f933cf96251ee03023fd07beb9bbf7193f275ce214b91ef70996019b3f42c8b77a8b5895669134c9868e745de049ca8f38fecf7230d65eace36d96854c
+EBUILD tigervnc-1.12.90.ebuild 5288 BLAKE2B 4ce90fc20c2e9f93f30e369f315b65fb5b750c3818bf9cd9cea32276f869d0a303a00087f55dcba5d340bbdb6e99bac4ef563a3958f156970e6638190ae17a9f SHA512 c72a5f56201d1f60f47652e5557bd6317529f41702bcf02b201687905f7e5331240c3b434450031ce338f345d9e8c109c26ca677c02aebbd51e8c5cd8c2f25ac
+EBUILD tigervnc-9999.ebuild 5288 BLAKE2B 4ce90fc20c2e9f93f30e369f315b65fb5b750c3818bf9cd9cea32276f869d0a303a00087f55dcba5d340bbdb6e99bac4ef563a3958f156970e6638190ae17a9f SHA512 c72a5f56201d1f60f47652e5557bd6317529f41702bcf02b201687905f7e5331240c3b434450031ce338f345d9e8c109c26ca677c02aebbd51e8c5cd8c2f25ac
+MISC metadata.xml 602 BLAKE2B cd3ae9a2fa5758627621230b5bc005b46c65d028764c5578d7684ae7aaa6403d301a59476e2aae6fa4a7a1f38cd0d8c23a7db3a784666aa2f375267444c48658 SHA512 16c1ccff038df995cbe4bace496636e41f1de9c28ad25c45d49f63485d3b7b71d9682866ff1b005acc7b401d66112c1709048298a77fb1c0baadc879fa236743
diff --git a/net-misc/tigervnc/files/tigervnc-1.13.80-depend-po-files.patch b/net-misc/tigervnc/files/tigervnc-1.13.80-depend-po-files.patch
new file mode 100644
index 000000000000..d611ece53fb1
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.13.80-depend-po-files.patch
@@ -0,0 +1,36 @@
+Currently the live version does not build because of this dependency.  Remove it for now
+
+--- a/vncviewer/CMakeLists.txt
++++ b/vncviewer/CMakeLists.txt
+@@ -81,7 +81,6 @@
+                 --desktop --template vncviewer.desktop.in
+                 -d ${CMAKE_SOURCE_DIR}/po -o vncviewer.desktop
+       DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
+-              ${CMAKE_SOURCE_DIR}/po/*.po
+     )
+   elseif(INTLTOOL_MERGE_EXECUTABLE)
+     add_custom_command(OUTPUT vncviewer.desktop
+@@ -93,7 +92,6 @@
+                 -d ${CMAKE_SOURCE_DIR}/po
+                 vncviewer.desktop.intl vncviewer.desktop
+       DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
+-              ${CMAKE_SOURCE_DIR}/po/*.po
+     )
+   else()
+     add_custom_command(OUTPUT vncviewer.desktop
+@@ -110,7 +108,6 @@
+                 --xml --template ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
+                 -d ${CMAKE_SOURCE_DIR}/po -o org.tigervnc.vncviewer.metainfo.xml
+       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
+-              ${CMAKE_SOURCE_DIR}/po/*.po
+     )
+   elseif(INTLTOOL_MERGE_EXECUTABLE)
+     add_custom_command(OUTPUT org.tigervnc.vncviewer.metainfo.xml
+@@ -123,7 +120,6 @@
+                 -x ${CMAKE_SOURCE_DIR}/po
+                 org.tigervnc.vncviewer.metainfo.xml.intl org.tigervnc.vncviewer.metainfo.xml
+       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
+-              ${CMAKE_SOURCE_DIR}/po/*.po
+     )
+   else()
+     add_custom_command(OUTPUT org.tigervnc.vncviewer.metainfo.xml
diff --git a/net-misc/tigervnc/metadata.xml b/net-misc/tigervnc/metadata.xml
index 09bd90e4d40b..7c4c48e857d6 100644
--- a/net-misc/tigervnc/metadata.xml
+++ b/net-misc/tigervnc/metadata.xml
@@ -6,9 +6,11 @@
 		<name>Viorel Munteanu</name>
 	</maintainer>
 	<use>
+		<flag name="dri3">Build with DRI3 support</flag>
 		<flag name="drm">Build with DRM support</flag>
+		<flag name="java">Build TigerVNC Java viewer</flag>
 		<flag name="server">Build TigerVNC server</flag>
-		<flag name="dri3">Build with DRI3 support</flag>
+		<flag name="viewer">Build TigerVNC viewer</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">TigerVNC/tigervnc</remote-id>
diff --git a/net-misc/tigervnc/tigervnc-1.12.90.ebuild b/net-misc/tigervnc/tigervnc-1.12.90.ebuild
new file mode 100644
index 000000000000..fc6cb7d77a07
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.12.90.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_IN_SOURCE_BUILD=1
+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="https://tigervnc.org"
+SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
+else
+	SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dri3 +drm gnutls java nls +opengl +server +viewer xinerama"
+REQUIRED_USE="
+	dri3? ( drm )
+	java? ( viewer )
+	opengl? ( server )
+	|| ( server viewer )
+"
+
+# TODO: sys-libs/libselinux
+COMMON_DEPEND="
+	dev-libs/gmp:=
+	dev-libs/nettle:=
+	media-libs/libjpeg-turbo:=
+	sys-libs/zlib:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	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
+		x11-libs/xtrans
+		x11-apps/xauth
+		x11-apps/xinit
+		x11-apps/xkbcomp
+		x11-apps/xsetroot
+		x11-misc/xkeyboard-config
+		opengl? ( media-libs/libglvnd[X] )
+		!net-misc/turbovnc[server]
+	)
+	viewer? (
+		media-video/ffmpeg:=
+		x11-libs/fltk:1
+		x11-libs/libXi
+		x11-libs/libXrender
+		!net-misc/turbovnc[viewer]
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	java? ( virtual/jre:1.8 )
+	server? (
+		dev-lang/perl
+		sys-process/psmisc
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	drm? ( x11-libs/libdrm )
+	server? (
+		media-fonts/font-util
+		x11-base/xorg-proto
+		x11-libs/libxcvt
+		x11-libs/libXi
+		x11-libs/libxkbfile
+		x11-libs/libXrender
+		x11-misc/util-macros
+		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
+	"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
+)
+[[ ${PV} == *9999 ]] && PATCHES+=( "${FILESDIR}"/${PN}-1.13.80-depend-po-files.patch )
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+		use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	if use server; then
+		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
+	fi
+
+	cmake_src_prepare
+
+	if use server; then
+		cd unix/xserver || die
+		eapply ../xserver${XSERVER_VERSION}.patch
+		eautoreconf
+		sed -i 's:\(present.h\):../present/\1:' os/utils.c || die
+		sed -i '/strcmp.*-fakescreenfps/,/^        \}/d' os/utils.c || die
+
+		if use drm; then
+			cd "${WORKDIR}" && \
+			sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
+		fi
+	fi
+}
+
+src_configure() {
+	if use arm || use hppa; then
+		append-flags "-fPIC"
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_NLS=$(usex nls)
+		-DBUILD_JAVA=$(usex java)
+		-DBUILD_SERVER=$(usex server)
+		-DBUILD_VIEWER=$(usex viewer)
+	)
+
+	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-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 \
+			--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
+		rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+
+		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
+	fi
+}
+
+pkg_postinst() {
+	xdg_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-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild
index d8ae0f70e5f1..fc6cb7d77a07 100644
--- a/net-misc/tigervnc/tigervnc-9999.ebuild
+++ b/net-misc/tigervnc/tigervnc-9999.ebuild
@@ -1,36 +1,44 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 CMAKE_IN_SOURCE_BUILD=1
-inherit autotools cmake eapi8-dosym flag-o-matic git-r3 java-pkg-opt-2 optfeature systemd xdg
+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="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/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
+else
+	SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="dri3 +drm gnutls java nls +opengl +server xinerama"
+IUSE="dri3 +drm gnutls java nls +opengl +server +viewer xinerama"
 REQUIRED_USE="
 	dri3? ( drm )
+	java? ( viewer )
 	opengl? ( server )
+	|| ( server viewer )
 "
 
-CDEPEND="
+# TODO: sys-libs/libselinux
+COMMON_DEPEND="
+	dev-libs/gmp:=
+	dev-libs/nettle:=
 	media-libs/libjpeg-turbo:=
 	sys-libs/zlib:=
-	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 )
@@ -52,31 +60,40 @@ CDEPEND="
 		x11-apps/xsetroot
 		x11-misc/xkeyboard-config
 		opengl? ( media-libs/libglvnd[X] )
+		!net-misc/turbovnc[server]
 	)
-	"
-
-RDEPEND="${CDEPEND}
+	viewer? (
+		media-video/ffmpeg:=
+		x11-libs/fltk:1
+		x11-libs/libXi
+		x11-libs/libXrender
+		!net-misc/turbovnc[viewer]
+	)
+"
+RDEPEND="${COMMON_DEPEND}
 	java? ( virtual/jre:1.8 )
 	server? (
 		dev-lang/perl
 		sys-process/psmisc
-	)"
-
-DEPEND="${CDEPEND}
+	)
+"
+DEPEND="${COMMON_DEPEND}
 	drm? ( x11-libs/libdrm )
 	server? (
 		media-fonts/font-util
 		x11-base/xorg-proto
 		x11-libs/libxcvt
+		x11-libs/libXi
 		x11-libs/libxkbfile
+		x11-libs/libXrender
 		x11-misc/util-macros
 		opengl? ( media-libs/mesa )
-	)"
-
+	)
+"
 BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
-	"
+"
 
 PATCHES=(
 	# Restore Java viewer
@@ -84,10 +101,15 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
 	"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
 )
+[[ ${PV} == *9999 ]] && PATCHES+=( "${FILESDIR}"/${PN}-1.13.80-depend-po-files.patch )
 
 src_unpack() {
-	git-r3_src_unpack
-	use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+		use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz
+	else
+		default
+	fi
 }
 
 src_prepare() {
@@ -104,7 +126,10 @@ src_prepare() {
 		sed -i 's:\(present.h\):../present/\1:' os/utils.c || die
 		sed -i '/strcmp.*-fakescreenfps/,/^        \}/d' os/utils.c || die
 
-		cd "${WORKDIR}" && sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
+		if use drm; then
+			cd "${WORKDIR}" && \
+			sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
+		fi
 	fi
 }
 
@@ -118,6 +143,7 @@ src_configure() {
 		-DENABLE_NLS=$(usex nls)
 		-DBUILD_JAVA=$(usex java)
 		-DBUILD_SERVER=$(usex server)
+		-DBUILD_VIEWER=$(usex viewer)
 	)
 
 	cmake_src_configure
@@ -186,7 +212,7 @@ src_install() {
 		sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die
 
 		# install vncserver to /usr/bin too, see bug #836620
-		dosym8 -r /usr/libexec/vncserver /usr/bin/vncserver
+		dosym -r /usr/libexec/vncserver /usr/bin/vncserver
 	fi
 }
 
diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest
index 2a65b77b0c93..d61557ae6cb9 100644
--- a/net-misc/turbovnc/Manifest
+++ b/net-misc/turbovnc/Manifest
@@ -1,5 +1,5 @@
 AUX turbovnc-3.0-fix-musl-compilation.patch 936 BLAKE2B d0785023ecf0ffa4f1c1d4f09ad8669d04780bf7c7159da06caf4ee8b58c2b46268d55c6148de95b9bfc8d4c695e2571338aa90c65ee848e1cf5886ffb909309 SHA512 dbf30af408a921a73e3100e5f05639beea2466c02cb8b3b2c8c498e904ba33bc84f92541f1e7d03ac6ae8301afcdfa537101ea9efe3c52245e2470903b13a517
 DIST turbovnc-3.0.2.tar.gz 8691956 BLAKE2B 872dbdb0127d9935e8232757f0939cf95930bcd087d06dabe771bfe4ccf4703c05fd2d9c01f0baf073ba37f989c0f02b4e20d5ed08eb6f2a4a83c6f5bb0f9d36 SHA512 f04ab062dafe3210ab7722aa12a97d1f7956ddef7eed965e7df86810b7c9aa35d981d2397503d154bd0da0c71542e0e58be458fb5841f05fc9a0d80fdddf2d11
 DIST turbovnc-3.0.2.tar.gz.sig 543 BLAKE2B 3eeaa647ab3cab092112e3aa14cb4dba204e3c8a164082f32f942fd730d465e9b1973c9c7af047fcbba35fbfa02bb312fb8072963876b6add51d1105ac8eccbc SHA512 d17c6900db2bc47d8bbe3cc4bf8d0d1f17447fe4db5346baabf105c5d37a5a13048d6888d48fc5bd8e7a7a81b473b59b66c4c0108a10fcac211365d603093c4c
-EBUILD turbovnc-3.0.2.ebuild 2979 BLAKE2B 7cdab8545696eb6d324e27e5a34cebcf2dd2bbda6793f5f97d59d35d37d4e91d094c20adf60978d124a880ac0a4899da112cbd4f3a8ee63ee3580146b839ddae SHA512 cf3b7a1925f6276fece97bfca2a5b6d69e607cad67d12d5be163b82ff73192c1166b6fc259b3488b262d7e034c86fd60fe6621666ce9392446244f107b56e33d
-MISC metadata.xml 820 BLAKE2B 10f3075f4bbe8c9c39a7b1a2d40fb4986c089b48fd041e39880b310507130c091b53683870884b1f93a94e10ccf70a87504c6894637144d817ffa64b532c41e8 SHA512 13bd42b209f6a0f2b27240988edfa6b7e260ee70dbf42f380c1eec86a082106132de707d366325eb5eb04df5319420bc27b7f226fb994cb0ee700b0759b6b91c
+EBUILD turbovnc-3.0.2.ebuild 2998 BLAKE2B 568f6a2dd2392158fd1a2a9a402fe8d6913e6d4ecaa02e9b20caee02d3e088d71ee0982c38fbf701cb9bc423867cba4ebfdfe214437aa9608263933ba2ecdff3 SHA512 53836490d66875436733ec641cbb4b09d0baed77d0113e56e01dab704bf593c55352376e55224925fef9043b1411bf3d8d5ddbcbee8f3cc2e510232fc93c21af
+MISC metadata.xml 820 BLAKE2B 331426a28ac5efa9f27d1e9b21e4b75e6965b5c1cf41ce7b8d98b03187fc56d81ffb58f555fc522188d1003e64713220b6f5591131fb8a26a8fe43e277f54526 SHA512 0aa50eef5eb122e0de38bf5e2f8d0627841419dd5e88ee58444493f4a9804626111d5edc5b36aa996635f38c7fd87c71706dd543305f9b495031971b1c52be3d
diff --git a/net-misc/turbovnc/metadata.xml b/net-misc/turbovnc/metadata.xml
index 97cad453f15c..5c1cfb86ec9a 100644
--- a/net-misc/turbovnc/metadata.xml
+++ b/net-misc/turbovnc/metadata.xml
@@ -14,8 +14,8 @@
 		By The VirtualGL Project.
 	</longdescription>
 	<use>
-		<flag name="client">Build the client (vncviewer)</flag>
 		<flag name="server">Build the server (vncserver, Xvnc)</flag>
+		<flag name="viewer">Build the viewer (vncviewer)</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">turbovnc</remote-id>
diff --git a/net-misc/turbovnc/turbovnc-3.0.2.ebuild b/net-misc/turbovnc/turbovnc-3.0.2.ebuild
index 3471a1f73bd5..abebac6c9c50 100644
--- a/net-misc/turbovnc/turbovnc-3.0.2.ebuild
+++ b/net-misc/turbovnc/turbovnc-3.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-JAVA_PKG_OPT_USE=client
+JAVA_PKG_OPT_USE=viewer
 inherit cmake desktop java-pkg-opt-2 verify-sig
 
 DESCRIPTION="A fast replacement for TigerVNC"
@@ -16,19 +16,14 @@ SRC_URI="
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+server +ssl"
-REQUIRED_USE="|| ( client server )"
+IUSE="+server +ssl +viewer"
+REQUIRED_USE="|| ( server viewer )"
 
 COMMON_DEPEND="
 	x11-apps/xauth
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-misc/xkeyboard-config
-	client? (
-		media-libs/libjpeg-turbo:=[java]
-		x11-libs/libXi
-		!net-misc/tigervnc
-	)
 	server? (
 		media-libs/libjpeg-turbo:=
 		sys-libs/pam
@@ -41,12 +36,17 @@ COMMON_DEPEND="
 		ssl? ( dev-libs/openssl:= )
 		!net-misc/tigervnc[server]
 	)
+	viewer? (
+		media-libs/libjpeg-turbo:=[java]
+		x11-libs/libXi
+		!net-misc/tigervnc[viewer(+)]
+	)
 "
 
 RDEPEND="
 	${COMMON_DEPEND}
 	x11-apps/xkbcomp
-	client? ( >=virtual/jre-1.8:* )
+	viewer? ( >=virtual/jre-1.8:* )
 "
 
 # libbz2.so.1, libfontenc.so.1 and libfreetype.so.6 are used by libXfont2.so.2
@@ -54,7 +54,7 @@ RDEPEND="
 DEPEND="
 	${COMMON_DEPEND}
 	x11-libs/xtrans
-	client? ( >=virtual/jdk-1.8:* )
+	viewer? ( >=virtual/jdk-1.8:* )
 	server? (
 		app-arch/bzip2
 		media-libs/freetype
@@ -77,14 +77,14 @@ pkg_pretend() {
 }
 
 src_prepare() {
-	use client && java-pkg-opt-2_src_prepare
+	use viewer && java-pkg-opt-2_src_prepare
 	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
-		-DTVNC_BUILDVIEWER=$(usex client)
-		-DTVNC_BUILDHELPER=$(usex client)
+		-DTVNC_BUILDVIEWER=$(usex viewer)
+		-DTVNC_BUILDHELPER=$(usex viewer)
 		-DTVNC_BUILDSERVER=$(usex server)
 		-DTVNC_BUILDWEBSERVER=$(usex server)
 	)
@@ -109,7 +109,7 @@ src_configure() {
 		fi
 	fi
 
-	if use client ; then
+	if use viewer ; then
 		export JAVACFLAGS="$(java-pkg_javac-args)"
 		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
 	fi
@@ -120,7 +120,7 @@ src_configure() {
 src_install() {
 	cmake_src_install
 
-	if use client ; then
+	if use viewer ; then
 		java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar
 		make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png
 	fi