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

2023-08-03 Thread Viorel Munteanu
commit: 711be43f5a8d4ad3aa3b20f0734cd74c1b0b4251
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Thu Aug  3 05:59:40 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Thu Aug  3 05:59:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=711be43f

net-misc/tigervnc: drop 1.13.1-r2

Signed-off-by: Viorel Munteanu  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..
--- 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..
--- 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 

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

2023-08-02 Thread Viorel Munteanu
commit: 1df7bcaa2a204906cec8c766513d1b008b912331
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Thu Aug  3 05:51:26 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Thu Aug  3 05:51:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1df7bcaa

net-misc/tigervnc: stabilize 1.13.1-r3 for ppc, #911184

Signed-off-by: Viorel Munteanu  gentoo.org>

 net-misc/tigervnc/tigervnc-1.13.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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} == * ]]; 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"



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

2023-07-25 Thread Sam James
commit: 78fe42db79951a65a55a7cb33dcc24a5af3ca095
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 25 13:44:35 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 25 13:44:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78fe42db

net-misc/tigervnc: Stabilize 1.13.1-r3 amd64, #911184

Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/tigervnc-1.13.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.13.1-r3.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.1-r3.ebuild
index 32773560b2b7..76e5a3a5d969 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} == * ]]; 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"



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

2023-07-25 Thread Sam James
commit: cee89684b92eab435fc00274d1eb065f254b4317
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 25 13:44:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 25 13:44:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cee89684

net-misc/tigervnc: Stabilize 1.13.1-r3 x86, #911184

Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/tigervnc-1.13.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.13.1-r3.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.1-r3.ebuild
index 76e5a3a5d969..e216e24bf836 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} == * ]]; 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"



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

2023-07-25 Thread Sam James
commit: 8b4a67c90d6eda6da47eb0f9240cc53ea8a6ebdf
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 25 13:44:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 25 13:44:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b4a67c9

net-misc/tigervnc: Stabilize 1.13.1-r3 arm, #911184

Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/tigervnc-1.13.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.13.1-r3.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.1-r3.ebuild
index dac19484d13d..32773560b2b7 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} == * ]]; 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"



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

2023-07-25 Thread Sam James
commit: f612a6679bd3733b7d08f341021e622c2330f1cd
Author: Sam James  gentoo  org>
AuthorDate: Tue Jul 25 13:29:45 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jul 25 13:29:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f612a667

net-misc/tigervnc: Stabilize 1.13.1-r3 ppc64, #911184

Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/tigervnc-1.13.1-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.13.1-r3.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.1-r3.ebuild
index 14114aae2041..dac19484d13d 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} == * ]]; 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"



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

2023-06-24 Thread Viorel Munteanu
commit: 8c9e7c2263068ab5d074c7652431e7952ccf7eba
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Fri Jun  2 17:09:34 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Sat Jun 24 09:02:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c9e7c22

net-misc/tigervnc: one service per display

Change configuration for openrc users.

Currently, it has 3 drawbacks:
- the sessions must be defined in 2 places
- if a display crashes, it cannot be restarted without stopping all of
  them
- openrc only keeps track of the last display started, so if any other
  display crashes, it will not show as crashed.

The first issue is solved by no longer using DISPLAYS fron conf.d, and
parsing /etc/tigervnc/vncserver.users directly.

The other two by switching to a one service per display model.

Closes: https://github.com/gentoo/gentoo/pull/31277
Signed-off-by: Viorel Munteanu  gentoo.org>

 net-misc/tigervnc/files/tigervnc-1.13.1.confd  | 13 
 net-misc/tigervnc/files/tigervnc-1.13.1.initd  | 88 ++
 ...ervnc-.ebuild => tigervnc-1.13.1-r3.ebuild} | 14 ++--
 net-misc/tigervnc/tigervnc-.ebuild | 11 ++-
 4 files changed, 114 insertions(+), 12 deletions(-)

diff --git a/net-misc/tigervnc/files/tigervnc-1.13.1.confd 
b/net-misc/tigervnc/files/tigervnc-1.13.1.confd
new file mode 100644
index ..bb6dae7df032
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.13.1.confd
@@ -0,0 +1,13 @@
+# Config file for /etc/init.d/tigervnc
+
+# Add the user(s) Xvnc(1) should be run for to /etc/tigervnc/vncserver.users
+# DISPLAYS is no loger used.
+
+# 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.13.1.initd 
b/net-misc/tigervnc/files/tigervnc-1.13.1.initd
new file mode 100644
index ..f7e72fa84c07
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.13.1.initd
@@ -0,0 +1,88 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+# shellcheck shell=sh
+
+# Create symlinks for all displays.
+# For example for display :1, run `ln -s tigervnc /etc/init.d/tigervnc.1`
+# Then `rc-update add tigervnc.1 default`
+# For compatibility, /etc/init.d/tigervnc will start all displays.
+
+DISPLAYS=${SVCNAME#*.}
+if [ "$DISPLAYS" = "tigervnc" ]; then
+   should_warn=1
+   DISPLAYS=$(grep -v "^#" /etc/tigervnc/vncserver.users | sed -e 
's/=.*//' -e 's/^://')
+fi
+
+depend() {
+   need net
+}
+
+checkconfig() {
+   if [ -n "${DISPLAYS}" ]; then
+   if [ "$1" = "start" ]; then
+   for display in $DISPLAYS; do
+   user="$(grep "^:${display}" 
/etc/tigervnc/vncserver.users)"
+   user=${user#*=}
+   # bug #690046
+   if [ -z "${user}" ]; then
+   eerror "User is not defined for display 
:${display} in /etc/tigervnc/vncserver.users"
+   return 1
+   elif ! 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${display}" ]; then
+   eerror "Display :${display} appears to 
be already in use because of /tmp/.X11-unix/X${display}"
+   eerror "Remove this file if there is no 
X server for :${display}"
+   return 1
+   elif [ -e "/tmp/.X${display}-lock" ]; then
+   eerror "Display :${display} appears to 
be already in use because of /tmp/.X${display}-lock"
+   eerror "Remove this file if there is no 
X server for :${display}"
+   return 1
+   fi
+   FREEDISPLAYS="${FREEDISPLAYS} ${display}"
+   done
+   fi
+   return 0
+   else
+   eerror 'There are no displays configured in 
/etc/tigervnc/vncserver.users'
+   return 1
+   fi
+}
+
+checkwarn() {
+   if [ "${should_warn}" = "1" ]; then
+   ewarn 'Running /etc/init.d/tigervnc in compatibility mode'
+   ewarn 'Please migrate to one service per display as detailed 
here:'
+   

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

2023-06-02 Thread Matt Turner
commit: 7e46a7e2730d9667a6ee596ab3c729f2628169d6
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Jun  3 01:39:54 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Jun  3 01:47:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e46a7e2

net-misc/tigervnc: Move x11-libs/xtrans to DEPEND

Signed-off-by: Matt Turner  gentoo.org>

 .../tigervnc/{tigervnc-1.13.1-r1.ebuild => tigervnc-1.13.1-r2.ebuild}   | 2 +-
 net-misc/tigervnc/tigervnc-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.1-r2.ebuild
similarity index 100%
rename from net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
rename to net-misc/tigervnc/tigervnc-1.13.1-r2.ebuild
index 6712d81f0179..d0fef1cb5d47 100644
--- a/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.13.1-r2.ebuild
@@ -54,7 +54,6 @@ COMMON_DEPEND="
x11-libs/libXfont2
x11-libs/libXtst
x11-libs/pixman
-   x11-libs/xtrans
x11-apps/xauth
x11-apps/xinit
x11-apps/xkbcomp
@@ -88,6 +87,7 @@ DEPEND="${COMMON_DEPEND}
x11-libs/libXi
x11-libs/libxkbfile
x11-libs/libXrender
+   x11-libs/xtrans
x11-misc/util-macros
opengl? ( media-libs/mesa )
)

diff --git a/net-misc/tigervnc/tigervnc-.ebuild 
b/net-misc/tigervnc/tigervnc-.ebuild
index 891ae952cf7e..a1d75fef3750 100644
--- a/net-misc/tigervnc/tigervnc-.ebuild
+++ b/net-misc/tigervnc/tigervnc-.ebuild
@@ -54,7 +54,6 @@ COMMON_DEPEND="
x11-libs/libXfont2
x11-libs/libXtst
x11-libs/pixman
-   x11-libs/xtrans
x11-apps/xauth
x11-apps/xinit
x11-apps/xkbcomp
@@ -88,6 +87,7 @@ DEPEND="${COMMON_DEPEND}
x11-libs/libXi
x11-libs/libxkbfile
x11-libs/libXrender
+   x11-libs/xtrans
x11-misc/util-macros
opengl? ( media-libs/mesa )
)



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

2023-05-29 Thread Viorel Munteanu
commit: 8e13708193d139d4f36eff3053ba7ec5b3e6e41a
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Tue May 30 05:35:43 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Tue May 30 05:35:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e137081

net-misc/tigervnc: drop 1.13.1

Signed-off-by: Viorel Munteanu  gentoo.org>

 net-misc/tigervnc/Manifest   |   1 -
 net-misc/tigervnc/tigervnc-1.13.1.ebuild | 227 ---
 2 files changed, 228 deletions(-)

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 35c1c7dbfb8f..a892cc0077f4 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,3 +1,2 @@
 DIST tigervnc-1.13.1.tar.gz 1989081 BLAKE2B 
3f4d395c2788a4d475dcd42793c43f249264db586da85f99d7e0f64ea37854831c61bb5c99945578f8dbeac5ee30e0f7b46fa7f215768c70e750d50689cd4e7a
 SHA512 
9190dbcd3b57ba52286c158c0675104d68463d7e3ea8e23493514b64451ddb511f3daf0f177339bc231155daea376d9c8dc58216663e10aa12f67468f4559da5
-DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B 
fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79
 SHA512 
8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a86510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d
 DIST xorg-server-21.1.8.tar.xz 4980208 BLAKE2B 
a223efe6d14b55bd133b7f8db75b7720ea0ae58f1eced0f6b20caf6e7045e7649a0923a1c6db5d649265375e6768fa9811477d2fa0da52d7a1e65cf4511535d2
 SHA512 
6104b3620ed2e1e27d9a8e963388bbe8785a764585b1bc03dbf5d719a92894773dda580d377ca18ceeab353e65a5d23cc947bab84a4012f9dd1eca31cac36937

diff --git a/net-misc/tigervnc/tigervnc-1.13.1.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.1.ebuild
deleted file mode 100644
index 8084b2b74a7b..
--- a/net-misc/tigervnc/tigervnc-1.13.1.ebuild
+++ /dev/null
@@ -1,227 +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.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} == * ]]; 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} == * ]] && PATCHES+=( 

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

2023-05-29 Thread Arthur Zamarin
commit: 5be0b7e5359fef54d88e5903e6aa20a83cd2ce30
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon May 29 17:48:55 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon May 29 17:48:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5be0b7e5

net-misc/tigervnc: Stabilize 1.13.1-r1 x86, #907352

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
index bea3b1ef79c6..6712d81f0179 100644
--- a/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == * ]]; 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"



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

2023-05-29 Thread Sam James
commit: d764b0564f98e82b13b5f30ba39d7114f2dd414f
Author: Sam James  gentoo  org>
AuthorDate: Mon May 29 13:58:28 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 29 13:58:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d764b056

net-misc/tigervnc: Stabilize 1.13.1-r1 amd64, #907352

Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
index 322631a9ae04..bea3b1ef79c6 100644
--- a/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == * ]]; 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"



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

2023-05-29 Thread Sam James
commit: 4524ddf051f28abd3c2db1a14c25ef3593de3a65
Author: Sam James  gentoo  org>
AuthorDate: Mon May 29 13:10:01 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 29 13:10:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4524ddf0

net-misc/tigervnc: Stabilize 1.13.1-r1 ppc64, #907352

Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
index 44b6a4f4247a..322631a9ae04 100644
--- a/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == * ]]; 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"



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

2023-05-29 Thread Sam James
commit: 56b3f17716dd7998b6ad1f282666fff7b82b
Author: Sam James  gentoo  org>
AuthorDate: Mon May 29 13:01:26 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 29 13:01:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56b3f177

net-misc/tigervnc: Stabilize 1.13.1-r1 ppc, #907352

Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
index 82ac00b6c2d9..44b6a4f4247a 100644
--- a/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == * ]]; 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"



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

2023-05-29 Thread Sam James
commit: 670991b6fea168ddb1d1fafe429a84224e6aa734
Author: Sam James  gentoo  org>
AuthorDate: Mon May 29 13:00:38 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May 29 13:01:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=670991b6

net-misc/tigervnc: Stabilize 1.13.1-r1 arm, #907352

Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
index 891ae952cf7e..82ac00b6c2d9 100644
--- a/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == * ]]; 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"



[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc-xorg-module/

2023-05-03 Thread Viorel Munteanu
commit: 22e74d138e3432ce4ec4b1efec418674ec094ef9
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Wed May  3 17:20:46 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Wed May  3 17:22:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22e74d13

net-misc/tigervnc-xorg-module: drop 1.13.0

Signed-off-by: Viorel Munteanu  gentoo.org>

 .../tigervnc-xorg-module-1.13.0.ebuild | 18 --
 1 file changed, 18 deletions(-)

diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild 
b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild
deleted file mode 100644
index 48f881ebf961..
--- a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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%.*}*
-"



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

2023-05-03 Thread Viorel Munteanu
commit: 50d3026da7b814c8c500cb4be5bde85b06585b05
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Wed May  3 16:57:54 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Wed May  3 16:57:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50d3026d

net-misc/tigervnc: drop 1.13.0

Signed-off-by: Viorel Munteanu  gentoo.org>

 net-misc/tigervnc/Manifest   |   1 -
 net-misc/tigervnc/tigervnc-1.13.0.ebuild | 227 ---
 2 files changed, 228 deletions(-)

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index fc59440288e2..35c1c7dbfb8f 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,4 +1,3 @@
-DIST tigervnc-1.13.0.tar.gz 1986759 BLAKE2B 
675284b854e9ce4c328ed5dcc0d22a57f380a3abe1837451bae09d6c03e91fa9e4b0d06f49ade1ba6924bffdc3cc85c5c9b28c594dbc0d0ffeb0aa23e5299f6d
 SHA512 
55936f075ec64880f4b3e9a803f17761abd4c111392ff0fd5289161cd981acae0b57adf26f768db50162e8d7bfd986b8d4ac5fc3389c6f9319df16b90be8
 DIST tigervnc-1.13.1.tar.gz 1989081 BLAKE2B 
3f4d395c2788a4d475dcd42793c43f249264db586da85f99d7e0f64ea37854831c61bb5c99945578f8dbeac5ee30e0f7b46fa7f215768c70e750d50689cd4e7a
 SHA512 
9190dbcd3b57ba52286c158c0675104d68463d7e3ea8e23493514b64451ddb511f3daf0f177339bc231155daea376d9c8dc58216663e10aa12f67468f4559da5
 DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B 
fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79
 SHA512 
8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a86510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d
 DIST xorg-server-21.1.8.tar.xz 4980208 BLAKE2B 
a223efe6d14b55bd133b7f8db75b7720ea0ae58f1eced0f6b20caf6e7045e7649a0923a1c6db5d649265375e6768fa9811477d2fa0da52d7a1e65cf4511535d2
 SHA512 
6104b3620ed2e1e27d9a8e963388bbe8785a764585b1bc03dbf5d719a92894773dda580d377ca18ceeab353e65a5d23cc947bab84a4012f9dd1eca31cac36937

diff --git a/net-misc/tigervnc/tigervnc-1.13.0.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.0.ebuild
deleted file mode 100644
index 8084b2b74a7b..
--- a/net-misc/tigervnc/tigervnc-1.13.0.ebuild
+++ /dev/null
@@ -1,227 +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.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} == * ]]; 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
-   

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

