(Proxy commit) Version bump

(Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 i686)

15 files changed, 330 insertions, 391 deletions

diff --git a/app-emulation/virtualbox-ose/ChangeLog b/app-emulation/virtualbox-ose/ChangeLog
index 1675e8b40bd2..a54cf064f83e 100644
--- a/app-emulation/virtualbox-ose/ChangeLog
+++ b/app-emulation/virtualbox-ose/ChangeLog
@@ -1,6 +1,46 @@
 # 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.6 2008/09/15 19:54:48 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/ChangeLog,v 1.7 2008/10/27 17:19:20 jokey Exp $
+
+*virtualbox-ose-2.0.4 (27 Oct 2008)
+
+  27 Oct 2008; Markus Ullmann <jokey@gentoo.org>
+  -files/virtualbox-ose-1.6.4-fix-missing-makefiles.patch,
+  -files/virtualbox-ose-1.6.4-remove-unused.patch,
+  +files/virtualbox-ose-1-config, +files/virtualbox-ose-1-wrapper,
+  -files/virtualbox-ose-2.0.2-config,
+  -files/virtualbox-ose-2.0.2-localconfig,
+  -files/virtualbox-ose-2.0.2-wrapper, +files/virtualbox-ose-2-config,
+  +files/virtualbox-ose-2-localconfig, +files/virtualbox-ose-2-wrapper,
+  files/virtualbox-ose.desktop, -files/virtualbox-ose-config,
+  -files/virtualbox-ose-wrapper, -virtualbox-ose-1.6.4.ebuild,
+  virtualbox-ose-1.6.6.ebuild, virtualbox-ose-2.0.2.ebuild,
+  +virtualbox-ose-2.0.4.ebuild, virtualbox-ose-9999.ebuild:
+  (Proxy commit) Version bump
+
+  25 Oct 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  -virtualbox-ose-1.6.4.ebuild,
+  -files/virtualbox-ose-1.6.4-fix-missing-makefiles.patch,
+  -files/virtualbox-ose-1.6.4-remove-unused.patch,
+  virtualbox-ose-1.6.6.ebuild, +files/virtualbox-ose-1-config,
+  +files/virtualbox-ose-1-wrapper, virtualbox-ose-2.0.2.ebuild,
+  -files/virtualbox-ose-2.0.2-config,
+  -files/virtualbox-ose-2.0.2-localconfig,
+  -files/virtualbox-ose-2.0.2-wrapper, +virtualbox-ose-2.0.4.ebuild,
+  +files/virtualbox-ose-2-config, +files/virtualbox-ose-2-localconfig,
+  +files/virtualbox-ose-2-wrapper, virtualbox-ose-9999.ebuild,
+  -files/virtualbox-ose-config, -files/virtualbox-ose-wrapper:
+  Version Bump; drop version 1.6.4; remove xalan-c,xerces from RDEPEND wrt
+  #243818
+
+  22 Oct 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  files/virtualbox-ose.desktop:
+  fix icon in virtualbox-ose.desktop  wrt #242714
+
+  24 Sep 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  virtualbox-ose-2.0.2.ebuild, files/virtualbox-ose-2.0.2-config,
+  files/virtualbox-ose-2.0.2-localconfig:
+  fix libdir for amd64 profiles (explicitly pass libdir to kBuild) wrt #238025
 
 *virtualbox-ose-2.0.2 (15 Sep 2008)
 
