Really use updated conf.d and init.d files as looks like I forgot to effectively commit them in the past and was using them only locally, bug #436386 by Szymon Walczak, My Th and mva.

(Portage version: 2.1.11.19/cvs/Linux x86_64)

3 files changed, 18 insertions, 10 deletions

diff --git a/x11-misc/virtualgl/ChangeLog b/x11-misc/virtualgl/ChangeLog
index ab1f0abd5e56..91f6e47f6eb2 100644
--- a/x11-misc/virtualgl/ChangeLog
+++ b/x11-misc/virtualgl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/virtualgl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/ChangeLog,v 1.5 2012/09/14 20:26:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/ChangeLog,v 1.6 2012/09/29 09:33:10 pacho Exp $
+
+*virtualgl-2.3.1-r1 (29 Sep 2012)
+
+  29 Sep 2012; Pacho Ramos <pacho@gentoo.org> +virtualgl-2.3.1-r1.ebuild,
+  -virtualgl-2.3.1.ebuild, files/vgl.initd-r1:
+  Really use updated conf.d and init.d files as looks like I forgot to
+  effectively commit them in the past and was using them only locally, bug
+  #436386 by Szymon Walczak, My Th and mva.
 
   14 Sep 2012; Pacho Ramos <pacho@gentoo.org> -virtualgl-2.3.ebuild:
   Drop old.
diff --git a/x11-misc/virtualgl/files/vgl.initd-r1 b/x11-misc/virtualgl/files/vgl.initd-r1
index 431e4448cbff..b079a35311bc 100644
--- a/x11-misc/virtualgl/files/vgl.initd-r1
+++ b/x11-misc/virtualgl/files/vgl.initd-r1
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/files/vgl.initd-r1,v 1.1 2012/07/26 18:46:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/files/vgl.initd-r1,v 1.2 2012/09/29 09:33:10 pacho Exp $
 
 # TODO: description="*" and other OpenRC 0.9+ candies
 
@@ -12,19 +12,19 @@ depend() {
 
 start() {
 	ebegin "Starting VirtualGL"
-	truncate --size=0 /etc/VirtualGL/vgl_xauth_key
+	truncate --size=0 /var/lib/VirtualGL/vgl_xauth_key
 
 	# Check if XAUTHORITY was set successfully, if not wait a bit and let X to start
 	[ -z "$XAUTHORITY" ] && sleep 3 && set_xauth
 	[ -e "$XAUTHORITY" ] || sleep 3
-	xauth -f /etc/VirtualGL/vgl_xauth_key add $DISPLAY . `xauth -f $XAUTHORITY list | awk '{print $3}'` && \
-		chmod 644 /etc/VirtualGL/vgl_xauth_key
+	xauth -f /var/lib/VirtualGL/vgl_xauth_key add $DISPLAY . `xauth -f $XAUTHORITY list | awk '{print $3}'` && \
+		chmod 644 /var/lib/VirtualGL/vgl_xauth_key
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping VirtualGL"
-	[ -f /etc/VirtualGL/vgl_xauth_key ] && \
-		rm /etc/VirtualGL/vgl_xauth_key
+	[ -f /var/lib/VirtualGL/vgl_xauth_key ] && \
+		rm /var/lib/VirtualGL/vgl_xauth_key
 	eend $?
 }
diff --git a/x11-misc/virtualgl/virtualgl-2.3.1.ebuild b/x11-misc/virtualgl/virtualgl-2.3.1-r1.ebuild
index dbc8a3268988..9096ac7b6855 100644
--- a/x11-misc/virtualgl/virtualgl-2.3.1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/virtualgl-2.3.1.ebuild,v 1.1 2012/07/26 18:46:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/virtualgl-2.3.1-r1.ebuild,v 1.1 2012/09/29 09:33:10 pacho Exp $
 
 EAPI="4"
 
@@ -108,8 +108,8 @@ src_install() {
 	dodir /var/lib/VirtualGL
 	fowners root:video /var/lib/VirtualGL
 	fperms 0750 /var/lib/VirtualGL
-	newinitd "${FILESDIR}/vgl.initd" vgl
-	newconfd "${FILESDIR}/vgl.confd" vgl
+	newinitd "${FILESDIR}/vgl.initd-r1" vgl
+	newconfd "${FILESDIR}/vgl.confd-r1" vgl
 
 	# Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
 	mv "${D}"/usr/bin/{,v}glxinfo || die