2023-05-03 Thread Viorel Munteanu
commit: 394d4037791c1c6f62cd84a0a01794295c645948
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Wed May  3 17:04:33 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Wed May  3 17:04:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=394d4037

net-misc/tigervnc: sync live

Signed-off-by: Viorel Munteanu  gentoo.org>

 .../files/tigervnc-1.13.80-depend-po-files.patch   | 36 --
 net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild|  1 -
 net-misc/tigervnc/tigervnc-.ebuild |  9 +++---
 3 files changed, 5 insertions(+), 41 deletions(-)

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
deleted file mode 100644
index d611ece53fb1..
--- a/net-misc/tigervnc/files/tigervnc-1.13.80-depend-po-files.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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/tigervnc-1.13.1-r1.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
index 7c3dbedebb53..891ae952cf7e 100644
--- a/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
@@ -103,7 +103,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
 )
-[[ ${PV} == * ]] && PATCHES+=( 
"${FILESDIR}"/${PN}-1.13.80-depend-po-files.patch )
 
 src_unpack() {
if [[ ${PV} == * ]]; then

diff --git a/net-misc/tigervnc/tigervnc-.ebuild 
b/net-misc/tigervnc/tigervnc-.ebuild
index fc6cb7d77a07..891ae952cf7e 100644
--- a/net-misc/tigervnc/tigervnc-.ebuild
+++ b/net-misc/tigervnc/tigervnc-.ebuild
@@ -6,7 +6,8 @@ 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"
+XSERVER_VERSION="21.1.8"
+XSERVER_PATCH_VERSION="21.1.1"
 
 DESCRIPTION="Remote desktop viewer display system"
 HOMEPAGE="https://tigervnc.org;
@@ -71,13 +72,14 @@ COMMON_DEPEND="
)
 "
 RDEPEND="${COMMON_DEPEND}
-   java? ( virtual/jre:1.8 )
+   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
@@ -101,7 +103,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
 )
-[[ ${PV} == * ]] && PATCHES+=( 
"${FILESDIR}"/${PN}-1.13.80-depend-po-files.patch )
 
 src_unpack() {
if [[ ${PV} == * ]]; then
@@ -121,7 +122,7 @@ src_prepare() {
 
if use server; then
cd unix/xserver || die
-   eapply ../xserver${XSERVER_VERSION}.patch
+   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



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

2023-04-29 Thread Arthur Zamarin
commit: 4ccb5f54cd5f300cc8e5765d47658a61eaca0ee5
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr 29 15:47:55 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 29 15:47:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ccb5f54

net-misc/tigervnc: Stabilize 1.13.1 ppc, #904324

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/tigervnc/tigervnc-1.13.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.13.1.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.1.ebuild
index b34d0eaaa530..8084b2b74a7b 100644
--- a/net-misc/tigervnc/tigervnc-1.13.1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.13.1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == * ]]; 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"



[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc-xorg-module/

2023-04-29 Thread Arthur Zamarin
commit: 545d882bbe4a5ff5788f9638e2a99b912853312f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr 29 15:47:56 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 29 15:47:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=545d882b

net-misc/tigervnc-xorg-module: Stabilize 1.13.1 ppc, #904324

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild 
b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild
index 836ef27cdd68..48f881ebf961 100644
--- a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://tigervnc.org/;
 
 LICENSE="metapackage"
 SLOT="0"
-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"
 
 RDEPEND="
~net-misc/tigervnc-${PV}[server]



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

2023-04-28 Thread Viorel Munteanu
commit: 25bdfa95c3fa0be3b34f0a0652509ff2c69d09c7
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Fri Apr 28 07:42:13 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Fri Apr 28 07:58:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25bdfa95

net-misc/tigervnc: depend on JDK

Was depending on JRE only.  Also it builds with jdk 11 and 17, so update
the dependency.

Closes: https://bugs.gentoo.org/905135
Signed-off-by: Viorel Munteanu  gentoo.org>

 net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild | 228 
 1 file changed, 228 insertions(+)

diff --git a/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
new file mode 100644
index ..de8b18aba01f
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
@@ -0,0 +1,228 @@
+# 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} == * ]]; 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}
+   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-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} == * ]] && PATCHES+=( 
"${FILESDIR}"/${PN}-1.13.80-depend-po-files.patch )
+
+src_unpack() {
+   if [[ ${PV} == * ]]; 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
+ 

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

2023-04-28 Thread Viorel Munteanu
commit: c28221edcd0003d7b3cd3fb64de3693c9f1b63ee
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Fri Apr 28 07:51:00 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Fri Apr 28 07:58:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c28221ed

net-misc/tigervnc: update xserver version

Build against xserver 21.1.8, because that's what it's currently in the
tree.  The patch from 21.1.1 still works.

Signed-off-by: Viorel Munteanu  gentoo.org>

 net-misc/tigervnc/Manifest  | 1 +
 net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 9527ec8e616e..fc59440288e2 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,3 +1,4 @@
 DIST tigervnc-1.13.0.tar.gz 1986759 BLAKE2B 
675284b854e9ce4c328ed5dcc0d22a57f380a3abe1837451bae09d6c03e91fa9e4b0d06f49ade1ba6924bffdc3cc85c5c9b28c594dbc0d0ffeb0aa23e5299f6d
 SHA512 
55936f075ec64880f4b3e9a803f17761abd4c111392ff0fd5289161cd981acae0b57adf26f768db50162e8d7bfd986b8d4ac5fc3389c6f9319df16b90be8
 DIST tigervnc-1.13.1.tar.gz 1989081 BLAKE2B 
3f4d395c2788a4d475dcd42793c43f249264db586da85f99d7e0f64ea37854831c61bb5c99945578f8dbeac5ee30e0f7b46fa7f215768c70e750d50689cd4e7a
 SHA512 
9190dbcd3b57ba52286c158c0675104d68463d7e3ea8e23493514b64451ddb511f3daf0f177339bc231155daea376d9c8dc58216663e10aa12f67468f4559da5
 DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B 
fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79
 SHA512 
8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a86510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d
+DIST xorg-server-21.1.8.tar.xz 4980208 BLAKE2B 
a223efe6d14b55bd133b7f8db75b7720ea0ae58f1eced0f6b20caf6e7045e7649a0923a1c6db5d649265375e6768fa9811477d2fa0da52d7a1e65cf4511535d2
 SHA512 
6104b3620ed2e1e27d9a8e963388bbe8785a764585b1bc03dbf5d719a92894773dda580d377ca18ceeab353e65a5d23cc947bab84a4012f9dd1eca31cac36937

diff --git a/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
index de8b18aba01f..7c3dbedebb53 100644
--- a/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.13.1-r1.ebuild
@@ -6,7 +6,8 @@ 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"
+XSERVER_VERSION="21.1.8"
+XSERVER_PATCH_VERSION="21.1.1"
 
 DESCRIPTION="Remote desktop viewer display system"
 HOMEPAGE="https://tigervnc.org;
@@ -122,7 +123,7 @@ src_prepare() {
 
if use server; then
cd unix/xserver || die
-   eapply ../xserver${XSERVER_VERSION}.patch
+   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



[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc-xorg-module/

2023-04-19 Thread Viorel Munteanu
commit: 5b4781acf04fcb68f6a52587aa96c633196291fd
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Wed Apr 19 09:56:31 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Wed Apr 19 09:57:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b4781ac

net-misc/tigervnc-xorg-module: Stabilize x86, #904324

Signed-off-by: Viorel Munteanu  gentoo.org>

 net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild 
b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild
index 80bfb1fed556..836ef27cdd68 100644
--- a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://tigervnc.org/;
 
 LICENSE="metapackage"
 SLOT="0"
-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"
 
 RDEPEND="
~net-misc/tigervnc-${PV}[server]



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

2023-04-19 Thread Viorel Munteanu
commit: 759c574bbe4bef5b0f73791ead0228429881bae3
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Wed Apr 19 09:56:35 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Wed Apr 19 09:57:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=759c574b

net-misc/tigervnc: Stabilize x86, #904324

Signed-off-by: Viorel Munteanu  gentoo.org>

 net-misc/tigervnc/tigervnc-1.13.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.13.1.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.1.ebuild
index e0b70021c964..b34d0eaaa530 100644
--- a/net-misc/tigervnc/tigervnc-1.13.1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.13.1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == * ]]; 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"



[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc-xorg-module/

2023-04-14 Thread Sam James
commit: 722c551e9472d757085469730e4a2bf938ad7e66
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 14 19:55:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 14 19:55:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=722c551e

net-misc/tigervnc-xorg-module: Stabilize 1.13.1 ppc64, #904324

Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild 
b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild
index 69c3cde8089d..80bfb1fed556 100644
--- a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://tigervnc.org/;
 
 LICENSE="metapackage"
 SLOT="0"
-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"
 
 RDEPEND="
~net-misc/tigervnc-${PV}[server]



[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc-xorg-module/

2023-04-14 Thread Sam James
commit: 6109040feb8a21f296d5169d11aed9574f69283c
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 14 19:55:30 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 14 19:55:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6109040f

net-misc/tigervnc-xorg-module: Stabilize 1.13.1 arm, #904324

Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild 
b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild
index 1d1930d093a1..69c3cde8089d 100644
--- a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://tigervnc.org/;
 
 LICENSE="metapackage"
 SLOT="0"
-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"
 
 RDEPEND="
~net-misc/tigervnc-${PV}[server]



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

2023-04-14 Thread Sam James
commit: 3cd3901b016a359f90c338224f354f8e78b1dccc
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 14 19:55:36 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 14 19:55:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cd3901b

net-misc/tigervnc: Stabilize 1.13.1 ppc64, #904324

Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/tigervnc-1.13.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.13.1.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.1.ebuild
index 1bebb5cb2f80..e0b70021c964 100644
--- a/net-misc/tigervnc/tigervnc-1.13.1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.13.1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == * ]]; 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"



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

2023-04-14 Thread Sam James
commit: 7a041877ab0435887043b0be7da5df21a596fe6f
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 14 19:55:32 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 14 19:55:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a041877

net-misc/tigervnc: Stabilize 1.13.1 arm, #904324

Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/tigervnc-1.13.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.13.1.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.1.ebuild
index 3d4b589dc645..1bebb5cb2f80 100644
--- a/net-misc/tigervnc/tigervnc-1.13.1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.13.1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == * ]]; 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"



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

2023-04-14 Thread Sam James
commit: 341212358d0c8b9f27d8923e8251dbeb88174b0a
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 14 19:33:16 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 14 19:33:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34121235

net-misc/tigervnc: Stabilize 1.13.1 amd64, #904324

Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/tigervnc-1.13.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.13.1.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.1.ebuild
index fc6cb7d77a07..3d4b589dc645 100644
--- a/net-misc/tigervnc/tigervnc-1.13.1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.13.1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == * ]]; 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"



[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc-xorg-module/

2023-04-14 Thread Sam James
commit: 337f57bee6f5353f5e79316a17f6fa854319aa74
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr 14 19:33:15 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr 14 19:33:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=337f57be

net-misc/tigervnc-xorg-module: Stabilize 1.13.1 amd64, #904324

Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild 
b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild
index aa3265514938..1d1930d093a1 100644
--- a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://tigervnc.org/;
 
 LICENSE="metapackage"
 SLOT="0"
-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"
 
 RDEPEND="
~net-misc/tigervnc-${PV}[server]



[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc-xorg-module/

2023-03-31 Thread Viorel Munteanu
commit: ed2dd766115712a7c3fece00ed0e2511b91f77e8
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Fri Mar 31 07:33:19 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Fri Mar 31 07:33:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed2dd766

net-misc/tigervnc-xorg-module: drop 1.12.0

Signed-off-by: Viorel Munteanu  gentoo.org>

 .../tigervnc-xorg-module-1.12.0.ebuild | 18 --
 1 file changed, 18 deletions(-)

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
deleted file mode 100644
index 48f881ebf961..
--- a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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%.*}*
-"



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

2023-03-31 Thread Viorel Munteanu
commit: ba963608f5e3c998e78040fb92c793341244a697
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Fri Mar 31 07:02:38 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Fri Mar 31 07:03:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba963608

net-misc/tigervnc: drop 1.12.0-r7

Signed-off-by: Viorel Munteanu  gentoo.org>

 net-misc/tigervnc/Manifest |   2 -
 .../tigervnc-1.12.0-disable-server-and-pam.patch   |  57 --
 .../tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch |  55 --
 net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild| 199 -
 4 files changed, 313 deletions(-)

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 3d98f06d8bf5..9527ec8e616e 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,5 +1,3 @@
-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.13.0.tar.gz 1986759 BLAKE2B 
675284b854e9ce4c328ed5dcc0d22a57f380a3abe1837451bae09d6c03e91fa9e4b0d06f49ade1ba6924bffdc3cc85c5c9b28c594dbc0d0ffeb0aa23e5299f6d
 SHA512 
55936f075ec64880f4b3e9a803f17761abd4c111392ff0fd5289161cd981acae0b57adf26f768db50162e8d7bfd986b8d4ac5fc3389c6f9319df16b90be8
 DIST tigervnc-1.13.1.tar.gz 1989081 BLAKE2B 
3f4d395c2788a4d475dcd42793c43f249264db586da85f99d7e0f64ea37854831c61bb5c99945578f8dbeac5ee30e0f7b46fa7f215768c70e750d50689cd4e7a
 SHA512 
9190dbcd3b57ba52286c158c0675104d68463d7e3ea8e23493514b64451ddb511f3daf0f177339bc231155daea376d9c8dc58216663e10aa12f67468f4559da5
 DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B 
fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79
 SHA512 
8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a86510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d

diff --git 
a/net-misc/tigervnc/files/tigervnc-1.12.0-disable-server-and-pam.patch 
b/net-misc/tigervnc/files/tigervnc-1.12.0-disable-server-and-pam.patch
deleted file mode 100644
index 5ae07007d467..
--- a/net-misc/tigervnc/files/tigervnc-1.12.0-disable-server-and-pam.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-See https://bugs.gentoo.org/852830
-
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -234,6 +234,7 @@
-   add_subdirectory(java)
- endif()
- 
-+option(BUILD_SERVER "Build TigerVNC server" ON)
- option(BUILD_VIEWER "Build TigerVNC viewer" ON)
- if(BUILD_VIEWER)
-   # Check for FLTK
-@@ -276,7 +277,7 @@
- endif()
- 
- # Check for PAM library
--if(UNIX AND NOT APPLE)
-+if(BUILD_SERVER AND UNIX AND NOT APPLE)
-   check_include_files(security/pam_appl.h HAVE_PAM_H)
-   set(CMAKE_REQUIRED_LIBRARIES -lpam)
-   check_function_exists(pam_start HAVE_PAM_START)
-@@ -315,9 +316,6 @@
-   add_subdirectory(media)
- endif()
- 
--add_subdirectory(tests)
--
--
- if(BUILD_VIEWER)
-   add_subdirectory(release)
- endif()
 a/common/rfb/CMakeLists.txt
-+++ b/common/rfb/CMakeLists.txt
-@@ -75,7 +75,7 @@
- 
- set(RFB_LIBRARIES ${JPEG_LIBRARIES} ${PIXMAN_LIBRARY} os rdr)
- 
--if(UNIX AND NOT APPLE)
-+if(BUILD_SERVER AND UNIX AND NOT APPLE)
-   set(RFB_SOURCES ${RFB_SOURCES} UnixPasswordValidator.cxx
- UnixPasswordValidator.h pam.c pam.h)
-   set(RFB_LIBRARIES ${RFB_LIBRARIES} ${PAM_LIBS})
 a/unix/CMakeLists.txt
-+++ b/unix/CMakeLists.txt
-@@ -1,6 +1,8 @@
- add_subdirectory(tx)
- add_subdirectory(common)
--add_subdirectory(vncconfig)
--add_subdirectory(vncpasswd)
--add_subdirectory(vncserver)
--add_subdirectory(x0vncserver)
-+if(BUILD_SERVER)
-+  add_subdirectory(vncconfig)
-+  add_subdirectory(vncpasswd)
-+  add_subdirectory(vncserver)
-+  add_subdirectory(x0vncserver)
-+endif()

diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch 
b/net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch
deleted file mode 100644
index c3e003d328a6..
--- a/net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-https://github.com/TigerVNC/tigervnc/commit/736b50d04e1ba965696cd15d456dc2b7fc123150.patch
-https://github.com/TigerVNC/tigervnc/commit/f2577107f7f55382c524d8c738a777e5cdd80f60.patch
-
-From: Joakim Tjernlund 
-Date: Wed, 24 Nov 2021 21:09:36 +0100
-Subject: [PATCH] xorg-version.h: Increase supported Xorg version to 1.21
-
 a/unix/xserver/hw/vnc/xorg-version.h
-+++ b/unix/xserver/hw/vnc/xorg-version.h
-@@ -33,8 +33,8 @@
- #error 

[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc-xorg-module/

2023-03-30 Thread Arthur Zamarin
commit: 6f4c4aa44bc319fa53249702f34dc82a4054982e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Mar 30 17:32:02 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Mar 30 17:32:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f4c4aa4

net-misc/tigervnc-xorg-module: Stabilize 1.13.0 x86, #900350

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild 
b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild
index c0aa84fe9b18..48f881ebf961 100644
--- a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://tigervnc.org/;
 
 LICENSE="metapackage"
 SLOT="0"
-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"
 
 RDEPEND="
~net-misc/tigervnc-${PV}[server]



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

2023-03-30 Thread Arthur Zamarin
commit: 96ca3aae2f4c0aab93e2ea3baf56fa4fb0c0556f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Mar 30 17:32:03 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Mar 30 17:32:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96ca3aae

net-misc/tigervnc: Stabilize 1.13.0 x86, #900350

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/tigervnc/tigervnc-1.13.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.13.0.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.0.ebuild
index 76fee7aaf401..8084b2b74a7b 100644
--- a/net-misc/tigervnc/tigervnc-1.13.0.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.13.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == * ]]; 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"



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

