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

1 files changed, 49 insertions, 23 deletions

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
 }