[gentoo-commits] gentoo-x86 commit in app-emulation/virtualbox-ose/files: virtualbox-ose.desktop virtualbox-ose-1-wrapper virtualbox-ose-1-config virtualbox-ose-2-wrapper virtualbox-ose-2-config virtualbox-ose-2-localconfig virtualbox-ose-2.0.2-config virtualbox-ose-2.0.2-localconfig virtualbox-ose-2.0.2-wrapper virtualbox-ose-1.6.4-remove-unused.patch virtualbox-ose-config virtualbox-ose-wrapper virtualbox-ose-1.6.4-fix-missing-makefiles.patch

[Markus Ullmann (jokey)]

jokey       08/10/27 17:19:20

  Modified:             virtualbox-ose.desktop
  Added:                virtualbox-ose-1-wrapper virtualbox-ose-1-config
                        virtualbox-ose-2-wrapper virtualbox-ose-2-config
                        virtualbox-ose-2-localconfig
  Removed:              virtualbox-ose-2.0.2-config
                        virtualbox-ose-2.0.2-localconfig
                        virtualbox-ose-2.0.2-wrapper
                        virtualbox-ose-1.6.4-remove-unused.patch
                        virtualbox-ose-config virtualbox-ose-wrapper
                        virtualbox-ose-1.6.4-fix-missing-makefiles.patch
  Log:
  (Proxy commit) Version bump
  (Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 i686)

Revision  Changes    Path
1.2                  app-emulation/virtualbox-ose/files/virtualbox-ose.desktop

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-ose/files/virtualbox-ose.desktop?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-ose/files/virtualbox-ose.desktop?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-ose/files/virtualbox-ose.desktop?r1=1.1&r2=1.2

Index: virtualbox-ose.desktop
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/files/virtualbox-ose.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- virtualbox-ose.desktop	27 Aug 2008 12:39:00 -0000	1.1
+++ virtualbox-ose.desktop	27 Oct 2008 17:19:20 -0000	1.2
@@ -4,5 +4,5 @@
 Comment=Run several virtual systems on a single host computer
 Exec=VirtualBox
 TryExec=VirtualBox
-Icon=virtualbox
+Icon=virtualbox-ose
 Categories=System;Emulator;



1.1                  app-emulation/virtualbox-ose/files/virtualbox-ose-1-wrapper

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-ose/files/virtualbox-ose-1-wrapper?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-ose/files/virtualbox-ose-1-wrapper?rev=1.1&content-type=text/plain

Index: virtualbox-ose-1-wrapper
===================================================================
#!/bin/sh
#
# Sun xVM VirtualBox
#
# Copyright (C) 2006-2007 Sun Microsystems, Inc.
#
# This file is part of VirtualBox Open Source Edition (OSE), as
# available from http://www.virtualbox.org. This file is free software;
# you can redistribute it and/or modify it under the terms of the GNU
# General Public License (GPL) as published by the Free Software
# Foundation, in version 2 as it comes in the "COPYING" file of the
# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
#
# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
# Clara, CA 95054 USA or visit http://www.sun.com if you need
# additional information or have any questions.
#

PATH="/usr/bin:/bin:/usr/sbin:/sbin"
CONFIG="/etc/vbox/vbox.cfg"

if [ ! -r "$CONFIG" ]; then
    echo "Could not find VirtualBox installation. Please reinstall."
    exit 1
fi

. "$CONFIG"

# Note: This script must not fail if the module was not successfully installed
#       because the user might not want to run a VM but only change VM params!

if [ "$1" = "shutdown" ]; then
    SHUTDOWN="true"
elif [ ! -e /lib/modules/`uname -r`/misc/vboxdrv.ko ]; then
	cat << EOF
WARNING: There is no module available for the current kernel (`uname -r`).
         Please recompile the kernel module and install it by:
	
	 sudo emerge -1 app-emulation/virtualbox-modules

	 You will not be able to start VMs until this problem is fixed.
EOF
elif ! lsmod|grep -q vboxdrv; then
    cat << EOF
WARNING: The vboxdrv kernel module is not loaded.
         Please load the kernel module by:

           sudo modprobe vboxdrv

         You will not be able to start VMs until this problem is fixed.
EOF
elif [ ! -c /dev/vboxdrv ]; then
    cat << EOF
WARNING: The character device /dev/vboxdrv does not exist.
	 Please try to reload the kernel module by:

           sudo rmmod vboxdrv; sleep 2; sudo modprobe vboxdrv

         and if that is not successful, try to re-install the package by:

	   sudo emerge -1 app-emulation/virtualbox-modules

	 You will not be able to start VMs until this problem is fixed.