2023-03-08 Thread Sam James
commit: 5389686481c851f2ad027bc7c046afc279bc7347
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar  9 01:09:43 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar  9 01:09:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53896864

net-misc/tigervnc: Stabilize 1.13.0 ppc, #900350

Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/tigervnc-1.13.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.13.0.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.0.ebuild
index 1bebb5cb2f80..0ae2d0c4ce91 100644
--- a/net-misc/tigervnc/tigervnc-1.13.0.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.13.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == * ]]; 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"



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

2023-03-08 Thread Sam James
commit: fc4f39ae6fa039fe584bcb16c87d3dcf04a9338c
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar  9 01:09:47 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar  9 01:09:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc4f39ae

net-misc/tigervnc: Stabilize 1.13.0 ppc64, #900350

Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/tigervnc-1.13.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.13.0.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.0.ebuild
index 0ae2d0c4ce91..76fee7aaf401 100644
--- a/net-misc/tigervnc/tigervnc-1.13.0.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.13.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == * ]]; 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"



[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc-xorg-module/

2023-03-08 Thread Sam James
commit: 572677c583af6592c52f23f139f4dbb115bbc08f
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar  9 01:09:45 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar  9 01:09:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=572677c5

net-misc/tigervnc-xorg-module: Stabilize 1.13.0 ppc64, #900350

Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild 
b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild
index deefa54611f7..c0aa84fe9b18 100644
--- a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://tigervnc.org/;
 
 LICENSE="metapackage"
 SLOT="0"
-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"
 
 RDEPEND="
~net-misc/tigervnc-${PV}[server]



[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc-xorg-module/

2023-03-08 Thread Sam James
commit: ff766b53cdaf01ab1ad70b00169ba2845a3caa9b
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar  9 01:09:42 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar  9 01:09:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff766b53

net-misc/tigervnc-xorg-module: Stabilize 1.13.0 ppc, #900350

Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild 
b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild
index 69c3cde8089d..deefa54611f7 100644
--- a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://tigervnc.org/;
 
 LICENSE="metapackage"
 SLOT="0"
-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"
 
 RDEPEND="
~net-misc/tigervnc-${PV}[server]



[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc-xorg-module/

2023-03-08 Thread Sam James
commit: f4d6495e3f58079ee9e55cbaa2559040b1b1b6ff
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar  8 23:35:26 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar  8 23:35:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4d6495e

net-misc/tigervnc-xorg-module: Stabilize 1.13.0 amd64, #900350

Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild 
b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild
index 488189eeb26e..69c3cde8089d 100644
--- a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://tigervnc.org/;
 
 LICENSE="metapackage"
 SLOT="0"
-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"
 
 RDEPEND="
~net-misc/tigervnc-${PV}[server]



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

2023-03-08 Thread Sam James
commit: ca723e5193f0e467b11bd22f27e5e96af1868241
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar  8 23:35:27 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar  8 23:35:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca723e51

net-misc/tigervnc: Stabilize 1.13.0 amd64, #900350

Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/tigervnc-1.13.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.13.0.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.0.ebuild
index 94217a57d41e..1bebb5cb2f80 100644
--- a/net-misc/tigervnc/tigervnc-1.13.0.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.13.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == * ]]; 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"



[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc-xorg-module/

2023-03-08 Thread Arthur Zamarin
commit: 75836a38c99d3e6e2b474d51e116419dbbab749c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Mar  8 11:12:11 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Mar  8 11:12:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75836a38

net-misc/tigervnc-xorg-module: Stabilize 1.13.0 arm, #900350

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild 
b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild
index aa3265514938..488189eeb26e 100644
--- a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://tigervnc.org/;
 
 LICENSE="metapackage"
 SLOT="0"
-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"
 
 RDEPEND="
~net-misc/tigervnc-${PV}[server]



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

2023-03-08 Thread Arthur Zamarin
commit: 02bcfdaa84b06f0a83999ac5a57cd8ad80256db6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Mar  8 11:12:11 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Mar  8 11:12:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02bcfdaa

net-misc/tigervnc: Stabilize 1.13.0 arm, #900350

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/tigervnc/tigervnc-1.13.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.13.0.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.0.ebuild
index fc6cb7d77a07..94217a57d41e 100644
--- a/net-misc/tigervnc/tigervnc-1.13.0.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.13.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == * ]]; 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"



[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc-xorg-module/

2023-03-01 Thread Viorel Munteanu
commit: 12b7abc14ce0bd36ac0f424876b73f954a8cde63
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Wed Mar  1 16:32:17 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Wed Mar  1 16:33:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12b7abc1

net-misc/tigervnc-xorg-module: add 1.13.1

Signed-off-by: Viorel Munteanu  gentoo.org>

 .../tigervnc-xorg-module-1.13.1.ebuild | 18 ++
 1 file changed, 18 insertions(+)

diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild 
b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.ebuild
new file mode 100644
index ..aa3265514938
--- /dev/null
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.1.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%.*}*
+"



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

2023-02-28 Thread Viorel Munteanu
commit: 47af1aeaf2231512af7f700ae1ce35d441178cb9
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Tue Feb 28 18:54:15 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Wed Mar  1 06:14:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47af1aea

net-misc/tigervnc: add 1.13.1

Signed-off-by: Viorel Munteanu  gentoo.org>

 net-misc/tigervnc/Manifest   |   1 +
 net-misc/tigervnc/tigervnc-1.13.1.ebuild | 227 +++
 2 files changed, 228 insertions(+)

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index a2a9e9e7c73c..3d98f06d8bf5 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,4 +1,5 @@
 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.13.0.tar.gz 1986759 BLAKE2B 
675284b854e9ce4c328ed5dcc0d22a57f380a3abe1837451bae09d6c03e91fa9e4b0d06f49ade1ba6924bffdc3cc85c5c9b28c594dbc0d0ffeb0aa23e5299f6d
 SHA512 
55936f075ec64880f4b3e9a803f17761abd4c111392ff0fd5289161cd981acae0b57adf26f768db50162e8d7bfd986b8d4ac5fc3389c6f9319df16b90be8
+DIST tigervnc-1.13.1.tar.gz 1989081 BLAKE2B 
3f4d395c2788a4d475dcd42793c43f249264db586da85f99d7e0f64ea37854831c61bb5c99945578f8dbeac5ee30e0f7b46fa7f215768c70e750d50689cd4e7a
 SHA512 
9190dbcd3b57ba52286c158c0675104d68463d7e3ea8e23493514b64451ddb511f3daf0f177339bc231155daea376d9c8dc58216663e10aa12f67468f4559da5
 DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B 
fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79
 SHA512 
8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a86510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d

diff --git a/net-misc/tigervnc/tigervnc-1.13.1.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.1.ebuild
new file mode 100644
index ..fc6cb7d77a07
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.13.1.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} == * ]]; 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? (
+   

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

2023-02-03 Thread Viorel Munteanu
commit: 95ece77bcb37f4d9b44b35617d49b8582e728a33
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Fri Feb  3 10:47:24 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Fri Feb  3 11:15:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95ece77b

net-misc/tigervnc: drop 1.12.90

Signed-off-by: Viorel Munteanu  gentoo.org>

 net-misc/tigervnc/Manifest|   1 -
 net-misc/tigervnc/tigervnc-1.12.90.ebuild | 227 --
 2 files changed, 228 deletions(-)

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index a474746626cd..a2a9e9e7c73c 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,5 +1,4 @@
 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 tigervnc-1.13.0.tar.gz 1986759 BLAKE2B 
675284b854e9ce4c328ed5dcc0d22a57f380a3abe1837451bae09d6c03e91fa9e4b0d06f49ade1ba6924bffdc3cc85c5c9b28c594dbc0d0ffeb0aa23e5299f6d
 SHA512 
55936f075ec64880f4b3e9a803f17761abd4c111392ff0fd5289161cd981acae0b57adf26f768db50162e8d7bfd986b8d4ac5fc3389c6f9319df16b90be8
 DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B 
fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79
 SHA512 
8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a86510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d

diff --git a/net-misc/tigervnc/tigervnc-1.12.90.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.90.ebuild
deleted file mode 100644
index fc6cb7d77a07..
--- a/net-misc/tigervnc/tigervnc-1.12.90.ebuild
+++ /dev/null
@@ -1,227 +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.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} == * ]]; 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? (
-   

[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc-xorg-module/

2023-02-03 Thread Viorel Munteanu
commit: 1b58c2259a751b9f13304edef3baacb903b4dba0
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Fri Feb  3 10:46:36 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Fri Feb  3 11:15:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b58c225

net-misc/tigervnc-xorg-module: add 1.13.0

Signed-off-by: Viorel Munteanu  gentoo.org>

 .../tigervnc-xorg-module-1.13.0.ebuild | 18 ++
 1 file changed, 18 insertions(+)

diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild 
b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.ebuild
new file mode 100644
index ..aa3265514938
--- /dev/null
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.13.0.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%.*}*
+"



[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc-xorg-module/

2023-02-03 Thread Viorel Munteanu
commit: ba6420ea1653e9605ff784cff089e325c1bda716
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Fri Feb  3 10:47:36 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Fri Feb  3 11:16:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba6420ea

net-misc/tigervnc-xorg-module: drop 1.12.90

Closes: https://github.com/gentoo/gentoo/pull/29403
Signed-off-by: Viorel Munteanu  gentoo.org>

 .../tigervnc-xorg-module-1.12.90.ebuild| 18 --
 1 file changed, 18 deletions(-)

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
deleted file mode 100644
index aa3265514938..
--- a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.90.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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%.*}*
-"



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

2023-02-03 Thread Viorel Munteanu
commit: f815eb79f8f06b44b14185bccd05b786cfdc2804
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Fri Feb  3 10:46:29 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Fri Feb  3 11:15:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f815eb79

net-misc/tigervnc: add 1.13.0

Signed-off-by: Viorel Munteanu  gentoo.org>

 net-misc/tigervnc/Manifest   |   1 +
 net-misc/tigervnc/tigervnc-1.13.0.ebuild | 227 +++
 2 files changed, 228 insertions(+)

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index d5340081add2..a474746626cd 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,4 +1,5 @@
 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 tigervnc-1.13.0.tar.gz 1986759 BLAKE2B 
675284b854e9ce4c328ed5dcc0d22a57f380a3abe1837451bae09d6c03e91fa9e4b0d06f49ade1ba6924bffdc3cc85c5c9b28c594dbc0d0ffeb0aa23e5299f6d
 SHA512 
55936f075ec64880f4b3e9a803f17761abd4c111392ff0fd5289161cd981acae0b57adf26f768db50162e8d7bfd986b8d4ac5fc3389c6f9319df16b90be8
 DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B 
fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79
 SHA512 
8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a86510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d

diff --git a/net-misc/tigervnc/tigervnc-1.13.0.ebuild 
b/net-misc/tigervnc/tigervnc-1.13.0.ebuild
new file mode 100644
index ..fc6cb7d77a07
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.13.0.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} == * ]]; 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? (
+   

[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc-xorg-module/

2023-01-15 Thread Viorel Munteanu
commit: ed2563aade1a8e2db225d5375823254f1fe563fd
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Sun Jan 15 09:11:02 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Sun Jan 15 09:12:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed2563aa

net-misc/tigervnc-xorg-module: add 1.12.90

Signed-off-by: Viorel Munteanu  gentoo.org>

 net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild| 4 ++--
 ...org-module-1.12.0.ebuild => tigervnc-xorg-module-1.12.90.ebuild} | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

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.0.ebuild 
b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.90.ebuild
similarity index 64%
copy from net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild
copy to net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.90.ebuild
index 3f9ee15b2f61..aa3265514938 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.90.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,11 +6,11 @@ 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"
-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"
 
 RDEPEND="
~net-misc/tigervnc-${PV}[server]



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

2023-01-15 Thread Viorel Munteanu
commit: 61edb13feb920235ca828256639512b68d8de066
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Sat Jan 14 18:50:54 2023 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Sun Jan 15 08:39:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61edb13f

net-misc/tigervnc: add 1.12.90

This is called "1.13.0 Beta" in their release page, so try to get ready
for "1.13.0": https://github.com/TigerVNC/tigervnc/releases/tag/v1.12.90

Also add viewer USE flag to complement turbovnc.  I tested and I can
install and run both combinations of {tiger,turbo}vnc {server,viewer}

Sync live (live is 1.13.80 now)

Bug: https://bugs.gentoo.org/864809
Signed-off-by: Viorel Munteanu  gentoo.org>

 net-misc/tigervnc/Manifest |  1 +
 .../files/tigervnc-1.13.80-depend-po-files.patch   | 36 +++
 net-misc/tigervnc/metadata.xml |  4 +-
 ...igervnc-.ebuild => tigervnc-1.12.90.ebuild} | 72 +++---
 net-misc/tigervnc/tigervnc-.ebuild | 72 +++---
 5 files changed, 138 insertions(+), 47 deletions(-)

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 272e2edc7499..d5340081add2 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,3 +1,4 @@
 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 
8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a86510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d

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 ..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 @@
Viorel Munteanu


+   Build with DRI3 support
Build with DRM support
+   Build TigerVNC Java viewer
Build TigerVNC server
-   Build with DRI3 support
+   Build 

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

2022-11-02 Thread Viorel Munteanu
commit: 868ab4c12214604479c1529f9febd0c650dd92b3
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Wed Nov  2 10:38:10 2022 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Wed Nov  2 16:17:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=868ab4c1

net-misc/tigervnc: add myself as a maintainer

Signed-off-by: Viorel Munteanu  gentoo.org>

 net-misc/tigervnc/metadata.xml | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/net-misc/tigervnc/metadata.xml b/net-misc/tigervnc/metadata.xml
index 68efa8f862da..09bd90e4d40b 100644
--- a/net-misc/tigervnc/metadata.xml
+++ b/net-misc/tigervnc/metadata.xml
@@ -1,14 +1,10 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   ceamac.para...@gmail.com
+   
+   cea...@gentoo.org
Viorel Munteanu