diff --git a/app-emulation/virtualbox-ose/files/virtualbox-ose-config b/app-emulation/virtualbox-ose/files/virtualbox-ose-1-config
index f69e73e2fcb6..f69e73e2fcb6 100644
--- a/app-emulation/virtualbox-ose/files/virtualbox-ose-config
+++ b/app-emulation/virtualbox-ose/files/virtualbox-ose-1-config
diff --git a/app-emulation/virtualbox-ose/files/virtualbox-ose-wrapper b/app-emulation/virtualbox-ose/files/virtualbox-ose-1-wrapper
index a5607133540d..a5607133540d 100644
--- a/app-emulation/virtualbox-ose/files/virtualbox-ose-wrapper
+++ b/app-emulation/virtualbox-ose/files/virtualbox-ose-1-wrapper
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
deleted file mode 100644
index d170042186c5..000000000000
--- a/app-emulation/virtualbox-ose/files/virtualbox-ose-1.6.4-fix-missing-makefiles.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- 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.3 2008/09/15 19:54:49 jokey Exp $
-+## @file
-+# Sub-Makefile for the external apps.
-+#
-+
-+#
-+# Copyright (C) 2006-2007 Sun Microsystems, Inc.
-+#
-+# Sun Microsystems, Inc. confidential
-+# All rights reserved
-+#
-+
-+DEPTH = ../..
-+include $(KBUILD_PATH)/subheader.kmk
-+
-+ifdef VBOX_WITH_KCHMVIEWER
-+ ifneq ($(wildcard $(PATH_SUB_CURRENT)/kchmviewer-2.6),)
-+  include $(PATH_SUB_CURRENT)/kchmviewer-2.6/Makefile.kmk
-+ endif
-+endif
-+ifneq ($(wildcard $(PATH_SUB_CURRENT)/tunctl),)
-+ ifeq ($(KBUILD_TARGET),linux)
-+  include $(PATH_SUB_CURRENT)/tunctl/Makefile.kmk
-+ endif
-+endif
-+
-+include $(KBUILD_PATH)/subfooter.kmk
-+
---- 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.3 2008/09/15 19:54:49 jokey Exp $
-+## @file
-+# Sub-Makefile for VBoxTunctl
-+#
-+# VBoxTunctl is identical to tunctl from Usermode Linux	except for the name.
-+#
-+
-+#
-+# 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.
-+#
-+
-+DEPTH = ../../..
-+include $(KBUILD_PATH)/subheader.kmk
-+
-+PROGRAMS.linux += VBoxTunctl
-+VBoxTunctl_TEMPLATE = VBOXR3EXE
-+VBoxTunctl_SOURCES  = tunctl.c
-+
-+include $(KBUILD_PATH)/subfooter.kmk
-+
diff --git a/app-emulation/virtualbox-ose/files/virtualbox-ose-1.6.4-remove-unused.patch b/app-emulation/virtualbox-ose/files/virtualbox-ose-1.6.4-remove-unused.patch
deleted file mode 100644
index e9b6696f3776..000000000000
--- a/app-emulation/virtualbox-ose/files/virtualbox-ose-1.6.4-remove-unused.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- Config.kmk.orig	2008-08-04 01:11:59.000000000 +0200
-+++ Config.kmk	2008-08-04 01:15:23.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
-@@ -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-08-04 01:12:11.000000000 +0200
-+++ configure	2008-08-04 01:16:04.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-2-config b/app-emulation/virtualbox-ose/files/virtualbox-ose-2-config
new file mode 100644
index 000000000000..d1e35d2c40d2
--- /dev/null
+++ b/app-emulation/virtualbox-ose/files/virtualbox-ose-2-config
@@ -0,0 +1 @@
+INSTALL_DIR=/usr/MY_LIBDIR/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-localconfig
index 20e2c5a11137..0c9978856489 100644
--- a/app-emulation/virtualbox-ose/files/virtualbox-ose-2.0.2-localconfig
+++ b/app-emulation/virtualbox-ose/files/virtualbox-ose-2-localconfig
@@ -28,7 +28,7 @@ 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_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
diff --git a/app-emulation/virtualbox-ose/files/virtualbox-ose-2.0.2-wrapper b/app-emulation/virtualbox-ose/files/virtualbox-ose-2-wrapper
index 393818bb119d..393818bb119d 100644
--- a/app-emulation/virtualbox-ose/files/virtualbox-ose-2.0.2-wrapper
+++ b/app-emulation/virtualbox-ose/files/virtualbox-ose-2-wrapper
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
deleted file mode 100644
index 5ca78464eaf4..000000000000
--- a/app-emulation/virtualbox-ose/files/virtualbox-ose-2.0.2-config
+++ /dev/null
@@ -1 +0,0 @@
-INSTALL_DIR=/usr/lib/virtualbox-ose
diff --git a/app-emulation/virtualbox-ose/files/virtualbox-ose.desktop b/app-emulation/virtualbox-ose/files/virtualbox-ose.desktop
index 5aa492552507..6e3dc7571290 100644
--- a/app-emulation/virtualbox-ose/files/virtualbox-ose.desktop
+++ b/app-emulation/virtualbox-ose/files/virtualbox-ose.desktop
@@ -4,5 +4,5 @@ Type=Application
 Comment=Run several virtual systems on a single host computer
 Exec=VirtualBox
 TryExec=VirtualBox