EOF
elif [ ! -w /dev/vboxdrv ]; then
    if [ "`id | grep vboxusers`" = "" ]; then
        cat << EOF
WARNING: You are not a member of the "vboxusers" group.
	 Please add yourself to this group before starting VirtualBox.

	 You will not be able to start VMs until this problem is fixed.
EOF
    else
        cat << EOF
WARNING: /dev/vboxdrv not writable for some reason.
	 If you recently added the current user to the "vboxusers" group
	 then you have to logout and re-login to take the change effect.

	 You will not be able to start VMs until this problem is fixed.
EOF
    fi
elif [ ! -e /usr/lib/libhal.so ]; then
	cat << EOF
WARNING: libhal was not found on this system.
	 This can create several side effects thus problems,
	 when accessing host resources (eg: Cd/Dvd readers).

	 The use of "sys-apps/hal" is still recommended, please install it
	 to meet this requirement by:

	 	sudo emerge sys-apps/hal
EOF
fi

export LD_LIBRARY_PATH="$INSTALL_DIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"

SERVER_PID=`ps -U \`whoami\` | grep VBoxSVC | awk '{ print $1 }'`
if [ -z "$SERVER_PID" ]; then
    # Server not running yet/anymore, cleanup socket path.
    # See IPC_GetDefaultSocketPath()!
    if [ -n "$LOGNAME" ]; then
        rm -rf /tmp/.vbox-$LOGNAME-ipc > /dev/null 2>&1
    else
        rm -rf /tmp/.vbox-$USER-ipc > /dev/null 2>&1
    fi
fi

if [ "$SHUTDOWN" = "true" ]; then
    if [ -n "$SERVER_PID" ]; then
        kill -TERM $SERVER_PID
        sleep 2
    fi
    exit 0
fi

APP=`which $0`
APP=`basename $APP`
APP=${APP##/*/}
case "$APP" in
  VirtualBox)
    exec "$INSTALL_DIR/VirtualBox" "$@"
    ;;
  VBoxManage)
    exec "$INSTALL_DIR/VBoxManage" "$@"
    ;;
  VBoxSDL)
    exec "$INSTALL_DIR/VBoxSDL" "$@"
    ;;
  VBoxVRDP)
    exec "$INSTALL_DIR/VBoxHeadless" "$@"
    ;;
  VBoxHeadless)
    exec "$INSTALL_DIR/VBoxHeadless" "$@"
    ;;
  *)
    echo "Unknown application - $APP"
    ;;
esac



1.1                  app-emulation/virtualbox-ose/files/virtualbox-ose-1-config

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-ose/files/virtualbox-ose-1-config?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-ose/files/virtualbox-ose-1-config?rev=1.1&content-type=text/plain

Index: virtualbox-ose-1-config
===================================================================
INSTALL_DIR=/opt/VirtualBox



1.1                  app-emulation/virtualbox-ose/files/virtualbox-ose-2-wrapper

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-ose/files/virtualbox-ose-2-wrapper?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-ose/files/virtualbox-ose-2-wrapper?rev=1.1&content-type=text/plain

Index: virtualbox-ose-2-wrapper
===================================================================
#!/bin/sh
#
# Sun xVM VirtualBox
#
# Copyright (C) 2006-2007 Sun Microsystems, Inc.
#
# This file is part of VirtualBox Open Source Edition (OSE), as
# available from http://www.virtualbox.org. This file is free software;
# you can redistribute it and/or modify it under the terms of the GNU
# General Public License (GPL) as published by the Free Software
# Foundation, in version 2 as it comes in the "COPYING" file of the
# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
#
# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
# Clara, CA 95054 USA or visit http://www.sun.com if you need
# additional information or have any questions.
#

PATH="/usr/bin:/bin:/usr/sbin:/sbin"
CONFIG="/etc/vbox/vbox.cfg"

if [ ! -r "$CONFIG" ]; then
    echo "Could not find VirtualBox installation. Please reinstall."
    exit 1
fi

. "$CONFIG"

# Note: This script must not fail if the module was not successfully installed
#       because the user might not want to run a VM but only change VM params!

if [ "$1" = "shutdown" ]; then
    SHUTDOWN="true"
elif ! lsmod|grep -q vboxdrv; then
    cat << EOF
WARNING: The vboxdrv kernel module is not loaded.
         Please load the kernel module by:

           sudo modprobe vboxdrv

         You will not be able to start VMs until this problem is fixed.