-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
-   

Build with DRM support
Build TigerVNC server



[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc-xorg-module/

2022-11-02 Thread Viorel Munteanu
commit: 5a988712a3129e164b7e429c2edc180ff313afdd
Author: Viorel Munteanu  gentoo  org>
AuthorDate: Wed Nov  2 10:38:11 2022 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Wed Nov  2 16:17:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a988712

net-misc/tigervnc-xorg-module: add myself as a maintainer

Signed-off-by: Viorel Munteanu  gentoo.org>

 net-misc/tigervnc-xorg-module/metadata.xml | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/net-misc/tigervnc-xorg-module/metadata.xml 
b/net-misc/tigervnc-xorg-module/metadata.xml
index c9acc8f7d177..814c80fe2416 100644
--- a/net-misc/tigervnc-xorg-module/metadata.xml
+++ b/net-misc/tigervnc-xorg-module/metadata.xml
@@ -1,14 +1,10 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   ceamac.para...@gmail.com
+   
+   cea...@gentoo.org
Viorel Munteanu

-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
-   

TigerVNC/tigervnc




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

2022-08-22 Thread Sam James
commit: 1c1de34dfcdb209c266c3ebf415181eaf2b33f29
Author: Viorel Munteanu  gmail  com>
AuthorDate: Sun Aug  7 10:41:33 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug 23 05:32:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c1de34d

net-misc/tigervnc: drop 1.12.0-r6

Signed-off-by: Viorel Munteanu  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26770
Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild | 206 
 1 file changed, 206 deletions(-)

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
deleted file mode 100644
index f7f753594c8d..
--- a/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_IN_SOURCE_BUILD=1
-inherit autotools cmake eapi8-dosym flag-o-matic java-pkg-opt-2 optfeature 
systemd xdg
-
-XSERVER_VERSION="21.1.1"
-
-DESCRIPTION="Remote desktop viewer display system"
-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
-   
https://github.com/TigerVNC/tigervnc/commit/0c5a2b2e7759c2829c07186cfce4d24aa9b5274e.patch
 -> ${P}-xserver-21.patch
-   )"
-
-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"
-REQUIRED_USE="
-   dri3? ( drm )
-   opengl? ( server )
-"
-
-CDEPEND="
-   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 )
-   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] )
-   )
-   "
-
-RDEPEND="${CDEPEND}
-   java? ( virtual/jre:1.8 )
-   server? (
-   dev-lang/perl
-   sys-process/psmisc
-   )"
-
-DEPEND="${CDEPEND}
-   drm? ( x11-libs/libdrm )
-   server? (
-   media-fonts/font-util
-   x11-base/xorg-proto
-   x11-libs/libxcvt
-   x11-libs/libxkbfile
-   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
-)
-
-src_prepare() {
-   if use server; then
-   cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. 
unix/xserver || die
-   eapply "${FILESDIR}"/${P}-xorg-1.21.patch
-   eapply "${DISTDIR}"/${P}-xserver-21.patch
-   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
-   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)
-   )
-
-   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 \
-  

[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc-xorg-module/

2022-08-14 Thread WANG Xuerui
commit: 855a95551757e0da6a793fda21fda69c271ced3a
Author: WANG Xuerui  gentoo  org>
AuthorDate: Mon Aug 15 05:27:31 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Mon Aug 15 05:27:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=855a9555

net-misc/tigervnc-xorg-module: keyword 1.12.0 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 5813135ac84c..3f9ee15b2f61 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
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.tigervnc.org;
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc 
x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~sparc x86"
 
 RDEPEND="
~net-misc/tigervnc-${PV}[server]



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

2022-08-13 Thread WANG Xuerui
commit: c98303bcd822c0c5dfb44eca8761d9113e05c9a8
Author: WANG Xuerui  gentoo  org>
AuthorDate: Sun Aug 14 01:17:01 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Sun Aug 14 03:19:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c98303bc

net-misc/tigervnc: keyword 1.12.0-r7 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
index fd57e3027d3a..4f68a5bed85a 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc 
x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv 
~sparc x86"
 IUSE="dri3 +drm gnutls java nls +opengl +server xinerama"
 REQUIRED_USE="
dri3? ( drm )



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

2022-08-05 Thread Arthur Zamarin
commit: 7c82929742caaa44df50e64bb7df3b5c4bce3210
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Aug  5 06:57:29 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Aug  5 06:57:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c829297

net-misc/tigervnc: Stabilize 1.12.0-r7 arm, #863332

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
index 61f5df55e380..fd57e3027d3a 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc 
x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc 
x86"
 IUSE="dri3 +drm gnutls java nls +opengl +server xinerama"
 REQUIRED_USE="
dri3? ( drm )



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

2022-08-04 Thread Arthur Zamarin
commit: 3e44dc8f466ea73e89ab34229e233397783b1203
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Aug  4 06:27:15 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Aug  4 06:27:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e44dc8f

net-misc/tigervnc: Stabilize 1.12.0-r7 ppc, #863332

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
index 8a87e2df69b6..d868a8172651 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc 
x86"
 IUSE="dri3 +drm gnutls java nls +opengl +server xinerama"
 REQUIRED_USE="
dri3? ( drm )



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

2022-08-04 Thread Arthur Zamarin
commit: 2ba603aef5520403edb97f8ffc62835174f5334a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Aug  4 06:27:16 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Aug  4 06:27:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ba603ae

net-misc/tigervnc: Stabilize 1.12.0-r7 ppc64, #863332

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
index d868a8172651..61f5df55e380 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc 
x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc 
x86"
 IUSE="dri3 +drm gnutls java nls +opengl +server xinerama"
 REQUIRED_USE="
dri3? ( drm )



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

2022-08-03 Thread Joonas Niilola
commit: a7c16e8651ce9cb802943b1adffa227b29bf2464
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Aug  4 05:03:59 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Aug  4 05:03:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7c16e86

net-misc/tigervnc: Stabilize 1.12.0-r7 amd64, #863332

Signed-off-by: Joonas Niilola  gentoo.org>

 net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
index 93ca0f1495e4..32a7a5af5811 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
~x86"
 IUSE="dri3 +drm gnutls java nls +opengl +server xinerama"
 REQUIRED_USE="
dri3? ( drm )



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

2022-08-03 Thread Joonas Niilola
commit: 2a8ae50dc473e5355c4dada46674ab98e82097de
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Aug  4 05:21:29 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Aug  4 05:21:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a8ae50d

net-misc/tigervnc: Stabilize 1.12.0-r7 x86, #863332

Signed-off-by: Joonas Niilola  gentoo.org>

 net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
index 32a7a5af5811..8a87e2df69b6 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
x86"
 IUSE="dri3 +drm gnutls java nls +opengl +server xinerama"
 REQUIRED_USE="
dri3? ( drm )



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

2022-07-07 Thread Mike Gilbert
commit: 450d2f0cf2a82e67800c7f692ef51440b9728a4a
Author: Mike Gilbert  gentoo  org>
AuthorDate: Thu Jul  7 17:23:19 2022 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Thu Jul  7 17:23:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=450d2f0c

net-misc/tigervnc: call dosym8

dosym -r is not valid for EAPI=7.

Signed-off-by: Mike Gilbert  gentoo.org>

 net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild | 4 ++--
 net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild | 4 ++--
 net-misc/tigervnc/tigervnc-.ebuild  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
index 5bbb399656a0..f7f753594c8d 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_IN_SOURCE_BUILD=1
-inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
+inherit autotools cmake eapi8-dosym flag-o-matic java-pkg-opt-2 optfeature 
systemd xdg
 
 XSERVER_VERSION="21.1.1"
 
@@ -182,7 +182,7 @@ src_install() {
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
+   dosym8 -r /usr/libexec/vncserver /usr/bin/vncserver
else
local f
for f in x0vncserver vncconfig; do

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
index ada6c94f5d44..93ca0f1495e4 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_IN_SOURCE_BUILD=1
-inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
+inherit autotools cmake eapi8-dosym flag-o-matic java-pkg-opt-2 optfeature 
systemd xdg
 
 XSERVER_VERSION="21.1.1"
 
@@ -184,7 +184,7 @@ src_install() {
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
+   dosym8 -r /usr/libexec/vncserver /usr/bin/vncserver
fi
 }
 

diff --git a/net-misc/tigervnc/tigervnc-.ebuild 
b/net-misc/tigervnc/tigervnc-.ebuild
index 437a5aef9438..d8ae0f70e5f1 100644
--- a/net-misc/tigervnc/tigervnc-.ebuild
+++ b/net-misc/tigervnc/tigervnc-.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_IN_SOURCE_BUILD=1
-inherit autotools cmake flag-o-matic git-r3 java-pkg-opt-2 optfeature systemd 
xdg
+inherit autotools cmake eapi8-dosym flag-o-matic git-r3 java-pkg-opt-2 
optfeature systemd xdg
 
 XSERVER_VERSION="21.1.1"
 
@@ -186,7 +186,7 @@ src_install() {
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
+   dosym8 -r /usr/libexec/vncserver /usr/bin/vncserver
fi
 }
 



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

2022-07-03 Thread Sam James
commit: 81782dbff6cb3d7c601a09f3e4cdf84fea4b36c2
Author: Viorel Munteanu  gmail  com>
AuthorDate: Sat Jun 18 09:53:32 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul  4 00:32:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81782dbf

net-misc/tigervnc: Fix for USE=-server and no pam

Don't build server files instead of erasing them afterwards
Drop xorgmodule local use flag from metadata (no longer used)

Closes: https://bugs.gentoo.org/852830
Signed-off-by: Nick Bowler  draconx.ca>
Signed-off-by: Viorel Munteanu  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26034
Signed-off-by: Sam James  gentoo.org>

 .../tigervnc-1.12.0-disable-server-and-pam.patch   | 57 ++
 .../tigervnc-1.12.80-disable-server-and-pam.patch  | 57 ++
 net-misc/tigervnc/metadata.xml |  1 -
 ...ervnc-.ebuild => tigervnc-1.12.0-r7.ebuild} | 48 --
 net-misc/tigervnc/tigervnc-.ebuild | 30 +---
 5 files changed, 146 insertions(+), 47 deletions(-)

diff --git 
a/net-misc/tigervnc/files/tigervnc-1.12.0-disable-server-and-pam.patch 
b/net-misc/tigervnc/files/tigervnc-1.12.0-disable-server-and-pam.patch
new file mode 100644
index ..5ae07007d467
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.12.0-disable-server-and-pam.patch
@@ -0,0 +1,57 @@
+See https://bugs.gentoo.org/852830
+
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -234,6 +234,7 @@
+   add_subdirectory(java)
+ endif()
+ 
++option(BUILD_SERVER "Build TigerVNC server" ON)
+ option(BUILD_VIEWER "Build TigerVNC viewer" ON)
+ if(BUILD_VIEWER)
+   # Check for FLTK
+@@ -276,7 +277,7 @@
+ endif()
+ 
+ # Check for PAM library
+-if(UNIX AND NOT APPLE)
++if(BUILD_SERVER AND UNIX AND NOT APPLE)
+   check_include_files(security/pam_appl.h HAVE_PAM_H)
+   set(CMAKE_REQUIRED_LIBRARIES -lpam)
+   check_function_exists(pam_start HAVE_PAM_START)
+@@ -315,9 +316,6 @@
+   add_subdirectory(media)
+ endif()
+ 
+-add_subdirectory(tests)
+-
+-
+ if(BUILD_VIEWER)
+   add_subdirectory(release)
+ endif()
+--- a/common/rfb/CMakeLists.txt
 b/common/rfb/CMakeLists.txt
+@@ -75,7 +75,7 @@
+ 
+ set(RFB_LIBRARIES ${JPEG_LIBRARIES} ${PIXMAN_LIBRARY} os rdr)
+ 
+-if(UNIX AND NOT APPLE)
++if(BUILD_SERVER AND UNIX AND NOT APPLE)
+   set(RFB_SOURCES ${RFB_SOURCES} UnixPasswordValidator.cxx
+ UnixPasswordValidator.h pam.c pam.h)
+   set(RFB_LIBRARIES ${RFB_LIBRARIES} ${PAM_LIBS})
+--- a/unix/CMakeLists.txt
 b/unix/CMakeLists.txt
+@@ -1,6 +1,8 @@
+ add_subdirectory(tx)
+ add_subdirectory(common)
+-add_subdirectory(vncconfig)
+-add_subdirectory(vncpasswd)
+-add_subdirectory(vncserver)
+-add_subdirectory(x0vncserver)
++if(BUILD_SERVER)
++  add_subdirectory(vncconfig)
++  add_subdirectory(vncpasswd)
++  add_subdirectory(vncserver)
++  add_subdirectory(x0vncserver)
++endif()

diff --git 
a/net-misc/tigervnc/files/tigervnc-1.12.80-disable-server-and-pam.patch 
b/net-misc/tigervnc/files/tigervnc-1.12.80-disable-server-and-pam.patch
new file mode 100644
index ..e61f099d397a
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.12.80-disable-server-and-pam.patch
@@ -0,0 +1,57 @@
+See https://bugs.gentoo.org/852830
+
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -234,6 +234,7 @@
+   add_subdirectory(java)
+ endif()
+ 
++option(BUILD_SERVER "Build TigerVNC server" ON)
+ option(BUILD_VIEWER "Build TigerVNC viewer" ON)
+ if(BUILD_VIEWER)
+   # Check for FLTK
+@@ -276,7 +277,7 @@
+ endif()
+ 
+ # Check for PAM library
+-if(UNIX AND NOT APPLE)
++if(BUILD_SERVER AND UNIX AND NOT APPLE)
+   check_include_files(security/pam_appl.h HAVE_PAM_H)
+   set(CMAKE_REQUIRED_LIBRARIES -lpam)
+   check_function_exists(pam_start HAVE_PAM_START)
+@@ -315,9 +316,6 @@
+   add_subdirectory(media)
+ endif()
+ 
+-add_subdirectory(tests)
+-
+-
+ if(BUILD_VIEWER)
+   add_subdirectory(release)
+ endif()
+--- a/common/rfb/CMakeLists.txt
 b/common/rfb/CMakeLists.txt
+@@ -88,7 +88,7 @@
+   target_sources(rfb PRIVATE WinPasswdValidator.cxx)
+ endif(WIN32)
+ 
+-if(UNIX AND NOT APPLE)
++if(BUILD_SERVER AND UNIX AND NOT APPLE)
+   target_sources(rfb PRIVATE UnixPasswordValidator.cxx pam.c)
+   target_link_libraries(rfb ${PAM_LIBS})
+ endif()
+--- a/unix/CMakeLists.txt
 b/unix/CMakeLists.txt
+@@ -1,6 +1,8 @@
+ add_subdirectory(tx)
+ add_subdirectory(common)
+-add_subdirectory(vncconfig)
+-add_subdirectory(vncpasswd)
+-add_subdirectory(vncserver)
+-add_subdirectory(x0vncserver)
++if(BUILD_SERVER)
++  add_subdirectory(vncconfig)
++  add_subdirectory(vncpasswd)
++  add_subdirectory(vncserver)
++  add_subdirectory(x0vncserver)
++endif()

diff --git a/net-misc/tigervnc/metadata.xml b/net-misc/tigervnc/metadata.xml
index 9717615f517c..68efa8f862da 100644
--- a/net-misc/tigervnc/metadata.xml
+++ b/net-misc/tigervnc/metadata.xml
@@ -12,7 +12,6 @@

Build with DRM support
Build TigerVNC 

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

2022-06-22 Thread Sam James
commit: c4ff06dbe33c1d972e8c8d6c7a8c1501ebeb1297
Author: Viorel Munteanu  gmail  com>
AuthorDate: Fri Jun 17 07:37:22 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 23 05:50:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4ff06db

net-misc/tigervnc: drop 1.12.0-r5

Signed-off-by: Viorel Munteanu  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25933
Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild | 207 
 1 file changed, 207 deletions(-)

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
deleted file mode 100644
index 5a4087287b50..
--- a/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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://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
-   
https://github.com/TigerVNC/tigervnc/commit/0c5a2b2e7759c2829c07186cfce4d24aa9b5274e.patch
 -> ${P}-xserver-21.patch
-   )"
-
-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
-   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
-   x11-libs/xtrans
-   x11-apps/xauth
-   x11-apps/xinit
-   x11-apps/xkbcomp
-   x11-apps/xsetroot
-   x11-misc/xkeyboard-config
-   opengl? ( media-libs/libglvnd[X] )
-   xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-   )
-   "
-
-RDEPEND="${CDEPEND}
-   java? ( virtual/jre:1.8 )
-   server? (
-   dev-lang/perl
-   sys-process/psmisc
-   )"
-
-DEPEND="${CDEPEND}
-   drm? ( x11-libs/libdrm )
-   server? (
-   media-fonts/font-util
-   x11-base/xorg-proto
-   x11-libs/libxcvt
-   x11-libs/libxkbfile
-   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
-)
-
-src_prepare() {
-   if use server; then
-   cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. 
unix/xserver || die
-   eapply "${FILESDIR}"/${P}-xorg-1.21.patch
-   eapply "${DISTDIR}"/${P}-xserver-21.patch
-   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
-   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)
-   )
-
-   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 \
-   

