Version bump wrt bug #196424 thanks to Alessio for the ebuilds

Package-Manager: portage-2.1.3.15

19 files changed, 427 insertions, 149 deletions

diff --git a/app-emulation/virtualbox-additions/ChangeLog b/app-emulation/virtualbox-additions/ChangeLog
index aa863d9a4d71..b474c1032ab4 100644
--- a/app-emulation/virtualbox-additions/ChangeLog
+++ b/app-emulation/virtualbox-additions/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virtualbox-additions
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/ChangeLog,v 1.9 2007/09/04 23:36:06 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/ChangeLog,v 1.10 2007/10/22 22:12:44 jokey Exp $
+
+*virtualbox-additions-1.5.2 (22 Oct 2007)
+
+  22 Oct 2007; Markus Ullmann <jokey@gentoo.org>
+  +virtualbox-additions-1.5.2.ebuild:
+  Version bump wrt bug #196424 thanks to Alessio for the ebuilds
 
 *virtualbox-additions-1.5.0 (04 Sep 2007)
 
diff --git a/app-emulation/virtualbox-additions/files/digest-virtualbox-additions-1.5.2 b/app-emulation/virtualbox-additions/files/digest-virtualbox-additions-1.5.2
new file mode 100644
index 000000000000..8bbf87fd11c7
--- /dev/null
+++ b/app-emulation/virtualbox-additions/files/digest-virtualbox-additions-1.5.2
@@ -0,0 +1,3 @@
+MD5 387912f465d450bcf4da805158a6b26d VBoxGuestAdditions_1.5.2.iso 5228544
+RMD160 4d70818342e8653ba0a6c53795d903a35ddbd59b VBoxGuestAdditions_1.5.2.iso 5228544
+SHA256 822fd13e129d736590bfb740e57c06fe8f68f281b60a9f8b9e0cc32b6672f230 VBoxGuestAdditions_1.5.2.iso 5228544
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-1.5.2.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-1.5.2.ebuild
new file mode 100644
index 000000000000..66676119d9b1
--- /dev/null
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-1.5.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-1.5.2.ebuild,v 1.1 2007/10/22 22:12:44 jokey Exp $
+
+inherit eutils
+
+MY_PN=VBoxGuestAdditions
+MY_P=${MY_PN}_${PV}
+
+DESCRIPTION="Guest additions for VirtualBox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://virtualbox.org/download/${PV}/${MY_P}.iso"
+
+LICENSE="PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!app-emulation/virtualbox-bin
+	!=app-emulation/virtualbox-9999"
+
+RESTRICT="primaryuri"
+
+pkg_setup() {
+	check_license
+}
+
+src_unpack() {
+	return 0
+}
+
+src_install() {
+	insinto /opt/VirtualBox/additions
+	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
+}
diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index 2b18b53ec44d..aebb38254c05 100644
--- a/app-emulation/virtualbox-bin/ChangeLog
+++ b/app-emulation/virtualbox-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virtualbox-bin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.15 2007/10/07 22:01:12 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.16 2007/10/22 22:17:24 jokey Exp $
+
+*virtualbox-bin-1.5.2 (22 Oct 2007)
+
+  22 Oct 2007; Markus Ullmann <jokey@gentoo.org>
+  +virtualbox-bin-1.5.2.ebuild:
+  Version bump wrt bug #196424 thanks to Alessio for the ebuilds
 
   07 Oct 2007; Markus Ullmann <jokey@gentoo.org>
   files/virtualbox-bin-wrapper, virtualbox-bin-1.5.0-r1.ebuild:
diff --git a/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.5.2 b/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.5.2
new file mode 100644
index 000000000000..f11b0b8b7c43
--- /dev/null
+++ b/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.5.2
@@ -0,0 +1,6 @@
+MD5 1dd5ce98d60b6e269068dcf58d034f8a VirtualBox_1.5.2_Linux_amd64.run 16563190
+RMD160 0e97a0f3175b57140743fb961215ccec651edc33 VirtualBox_1.5.2_Linux_amd64.run 16563190
+SHA256 b7290b1df17d9011901b64ed3bf697bc8bdc71a762bdd0c12ef18dd7685ec5b8 VirtualBox_1.5.2_Linux_amd64.run 16563190
+MD5 11a819bc2a9a9c372e28bbbdd1d51ede VirtualBox_1.5.2_Linux_x86.run 15946150
+RMD160 c8373044892a1b4b036ae3bb0460c03d0c5c9078 VirtualBox_1.5.2_Linux_x86.run 15946150
+SHA256 f1e0b3de29e39f0bdfd8697ee3409b5274fe8afd61b3c93c668c835409aaa6a7 VirtualBox_1.5.2_Linux_x86.run 15946150
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-1.5.2.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-1.5.2.ebuild
new file mode 100644
index 000000000000..aefbd3377a33
--- /dev/null
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-1.5.2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2007 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.5.2.ebuild,v 1.1 2007/10/22 22:17:24 jokey Exp $
+
+inherit eutils qt3 pax-utils
+
+MY_P=VirtualBox_${PV}_Linux_${ARCH}.run
+
+DESCRIPTION="Softwarefamily of powerful x86 virtualization"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="amd64? ( http://www.virtualbox.org/download/${PV}/VirtualBox_${PV}_Linux_amd64.run )
+	x86? ( http://www.virtualbox.org/download/${PV}/VirtualBox_${PV}_Linux_x86.run )"
+
+LICENSE="PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="additions sdk"
+
+RDEPEND="!app-emulation/virtualbox
+	!app-emulation/virtualbox-additions
+	~app-emulation/virtualbox-modules-${PV}
+	virtual/xft
+	x11-libs/libXi
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXtst
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXrender
+	x11-libs/libXrandr
+	x11-libs/libXau
+	x11-libs/libXcursor
+	x11-libs/libXdmcp
+	x11-libs/libXfixes
+	dev-libs/libxml2
+	media-libs/libsdl
+	media-libs/libmng
+	media-libs/jpeg
+	media-libs/libpng
+	media-libs/freetype
+	media-libs/fontconfig
+	$(qt_min_version 3.3.5)
+	sys-apps/usermode-utilities
+	net-misc/bridge-utils
+	x86? ( =virtual/libstdc++-3.3 )
+	sdk? ( dev-libs/libIDL )"
+
+S=${WORKDIR}
+
+RESTRICT="primaryuri"
+
+pkg_setup() {
+	# 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
+
+	check_license
+}
+
+src_unpack() {
+	unpack_makeself ${MY_P}
+	unpack ./VirtualBox.tar.bz2
+}
+
+src_install() {
+	cd "${S}"
+
+	# desktop entry
+	insinto /usr/share/pixmaps
+	newins VBox.png virtualbox.png
+	insinto /usr/share/applications
+	newins VirtualBox.desktop virtualbox.desktop
+	dosed -e "10d" /usr/share/applications/virtualbox.desktop
+	dosed -e "5d" /usr/share/applications/virtualbox.desktop
+	dosed -e "s/VirtualBox/virtualbox/" /usr/share/applications/virtualbox.desktop
+	dosed -e "s/VBox.png/virtualbox.png/" /usr/share/applications/virtualbox.desktop
+	dosed -e "s/innotek virtualbox/Innotek VirtualBox/" /usr/share/applications/virtualbox.desktop
+	dosed -e "s/X-MandrivaLinux-System;//" /usr/share/applications/virtualbox.desktop
+
+	# create virtualbox configurations files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-config" vbox.cfg
+	newins "${FILESDIR}/${PN}-interfaces" interfaces
+
+	insinto /opt/VirtualBox
+	doins UserManual.pdf
+
+	if use additions; then
+		doins -r additions
+	fi
+	if use sdk; then
+		doins -r sdk
+		fowners root:vboxusers /opt/VirtualBox/sdk/bin/xpidl
+		fperms 0750 /opt/VirtualBox/sdk/bin/xpidl
+		pax-mark -m "${D}"/opt/VirtualBox/sdk/bin/xpidl
+	fi
+
+	rm -rf src sdk tst* rdesktop-vrdp.tar.gz deffiles install.sh routines.sh \
+	runlevel.sh vboxdrv.sh VBox.sh VBox.png kchmviewer additions VirtualBox.desktop \
+	VirtualBox.chm VirtualBox.tar.bz2 vboxnet.sh LICENSE VirtualBoxAPI.chm
+
+	doins -r *
+	for each in VBox{Manage,SDL,SVC,XPCOMIPCD,VRDP,Tunctl} VirtualBox ; do
+		fowners root:vboxusers /opt/VirtualBox/${each}
+		fperms 0750 /opt/VirtualBox/${each}
+		pax-mark -m "${D}"/opt/VirtualBox/${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
+	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/VBox.sh /usr/bin/VBoxVRDP
+	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() {
+	elog ""
+	elog "To launch VirtualBox just type: \"VirtualBox\""
+	elog "You must be in the vboxusers group to use VirtualBox"
+	elog ""
+}
diff --git a/app-emulation/virtualbox-modules/ChangeLog b/app-emulation/virtualbox-modules/ChangeLog
index 0d69ad65af36..7cd6d2ab4723 100644
--- a/app-emulation/virtualbox-modules/ChangeLog
+++ b/app-emulation/virtualbox-modules/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virtualbox-modules
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.7 2007/09/17 09:50:16 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/ChangeLog,v 1.8 2007/10/22 22:15:00 jokey Exp $
+
+*virtualbox-modules-1.5.2 (22 Oct 2007)
+
+  22 Oct 2007; Markus Ullmann <jokey@gentoo.org>
+  +virtualbox-modules-1.5.2.ebuild:
+  Version bump wrt bug #196424 thanks to Alessio for the ebuilds
 
   17 Sep 2007; Markus Ullmann <jokey@gentoo.org>
   virtualbox-modules-1.5.0.ebuild:
diff --git a/app-emulation/virtualbox-modules/files/digest-virtualbox-modules-1.5.2 b/app-emulation/virtualbox-modules/files/digest-virtualbox-modules-1.5.2
new file mode 100644
index 000000000000..83cbce85f525
--- /dev/null
+++ b/app-emulation/virtualbox-modules/files/digest-virtualbox-modules-1.5.2
@@ -0,0 +1,3 @@
+MD5 b2bf105abdfbe0e3b1f95d493b026762 vbox-kernel-module-src-1.5.2.tar.gz 203247
+RMD160 942b0d520dd638c18ba782c325c6c1d41b62d8d7 vbox-kernel-module-src-1.5.2.tar.gz 203247
+SHA256 29ca917b9032c82b632d8557e26474bbac8086015311eb57c23fec3bf8ebe4e2 vbox-kernel-module-src-1.5.2.tar.gz 203247
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-1.5.2.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-1.5.2.ebuild
new file mode 100644
index 000000000000..71724f927e44
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-1.5.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2007 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.5.2.ebuild,v 1.1 2007/10/22 22:15:00 jokey Exp $
+
+inherit eutils linux-mod
+
+MY_P=vbox-kernel-module-src-${PV}
+DESCRIPTION="Modules for Virtualbox OSE"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://www.virtualbox.org/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!=app-emulation/virtualbox-9999"
+
+S=${WORKDIR}/vboxdrv
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxdrv(misc:${S})"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+	enewgroup vboxusers
+}
+
+src_install() {
+	linux-mod_src_install
+
+	# udev rule for vboxdrv
+	dodir /etc/udev/rules.d
+	echo 'KERNEL=="vboxdrv", GROUP="vboxusers" MODE=660' >> "${D}/etc/udev/rules.d/60-virtualbox.rules"
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+}
diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index 235b65f37eb6..28f921108d81 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-emulation/virtualbox
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.26 2007/10/07 21:58:17 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.27 2007/10/22 22:19:38 jokey Exp $
+
+*virtualbox-1.5.2 (22 Oct 2007)
+
+  22 Oct 2007; Markus Ullmann <jokey@gentoo.org>
+  -files/virtualbox-1.5.0-remove-alsa.patch,
+  -files/virtualbox-1.5.0-remove-splitted-stuff.patch,
+  +files/virtualbox-1.5.2-remove-alsa.patch,
+  +files/virtualbox-1.5.2-remove-splitted-stuff.patch,
+  +files/virtualbox-config, +files/virtualbox-interfaces,
+  files/virtualbox-wrapper, -virtualbox-1.5.0-r1.ebuild,
+  +virtualbox-1.5.2.ebuild, virtualbox-9999.ebuild:
+  Version bump wrt bug #196424 thanks to Alessio for the ebuilds
 
   07 Oct 2007; Markus Ullmann <jokey@gentoo.org> virtualbox-9999.ebuild:
   add blockers for virtualbox-additions bug #194183, thanks to Alessio
diff --git a/app-emulation/virtualbox/files/digest-virtualbox-1.5.0-r1 b/app-emulation/virtualbox/files/digest-virtualbox-1.5.0-r1
deleted file mode 100644
index e6ddffe5c6d1..000000000000
--- a/app-emulation/virtualbox/files/digest-virtualbox-1.5.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 56c074900260c109ed735c08e726fe81 VirtualBox-1.5.0_OSE.tar.bz2 23951481
-RMD160 fe9f52d2b944535c6a6f2fb499d88f61ef67cbd4 VirtualBox-1.5.0_OSE.tar.bz2 23951481
-SHA256 1eb1d7e49324303b47c584cb150f0f676873a93bc1d426afe77fbeca05991cba VirtualBox-1.5.0_OSE.tar.bz2 23951481
diff --git a/app-emulation/virtualbox/files/digest-virtualbox-1.5.2 b/app-emulation/virtualbox/files/digest-virtualbox-1.5.2
new file mode 100644
index 000000000000..c7b9e2c0583e
--- /dev/null
+++ b/app-emulation/virtualbox/files/digest-virtualbox-1.5.2
@@ -0,0 +1,3 @@
+MD5 2940f92160c88e241606f0fa91428b2c VirtualBox-1.5.2_OSE.tar.bz2 24227070
+RMD160 ca9ae0ad715109835800a2258124101ada679ede VirtualBox-1.5.2_OSE.tar.bz2 24227070
+SHA256 a34c3ef9d3c07bbf8fd5c1b62a7a1f05185a1760299ac99f19dd6926f1dc39bd VirtualBox-1.5.2_OSE.tar.bz2 24227070
diff --git a/app-emulation/virtualbox/files/virtualbox-1.5.0-remove-alsa.patch b/app-emulation/virtualbox/files/virtualbox-1.5.2-remove-alsa.patch
index 4e6560f6e3d8..71a239abf258 100644
--- a/app-emulation/virtualbox/files/virtualbox-1.5.0-remove-alsa.patch
+++ b/app-emulation/virtualbox/files/virtualbox-1.5.2-remove-alsa.patch
@@ -1,5 +1,5 @@
---- Config.kmk.orig	2007-09-05 10:29:18.000000000 +0200
-+++ Config.kmk	2007-09-05 10:29:58.000000000 +0200
+--- Config.kmk.orig	2007-10-19 14:44:53.000000000 +0200
++++ Config.kmk	2007-10-19 14:45:11.000000000 +0200
 @@ -202,7 +202,7 @@
  # Enable the ISCSI feature.
  VBOX_WITH_ISCSI = 1
@@ -9,9 +9,9 @@
  # Disable WINMM support for Windows (not implemented)
  VBOX_WITH_WINMM =
  # Enable the kchmviewer
---- configure.orig	2007-09-05 10:29:24.000000000 +0200
-+++ configure	2007-09-05 10:34:34.000000000 +0200
-@@ -1336,7 +1336,7 @@
+--- configure.orig	2007-10-19 14:44:59.000000000 +0200
++++ configure	2007-10-19 14:45:31.000000000 +0200
+@@ -1451,7 +1451,7 @@
  # Linux-specific
  if [ "$OS" = "linux" ]; then
    check_linux
diff --git a/app-emulation/virtualbox/files/virtualbox-1.5.0-remove-splitted-stuff.patch b/app-emulation/virtualbox/files/virtualbox-1.5.2-remove-splitted-stuff.patch
index 8b28893a0602..7f8b562ca680 100644
--- a/app-emulation/virtualbox/files/virtualbox-1.5.0-remove-splitted-stuff.patch
+++ b/app-emulation/virtualbox/files/virtualbox-1.5.2-remove-splitted-stuff.patch
@@ -1,5 +1,5 @@
---- Config.kmk.orig	2007-09-05 10:17:41.000000000 +0200
-+++ Config.kmk	2007-09-05 10:20:27.000000000 +0200
+--- Config.kmk.orig	2007-10-19 14:38:41.000000000 +0200
++++ Config.kmk	2007-10-19 14:40:51.000000000 +0200
 @@ -134,7 +134,7 @@
  
  # Build linux / win32 additions.
@@ -33,9 +33,9 @@
  # 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	2007-09-05 10:20:35.000000000 +0200
-+++ configure	2007-09-05 10:23:44.000000000 +0200
-@@ -1281,14 +1281,14 @@
+--- configure.orig	2007-10-19 14:41:28.000000000 +0200
++++ configure	2007-10-19 14:42:29.000000000 +0200
+@@ -1402,14 +1402,14 @@
  # some things are not available in for OSE
  if [ $OSE -ge 1 ]; then
    cnf_append "VBOX_OSE" "1"
diff --git a/app-emulation/virtualbox/files/virtualbox-config b/app-emulation/virtualbox/files/virtualbox-config
new file mode 100644
index 000000000000..f69e73e2fcb6
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-config
@@ -0,0 +1 @@
+INSTALL_DIR=/opt/VirtualBox
diff --git a/app-emulation/virtualbox/files/virtualbox-interfaces b/app-emulation/virtualbox/files/virtualbox-interfaces
new file mode 100644
index 000000000000..ce2606b9d173
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-interfaces
@@ -0,0 +1,4 @@
+# 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 <interface name> <user name> [<bridge>].
+
diff --git a/app-emulation/virtualbox/files/virtualbox-wrapper b/app-emulation/virtualbox/files/virtualbox-wrapper
index 059a7887241f..4e39565812b1 100644
--- a/app-emulation/virtualbox/files/virtualbox-wrapper
+++ b/app-emulation/virtualbox/files/virtualbox-wrapper
@@ -1,66 +1,113 @@
 #!/bin/sh
+#
+# innotek VirtualBox
+#
+#  Copyright (C) 2006-2007 innotek GmbH
+# 
+#  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.
 
-INSTALL_DIR=/opt/VirtualBox
-USER=$( whoami )
+PATH="/usr/bin:/bin:/usr/sbin:/sbin"
+CONFIG="/etc/vbox/vbox.cfg"
 
-SERVER_PID=$( ps -U $USER | grep VBoxSVC | awk '{ print $1 }' )
-
-if [ "$1" = shutdown ]; then
-    if [ "$SERVER_PID" != "" ]; then
-        kill -TERM $SERVER_PID
-        sleep 2
-    fi
-    exit 0
+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 currente kernel (`uname -r`).
+         Please recompile the kernel module and install it by
+	
+	 sudo emerge -1 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 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. Try
 
-[ "$VBOX_USER_HOME" = "" ] && VBOX_USER_HOME="$HOME/.VirtualBox"
+           sudo /etc/init.d/virtualbox restart
 
-mkdir -p "$VBOX_USER_HOME"
-LOG="$VBOX_USER_HOME/VBoxSVC.log"
+         and if that is not successful, try to re-install the package.
 
-if [[ -e /proc/modules && ! -e /dev/vboxdrv ]] ; then
-	echo "Error: vboxdrv kernel module is not loaded..."
-	echo "Please load the module before starting VirtualBox."
-	exit 1
+	 You will not be able to start VMs until this problem is fixed.
+EOF
 elif [ ! -w /dev/vboxdrv ]; then
-	if [ "`id | grep vboxusers`" = "" ]; then
-		echo "Error: You are not a member of the \"vboxusers\" group..."
-		echo "Please add yourself to this group before starting VirtualBox."
-	else
-		echo "Error: /dev/vboxdrv is not writable for some reason..." 
-		echo "If you recently added the current user to the vboxusers group,"
-		echo "then you have to logout and re-login to take the change effect."
-	fi
-	exit 1
+    if [ "`id | grep vboxusers`" = "" ]; then
+        cat << EOF
+WARNING: You are not a member of the "vboxusers" group.  Please add yourself
+         to this group before starting VirtualBox.
+
+	 You will not be able to start VMs until this problem is fixed.
+EOF
+    else
+        cat << EOF
+WARNING: /dev/vboxdrv not writable for some reason. If you recently added the
+         current user to the vboxusers group then you have to logout and
+	 re-login to take the change effect.
+
+	 You will not be able to start VMs until this problem is fixed.
+EOF
+    fi
 fi
 
-export LD_LIBRARY_PATH="$INSTALL_DIR"
+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 [ "$SERVER_PID" = "" ]; then
-	rm -rf /tmp/.vbox-$USER-ipc
-	[ -f "$LOG.1" ] && mv "$LOG.1" "$LOG.2"
-	[ -f "$LOG.0" ] && mv "$LOG.0" "$LOG.1"
-	[ -f "$LOG" ] && mv "$LOG" "$LOG.0"
-	/opt/VirtualBox/VBoxSVC --daemonize >"$LOG" 2>&1
+if [ "$SHUTDOWN" = "true" ]; then
+    if [ -n "$SERVER_PID" ]; then
+        kill -TERM $SERVER_PID
+        sleep 2
+    fi
+    exit 0
 fi
 
-APP=$( which $0 )
+APP=`which $0`
 APP=${APP##/*/}
 case "$APP" in
-	virtualbox)
-		exec "$INSTALL_DIR/VirtualBox" "$@"
-		;;
-	vboxmanage)
-		exec "$INSTALL_DIR/VBoxManage" "$@"
-		;;
-	vboxsdl)
-		exec "$INSTALL_DIR/VBoxSDL" "$@"
-		;;
-	vboxbfe)
-		exec "$INSTALL_DIR/VBoxBFE" "$@"
-		;;
-	*)
-		echo "Error: Unknown application - $APP"
-		exit 1
-		;;
+  VirtualBox)
+    exec "$INSTALL_DIR/VirtualBox" "$@"
+  ;;
+  VBoxManage)
+    exec "$INSTALL_DIR/VBoxManage" "$@"
+  ;;
+  VBoxSDL)
+    exec "$INSTALL_DIR/VBoxSDL" "$@"
+  ;;
+  *)
+    echo "Unknown application - $APP"
+  ;;
 esac
