Version bump. Removed old versions.
authorLars Wendler <polynomial-c@gentoo.org>
Thu, 20 May 2010 13:09:08 +0000 (13:09 +0000)
committerLars Wendler <polynomial-c@gentoo.org>
Thu, 20 May 2010 13:09:08 +0000 (13:09 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

26 files changed:
app-emulation/virtualbox-bin/ChangeLog
app-emulation/virtualbox-bin/files/virtualbox-bin-1-wrapper [deleted file]
app-emulation/virtualbox-bin/files/virtualbox-bin-2-wrapper [deleted file]
app-emulation/virtualbox-bin/virtualbox-bin-3.1.0.ebuild [deleted file]
app-emulation/virtualbox-bin/virtualbox-bin-3.1.2.ebuild [deleted file]
app-emulation/virtualbox-bin/virtualbox-bin-3.1.4.ebuild [deleted file]
app-emulation/virtualbox-bin/virtualbox-bin-3.2.0.ebuild [moved from app-emulation/virtualbox-bin/virtualbox-bin-3.1.4-r1.ebuild with 98% similarity]
app-emulation/virtualbox-modules/ChangeLog
app-emulation/virtualbox-modules/virtualbox-modules-3.2.0.ebuild [new file with mode: 0644]
app-emulation/virtualbox-ose-additions/ChangeLog
app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-3.1.0.ebuild [deleted file]
app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-3.1.4.ebuild [deleted file]
app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-3.2.0.ebuild [moved from app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-3.1.2.ebuild with 90% similarity]
app-emulation/virtualbox-ose/ChangeLog
app-emulation/virtualbox-ose/files/virtualbox-ose-1-config [deleted file]
app-emulation/virtualbox-ose/files/virtualbox-ose-1-wrapper [deleted file]
app-emulation/virtualbox-ose/files/virtualbox-ose-1.6.6-remove-unused.patch [deleted file]
app-emulation/virtualbox-ose/files/virtualbox-ose-2-config [deleted file]
app-emulation/virtualbox-ose/files/virtualbox-ose-2-localconfig [deleted file]
app-emulation/virtualbox-ose/files/virtualbox-ose-2-wrapper [deleted file]
app-emulation/virtualbox-ose/files/virtualbox-ose-3.0.8-without-hal-fix.patch [deleted file]
app-emulation/virtualbox-ose/files/virtualbox-ose-3.2.0-mesa-check.patch [new file with mode: 0644]
app-emulation/virtualbox-ose/files/virtualbox-ose-fix-insecure-lockfiles.patch [deleted file]
app-emulation/virtualbox-ose/virtualbox-ose-3.1.0.ebuild [deleted file]
app-emulation/virtualbox-ose/virtualbox-ose-3.1.4.ebuild [deleted file]
app-emulation/virtualbox-ose/virtualbox-ose-3.2.0.ebuild [moved from app-emulation/virtualbox-ose/virtualbox-ose-3.1.2.ebuild with 96% similarity]

index 5d862a1ea1f74a2e566243a8b9a3c8144cf843e7..88fe4c0414a308f126768da55ea42fd63fbc6bcf 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virtualbox-bin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.77 2010/05/10 13:21:17 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.78 2010/05/20 13:07:22 polynomial-c Exp $
+
+*virtualbox-bin-3.2.0 (20 May 2010)
+
+  20 May 2010; Lars Wendler <polynomial-c@gentoo.org>
+  +virtualbox-bin-3.2.0.ebuild:
+  Version bump. removed old versions.
 
 *virtualbox-bin-3.1.8 (10 May 2010)
 
diff --git a/app-emulation/virtualbox-bin/files/virtualbox-bin-1-wrapper b/app-emulation/virtualbox-bin/files/virtualbox-bin-1-wrapper
deleted file mode 100644 (file)
index 3dbfce6..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/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
-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" "$@"
-    ;;
-  vboxwebsrv)
-    exec "$INSTALL_DIR/vboxwebsrv" "$@"
-    ;;
-  *)
-    echo "Unknown application - $APP"
-    ;;
-esac
diff --git a/app-emulation/virtualbox-bin/files/virtualbox-bin-2-wrapper b/app-emulation/virtualbox-bin/files/virtualbox-bin-2-wrapper
deleted file mode 100755 (executable)
index 3888750..0000000
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/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
-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" "$@"
-    ;;
-  vboxwebsrv)
-    exec "$INSTALL_DIR/vboxwebsrv" "$@"
-    ;;
-  *)
-    echo "Unknown application - $APP"
-    ;;
-esac
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-3.1.0.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-3.1.0.ebuild
deleted file mode 100644 (file)
index cfc6a8e..0000000
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-3.1.0.ebuild,v 1.1 2009/12/02 20:36:52 patrick Exp $
-
-EAPI=2
-
-inherit eutils fdo-mime pax-utils
-
-MY_PV=${PV}-55467
-MY_P=VirtualBox-${MY_PV}-Linux
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_amd64.run )
-       x86? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_x86.run )
-       sdk? ( http://download.virtualbox.org/virtualbox/${PV}/VirtualBoxSDK-${MY_PV}.zip )"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+additions +chm headless python sdk vboxwebsrv"
-RESTRICT="mirror"
-PROPERTIES="interactive"
-
-RDEPEND="!!app-emulation/virtualbox-ose
-       !app-emulation/virtualbox-ose-additions
-       ~app-emulation/virtualbox-modules-${PV}
-       !headless? (
-               x11-libs/libXcursor
-               media-libs/libsdl[X]
-               x11-libs/libXrender
-               x11-libs/libXfixes
-               media-libs/libpng
-               x11-libs/libXi
-               x11-libs/libXrandr
-               x11-libs/libXinerama
-               x11-libs/libXft
-               media-libs/freetype
-               media-libs/fontconfig
-               x11-libs/libXext
-               dev-libs/glib
-               chm? ( dev-libs/expat )
-       )
-       x11-libs/libXt
-       dev-libs/libxml2
-       x11-libs/libXau
-       x11-libs/libX11
-       x11-libs/libSM
-       x11-libs/libICE
-       x11-libs/libXdmcp
-       python? ( dev-lang/python )"
-
-S=${WORKDIR}
-
-QA_TEXTRELS_amd64="opt/VirtualBox/VBoxVMM.so"
-QA_TEXTRELS_x86="opt/VirtualBox/VBoxGuestPropSvc.so
-       opt/VirtualBox/VBoxSDL.so
-       opt/VirtualBox/VBoxPython2_4.so
-       opt/VirtualBox/VBoxPython2_6.so
-       opt/VirtualBox/VBoxDbg.so
-       opt/VirtualBox/VBoxSharedFolders.so
-       opt/VirtualBox/VBoxDD2.so
-       opt/VirtualBox/VBoxOGLrenderspu.so
-       opt/VirtualBox/VBoxPython.so
-       opt/VirtualBox/VBoxPython2_3.so
-       opt/VirtualBox/VBoxDD.so
-       opt/VirtualBox/VBoxVRDP.so
-       opt/VirtualBox/VBoxDDU.so
-       opt/VirtualBox/VBoxREM64.so
-       opt/VirtualBox/VBoxSharedClipboard.so
-       opt/VirtualBox/VBoxHeadless.so
-       opt/VirtualBox/VBoxRT.so
-       opt/VirtualBox/VRDPAuth.so
-       opt/VirtualBox/VBoxREM.so
-       opt/VirtualBox/VBoxSettings.so
-       opt/VirtualBox/VBoxKeyboard.so
-       opt/VirtualBox/VBoxSharedCrOpenGL.so
-       opt/VirtualBox/VBoxVMM.so
-       opt/VirtualBox/VirtualBox.so
-       opt/VirtualBox/VBoxOGLhosterrorspu.so
-       opt/VirtualBox/components/VBoxC.so
-       opt/VirtualBox/components/VBoxSVCM.so
-       opt/VirtualBox/VBoxREM32.so
-       opt/VirtualBox/VBoxPython2_5.so
-       opt/VirtualBox/VBoxXPCOMC.so
-       opt/VirtualBox/VBoxOGLhostcrutil.so
-       opt/VirtualBox/VBoxNetDHCP.so"
-QA_PRESTRIPPED="opt/VirtualBox/VBoxDD.so
-       opt/VirtualBox/VBoxDD2.so
-       opt/VirtualBox/VBoxDDU.so
-       opt/VirtualBox/VBoxDbg.so
-       opt/VirtualBox/VBoxGuestPropSvc.so
-       opt/VirtualBox/VBoxHeadless
-       opt/VirtualBox/VBoxHeadless.so
-       opt/VirtualBox/VBoxKeyboard.so
-       opt/VirtualBox/VBoxManage
-       opt/VirtualBox/VBoxNetAdpCtl
-       opt/VirtualBox/VBoxNetDHCP
-       opt/VirtualBox/VBoxNetDHCP.so
-       opt/VirtualBox/VBoxOGLhostcrutil.so
-       opt/VirtualBox/VBoxOGLhosterrorspu.so
-       opt/VirtualBox/VBoxOGLrenderspu.so
-       opt/VirtualBox/VBoxPython.so
-       opt/VirtualBox/VBoxPython2_3.so
-       opt/VirtualBox/VBoxPython2_4.so
-       opt/VirtualBox/VBoxPython2_5.so
-       opt/VirtualBox/VBoxPython2_6.so
-       opt/VirtualBox/VBoxREM.so
-       opt/VirtualBox/VBoxREM32.so
-       opt/VirtualBox/VBoxREM64.so
-       opt/VirtualBox/VBoxRT.so
-       opt/VirtualBox/VBoxSDL
-       opt/VirtualBox/VBoxSDL.so
-       opt/VirtualBox/VBoxSVC
-       opt/VirtualBox/VBoxSettings.so
-       opt/VirtualBox/VBoxSharedClipboard.so
-       opt/VirtualBox/VBoxSharedCrOpenGL.so
-       opt/VirtualBox/VBoxSharedFolders.so
-       opt/VirtualBox/VBoxTestOGL
-       opt/VirtualBox/VBoxTunctl
-       opt/VirtualBox/VBoxVMM.so
-       opt/VirtualBox/VBoxVRDP.so
-       opt/VirtualBox/VBoxXPCOM.so
-       opt/VirtualBox/VBoxXPCOMC.so
-       opt/VirtualBox/VBoxXPCOMIPCD
-       opt/VirtualBox/VRDPAuth.so
-       opt/VirtualBox/VirtualBox
-       opt/VirtualBox/VirtualBox.so
-       opt/VirtualBox/accessible/libqtaccessiblewidgets.so
-       opt/VirtualBox/components/VBoxC.so
-       opt/VirtualBox/components/VBoxSVCM.so
-       opt/VirtualBox/components/VBoxXPCOMIPCC.so
-       opt/VirtualBox/kchmviewer
-       opt/VirtualBox/libQtCoreVBox.so.4
-       opt/VirtualBox/libQtGuiVBox.so.4
-       opt/VirtualBox/libQtNetworkVBox.so.4
-       opt/VirtualBox/libQtOpenGLVBox.so.4
-       opt/VirtualBox/vboxwebsrv"
-
-pkg_setup() {
-       # We cannot mirror VirtualBox PUEL licensed files see:
-       # http://www.virtualbox.org/wiki/Licensing_FAQ
-       check_license
-}
-
-src_unpack() {
-       unpack_makeself ${MY_P}_${ARCH}.run
-       unpack ./VirtualBox.tar.bz2
-
-       if use sdk; then
-               unpack VirtualBoxSDK-${MY_PV}.zip
-       fi
-}
-
-src_install() {
-       # create virtualbox configurations files
-       insinto /etc/vbox
-       newins "${FILESDIR}/${PN}-config" vbox.cfg
-
-       if ! use headless ; then
-               newicon VBox.png ${PN}.png
-               newmenu "${FILESDIR}"/${PN}.desktop ${PN}.desktop
-       fi
-
-       insinto /opt/VirtualBox
-       dodir /opt/bin
-
-       doins UserManual.pdf
-
-       if use sdk ; then
-               doins -r sdk || die
-       fi
-
-       if use additions; then
-               doins -r additions || die
-       fi
-
-       if use vboxwebsrv; then
-               doins vboxwebsrv || die
-               fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
-               fperms 0750 /opt/VirtualBox/vboxwebsrv
-               dosym /opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
-               newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-               newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-       fi
-
-       if ! use headless && use chm; then
-               doins kchmviewer VirtualBox.chm || die
-               fowners root:vboxusers /opt/VirtualBox/kchmviewer
-               fperms 0750 /opt/VirtualBox/kchmviewer
-       fi
-
-       if use python; then
-               if has_version "=dev-lang/python-2.4*"; then
-                       doins VBoxPython2_4.so || die
-               fi
-
-               if has_version "=dev-lang/python-2.5*"; then
-                       doins VBoxPython2_5.so || die
-               fi
-
-               if has_version "=dev-lang/python-2.6*"; then
-                       doins VBoxPython2_6.so || die
-               fi
-       fi
-
-       rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
-               vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
-               VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
-               webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
-               90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
-               VBoxPython2_*.so
-
-       if use headless ; then
-               rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
-       fi
-
-       doins -r * || die
-
-       # create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
-       dosym /opt/VirtualBox/VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
-       dosym /opt/VirtualBox/VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
-       dosym /opt/VirtualBox/VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
-       dosym /opt/VirtualBox/VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
-       dosym /opt/VirtualBox/VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
-
-       local each
-       for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,TestOGL}; do
-               fowners root:vboxusers /opt/VirtualBox/${each}
-               fperms 0750 /opt/VirtualBox/${each}
-               pax-mark -m "${D}"/opt/VirtualBox/${each}
-       done
-       # VBoxNetAdpCtl binary needs to be suid root in any case..
-       fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
-
-       if ! use headless ; then
-               # Hardened build: Mark selected binaries set-user-ID-on-execution
-               for each in VBox{SDL,Headless} VirtualBox; do
-                       fowners root:vboxusers /opt/VirtualBox/${each}
-                       fperms 4510 /opt/VirtualBox/${each}
-                       pax-mark -m "${D}"/opt/VirtualBox/${each}
-               done
-
-               dosym /opt/VirtualBox/VBox.sh /opt/bin/VirtualBox
-               dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxSDL
-       else
-               # Hardened build: Mark selected binaries set-user-ID-on-execution
-               fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
-               fperms 4510 /opt/VirtualBox/VBoxHeadless
-               pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
-       fi
-
-       exeinto /opt/VirtualBox
-       newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh" || die
-       fowners root:vboxusers /opt/VirtualBox/VBox.sh
-       fperms 0750 /opt/VirtualBox/VBox.sh
-
-       dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxManage
-       dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxVRDP
-       dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxHeadless
-       dosym /opt/VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
-}
-
-pkg_postinst() {
-       fdo-mime_desktop_database_update
-       elog ""
-       if ! use headless ; then
-               elog "To launch VirtualBox just type: \"VirtualBox\""
-               elog ""
-       fi
-       elog "You must be in the vboxusers group to use VirtualBox."
-       elog ""
-       elog "For advanced networking setups you should emerge:"
-       elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-}
-
-pkg_postrm() {
-       fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-3.1.2.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-3.1.2.ebuild
deleted file mode 100644 (file)
index 14cf8a1..0000000
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-3.1.2.ebuild,v 1.1 2010/01/28 13:11:47 patrick Exp $
-
-EAPI=2
-
-inherit eutils fdo-mime pax-utils
-
-MY_PV=${PV}-56127
-MY_P=VirtualBox-${MY_PV}-Linux
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_amd64.run )
-       x86? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_x86.run )
-       sdk? ( http://download.virtualbox.org/virtualbox/${PV}/VirtualBoxSDK-${MY_PV}.zip )"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+additions +chm headless python sdk vboxwebsrv"
-RESTRICT="mirror"
-PROPERTIES="interactive"
-
-RDEPEND="!!app-emulation/virtualbox-ose
-       !app-emulation/virtualbox-ose-additions
-       ~app-emulation/virtualbox-modules-${PV}
-       !headless? (
-               x11-libs/libXcursor
-               media-libs/libsdl[X]
-               x11-libs/libXrender
-               x11-libs/libXfixes
-               media-libs/libpng
-               x11-libs/libXi
-               x11-libs/libXrandr
-               x11-libs/libXinerama
-               x11-libs/libXft
-               media-libs/freetype
-               media-libs/fontconfig
-               x11-libs/libXext
-               dev-libs/glib
-               chm? ( dev-libs/expat )
-       )
-       x11-libs/libXt
-       dev-libs/libxml2
-       x11-libs/libXau
-       x11-libs/libX11
-       x11-libs/libXmu
-       x11-libs/libSM
-       x11-libs/libICE
-       x11-libs/libXdmcp
-       python? ( dev-lang/python )"
-
-S=${WORKDIR}
-
-QA_TEXTRELS_amd64="opt/VirtualBox/VBoxVMM.so"
-QA_TEXTRELS_x86="opt/VirtualBox/VBoxGuestPropSvc.so
-       opt/VirtualBox/VBoxSDL.so
-       opt/VirtualBox/VBoxPython2_4.so
-       opt/VirtualBox/VBoxPython2_6.so
-       opt/VirtualBox/VBoxDbg.so
-       opt/VirtualBox/VBoxSharedFolders.so
-       opt/VirtualBox/VBoxDD2.so
-       opt/VirtualBox/VBoxOGLrenderspu.so
-       opt/VirtualBox/VBoxPython.so
-       opt/VirtualBox/VBoxPython2_3.so
-       opt/VirtualBox/VBoxDD.so
-       opt/VirtualBox/VBoxVRDP.so
-       opt/VirtualBox/VBoxDDU.so
-       opt/VirtualBox/VBoxREM64.so
-       opt/VirtualBox/VBoxSharedClipboard.so
-       opt/VirtualBox/VBoxHeadless.so
-       opt/VirtualBox/VBoxRT.so
-       opt/VirtualBox/VRDPAuth.so
-       opt/VirtualBox/VBoxREM.so
-       opt/VirtualBox/VBoxSettings.so
-       opt/VirtualBox/VBoxKeyboard.so
-       opt/VirtualBox/VBoxSharedCrOpenGL.so
-       opt/VirtualBox/VBoxVMM.so
-       opt/VirtualBox/VirtualBox.so
-       opt/VirtualBox/VBoxOGLhosterrorspu.so
-       opt/VirtualBox/components/VBoxC.so
-       opt/VirtualBox/components/VBoxSVCM.so
-       opt/VirtualBox/VBoxREM32.so
-       opt/VirtualBox/VBoxPython2_5.so
-       opt/VirtualBox/VBoxXPCOMC.so
-       opt/VirtualBox/VBoxOGLhostcrutil.so
-       opt/VirtualBox/VBoxNetDHCP.so"
-QA_PRESTRIPPED="opt/VirtualBox/VBoxDD.so
-       opt/VirtualBox/VBoxDD2.so
-       opt/VirtualBox/VBoxDDU.so
-       opt/VirtualBox/VBoxDbg.so
-       opt/VirtualBox/VBoxGuestPropSvc.so
-       opt/VirtualBox/VBoxHeadless
-       opt/VirtualBox/VBoxHeadless.so
-       opt/VirtualBox/VBoxKeyboard.so
-       opt/VirtualBox/VBoxManage
-       opt/VirtualBox/VBoxNetAdpCtl
-       opt/VirtualBox/VBoxNetDHCP
-       opt/VirtualBox/VBoxNetDHCP.so
-       opt/VirtualBox/VBoxOGLhostcrutil.so
-       opt/VirtualBox/VBoxOGLhosterrorspu.so
-       opt/VirtualBox/VBoxOGLrenderspu.so
-       opt/VirtualBox/VBoxPython.so
-       opt/VirtualBox/VBoxPython2_3.so
-       opt/VirtualBox/VBoxPython2_4.so
-       opt/VirtualBox/VBoxPython2_5.so
-       opt/VirtualBox/VBoxPython2_6.so
-       opt/VirtualBox/VBoxREM.so
-       opt/VirtualBox/VBoxREM32.so
-       opt/VirtualBox/VBoxREM64.so
-       opt/VirtualBox/VBoxRT.so
-       opt/VirtualBox/VBoxSDL
-       opt/VirtualBox/VBoxSDL.so
-       opt/VirtualBox/VBoxSVC
-       opt/VirtualBox/VBoxSettings.so
-       opt/VirtualBox/VBoxSharedClipboard.so
-       opt/VirtualBox/VBoxSharedCrOpenGL.so
-       opt/VirtualBox/VBoxSharedFolders.so
-       opt/VirtualBox/VBoxTestOGL
-       opt/VirtualBox/VBoxTunctl
-       opt/VirtualBox/VBoxVMM.so
-       opt/VirtualBox/VBoxVRDP.so
-       opt/VirtualBox/VBoxXPCOM.so
-       opt/VirtualBox/VBoxXPCOMC.so
-       opt/VirtualBox/VBoxXPCOMIPCD
-       opt/VirtualBox/VRDPAuth.so
-       opt/VirtualBox/VirtualBox
-       opt/VirtualBox/VirtualBox.so
-       opt/VirtualBox/accessible/libqtaccessiblewidgets.so
-       opt/VirtualBox/components/VBoxC.so
-       opt/VirtualBox/components/VBoxSVCM.so
-       opt/VirtualBox/components/VBoxXPCOMIPCC.so
-       opt/VirtualBox/kchmviewer
-       opt/VirtualBox/libQtCoreVBox.so.4
-       opt/VirtualBox/libQtGuiVBox.so.4
-       opt/VirtualBox/libQtNetworkVBox.so.4
-       opt/VirtualBox/libQtOpenGLVBox.so.4
-       opt/VirtualBox/vboxwebsrv"
-
-pkg_setup() {
-       # We cannot mirror VirtualBox PUEL licensed files see:
-       # http://www.virtualbox.org/wiki/Licensing_FAQ
-       check_license
-}
-
-src_unpack() {
-       unpack_makeself ${MY_P}_${ARCH}.run
-       unpack ./VirtualBox.tar.bz2
-
-       if use sdk; then
-               unpack VirtualBoxSDK-${MY_PV}.zip
-       fi
-}
-
-src_install() {
-       # create virtualbox configurations files
-       insinto /etc/vbox
-       newins "${FILESDIR}/${PN}-config" vbox.cfg
-
-       if ! use headless ; then
-               newicon VBox.png ${PN}.png
-               newmenu "${FILESDIR}"/${PN}.desktop ${PN}.desktop
-       fi
-
-       insinto /opt/VirtualBox
-       dodir /opt/bin
-
-       doins UserManual.pdf
-
-       if use sdk ; then
-               doins -r sdk || die
-       fi
-
-       if use additions; then
-               doins -r additions || die
-       fi
-
-       if use vboxwebsrv; then
-               doins vboxwebsrv || die
-               fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
-               fperms 0750 /opt/VirtualBox/vboxwebsrv
-               dosym /opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
-               newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-               newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-       fi
-
-       if ! use headless && use chm; then
-               doins kchmviewer VirtualBox.chm || die
-               fowners root:vboxusers /opt/VirtualBox/kchmviewer
-               fperms 0750 /opt/VirtualBox/kchmviewer
-       fi
-
-       if use python; then
-               if has_version "=dev-lang/python-2.4*"; then
-                       doins VBoxPython2_4.so || die
-               fi
-
-               if has_version "=dev-lang/python-2.5*"; then
-                       doins VBoxPython2_5.so || die
-               fi
-
-               if has_version "=dev-lang/python-2.6*"; then
-                       doins VBoxPython2_6.so || die
-               fi
-       fi
-
-       rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
-               vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
-               VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
-               webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
-               90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
-               VBoxPython2_*.so
-
-       if use headless ; then
-               rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
-       fi
-
-       doins -r * || die
-
-       # create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
-       dosym /opt/VirtualBox/VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
-       dosym /opt/VirtualBox/VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
-       dosym /opt/VirtualBox/VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
-       dosym /opt/VirtualBox/VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
-       dosym /opt/VirtualBox/VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
-
-       local each
-       for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,TestOGL}; do
-               fowners root:vboxusers /opt/VirtualBox/${each}
-               fperms 0750 /opt/VirtualBox/${each}
-               pax-mark -m "${D}"/opt/VirtualBox/${each}
-       done
-       # VBoxNetAdpCtl binary needs to be suid root in any case..
-       fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
-
-       if ! use headless ; then
-               # Hardened build: Mark selected binaries set-user-ID-on-execution
-               for each in VBox{SDL,Headless} VirtualBox; do
-                       fowners root:vboxusers /opt/VirtualBox/${each}
-                       fperms 4510 /opt/VirtualBox/${each}
-                       pax-mark -m "${D}"/opt/VirtualBox/${each}
-               done
-
-               dosym /opt/VirtualBox/VBox.sh /opt/bin/VirtualBox
-               dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxSDL
-       else
-               # Hardened build: Mark selected binaries set-user-ID-on-execution
-               fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
-               fperms 4510 /opt/VirtualBox/VBoxHeadless
-               pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
-       fi
-
-       exeinto /opt/VirtualBox
-       newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh" || die
-       fowners root:vboxusers /opt/VirtualBox/VBox.sh
-       fperms 0750 /opt/VirtualBox/VBox.sh
-
-       dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxManage
-       dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxVRDP
-       dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxHeadless
-       dosym /opt/VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
-
-       # set an env-variable for 3rd party tools
-       echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
-       doenvd "${T}/90virtualbox"
-}
-
-pkg_postinst() {
-       fdo-mime_desktop_database_update
-       elog ""
-       if ! use headless ; then
-               elog "To launch VirtualBox just type: \"VirtualBox\""
-               elog ""
-       fi
-       elog "You must be in the vboxusers group to use VirtualBox."
-       elog ""
-       elog "For advanced networking setups you should emerge:"
-       elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-}
-
-pkg_postrm() {
-       fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-3.1.4.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-3.1.4.ebuild
deleted file mode 100644 (file)
index c8181d9..0000000
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-3.1.4.ebuild,v 1.1 2010/02/14 00:01:13 patrick Exp $
-
-EAPI=2
-
-inherit eutils fdo-mime pax-utils
-
-MY_PV=${PV}-57640
-MY_P=VirtualBox-${MY_PV}-Linux
-
-DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_amd64.run )
-       x86? ( http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_x86.run )
-       sdk? ( http://download.virtualbox.org/virtualbox/${PV}/VirtualBoxSDK-${MY_PV}.zip )"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+additions +chm headless python sdk vboxwebsrv"
-RESTRICT="mirror"
-PROPERTIES="interactive"
-
-RDEPEND="!!app-emulation/virtualbox-ose
-       !app-emulation/virtualbox-ose-additions
-       ~app-emulation/virtualbox-modules-${PV}
-       !headless? (
-               x11-libs/libXcursor
-               media-libs/libsdl[X]
-               x11-libs/libXrender
-               x11-libs/libXfixes
-               media-libs/libpng
-               x11-libs/libXi
-               x11-libs/libXrandr
-               x11-libs/libXinerama
-               x11-libs/libXft
-               media-libs/freetype
-               media-libs/fontconfig
-               x11-libs/libXext
-               dev-libs/glib
-               chm? ( dev-libs/expat )
-       )
-       x11-libs/libXt
-       dev-libs/libxml2
-       x11-libs/libXau
-       x11-libs/libX11
-       x11-libs/libXmu
-       x11-libs/libSM
-       x11-libs/libICE
-       x11-libs/libXdmcp
-       python? ( dev-lang/python )"
-
-S=${WORKDIR}
-
-QA_TEXTRELS_amd64="opt/VirtualBox/VBoxVMM.so"
-QA_TEXTRELS_x86="opt/VirtualBox/VBoxGuestPropSvc.so
-       opt/VirtualBox/VBoxSDL.so
-       opt/VirtualBox/VBoxPython2_4.so
-       opt/VirtualBox/VBoxPython2_6.so
-       opt/VirtualBox/VBoxDbg.so
-       opt/VirtualBox/VBoxSharedFolders.so
-       opt/VirtualBox/VBoxDD2.so
-       opt/VirtualBox/VBoxOGLrenderspu.so
-       opt/VirtualBox/VBoxPython.so
-       opt/VirtualBox/VBoxPython2_3.so
-       opt/VirtualBox/VBoxDD.so
-       opt/VirtualBox/VBoxVRDP.so
-       opt/VirtualBox/VBoxDDU.so
-       opt/VirtualBox/VBoxREM64.so
-       opt/VirtualBox/VBoxSharedClipboard.so
-       opt/VirtualBox/VBoxHeadless.so
-       opt/VirtualBox/VBoxRT.so
-       opt/VirtualBox/VRDPAuth.so
-       opt/VirtualBox/VBoxREM.so
-       opt/VirtualBox/VBoxSettings.so
-       opt/VirtualBox/VBoxKeyboard.so
-       opt/VirtualBox/VBoxSharedCrOpenGL.so
-       opt/VirtualBox/VBoxVMM.so
-       opt/VirtualBox/VirtualBox.so
-       opt/VirtualBox/VBoxOGLhosterrorspu.so
-       opt/VirtualBox/components/VBoxC.so
-       opt/VirtualBox/components/VBoxSVCM.so
-       opt/VirtualBox/VBoxREM32.so
-       opt/VirtualBox/VBoxPython2_5.so
-       opt/VirtualBox/VBoxXPCOMC.so
-       opt/VirtualBox/VBoxOGLhostcrutil.so
-       opt/VirtualBox/VBoxNetDHCP.so"
-QA_PRESTRIPPED="opt/VirtualBox/VBoxDD.so
-       opt/VirtualBox/VBoxDD2.so
-       opt/VirtualBox/VBoxDDU.so
-       opt/VirtualBox/VBoxDbg.so
-       opt/VirtualBox/VBoxGuestPropSvc.so
-       opt/VirtualBox/VBoxHeadless
-       opt/VirtualBox/VBoxHeadless.so
-       opt/VirtualBox/VBoxKeyboard.so
-       opt/VirtualBox/VBoxManage
-       opt/VirtualBox/VBoxNetAdpCtl
-       opt/VirtualBox/VBoxNetDHCP
-       opt/VirtualBox/VBoxNetDHCP.so
-       opt/VirtualBox/VBoxOGLhostcrutil.so
-       opt/VirtualBox/VBoxOGLhosterrorspu.so
-       opt/VirtualBox/VBoxOGLrenderspu.so
-       opt/VirtualBox/VBoxPython.so
-       opt/VirtualBox/VBoxPython2_3.so
-       opt/VirtualBox/VBoxPython2_4.so
-       opt/VirtualBox/VBoxPython2_5.so
-       opt/VirtualBox/VBoxPython2_6.so
-       opt/VirtualBox/VBoxREM.so
-       opt/VirtualBox/VBoxREM32.so
-       opt/VirtualBox/VBoxREM64.so
-       opt/VirtualBox/VBoxRT.so
-       opt/VirtualBox/VBoxSDL
-       opt/VirtualBox/VBoxSDL.so
-       opt/VirtualBox/VBoxSVC
-       opt/VirtualBox/VBoxSettings.so
-       opt/VirtualBox/VBoxSharedClipboard.so
-       opt/VirtualBox/VBoxSharedCrOpenGL.so
-       opt/VirtualBox/VBoxSharedFolders.so
-       opt/VirtualBox/VBoxTestOGL
-       opt/VirtualBox/VBoxTunctl
-       opt/VirtualBox/VBoxVMM.so
-       opt/VirtualBox/VBoxVRDP.so
-       opt/VirtualBox/VBoxXPCOM.so
-       opt/VirtualBox/VBoxXPCOMC.so
-       opt/VirtualBox/VBoxXPCOMIPCD
-       opt/VirtualBox/VRDPAuth.so
-       opt/VirtualBox/VirtualBox
-       opt/VirtualBox/VirtualBox.so
-       opt/VirtualBox/accessible/libqtaccessiblewidgets.so
-       opt/VirtualBox/components/VBoxC.so
-       opt/VirtualBox/components/VBoxSVCM.so
-       opt/VirtualBox/components/VBoxXPCOMIPCC.so
-       opt/VirtualBox/kchmviewer
-       opt/VirtualBox/libQtCoreVBox.so.4
-       opt/VirtualBox/libQtGuiVBox.so.4
-       opt/VirtualBox/libQtNetworkVBox.so.4
-       opt/VirtualBox/libQtOpenGLVBox.so.4
-       opt/VirtualBox/vboxwebsrv"
-
-pkg_setup() {
-       # We cannot mirror VirtualBox PUEL licensed files see:
-       # http://www.virtualbox.org/wiki/Licensing_FAQ
-       check_license
-}
-
-src_unpack() {
-       unpack_makeself ${MY_P}_${ARCH}.run
-       unpack ./VirtualBox.tar.bz2
-
-       if use sdk; then
-               unpack VirtualBoxSDK-${MY_PV}.zip
-       fi
-}
-
-src_install() {
-       # create virtualbox configurations files
-       insinto /etc/vbox
-       newins "${FILESDIR}/${PN}-config" vbox.cfg
-
-       if ! use headless ; then
-               newicon VBox.png ${PN}.png
-               newmenu "${FILESDIR}"/${PN}.desktop ${PN}.desktop
-       fi
-
-       insinto /opt/VirtualBox
-       dodir /opt/bin
-
-       doins UserManual.pdf
-
-       if use sdk ; then
-               doins -r sdk || die
-       fi
-
-       if use additions; then
-               doins -r additions || die
-       fi
-
-       if use vboxwebsrv; then
-               doins vboxwebsrv || die
-               fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
-               fperms 0750 /opt/VirtualBox/vboxwebsrv
-               dosym /opt/VirtualBox/VBox.sh /opt/bin/vboxwebsrv
-               newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-               newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-       fi
-
-       if ! use headless && use chm; then
-               doins kchmviewer VirtualBox.chm || die
-               fowners root:vboxusers /opt/VirtualBox/kchmviewer
-               fperms 0750 /opt/VirtualBox/kchmviewer
-       fi
-
-       if use python; then
-               if has_version "=dev-lang/python-2.4*"; then
-                       doins VBoxPython2_4.so || die
-               fi
-
-               if has_version "=dev-lang/python-2.5*"; then
-                       doins VBoxPython2_5.so || die
-               fi
-
-               if has_version "=dev-lang/python-2.6*"; then
-                       doins VBoxPython2_6.so || die
-               fi
-       fi
-
-       rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \
-               vboxdrv.sh VBox.sh VBox.png vboxnet.sh additions VirtualBox.desktop \
-               VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv \
-               webtest kchmviewer VirtualBox.chm vbox-create-usb-node.sh \
-               90-vbox-usb.fdi uninstall.sh vboxshell.py vboxdrv-pardus.py \
-               VBoxPython2_*.so
-
-       if use headless ; then
-               rm -rf VBoxSDL VirtualBox VBoxKeyboard.so
-       fi
-
-       doins -r * || die
-
-       # create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid)
-       dosym /opt/VirtualBox/VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so
-       dosym /opt/VirtualBox/VBoxREM.so /opt/VirtualBox/components/VBoxREM.so
-       dosym /opt/VirtualBox/VBoxRT.so /opt/VirtualBox/components/VBoxRT.so
-       dosym /opt/VirtualBox/VBoxDDU.so /opt/VirtualBox/components/VBoxDDU.so
-       dosym /opt/VirtualBox/VBoxXPCOM.so /opt/VirtualBox/components/VBoxXPCOM.so
-
-       local each
-       for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP,TestOGL}; do
-               fowners root:vboxusers /opt/VirtualBox/${each}
-               fperms 0750 /opt/VirtualBox/${each}
-               pax-mark -m "${D}"/opt/VirtualBox/${each}
-       done
-       # VBoxNetAdpCtl binary needs to be suid root in any case..
-       fperms 4750 /opt/VirtualBox/VBoxNetAdpCtl
-
-       if ! use headless ; then
-               # Hardened build: Mark selected binaries set-user-ID-on-execution
-               for each in VBox{SDL,Headless} VirtualBox; do
-                       fowners root:vboxusers /opt/VirtualBox/${each}
-                       fperms 4510 /opt/VirtualBox/${each}
-                       pax-mark -m "${D}"/opt/VirtualBox/${each}
-               done
-
-               dosym /opt/VirtualBox/VBox.sh /opt/bin/VirtualBox
-               dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxSDL
-       else
-               # Hardened build: Mark selected binaries set-user-ID-on-execution
-               fowners root:vboxusers /opt/VirtualBox/VBoxHeadless
-               fperms 4510 /opt/VirtualBox/VBoxHeadless
-               pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless
-       fi
-
-       exeinto /opt/VirtualBox
-       newexe "${FILESDIR}/${PN}-3-wrapper" "VBox.sh" || die
-       fowners root:vboxusers /opt/VirtualBox/VBox.sh
-       fperms 0750 /opt/VirtualBox/VBox.sh
-
-       dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxManage
-       dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxVRDP
-       dosym /opt/VirtualBox/VBox.sh /opt/bin/VBoxHeadless
-       dosym /opt/VirtualBox/VBoxTunctl /opt/bin/VBoxTunctl
-
-       # set an env-variable for 3rd party tools
-       echo -n "VBOX_APP_HOME=/opt/VirtualBox" > "${T}/90virtualbox"
-       doenvd "${T}/90virtualbox"
-}
-
-pkg_postinst() {
-       fdo-mime_desktop_database_update
-       elog ""
-       if ! use headless ; then
-               elog "To launch VirtualBox just type: \"VirtualBox\""
-               elog ""
-       fi
-       elog "You must be in the vboxusers group to use VirtualBox."
-       elog ""
-       elog "For advanced networking setups you should emerge:"
-       elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-}
-
-pkg_postrm() {
-       fdo-mime_desktop_database_update
-}
similarity index 98%
rename from app-emulation/virtualbox-bin/virtualbox-bin-3.1.4-r1.ebuild
rename to app-emulation/virtualbox-bin/virtualbox-bin-3.2.0.ebuild
index c5098f2b3dc49849effa7727df5089c9c681b179..541559a01fc95bb63e7d8af710732b6486359a7e 100644 (file)
@@ -1,12 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-3.1.4-r1.ebuild,v 1.2 2010/02/20 19:23:54 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-3.2.0.ebuild,v 1.1 2010/05/20 13:07:22 polynomial-c Exp $
 
 EAPI=2
 
 inherit eutils fdo-mime pax-utils
 