[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc-xorg-module/

2022-06-16 Thread Jakov Smolić
commit: 77d6248897f2e6c6ced5b452a3a774cf5cdc7de3
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Jun 16 10:26:54 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Jun 16 10:26:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77d62488

net-misc/tigervnc-xorg-module: Stabilize 1.12.0 ppc, #852014

Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 83f7168de317..5813135ac84c 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
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.tigervnc.org;
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc 
x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc 
x86"
 
 RDEPEND="
~net-misc/tigervnc-${PV}[server]



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

2022-06-16 Thread Jakov Smolić
commit: 63e1445e72e459091ef7786e5eea5e0d577358b1
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Jun 16 10:26:53 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Jun 16 10:26:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63e1445e

net-misc/tigervnc: Stabilize 1.12.0-r6 ppc, #852014

Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
index 161c0a0e6755..5bbb399656a0 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc 
x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc 
x86"
 IUSE="dri3 +drm gnutls java nls +opengl +server xinerama"
 REQUIRED_USE="
dri3? ( drm )



[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc-xorg-module/

2022-06-16 Thread Jakov Smolić
commit: 929ab2895349175af54f876c16832cb191cbe3e5
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Jun 16 09:56:11 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Jun 16 09:56:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=929ab289

net-misc/tigervnc-xorg-module: Stabilize 1.12.0 ppc64, #852014

Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 f20bdc9983e9..83f7168de317 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
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.tigervnc.org;
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc 
x86"
 
 RDEPEND="
~net-misc/tigervnc-${PV}[server]



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

2022-06-16 Thread Jakov Smolić
commit: 73da0a9c9c3280d367ce876f841d93a5c88947ef
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Jun 16 09:56:11 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Jun 16 09:56:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73da0a9c

net-misc/tigervnc: Stabilize 1.12.0-r6 ppc64, #852014

Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
index 4cea70381595..161c0a0e6755 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc 
x86"
 IUSE="dri3 +drm gnutls java nls +opengl +server xinerama"
 REQUIRED_USE="
dri3? ( drm )



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

2022-06-16 Thread Jakov Smolić
commit: a7358f064610161f7272a9e2079800b8c59df75b
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Jun 16 09:33:22 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Jun 16 09:33:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7358f06

net-misc/tigervnc: Stabilize 1.12.0-r6 arm, #852014

Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
index f78cf7ada99d..4cea70381595 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
x86"
 IUSE="dri3 +drm gnutls java nls +opengl +server xinerama"
 REQUIRED_USE="
dri3? ( drm )



[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc-xorg-module/

2022-06-16 Thread Jakov Smolić
commit: eae66713ad1a10dee746623e90b0d05f19ff2655
Author: Jakov Smolić  gentoo  org>
AuthorDate: Thu Jun 16 09:33:23 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Thu Jun 16 09:33:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eae66713

net-misc/tigervnc-xorg-module: Stabilize 1.12.0 arm, #852014

Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 e8a8bb885986..f20bdc9983e9 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
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.tigervnc.org;
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
x86"
 
 RDEPEND="
~net-misc/tigervnc-${PV}[server]



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

2022-06-16 Thread Joonas Niilola
commit: 55a40901515b71977137231484c7f7acd13b
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Jun 16 07:41:31 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jun 16 07:41:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55a4

net-misc/tigervnc: Stabilize 1.12.0-r6 x86, #852014

Signed-off-by: Joonas Niilola  gentoo.org>

 net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
index 9d5209d4f759..f78cf7ada99d 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
x86"
 IUSE="dri3 +drm gnutls java nls +opengl +server xinerama"
 REQUIRED_USE="
dri3? ( drm )



[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc-xorg-module/

2022-06-16 Thread Joonas Niilola
commit: 2db9cf4fb49c1c5b24eaea09d759961668f8fe33
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Jun 16 07:41:36 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jun 16 07:41:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2db9cf4f

net-misc/tigervnc-xorg-module: Stabilize 1.12.0 x86, #852014

Signed-off-by: Joonas Niilola  gentoo.org>

 net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 34dc092df065..e8a8bb885986 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
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.tigervnc.org;
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
x86"
 
 RDEPEND="
~net-misc/tigervnc-${PV}[server]



[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc-xorg-module/

2022-06-16 Thread Joonas Niilola
commit: 6e077b5b4502292cdeabde402f496700f3cd109f
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Jun 16 06:50:09 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jun 16 06:50:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e077b5b

net-misc/tigervnc-xorg-module: Stabilize 1.12.0 amd64, #852014

Signed-off-by: Joonas Niilola  gentoo.org>

 net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 07bcc43dc9ea..34dc092df065 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
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.tigervnc.org;
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
~x86"
 
 RDEPEND="
~net-misc/tigervnc-${PV}[server]



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

2022-06-16 Thread Joonas Niilola
commit: 5db16e32ff7bad6a119aa54e06e414e24bda2768
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Jun 16 06:50:03 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jun 16 06:50:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5db16e32

net-misc/tigervnc: Stabilize 1.12.0-r6 amd64, #852014

Signed-off-by: Joonas Niilola  gentoo.org>

 net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
index 2bb25923bd56..9d5209d4f759 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
~x86"
 IUSE="dri3 +drm gnutls java nls +opengl +server xinerama"
 REQUIRED_USE="
dri3? ( drm )



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

2022-05-13 Thread Sam James
commit: 360b91d81237a8627bd2909d5800b31a1e2e1ca7
Author: Viorel Munteanu  gmail  com>
AuthorDate: Tue Apr 12 08:58:57 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 14 01:03:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=360b91d8

net-misc/tigervnc: Drop USE flag xorgmodule

Always build the xorg module
Do not depend on a specific version of xorg, add a metapackage instead
Revbump so we can stabilize net-misc/tigervnc-1.12.0-r5

Closes: https://bugs.gentoo.org/481928
Signed-off-by: Viorel Munteanu  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild | 206 
 1 file changed, 206 insertions(+)

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
new file mode 100644
index ..2bb25923bd56
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r6.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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://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
+   
https://github.com/TigerVNC/tigervnc/commit/0c5a2b2e7759c2829c07186cfce4d24aa9b5274e.patch
 -> ${P}-xserver-21.patch
+   )"
+
+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"
+REQUIRED_USE="
+   dri3? ( drm )
+   opengl? ( server )
+"
+
+CDEPEND="
+   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 )
+   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] )
+   )
+   "
+
+RDEPEND="${CDEPEND}
+   java? ( virtual/jre:1.8 )
+   server? (
+   dev-lang/perl
+   sys-process/psmisc
+   )"
+
+DEPEND="${CDEPEND}
+   drm? ( x11-libs/libdrm )
+   server? (
+   media-fonts/font-util
+   x11-base/xorg-proto
+   x11-libs/libxcvt
+   x11-libs/libxkbfile
+   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
+)
+
+src_prepare() {
+   if use server; then
+   cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. 
unix/xserver || die
+   eapply "${FILESDIR}"/${P}-xorg-1.21.patch
+   eapply "${DISTDIR}"/${P}-xserver-21.patch
+   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
+   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)
+   )
+
+   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 \
+   

[gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc-xorg-module/

2022-05-13 Thread Sam James
commit: eb5e8d143fb56ae0e9c40cddd425fb900bf6c1a7
Author: Viorel Munteanu  gmail  com>
AuthorDate: Wed Apr 13 13:13:40 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 14 01:03:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb5e8d14

net-misc/tigervnc-xorg-module: initial import 1.12.0

Metapackage to link a specific version of tigervnc to the right version
of xorg-server for using the xorg module

Bug: https://bugs.gentoo.org/481928
Signed-off-by: Viorel Munteanu  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25006
Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc-xorg-module/metadata.xml | 15 +++
 .../tigervnc-xorg-module-1.12.0.ebuild | 18 ++
 2 files changed, 33 insertions(+)

diff --git a/net-misc/tigervnc-xorg-module/metadata.xml 
b/net-misc/tigervnc-xorg-module/metadata.xml
new file mode 100644
index ..c9acc8f7d177
--- /dev/null
+++ b/net-misc/tigervnc-xorg-module/metadata.xml
@@ -0,0 +1,15 @@
+
+https://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   ceamac.para...@gmail.com
+   Viorel Munteanu
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+   
+   TigerVNC/tigervnc
+   
+

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
new file mode 100644
index ..07bcc43dc9ea
--- /dev/null
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2022 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://www.tigervnc.org;
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
+
+RDEPEND="
+   ~net-misc/tigervnc-${PV}[server]
+   =x11-base/xorg-server-${XSERVER_VERSION%.*}*
+"



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

2022-05-13 Thread Sam James
commit: aabb6b116e78b4e93773e599018811120e5c4ca5
Author: Viorel Munteanu  gmail  com>
AuthorDate: Mon May  9 16:10:23 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 13 20:03:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aabb6b11

net-misc/tigervnc: drop 1.9.0-r2

Bug: https://bugs.gentoo.org/700464
Signed-off-by: Viorel Munteanu  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25403
Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/Manifest |   2 -
 .../files/tigervnc-1.9.0-030_manpages.patch|  55 --
 .../files/tigervnc-1.9.0-055_xstartup.patch|  33 
 net-misc/tigervnc/files/tigervnc.confd |   9 -
 net-misc/tigervnc/files/tigervnc.initd |  72 
 .../files/xserver120-drmfourcc-header.patch|  36 
 net-misc/tigervnc/files/xserver120.patch   |  91 --
 net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild | 185 -
 8 files changed, 483 deletions(-)

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 69a6995f580f..272e2edc7499 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,5 +1,3 @@
 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.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 
8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a86510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d

diff --git a/net-misc/tigervnc/files/tigervnc-1.9.0-030_manpages.patch 
b/net-misc/tigervnc/files/tigervnc-1.9.0-030_manpages.patch
deleted file mode 100644
index 8a30f18d7d92..
--- a/net-misc/tigervnc/files/tigervnc-1.9.0-030_manpages.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/unix/vncserver b/unix/vncserver
-index 9e7a6ac5..139f9601 100755
 a/unix/vncserver
-+++ b/unix/vncserver
-@@ -684,6 +684,7 @@ sub Usage
-   " [-geometry x]\n".
-   " [-pixelformat rgbNNN|bgrNNN]\n".
-   " [-fp ]\n".
-+  " [-cc ]\n".
-   " [-fg]\n".
-   " [-autokill]\n".
-   " [-noxstartup]\n".
-diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx
-index f076565f..05669a42 100644
 a/vncviewer/vncviewer.cxx
-+++ b/vncviewer/vncviewer.cxx
-@@ -352,6 +352,11 @@ static void usage(const char *programName)
-   "   %s [parameters] -listen [port] [parameters]\n"
-   "   %s [parameters] [.tigervnc file]\n",
-   programName, programName, programName);
-+  fprintf(stderr,"\n"
-+"Options:\n\n"
-+"  -display Xdisplay - Specifies the X display for the viewer 
window\n"
-+"  -geometry geometry - Standard X position and sizing 
specification.\n");
-+
-   fprintf(stderr,"\n"
-   "Parameters can be turned on with - or off with -=0\n"
-   "Parameters which take a value can be specified as "
-diff --git a/vncviewer/vncviewer.man b/vncviewer/vncviewer.man
-index 729c01d6..07dc58f1 100644
 a/vncviewer/vncviewer.man
-+++ b/vncviewer/vncviewer.man
-@@ -240,6 +240,10 @@ This option specifies the preferred encoding to use from 
one of "Tight", "ZRLE",
- Disable lossy JPEG compression in Tight encoding. Default is off.
- .
- .TP
-+.B \-ImprovedHextile
-+Try harder to compress data (default).
-+.
-+.TP
- .B \-QualityLevel \fIlevel\fP
- JPEG quality level. 0 = Low, 9 = High. May be adjusted automatically if
- \fB-AutoSelect\fP is turned on. Default is 8.
-@@ -296,6 +300,11 @@ respectively.
- .B \-AlertOnFatalError
- Display a dialog with 

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

2022-05-13 Thread Sam James
commit: b192534cc6d9f3eb07121b7ef3d7f880ac1bcfec
Author: Viorel Munteanu  gmail  com>
AuthorDate: Mon May  9 16:07:59 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 13 20:03:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b192534c

net-misc/tigervnc: update live ebuild to 1.12

Signed-off-by: Viorel Munteanu  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/tigervnc-.ebuild | 96 +-
 1 file changed, 61 insertions(+), 35 deletions(-)

diff --git a/net-misc/tigervnc/tigervnc-.ebuild 
b/net-misc/tigervnc/tigervnc-.ebuild
index 90b341d3f1e9..903570b2dd06 100644
--- a/net-misc/tigervnc/tigervnc-.ebuild
+++ b/net-misc/tigervnc/tigervnc-.ebuild
@@ -2,74 +2,85 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CMAKE_IN_SOURCE_BUILD=1
 
-inherit autotools cmake flag-o-matic git-r3 systemd xdg
+CMAKE_IN_SOURCE_BUILD=1
+inherit autotools cmake flag-o-matic git-r3 java-pkg-opt-2 optfeature systemd 
xdg
 
 XSERVER_VERSION="21.1.1"
 
 DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="https://www.tigervnc.org;
+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/;
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="dri3 +drm gnutls nls +opengl server xinerama +xorgmodule"
+IUSE="dri3 +drm gnutls java nls +opengl server xinerama +xorgmodule"
 
 CDEPEND="
-   virtual/jpeg:0
+   media-libs/libjpeg-turbo:=
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/libxcvt
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}"
+RDEPEND="${CDEPEND}
+   java? ( virtual/jre:1.8 )
+   server? (
+   dev-lang/perl
+   sys-process/psmisc
+   )"
 
 DEPEND="${CDEPEND}
-   nls? ( sys-devel/gettext )
-   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
+   "${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
+)
+
 src_unpack() {
git-r3_src_unpack
unpack xorg-server-${XSERVER_VERSION}.tar.xz
@@ -100,7 +111,7 @@ src_configure() {
local mycmakeargs=(
-DENABLE_GNUTLS=$(usex gnutls)
-DENABLE_NLS=$(usex nls)
-   -DBUILD_JAVA=no
+   -DBUILD_JAVA=$(usex java)
)
 
cmake_src_configure
@@ -113,7 +124,6 @@ src_configure() {
--disable-config-hal \
--disable-config-udev \
--disable-devel-docs \
-   --disable-dmx \
--disable-dri \
$(use_enable dri3) \
--disable-glamor \
@@ -130,7 +140,6 @@ src_configure() {
--disable-xorg \
--disable-xvfb \
 

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

2022-05-09 Thread Jakov Smolić
commit: 59835bd6b66acb7f4f4aea70cb61e368adcc97e9
Author: Jakov Smolić  gentoo  org>
AuthorDate: Mon May  9 09:58:20 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Mon May  9 09:58:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59835bd6

net-misc/tigervnc: Stabilize 1.12.0-r5 x86, #842723

Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
index b6d39f8b64ba..5a4087287b50 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc 
~x86"
+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 )"
 



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

2022-05-08 Thread Sam James
commit: 281cda1fc9ca3fa844dea59caef35c1a207f6668
Author: Sam James  gentoo  org>
AuthorDate: Sun May  8 18:05:39 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May  8 18:05:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=281cda1f

net-misc/tigervnc: Stabilize 1.12.0-r5 amd64, #842723

Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
index 95744fc3dbcc..b6d39f8b64ba 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc 
~x86"
+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 )"
 



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

2022-05-07 Thread Jakov Smolić
commit: a14045ad41dfcd8477d9faa72d832de0d36d54f5
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat May  7 14:30:32 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat May  7 14:30:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a14045ad

net-misc/tigervnc: Stabilize 1.12.0-r5 ppc, #842723

Signed-off-by: Jakov Smolić  gentoo.org>

 net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
index fa64afec6d6b..95744fc3dbcc 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc 
~x86"
+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 )"
 



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

2022-05-07 Thread Arthur Zamarin
commit: cfc5e062e271db6952cd3aa89e19b8ac16067f09
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May  7 10:05:21 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May  7 10:05:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfc5e062

net-misc/tigervnc: Stabilize 1.12.0-r5 ppc64, #842723

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
index 4b1c7840052b..fa64afec6d6b 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc 
~x86"
+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 )"
 



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

