[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/, net-misc/tigervnc/files/

["Viorel Munteanu" <ceamac@gentoo.org>]

commit:     711be43f5a8d4ad3aa3b20f0734cd74c1b0b4251
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  3 05:59:40 2023 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu Aug  3 05:59:40 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=711be43f

net-misc/tigervnc: drop 1.13.1-r2

Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 net-misc/tigervnc/files/tigervnc-1.12.0.confd |  15 --
 net-misc/tigervnc/files/tigervnc-1.12.0.initd |  72 --------
 net-misc/tigervnc/tigervnc-1.13.1-r2.ebuild   | 228 --------------------------
 3 files changed, 315 deletions(-)

diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0.confd b/net-misc/tigervnc/files/tigervnc-1.12.0.confd
deleted file mode 100644
index d03da01660be..000000000000
--- a/net-misc/tigervnc/files/tigervnc-1.12.0.confd
+++ /dev/null
@@ -1,15 +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"
-# Do not forget to add them to /etc/tigervnc/vncserver.users too
-
-# Optionally override the default Xsession file
-# TIGERVNC_XSESSION_FILE="/usr/share/sddm/scripts/Xsession"
-# TIGERVNC_XSESSION_FILE="/etc/gdm/Xsession"
-# TIGERVNC_XSESSION_FILE="/etc/lightdm/Xsession"
-# TIGERVNC_XSESSION_FILE="/usr/share/slim/Xsession"
-
-# 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
deleted file mode 100644
index 187b3c7296b4..000000000000
--- a/net-misc/tigervnc/files/tigervnc-1.12.0.initd
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/sbin/openrc-run
-# 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
-			for user in $DISPLAYS; do
-				# 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
-					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 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 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"
-					return 1
-				fi
-			done
-		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
-}
-
-start() {
-	checkconfig start || return 1
-	ebegin "Starting TigerVNC server"
-	for user in $DISPLAYS; do
-		[ -n "${TIGERVNC_XSESSION_FILE}" ] && export TIGERVNC_XSESSION_FILE
-		/usr/libexec/vncsession-start ":${user##*:}" >/dev/null 2>&1
-	done
-	eend $?
-}
-
-stop() {
-	checkconfig stop || return 2
-	ebegin "Stopping TigerVNC server"
-	for user in $DISPLAYS; do
-		# 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 2>&1
-	done
-	# Do not fail if a server is missing
-	/bin/true
-	eend $?
-}
-
-restart() {
-        svc_stop
-        svc_start
-}

diff --git a/net-misc/tigervnc/tigervnc-1.13.1-r2.ebuild b/net-misc/tigervnc/tigervnc-1.13.1-r2.ebuild
deleted file mode 100644
index d0fef1cb5d47..000000000000
--- a/net-misc/tigervnc/tigervnc-1.13.1-r2.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# 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.8"
-XSERVER_PATCH_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-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}
-	java? ( >=virtual/jdk-1.8:* )
-	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-libs/xtrans
-		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
-)
-
-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_PATCH_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}
-}