diff options
30 files changed, 1118 insertions, 346 deletions
diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog index 5bca375bf024..14ead571dd52 100644 --- a/app-emulation/virtualbox-bin/ChangeLog +++ b/app-emulation/virtualbox-bin/ChangeLog @@ -1,6 +1,21 @@ # ChangeLog for app-emulation/virtualbox-bin # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.34 2008/09/06 07:16:40 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.35 2008/09/15 19:52:56 jokey Exp $ + +*virtualbox-bin-2.0.2 (15 Sep 2008) + + 15 Sep 2008; Markus Ullmann <jokey@gentoo.org> + +files/virtualbox-bin-2.0.2-wrapper, virtualbox-bin-1.6.4.ebuild, + virtualbox-bin-1.6.6.ebuild, +virtualbox-bin-2.0.2.ebuild: + (Proxy-Commit) Port from dev overlay + + 13 Sep 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com> + virtualbox-bin-1.6.4.ebuild, virtualbox-bin-1.6.6.ebuild, + +virtualbox-bin-2.0.2.ebuild, +virtualbox-bin-2.0.2-wrapper: + Version bump: add support for the new sdk, add new wrapper for 2.x release, + add dev-libs/glib to RDEPEND, drop qt3 from USE and RDEPEND, set starters + suid (VirtualBox,VBoxSDL,VBoxHeadless) due new hardening system, restrict + old versions downloads due: http://www.virtualbox.org/ticket/2148 *virtualbox-bin-1.6.6 (06 Sep 2008) diff --git a/app-emulation/virtualbox-bin/files/virtualbox-bin-2.0.2-wrapper b/app-emulation/virtualbox-bin/files/virtualbox-bin-2.0.2-wrapper new file mode 100755 index 000000000000..3888750d717a --- /dev/null +++ b/app-emulation/virtualbox-bin/files/virtualbox-bin-2.0.2-wrapper @@ -0,0 +1,104 @@ +#!/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-1.6.4.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-1.6.4.ebuild index 9012b0c2281d..8960797d942c 100644 --- a/app-emulation/virtualbox-bin/virtualbox-bin-1.6.4.ebuild +++ b/app-emulation/virtualbox-bin/virtualbox-bin-1.6.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-1.6.4.ebuild,v 1.5 2008/09/06 07:16:40 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-1.6.4.ebuild,v 1.6 2008/09/15 19:52:56 jokey Exp $ EAPI=1 @@ -10,8 +10,8 @@ MY_P=VirtualBox-${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 )" +SRC_URI="amd64? ( ${MY_P}_amd64.run ) + x86? ( ${MY_P}_x86.run )" LICENSE="PUEL" SLOT="0" @@ -52,7 +52,21 @@ RDEPEND="!app-emulation/virtualbox-ose S=${WORKDIR} -RESTRICT="primaryuri" +RESTRICT="fetch" + +pkg_nofetch() { + # Fetch restriction added due licensing and problems downloading with + # wget, see http://www.virtualbox.org/ticket/2148 + elog "Please download the package from:" + elog "" + if use amd64 ; then + elog "http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_amd64.run" + else + elog "http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_x86.run" + fi + elog "" + elog "and then put it in ${DISTDIR}" +} pkg_setup() { # The VBoxSDL frontend needs media-libs/libsdl compiled @@ -64,8 +78,6 @@ pkg_setup() { die "media-libs/libsdl should be compiled with the \"X\" USE flag." fi fi - - check_license } src_unpack() { @@ -100,6 +112,7 @@ src_install() { doins vboxwebsrv fowners root:vboxusers /opt/VirtualBox/vboxwebsrv fperms 0750 /opt/VirtualBox/vboxwebsrv + dosym /opt/VirtualBox/VBox.sh /usr/bin/vboxwebsrv newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv fi diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-1.6.6.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-1.6.6.ebuild index 0ac0d51cf6a0..8133cd43cb38 100644 --- a/app-emulation/virtualbox-bin/virtualbox-bin-1.6.6.ebuild +++ b/app-emulation/virtualbox-bin/virtualbox-bin-1.6.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-1.6.6.ebuild,v 1.1 2008/09/06 07:16:40 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-1.6.6.ebuild,v 1.2 2008/09/15 19:52:56 jokey Exp $ EAPI=1 @@ -10,8 +10,8 @@ MY_P=VirtualBox-${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 )" +SRC_URI="amd64? ( ${MY_P}_amd64.run ) + x86? ( ${MY_P}_x86.run )" LICENSE="PUEL" SLOT="0" @@ -52,7 +52,21 @@ RDEPEND="!app-emulation/virtualbox-ose S=${WORKDIR} -RESTRICT="primaryuri" +RESTRICT="fetch" + +pkg_nofetch() { + # Fetch restriction added due licensing and problems downloading with + # wget, see http://www.virtualbox.org/ticket/2148 + elog "Please download the package from:" + elog "" + if use amd64 ; then + elog "http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_amd64.run" + else + elog "http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_x86.run" + fi + elog "" + elog "and then put it in ${DISTDIR}" +} pkg_setup() { # The VBoxSDL frontend needs media-libs/libsdl compiled @@ -64,8 +78,6 @@ pkg_setup() { die "media-libs/libsdl should be compiled with the \"X\" USE flag." fi fi - - check_license } src_unpack() { @@ -100,6 +112,7 @@ src_install() { doins vboxwebsrv fowners root:vboxusers /opt/VirtualBox/vboxwebsrv fperms 0750 /opt/VirtualBox/vboxwebsrv + dosym /opt/VirtualBox/VBox.sh /usr/bin/vboxwebsrv newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv fi diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-2.0.2.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-2.0.2.ebuild new file mode 100644 index 000000000000..daad6305eec4 --- /dev/null +++ b/app-emulation/virtualbox-bin/virtualbox-bin-2.0.2.ebuild @@ -0,0 +1,201 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-2.0.2.ebuild,v 1.1 2008/09/15 19:52:56 jokey Exp $ + +EAPI=1 + +inherit eutils fdo-mime pax-utils + +MY_PV=${PV}-36488 +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? ( ${MY_P}_amd64.run ) + x86? ( ${MY_P}_x86.run ) + sdk? ( VirtualBoxSDK-${MY_PV}.zip )" + +LICENSE="PUEL" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+additions headless sdk vboxwebsrv" + +RDEPEND="!app-emulation/virtualbox-ose + !app-emulation/virtualbox-ose-additions + ~app-emulation/virtualbox-modules-${PV} + !headless? ( + x11-libs/libXcursor + media-libs/libsdl + x11-libs/libXrender + x11-libs/libXfixes + media-libs/libmng + media-libs/jpeg + media-libs/libpng + x11-libs/libXi + x11-libs/libXrandr + x11-libs/libXinerama + virtual/xft + x11-libs/libXft + media-libs/freetype + media-libs/fontconfig + x11-libs/libXext + dev-libs/glib ) + x11-libs/libXt + dev-libs/libxml2 + x11-libs/libXau + x11-libs/libX11 + x11-libs/libSM + x11-libs/libICE + x11-libs/libXdmcp + sys-apps/usermode-utilities + net-misc/bridge-utils + x86? ( =virtual/libstdc++-3.3 )" + +S=${WORKDIR} + +RESTRICT="fetch" + +pkg_nofetch() { + # Fetch restriction added due licensing and problems downloading with + # wget, see http://www.virtualbox.org/ticket/2148 + elog "Please download:" + elog "" + if use amd64 ; then + elog "http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_amd64.run" + else + elog "http://download.virtualbox.org/virtualbox/${PV}/${MY_P}_x86.run" + fi + if use sdk; then + elog "http://download.virtualbox.org/virtualbox/${PV}/VirtualBoxSDK-${MY_PV}.zip" + fi + elog "" + elog "and then put file(s) in ${DISTDIR}" +} + +pkg_setup() { + # The VBoxSDL frontend needs media-libs/libsdl compiled + # with USE flag X enabled (bug #177335) + if ! use headless ; then + if ! built_with_use media-libs/libsdl X ; then + eerror "media-libs/libsdl was compiled without the \"X\" USE flag enabled." + eerror "Please re-emerge media-libs/libsdl with USE=\"X\"." + die "media-libs/libsdl should be compiled with the \"X\" USE flag." + fi + fi +} + +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 + newins "${FILESDIR}/${PN}-interfaces" interfaces + + if ! use headless ; then + newicon VBox.png virtualbox.png + newmenu "${FILESDIR}"/${PN}.desktop virtualbox.desktop + fi + + insinto /opt/VirtualBox + + doins UserManual.pdf + + if use sdk ; then + doins -r sdk + fi + + if use additions; then + doins -r additions + fi + + if use vboxwebsrv; then + doins vboxwebsrv + fowners root:vboxusers /opt/VirtualBox/vboxwebsrv + fperms 0750 /opt/VirtualBox/vboxwebsrv + dosym /opt/VirtualBox/VBox.sh /usr/bin/vboxwebsrv + newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv + newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv + fi + + rm -rf src rdesktop* deffiles install* routines.sh runlevel.sh \ + vboxdrv.sh VBox.sh VBox.png vboxnet.sh kchmviewer additions VirtualBox.desktop \ + VirtualBox.tar.bz2 LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv webtest + + if use headless ; then + rm -rf VBoxSDL VirtualBox VBoxKeyboard.so VirtualBoxAPI.chm \ + VirtualBox.chm + 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 + + for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl}; do + fowners root:vboxusers /opt/VirtualBox/${each} + fperms 0750 /opt/VirtualBox/${each} + pax-mark -m "${D}"/opt/VirtualBox/${each} + done + + 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 4511 /opt/VirtualBox/${each} + pax-mark -m "${D}"/opt/VirtualBox/${each} + done + + dosym /opt/VirtualBox/VBox.sh /usr/bin/VirtualBox + dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxSDL + else + # Hardened build: Mark selected binaries set-user-ID-on-execution + fowners root:vboxusers /opt/VirtualBox/VBoxHeadless + fperms 4511 /opt/VirtualBox/VBoxHeadless + pax-mark -m "${D}"/opt/VirtualBox/VBoxHeadless + fi + + exeinto /opt/VirtualBox + newexe "${FILESDIR}/${P}-wrapper" "VBox.sh" || die + fowners root:vboxusers /opt/VirtualBox/VBox.sh + fperms 0750 /opt/VirtualBox/VBox.sh + fowners root:vboxusers /opt/VirtualBox/VBoxAddIF.sh + fperms 0750 /opt/VirtualBox/VBoxAddIF.sh + + dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxManage + dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxVRDP + dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxHeadless + dosym /opt/VirtualBox/VBoxTunctl /usr/bin/VBoxTunctl + dosym /opt/VirtualBox/VBoxAddIF.sh /usr/bin/VBoxAddIF + dosym /opt/VirtualBox/VBoxAddIF.sh /usr/bin/VBoxDeleteIF +} + +pkg_postinst() { + fdo-mime_desktop_database_update + elog "" + if ! use headless ; then + elog "To launch VirtualBox just type: \"VirtualBox\"" + elog "" + elog "In order to use the online help, create a link" + elog "to your favourite chm viewer, for example:" + elog "ln -s /usr/bin/kchmviewer /opt/VirtualBox/kchmviewer" + elog "" + fi + elog "You must be in the vboxusers group to use VirtualBox." + elog "" +} + +pkg_postrm() { + fdo-mime_desktop_database_update +} diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog index 590767e333ac..39a921e893bf 100644 --- a/app-emulation/virtualbox-guest-additions/ChangeLog +++ b/app-emulation/virtualbox-guest-additions/ChangeLog @@ -1,6 +1,22 @@ # ChangeLog for app-emulation/virtualbox-guest-additions # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.4 2008/09/06 19:30:00 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.5 2008/09/15 19:50:08 jokey Exp $ + +*virtualbox-guest-additions-2.0.2 (15 Sep 2008) + + 15 Sep 2008; Markus Ullmann <jokey@gentoo.org> + files/virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch, + +files/virtualbox-guest-additions-2.0.2-localconfig, + virtualbox-guest-additions-1.6.4-r2.ebuild, + virtualbox-guest-additions-1.6.6.ebuild, + +virtualbox-guest-additions-2.0.2.ebuild: + (Proxy-Commit) Port from dev overlay + + 13 Sep 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com> + +virtualbox-guest-additions-2.0.2.ebuild, + +files/virtualbox-guest-additions-2.0.2-localconfig: + Version bump, add VBoxControl command line utility, force 2.0.2 to build + with dev-util/kbuild-0.1.4 *virtualbox-guest-additions-1.6.6 (06 Sep 2008) *virtualbox-guest-additions-1.6.4-r2 (06 Sep 2008) diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch index 83ad78acf1b2..25d928871f39 100644 --- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch +++ b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch @@ -1,7 +1,7 @@ --- src/apps/Makefile.kmk 1970-01-01 01:00:00.000000000 +0100 +++ src/apps/Makefile.kmk 2008-08-02 16:06:11.358197514 +0200 @@ -0,0 +1,28 @@ -+# $Id: virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch,v 1.3 2008/09/06 19:30:01 jokey Exp $ ++# $Id: virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch,v 1.4 2008/09/15 19:50:09 jokey Exp $ +## @file +# Sub-Makefile for the external apps. +# @@ -32,7 +32,7 @@ --- src/apps/tunctl/Makefile.kmk 1970-01-01 01:00:00.000000000 +0100 +++ src/apps/tunctl/Makefile.kmk 2008-08-02 16:06:37.447936207 +0200 @@ -0,0 +1,32 @@ -+# $Id: virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch,v 1.3 2008/09/06 19:30:01 jokey Exp $ ++# $Id: virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch,v 1.4 2008/09/15 19:50:09 jokey Exp $ +## @file +# Sub-Makefile for VBoxTunctl +# diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-2.0.2-localconfig b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-2.0.2-localconfig new file mode 100644 index 000000000000..3e1f7d8cbb32 --- /dev/null +++ b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-2.0.2-localconfig @@ -0,0 +1,27 @@ +# -*- 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. +# + +# don't build testcases to save time, they are not needed for the package +VBOX_WITH_TESTCASES := +VBOX_WITH_TESTSUITE := + +KBUILD_MSG_STYLE := brief + +## paths, origin, hardening +VBOX_WITH_HARDENING := 2 +VBOX_WITH_ORIGIN := + diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.4-r2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.4-r2.ebuild index 2acd337c3b9a..259a71368e2f 100644 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.4-r2.ebuild +++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.4-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.4-r2.ebuild,v 1.1 2008/09/06 19:30:00 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.4-r2.ebuild,v 1.2 2008/09/15 19:50:08 jokey Exp $ inherit eutils linux-mod diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.6.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.6.ebuild index d2eeb73f6896..b8829e399c7c 100644 --- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.6.ebuild +++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.6.ebuild,v 1.1 2008/09/06 19:30:00 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.6.ebuild,v 1.2 2008/09/15 19:50:08 jokey Exp $ inherit eutils linux-mod diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.0.2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.0.2.ebuild new file mode 100644 index 000000000000..e3a8e83e601d --- /dev/null +++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.0.2.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.0.2.ebuild,v 1.1 2008/09/15 19:50:08 jokey Exp $ + +inherit eutils linux-mod + +MY_P=VirtualBox-${PV}-OSE +DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests" +HOMEPAGE="http://www.virtualbox.org/" +SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="X" + +RDEPEND="x11-libs/libXt + amd64? ( app-emulation/emul-linux-x86-xlibs ) + X? ( ~x11-drivers/xf86-video-virtualbox-${PV} + ~x11-drivers/xf86-input-virtualbox-${PV} + x11-apps/xrandr + x11-apps/xrefresh )" +DEPEND="${RDEPEND} + >=dev-util/kbuild-0.1.4 + >=dev-lang/yasm-0.6.2 + sys-devel/bin86 + sys-devel/dev86 + sys-power/iasl + x11-proto/renderproto" + +BUILD_TARGETS="all" +BUILD_TARGET_ARCH="${ARCH}" +MODULE_NAMES="vboxadd(misc:${WORKDIR}/vboxadd:${WORKDIR}/vboxadd) + vboxvfs(misc:${WORKDIR}/vboxvfs:${WORKDIR}/vboxvfs)" + +S=${WORKDIR}/${MY_P/-OSE/} + +pkg_setup() { + linux-mod_pkg_setup + BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}" +} + +src_unpack() { + unpack ${A} + + # Create and unpack a tarball with the sources of the Linux guest + # kernel modules, to include all the needed files + "${MY_P/-OSE/}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz" + unpack ./vbox-kmod.tar.gz + + # Remove shipped binaries (kBuild,yasm), see bug #232775 + cd "${S}" + rm -rf kBuild/bin tools + + # Disable things unused or splitted into separate ebuilds + cp "${FILESDIR}/${P}-localconfig" LocalConfig.kmk +} + +src_compile() { + linux-mod_src_compile + + # build the user-space tools, warnings are harmless + ./configure --nofatal \ + --disable-xpcom \ + --disable-sdl-ttf \ + --disable-pulse \ + --disable-alsa \ + --build-headless || die "configure failed" + source ./env.sh + + for each in src/VBox/{Runtime,Additions/common} \ + src/VBox/Additions/linux{sharefolders,daemon} ; do + MAKE="kmk" emake TOOL_YASM_AS=yasm \ + KBUILD_PATH="${S}/kBuild" \ + || die "kmk failed" + done +} + +src_install() { + linux-mod_src_install + + cd "${S}"/out/linux.${ARCH}/release/bin/additions + + # shared folders + insinto /sbin + newins mountvboxsf mount.vboxsf + fperms 4755 /sbin/mount.vboxsf + + # time synchronisation system service + insinto /usr/sbin + doins vboxadd-timesync + fperms 0755 /usr/sbin/vboxadd-timesync + + newinitd "${FILESDIR}"/${PN}.initd ${PN} + + # VBoxClient user service and xrandr wrapper + if use X; then + insinto /usr/bin + + doins VBoxClient + doins VBoxComtrol + fperms 4755 /usr/bin/VBoxClient + fperms 4755 /usr/bin/VBoxControl + + dodir /etc/X11/xinit/xinitrc.d/ + echo -e "#/bin/sh\n/usr/bin/VBoxClient" \ + >> "${D}/etc/X11/xinit/xinitrc.d/98VBoxClient" + fperms 0755 /etc/X11/xinit/xinitrc.d/98VBoxClient + + cd "${S}"/src/VBox/Additions/x11/installer + newins VBoxRandR.sh VBoxRandR + fperms 0755 /usr/bin/VBoxRandR + fi + + # udev rule for vboxdrv + dodir /etc/udev/rules.d + echo 'KERNEL=="vboxadd", NAME="vboxadd", OWNER="root", MODE="0660"' \ + >> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules" +} + +pkg_postinst() { + linux-mod_pkg_postinst + if ! useq X ; then + elog "use flag X is off, enable it to install the" + elog "X Window System input and video drivers" + fi + elog "Please add:" + elog "/etc/init.d/${PN}" + elog "to the default runlevel in order to load all" + elog "needed modules and services." + elog "" + elog "Warning:" + elog "this ebuild is only needed if you are running gentoo" + elog "inside a VirtualBox Virtual Machine, you don't need" + elog "it to run VirtualBox itself." + elog "" +} diff --git a/app-emulation/virtualbox-modules/ChangeLog b/app-emulation/virtualbox-modules/ChangeLog index f795cb81dc6d..fde12334307e 100644 --- a/app-emulation/virtualbox-modules/ChangeLog +++ b/app-emulation/virtualbox-modules/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for app-emulation/virtualbox-modules # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.24 2008/09/08 05:11:13 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.25 2008/09/15 19:52:13 jokey Exp $ + +*virtualbox-modules-2.0.2 (15 Sep 2008) + + 15 Sep 2008; Markus Ullmann <jokey@gentoo.org> + -virtualbox-modules-1.6.2.ebuild, virtualbox-modules-1.6.4.ebuild, + virtualbox-modules-1.6.6.ebuild, +virtualbox-modules-2.0.2.ebuild: + (Proxy-Commit) Port from dev overlay + + 14 Sep 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com> ChangeLog: + +virtualbox-modules-2.0.2.ebuild, -virtualbox-modules-1.6.2.ebuild: + Version Bump *virtualbox-modules-1.6.6 (06 Sep 2008) diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-1.6.4.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-1.6.4.ebuild index f5d3e7636b51..c4b0cbe86e16 100644 --- a/app-emulation/virtualbox-modules/virtualbox-modules-1.6.4.ebuild +++ b/app-emulation/virtualbox-modules/virtualbox-modules-1.6.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-1.6.4.ebuild,v 1.4 2008/09/06 07:16:12 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-1.6.4.ebuild,v 1.5 2008/09/15 19:52:13 jokey Exp $ inherit eutils linux-mod diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-1.6.6.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-1.6.6.ebuild index d8ff1a5d51fb..45cfc00c15ad 100644 --- a/app-emulation/virtualbox-modules/virtualbox-modules-1.6.6.ebuild +++ b/app-emulation/virtualbox-modules/virtualbox-modules-1.6.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-1.6.6.ebuild,v 1.1 2008/09/06 07:16:12 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-1.6.6.ebuild,v 1.2 2008/09/15 19:52:13 jokey Exp $ inherit eutils linux-mod diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-1.6.2.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-2.0.2.ebuild index 79aab9a330b5..2de66da73261 100644 --- a/app-emulation/virtualbox-modules/virtualbox-modules-1.6.2.ebuild +++ b/app-emulation/virtualbox-modules/virtualbox-modules-2.0.2.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-1.6.2.ebuild,v 1.3 2008/09/06 07:16:12 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-2.0.2.ebuild,v 1.1 2008/09/15 19:52:13 jokey Exp $ inherit eutils linux-mod MY_P=vbox-kernel-module-src-${PV} -DESCRIPTION="Modules for Virtualbox OSE" +DESCRIPTION="Kernel Modules for Virtualbox" HOMEPAGE="http://www.virtualbox.org/" -SRC_URI="http://gentoo.zerodev.it/files/${MY_P}.tar.gz" +SRC_URI="http://gentoo.zerodev.it/files/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" diff --git a/app-emulation/virtualbox-ose-additions/ChangeLog b/app-emulation/virtualbox-ose-additions/ChangeLog index 9745afa2d870..418633e23c66 100644 --- a/app-emulation/virtualbox-ose-additions/ChangeLog +++ b/app-emulation/virtualbox-ose-additions/ChangeLog @@ -1,6 +1,21 @@ # ChangeLog for app-emulation/virtualbox-ose-additions # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose-additions/ChangeLog,v 1.5 2008/09/08 05:13:05 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose-additions/ChangeLog,v 1.6 2008/09/15 19:53:46 jokey Exp $ + +*virtualbox-ose-additions-2.0.2 (15 Sep 2008) + + 15 Sep 2008; Markus Ullmann <jokey@gentoo.org> + -virtualbox-ose-additions-1.6.2.ebuild, + virtualbox-ose-additions-1.6.4.ebuild, + virtualbox-ose-additions-1.6.6.ebuild, + +virtualbox-ose-additions-2.0.2.ebuild: + (Proxy-Commit) Port from dev overlay + + 13 Sep 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com> + -virtualbox-ose-additions-1.6.2.ebuild, + +virtualbox-ose-additions-2.0.2.ebuild: + Version bump; install files in /usr/share/virtualbox-ose rather than in + /opt/VirtualBox *virtualbox-ose-additions-1.6.6 (06 Sep 2008) diff --git a/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-1.6.4.ebuild b/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-1.6.4.ebuild index e2346015b21d..5b89dcc08eb9 100644 --- a/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-1.6.4.ebuild +++ b/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-1.6.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 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-1.6.4.ebuild,v 1.3 2008/09/06 19:20:28 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-1.6.4.ebuild,v 1.4 2008/09/15 19:53:46 jokey Exp $ inherit eutils @@ -9,7 +9,7 @@ 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" +SRC_URI="${MY_P}.iso" LICENSE="PUEL" SLOT="0" @@ -19,10 +19,16 @@ IUSE="" RDEPEND="!app-emulation/virtualbox-bin !=app-emulation/virtualbox-ose-9999" -RESTRICT="primaryuri" +RESTRICT="fetch" -pkg_setup() { - check_license +pkg_nofetch() { + # Fetch restriction added due licensing and problems downloading with + # wget, see http://www.virtualbox.org/ticket/2148 + elog "Please download the package from:" + elog "" + elog "http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso" + elog "" + elog "and then put it in ${DISTDIR}" } src_unpack() { diff --git a/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-1.6.6.ebuild b/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-1.6.6.ebuild index 25658fa994b7..ab84b73ff9fd 100644 --- a/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-1.6.6.ebuild +++ b/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-1.6.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 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-1.6.6.ebuild,v 1.1 2008/09/06 19:20:28 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-1.6.6.ebuild,v 1.2 2008/09/15 19:53:46 jokey Exp $ inherit eutils @@ -9,7 +9,7 @@ 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" +SRC_URI="${MY_P}.iso" LICENSE="PUEL" SLOT="0" @@ -19,10 +19,16 @@ IUSE="" RDEPEND="!app-emulation/virtualbox-bin !=app-emulation/virtualbox-ose-9999" -RESTRICT="primaryuri" +RESTRICT="fetch" -pkg_setup() { - check_license +pkg_nofetch() { + # Fetch restriction added due licensing and problems downloading with + # wget, see http://www.virtualbox.org/ticket/2148 + elog "Please download the package from:" + elog "" + elog "http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso" + elog "" + elog "and then put it in ${DISTDIR}" } src_unpack() { diff --git a/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-1.6.2.ebuild b/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-2.0.2.ebuild index 9b89a4d493ce..4387ab7c3e5b 100644 --- a/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-1.6.2.ebuild +++ b/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-2.0.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 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-1.6.2.ebuild,v 1.2 2008/09/06 19:20:28 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose-additions/virtualbox-ose-additions-2.0.2.ebuild,v 1.1 2008/09/15 19:53:46 jokey Exp $ inherit eutils @@ -9,7 +9,7 @@ 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" +SRC_URI="${MY_P}.iso" LICENSE="PUEL" SLOT="0" @@ -19,10 +19,16 @@ IUSE="" RDEPEND="!app-emulation/virtualbox-bin !=app-emulation/virtualbox-ose-9999" -RESTRICT="primaryuri" +RESTRICT="fetch" -pkg_setup() { - check_license +pkg_nofetch() { + # Fetch restriction added due licensing and problems downloading with + # wget, see http://www.virtualbox.org/ticket/2148 + elog "Please download the package from:" + elog "" + elog "http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.iso" + elog "" + elog "and then put it in ${DISTDIR}" } src_unpack() { @@ -30,6 +36,6 @@ src_unpack() { } src_install() { - insinto /opt/VirtualBox/additions + insinto /usr/share/${PN/-additions} newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso } diff --git a/app-emulation/virtualbox-ose/ChangeLog b/app-emulation/virtualbox-ose/ChangeLog index adf69b6abea2..1675e8b40bd2 100644 --- a/app-emulation/virtualbox-ose/ChangeLog +++ b/app-emulation/virtualbox-ose/ChangeLog @@ -1,6 +1,36 @@ # ChangeLog for app-emulation/virtualbox-ose # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.5 2008/09/08 05:14:46 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.6 2008/09/15 19:54:48 jokey Exp $ + +*virtualbox-ose-2.0.2 (15 Sep 2008) + + 15 Sep 2008; Markus Ullmann <jokey@gentoo.org> + -files/virtualbox-ose-1.6.2-remove-unused.patch, + files/virtualbox-ose-1.6.4-fix-missing-makefiles.patch, + +files/virtualbox-ose-2.0.2-config, + +files/virtualbox-ose-2.0.2-localconfig, + +files/virtualbox-ose-2.0.2-wrapper, -virtualbox-ose-1.6.2.ebuild, + virtualbox-ose-1.6.4.ebuild, virtualbox-ose-1.6.6.ebuild, + +virtualbox-ose-2.0.2.ebuild, virtualbox-ose-9999.ebuild: + (Proxy-Commit) Port from dev overlay + + 13 Sep 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com> + -virtualbox-ose-1.6.2.ebuild, virtualbox-ose-1.6.4.ebuild, + virtualbox-ose-1.6.6.ebuild, +virtualbox-ose-2.0.2.ebuild, + -files/virtualbox-ose-1.6.2-remove-unused.patch, + +files/virtualbox-ose-2.0.2-config, + +files/virtualbox-ose-2.0.2-localconfig, + +files/virtualbox-ose-2.0.2-wrapper, virtualbox-ose-9999.ebuild: + Version bump: drop support for deprecated (by upstream) qt3 and add support + for qt4, use LocalConfig.kmk to exclude splitted stuff and speed up the + build process, install files under /usr/share/ rather than /opt/VirtualBox, + disable DT_RPATH='' on binaries, add new VBox wrapper, rename wrapper + VBoxAddIF.sh to VBoxAddIF, set starters suid + (VirtualBox,VBoxSDL,VBoxHeadless) due new hardening system, force 2.0.2 to + build with dev-util/kbuild-0.1.4, add python USE flag, fix VBoxREM2.rel + installation on amd64 hosts (Thanks to Christian Authmann bug #236692); + disable unneeded qt4 detection in virtualbox 1.6.x ebuilds see bug #236729; + don't install additions by default bug #236930 *virtualbox-ose-1.6.6 (06 Sep 2008) diff --git a/app-emulation/virtualbox-ose/files/virtualbox-ose-1.6.2-remove-unused.patch b/app-emulation/virtualbox-ose/files/virtualbox-ose-1.6.2-remove-unused.patch deleted file mode 100644 index 6f072d2c41a2..000000000000 --- a/app-emulation/virtualbox-ose/files/virtualbox-ose-1.6.2-remove-unused.patch +++ /dev/null @@ -1,87 +0,0 @@ ---- Config.kmk.orig 2008-06-06 17:14:01.000000000 +0200 -+++ Config.kmk 2008-06-06 17:15:47.000000000 +0200 -@@ -132,26 +132,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 -@@ -207,7 +207,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). -@@ -243,9 +243,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-06-06 17:14:06.000000000 +0200 -+++ configure 2008-06-06 17:15:32.000000000 +0200 -@@ -1785,14 +1785,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-1.6.4-fix-missing-makefiles.patch b/app-emulation/virtualbox-ose/files/virtualbox-ose-1.6.4-fix-missing-makefiles.patch index bdb0596def99..d170042186c5 100644 --- a/app-emulation/virtualbox-ose/files/virtualbox-ose-1.6.4-fix-missing-makefiles.patch +++ b/app-emulation/virtualbox-ose/files/virtualbox-ose-1.6.4-fix-missing-makefiles.patch @@ -1,7 +1,7 @@ --- src/apps/Makefile.kmk 1970-01-01 01:00:00.000000000 +0100 +++ src/apps/Makefile.kmk 2008-08-02 16:06:11.358197514 +0200 @@ -0,0 +1,28 @@ -+# $Id: virtualbox-ose-1.6.4-fix-missing-makefiles.patch,v 1.2 2008/09/06 19:21:40 jokey Exp $ ++# $Id: virtualbox-ose-1.6.4-fix-missing-makefiles.patch,v 1.3 2008/09/15 19:54:49 jokey Exp $ +## @file +# Sub-Makefile for the external apps. +# @@ -32,7 +32,7 @@ --- src/apps/tunctl/Makefile.kmk 1970-01-01 01:00:00.000000000 +0100 +++ src/apps/tunctl/Makefile.kmk 2008-08-02 16:06:37.447936207 +0200 @@ -0,0 +1,32 @@ -+# $Id: virtualbox-ose-1.6.4-fix-missing-makefiles.patch,v 1.2 2008/09/06 19:21:40 jokey Exp $ ++# $Id: virtualbox-ose-1.6.4-fix-missing-makefiles.patch,v 1.3 2008/09/15 19:54:49 jokey Exp $ +## @file +# Sub-Makefile for VBoxTunctl +# diff --git a/app-emulation/virtualbox-ose/files/virtualbox-ose-2.0.2-config b/app-emulation/virtualbox-ose/files/virtualbox-ose-2.0.2-config new file mode 100644 index 000000000000..5ca78464eaf4 --- /dev/null +++ b/app-emulation/virtualbox-ose/files/virtualbox-ose-2.0.2-config @@ -0,0 +1 @@ +INSTALL_DIR=/usr/lib/virtualbox-ose diff --git a/app-emulation/virtualbox-ose/files/virtualbox-ose-2.0.2-localconfig b/app-emulation/virtualbox-ose/files/virtualbox-ose-2.0.2-localconfig new file mode 100644 index 000000000000..20e2c5a11137 --- /dev/null +++ b/app-emulation/virtualbox-ose/files/virtualbox-ose-2.0.2-localconfig @@ -0,0 +1,43 @@ +# -*- 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/lib/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.0.2-wrapper b/app-emulation/virtualbox-ose/files/virtualbox-ose-2.0.2-wrapper new file mode 100644 index 000000000000..393818bb119d --- /dev/null +++ b/app-emulation/virtualbox-ose/files/virtualbox-ose-2.0.2-wrapper @@ -0,0 +1,100 @@ +#!/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/virtualbox-ose-1.6.2.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-1.6.2.ebuild deleted file mode 100644 index 3263b773155a..000000000000 --- a/app-emulation/virtualbox-ose/virtualbox-ose-1.6.2.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-1.6.2.ebuild,v 1.2 2008/09/06 19:21:39 jokey Exp $ - -EAPI=1 - -inherit eutils fdo-mime flag-o-matic qt3 toolchain-funcs - -MY_P=VirtualBox-${PV}-OSE -DESCRIPTION="Softwarefamily of powerful x86 virtualization" -HOMEPAGE="http://www.virtualbox.org/" -SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+additions alsa headless pulseaudio sdk" - -RDEPEND="!app-emulation/virtualbox-bin - ~app-emulation/virtualbox-modules-${PV} - dev-libs/libIDL - >=dev-libs/libxslt-1.1.19 - dev-libs/xalan-c - dev-libs/xerces-c - !headless? ( - x11-libs/qt:3 - x11-libs/libXcursor - media-libs/libsdl - x11-libs/libXt )" -DEPEND="${RDEPEND} - sys-devel/bin86 - sys-devel/dev86 - sys-power/iasl - media-libs/libpng - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - pulseaudio? ( media-sound/pulseaudio )" -# sys-apps/hal is required at runtime (bug #197541) -RDEPEND="${RDEPEND} - additions? ( ~app-emulation/virtualbox-ose-additions-${PV} ) - sys-apps/usermode-utilities - net-misc/bridge-utils - sys-apps/hal" - -S=${WORKDIR}/${MY_P/-OSE/} - -pkg_setup() { - # The VBoxSDL frontend needs media-libs/libsdl compiled - # with USE flag X enabled (bug #177335) - if ! use headless; then - if ! built_with_use media-libs/libsdl X; then - eerror "media-libs/libsdl was compiled without the \"X\" USE flag enabled." - eerror "Please re-emerge media-libs/libsdl with USE=\"X\"." - die "media-libs/libsdl should be compiled with the \"X\" USE flag." - fi - fi -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # Don't build things unused or splitted into separate ebuilds (eg: additions) - epatch "${FILESDIR}/${P}-remove-unused.patch" -} - -src_compile() { - - local myconf - # Don't build vboxdrv kernel module - myconf="--disable-kmods" - - if ! use pulseaudio; then - myconf="${myconf} --disable-pulse" - fi - if ! use alsa; then - myconf="${myconf} --disable-alsa" - fi - if use headless; then - myconf="${myconf} --build-headless" - fi - - ./configure \ - ${myconf} || die "configure failed" - 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}" \ - all || die "kmk failed" -} - -src_install() { - cd "${S}"/out/linux.${ARCH}/release/bin - - # create virtualbox configurations files - insinto /etc/vbox - newins "${FILESDIR}/${PN}-config" vbox.cfg - newins "${FILESDIR}/${PN}-interfaces" interfaces - - insinto /opt/VirtualBox - if use sdk; then - doins -r sdk - fowners root:vboxusers /opt/VirtualBox/sdk/bin/xpidl - fperms 0750 /opt/VirtualBox/sdk/bin/xpidl - fi - - rm -rf sdk src tst* testcase xpidl SUPInstall SUPUninstall VBox.png \ - VBoxBFE vditool VBoxSysInfo.sh vboxkeyboard.tar.gz - - doins -r * - - if ! use headless; then - for each in VBox{Manage,SDL,SVC,XPCOMIPCD,Tunctl,Headless} VirtualBox ; do - fowners root:vboxusers /opt/VirtualBox/${each} - fperms 0750 /opt/VirtualBox/${each} - done - - dosym /opt/VirtualBox/VBox.sh /usr/bin/VirtualBox - dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxSDL - - newicon "${S}"/src/VBox/Frontends/VirtualBox/images/OSE/VirtualBox_32px.png ${PN}.png - domenu "${FILESDIR}"/${PN}.desktop - else - for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,Headless} ; do - fowners root:vboxusers /opt/VirtualBox/${each} - fperms 0750 /opt/VirtualBox/${each} - done - fi - - exeinto /opt/VirtualBox - newexe "${FILESDIR}/${PN}-wrapper" "VBox.sh" || die - fowners root:vboxusers /opt/VirtualBox/VBox.sh - fperms 0750 /opt/VirtualBox/VBox.sh - newexe "${S}"/src/VBox/Installer/linux/VBoxAddIF.sh "VBoxAddIF.sh" || die - fowners root:vboxusers /opt/VirtualBox/VBoxAddIF.sh - fperms 0750 /opt/VirtualBox/VBoxAddIF.sh - - dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxManage - dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxHeadless - dosym /opt/VirtualBox/VBoxTunctl /usr/bin/VBoxTunctl - dosym /opt/VirtualBox/VBoxAddIF.sh /usr/bin/VBoxAddIF - dosym /opt/VirtualBox/VBoxAddIF.sh /usr/bin/VBoxDeleteIF -} - -pkg_postinst() { - fdo-mime_desktop_database_update - elog "" - if ! use headless; then - elog "To launch VirtualBox just type: \"VirtualBox\"" - fi - elog "You must be in the vboxusers group to use VirtualBox." - elog "" - elog "The last user manual is available for download at:" - elog "http://www.virtualbox.org/download/UserManual.pdf" - elog "" -} - -pkg_postrm() { - fdo-mime_desktop_database_update -} diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-1.6.4.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-1.6.4.ebuild index 5ada95fe3357..140a82f17017 100644 --- a/app-emulation/virtualbox-ose/virtualbox-ose-1.6.4.ebuild +++ b/app-emulation/virtualbox-ose/virtualbox-ose-1.6.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-1.6.4.ebuild,v 1.3 2008/09/06 19:21:39 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-1.6.4.ebuild,v 1.4 2008/09/15 19:54:48 jokey Exp $ EAPI=1 @@ -14,7 +14,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -IUSE="+additions alsa headless pulseaudio sdk" +IUSE="additions alsa headless pulseaudio sdk" RDEPEND="!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-${PV} @@ -77,7 +77,7 @@ src_compile() { local myconf # Don't build vboxdrv kernel module - myconf="--disable-kmods" + myconf="--disable-kmods --disable-qt4" if ! use pulseaudio; then myconf="${myconf} --disable-pulse" diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-1.6.6.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-1.6.6.ebuild index cc1f18e8330d..dd12a24d1513 100644 --- a/app-emulation/virtualbox-ose/virtualbox-ose-1.6.6.ebuild +++ b/app-emulation/virtualbox-ose/virtualbox-ose-1.6.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-1.6.6.ebuild,v 1.1 2008/09/06 19:21:39 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-1.6.6.ebuild,v 1.2 2008/09/15 19:54:48 jokey Exp $ EAPI=1 @@ -14,7 +14,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="+additions alsa headless pulseaudio +qt3 sdk" +IUSE="additions alsa headless pulseaudio +qt3 sdk" RDEPEND="!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-${PV} @@ -62,6 +62,12 @@ pkg_setup() { eerror "Please re-emerge media-libs/libsdl with USE=\"X\"." die "media-libs/libsdl should be compiled with the \"X\" USE flag." fi + if ! use qt3; then + einfo "" + einfo "No USE=\"qt3\" selected, this build will not include" + einfo "any Qt frontend." + einfo "" + fi else if use qt3; then einfo "" diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-2.0.2.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-2.0.2.ebuild new file mode 100644 index 000000000000..df50f7eeeea4 --- /dev/null +++ b/app-emulation/virtualbox-ose/virtualbox-ose-2.0.2.ebuild @@ -0,0 +1,223 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-2.0.2.ebuild,v 1.1 2008/09/15 19:54:48 jokey Exp $ + +EAPI=1 + +inherit eutils fdo-mime flag-o-matic qt4 toolchain-funcs + +MY_P=VirtualBox-${PV}-OSE +DESCRIPTION="Softwarefamily of powerful x86 virtualization" +HOMEPAGE="http://www.virtualbox.org/" +SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+additions alsa headless pulseaudio python +qt4 sdk" + +RDEPEND="!app-emulation/virtualbox-bin + ~app-emulation/virtualbox-modules-${PV} + dev-libs/libIDL + >=dev-libs/libxslt-1.1.19 + dev-libs/xalan-c + dev-libs/xerces-c + !headless? ( + qt4? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) ) + x11-libs/libXcursor + media-libs/libsdl + x11-libs/libXt )" +DEPEND="${RDEPEND} + >=dev-util/kbuild-0.1.4 + >=dev-lang/yasm-0.6.2 + sys-devel/bin86 + sys-devel/dev86 + sys-power/iasl + media-libs/libpng + alsa? ( >=media-libs/alsa-lib-1.0.13 ) + pulseaudio? ( media-sound/pulseaudio ) + python? ( >=dev-lang/python-2.3 )" +# sys-apps/hal is required at runtime (bug #197541) +RDEPEND="${RDEPEND} + additions? ( ~app-emulation/virtualbox-ose-additions-${PV} ) + sys-apps/usermode-utilities + net-misc/bridge-utils + sys-apps/hal" + +S=${WORKDIR}/${MY_P/-OSE/} + +pkg_setup() { + # known problems with gcc 4.3 and the recompiler + # http://www.virtualbox.org/ticket/936 + if [[ "$(gcc-major-version)$(gcc-minor-version)" == "43" ]]; then + eerror "there are known problems with gcc 4.3 and the virtualbox" + eerror "recompiler stuff. Please use at least a version of gcc < 4.3" + die "gcc 4.3 cannot build the virtualbox recompiler" + fi + + if ! use headless; then + # The VBoxSDL frontend needs media-libs/libsdl compiled + # with USE flag X enabled (bug #177335) + if ! built_with_use media-libs/libsdl X; then + eerror "media-libs/libsdl was compiled without the \"X\" USE flag enabled." + eerror "Please re-emerge media-libs/libsdl with USE=\"X\"." + die "media-libs/libsdl should be compiled with the \"X\" USE flag." + fi + if ! use qt4; then + einfo "" + einfo "No USE=\"qt4\" selected, this build will not include" + einfo "any Qt frontend." + einfo "" + fi + else + if use qt4; then + einfo "" + einfo "You selected USE=\"headless qt4\", defaulting to" + einfo "USE=\"headless\", this build will not include any X11/Qt frontend." + einfo "" + fi + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + + # Remove shipped binaries (kBuild,yasm), see bug #232775 + rm -rf kBuild/bin tools + + # Disable things unused or splitted into separate ebuilds + cp "${FILESDIR}/${P}-localconfig" LocalConfig.kmk +} + +src_compile() { + + local myconf + # Don't build vboxdrv kernel module, disable deprecated qt3 support + myconf="--disable-kmods --disable-qt3" + + if ! use pulseaudio; then + myconf="${myconf} --disable-pulse" + fi + if ! use python; then + myconf="${myconf} --disable-python" + fi + if ! use alsa; then + myconf="${myconf} --disable-alsa" + fi + if ! use headless; then + if ! use qt4; then + myconf="${myconf} --disable-qt4" + fi + else + myconf="${myconf} --build-headless" + fi + + ./configure --with-gcc="$(tc-getCC)" --with-g++="$(tc-getCXX)" \ + ${myconf} || die "configure failed" + 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.${ARCH}/release/bin + + # create configuration files + insinto /etc/vbox + newins "${FILESDIR}/${P}-config" vbox.cfg + newins "${FILESDIR}/${PN}-interfaces" interfaces + + # symlink binaries to the shipped wrapper + exeinto /usr/lib/${PN} + newexe "${FILESDIR}/${P}-wrapper" "VBox" || die + fowners root:vboxusers /usr/lib/${PN}/VBox + fperms 0750 /usr/lib/${PN}/VBox + newexe "${S}"/src/VBox/Installer/linux/VBoxAddIF.sh "VBoxAddIF" || die + fowners root:vboxusers /usr/lib/${PN}/VBoxAddIF + fperms 0750 /usr/lib/${PN}/VBoxAddIF + + dosym /usr/lib/${PN}/VBox /usr/bin/VBoxManage + dosym /usr/lib/${PN}/VBox /usr/bin/VBoxVRDP + dosym /usr/lib/${PN}/VBox /usr/bin/VBoxHeadless + dosym /usr/lib/${PN}/VBoxTunctl /usr/bin/VBoxTunctl + dosym /usr/lib/${PN}/VBoxAddIF /usr/bin/VBoxAddIF + dosym /usr/lib/${PN}/VBoxAddIF /usr/bin/VBoxDeleteIF + + # install binaries and libraries + insinto /usr/lib/${PN} + doins -r components + + if use sdk; then + doins -r sdk + fi + + for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl} *so *r0 *gc ; do + doins $each + fowners root:vboxusers /usr/lib/${PN}/${each} + fperms 0750 /usr/lib/${PN}/${each} + done + + if use amd64; then + doins VBoxREM2.rel + fowners root:vboxusers /usr/lib/${PN}/VBoxREM2.rel + fperms 0750 /usr/lib/${PN}/VBoxREM2.rel + fi + + if ! use headless; then + for each in VBox{SDL,Headless} ; do + doins $each + fowners root:vboxusers /usr/lib/${PN}/${each} + fperms 4750 /usr/lib/${PN}/${each} + pax-mark -m "${D}"/usr/lib/${PN}/${each} + done + + dosym /usr/lib/${PN}/VBox /usr/bin/VBoxSDL + + if use qt4; then + doins VirtualBox + fowners root:vboxusers /usr/lib/${PN}/VirtualBox + fperms 4750 /usr/lib/${PN}/VirtualBox + pax-mark -m "${D}"/usr/lib/${PN}/VirtualBox + + dosym /usr/lib/${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 + fowners root:vboxusers /usr/lib/${PN}/VBoxHeadless + fperms 4750 /usr/lib/${PN}/VBoxHeadless + pax-mark -m "${D}"/usr/lib/${PN}/VBoxHeadless + fi + + insinto /usr/share/${PN} + doins -r nls +} + +pkg_postinst() { + fdo-mime_desktop_database_update + elog "" + if ! use headless; then + elog "To launch VirtualBox just type: \"VirtualBox\"" + fi + elog "You must be in the vboxusers group to use VirtualBox." + elog "" + elog "The last user manual is available for download at:" + elog "http://www.virtualbox.org/download/UserManual.pdf" + elog "" +} + +pkg_postrm() { + fdo-mime_desktop_database_update +} diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-9999.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-9999.ebuild index d22cd8c1f414..40635dfc2ad0 100644 --- a/app-emulation/virtualbox-ose/virtualbox-ose-9999.ebuild +++ b/app-emulation/virtualbox-ose/virtualbox-ose-9999.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-9999.ebuild,v 1.2 2008/09/06 19:21:39 jokey Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-9999.ebuild,v 1.3 2008/09/15 19:54:48 jokey Exp $ EAPI=1 -inherit eutils fdo-mime flag-o-matic linux-mod qt3 subversion toolchain-funcs +inherit eutils fdo-mime flag-o-matic linux-mod qt4 subversion toolchain-funcs DESCRIPTION="Softwarefamily of powerful x86 virtualization" HOMEPAGE="http://www.virtualbox.org/" @@ -13,7 +13,7 @@ ESVN_REPO_URI="http://virtualbox.org/svn/vbox/trunk" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="pulseaudio sdk" +IUSE="alsa headless pulseaudio python +qt4 sdk" RDEPEND="!app-emulation/virtualbox-bin !app-emulation/virtualbox-ose-additions @@ -22,16 +22,21 @@ RDEPEND="!app-emulation/virtualbox-bin >=dev-libs/libxslt-1.1.19 dev-libs/xalan-c dev-libs/xerces-c - media-libs/libsdl - x11-libs/libXcursor - x11-libs/libXt - x11-libs/qt:3" + !headless? ( + qt4? ( || ( ( x11-libs/qt-gui x11-libs/qt-core ) =x11-libs/qt-4.3*:4 ) ) + x11-libs/libXcursor + media-libs/libsdl + x11-libs/libXt )" DEPEND="${RDEPEND} + dev-util/kbuild + >=dev-lang/yasm-0.6.2 sys-devel/bin86 sys-devel/dev86 sys-power/iasl + media-libs/libpng >=media-libs/alsa-lib-1.0.13 - pulseaudio? ( media-sound/pulseaudio )" + pulseaudio? ( media-sound/pulseaudio ) + python? ( >=dev-lang/python-2.3 )" # sys-apps/hal is required at runtime (bug #197541) RDEPEND="${RDEPEND} sys-apps/usermode-utilities @@ -61,11 +66,27 @@ pkg_setup() { src_compile() { local myconf + # Don't build vboxdrv kernel module, disable deprecated qt3 support + myconf="--disable-kmods --disable-qt3" + if ! use pulseaudio; then myconf="${myconf} --disable-pulse" fi + if ! use python; then + myconf="${myconf} --disable-python" + fi + if ! use alsa; then + myconf="${myconf} --disable-alsa" + fi + if ! use headless; then + if ! use qt4; then + myconf="${myconf} --disable-qt4" + fi + else + myconf="${myconf} --build-headless" + fi - ./configure \ + ./configure --with-gcc="$(tc-getCC)" --with-g++="$(tc-getCXX)" \ ${myconf} || die "configure failed" source ./env.sh @@ -77,6 +98,7 @@ src_compile() { 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" linux-mod_src_compile @@ -86,50 +108,79 @@ src_install() { linux-mod_src_install cd "${S}"/out/linux.${ARCH}/release/bin - insinto /opt/VirtualBox + + # create configuration files + insinto /etc/vbox + newins "${FILESDIR}/${PN}-2.0.2-config" vbox.cfg + newins "${FILESDIR}/${PN}-interfaces" interfaces + + # symlink binaries to the shipped wrapper + exeinto /usr/lib/${PN} + newexe "${FILESDIR}/${PN}-2.0.2-wrapper" "VBox" || die + fowners root:vboxusers /usr/lib/${PN}/VBox + fperms 0750 /usr/lib/${PN}/VBox + newexe "${S}"/src/VBox/Installer/linux/VBoxAddIF.sh "VBoxAddIF" || die + fowners root:vboxusers /usr/lib/${PN}/VBoxAddIF + fperms 0750 /usr/lib/${PN}/VBoxAddIF + + dosym /usr/lib/${PN}/VBox /usr/bin/VBoxManage + dosym /usr/lib/${PN}/VBox /usr/bin/VBoxVRDP + dosym /usr/lib/${PN}/VBox /usr/bin/VBoxHeadless + dosym /usr/lib/${PN}/VBoxTunctl /usr/bin/VBoxTunctl + dosym /usr/lib/${PN}/VBoxAddIF /usr/bin/VBoxAddIF + dosym /usr/lib/${PN}/VBoxAddIF /usr/bin/VBoxDeleteIF + + # install binaries and libraries + insinto /usr/lib/${PN} + doins -r components if use sdk; then doins -r sdk - fowners root:vboxusers /opt/VirtualBox/sdk/bin/xpidl - fperms 0750 /opt/VirtualBox/sdk/bin/xpidl fi - rm -rf sdk src tst* testcase additions VBoxBFE vditool vboxdrv.ko xpidl SUPInstall \ - SUPUninstall VBox.png - - doins -r * - for each in VBox{Manage,SDL,SVC,XPCOMIPCD,Tunctl} VirtualBox ; do - fowners root:vboxusers /opt/VirtualBox/${each} - fperms 0750 /opt/VirtualBox/${each} + for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl} *so *r0 *gc ; do + doins $each + fowners root:vboxusers /usr/lib/${PN}/${each} + fperms 0750 /usr/lib/${PN}/${each} done - exeinto /opt/VirtualBox - newexe "${FILESDIR}/${PN}-wrapper" "VBox.sh" || die - fowners root:vboxusers /opt/VirtualBox/VBox.sh - fperms 0750 /opt/VirtualBox/VBox.sh - newexe "${S}"/src/VBox/Installer/linux/VBoxAddIF.sh "VBoxAddIF.sh" || die - fowners root:vboxusers /opt/VirtualBox/VBoxAddIF.sh - fperms 0750 /opt/VirtualBox/VBoxAddIF.sh - - dosym /opt/VirtualBox/VBox.sh /usr/bin/VirtualBox - dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxManage - dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxSDL - dosym /opt/VirtualBox/VBoxTunctl /usr/bin/VBoxTunctl - dosym /opt/VirtualBox/VBoxAddIF.sh /usr/bin/VBoxAddIF - dosym /opt/VirtualBox/VBoxAddIF.sh /usr/bin/VBoxDeleteIF - - # udev rule for vboxdrv - dodir /etc/udev/rules.d - echo 'KERNEL=="vboxdrv", GROUP="vboxusers" MODE=660' >> "${D}/etc/udev/rules.d/60-virtualbox.rules" - - # create virtualbox configurations files - insinto /etc/vbox - newins "${FILESDIR}/${PN}-config" vbox.cfg - newins "${FILESDIR}/${PN}-interfaces" interfaces + if use amd64; then + doins VBoxREM2.rel + fowners root:vboxusers /usr/lib/${PN}/VBoxREM2.rel + fperms 0750 /usr/lib/${PN}/VBoxREM2.rel + fi + + if ! use headless; then + for each in VBox{SDL,Headless} ; do + doins $each + fowners root:vboxusers /usr/lib/${PN}/${each} + fperms 4750 /usr/lib/${PN}/${each} + pax-mark -m "${D}"/usr/lib/${PN}/${each} + done + + dosym /usr/lib/${PN}/VBox /usr/bin/VBoxSDL + + if use qt4; then + doins VirtualBox + fowners root:vboxusers /usr/lib/${PN}/VirtualBox + fperms 4750 /usr/lib/${PN}/VirtualBox + pax-mark -m "${D}"/usr/lib/${PN}/VirtualBox + + dosym /usr/lib/${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 + fowners root:vboxusers /usr/lib/${PN}/VBoxHeadless + fperms 4750 /usr/lib/${PN}/VBoxHeadless + pax-mark -m "${D}"/usr/lib/${PN}/VBoxHeadless + fi + + insinto /usr/share/${PN} + doins -r nls - # desktop entry - newicon "${S}"/src/VBox/Frontends/VirtualBox/images/ico32x01.png ${PN}.png - domenu "${FILESDIR}"/${PN}.desktop } pkg_postinst() { |