From 9ba597047e9c658dd23b41a33e6666de26b7c660 Mon Sep 17 00:00:00 2001 From: x-drum Date: Wed, 18 Nov 2009 15:39:33 +0000 Subject: Version bump svn path=/trunk/; revision=747 --- app-emulation/virtualbox-ose/ChangeLog | 39 +++- app-emulation/virtualbox-ose/Manifest | 19 +- .../virtualbox-ose/files/virtualbox-ose-1-config | 1 - .../virtualbox-ose/files/virtualbox-ose-1-wrapper | 139 ----------- .../files/virtualbox-ose-1.6.6-remove-unused.patch | 96 -------- .../virtualbox-ose/files/virtualbox-ose-2-config | 1 - .../files/virtualbox-ose-2-localconfig | 43 ---- .../virtualbox-ose/files/virtualbox-ose-2-wrapper | 103 -------- .../virtualbox-ose/files/virtualbox-ose-3-config | 1 + .../files/virtualbox-ose-3-localconfig | 43 ++++ .../virtualbox-ose/files/virtualbox-ose-3-wrapper | 6 +- .../virtualbox-ose-fix-insecure-lockfiles.patch | 94 -------- .../files/virtualbox-ose-fix-nodbus-build.patch | 17 -- .../virtualbox-ose/files/virtualbox-ose-interfaces | 4 - .../virtualbox-ose/virtualbox-ose-3.0.10.ebuild | 260 --------------------- .../virtualbox-ose/virtualbox-ose-3.0.12.ebuild | 260 +++++++++++++++++++++ 16 files changed, 347 insertions(+), 779 deletions(-) delete mode 100644 app-emulation/virtualbox-ose/files/virtualbox-ose-1-config delete mode 100644 app-emulation/virtualbox-ose/files/virtualbox-ose-1-wrapper delete mode 100644 app-emulation/virtualbox-ose/files/virtualbox-ose-1.6.6-remove-unused.patch delete mode 100644 app-emulation/virtualbox-ose/files/virtualbox-ose-2-config delete mode 100644 app-emulation/virtualbox-ose/files/virtualbox-ose-2-localconfig delete mode 100644 app-emulation/virtualbox-ose/files/virtualbox-ose-2-wrapper create mode 100644 app-emulation/virtualbox-ose/files/virtualbox-ose-3-config create mode 100644 app-emulation/virtualbox-ose/files/virtualbox-ose-3-localconfig delete mode 100644 app-emulation/virtualbox-ose/files/virtualbox-ose-fix-insecure-lockfiles.patch delete mode 100644 app-emulation/virtualbox-ose/files/virtualbox-ose-fix-nodbus-build.patch delete mode 100644 app-emulation/virtualbox-ose/files/virtualbox-ose-interfaces delete mode 100644 app-emulation/virtualbox-ose/virtualbox-ose-3.0.10.ebuild create mode 100644 app-emulation/virtualbox-ose/virtualbox-ose-3.0.12.ebuild diff --git a/app-emulation/virtualbox-ose/ChangeLog b/app-emulation/virtualbox-ose/ChangeLog index 334e584..0db438a 100644 --- a/app-emulation/virtualbox-ose/ChangeLog +++ b/app-emulation/virtualbox-ose/ChangeLog @@ -1,11 +1,40 @@ # ChangeLog for app-emulation/virtualbox-ose # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.33 2009/10/19 01:46:15 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.38 2009/11/10 01:48:54 patrick Exp $ + + 18 Nov 2009; Alessio Cassibba (X-Drum) + -files/virtualbox-ose-1.6.6-remove-unused.patch, + -files/virtualbox-ose-1-config, -files/virtualbox-ose-1-wrapper, + -files/virtualbox-ose-2-config, -files/virtualbox-ose-2-localconfig, + -files/virtualbox-ose-2-wrapper, -virtualbox-ose-3.0.10.ebuild, + +virtualbox-ose-3.0.12.ebuild, +files/virtualbox-ose-3-config, + +files/virtualbox-ose-3-localconfig, files/virtualbox-ose-3-wrapper, + -files/virtualbox-ose-fix-insecure-lockfiles.patch, + -files/virtualbox-ose-fix-nodbus-build.patch, + -files/virtualbox-ose-interfaces: + Version bump + + 10 Nov 2009; Patrick Lauer + -virtualbox-ose-1.6.6.ebuild, -virtualbox-ose-1.6.6-r1.ebuild, + -virtualbox-ose-3.0.6.ebuild: + Drop old + + 09 Nov 2009; Markus Meier + virtualbox-ose-3.0.8-r1.ebuild: + amd64 stable, bug #288836 + + 09 Nov 2009; Markus Meier virtualbox-ose-3.0.6.ebuild: + amd64 stable, bug #285451 + + 03 Nov 2009; Patrick Lauer + virtualbox-ose-3.0.10.ebuild: + Remove obsolete patch + +*virtualbox-ose-3.0.10 (03 Nov 2009) - 03 Nov 2009; Alessio Cassibba (X-Drum) - -virtualbox-ose-3.0.8-r1.ebuild, +virtualbox-ose-3.0.10.ebuild, - +files/virtualbox-ose-3-wrapper: - Version bump; update VBox.sh wrapper + 03 Nov 2009; Patrick Lauer + +virtualbox-ose-3.0.10.ebuild, +files/virtualbox-ose-3-wrapper: + Bump to 3.0.10, fixes #291214 #290296 #285749 #286163 19 Oct 2009; Christian Faulhammer virtualbox-ose-3.0.8-r1.ebuild: diff --git a/app-emulation/virtualbox-ose/Manifest b/app-emulation/virtualbox-ose/Manifest index 9ab967c..4676a84 100644 --- a/app-emulation/virtualbox-ose/Manifest +++ b/app-emulation/virtualbox-ose/Manifest @@ -1,19 +1,12 @@ AUX vboxwebsrv-confd 508 RMD160 51e18eb2cb4c70d482a5ea08b38240faba9e3b3e SHA1 6f2d9089ac912c7334c474623463574b0285c4df SHA256 939f87e8d6976f344986369a0882082576eccb4e4aea768f9fbbe399f57843fe AUX vboxwebsrv-initd 634 RMD160 c581c8465e297ea293c449c433a043bd94b74bdd SHA1 1d05298ccdb75e7aaeae1e73e4cacc3b674d4c95 SHA256 3fdb4847a1ff6d402d110b15fe8fc2689502000e8853a3f2ea76c8959d4fa50c -AUX virtualbox-ose-1-config 28 RMD160 c03986f0a6ecc77c2d15382d965952bb209ae534 SHA1 43b5fd213ae08bb390ec1962ee2776d4f7fe45fd SHA256 5326f7abdd1a7c8a8a44fd4ab269977ec115286059fc8a4c2fde6805c381236f -AUX virtualbox-ose-1-wrapper 4054 RMD160 7e8509dc313cfac5d1e63efe05e98e351c22050b SHA1 35ffda3b1663953ce3b1d89b0fe104cb43c5e949 SHA256 d03f50600234b6c9507a564c953320b41be8bbc14dc6b957e75578d052ac8697 -AUX virtualbox-ose-1.6.6-remove-unused.patch 3379 RMD160 d0a346f5ce9d236a5de2b05fc34b2fb02be4727d SHA1 bb59f6b6c615834977841efefd1e9570e6407614 SHA256 139aa3353fd323d88fa759819dc78f3dacba902a669b63bd4cf4581ea09bfabb -AUX virtualbox-ose-2-config 42 RMD160 7102b584e67b964dfd3c06e06b29eb91d33d7604 SHA1 1fe2ac29550c4b3ab4a82399ece3d08c8851c207 SHA256 fb619bc28ba651135730601240e192f9d02b9bef9954eb8026a716865db01b4d -AUX virtualbox-ose-2-localconfig 1382 RMD160 1e484d1d7b3955ae425caa6d20ceba629b5f0150 SHA1 f1c7f076c2dfb8011708852391ae35cfe4d82994 SHA256 ebd65235b78f68f3c6f2b2185230f6271e077c04ad35a8c00b072fe563109fc6 -AUX virtualbox-ose-2-wrapper 2813 RMD160 2d05512fa94abfb034f1f6eec6bb207af020df45 SHA1 c2dbe19e5ab603378d6b1c72dc4b02fe4368a3e1 SHA256 ad91be6fc1753dc686e9f9774fd91101e7fd15e064af5419d5fd0769f3434e8b -AUX virtualbox-ose-3-wrapper 2928 RMD160 99ce30d35ec3cea75e7e55097d49354d87d955be SHA1 63a4caecd9cbf326e9f189268ff1eb6c39e172b5 SHA256 cbbd44e20becbcbcb34a9d17d0968b8e48f7e190f14214728187d7098c812e06 +AUX virtualbox-ose-3-config 42 RMD160 7102b584e67b964dfd3c06e06b29eb91d33d7604 SHA1 1fe2ac29550c4b3ab4a82399ece3d08c8851c207 SHA256 fb619bc28ba651135730601240e192f9d02b9bef9954eb8026a716865db01b4d +AUX virtualbox-ose-3-localconfig 1382 RMD160 1e484d1d7b3955ae425caa6d20ceba629b5f0150 SHA1 f1c7f076c2dfb8011708852391ae35cfe4d82994 SHA256 ebd65235b78f68f3c6f2b2185230f6271e077c04ad35a8c00b072fe563109fc6 +AUX virtualbox-ose-3-wrapper 2931 RMD160 c73f7fca4531dc8023484b860c81c0a5805f022c SHA1 1d51680f1dc67394b0bf2c0533305e54c68ef177 SHA256 7ed4834ece201cb6a9da57e36a1a9b47bd054057d2ac4a46343a9966ff460644 AUX virtualbox-ose-3.0.0-mesa-check.patch 692 RMD160 c1b62d987fa941f5455a8fb0c0d6b07377756d0f SHA1 18c987a024fc45778cc2dc55515100150996408d SHA256 88e981ed765b26c11ea9c606a009a9a1b03c67a1de5cb42b18e0088e027fe0c8 AUX virtualbox-ose-3.0.8-without-hal-fix.patch 1318 RMD160 9fbefc7f4a783dc2f2c84773cf52b30b9e16777c SHA1 0e2e06c38de7023920cbd819be24e1dbc9ff8408 SHA256 125bbf9f926ad19a5dac6a0c68cc7b2abbd2c246c071917b1f9b447b38addbe5 -AUX virtualbox-ose-fix-insecure-lockfiles.patch 2579 RMD160 4b460669369a4da395a335c4357346d932275916 SHA1 0a692a1b6de3e643ca8e60de6da8b9a7613cd352 SHA256 32f253b9c212a66181f7bdab9c6d509dbf5f3220849d0aeb47d840aa9465fcdf -AUX virtualbox-ose-fix-nodbus-build.patch 461 RMD160 f9e731a1d68947823d23bdfd4bc85ae182e6302c SHA1 f39bcd3bf704d64d45a97b1e1b77b6c47e9a61fc SHA256 cecc8685203f715f446fad31a597a2bf7397967200b1ab90b0c02785b151445b -AUX virtualbox-ose-interfaces 218 RMD160 4639b9848cf44ac59cd12585a3c56ef53d72a6d9 SHA1 3268e5759286bdff1c5242598266e6c2a5b17e5d SHA256 50ddbfedce3afd41aad45163eb799fce0956d815948ad9da842f09163aaafd52 AUX virtualbox-ose.desktop 202 RMD160 8b4b5c05743978d71edd4eaba71ae25f1d9d0d82 SHA1 3c10d2f12ea58ef35e785b8727a51fd3a0d66472 SHA256 9bbd26661317b106593d74b84cec3781b24c41bc40a2f98776e23d6b422ee4bb -DIST VirtualBox-3.0.10-OSE.tar.bz2 52099416 RMD160 4bf389cdd9500571ff665fa959c6cda22db9b5d2 SHA1 90217b54233a4161b45c393ca1301bfd13d3766e SHA256 01c724e70a05d71bfd53ee35f045c044e2b9a2c5010e828f32bebb4bad1d142d -EBUILD virtualbox-ose-3.0.10.ebuild 8233 RMD160 94dffc52ace03c461d4e860622f8af8d5b87bed7 SHA1 06603c0a6ea31facf3760e212532793e79a5e0fa SHA256 e7e84312e79b13dedb77f218970fb43128efd4a65d112966b788f02905982095 -MISC ChangeLog 20473 RMD160 6064ae6d9555579dd6c6173df47b23eb3c2d339a SHA1 cc5b3d39f2d88c9b9830f593fe250b59c9fbbd2f SHA256 b2ea1f442322be8f5f1f4ab4e7f19a4a836b164074f3a1ecd3940c07c0a211c8 +DIST VirtualBox-3.0.12-OSE.tar.bz2 52075946 RMD160 4c19f2b945f7288235c8becfc0d1931ddf1bc94e SHA1 7ac46be39db4e51ea38cb6a857d2da544b7a820f SHA256 3c88b6ad1fa5739440485ad8cfd9754dbd17dc23df09a7dcc47b2e91635182b2 +EBUILD virtualbox-ose-3.0.12.ebuild 8240 RMD160 64b57abab536393d6c018394d84b9c0740096fcb SHA1 14515d6e265bb99e568f7dc1962e3e4e67273ceb SHA256 5eb6435b93050396839760f293f76780c753cff8b536e7f4e00b21e3070861ec +MISC ChangeLog 21573 RMD160 6134c6f67cd4911a4ff4694769aef582b230dee3 SHA1 0afd7ecce127603a0afa46b8cd693085bd54062e SHA256 37c47d108a58ee9f4ce8fbbe679286c3814f24ab93aeed0ae87d7aac634df8af MISC metadata.xml 608 RMD160 05b2e56d330d28aed13d4a7035369e04dc1e989e SHA1 ea332f57fa454cc6f8489f6debcd991003886fc0 SHA256 ab349ab6727625054f24bbf733a3f6fabb34ba1e1f0fd845c51c70595b05b6aa 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 index f69e73e..0000000 --- a/app-emulation/virtualbox-ose/files/virtualbox-ose-1-config +++ /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 index a560713..0000000 --- a/app-emulation/virtualbox-ose/files/virtualbox-ose-1-wrapper +++ /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 index ad2ac6a..0000000 --- a/app-emulation/virtualbox-ose/files/virtualbox-ose-1.6.6-remove-unused.patch +++ /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 index d1e35d2..0000000 --- a/app-emulation/virtualbox-ose/files/virtualbox-ose-2-config +++ /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 index 0c99788..0000000 --- a/app-emulation/virtualbox-ose/files/virtualbox-ose-2-localconfig +++ /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 index edf4e25..0000000 --- a/app-emulation/virtualbox-ose/files/virtualbox-ose-2-wrapper +++ /dev/null @@ -1,103 +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" "$@" - ;; - vboxwebsrv) - exec "$INSTALL_DIR/vboxwebsrv" "$@" - ;; - *) - echo "Unknown application - $APP" - ;; -esac diff --git a/app-emulation/virtualbox-ose/files/virtualbox-ose-3-config b/app-emulation/virtualbox-ose/files/virtualbox-ose-3-config new file mode 100644 index 0000000..d1e35d2 --- /dev/null +++ b/app-emulation/virtualbox-ose/files/virtualbox-ose-3-config @@ -0,0 +1 @@ +INSTALL_DIR=/usr/MY_LIBDIR/virtualbox-ose diff --git a/app-emulation/virtualbox-ose/files/virtualbox-ose-3-localconfig b/app-emulation/virtualbox-ose/files/virtualbox-ose-3-localconfig new file mode 100644 index 0000000..0c99788 --- /dev/null +++ b/app-emulation/virtualbox-ose/files/virtualbox-ose-3-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/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-3-wrapper b/app-emulation/virtualbox-ose/files/virtualbox-ose-3-wrapper index 0cf0597..6f2da49 100755 --- a/app-emulation/virtualbox-ose/files/virtualbox-ose-3-wrapper +++ b/app-emulation/virtualbox-ose/files/virtualbox-ose-3-wrapper @@ -37,7 +37,7 @@ elif ! lsmod|grep -q vboxdrv; then WARNING: The VirtualBox kernel modules are not loaded. Please load all the needed kernel modules by: - for m in vbox{drv,netadp,netflt}; do modprobe $m; done + for m in vbox{drv,netadp,netflt}; do modprobe \$m; done You will not be able to start VMs until this problem is fixed. EOF @@ -46,8 +46,8 @@ elif [ ! -c /dev/vboxdrv ]; then WARNING: The character device /dev/vboxdrv does not exist. Please try to reload all the needed kernel modules by: - for m in vbox{netflt,netadp,drv}; do rmmod $m; done - for m in vbox{drv,netadp,netflt}; do modprobe $m; done + for m in vbox{netflt,netadp,drv}; do rmmod \$m; done + for m in vbox{drv,netadp,netflt}; do modprobe \$m; done and if that is not successful, try to re-install the package by: 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 index 0df6290..0000000 --- a/app-emulation/virtualbox-ose/files/virtualbox-ose-fix-insecure-lockfiles.patch +++ /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/files/virtualbox-ose-fix-nodbus-build.patch b/app-emulation/virtualbox-ose/files/virtualbox-ose-fix-nodbus-build.patch deleted file mode 100644 index f81a2f9..0000000 --- a/app-emulation/virtualbox-ose/files/virtualbox-ose-fix-nodbus-build.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- src/VBox/Main/Makefile.kmk.orig 2009-01-26 23:18:28.000000000 +0100 -+++ src/VBox/Main/Makefile.kmk 2009-01-27 00:14:17.000000000 +0100 -@@ -290,10 +290,11 @@ - win/HostPowerWin.cpp \ - win/VBoxSVC.rc - -+VBoxSVC_SOURCES.linux = \ -+ linux/HostHardwareLinux.cpp -+ - ifdef VBOX_WITH_DBUS --VBoxSVC_SOURCES.linux += \ -- linux/HostHardwareLinux.cpp \ -- linux/vbox-dbus.cpp -+ VBoxSVC_SOURCES.linux += linux/vbox-dbus.cpp - endif - - VBoxSVC_SOURCES.solaris = \ diff --git a/app-emulation/virtualbox-ose/files/virtualbox-ose-interfaces b/app-emulation/virtualbox-ose/files/virtualbox-ose-interfaces deleted file mode 100644 index ce2606b..0000000 --- a/app-emulation/virtualbox-ose/files/virtualbox-ose-interfaces +++ /dev/null @@ -1,4 +0,0 @@ -# This file is for registering VirtualBox permanent host networking interfaces -# and optionally adding them to network bridges on the host. -# Each line should be of the format []. - diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-3.0.10.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-3.0.10.ebuild deleted file mode 100644 index 908ae79..0000000 --- a/app-emulation/virtualbox-ose/virtualbox-ose-3.0.10.ebuild +++ /dev/null @@ -1,260 +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.0.6.ebuild,v 1.3 2009/09/30 17:09:49 ayoy 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? ( 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/VBoxPython2_4.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_5.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}-2-localconfig > LocalConfig.kmk || die - - # unset useless/problematic mesa checks in configure - epatch "${FILESDIR}/${PN}-3.0.0-mesa-check.patch" - - # stupid hal being stupid code - use hal || epatch "${FILESDIR}/${P}-without-hal-fix.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}-2-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.0.12.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-3.0.12.ebuild new file mode 100644 index 0000000..47968f4 --- /dev/null +++ b/app-emulation/virtualbox-ose/virtualbox-ose-3.0.12.ebuild @@ -0,0 +1,260 @@ +# 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.0.6.ebuild,v 1.3 2009/09/30 17:09:49 ayoy 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? ( 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/VBoxPython2_4.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_5.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" + + # stupid hal being stupid code + use hal || epatch "${FILESDIR}/${PN}-3.0.8-without-hal-fix.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 +} -- cgit v1.2.3-65-gdbad