-MY_PV=${PV}-57640
+MY_PV=${PV}-61806
 MY_P=VirtualBox-${MY_PV}-Linux
 
 DESCRIPTION="Family of powerful x86 virtualization products for enterprise as well as home use"
index 556843a0a0817edb870997aa68f14c15e6cce475..20d1dd57ee730cbfa94586e1983d296d129de5c5 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virtualbox-modules
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.60 2010/05/10 13:17:58 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.61 2010/05/20 12:58:17 polynomial-c Exp $
+
+*virtualbox-modules-3.2.0 (20 May 2010)
+
+  20 May 2010; Lars Wendler <polynomial-c@gentoo.org>
+  +virtualbox-modules-3.2.0.ebuild:
+  Version bump. Removed old versions.
 
 *virtualbox-modules-3.1.8 (10 May 2010)
 
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-3.2.0.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-3.2.0.ebuild
new file mode 100644 (file)
index 0000000..2512981
--- /dev/null
@@ -0,0 +1,72 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-3.2.0.ebuild,v 1.1 2010/05/20 12:58:17 polynomial-c Exp $
+
+# XXX: the tarball here is just the kernel modules split out of the binary
+#      package that comes from virtualbox-bin
+
+EAPI=2
+
+inherit eutils linux-mod
+
+MY_P=vbox-kernel-module-src-${PV}
+DESCRIPTION="Kernel Modules for Virtualbox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://dev.gentoo.org/~polynomial-c/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!=app-emulation/virtualbox-ose-9999"
+
+S=${WORKDIR}
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxdrv(misc:${S}) vboxnetflt(misc:${S}) vboxnetadp(misc:${S})"
+
+pkg_setup() {
+       linux-mod_pkg_setup
+       BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+       enewgroup vboxusers
+}
+
+src_prepare() {
+       if kernel_is -ge 2 6 33 ; then
+               # evil patch for new kernels - header moved
+               grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
+       fi
+}
+
+src_install() {
+       linux-mod_src_install
+
+       # udev rule for vboxdrv
+       dodir /etc/udev/rules.d
+       echo '#SUBSYSTEM=="usb_device", GROUP="vboxusers", MODE="0644"' \
+       > "${D}/etc/udev/rules.d/10-virtualbox.rules"
+       echo '#SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="vboxusers", MODE="0644"' \
+       >> "${D}/etc/udev/rules.d/10-virtualbox.rules"
+}
+
+pkg_postinst() {
+       linux-mod_pkg_postinst
+       elog "Starting with the 3.x release new kernel modules were added,"
+       elog "be sure to load all the needed modules."
+       elog ""
+       elog "Please add \"vboxdrv\", \"vboxnetflt\" and \"vboxnetadp\" to:"
+       if has_version sys-apps/openrc; then
+               elog "/etc/conf.d/modules"
+       else
+               elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
+       fi
+       elog ""
+       elog "If you are experiencing problems on your guests"
+       elog "with USB support and app-emulation/virtualbox-bin,"
+       elog "uncomment the udev rules placed in:"
+       elog ""
+       elog "/etc/udev/rules.d/10-virtualbox.rules"
+       elog ""
+}
index 33d9d537b614d71085c0d7e246897af6a9e526a6..cc11b6d9383343dc4bf3a6b5463a50d565f3c9d2 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virtualbox-ose-additions
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose-additions/ChangeLog,v 1.37 2010/05/10 13:18:45 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose-additions/ChangeLog,v 1.38 2010/05/20 13:09:08 polynomial-c Exp $
+
+*virtualbox-ose-additions-3.2.0 (20 May 2010)
+
+  20 May 2010; Lars Wendler <polynomial-c@gentoo.org>
+  +virtualbox-ose-additions-3.2.0.ebuild:
+  Version bump. Removed old versions.
 
 *virtualbox-ose-additions-3.1.8 (10 May 2010)
 