EOF
elif [ ! -c /dev/vboxdrv ]; then
    cat << EOF
WARNING: The character device /dev/vboxdrv does not exist.
         Please try to reload the kernel module by:

           sudo rmmod vboxdrv; sleep 2; sudo modprobe vboxdrv

         and if that is not successful, try to re-install the package by:

           sudo emerge -1 app-emulation/virtualbox-modules

         You will not be able to start VMs until this problem is fixed.
EOF
fi

SERVER_PID=`ps -U \`whoami\` | grep VBoxSVC | awk '{ print $1 }'`
if [ -z "$SERVER_PID" ]; then
    # Server not running yet/anymore, cleanup socket path.
    # See IPC_GetDefaultSocketPath()!
    if [ -n "$LOGNAME" ]; then
        rm -rf /tmp/.vbox-$LOGNAME-ipc > /dev/null 2>&1
    else
        rm -rf /tmp/.vbox-$USER-ipc > /dev/null 2>&1
    fi
fi

if [ "$SHUTDOWN" = "true" ]; then
    if [ -n "$SERVER_PID" ]; then
        kill -TERM $SERVER_PID
        sleep 2
    fi
    exit 0
fi

APP=`which $0`
APP=`basename $APP`
APP=${APP##/*/}
case "$APP" in
  VirtualBox)
    exec "$INSTALL_DIR/VirtualBox" "$@"
    ;;
  VBoxManage)
    exec "$INSTALL_DIR/VBoxManage" "$@"
    ;;
  VBoxSDL)
    exec "$INSTALL_DIR/VBoxSDL" "$@"
    ;;
  VBoxVRDP)
    exec "$INSTALL_DIR/VBoxHeadless" "$@"
    ;;
  VBoxHeadless)
    exec "$INSTALL_DIR/VBoxHeadless" "$@"
    ;;
  *)
    echo "Unknown application - $APP"
    ;;
esac



1.1                  app-emulation/virtualbox-ose/files/virtualbox-ose-2-config

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-ose/files/virtualbox-ose-2-config?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-ose/files/virtualbox-ose-2-config?rev=1.1&content-type=text/plain

Index: virtualbox-ose-2-config
===================================================================
INSTALL_DIR=/usr/MY_LIBDIR/virtualbox-ose



1.1                  app-emulation/virtualbox-ose/files/virtualbox-ose-2-localconfig

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-ose/files/virtualbox-ose-2-localconfig?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/virtualbox-ose/files/virtualbox-ose-2-localconfig?rev=1.1&content-type=text/plain

Index: virtualbox-ose-2-localconfig
===================================================================
# -*- Makefile -*-
#
# Overwrite some default kBuild settings
#

#
# Copyright (C) 2006-2008 Sun Microsystems, Inc.
#
# This file is part of VirtualBox Open Source Edition (OSE), as
# available from http://www.virtualbox.org. This file is free software;
# you can redistribute it and/or modify it under the terms of the GNU
# General Public License as published by the Free Software Foundation,
# in version 2 as it comes in the "COPYING" file of the VirtualBox OSE
# distribution. VirtualBox OSE is distributed in the hope that it will
# be useful, but WITHOUT ANY WARRANTY of any kind.
#

# shut up wine complaining about unknown locale
EXEC_X86_WIN32          := wine

# don't build testcases to save time, they are not needed for the package
VBOX_WITH_TESTCASES     :=
VBOX_WITH_TESTSUITE     :=
VBOX_DOCBOOK_WITH_LATEX := 1

KBUILD_MSG_STYLE        := brief

## paths, origin, hardening
VBOX_WITH_HARDENING        := 1
VBOX_WITH_ORIGIN           :=
VBOX_PATH_APP_PRIVATE_ARCH := /usr/MY_LIBDIR/virtualbox-ose
VBOX_PATH_SHARED_LIBS      := $(VBOX_PATH_APP_PRIVATE_ARCH)
VBOX_WITH_RUNPATH          := $(VBOX_PATH_APP_PRIVATE_ARCH)
VBOX_PATH_APP_PRIVATE      := /usr/share/virtualbox-ose
VBOX_PATH_APP_DOCS          = $(VBOX_PATH_PACKAGE_DOCS)

## don't build unwanted/splitted stuff
VBOX_WITHOUT_ADDITIONS := 1
VBOX_WITH_VBOXDRV :=
VBOX_WITH_VBOXBFE :=
VBOX_WITH_KCHMVIEWER :=