-Icon=virtualbox
+Icon=virtualbox-ose
 Categories=System;Emulator;
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-1.6.4.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-1.6.4.ebuild
deleted file mode 100644
index 140a82f17017..000000000000
--- a/app-emulation/virtualbox-ose/virtualbox-ose-1.6.4.ebuild
+++ /dev/null
@@ -1,187 +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.4.ebuild,v 1.4 2008/09/15 19:54:48 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() {
-	# 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
-
-	# 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"
-	# Fix missing makefiles
-	epatch "${FILESDIR}/${P}-fix-missing-makefiles.patch"
-}
-
-src_compile() {
-
-	local myconf
-	# Don't build vboxdrv kernel module
-	myconf="--disable-kmods --disable-qt4"
-
-	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 --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}" \
-		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
-
-	# Disable logging by default, broken in this release (bug #233683)
-	sed -i \
-			-e "/vbox.cfg\"$/a export VBOX_LOG_DEST=\"nofile\"" \
-			"${D}"/opt/VirtualBox/VBox.sh || die "VBox.sh sed failed"
-
-	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/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\""
-	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 ""
-	elog "Warning:"
-	elog "Due to a bug which can cause a large amount of logging"
-	elog "data to be written to your home directory, logging is"
-	elog "disabled by default in this release, see bug #233683"
-	elog ""
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
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 dd12a24d1513..3d7b380555f5 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.2 2008/09/15 19:54:48 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-1.6.6.ebuild,v 1.3 2008/10/27 17:19:20 jokey Exp $
 
 EAPI=1
 