2022-05-07 Thread Arthur Zamarin
commit: e8be30d2ada0a68f9a8cbed749aadf0ec4b840ed
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May  7 10:02:49 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May  7 10:02:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8be30d2

net-misc/tigervnc: Stabilize 1.12.0-r5 arm, #842723

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
index 0b98ec1f8f59..4b1c7840052b 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
@@ -18,7 +18,7 @@ 
SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
+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 )"
 



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

2022-04-03 Thread Florian Schmaus
commit: 53edf37c81d157316a662c1deab272507edd4eda
Author: Florian Schmaus  gentoo  org>
AuthorDate: Sun Apr  3 10:02:02 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Sun Apr  3 10:02:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53edf37c

net-misc/tigervnc: Use https HOMEPAGE

Signed-off-by: Florian Schmaus  gentoo.org>

 net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild | 2 +-
 net-misc/tigervnc/tigervnc-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
index 9665552943b5..0b98ec1f8f59 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r5.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

diff --git a/net-misc/tigervnc/tigervnc-.ebuild 
b/net-misc/tigervnc/tigervnc-.ebuild
index 53fc1b9c571d..90b341d3f1e9 100644
--- a/net-misc/tigervnc/tigervnc-.ebuild
+++ b/net-misc/tigervnc/tigervnc-.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/;
 



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

2022-04-03 Thread Florian Schmaus
commit: 5807807bd80ebf2a96e83ea22a36e372cc28f18d
Author: Viorel Munteanu  gmail  com>
AuthorDate: Sat Apr  2 06:51:12 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Sun Apr  3 09:56:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5807807b

net-misc/tigervnc: drop 1.12.0-r4

Signed-off-by: Viorel Munteanu  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24858
Signed-off-by: Florian Schmaus  gentoo.org>

 net-misc/tigervnc/tigervnc-1.12.0-r4.ebuild | 204 
 1 file changed, 204 deletions(-)

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r4.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r4.ebuild
deleted file mode 100644
index 3a6b5d9eb75f..
--- a/net-misc/tigervnc/tigervnc-1.12.0-r4.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="http://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
-   
https://github.com/TigerVNC/tigervnc/commit/0c5a2b2e7759c2829c07186cfce4d24aa9b5274e.patch
 -> ${P}-xserver-21.patch
-   )"
-
-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
-   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
-   x11-libs/xtrans
-   x11-apps/xauth
-   x11-apps/xinit
-   x11-apps/xkbcomp
-   x11-apps/xsetroot
-   x11-misc/xkeyboard-config
-   opengl? ( media-libs/libglvnd[X] )
-   xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-   )
-   "
-
-RDEPEND="${CDEPEND}
-   java? ( virtual/jre:1.8 )
-   server? (
-   dev-lang/perl
-   sys-process/psmisc
-   )"
-
-DEPEND="${CDEPEND}
-   drm? ( x11-libs/libdrm )
-   server? (
-   media-fonts/font-util
-   x11-base/xorg-proto
-   x11-libs/libxcvt
-   x11-libs/libxkbfile
-   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
-)
-
-src_prepare() {
-   if use server; then
-   cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. 
unix/xserver || die
-   eapply "${FILESDIR}"/${P}-xorg-1.21.patch
-   eapply "${DISTDIR}"/${P}-xserver-21.patch
-   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
-   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)
-   )
-
-   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 \
-

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

2022-04-03 Thread Florian Schmaus
commit: 2bda6cc82caf55afd1f0c5c213f6525cb2d2fd3d
Author: Viorel Munteanu  gmail  com>
AuthorDate: Sat Apr  2 06:48:39 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Sun Apr  3 09:56:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bda6cc8

net-misc/tigervnc: Fix bug in init script

cannot start user-server when user-home is on nfs and not readable by
root

Closes: https://bugs.gentoo.org/690046
Signed-off-by: Manuel Mommertz <2kmm  gmx.de>
Signed-off-by: Viorel Munteanu  gmail.com>
Signed-off-by: Florian Schmaus  gentoo.org>

 net-misc/tigervnc/files/tigervnc-1.12.0.initd | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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



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

2022-04-03 Thread Florian Schmaus
commit: 7354726a8775617b6f82431f7f46aae7e5c84a8c
Author: Viorel Munteanu  gmail  com>
AuthorDate: Sat Apr  2 06:46:43 2022 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Sun Apr  3 09:56:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7354726a

net-misc/tigervnc: Install vncserver in $PATH

Closes: https://bugs.gentoo.org/836620
Signed-off-by: Viorel Munteanu  gmail.com>
Signed-off-by: Florian Schmaus  gentoo.org>

 net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild | 207 
 1 file changed, 207 insertions(+)

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
new file mode 100644
index ..9665552943b5
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r5.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="http://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
+   
https://github.com/TigerVNC/tigervnc/commit/0c5a2b2e7759c2829c07186cfce4d24aa9b5274e.patch
 -> ${P}-xserver-21.patch
+   )"
+
+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
+   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
+   x11-libs/xtrans
+   x11-apps/xauth
+   x11-apps/xinit
+   x11-apps/xkbcomp
+   x11-apps/xsetroot
+   x11-misc/xkeyboard-config
+   opengl? ( media-libs/libglvnd[X] )
+   xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
+   )
+   "
+
+RDEPEND="${CDEPEND}
+   java? ( virtual/jre:1.8 )
+   server? (
+   dev-lang/perl
+   sys-process/psmisc
+   )"
+
+DEPEND="${CDEPEND}
+   drm? ( x11-libs/libdrm )
+   server? (
+   media-fonts/font-util
+   x11-base/xorg-proto
+   x11-libs/libxcvt
+   x11-libs/libxkbfile
+   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
+)
+
+src_prepare() {
+   if use server; then
+   cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. 
unix/xserver || die
+   eapply "${FILESDIR}"/${P}-xorg-1.21.patch
+   eapply "${DISTDIR}"/${P}-xserver-21.patch
+   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
+   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)
+   )
+
+   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 \
+

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

2022-03-31 Thread Joonas Niilola
commit: 381b11ad7102235aedbcb86eb793044a0f316361
Author: Viorel Munteanu  gmail  com>
AuthorDate: Wed Mar 23 07:27:21 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Mar 31 11:56:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=381b11ad

net-misc/tigervnc: Fix dependencies

Also fix xdg in pkg_postinst

Closes: https://bugs.gentoo.org/835756
Signed-off-by: Viorel Munteanu  gmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 net-misc/tigervnc/tigervnc-1.12.0-r4.ebuild | 204 
 1 file changed, 204 insertions(+)

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r4.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r4.ebuild
new file mode 100644
index ..3a6b5d9eb75f
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r4.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="http://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
+   
https://github.com/TigerVNC/tigervnc/commit/0c5a2b2e7759c2829c07186cfce4d24aa9b5274e.patch
 -> ${P}-xserver-21.patch
+   )"
+
+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
+   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
+   x11-libs/xtrans
+   x11-apps/xauth
+   x11-apps/xinit
+   x11-apps/xkbcomp
+   x11-apps/xsetroot
+   x11-misc/xkeyboard-config
+   opengl? ( media-libs/libglvnd[X] )
+   xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
+   )
+   "
+
+RDEPEND="${CDEPEND}
+   java? ( virtual/jre:1.8 )
+   server? (
+   dev-lang/perl
+   sys-process/psmisc
+   )"
+
+DEPEND="${CDEPEND}
+   drm? ( x11-libs/libdrm )
+   server? (
+   media-fonts/font-util
+   x11-base/xorg-proto
+   x11-libs/libxcvt
+   x11-libs/libxkbfile
+   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
+)
+
+src_prepare() {
+   if use server; then
+   cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. 
unix/xserver || die
+   eapply "${FILESDIR}"/${P}-xorg-1.21.patch
+   eapply "${DISTDIR}"/${P}-xserver-21.patch
+   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
+   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)
+   )
+
+   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 \
+  

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

2022-03-31 Thread Joonas Niilola
commit: 65dae4ae73b4d34bcac425569196686e9e35aca3
Author: Viorel Munteanu  gmail  com>
AuthorDate: Fri Mar 25 11:10:51 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Mar 31 11:56:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65dae4ae

net-misc/tigervnc: drop 1.12.0-r3

Signed-off-by: Viorel Munteanu  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24743
Signed-off-by: Joonas Niilola  gentoo.org>

 net-misc/tigervnc/tigervnc-1.12.0-r3.ebuild | 201 
 1 file changed, 201 deletions(-)

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r3.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r3.ebuild
deleted file mode 100644
index a87123a7d275..
--- a/net-misc/tigervnc/tigervnc-1.12.0-r3.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="http://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
-   
https://github.com/TigerVNC/tigervnc/commit/0c5a2b2e7759c2829c07186cfce4d24aa9b5274e.patch
 -> ${P}-xserver-21.patch
-   )"
-
-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"
-
-CDEPEND="
-   virtual/jpeg:0
-   sys-libs/zlib:=
-   >=x11-libs/fltk-1.3.1
-   sys-libs/pam
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libXrender
-   x11-libs/pixman
-   gnutls? ( net-libs/gnutls:= )
-   nls? ( virtual/libiconv )
-   server? (
-   x11-libs/libXau
-   x11-libs/libXdamage
-   x11-libs/libXdmcp
-   x11-libs/libXfont2
-   x11-libs/libXtst
-   >=x11-libs/pixman-0.27.2
-   >=x11-apps/xauth-1.0.3
-   x11-apps/xsetroot
-   >=x11-misc/xkeyboard-config-2.4.1-r3
-   xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-   drm? ( x11-libs/libdrm )
-   dev-libs/openssl:0=
-   )
-   xinerama? ( x11-libs/libXinerama )
-   "
-
-RDEPEND="${CDEPEND}
-   java? ( virtual/jre:1.8 )
-   server? (
-   dev-lang/perl
-   sys-process/psmisc
-   )"
-
-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
-   server? (
-   dev-libs/libbsd
-   x11-libs/libxkbfile
-   x11-libs/libxshmfence
-   virtual/pkgconfig
-   media-fonts/font-util
-   x11-misc/util-macros
-   >=x11-libs/xtrans-1.3.3
-   opengl? ( >=media-libs/mesa-10.3.4-r1 )
-   )"
-
-PATCHES=(
-   # Restore Java viewer
-   "${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
-   "${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
-)
-
-src_prepare() {
-   if use server; then
-   cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. 
unix/xserver || die
-   eapply "${FILESDIR}"/${P}-xorg-1.21.patch
-   eapply "${DISTDIR}"/${P}-xserver-21.patch
-   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
-   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)
-   )
-
-   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 \
-   

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

2022-03-31 Thread Joonas Niilola
commit: 22e7fd0a01cf60a256086d643f1ebab00c31d39a
Author: Viorel Munteanu  gmail  com>
AuthorDate: Fri Mar 25 11:08:19 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Mar 31 11:56:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22e7fd0a

net-misc/tigervnc: add myself as a maintainer

Signed-off-by: Viorel Munteanu  gmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 net-misc/tigervnc/metadata.xml | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

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 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-   
+   
+   ceamac.para...@gmail.com
+   Viorel Munteanu
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   

Build with DRM support
Build TigerVNC server



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

2022-03-22 Thread Sam James
commit: f94f6f15314c9a4b161efacb57042744346bc234
Author: Viorel Munteanu  gmail  com>
AuthorDate: Tue Mar 22 07:27:03 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 22 18:01:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f94f6f15

net-misc/tigervnc: Fix the init script

Remove $VNC_OPTS from conf.d
Make init script POSIX compliant

Closes: https://bugs.gentoo.org/835730
Closes: https://bugs.gentoo.org/506522
Signed-off-by: Viorel Munteanu  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24703
Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/files/tigervnc-1.12.0.confd  |  4 ++--
 net-misc/tigervnc/files/tigervnc-1.12.0.initd  | 28 ++
 ...-1.12.0-r2.ebuild => tigervnc-1.12.0-r3.ebuild} |  0
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0.confd 
b/net-misc/tigervnc/files/tigervnc-1.12.0.confd
index a65c991eabcc..d03da01660be 100644
--- a/net-misc/tigervnc/files/tigervnc-1.12.0.confd
+++ b/net-misc/tigervnc/files/tigervnc-1.12.0.confd
@@ -11,5 +11,5 @@
 # TIGERVNC_XSESSION_FILE="/etc/lightdm/Xsession"
 # TIGERVNC_XSESSION_FILE="/usr/share/slim/Xsession"
 
-# Specify any of vncserver(1) and Xvnc(1) options. See the respective man 
pages for more information.
-# VNC_OPTS=""
+# 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
index 59da61eed5f7..c27d9c01bd7e 100644
--- a/net-misc/tigervnc/files/tigervnc-1.12.0.initd
+++ b/net-misc/tigervnc/files/tigervnc-1.12.0.initd
@@ -2,25 +2,26 @@
 # 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
