From 58bc1eef7fcc2712f4fe69e418f697d6f4d57df4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 3 Aug 2023 10:53:03 +0100 Subject: gentoo auto-resync : 03:08:2023 - 10:53:03 --- net-misc/tigervnc/Manifest | 5 +- 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 -------------------------- net-misc/tigervnc/tigervnc-1.13.1-r3.ebuild | 2 +- 5 files changed, 2 insertions(+), 320 deletions(-) delete mode 100644 net-misc/tigervnc/files/tigervnc-1.12.0.confd delete mode 100644 net-misc/tigervnc/files/tigervnc-1.12.0.initd delete mode 100644 net-misc/tigervnc/tigervnc-1.13.1-r2.ebuild (limited to 'net-misc/tigervnc') diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest index a73cf1aaa4e8..968b91725477 100644 --- a/net-misc/tigervnc/Manifest +++ b/net-misc/tigervnc/Manifest @@ -1,13 +1,10 @@ AUX tigervnc-1.11.0-install-java-viewer.patch 788 BLAKE2B b3da744d21030bf988dc21bca66a17811b1180ad89fcbc6e3ca8b70b8803c284456cc14393dddf5f2f395d9044d90e8ac8ee50d155be7779b08c14d7bbcb270b SHA512 5f9650a6f8589ab952506cbf6a67f603fc720a70dd76a505da69812c039fb9a0a4137c9667ce11e253a35bade056a18d2fa584ac23cda8111ff1fe17e90f025a 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 2149 BLAKE2B 7d7389128816ad07ba0890d57c113834fc325b00729a5e3979dca5c25e9940690aab9e10d7e6a94a8645002cc15dcbd54137636b373c99f86454a5873870ed72 SHA512 c1047acf1211c4073a4581d5bfe78dec00320e0749b44608224cc478ac335233cd7beacbd161f61330fe28c2a6fa8de137b2c80e9ebda9d92f90b062f489eecb AUX tigervnc-1.12.80-disable-server-and-pam.patch 1394 BLAKE2B fcda4d2199dce67a189e3b3aba7e88e41d2325e79147de7a5e0a414aff2583ac0bda1de7e372b907527177612eaeb2462294dbf578f5342701e9d274f09e4f78 SHA512 ec1fa15f70ff508636c02cf3b945b7e372fb391c674e47c6c0cbfc871400a3fc6f0847dae62cf7eb5d56afae121b9aec8d19359319ca0e7e04df03b3bec3cc5e AUX tigervnc-1.13.1.confd 518 BLAKE2B ee5e354a36638850595cda0c4d083c6837609201cca520175f78b03aa8cce18c6b89f534cdaf6c409ecd5aacf0c0115a52ebd458cc4aaa4aa0ba19942e2352cf SHA512 57db5b7ba590a48fc7e91da13cbe2ff0bf6e96088d522d214f6dc5266ea9dc214c561c9705380477f25d65eede870ef3b054fa77fabac78cd5ac449204e07b59 AUX tigervnc-1.13.1.initd 2635 BLAKE2B 4600e73a22cb774030bcb0f750a50b134f06183a30008781e78c5e64034ab4ae8e5598e8e65f01c2bee96276ded4ec583df73f5eee0bc1ff1e8c2524af9ea6fd SHA512 acdbd97e3f559474c0c5b9211a8a3885f70d7d59a89c236d01b50490c6c2a70c4b7f9c2346f161640b09123cadb8803f0cbe9ddaa0efd046bcdd00033f133673 DIST tigervnc-1.13.1.tar.gz 1989081 BLAKE2B 3f4d395c2788a4d475dcd42793c43f249264db586da85f99d7e0f64ea37854831c61bb5c99945578f8dbeac5ee30e0f7b46fa7f215768c70e750d50689cd4e7a SHA512 9190dbcd3b57ba52286c158c0675104d68463d7e3ea8e23493514b64451ddb511f3daf0f177339bc231155daea376d9c8dc58216663e10aa12f67468f4559da5 DIST xorg-server-21.1.8.tar.xz 4980208 BLAKE2B a223efe6d14b55bd133b7f8db75b7720ea0ae58f1eced0f6b20caf6e7045e7649a0923a1c6db5d649265375e6768fa9811477d2fa0da52d7a1e65cf4511535d2 SHA512 6104b3620ed2e1e27d9a8e963388bbe8785a764585b1bc03dbf5d719a92894773dda580d377ca18ceeab353e65a5d23cc947bab84a4012f9dd1eca31cac36937 -EBUILD tigervnc-1.13.1-r2.ebuild 5268 BLAKE2B 45352e11fbd53ce50dc7af7a8e182bb7e1e56d236398f0407afafd2cb585caa8cc0a0f3d92094e5188fde658524041a8e15f81b52ee19ec66fb3c9902b5a7dff SHA512 ac9bb8b04ac34794c019286df64519a750eca97c132db3f788c1bc2c5710530f6bbebd58dca7ac3d4a89259ec0826d498b7e62a71baa7d42ce8b8ddb5dfb15b4 -EBUILD tigervnc-1.13.1-r3.ebuild 5433 BLAKE2B a89fa2179041ebe97dd9c1c47c396b735f7f76b98155bf7f2c90ae007c21372f43df989eec00b72a54cb40c4660fcfe0dded0f084978a6e72f9f0d4f8c00a542 SHA512 827ff891f163cfe0bb256b5df4b2b245800b0436e2fe9612890063fe80daa743b6052308eae61057333eafd56aaabb576718048a8c3bcc1f029e78096fc150f4 +EBUILD tigervnc-1.13.1-r3.ebuild 5432 BLAKE2B e9104059ab3ca717699f38329a8c428f24f7ff9d42ebd27181f30f0dd4bad7ba7af86f7e1a75406a0f08a6570cf1bed9ee4d03c50f266d6bf9c681d1b7bd2c86 SHA512 b921c52372954381ae535c6c7e9fa518c31f33a62e13a63ae9cca0f0fd210f4efa40d769966d86a4c3d4ad71d6b2d0caa30de6fd4d4b1de61f41faedb87e803a EBUILD tigervnc-9999.ebuild 5364 BLAKE2B f2bc3c8b4a83d01989fc5d353a2afb78f7e04413c5fab6bfdcf927a9b992dfa5426e25db8ec541aaaa3b0cc3160323cfc340d5a034ee51c47b1a27076dc2d7c6 SHA512 060c2b282be98fa105fc862beafd60632e9b5967dc6f57b1149ab0be7b33b899875a2af32abfd88fff16d82d2f0a57361373d28726e225c2fd7be5ddc7150fd1 MISC metadata.xml 602 BLAKE2B cd3ae9a2fa5758627621230b5bc005b46c65d028764c5578d7684ae7aaa6403d301a59476e2aae6fa4a7a1f38cd0d8c23a7db3a784666aa2f375267444c48658 SHA512 16c1ccff038df995cbe4bace496636e41f1de9c28ad25c45d49f63485d3b7b71d9682866ff1b005acc7b401d66112c1709048298a77fb1c0baadc879fa236743 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} -} diff --git a/net-misc/tigervnc/tigervnc-1.13.1-r3.ebuild b/net-misc/tigervnc/tigervnc-1.13.1-r3.ebuild index e216e24bf836..62d96695236a 100644 --- a/net-misc/tigervnc/tigervnc-1.13.1-r3.ebuild +++ b/net-misc/tigervnc/tigervnc-1.13.1-r3.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]]; then 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" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" fi LICENSE="GPL-2" -- cgit v1.2.3