[gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/, x11-misc/virtualgl/files/

[Matt Turner]

commit:     1607d107ea8254e32d059ce4b9c4375f9608e6f7
Author:     Aisha Tammy <gentoo <AT> aisha <DOT> cc>
AuthorDate: Sat Feb 13 02:04:17 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Mar 24 16:06:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1607d107

x11-misc/virtualgl: revbump for d-m-i

Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 x11-misc/virtualgl/files/vgl.initd-r4              | 45 ++++++++++++++++++++++
 ...algl-2.6.5.ebuild => virtualgl-2.6.5-r1.ebuild} |  2 +-
 x11-misc/virtualgl/virtualgl-9999.ebuild           |  4 +-
 3 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/x11-misc/virtualgl/files/vgl.initd-r4 
b/x11-misc/virtualgl/files/vgl.initd-r4
new file mode 100644
index 00000000000..d40686266e0
--- /dev/null
+++ b/x11-misc/virtualgl/files/vgl.initd-r4
@@ -0,0 +1,45 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: description="*" and other OpenRC 0.9+ candies
+
+depend() {
+       need display-manager
+       after sshd
+}
+
+start() {
+       ebegin "Starting VirtualGL"
+       truncate --size=0 /var/lib/VirtualGL/vgl_xauth_key
+
+  set_xauth
+
+  if [ -z "$XAUTHORITY" ]; then
+
+    einfo "Waiting for xauthority..."
+
+    # wait for xauth file
+    while true; do 
+      set_xauth
+
+      if [ -e "$XAUTHORITY" ]; then
+        break;
+      fi
+
+      sleep 1
+    done 
+  fi
+
+
+       xauth -f /var/lib/VirtualGL/vgl_xauth_key add $DISPLAY . $(xauth -f 
$XAUTHORITY list | awk '{print $3;exit}') && \
+               chmod 644 /var/lib/VirtualGL/vgl_xauth_key
+       eend $?
+}
+
+stop() {
+       ebegin "Stopping VirtualGL"
+       [ -f /var/lib/VirtualGL/vgl_xauth_key ] && \
+               rm /var/lib/VirtualGL/vgl_xauth_key
+       eend $?
+}

diff --git a/x11-misc/virtualgl/virtualgl-2.6.5.ebuild 
b/x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild
similarity index 98%
rename from x11-misc/virtualgl/virtualgl-2.6.5.ebuild
rename to x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild
index f537ef88432..a7857fad033 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.5.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.5-r1.ebuild
@@ -86,7 +86,7 @@ src_install() {
        dodir /var/lib/VirtualGL
        fowners root:video /var/lib/VirtualGL
        fperms 0750 /var/lib/VirtualGL
-       newinitd "${FILESDIR}/vgl.initd-r3" vgl
+       newinitd "${FILESDIR}/vgl.initd-r4" vgl
        newconfd "${FILESDIR}/vgl.confd-r2" vgl
 
        exeinto /usr/libexec

diff --git a/x11-misc/virtualgl/virtualgl-9999.ebuild 
b/x11-misc/virtualgl/virtualgl-9999.ebuild
index b1f2ed56343..c464597e5bc 100644
--- a/x11-misc/virtualgl/virtualgl-9999.ebuild
+++ b/x11-misc/virtualgl/virtualgl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -82,7 +82,7 @@ src_install() {
        dodir /var/lib/VirtualGL
        fowners root:video /var/lib/VirtualGL
        fperms 0750 /var/lib/VirtualGL
-       newinitd "${FILESDIR}/vgl.initd-r3" vgl
+       newinitd "${FILESDIR}/vgl.initd-r4" vgl
        newconfd "${FILESDIR}/vgl.confd-r2" vgl
 
        exeinto /usr/libexec