-   local user
+   if [ "$1" = "start" ]; then
for user in $DISPLAYS; do
if eval [ ! -f "~${user%%:*}/.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 $HOSTNAME:${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 $HOSTNAME:${user##*:}"
+   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"
@@ -30,6 +31,8 @@ checkconfig() {
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
@@ -39,15 +42,8 @@ start() {
checkconfig start || return 1
ebegin "Starting TigerVNC server"
for user in $DISPLAYS; do
-   usrname=${user%%:*}
-   usropts=VNC_OPTS_${usrname}
-   usrdisp=${user##*:}
-   usrvar=$usropts"["$usrdisp"]"
-   [ -z ${!usrvar} ] && vnc_opts=$VNC_OPTS || vnc_opts=${!usrvar}
-
[ -n "${TIGERVNC_XSESSION_FILE}" ] && export 
TIGERVNC_XSESSION_FILE
-
-   /usr/libexec/vncsession-start :${user##*:} $vnc_opts &>/dev/null
+   /usr/libexec/vncsession-start ":${user##*:}" >/dev/null 2>&1
done
eend $?
 }
@@ -59,10 +55,10 @@ stop() {
# 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(//
-   

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

2022-03-18 Thread Sam James
commit: 412958a6e4d9961ed92591d0029dbfc6685cf7db
Author: Viorel Munteanu  gmail  com>
AuthorDate: Sun Feb 20 08:08:51 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 18 18:52:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=412958a6

net-misc/tigervnc: drop 1.12.0-r1

Signed-off-by: Viorel Munteanu  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/tigervnc-1.12.0-r1.ebuild | 184 
 1 file changed, 184 deletions(-)

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r1.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r1.ebuild
deleted file mode 100644
index dad2f03e904d..
--- a/net-misc/tigervnc/tigervnc-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_IN_SOURCE_BUILD=1
-inherit autotools cmake flag-o-matic java-pkg-opt-2 systemd xdg
-
-XSERVER_VERSION="21.1.1"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://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
-   
https://github.com/TigerVNC/tigervnc/commit/0c5a2b2e7759c2829c07186cfce4d24aa9b5274e.patch
 -> ${P}-xserver-21.patch
-   )"
-
-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"
-
-CDEPEND="
-   virtual/jpeg:0
-   sys-libs/zlib:=
-   >=x11-libs/fltk-1.3.1
-   sys-libs/pam
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libXrender
-   x11-libs/pixman
-   gnutls? ( net-libs/gnutls:= )
-   nls? ( virtual/libiconv )
-   server? (
-   x11-libs/libXau
-   x11-libs/libXdamage
-   x11-libs/libXdmcp
-   x11-libs/libXfont2
-   x11-libs/libXtst
-   >=x11-libs/pixman-0.27.2
-   >=x11-apps/xauth-1.0.3
-   x11-apps/xsetroot
-   >=x11-misc/xkeyboard-config-2.4.1-r3
-   xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-   drm? ( x11-libs/libdrm )
-   dev-libs/openssl:0=
-   )
-   xinerama? ( x11-libs/libXinerama )
-   "
-
-RDEPEND="${CDEPEND}
-   java? ( virtual/jre:1.8 )"
-
-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
-   server? (
-   dev-libs/libbsd
-   x11-libs/libxkbfile
-   x11-libs/libxshmfence
-   virtual/pkgconfig
-   media-fonts/font-util
-   x11-misc/util-macros
-   >=x11-libs/xtrans-1.3.3
-   opengl? ( >=media-libs/mesa-10.3.4-r1 )
-   )"
-
-PATCHES=(
-   # Restore Java viewer
-   "${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
-)
-
-src_prepare() {
-   if use server; then
-   cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. 
unix/xserver || die
-   eapply "${FILESDIR}"/${P}-xorg-1.21.patch
-   eapply "${DISTDIR}"/${P}-xserver-21.patch
-   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
-   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)
-   )
-
-   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 \
-   

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

2022-03-18 Thread Sam James
commit: 70baba99a3165ad7b142969b01713d3a4abeeb67
Author: Viorel Munteanu  gmail  com>
AuthorDate: Sun Feb 20 08:15:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 18 18:52:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70baba99

net-misc/tigervnc: drop 1.11.0-r4

Signed-off-by: Viorel Munteanu  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/Manifest  |   1 -
 net-misc/tigervnc/tigervnc-1.11.0-r4.ebuild | 182 
 2 files changed, 183 deletions(-)

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 004231b045fb..69a6995f580f 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,4 +1,3 @@
-DIST tigervnc-1.11.0.tar.gz 1346992 BLAKE2B 
4935f78154ea1567d58f542962f1a87688cd195e9d1aff8295e99aedc91a87cea7b686e9ef34e68f4abb1e3ce7a93122baff1d6f3564e4cc60b967a7bca6f8ac
 SHA512 
262676f065de6dfb72b1482c0ef1e6d8b764f53360ae6114debbe0986eede45d27e283e1452a72cb9b7540657ab347fd36df5b30b72d6db4a0f8cbea5b591025
 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.9.0.tar.gz 1506520 BLAKE2B 
292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a
 SHA512 
333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d

diff --git a/net-misc/tigervnc/tigervnc-1.11.0-r4.ebuild 
b/net-misc/tigervnc/tigervnc-1.11.0-r4.ebuild
deleted file mode 100644
index 2ca010e7a3c5..
--- a/net-misc/tigervnc/tigervnc-1.11.0-r4.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit autotools cmake flag-o-matic java-pkg-opt-2 systemd xdg
-
-XSERVER_VERSION="1.20.0"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://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.bz2
  )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule"
-
-CDEPEND="
-   virtual/jpeg:0
-   sys-libs/zlib:=
-   >=x11-libs/fltk-1.3.1
-   gnutls? ( net-libs/gnutls:= )
-   nls? ( virtual/libiconv )
-   pam? ( sys-libs/pam )
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libXrender
-   x11-libs/pixman
-   server? (
-   x11-libs/libXau
-   x11-libs/libXdamage
-   x11-libs/libXdmcp
-   x11-libs/libXfont2
-   x11-libs/libXtst
-   >=x11-libs/pixman-0.27.2
-   >=x11-apps/xauth-1.0.3
-   x11-apps/xsetroot
-   >=x11-misc/xkeyboard-config-2.4.1-r3
-   xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-   drm? ( x11-libs/libdrm )
-   dev-libs/openssl:0=
-   )
-   xinerama? ( x11-libs/libXinerama )
-   "
-
-RDEPEND="${CDEPEND}
-   java? ( virtual/jre:1.8 )"
-
-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
-   server? (
-   dev-libs/libbsd
-   x11-libs/libxkbfile
-   x11-libs/libxshmfence
-   virtual/pkgconfig
-   media-fonts/font-util
-   x11-misc/util-macros
-   >=x11-libs/xtrans-1.3.3
-   opengl? ( >=media-libs/mesa-10.3.4-r1 )
-   )"
-
-PATCHES=(
-   # Restore Java viewer
-   "${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
-)
-
-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 "${FILESDIR}"/xserver120.patch
-   eapply 

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

2022-03-18 Thread Sam James
commit: c0660ebeeddda8fb14f5f34f40d467b6e6f288d1
Author: Viorel Munteanu  gmail  com>
AuthorDate: Fri Feb 18 17:38:03 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 18 18:51:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0660ebe

net-misc/tigervnc: fix start server with openrc

Add support to override the default Xsession file

Bug: https://bugs.gentoo.org/746227
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Viorel Munteanu  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../files/tigervnc-1.12.0-xsession-path.patch  |  28 +++
 net-misc/tigervnc/files/tigervnc-1.12.0.confd  |  15 ++
 net-misc/tigervnc/files/tigervnc-1.12.0.initd  |  75 
 net-misc/tigervnc/tigervnc-1.12.0-r2.ebuild| 201 +
 4 files changed, 319 insertions(+)

diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0-xsession-path.patch 
b/net-misc/tigervnc/files/tigervnc-1.12.0-xsession-path.patch
new file mode 100644
index ..bfcf6ceaef16
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.12.0-xsession-path.patch
@@ -0,0 +1,28 @@
+Add more possible paths for Xsession, depending on which display manager is
+installed.  We need an Xsession that executes its command line parameters, so
+leave xinit last.
+
+See also https://bugs.gentoo.org/746227
+
+--- a/unix/vncserver/vncserver.in
 b/unix/vncserver/vncserver.in
+@@ -437,11 +437,14 @@
+   die "$prog: couldn't find \"$cmd\" on your PATH.\n";
+ }
+ 
+-foreach $cmd ("/etc/X11/xinit/Xsession", "/etc/X11/Xsession") {
+-if (-x "$cmd") {
+-$Xsession = $cmd;
+-last;
+-}
++$Xsession=$ENV{TIGERVNC_XSESSION_FILE};
++if (not defined $Xsession) {
++  foreach $cmd ("/usr/share/sddm/scripts/Xsession", "/etc/gdm/Xsession", 
"/etc/lightdm/Xsession", "/usr/share/slim/Xsession", 
"/etc/X11/Sessions/Xsession", "/etc/X11/xinit/Xsession", "/etc/X11/Xsession") {
++  if (-x "$cmd") {
++  $Xsession = $cmd;
++  last;
++  }
++  }
+ }
+ if (not defined $Xsession) {
+ die "$prog: Couldn't find suitable Xsession.\n";

diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0.confd 
b/net-misc/tigervnc/files/tigervnc-1.12.0.confd
new file mode 100644
index ..a65c991eabcc
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.12.0.confd
@@ -0,0 +1,15 @@
+# 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"
+
+# Specify any of vncserver(1) and Xvnc(1) options. See the respective man 
pages for more information.
+# VNC_OPTS=""

diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0.initd 
b/net-misc/tigervnc/files/tigervnc-1.12.0.initd
new file mode 100644
index ..59da61eed5f7
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.12.0.initd
@@ -0,0 +1,75 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+depend() {
+   need net
+}
+
+checkconfig() {
+   if [ -n "${DISPLAYS}" ]; then
+   if [ $1 = "start" ]; then
+   local user
+   for user in $DISPLAYS; do
+   if eval [ ! -f "~${user%%:*}/.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 $HOSTNAME:${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 $HOSTNAME:${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"
+

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

2022-03-18 Thread Sam James
commit: 1490b559b0acb670b8a39bbd5af9d721d6d0ba09
Author: Viorel Munteanu  gmail  com>
AuthorDate: Fri Feb 18 17:34:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 18 18:51:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1490b559

net-misc/tigervnc: fix dependencies

Some soft blockers have been removed from the tree

Also add missing ~riscv to 1.12.0-r1

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Viorel Munteanu  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/tigervnc-1.11.0-r4.ebuild | 5 +
 net-misc/tigervnc/tigervnc-1.12.0-r1.ebuild | 7 ++-
 net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild  | 5 +
 net-misc/tigervnc/tigervnc-.ebuild  | 7 ++-
 4 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/net-misc/tigervnc/tigervnc-1.11.0-r4.ebuild 
b/net-misc/tigervnc/tigervnc-1.11.0-r4.ebuild
index 34e7e078e373..2ca010e7a3c5 100644
--- a/net-misc/tigervnc/tigervnc-1.11.0-r4.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.11.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,9 +47,6 @@ CDEPEND="
"
 
 RDEPEND="${CDEPEND}
-   !net-misc/tightvnc
-   !net-misc/vnc
-   !net-misc/xf4vnc
java? ( virtual/jre:1.8 )"
 
 DEPEND="${CDEPEND}

diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r1.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r1.ebuild
index a00c4d13860f..dad2f03e904d 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ 
SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv 
~sparc ~x86"
 IUSE="dri3 +drm gnutls java nls +opengl server xinerama +xorgmodule"
 
 CDEPEND="
@@ -50,9 +50,6 @@ CDEPEND="
"
 
 RDEPEND="${CDEPEND}
-   !net-misc/tightvnc
-   !net-misc/vnc
-   !net-misc/xf4vnc
java? ( virtual/jre:1.8 )"
 
 DEPEND="${CDEPEND}

diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild 
b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
index 2b4a80d051da..8b4f9d535a12 100644
--- a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,9 +47,6 @@ CDEPEND="
"
 
 RDEPEND="${CDEPEND}
-   !net-misc/tightvnc
-   !net-misc/vnc
-   !net-misc/xf4vnc
java? ( virtual/jre:1.8 )"
 
 DEPEND="${CDEPEND}

diff --git a/net-misc/tigervnc/tigervnc-.ebuild 
b/net-misc/tigervnc/tigervnc-.ebuild
index 8b91a1a47c46..53fc1b9c571d 100644
--- a/net-misc/tigervnc/tigervnc-.ebuild
+++ b/net-misc/tigervnc/tigervnc-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,10 +47,7 @@ CDEPEND="
xinerama? ( x11-libs/libXinerama )
"
 
-RDEPEND="${CDEPEND}
-   !net-misc/tightvnc
-   !net-misc/vnc
-   !net-misc/xf4vnc"
+RDEPEND="${CDEPEND}"
 
 DEPEND="${CDEPEND}
nls? ( sys-devel/gettext )



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

2021-12-07 Thread Sam James
commit: 14e8c0f75ccd89f10dca5f83b3991c3bab5c7523
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec  7 23:44:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec  7 23:45:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14e8c0f7

net-misc/tigervnc: fix 1.12.0 for xorg 1.21.1

Add additional patches and apply the right one in the source tree too.

Bug: https://bugs.gentoo.org/746227
Thanks-to: Joakim Tjernlund  infinera.com>
Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/Manifest |  1 +
 .../tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch | 55 ++
 ...vnc-1.12.0.ebuild => tigervnc-1.12.0-r1.ebuild} | 15 +++---
 3 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index d58cbabda1a3..004231b045fb 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,4 +1,5 @@
 DIST tigervnc-1.11.0.tar.gz 1346992 BLAKE2B 
4935f78154ea1567d58f542962f1a87688cd195e9d1aff8295e99aedc91a87cea7b686e9ef34e68f4abb1e3ce7a93122baff1d6f3564e4cc60b967a7bca6f8ac
 SHA512 
262676f065de6dfb72b1482c0ef1e6d8b764f53360ae6114debbe0986eede45d27e283e1452a72cb9b7540657ab347fd36df5b30b72d6db4a0f8cbea5b591025
+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.9.0.tar.gz 1506520 BLAKE2B 
292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a
 SHA512 
333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d
 DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 
34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046
 SHA512 
1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde

diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch 
b/net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch
new file mode 100644
index ..c3e003d328a6
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.12.0-xorg-1.21.patch
@@ -0,0 +1,55 @@
+https://github.com/TigerVNC/tigervnc/commit/736b50d04e1ba965696cd15d456dc2b7fc123150.patch
+https://github.com/TigerVNC/tigervnc/commit/f2577107f7f55382c524d8c738a777e5cdd80f60.patch
+
+From: Joakim Tjernlund 
+Date: Wed, 24 Nov 2021 21:09:36 +0100
+Subject: [PATCH] xorg-version.h: Increase supported Xorg version to 1.21
+
+--- a/unix/xserver/hw/vnc/xorg-version.h
 b/unix/xserver/hw/vnc/xorg-version.h
+@@ -33,8 +33,8 @@
+ #error "X.Org older than 1.16 is not supported"
+ #endif
+ 
+-#if XORG_AT_LEAST(1, 21, 0)
+-#error "X.Org newer than 1.20 is not supported"
++#if XORG_AT_LEAST(1, 22, 0)
++#error "X.Org newer than 1.21 is not supported"
+ #endif
+ 
+ #endif
+
+From: Joakim Tjernlund 
+Date: Wed, 24 Nov 2021 21:10:56 +0100
+Subject: [PATCH] xvnc: adapt for 1.21
+
+VENDOR_STRING is gone as is DEFAULT_LOG_VERBOSITY
+site.h has been removed and is not needed.
+--- a/unix/xserver/hw/vnc/xvnc.c
 b/unix/xserver/hw/vnc/xvnc.c
+@@ -69,7 +69,6 @@ extern char buildtime[];
+ #undef VENDOR_RELEASE
+ #undef VENDOR_STRING
+ #include "version-config.h"
+-#include "site.h"
+ 
+ #define XVNCVERSION "TigerVNC 1.12.80"
+ #define XVNCCOPYRIGHT ("Copyright (C) 1999-2021 TigerVNC Team and many others 
(see README.rst)\n" \
+@@ -111,14 +110,13 @@ static Bool Render = TRUE;
+ static Bool displaySpecified = FALSE;
+ static char displayNumStr[16];
+ 
+-static int vncVerbose = DEFAULT_LOG_VERBOSITY;
++static int vncVerbose = 0;
+ 
+ static void
+ vncPrintBanner(void)
+ {
+ ErrorF("\nXvnc %s - built %s\n%s", XVNCVERSION, buildtime, XVNCCOPYRIGHT);
+-ErrorF("Underlying X server release %d, %s\n\n", VENDOR_RELEASE,
+-   VENDOR_STRING);
++ErrorF("Underlying X server release %d\n\n", VENDOR_RELEASE);
+ }
+ 
+ static void
+

diff --git a/net-misc/tigervnc/tigervnc-1.12.0.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0-r1.ebuild
similarity index 88%
rename from net-misc/tigervnc/tigervnc-1.12.0.ebuild
rename to net-misc/tigervnc/tigervnc-1.12.0-r1.ebuild
index 3fc099abd296..a00c4d13860f 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r1.ebuild
@@ -11,7 +11,10 @@ XSERVER_VERSION="21.1.1"
 

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

2021-12-07 Thread Sam James
commit: 9dc0ec55803692786e6538bca4a12b0102e775f3
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec  7 23:16:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec  7 23:16:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dc0ec55

net-misc/tigervnc: add 1.12.0 (still masked)

Note that this doesn't yet fix the xsession handling stuff, but
am looking to see what we can do about it.

Bug: https://bugs.gentoo.org/746227
Closes: https://bugs.gentoo.org/746359
Closes: https://bugs.gentoo.org/746365
Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/Manifest |  1 +
 ...tigervnc-.ebuild => tigervnc-1.12.0.ebuild} | 41 +++---
 net-misc/tigervnc/tigervnc-.ebuild |  9 +++--
 3 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 4f5a3da9f469..d58cbabda1a3 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,4 +1,5 @@
 DIST tigervnc-1.11.0.tar.gz 1346992 BLAKE2B 
4935f78154ea1567d58f542962f1a87688cd195e9d1aff8295e99aedc91a87cea7b686e9ef34e68f4abb1e3ce7a93122baff1d6f3564e4cc60b967a7bca6f8ac
 SHA512 
262676f065de6dfb72b1482c0ef1e6d8b764f53360ae6114debbe0986eede45d27e283e1452a72cb9b7540657ab347fd36df5b30b72d6db4a0f8cbea5b591025
+DIST tigervnc-1.12.0.tar.gz 1561898 BLAKE2B 
891934e48e3c4f2c36c280ad1562874d3c22ca3118e8eda2f68f9ad7cca978c76b8825100f540774b7a6553e981bd9264e0f717c8313585553741d31706cafad
 SHA512 
a16b15e9cda552a49a3934e4174e49d186d06494d90d11582599ab82559014332662aed7760619a6dfb32a8c95f7d63c68ac7d632c29dd662a6b713f036672bb
 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 
8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a86510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d

diff --git a/net-misc/tigervnc/tigervnc-.ebuild 
b/net-misc/tigervnc/tigervnc-1.12.0.ebuild
similarity index 81%
copy from net-misc/tigervnc/tigervnc-.ebuild
copy to net-misc/tigervnc/tigervnc-1.12.0.ebuild
index 01ff15488f6e..3fc099abd296 100644
--- a/net-misc/tigervnc/tigervnc-.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0.ebuild
@@ -2,34 +2,33 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-CMAKE_IN_SOURCE_BUILD=1
 
-inherit autotools cmake flag-o-matic git-r3 systemd xdg
+CMAKE_IN_SOURCE_BUILD=1
+inherit autotools cmake flag-o-matic java-pkg-opt-2 systemd xdg
 
 XSERVER_VERSION="21.1.1"
 
 DESCRIPTION="Remote desktop viewer display system"
 HOMEPAGE="http://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/;
+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
 )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="dri3 +drm gnutls nls +opengl pam server xinerama +xorgmodule"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dri3 +drm gnutls java nls +opengl server xinerama +xorgmodule"
 
 CDEPEND="
virtual/jpeg:0
sys-libs/zlib:=
>=x11-libs/fltk-1.3.1
-   gnutls? ( net-libs/gnutls:= )
-   nls? ( virtual/libiconv )
-   pam? ( sys-libs/pam )
+   sys-libs/pam
x11-libs/libX11
x11-libs/libXext
x11-libs/libXrender
-   x11-libs/libxcvt
x11-libs/pixman
+   gnutls? ( net-libs/gnutls:= )
+   nls? ( virtual/libiconv )
server? (
x11-libs/libXau
x11-libs/libXdamage
@@ -50,10 +49,12 @@ CDEPEND="
 RDEPEND="${CDEPEND}
!net-misc/tightvnc
!net-misc/vnc
-   !net-misc/xf4vnc"
+   !net-misc/xf4vnc
+   java? ( virtual/jre:1.8 )"
 
 DEPEND="${CDEPEND}
nls? ( sys-devel/gettext )
+   java? ( virtual/jdk:1.8 )
x11-base/xorg-proto
media-libs/fontconfig
x11-libs/libICE
@@ -73,10 +74,10 @@ DEPEND="${CDEPEND}
opengl? ( >=media-libs/mesa-10.3.4-r1 )
)"
 
-src_unpack() {
-   git-r3_src_unpack
-   

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

2021-12-06 Thread Sam James
commit: c1cdfd13843b40362a3b0a538f0a9bdbe564f050
Author: Jan Psota  gmail  com>
AuthorDate: Mon Dec  6 21:36:38 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  6 23:36:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1cdfd13

net-misc/tigervnc: live ebuild for xorg-server-21.1.1 support

[sam: Includes its own copy of xserver for now (not ideal, but this package
already uses a bunch of patched versions of things).]

Closes: https://bugs.gentoo.org/828469
Signed-off-by: Jan Psota  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 net-misc/tigervnc/Manifest |   1 +
 net-misc/tigervnc/tigervnc-.ebuild | 185 +
 2 files changed, 186 insertions(+)

diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 7c7e79a01771..4f5a3da9f469 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,3 +1,4 @@
 DIST tigervnc-1.11.0.tar.gz 1346992 BLAKE2B 
4935f78154ea1567d58f542962f1a87688cd195e9d1aff8295e99aedc91a87cea7b686e9ef34e68f4abb1e3ce7a93122baff1d6f3564e4cc60b967a7bca6f8ac
 SHA512 
262676f065de6dfb72b1482c0ef1e6d8b764f53360ae6114debbe0986eede45d27e283e1452a72cb9b7540657ab347fd36df5b30b72d6db4a0f8cbea5b591025
 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 
8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a86510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d

diff --git a/net-misc/tigervnc/tigervnc-.ebuild 
b/net-misc/tigervnc/tigervnc-.ebuild
new file mode 100644
index ..01ff15488f6e
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CMAKE_IN_SOURCE_BUILD=1
+
+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;
+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/;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="dri3 +drm gnutls nls +opengl pam server xinerama +xorgmodule"
+
+CDEPEND="
+   virtual/jpeg:0
+   sys-libs/zlib:=
+   >=x11-libs/fltk-1.3.1
+   gnutls? ( net-libs/gnutls:= )
+   nls? ( virtual/libiconv )
+   pam? ( sys-libs/pam )
+   x11-libs/libX11
+   x11-libs/libXext
+   x11-libs/libXrender
+   x11-libs/libxcvt
+   x11-libs/pixman
+   server? (
+   x11-libs/libXau
+   x11-libs/libXdamage
+   x11-libs/libXdmcp
+   x11-libs/libXfont2
+   x11-libs/libXtst
+   >=x11-libs/pixman-0.27.2
+   >=x11-apps/xauth-1.0.3
+   x11-apps/xsetroot
+   >=x11-misc/xkeyboard-config-2.4.1-r3
+   xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
+   drm? ( x11-libs/libdrm )
+   dev-libs/openssl:0=
+   )
+   xinerama? ( x11-libs/libXinerama )
+   "
+
+RDEPEND="${CDEPEND}
+   !net-misc/tightvnc
+   !net-misc/vnc
+   !net-misc/xf4vnc"
+
+DEPEND="${CDEPEND}
+   nls? ( sys-devel/gettext )
+   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
+   server? (
+   dev-libs/libbsd
+   x11-libs/libxkbfile
+   x11-libs/libxshmfence
+   virtual/pkgconfig
+   media-fonts/font-util
+   x11-misc/util-macros
+   >=x11-libs/xtrans-1.3.3
+   opengl? ( >=media-libs/mesa-10.3.4-r1 )
+   )"
+
+src_unpack() {
+   git-r3_src_unpack
+   unpack xorg-server-${XSERVER_VERSION}.tar.xz
+}
+
+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 

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

2021-09-16 Thread Sam James
commit: 5b32857aad326b3f495f80c1e529f940ffb4cff0
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep 17 02:14:24 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep 17 02:14:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b32857a

net-misc/tigervnc: restore Java viewer in 1.11.x

Thanks-to: Erik Wallin  sizeit.se>
Closes: https://bugs.gentoo.org/769794
Signed-off-by: Sam James  gentoo.org>

 .../tigervnc-1.11.0-install-java-viewer.patch  | 26 ++
 ...-1.11.0-r3.ebuild => tigervnc-1.11.0-r4.ebuild} |  5 +
 2 files changed, 31 insertions(+)

diff --git a/net-misc/tigervnc/files/tigervnc-1.11.0-install-java-viewer.patch 
b/net-misc/tigervnc/files/tigervnc-1.11.0-install-java-viewer.patch
new file mode 100644
index 000..3afaf82d002
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.11.0-install-java-viewer.patch
@@ -0,0 +1,26 @@
+See bug for rationale, gist is that this is still useful.
+
+Patch from Erik Wallin 
+https://bugs.gentoo.org/769794
+--- a/java/CMakeLists.txt
 b/java/CMakeLists.txt
+@@ -7,6 +7,8 @@
+ 
+ find_package(Java)
+ 
++set(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share")
++
+ set(DEFAULT_JAVACFLAGS "-source 8 -target 8 -encoding UTF-8 
-Xlint:all,-serial,-cast,-unchecked,-fallthrough,-dep-ann,-deprecation,-rawtypes")
+ set(JAVACFLAGS ${DEFAULT_JAVACFLAGS} CACHE STRING
+   "Java compiler flags (Default: ${DEFAULT_JAVACFLAGS})")
+@@ -172,3 +174,10 @@
+ -P ${SRCDIR}/cmake/SignJar.cmake)
+ 
+ add_custom_target(java ALL DEPENDS VncViewer.jar)
++
++if(NOT WIN32)
++  install(FILES
++${BINDIR}/VncViewer.jar
++${SRCDIR}/${CLASSPATH}/README
++DESTINATION ${DATA_DIR}/vnc/classes)
++endif()

diff --git a/net-misc/tigervnc/tigervnc-1.11.0-r3.ebuild 
b/net-misc/tigervnc/tigervnc-1.11.0-r4.ebuild
similarity index 97%
rename from net-misc/tigervnc/tigervnc-1.11.0-r3.ebuild
rename to net-misc/tigervnc/tigervnc-1.11.0-r4.ebuild
index 576dcb604f1..34e7e078e37 100644
--- a/net-misc/tigervnc/tigervnc-1.11.0-r3.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.11.0-r4.ebuild
@@ -74,6 +74,11 @@ DEPEND="${CDEPEND}
opengl? ( >=media-libs/mesa-10.3.4-r1 )
)"
 
+PATCHES=(
+   # Restore Java viewer
+   "${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
+)
+
 src_prepare() {
if use server; then
cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. 
unix/xserver || die



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

2021-09-12 Thread Ionen Wolkens
commit: 1190f9c5b21549cff935545c91c782de7d57f49d
Author: Alfred Wingate  protonmail  com>
AuthorDate: Fri Sep 10 15:20:14 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Sep 12 21:07:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1190f9c5

net-misc/tigervnc: use xdg instead of gnome2-utils

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alfred Wingate  protonmail.com>
Signed-off-by: Ionen Wolkens  gentoo.org>

 net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild | 12 +---
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild 
b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
index 099a5b57f34..2b4a80d051d 100644
--- a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_IN_SOURCE_BUILD=1
 
-inherit autotools cmake flag-o-matic java-pkg-opt-2 systemd xdg-utils 
gnome2-utils
+inherit autotools cmake flag-o-matic java-pkg-opt-2 systemd xdg
 
 XSERVER_VERSION="1.20.0"
 
@@ -186,13 +186,3 @@ src_install() {
done
fi
 }
-
-pkg_postinst() {
-   xdg_desktop_database_update
-   gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-   xdg_desktop_database_update
-   gnome2_icon_cache_update
-}



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

2021-08-03 Thread Ionen Wolkens
commit: 474d4341d9b6494a886def1c8302e18ea5190c1e
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Mon Aug  2 04:59:08 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Aug  3 16:22:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=474d4341

net-misc/tigervnc: remove old versions

Closes: https://bugs.gentoo.org/787635
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/21857
Signed-off-by: Ionen Wolkens  gentoo.org>

 net-misc/tigervnc/tigervnc-1.11.0-r2.ebuild | 180 -
 net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild  | 198 
 2 files changed, 378 deletions(-)

diff --git a/net-misc/tigervnc/tigervnc-1.11.0-r2.ebuild 
b/net-misc/tigervnc/tigervnc-1.11.0-r2.ebuild
deleted file mode 100644
index 6b3e1e47660..000
--- a/net-misc/tigervnc/tigervnc-1.11.0-r2.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit autotools cmake flag-o-matic java-pkg-opt-2 systemd xdg
-
-XSERVER_VERSION="1.20.0"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://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.bz2
  )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule"
-
-CDEPEND="
-   virtual/jpeg:0
-   sys-libs/zlib:=
-   >=x11-libs/fltk-1.3.1
-   gnutls? ( net-libs/gnutls:= )
-   nls? ( virtual/libiconv )
-   pam? ( sys-libs/pam )
-   x11-libs/libX11
-   x11-libs/libXext
-   x11-libs/libXrender
-   x11-libs/pixman
-   server? (
-   x11-libs/libXau
-   x11-libs/libXdamage
-   x11-libs/libXdmcp
-   x11-libs/libXfont2
-   x11-libs/libXtst
-   >=x11-libs/pixman-0.27.2
-   >=x11-apps/xauth-1.0.3
-   x11-apps/xsetroot
-   >=x11-misc/xkeyboard-config-2.4.1-r3
-   xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-   drm? ( x11-libs/libdrm )
-   dev-libs/openssl:0=
-   )
-   xinerama? ( x11-libs/libXinerama )
-   "
-
-RDEPEND="${CDEPEND}
-   !net-misc/tightvnc
-   !net-misc/vnc
-   !net-misc/xf4vnc
-   java? ( >=virtual/jre-1.5:* )"
-
-DEPEND="${CDEPEND}
-   nls? ( sys-devel/gettext )
-   java? ( >=virtual/jdk-1.5 )
-   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
-   server? (
-   dev-libs/libbsd
-   x11-libs/libxkbfile
-   x11-libs/libxshmfence
-   virtual/pkgconfig
-   media-fonts/font-util
-   x11-misc/util-macros
-   >=x11-libs/xtrans-1.3.3
-   opengl? ( >=media-libs/mesa-10.3.4-r1 )
-   )"
-
-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 "${FILESDIR}"/xserver120.patch
-   eapply "${FILESDIR}"/xserver120-drmfourcc-header.patch
-   sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die
-   eautoreconf
-   fi
-}
-
-src_configure() {
-   if use arm || use hppa; then
-   append-flags "-fPIC"
-   fi
-
-   local mycmakeargs=(
-   -DENABLE_GNUTLS=$(usex gnutls)
-   -DENABLE_NLS=$(usex nls)
-   -DENABLE_PAM=$(usex pam)
-   -DBUILD_JAVA=$(usex java)
-   )
-
-   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-dmx \
-   --disable-dri \
-   $(use_enable dri3) \
-   --disable-glamor \
-   --disable-kdrive \
-   --disable-libunwind \
-   --disable-linux-acpi \
-   --disable-record \
-   --disable-selective-werror \
-   --disable-static \
-   

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

2021-08-03 Thread Agostino Sarubbo
commit: 705874505211ba78d58449c9b154a8128a7741a6
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Aug  3 15:33:31 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Aug  3 15:33:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70587450

net-misc/tigervnc: x86 stable wrt bug #805503

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild 
b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
index af0ddfbcd53..099a5b57f34 100644
--- a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
@@ -16,7 +16,7 @@ 
SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc 
~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc 
x86"
 IUSE="dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule"
 
 CDEPEND="



  1   2   3   >