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.

Package-Manager: portage-2.1.11.19/cvs/Linux x86_64

4 files changed, 24 insertions, 16 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/Manifest b/x11-misc/virtualgl/Manifest
index 0ea80f54fb04..582832ed5ff8 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -4,15 +4,15 @@ Hash: SHA256
 AUX vgl.confd 577 SHA256 c14f83c0fbcb728b635550362fcdf9209921abec017c34ab9add3b99874acafe SHA512 af774c37f8dc437663379da1dcd402f404a12df9d44a94f0bcc68bc019709154eaebb6f865fbc76b1a18a4a5372d89d004016b0e2796ac44844a48526b747901 WHIRLPOOL 32d08015e074df9300b5d8d14db7b6119da47a769bc852e8e2861deb3f5c19031827ffb66a650c73b0765147b080acdf6840f76407b10a043e2f2f933d1a440d
 AUX vgl.confd-r1 636 SHA256 500957c2736f761e763f75e9c3a09bb4f53bcde8a3cd38dd5ec6b34777737fd2 SHA512 f3203bb987d5a99fb63fd11d907235b343b261d945b788dfd17c09999fdb83df3d1a3028c60dd083f6b2ec358df06f321c330ae63a862ec1fa16f816be884ecd WHIRLPOOL af1efbc7ccf18b01e35a4c991be8036f1ed0c34cf040fa7b5b52ebf6441971d952e9577dd9e11656cfc8c673441d083fee5cb4d87dc8876b4cf21cbcc80108ca
 AUX vgl.initd 858 SHA256 f01ec4a7f8b94e794f4b6ed6c80f4a7a0a6d4183e355ab499464065c5f10e6ff SHA512 72072fd39677c8bde7207ddaa55204f47258f3294bd556f489ca09ed2845d009fe710346d2db0c176c4dd90645a2c2c3a3635fa8cfd92767ba597e1aa6359f6f WHIRLPOOL d726d6e9df59014ec3c3bea43f95b47dcf8fc66ba767950bc590265535e8803ff23ff74b03c2869beeb0ab03b711a2461c816430f337592e0a941efadd5c9f30
-AUX vgl.initd-r1 861 SHA256 61a1a97a7bf3d488914f13b073a83625850166ccb84bb8ce18bd7ebc5d95beac SHA512 b373dc6c5095f5b1eda7a2b1ba4db4f921373028201847806816425de43e937517d75d98a092973869a0c62255be416e906b742e022471e36696e20068d1d89b WHIRLPOOL a35df478f0719298a8c80ec1b544f9e32f0d31f5dfd1d4a0c7e8db6387f55bafa5d1d72327dffd23590bab11dc807ac6d2a944e649d64737a354445de6ae45fb
+AUX vgl.initd-r1 881 SHA256 0dc1db0548c627b83c4adb3396aaafdc2d633698e6c89d47fb940904c2f4764c SHA512 e7965844cbc8f58158bb6176eed354b7a0a6da09489aee7b508a59f0fc7529ab7071bd4fa4ee2180cc4b019504f6b8735d7476cbfbc057c9b583ce59394d349e WHIRLPOOL 3a404bd35932c92ffca82b778261876f9e16cd73eb8116d21addf0c7c057faee4d1c8ce09c8e174cee7eea1373f70fb014f5f0412eac049ac7f4bb798cb95334
 DIST VirtualGL-2.3.1.tar.gz 2736264 SHA256 30e101111eb82a1c3326c7581ccc6ad7f3cdf827b22ef4510e62a700071155c9 SHA512 4e9e75e46e458358969f93edeee0f12f962ce1050255808d6ab4ad7aec6ab26c3e63a7f4d9b5abcfda35df1fb8757b4d6708fcc681d03af9f9041f97cccfd479 WHIRLPOOL cfae31c9334ededae01de2dc3e7a74e104c260431643f890c5b658b3fc05e5ccc6c42be9f228cca5ee4d8ff8ee3d96c0a50822d8a593043b15b5dd0302a6036c
-EBUILD virtualgl-2.3.1.ebuild 2971 SHA256 11e0afb16f4531397164318db1ad0d647b647e1be115eab4df9ed57d2976eb3f SHA512 d4eaa1970570f5adfd531b9872119668c3e05b8b44b884460432e87675faf58778bbaf4e43bcfbfc54b1d6c78e58f99ebaa2ad048959cde266ece7fb1c0cfc6f WHIRLPOOL 2928718c0a36c123afbcedc18144b76361dfa8b23b58c5abde312d228c2f0595d77d774ab0effecbd0312e38b13c87282559d8d3234c39fdb79b74659e1c3ffc
-MISC ChangeLog 1155 SHA256 f9e697da4bd416af47cd0104a13e15c36abc6e7568618c50137881e4af73010a SHA512 1ad9b65b403f6a920035bcb29c60c0af7688767ae2bab16dc5453fe436ea8240149c5222f26cb5df86d37a41416696320c51da33cb72fbb26db46a8b947bce28 WHIRLPOOL cbfeea4aa6109e94d7febff6e8fa00ae6cce809545b240b18c9278b1fe0cf0bdfbcc3223c27411a77c5077ba8b8f89719191cb66baf17607cb318b431aac5900
+EBUILD virtualgl-2.3.1-r1.ebuild 2980 SHA256 8c3c0693ba178a34bf2951f62214e93c426aef026d5f80ead5627d7d96d04aeb SHA512 80d33a32c80a84b4c271bced76431b3757ca7393e3f206931959a47402eb5a499022815399aa3d222403292aadea0e2e9cd9e0fb95ccf719c6a8c809241d071a WHIRLPOOL 7c5faee575f8024876842fdcaaa85b51b4d65491e32e2e960a6d30666078bfb8390250a14d15df150f466ce540515cd512f4498e0a4f01fd043f9f7dca894b87
+MISC ChangeLog 1502 SHA256 a62fa7ace8563c9e9ca65fc53a250fa7374523257c7413fd85609edbcdeb3278 SHA512 4368e1132e648b89e37d45fc9cae92229e56774b37b6ffc125be56e7cc456b1202999e2046fbbbd03c80b87bb401ff493bb7386f40a6668c256c1d29c62559cb WHIRLPOOL f57e0a72d10bda65cf3fb80ec6edde28731fbd00962f6b1f6a384bfd6323074e6d73bba9ba89e94c5c832bf6d432806098996c66a29823a25038a2b22cc98d58
 MISC metadata.xml 592 SHA256 d115cb675b59d6f8d0f0ced456d815f81ce7e56f19f0b82ba267323d2a69c163 SHA512 104d1a756f73ca0557231fc16cf7411c1105df73ff58ab37dfd8a460a9bb9c07b045865b63d38580f4490dbf8c1d555c1dd8cd9f77968a835815f0eef2dd9e4a WHIRLPOOL b8510aa2aecbea8f25cce5e4d5f4863f4acaa450f623e4b8f7dc538cd7555b9f6c8184aef753f71a6d2bf0022c0dd87ebf697de24192a3556647c2ba97b81cda
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBTkv8ACgkQCaWpQKGI+9TiSgCdFZXGUM+uMpN1C7WKF/23b2yB
-e8sAn2UaVG19lTvueRmuJtL/AGS+NKZP
-=C3Mb
+iEYEAREIAAYFAlBmwFsACgkQCaWpQKGI+9RR3wCfYpCcQNlXDVvPHgiiDni1wFwB
+vV4An2j68F3reR0ZjJ55EwOrp8oznWPx
+=SywO
 -----END PGP SIGNATURE-----
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