diff --git a/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-3.1.0.ebuild b/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-3.1.0.ebuild
deleted file mode 100644 (file)
index 2daddcf..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-3.1.0.ebuild,v 1.1 2009/12/02 20:38:18 patrick Exp $
-
-EAPI=2
-
-inherit eutils
-
-MY_PN=VBoxGuestAdditions
-MY_P=${MY_PN}_${PV}
-
-DESCRIPTION="Guest additions for VirtualBox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror"
-PROPERTIES="interactive"
-
-RDEPEND="!app-emulation/virtualbox-bin
-       !=app-emulation/virtualbox-ose-9999"
-
-pkg_setup() {
-       # We cannot mirror VirtualBox PUEL licensed files see:
-       # http://www.virtualbox.org/wiki/Licensing_FAQ
-       check_license
-}
-
-src_unpack() {
-       return 0
-}
-
-src_install() {
-       insinto /usr/share/${PN/-additions}
-       newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
diff --git a/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-3.1.4.ebuild b/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-3.1.4.ebuild
deleted file mode 100644 (file)
index 1631115..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-3.1.4.ebuild,v 1.1 2010/02/14 00:02:35 patrick Exp $
-
-EAPI=2
-
-inherit eutils
-
-MY_PN=VBoxGuestAdditions
-MY_P=${MY_PN}_${PV}
-
-DESCRIPTION="Guest additions for VirtualBox"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso"
-
-LICENSE="PUEL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror"
-PROPERTIES="interactive"
-
-RDEPEND="!app-emulation/virtualbox-bin
-       !=app-emulation/virtualbox-ose-9999"
-
-pkg_setup() {
-       # We cannot mirror VirtualBox PUEL licensed files see:
-       # http://www.virtualbox.org/wiki/Licensing_FAQ
-       check_license
-}
-
-src_unpack() {
-       return 0
-}
-
-src_install() {
-       insinto /usr/share/${PN/-additions}
-       newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
-}
similarity index 90%
rename from app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-3.1.2.ebuild
rename to app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-3.2.0.ebuild
index 26ca8d5c0c52626ed839bd6a3bb465af2cd773bf..32f8fd33590dd23baa3ffbea7b3cf8b126c7aea8 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-3.1.2.ebuild,v 1.1 2010/01/28 13:12:48 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-3.2.0.ebuild,v 1.1 2010/05/20 13:09:08 polynomial-c Exp $
 
 EAPI=2
 
index bd869182309b38f76902a8bff104426048106077..26c0b122ddc89181df99a10e2ff2affd35d95420 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/virtualbox-ose
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.52 2010/05/11 15:48:57 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.53 2010/05/20 13:03:16 polynomial-c Exp $
+
+*virtualbox-ose-3.2.0 (20 May 2010)
+
+  20 May 2010; Lars Wendler <polynomial-c@gentoo.org>
+  +virtualbox-ose-3.2.0.ebuild,
+  +files/virtualbox-ose-3.2.0-mesa-check.patch:
+  Version bump. Removed old versions.
 
   11 May 2010; Lars Wendler <polynomial-c@gentoo.org>
   virtualbox-ose-3.1.8.ebuild,
diff --git a/app-emulation/virtualbox-ose/files/virtualbox-ose-1-config b/app-emulation/virtualbox-ose/files/virtualbox-ose-1-config
deleted file mode 100644 (file)
index f69e73e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-INSTALL_DIR=/opt/VirtualBox
diff --git a/app-emulation/virtualbox-ose/files/virtualbox-ose-1-wrapper b/app-emulation/virtualbox-ose/files/virtualbox-ose-1-wrapper
deleted file mode 100644 (file)
index a560713..0000000
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/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
diff --git a/app-emulation/virtualbox-ose/files/virtualbox-ose-1.6.6-remove-unused.patch b/app-emulation/virtualbox-ose/files/virtualbox-ose-1.6.6-remove-unused.patch
deleted file mode 100644 (file)
index ad2ac6a..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
---- Config.kmk.orig    2008-09-03 01:49:46.000000000 +0200
-+++ Config.kmk 2008-09-03 01:53:48.000000000 +0200
-@@ -134,26 +134,26 @@
- 
- # This indicates that additions (of some kind or another) is being _built_.
- # VBOX_WITHOUT_ADDITIONS overrides it.
--if1of ($(KBUILD_TARGET),l4 linux os2 solaris win)
-- VBOX_WITH_ADDITIONS = 1
--else ifdef VBOX_WITH_WIN32_ADDITIONS # for ssh cross builds -remove later!
-- VBOX_WITH_ADDITIONS = 1
--else ifdef VBOX_WITH_LINUX_ADDITIONS # for ssh cross builds - remove later!
-- VBOX_WITH_ADDITIONS = 1
--endif
-+#if1of ($(KBUILD_TARGET),l4 linux os2 solaris win)
-+# VBOX_WITH_ADDITIONS = 1
-+#else ifdef VBOX_WITH_WIN32_ADDITIONS # for ssh cross builds -remove later!
-+# VBOX_WITH_ADDITIONS = 1
-+#else ifdef VBOX_WITH_LINUX_ADDITIONS # for ssh cross builds - remove later!
-+# VBOX_WITH_ADDITIONS = 1
-+#endif
- # Build the optional ring-0 part of the additions for syntax checking.
- # (Ignored ifndef VBOX_WITH_ADDITIONS. Hack for 32/64 linux issues.)
--VBOX_WITH_ADDITION_DRIVERS = 1
-+#VBOX_WITH_ADDITION_DRIVERS = 1
- # Build win32 additions (cross building them on linux and l4 using wine).
--if1of ($(KBUILD_TARGET),l4 linux win)
-- VBOX_WITH_WIN32_ADDITIONS = 1
--endif
-+#if1of ($(KBUILD_TARGET),l4 linux win)
-+# VBOX_WITH_WIN32_ADDITIONS = 1
-+#endif
- # Build linux additions.
- # Note! VBOX_WITH_LINUX_ADDITIONS will be removed later and only
- # VBOX_WITH_WIN32_ADDITIONS will be kept around for cross building.
--if1of ($(KBUILD_TARGET),l4 linux)
-- VBOX_WITH_LINUX_ADDITIONS = 1
--endif
-+#if1of ($(KBUILD_TARGET),l4 linux)
-+# VBOX_WITH_LINUX_ADDITIONS = 1
-+#endif
- # Build X11 additions. Can be disabled separately.
- ifndef VBOX_WITH_X11_ADDITIONS
-  ifdef VBOX_WITH_LINUX_ADDITIONS
-@@ -196,7 +196,7 @@
- # Activate this to force the VM to pre-allocate the guest RAM before startup
- VBOX_WITH_PREALLOC_RAM_BY_DEFAULT =
- # The kernel driver/module and related runtime libraries.
--VBOX_WITH_VBOXDRV = 1
-+#VBOX_WITH_VBOXDRV = 1
- # build with secure label support
- ifeq ($(filter win.amd64,$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),) # too much work with freetype and all that.
- VBOX_WITH_SECURELABEL = 1
-@@ -209,7 +209,7 @@
- # The SDL based GUI.
- VBOX_WITH_VBOXSDL = 1
- # The basic frontend (w/o Main).
--VBOX_WITH_VBOXBFE = 1
-+#VBOX_WITH_VBOXBFE = 1
- # The Qt GUI.
- VBOX_WITH_QTGUI = 1
- # The Qt 4 GUI (experimental).
-@@ -245,9 +245,9 @@
- # Enable the kchmviewer
- VBOX_WITH_KCHMVIEWER = 1
- # Build the testsuite.
--VBOX_WITH_TESTSUITE = 1
-+#VBOX_WITH_TESTSUITE = 1
- # Build the testcases.
--VBOX_WITH_TESTCASES = 1
-+#VBOX_WITH_TESTCASES = 1
- # Set this to not use COM or XPCOM in places where it can be avoided.
- #VBOX_WITHOUT_COM = 1
- # Set this to skip installing the redistributable compiler runtime.
---- configure.orig     2008-09-03 01:49:51.000000000 +0200
-+++ configure  2008-09-03 01:54:33.000000000 +0200
-@@ -1790,14 +1790,14 @@
- # some things are not available in for OSE
- if [ $OSE -ge 1 ]; then
-   cnf_append "VBOX_OSE" "1"
--  cnf_append "VBOX_WITH_TESTSUITE" ""
-+#  cnf_append "VBOX_WITH_TESTSUITE" ""
-   cnf_append "VBOX_WITH_WIN32_ADDITIONS" ""
- 
--  if [ "$OS" = "linux" ]; then
--    cnf_append "VBOX_WITH_LINUX_ADDITIONS" "1"
--  else
--    cnf_append "VBOX_WITH_LINUX_ADDITIONS" ""
--  fi
-+#  if [ "$OS" = "linux" ]; then
-+#    cnf_append "VBOX_WITH_LINUX_ADDITIONS" "1"
-+#  else
-+#    cnf_append "VBOX_WITH_LINUX_ADDITIONS" ""
-+#  fi
-   echo >> $CNF
- fi
- 
diff --git a/app-emulation/virtualbox-ose/files/virtualbox-ose-2-config b/app-emulation/virtualbox-ose/files/virtualbox-ose-2-config
deleted file mode 100644 (file)
index d1e35d2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-INSTALL_DIR=/usr/MY_LIBDIR/virtualbox-ose
diff --git a/app-emulation/virtualbox-ose/files/virtualbox-ose-2-localconfig b/app-emulation/virtualbox-ose/files/virtualbox-ose-2-localconfig
deleted file mode 100644 (file)
index 0c99788..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- 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 :=
-
-
diff --git a/app-emulation/virtualbox-ose/files/virtualbox-ose-2-wrapper b/app-emulation/virtualbox-ose/files/virtualbox-ose-2-wrapper
deleted file mode 100644 (file)
index 393818b..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/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
diff --git a/app-emulation/virtualbox-ose/files/virtualbox-ose-3.0.8-without-hal-fix.patch b/app-emulation/virtualbox-ose/files/virtualbox-ose-3.0.8-without-hal-fix.patch
deleted file mode 100644 (file)
index e2ac8c5..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
---- VirtualBox-3.0.8_OSE/src/VBox/Main/linux/HostHardwareLinux.cpp
-+++ VirtualBox-3.0.8_OSE/src/VBox/Main/linux/HostHardwareLinux.cpp
-@@ -212,10 +212,8 @@
-             && (!success || testing()))
-             rc = getDriveInfoFromHal(&mFloppyList, false /* isDVD */, &success);
- #endif /* VBOX_WITH_DBUS defined */
--        if (   RT_SUCCESS(rc)
--            && RT_SUCCESS(VBoxLoadDBusLib())
--            && (!success || testing()))
--            rc = getDriveInfoFromHal(&mFloppyList, false /* isDVD */, &success);
-+      if (  RT_SUCCESS(rc) && (!success || testing())) 
-+          rc = getDriveInfoFromSysfs(&mFloppyList, false /* isDVD */, &success);
-         /* As with the CDROMs, on Linux we have to take a multi-level approach
-          * involving parsing the mount tables. As this is not bulletproof, we
-          * give the user the chance to override the detection using an
-@@ -1086,6 +1084,7 @@
-     LogFlowFunc (("rc=%Rrc, halSuccess=%d\n", rc, halSuccess));
-     return rc;
- }
-+#endif  /* RT_OS_LINUX && VBOX_WITH_DBUS */
- 
- /**
-  * Send an SCSI INQUIRY command to a device and return selected information.
-@@ -1422,6 +1421,8 @@
-     return rc;
- }
- 
-+#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DBUS)
-+
- /**
-  * Helper function to query the hal subsystem for information about drives
-  * attached to the system.
diff --git a/app-emulation/virtualbox-ose/files/virtualbox-ose-3.2.0-mesa-check.patch b/app-emulation/virtualbox-ose/files/virtualbox-ose-3.2.0-mesa-check.patch
new file mode 100644 (file)
index 0000000..f2cf981
--- /dev/null
@@ -0,0 +1,34 @@
+--- configure
++++ configure
+@@ -1226,9 +1226,7 @@
+ }
+ EOF
+   [ -n "$INCX11" ] && I_INCX11=`prefix_I "$INCX11"`
+-  if test_compile "$LIBX11 $I_INCX11" Xlibs Xlibs; then
+-    log_success "found"
+-  fi
++  test_compile "$LIBX11 $I_INCX11" Xlibs Xlibs
+ }
+ 
+ 
+@@ -1382,20 +1380,6 @@
+ #include <GL/glu.h>
+ extern "C" int main(void)
+ {
+-  Display *dpy;
+-  int major, minor;
+-
+-  dpy = XOpenDisplay(NULL);
+-  if (dpy)
+-  {
+-    if (glXQueryVersion(dpy, &major, &minor))
+-    {
+-      printf("found version %u.%u, OK.\n", major, minor);
+-      return 0;
+-    }
+-    XCloseDisplay(dpy);
+-  }
+-  printf("found (inactive), OK.\n");
+   return 0;
+ }
+ EOF
diff --git a/app-emulation/virtualbox-ose/files/virtualbox-ose-fix-insecure-lockfiles.patch b/app-emulation/virtualbox-ose/files/virtualbox-ose-fix-insecure-lockfiles.patch
deleted file mode 100644 (file)
index 0df6290..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
---- src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcdUnix.cpp.orig   2008-11-09 19:48:22.000000000 +0100
-+++ src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcdUnix.cpp        2008-11-09 19:51:54.000000000 +0100
-@@ -93,7 +93,7 @@
-     EOk = 0,
-     ELockFileOpen = -1,
-     ELockFileLock = -2,
--
-+    ELockFileOwner = -3,
- };
- 
- static int ipcLockFD = 0;
-@@ -112,16 +112,70 @@
-     lockFile[dirLen] = '/';
-     memcpy(lockFile + dirLen + 1, lockName, sizeof(lockName));
- 
-+#ifdef VBOX
-+    //
-+    // Security checks for the directory
-+    //
-+    struct stat st;
-+    if (stat(baseDir, &st) == -1)
-+    {
-+        printf("Cannot stat '%s'.\n", baseDir);
-+        return ELockFileOwner;
-+    }
-+
-+    if (st.st_uid != getuid() && st.st_uid != geteuid())
-+    {
-+        printf("Wrong owner (%d) of '%s'.\n", st.st_uid, baseDir);
-+        return ELockFileOwner;
-+    }
-+
-+    if (st.st_mode != (S_IRUSR | S_IWUSR | S_IXUSR | S_IFDIR))
-+    {
-+        printf("Wrong mode (%o) of '%s'.\n", st.st_mode, baseDir);
-+        return ELockFileOwner;
-+    }
-+#endif
-+
-     //
-     // open lock file.  it remains open until we shutdown.
-     //
-     ipcLockFD = open(lockFile, O_WRONLY|O_CREAT, S_IWUSR|S_IRUSR);
- 
-+#ifndef VBOX
-     free(lockFile);
-+#endif
- 
-     if (ipcLockFD == -1)
-         return ELockFileOpen;
- 
-+#ifdef VBOX
-+    //
-+    // Security checks for the lock file
-+    //
-+    if (fstat(ipcLockFD, &st) == -1)
-+    {
-+        printf("Cannot stat '%s'.\n", lockFile);
-+        free(lockFile);
-+        return ELockFileOwner;
-+    }
-+
-+    if (st.st_uid != getuid() && st.st_uid != geteuid())
-+    {
-+        printf("Wrong owner (%d) of '%s'.\n", st.st_uid, lockFile);
-+        free(lockFile);
-+        return ELockFileOwner;
-+    }
-+
-+    if (st.st_mode != (S_IRUSR | S_IWUSR | S_IFREG))
-+    {
-+        printf("Wrong mode (%o) of '%s'.\n", st.st_mode, lockFile);
-+        free(lockFile);
-+        return ELockFileOwner;
-+    }
-+
-+    free(lockFile);
-+#endif
-+
-     //
-     // we use fcntl for locking.  assumption: filesystem should be local.
-     // this API is nice because the lock will be automatically released
-@@ -433,8 +487,9 @@
-             // don't notify the parent to cause it to fail in PR_Read() after
-             // we terminate
- #ifdef VBOX
--            printf("Cannot create a lock file for '%s'.\n"
--                   "Check permissions.\n", addr.local.path);
-+            if (status != ELockFileOwner)
-+                printf("Cannot create a lock file for '%s'.\n"
-+                        "Check permissions.\n", addr.local.path);
- #endif
-             return 0;
-         }
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-3.1.0.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-3.1.0.ebuild
deleted file mode 100644 (file)
index 0c06d38..0000000
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-3.1.0.ebuild,v 1.2 2009/12/02 23:33:02 patrick Exp $
-
-EAPI=2
-
-inherit eutils fdo-mime flag-o-matic linux-info pax-utils qt4 toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-       # XXX: should finish merging the -9999 ebuild into this one ...
-       ESVN_REPO_URI="http://www.virtualbox.org/svn/vbox/trunk"
-       inherit linux-mod subversion
-else
-       MY_P=VirtualBox-${PV}-OSE
-       SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
-       S=${WORKDIR}/${MY_P/-OSE/_OSE}
-fi
-
-DESCRIPTION="Software family of powerful x86 virtualization"
-HOMEPAGE="http://www.virtualbox.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+additions alsa +hal headless pulseaudio +opengl python +qt4 sdk vboxwebsrv"
-
-RDEPEND="!app-emulation/virtualbox-bin
-       ~app-emulation/virtualbox-modules-${PV}
-       dev-libs/libIDL
-       >=dev-libs/libxslt-1.1.19
-       net-misc/curl
-       !headless? (
-               qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/qt-opengl:4 )
-               opengl? ( virtual/opengl virtual/glut )
-               x11-libs/libXcursor
-               media-libs/libsdl[X,video]
-               x11-libs/libXt
-       )"
-DEPEND="${RDEPEND}
-       >=dev-util/kbuild-0.1.5-r1
-       >=dev-lang/yasm-0.6.2
-       sys-devel/bin86
-       sys-devel/dev86
-       sys-power/iasl
-       media-libs/libpng
-       sys-libs/libcap
-       dev-util/pkgconfig
-       alsa? ( >=media-libs/alsa-lib-1.0.13 )
-       hal? ( sys-apps/hal )
-       pulseaudio? ( media-sound/pulseaudio )
-       python? ( >=dev-lang/python-2.3 )
-       vboxwebsrv? ( >=net-libs/gsoap-2.7.13 )"
-RDEPEND="${RDEPEND}
-       additions? ( ~app-emulation/virtualbox-ose-additions-${PV} )"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-       usr/lib/virtualbox-ose/VBoxSDL.so
-       usr/lib/virtualbox-ose/VBoxSharedFolders.so
-       usr/lib/virtualbox-ose/VBoxDD2.so
-       usr/lib/virtualbox-ose/VBoxOGLrenderspu.so
-       usr/lib/virtualbox-ose/VBoxPython.so
-       usr/lib/virtualbox-ose/VBoxDD.so
-       usr/lib/virtualbox-ose/VBoxDDU.so
-       usr/lib/virtualbox-ose/VBoxREM64.so
-       usr/lib/virtualbox-ose/VBoxSharedClipboard.so
-       usr/lib/virtualbox-ose/VBoxHeadless.so
-       usr/lib/virtualbox-ose/VBoxRT.so
-       usr/lib/virtualbox-ose/VBoxREM.so
-       usr/lib/virtualbox-ose/VBoxSettings.so
-       usr/lib/virtualbox-ose/VBoxKeyboard.so
-       usr/lib/virtualbox-ose/VBoxSharedCrOpenGL.so
-       usr/lib/virtualbox-ose/VBoxVMM.so
-       usr/lib/virtualbox-ose/VirtualBox.so
-       usr/lib/virtualbox-ose/VBoxOGLhosterrorspu.so
-       usr/lib/virtualbox-ose/components/VBoxC.so
-       usr/lib/virtualbox-ose/components/VBoxSVCM.so
-       usr/lib/virtualbox-ose/components/VBoxDDU.so
-       usr/lib/virtualbox-ose/components/VBoxRT.so
-       usr/lib/virtualbox-ose/components/VBoxREM.so
-       usr/lib/virtualbox-ose/components/VBoxVMM.so
-       usr/lib/virtualbox-ose/VBoxREM32.so
-       usr/lib/virtualbox-ose/VBoxPython2_4.so
-       usr/lib/virtualbox-ose/VBoxPython2_5.so
-       usr/lib/virtualbox-ose/VBoxPython2_6.so
-       usr/lib/virtualbox-ose/VBoxXPCOMC.so
-       usr/lib/virtualbox-ose/VBoxOGLhostcrutil.so
-       usr/lib/virtualbox-ose/VBoxNetDHCP.so"
-
-pkg_setup() {
-       if ! use headless && ! use qt4 ; then
-               einfo "No USE=\"qt4\" selected, this build will not include"
-               einfo "any Qt frontend."
-       elif use headless && use qt4 ; then
-               einfo "You selected USE=\"headless qt4\", defaulting to"
-               einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-       fi
-
-       if ! use opengl ; then
-               einfo "No USE=\"opengl\" selected, this build will lack"
-               einfo "the OpenGL feature."
-       fi
-}
-
-src_prepare() {
-       # Remove shipped binaries (kBuild,yasm), see bug #232775
-       rm -rf kBuild/bin tools
-
-       # Disable things unused or split into separate ebuilds
-       sed -e "s/MY_LIBDIR/$(get_libdir)/" \
-               "${FILESDIR}"/${PN}-3-localconfig > LocalConfig.kmk || die
-
-       # unset useless/problematic mesa checks in configure
-       epatch "${FILESDIR}/${PN}-3.0.0-mesa-check.patch"
-
-}
-
-src_configure() {
-       local myconf
-       use alsa       || myconf="${myconf} --disable-alsa"
-       use opengl     || myconf="${myconf} --disable-opengl"
-       use pulseaudio || myconf="${myconf} --disable-pulse"
-       use python     || myconf="${myconf} --disable-python"
-       use hal        || myconf="${myconf} --disable-dbus"
-       use vboxwebsrv && myconf="${myconf} --enable-webservice"
-       if ! use headless ; then
-               use qt4 || myconf="${myconf} --disable-qt4"
-       else
-               myconf="${myconf} --build-headless --disable-opengl"
-       fi
-       # not an autoconf script
-       ./configure \
-               --with-gcc="$(tc-getCC)" \
-               --with-g++="$(tc-getCXX)" \
-               --disable-kmods \
-               ${myconf} \
-               || die "configure failed"
-}
-
-src_compile() {
-       source ./env.sh
-
-       # Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-       # and strip all flags
-       strip-flags
-
-       MAKE="kmk" emake \
-               TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
-               TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
-               TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
-               TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
-               TOOL_YASM_AS=yasm KBUILD_PATH="${S}/kBuild" \
-               all || die "kmk failed"
-}
-
-src_install() {
-       cd "${S}"/out/linux.*/release/bin || die
-
-       # Create configuration files
-       insinto /etc/vbox
-       newins "${FILESDIR}/${PN}-3-config" vbox.cfg
-
-       # Set the right libdir
-       sed -i \
-               -e "s/MY_LIBDIR/$(get_libdir)/" \
-               "${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-       # Symlink binaries to the shipped wrapper
-       exeinto /usr/$(get_libdir)/${PN}
-       newexe "${FILESDIR}/${PN}-3-wrapper" "VBox" || die
-       fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
-       fperms 0750 /usr/$(get_libdir)/${PN}/VBox
-
-       dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
-       dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
-       dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
-       dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
-
-       # Install binaries and libraries
-       insinto /usr/$(get_libdir)/${PN}
-       doins -r components || die
-
-       if use sdk ; then
-               doins -r sdk || die
-       fi
-
-       if use vboxwebsrv ; then
-               doins vboxwebsrv || die
-               fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
-               fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
-               dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
-               newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-               newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-       fi
-
-       for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP} *so *r0 *gc ; do
-               doins $each || die
-               fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-               fperms 0750 /usr/$(get_libdir)/${PN}/${each}
-       done
-       # VBoxNetAdpCtl binary needs to be suid root in any case..
-       fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetAdpCtl
-
-       if ! use headless ; then
-               for each in VBox{SDL,Headless} ; do
-                       doins $each || die
-                       fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-                       fperms 4750 /usr/$(get_libdir)/${PN}/${each}
-                       pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
-               done
-
-               if use opengl ; then
-                       doins VBoxTestOGL || die
-                       fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
-                       fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
-               fi
-
-               dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
-
-               if use qt4 ; then
-                       doins VirtualBox || die
-                       fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
-                       fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
-                       pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox
-
-                       dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
-               fi
-
-               newicon "${S}"/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_32px.png ${PN}.png
-               domenu "${FILESDIR}"/${PN}.desktop
-       else
-               doins VBoxHeadless || die
-               fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
-               fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
-               pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless
-       fi
-
-       insinto /usr/share/${PN}
-       if ! use headless && use qt4 ; then
-               doins -r nls
-       fi
-}
-
-pkg_postinst() {
-       fdo-mime_desktop_database_update
-       if ! use headless && use qt4 ; then
-               elog "To launch VirtualBox just type: \"VirtualBox\""
-       fi
-       elog "You must be in the vboxusers group to use VirtualBox."
-       elog ""
-       elog "The latest user manual is available for download at:"
-       elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-       elog ""
-       elog "For advanced networking setups you should emerge:"
-       elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-}
-
-pkg_postrm() {
-       fdo-mime_desktop_database_update
-}
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-3.1.4.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-3.1.4.ebuild
deleted file mode 100644 (file)
index 3226e11..0000000
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-3.1.4.ebuild,v 1.1 2010/02/14 00:02:15 patrick Exp $
-
-EAPI=2
-
-inherit eutils fdo-mime flag-o-matic linux-info pax-utils qt4 toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-       # XXX: should finish merging the -9999 ebuild into this one ...
-       ESVN_REPO_URI="http://www.virtualbox.org/svn/vbox/trunk"
-       inherit linux-mod subversion
-else
-       MY_P=VirtualBox-${PV}-OSE
-       SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
-       S=${WORKDIR}/${MY_P/-OSE/_OSE}
-fi
-
-DESCRIPTION="Software family of powerful x86 virtualization"
-HOMEPAGE="http://www.virtualbox.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+additions alsa +hal headless pulseaudio +opengl python +qt4 sdk vboxwebsrv"
-
-RDEPEND="!app-emulation/virtualbox-bin
-       ~app-emulation/virtualbox-modules-${PV}
-       dev-libs/libIDL
-       >=dev-libs/libxslt-1.1.19
-       net-misc/curl
-       !headless? (
-               qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 opengl?     ( x11-libs/qt-opengl:4 ) )
-               opengl? ( virtual/opengl virtual/glut )
-               x11-libs/libXcursor
-               media-libs/libsdl[X,video]
-               x11-libs/libXt
-       )"
-DEPEND="${RDEPEND}
-       >=dev-util/kbuild-0.1.5-r1
-       >=dev-lang/yasm-0.6.2
-       sys-devel/bin86
-       sys-devel/dev86
-       sys-power/iasl
-       media-libs/libpng
-       sys-libs/libcap
-       dev-util/pkgconfig
-       alsa? ( >=media-libs/alsa-lib-1.0.13 )
-       hal? ( sys-apps/hal )
-       pulseaudio? ( media-sound/pulseaudio )
-       python? ( >=dev-lang/python-2.3 )
-       vboxwebsrv? ( >=net-libs/gsoap-2.7.13 )"
-RDEPEND="${RDEPEND}
-       additions? ( ~app-emulation/virtualbox-ose-additions-${PV} )"
-
-QA_TEXTRELS_x86="usr/lib/virtualbox-ose/VBoxGuestPropSvc.so
-       usr/lib/virtualbox-ose/VBoxSDL.so
-       usr/lib/virtualbox-ose/VBoxSharedFolders.so
-       usr/lib/virtualbox-ose/VBoxDD2.so
-       usr/lib/virtualbox-ose/VBoxOGLrenderspu.so
-       usr/lib/virtualbox-ose/VBoxPython.so
-       usr/lib/virtualbox-ose/VBoxDD.so
-       usr/lib/virtualbox-ose/VBoxDDU.so
-       usr/lib/virtualbox-ose/VBoxREM64.so
-       usr/lib/virtualbox-ose/VBoxSharedClipboard.so
-       usr/lib/virtualbox-ose/VBoxHeadless.so
-       usr/lib/virtualbox-ose/VBoxRT.so
-       usr/lib/virtualbox-ose/VBoxREM.so
-       usr/lib/virtualbox-ose/VBoxSettings.so
-       usr/lib/virtualbox-ose/VBoxKeyboard.so
-       usr/lib/virtualbox-ose/VBoxSharedCrOpenGL.so
-       usr/lib/virtualbox-ose/VBoxVMM.so
-       usr/lib/virtualbox-ose/VirtualBox.so
-       usr/lib/virtualbox-ose/VBoxOGLhosterrorspu.so
-       usr/lib/virtualbox-ose/components/VBoxC.so
-       usr/lib/virtualbox-ose/components/VBoxSVCM.so
-       usr/lib/virtualbox-ose/components/VBoxDDU.so
-       usr/lib/virtualbox-ose/components/VBoxRT.so
-       usr/lib/virtualbox-ose/components/VBoxREM.so
-       usr/lib/virtualbox-ose/components/VBoxVMM.so
-       usr/lib/virtualbox-ose/VBoxREM32.so
-       usr/lib/virtualbox-ose/VBoxPython2_4.so
-       usr/lib/virtualbox-ose/VBoxPython2_5.so
-       usr/lib/virtualbox-ose/VBoxPython2_6.so
-       usr/lib/virtualbox-ose/VBoxXPCOMC.so
-       usr/lib/virtualbox-ose/VBoxOGLhostcrutil.so
-       usr/lib/virtualbox-ose/VBoxNetDHCP.so"
-
-pkg_setup() {
-       if ! use headless && ! use qt4 ; then
-               einfo "No USE=\"qt4\" selected, this build will not include"
-               einfo "any Qt frontend."
-       elif use headless && use qt4 ; then
-               einfo "You selected USE=\"headless qt4\", defaulting to"
-               einfo "USE=\"headless\", this build will not include any X11/Qt frontend."
-       fi
-
-       if ! use opengl ; then
-               einfo "No USE=\"opengl\" selected, this build will lack"
-               einfo "the OpenGL feature."
-       fi
-}
-
-src_prepare() {
-       # Remove shipped binaries (kBuild,yasm), see bug #232775
-       rm -rf kBuild/bin tools
-
-       # Disable things unused or split into separate ebuilds
-       sed -e "s/MY_LIBDIR/$(get_libdir)/" \
-               "${FILESDIR}"/${PN}-3-localconfig > LocalConfig.kmk || die
-
-       # unset useless/problematic mesa checks in configure
-       epatch "${FILESDIR}/${PN}-3.0.0-mesa-check.patch"
-}
-
-src_configure() {
-       local myconf
-       use alsa       || myconf="${myconf} --disable-alsa"
-       use opengl     || myconf="${myconf} --disable-opengl"
-       use pulseaudio || myconf="${myconf} --disable-pulse"
-       use python     || myconf="${myconf} --disable-python"
-       use hal        || myconf="${myconf} --disable-dbus"
-       use vboxwebsrv && myconf="${myconf} --enable-webservice"
-       if ! use headless ; then
-               use qt4 || myconf="${myconf} --disable-qt4"
-       else
-               myconf="${myconf} --build-headless --disable-opengl"
-       fi
-       # not an autoconf script
-       ./configure \
-               --with-gcc="$(tc-getCC)" \
-               --with-g++="$(tc-getCXX)" \
-               --disable-kmods \
-               ${myconf} \
-               || die "configure failed"
-}
-
-src_compile() {
-       source ./env.sh
-
-       # Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-       # and strip all flags
-       strip-flags
-
-       MAKE="kmk" emake \
-               TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
-               TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
-               TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
-               TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
-               TOOL_YASM_AS=yasm KBUILD_PATH="${S}/kBuild" \
-               all || die "kmk failed"
-}
-
-src_install() {
-       cd "${S}"/out/linux.*/release/bin || die
-
-       # Create configuration files
-       insinto /etc/vbox
-       newins "${FILESDIR}/${PN}-3-config" vbox.cfg
-
-       # Set the right libdir
-       sed -i \
-               -e "s/MY_LIBDIR/$(get_libdir)/" \
-               "${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
-
-       # Symlink binaries to the shipped wrapper
-       exeinto /usr/$(get_libdir)/${PN}
-       newexe "${FILESDIR}/${PN}-3-wrapper" "VBox" || die
-       fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBox
-       fperms 0750 /usr/$(get_libdir)/${PN}/VBox
-
-       dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxManage
-       dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxVRDP
-       dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxHeadless
-       dosym /usr/$(get_libdir)/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
-
-       # Install binaries and libraries
-       insinto /usr/$(get_libdir)/${PN}
-       doins -r components || die
-
-       if use sdk ; then
-               doins -r sdk || die
-       fi
-
-       if use vboxwebsrv ; then
-               doins vboxwebsrv || die
-               fowners root:vboxusers /usr/$(get_libdir)/${PN}/vboxwebsrv
-               fperms 0750 /usr/$(get_libdir)/${PN}/vboxwebsrv
-               dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/vboxwebsrv
-               newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
-               newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
-       fi
-
-       for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,NetAdpCtl,NetDHCP} *so *r0 *gc ; do
-               doins $each || die
-               fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-               fperms 0750 /usr/$(get_libdir)/${PN}/${each}
-       done
-       # VBoxNetAdpCtl binary needs to be suid root in any case..
-       fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetAdpCtl
-
-       if ! use headless ; then
-               for each in VBox{SDL,Headless} ; do
-                       doins $each || die
-                       fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
-                       fperms 4750 /usr/$(get_libdir)/${PN}/${each}
-                       pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
-               done
-
-               if use opengl ; then
-                       doins VBoxTestOGL || die
-                       fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
-                       fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL
-               fi
-
-               dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VBoxSDL
-
-               if use qt4 ; then
-                       doins VirtualBox || die
-                       fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
-                       fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
-                       pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox
-
-                       dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
-               fi
-
-               newicon "${S}"/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_32px.png ${PN}.png
-               domenu "${FILESDIR}"/${PN}.desktop
-       else
-               doins VBoxHeadless || die
-               fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
-               fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
-               pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless
-       fi
-
-       insinto /usr/share/${PN}
-       if ! use headless && use qt4 ; then
-               doins -r nls
-       fi
-
-       # set an env-variable for 3rd party tools
-       echo -n "VBOX_APP_HOME=/usr/$(get_libdir)/${PN}" > "${T}/90virtualbox"
-       doenvd "${T}/90virtualbox"
-}
-
-pkg_postinst() {
-       fdo-mime_desktop_database_update
-       if ! use headless && use qt4 ; then
-               elog "To launch VirtualBox just type: \"VirtualBox\""
-       fi
-       elog "You must be in the vboxusers group to use VirtualBox."
-       elog ""
-       elog "The latest user manual is available for download at:"
-       elog "http://download.virtualbox.org/virtualbox/${PV}/UserManual.pdf"
-       elog ""
-       elog "For advanced networking setups you should emerge:"
-       elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
-}
-
-pkg_postrm() {
-       fdo-mime_desktop_database_update
-}
similarity index 96%
rename from app-emulation/virtualbox-ose/virtualbox-ose-3.1.2.ebuild
rename to app-emulation/virtualbox-ose/virtualbox-ose-3.2.0.ebuild
index 9a19cb9bd4e1a4a856e3e2d814ceec219de999db..0a3ac19e4d5f9aa352283678c619bb0ea1c1630f 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-3.1.2.ebuild,v 1.1 2010/01/28 13:12:09 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-3.2.0.ebuild,v 1.1 2010/05/20 13:03:16 polynomial-c Exp $
 
 EAPI=2
 
@@ -110,7 +110,10 @@ src_prepare() {
                "${FILESDIR}"/${PN}-3-localconfig > LocalConfig.kmk || die
 
        # unset useless/problematic mesa checks in configure
-       epatch "${FILESDIR}/${PN}-3.0.0-mesa-check.patch"
+       epatch "${FILESDIR}/${PN}-3.2.0-mesa-check.patch"
+
+       # fix with newer iasl (bug #319127)
+       epatch "${FILESDIR}/${PN}-3.1.8-iasl-length-calculation-fix.patch"
 }
 
 src_configure() {
@@ -207,7 +210,7 @@ src_install() {
                        pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
                done
 
-               if use opengl ; then
+               if use opengl && use qt4 ; then
                        doins VBoxTestOGL || die
                        fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxTestOGL
                        fperms 0750 /usr/$(get_libdir)/${PN}/VBoxTestOGL