diff --git a/app-emulation/virtualbox/virtualbox-1.5.0-r1.ebuild b/app-emulation/virtualbox/virtualbox-1.5.2.ebuild
index 55f304b4843d..bed8bfeba276 100644
--- a/app-emulation/virtualbox/virtualbox-1.5.0-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-1.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-1.5.0-r1.ebuild,v 1.1 2007/09/17 09:41:37 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-1.5.2.ebuild,v 1.1 2007/10/22 22:19:38 jokey Exp $
 
 inherit eutils flag-o-matic qt3 toolchain-funcs
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.virtualbox.org/download/${PV}/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="additions alsa nowrapper sdk vboxbfe"
+IUSE="additions alsa sdk"
 
 RDEPEND="!app-emulation/virtualbox-bin
 	~app-emulation/virtualbox-modules-${PV}
@@ -30,7 +30,9 @@ DEPEND="${RDEPEND}
 	sys-power/iasl
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )"
 RDEPEND="${RDEPEND}
-	additions? ( ~app-emulation/virtualbox-additions-${PV} )"
+	additions? ( ~app-emulation/virtualbox-additions-${PV} )
+	sys-apps/usermode-utilities
+	net-misc/bridge-utils"
 
 S=${WORKDIR}/${MY_P}
 
@@ -75,48 +77,41 @@ src_compile() {
 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
-		make_wrapper xpidl "sdk/bin/xpidl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
 		fowners root:vboxusers /opt/VirtualBox/sdk/bin/xpidl
 		fperms 0750 /opt/VirtualBox/sdk/bin/xpidl
 	fi
-	if use vboxbfe; then
-		doins VBoxBFE
-		fowners root:vboxusers /opt/VirtualBox/VBoxBFE
-		fperms 0750 /opt/VirtualBox/VBoxBFE
-
-		if use nowrapper ; then
-			make_wrapper vboxbfe "./VBoxBFE" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-		else
-			dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxbfe
-		fi
-	fi
 
-	rm -rf sdk src tst* testcase VBoxBFE vditool xpidl SUPInstall SUPUninstall
+	rm -rf sdk tst* testcase xpidl SUPInstall SUPUninstall VBox.png VBoxBFE \
+	vditool
 
 	doins -r *
-	for each in VBox{Manage,SDL,SVC,XPCOMIPCD} VirtualBox ; do
+	for each in VBox{Manage,SDL,SVC,XPCOMIPCD,Tunctl} VirtualBox ; do
 		fowners root:vboxusers /opt/VirtualBox/${each}
 		fperms 0750 /opt/VirtualBox/${each}
 	done
 
-	if use nowrapper ; then
-		make_wrapper vboxsvc "./VBoxSVC" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-		make_wrapper virtualbox "./VirtualBox" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-		make_wrapper vboxmanage "./VBoxManage" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-		make_wrapper vboxsdl "./VBoxSDL" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-	else
-		exeinto /opt/VirtualBox
-		newexe "${FILESDIR}/${PN}-wrapper" "wrapper.sh"
-		fowners root:vboxusers /opt/VirtualBox/wrapper.sh
-		fperms 0750 /opt/VirtualBox/wrapper.sh
-
-		dosym /opt/VirtualBox/wrapper.sh /usr/bin/virtualbox
-		dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxmanage
-		dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxsdl
-	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/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
 
 	# desktop entry
 	insinto /usr/share/pixmaps
@@ -128,16 +123,8 @@ src_install() {
 
 pkg_postinst() {
 	elog ""
-	if use nowrapper; then
-		elog "In order to launch VirtualBox you need to start the"
-		elog "VirtualBox XPCom Server first, with:"
-		elog "vboxsvc --daemonize && virtualbox"
-	else
-		elog "To launch VirtualBox just type: \"virtualbox\""
-	fi
-	elog ""
+	elog "To launch VirtualBox just type: \"VirtualBox\""
 	elog "You must be in the vboxusers group to use VirtualBox,"
-	elog "\"vditool\" is now deprecated, use \"VBoxManage\" instead."
 	elog ""
 	elog "The last user manual is available for download at:"
 	elog "http://www.virtualbox.org/download/UserManual.pdf"
diff --git a/app-emulation/virtualbox/virtualbox-9999.ebuild b/app-emulation/virtualbox/virtualbox-9999.ebuild
index c9b9e9deb83d..9ceca73115c0 100644
--- a/app-emulation/virtualbox/virtualbox-9999.ebuild
+++ b/app-emulation/virtualbox/virtualbox-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-9999.ebuild,v 1.20 2007/10/07 21:58:17 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-9999.ebuild,v 1.21 2007/10/22 22:19:38 jokey Exp $
 
 inherit eutils flag-o-matic linux-mod qt3 subversion toolchain-funcs
 
@@ -11,7 +11,7 @@ ESVN_REPO_URI="http://virtualbox.org/svn/vbox/trunk"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="nowrapper sdk vboxbfe vditool"
+IUSE="sdk"
 
 RDEPEND="!app-emulation/virtualbox-bin
 	!app-emulation/virtualbox-additions
@@ -29,6 +29,9 @@ DEPEND="${RDEPEND}
 	sys-devel/dev86
 	sys-power/iasl
 	>=media-libs/alsa-lib-1.0.13"
+RDEPEND="${RDEPEND}
+	sys-apps/usermode-utilities
+	net-misc/bridge-utils"
 
 BUILD_TARGETS="all"
 MODULE_NAMES="vboxdrv(misc:${S}/out/linux.${ARCH}/release/bin/src:${S}/out/linux.${ARCH}/release/bin/src)"
@@ -73,31 +76,16 @@ src_install() {
 	linux-mod_src_install
 
 	cd "${S}"/out/linux.${ARCH}/release/bin
-
 	insinto /opt/VirtualBox
 
-	make_wrapper vboxtunctl "./VBoxTunctl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-
 	if use sdk; then
 		doins -r sdk
-		make_wrapper xpidl "sdk/bin/xpidl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
 		fowners root:vboxusers /opt/VirtualBox/sdk/bin/xpidl
 		fperms 0750 /opt/VirtualBox/sdk/bin/xpidl
 	fi
-	if use vboxbfe; then
-		doins VBoxBFE
-		fowners root:vboxusers /opt/VirtualBox/VBoxBFE
-		fperms 0750 /opt/VirtualBox/VBoxBFE
-
-		if use nowrapper ; then
-			make_wrapper vboxbfe "./VBoxBFE" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-		else
-			dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxbfe
-		fi
-	fi
 
 	rm -rf sdk src tst* testcase additions VBoxBFE vditool vboxdrv.ko xpidl SUPInstall \
-	SUPUninstall VBox.sh VBox.png
+	SUPUninstall VBox.png
 
 	doins -r *
 	for each in VBox{Manage,SDL,SVC,XPCOMIPCD,Tunctl} VirtualBox ; do
@@ -105,26 +93,30 @@ src_install() {
 		fperms 0750 /opt/VirtualBox/${each}
 	done
 
-	if use nowrapper ; then
-		make_wrapper vboxsvc "./VBoxSVC" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-		make_wrapper virtualbox "./VirtualBox" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-		make_wrapper vboxmanage "./VBoxManage" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-		make_wrapper vboxsdl "./VBoxSDL" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-	else
-		exeinto /opt/VirtualBox
-		newexe "${FILESDIR}/${PN}-wrapper" "wrapper.sh"
-		fowners root:vboxusers /opt/VirtualBox/wrapper.sh
-		fperms 0750 /opt/VirtualBox/wrapper.sh
-
-		dosym /opt/VirtualBox/wrapper.sh /usr/bin/virtualbox
-		dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxmanage
-		dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxsdl
-	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/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
+
 	# desktop entry
 	insinto /usr/share/pixmaps
 	newins "${S}"/src/VBox/Frontends/VirtualBox/images/ico32x01.png ${PN}.png
@@ -135,14 +127,7 @@ src_install() {
 
 pkg_postinst() {
 	linux-mod_pkg_postinst
-	if use nowrapper; then
-		elog "In order to launch VirtualBox you need to start the"
-		elog "VirtualBox XPCom Server first, with:"
-		elog "vboxsvc --daemonize && virtualbox"
-	else
-		elog "To launch VirtualBox just type: \"virtualbox\""
-	fi
-	elog ""
+	elog "To launch VirtualBox just type: \"VirtualBox\""
 	elog "You must be in the vboxusers group to use VirtualBox."
 	elog ""
 	elog "The last user manual is available for download at:"