diff options
| author |   Andrew Savchenko <bircoph@gentoo.org> | 2015-01-14 16:55:15 +0000 |
|---|---|---|
| committer | Andrew Savchenko <bircoph@gentoo.org> | 2015-01-14 16:55:15 +0000 |
| commit | e5dedb38c9561103565fbb4e28f0fc8195ae0248 (patch) | |
| tree | 8cdb578fe1c6839a5d113c0bb5d077db8026caf7 /x11-misc | |
| parent | Version bump (diff) | |
| download | gentoo-2-e5dedb38c9561103565fbb4e28f0fc8195ae0248.tar.gz gentoo-2-e5dedb38c9561103565fbb4e28f0fc8195ae0248.tar.bz2 gentoo-2-e5dedb38c9561103565fbb4e28f0fc8195ae0248.zip | |
Fix bug 536284
Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 565953B95372756C)
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/virtualgl/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/virtualgl/files/vgl.initd-r1 | 30 | ||||
| -rw-r--r-- | x11-misc/virtualgl/virtualgl-2.3.3.ebuild | 5 |
3 files changed, 9 insertions, 32 deletions
diff --git a/x11-misc/virtualgl/ChangeLog b/x11-misc/virtualgl/ChangeLog index a69f5eeec4b2..9298612c88ec 100644 --- a/x11-misc/virtualgl/ChangeLog +++ b/x11-misc/virtualgl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/virtualgl # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/ChangeLog,v 1.23 2015/01/10 13:50:26 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/ChangeLog,v 1.24 2015/01/14 16:55:15 bircoph Exp $ + + 14 Jan 2015; Andrew Savchenko <bircoph@gentoo.org> virtualgl-2.3.3.ebuild, + -files/vgl.initd-r1: + Remove license files (bug 536284). Remove unused init.d file. 10 Jan 2015; Pacho Ramos <pacho@gentoo.org> virtualgl-2.3.3.ebuild: Fix deps (#504134 by Matthew Schultz and Eternal Sorrow) diff --git a/x11-misc/virtualgl/files/vgl.initd-r1 b/x11-misc/virtualgl/files/vgl.initd-r1 deleted file mode 100644 index b079a35311bc..000000000000 --- a/x11-misc/virtualgl/files/vgl.initd-r1 +++ /dev/null @@ -1,30 +0,0 @@ -#!/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.2 2012/09/29 09:33:10 pacho Exp $ - -# TODO: description="*" and other OpenRC 0.9+ candies - -depend() { - need xdm - after sshd -} - -start() { - ebegin "Starting VirtualGL" - 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 /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 /var/lib/VirtualGL/vgl_xauth_key ] && \ - rm /var/lib/VirtualGL/vgl_xauth_key - eend $? -} diff --git a/x11-misc/virtualgl/virtualgl-2.3.3.ebuild b/x11-misc/virtualgl/virtualgl-2.3.3.ebuild index 686f5143392b..1b1b7727ef39 100644 --- a/x11-misc/virtualgl/virtualgl-2.3.3.ebuild +++ b/x11-misc/virtualgl/virtualgl-2.3.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/virtualgl-2.3.3.ebuild,v 1.5 2015/01/10 13:50:26 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/virtualgl/virtualgl-2.3.3.ebuild,v 1.6 2015/01/14 16:55:15 bircoph Exp $ EAPI=5 inherit cmake-multilib multilib systemd @@ -90,4 +90,7 @@ src_install() { # Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs mv "${D}"/usr/bin/{,v}glxinfo || die + + # Remove license files, bug 536284 + rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die } |