@@ -20,8 +20,6 @@ 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? (
 		qt3? ( x11-libs/qt:3 )
 		x11-libs/libXcursor
@@ -130,7 +128,7 @@ src_install() {
 
 	# create virtualbox configurations files
 	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-config" vbox.cfg
+	newins "${FILESDIR}/${PN}-1-config" vbox.cfg
 	newins "${FILESDIR}/${PN}-interfaces" interfaces
 
 	insinto /opt/VirtualBox
@@ -170,7 +168,7 @@ src_install() {
 	fi
 
 	exeinto /opt/VirtualBox
-	newexe "${FILESDIR}/${PN}-wrapper" "VBox.sh" || die
+	newexe "${FILESDIR}/${PN}-1-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
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-2.0.2.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-2.0.2.ebuild
index 2751d6fe4fe8..faa6b88d22f7 100644
--- a/app-emulation/virtualbox-ose/virtualbox-ose-2.0.2.ebuild
+++ b/app-emulation/virtualbox-ose/virtualbox-ose-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/virtualbox-ose-2.0.2.ebuild,v 1.2 2008/09/15 22:14:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-2.0.2.ebuild,v 1.3 2008/10/27 17:19:20 jokey Exp $
 
 EAPI=1
 
@@ -20,8 +20,6 @@ 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
@@ -45,6 +43,7 @@ RDEPEND="${RDEPEND}
 	sys-apps/hal"
 
 S=${WORKDIR}/${MY_P/-OSE/}
+MY_LIBDIR="$(get_libdir)"
 
 pkg_setup() {
 	# known problems with gcc 4.3 and the recompiler
@@ -86,8 +85,13 @@ src_unpack() {
 	# 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
+	# Disable things unused or splitted into separate ebuilds 
+	cp "${FILESDIR}/${PN}-2-localconfig" LocalConfig.kmk
+
+	# Set the right libdir 
+	sed -i \
+			-e "s/MY_LIBDIR/${MY_LIBDIR}/" LocalConfig.kmk \
+			|| die "LocalConfig.kmk sed failed"
 }
 
 src_compile() {
@@ -132,29 +136,34 @@ src_compile() {
 src_install() {
 	cd "${S}"/out/linux.${ARCH}/release/bin
 
-	# create configuration files
+	# Create configuration files
 	insinto /etc/vbox
-	newins "${FILESDIR}/${P}-config" vbox.cfg
+	newins "${FILESDIR}/${PN}-2-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
+	# Set the right libdir
+	sed -i \
+			-e "s/MY_LIBDIR/${MY_LIBDIR}/" \
+			"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Symlink binaries to the shipped wrapper
+	exeinto /usr/${MY_LIBDIR}/${PN}
+	newexe "${FILESDIR}/${PN}-2-wrapper" "VBox" || die
+	fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/VBox
+	fperms 0750 /usr/${MY_LIBDIR}/${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}
+	fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/VBoxAddIF
+	fperms 0750 /usr/${MY_LIBDIR}/${PN}/VBoxAddIF
+
+	dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/VBoxManage
+	dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/VBoxVRDP
+	dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/VBoxHeadless
+	dosym /usr/${MY_LIBDIR}/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
+	dosym /usr/${MY_LIBDIR}/${PN}/VBoxAddIF /usr/bin/VBoxAddIF
+	dosym /usr/${MY_LIBDIR}/${PN}/VBoxAddIF /usr/bin/VBoxDeleteIF
+
+	# Install binaries and libraries
+	insinto /usr/${MY_LIBDIR}/${PN}
 	doins -r components
 
 	if use sdk; then
@@ -163,42 +172,42 @@ src_install() {
 
 	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}
+		fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/${each}
+		fperms 0750 /usr/${MY_LIBDIR}/${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
+		fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/VBoxREM2.rel
+		fperms 0750 /usr/${MY_LIBDIR}/${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}
+				fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/${each}
+				fperms 4750 /usr/${MY_LIBDIR}/${PN}/${each}
+				pax-mark -m "${D}"/usr/${MY_LIBDIR}/${PN}/${each}
 			done
 
-			dosym /usr/lib/${PN}/VBox /usr/bin/VBoxSDL
+			dosym /usr/${MY_LIBDIR}/${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
+				fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/VirtualBox
+				fperms 4750 /usr/${MY_LIBDIR}/${PN}/VirtualBox
+				pax-mark -m "${D}"/usr/${MY_LIBDIR}/${PN}/VirtualBox
 
-				dosym /usr/lib/${PN}/VBox /usr/bin/VirtualBox
+				dosym /usr/${MY_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
-			fowners root:vboxusers /usr/lib/${PN}/VBoxHeadless
-			fperms 4750 /usr/lib/${PN}/VBoxHeadless
-			pax-mark -m "${D}"/usr/lib/${PN}/VBoxHeadless
+			fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/VBoxHeadless
+			fperms 4750 /usr/${MY_LIBDIR}/${PN}/VBoxHeadless
+			pax-mark -m "${D}"/usr/${MY_LIBDIR}/${PN}/VBoxHeadless
 	fi
 
 	insinto /usr/share/${PN}
diff --git a/app-emulation/virtualbox-ose/virtualbox-ose-2.0.4.ebuild b/app-emulation/virtualbox-ose/virtualbox-ose-2.0.4.ebuild
new file mode 100644
index 000000000000..51f330d0e347
--- /dev/null
+++ b/app-emulation/virtualbox-ose/virtualbox-ose-2.0.4.ebuild
@@ -0,0 +1,232 @@
+# 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.4.ebuild,v 1.1 2008/10/27 17:19:20 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
+	!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/}
+MY_LIBDIR="$(get_libdir)"
+
+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}/${PN}-2-localconfig" LocalConfig.kmk
+
+	# Set the right libdir 
+	sed -i \
+			-e "s/MY_LIBDIR/${MY_LIBDIR}/" LocalConfig.kmk \
+			|| die "LocalConfig.kmk sed failed"
+}
+
+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}/${PN}-2-config" vbox.cfg
+	newins "${FILESDIR}/${PN}-interfaces" interfaces
+
+	# Set the right libdir
+	sed -i \
+			-e "s/MY_LIBDIR/${MY_LIBDIR}/" \
+			"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
+
+	# Symlink binaries to the shipped wrapper
+	exeinto /usr/${MY_LIBDIR}/${PN}
+	newexe "${FILESDIR}/${PN}-2-wrapper" "VBox" || die
+	fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/VBox
+	fperms 0750 /usr/${MY_LIBDIR}/${PN}/VBox
+	newexe "${S}"/src/VBox/Installer/linux/VBoxAddIF.sh "VBoxAddIF" || die
+	fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/VBoxAddIF
+	fperms 0750 /usr/${MY_LIBDIR}/${PN}/VBoxAddIF
+
+	dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/VBoxManage
+	dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/VBoxVRDP
+	dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/VBoxHeadless
+	dosym /usr/${MY_LIBDIR}/${PN}/VBoxTunctl /usr/bin/VBoxTunctl
+	dosym /usr/${MY_LIBDIR}/${PN}/VBoxAddIF /usr/bin/VBoxAddIF
+	dosym /usr/${MY_LIBDIR}/${PN}/VBoxAddIF /usr/bin/VBoxDeleteIF
+
+	# Install binaries and libraries
+	insinto /usr/${MY_LIBDIR}/${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/${MY_LIBDIR}/${PN}/${each}
+		fperms 0750 /usr/${MY_LIBDIR}/${PN}/${each}
+	done
+
+	if use amd64; then
+		doins VBoxREM2.rel
+		fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/VBoxREM2.rel
+		fperms 0750 /usr/${MY_LIBDIR}/${PN}/VBoxREM2.rel
+	fi
+
+	if ! use headless; then
+			for each in VBox{SDL,Headless} ; do
+				doins $each
+				fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/${each}
+				fperms 4750 /usr/${MY_LIBDIR}/${PN}/${each}
+				pax-mark -m "${D}"/usr/${MY_LIBDIR}/${PN}/${each}
+			done
+
+			dosym /usr/${MY_LIBDIR}/${PN}/VBox /usr/bin/VBoxSDL
+
+			if use qt4; then
+				doins VirtualBox
+				fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/VirtualBox
+				fperms 4750 /usr/${MY_LIBDIR}/${PN}/VirtualBox
+				pax-mark -m "${D}"/usr/${MY_LIBDIR}/${PN}/VirtualBox
+
+				dosym /usr/${MY_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
+			fowners root:vboxusers /usr/${MY_LIBDIR}/${PN}/VBoxHeadless
+			fperms 4750 /usr/${MY_LIBDIR}/${PN}/VBoxHeadless
+			pax-mark -m "${D}"/usr/${MY_LIBDIR}/${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 40635dfc2ad0..e581a5727446 100644
--- a/app-emulation/virtualbox-ose/virtualbox-ose-9999.ebuild
+++ b/app-emulation/virtualbox-ose/virtualbox-ose-9999.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-9999.ebuild,v 1.3 2008/09/15 19:54:48 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-ose/virtualbox-ose-9999.ebuild,v 1.4 2008/10/27 17:19:20 jokey Exp $
 
 EAPI=1
 
@@ -111,12 +111,12 @@ src_install() {
 
 	# create configuration files
 	insinto /etc/vbox
-	newins "${FILESDIR}/${PN}-2.0.2-config" vbox.cfg
+	newins "${FILESDIR}/${PN}-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
+	newexe "${FILESDIR}/${PN}-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