diff options
| author |   Markus Ullmann <jokey@gentoo.org> | 2007-10-07 22:01:12 +0000 |
|---|---|---|
| committer | Markus Ullmann <jokey@gentoo.org> | 2007-10-07 22:01:12 +0000 |
| commit | ed55d292a6d6185e05143b0a608b042e5383bf66 (patch) | |
| tree | ad244f0968ddaf40ba5b72894767e11c9eed3d30 /app-emulation | |
| parent | add blockers for virtualbox-additions bug #194183, thanks to Alessio (diff) | |
| download | gentoo-2-ed55d292a6d6185e05143b0a608b042e5383bf66.tar.gz gentoo-2-ed55d292a6d6185e05143b0a608b042e5383bf66.tar.bz2 gentoo-2-ed55d292a6d6185e05143b0a608b042e5383bf66.zip | |
add blockers for virtualbox-additions bug #194183, thanks to Alessio
(Portage version: 2.1.3.12)
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/virtualbox-bin/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper | 8 | ||||
| -rw-r--r-- | app-emulation/virtualbox-bin/virtualbox-bin-1.5.0-r1.ebuild | 3 |
3 files changed, 11 insertions, 6 deletions
diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog index 2d18d1010cf5..2b18b53ec44d 100644 --- a/app-emulation/virtualbox-bin/ChangeLog +++ b/app-emulation/virtualbox-bin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/virtualbox-bin # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.14 2007/09/17 09:48:47 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.15 2007/10/07 22:01:12 jokey Exp $ + + 07 Oct 2007; Markus Ullmann <jokey@gentoo.org> + files/virtualbox-bin-wrapper, virtualbox-bin-1.5.0-r1.ebuild: + add blockers for virtualbox-additions bug #194183, thanks to Alessio *virtualbox-bin-1.5.0-r1 (17 Sep 2007) diff --git a/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper b/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper index 79c4e3d3df53..f92b67f639cd 100644 --- a/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper +++ b/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper @@ -13,12 +13,12 @@ if [ "$1" = shutdown ]; then exit 0 fi -[ "$VBOX_USER_HOME" = "" ] && VBOX_USER_HOME="$HOME/.VirtualBox" +[ -z "$VBOX_USER_HOME" ] && VBOX_USER_HOME="$HOME/.VirtualBox" mkdir -p "$VBOX_USER_HOME" LOG="$VBOX_USER_HOME/VBoxSVC.log" -if [[ -e /proc/modules && ! -e /dev/vboxdrv ]] ; then +if [ -e /proc/modules -a ! -e /dev/vboxdrv ] ; then echo "Error: vboxdrv kernel module is not loaded..." echo "Please load the module before starting VirtualBox." exit 1 @@ -36,7 +36,7 @@ fi export LD_LIBRARY_PATH="$INSTALL_DIR" -if [ "$SERVER_PID" = "" ]; then +if [ -z "$SERVER_PID" ]; then rm -rf /tmp/.vbox-$USER-ipc [ -f "$LOG.1" ] && mv "$LOG.1" "$LOG.2" [ -f "$LOG.0" ] && mv "$LOG.0" "$LOG.1" @@ -44,7 +44,7 @@ if [ "$SERVER_PID" = "" ]; then /opt/VirtualBox/VBoxSVC --daemonize >"$LOG" 2>&1 fi -APP=$( which $0 ) +APP=$( command -v "$0" ) APP=${APP##/*/} case "$APP" in virtualbox) diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-1.5.0-r1.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-1.5.0-r1.ebuild index 344fe9283543..e2490c0f4ab5 100644 --- a/app-emulation/virtualbox-bin/virtualbox-bin-1.5.0-r1.ebuild +++ b/app-emulation/virtualbox-bin/virtualbox-bin-1.5.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-1.5.0-r1.ebuild,v 1.1 2007/09/17 09:48:47 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-1.5.0-r1.ebuild,v 1.2 2007/10/07 22:01:12 jokey Exp $ inherit eutils qt3 pax-utils @@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~x86" IUSE="additions nowrapper sdk" RDEPEND="!app-emulation/virtualbox + !app-emulation/virtualbox-additions ~app-emulation/virtualbox-modules-${PV} virtual/xft x11-libs/libXi |