Port from dev overlay

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

4 files changed, 27 insertions, 74 deletions

diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.5.6-remove-alsa.patch b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.5.6-remove-alsa.patch
deleted file mode 100644
index 44c5d7510dd7..000000000000
--- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.5.6-remove-alsa.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- VirtualBox-1.5.6_OSE/Config.kmk.orig	2008-01-02 17:21:25.000000000 +0100
-+++ VirtualBox-1.5.6_OSE/Config.kmk	2008-01-02 17:24:20.000000000 +0100
-@@ -208,7 +208,7 @@
- # Enable the ISCSI feature.
- VBOX_WITH_ISCSI = 1
- # Enable ALSA support for Linux
--VBOX_WITH_ALSA = 1
-+#VBOX_WITH_ALSA = 1
- # Enable Pulse support for Linux
- VBOX_WITH_PULSE = 1
- # Disable WINMM support for Windows (not implemented)
---- VirtualBox-1.5.6_OSE/configure.orig	2008-01-02 17:21:37.000000000 +0100
-+++ VirtualBox-1.5.6_OSE/configure	2008-01-02 17:24:42.000000000 +0100
-@@ -1526,7 +1526,7 @@
-     cnf_append "VBOX_WITH_VBOXDRV" ""
-     cnf_append "VBOX_WITH_LINUX_ADDITIONS_32BIT_R0" ""
-   fi
--  check_alsa
-+#  check_alsa
-   if [ $WITH_PULSE -eq 1 ]; then
-     check_pulse
-   else
diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch
index 44668d838849..83ad78acf1b2 100644
--- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch
+++ b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch
@@ -1,7 +1,7 @@
 --- src/apps/Makefile.kmk	1970-01-01 01:00:00.000000000 +0100
 +++ src/apps/Makefile.kmk	2008-08-02 16:06:11.358197514 +0200
 @@ -0,0 +1,28 @@
-+# $Id: virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch,v 1.2 2008/08/27 12:31:00 jokey Exp $
++# $Id: virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch,v 1.3 2008/09/06 19:30:01 jokey Exp $
 +## @file
 +# Sub-Makefile for the external apps.
 +#
@@ -32,7 +32,7 @@
 --- src/apps/tunctl/Makefile.kmk	1970-01-01 01:00:00.000000000 +0100
 +++ src/apps/tunctl/Makefile.kmk	2008-08-02 16:06:37.447936207 +0200
 @@ -0,0 +1,32 @@
-+# $Id: virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch,v 1.2 2008/08/27 12:31:00 jokey Exp $
++# $Id: virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch,v 1.3 2008/09/06 19:30:01 jokey Exp $
 +## @file
 +# Sub-Makefile for VBoxTunctl
 +#
diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.6.4.initd b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.6.4.initd
deleted file mode 100644
index 4b3721d1bd67..000000000000
--- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.6.4.initd
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header:
-
-depend() {
-        need localmount
-	before xdm
-}
-
-start() {
-	ebegin "Starting VirtualBox guest additions"
-
-	# Check if vboxadd and vboxvfs module are already loaded
-	if [[ -e /proc/modules && ! -e /dev/vboxadd ]] ; then
-                einfo "	Loading kernel modules and creating devices"
-                /sbin/modprobe vboxadd &> /dev/null
-		mknod /dev/vboxadd c 254 0 -m 0664 &> /dev/null
-                /sbin/modprobe vboxvfs &> /dev/null
-        fi
-
-	einfo "	Starting the time syncronization system service"
-        start-stop-daemon --start --make-pidfile \
-		--exec /usr/sbin/vboxadd-timesync --pidfile /var/run/vboxadd-timesync.pid \
-		--name vboxadd-timesync \
-		--background
-
-        eend $? "Failed to start VirtualBox guest additions"
-}
-
-stop() {
-        ebegin "Stopping VirtualBox guest additions"
-
-	einfo "	Stopping the time syncronization system service"
-	start-stop-daemon --stop --quiet \
-		--pidfile /var/run/vboxadd-timesync.pid --name vboxadd-timesync
-
-	einfo " Unloading kernel modules and removing devices"
-	/sbin/rmmod vboxvfs &> /dev/null
-	/sbin/rmmod vboxadd &> /dev/null
-	rm -f /dev/vboxadd &> /dev/null
-        eend $?
-}
diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.5.6.initd b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions.initd
index 4b3721d1bd67..69b0a46ef0fb 100755..100644
--- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.5.6.initd
+++ b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions.initd
@@ -8,16 +8,34 @@ depend() {
 	before xdm
 }
 
+createvboxdevice() {
+		local maj min
+
+		maj=`sed -n 's;\([0-9]\+\) vboxadd;\1;p' /proc/devices`
+
+		if ! [[ -z $maj ]] ; then
+			min=0
+		else
+			min=`sed -n 's;\([0-9]\+\) vboxadd;\1;p' /proc/misc`
+			if ! [[ -z $min ]] ; then
+				maj=10
+			fi
+		fi
+
+		mknod /dev/vboxadd c $maj $min -m 0664 &> /dev/null
+}
+
 start() {
 	ebegin "Starting VirtualBox guest additions"
 
-	# Check if vboxadd and vboxvfs module are already loaded
-	if [[ -e /proc/modules && ! -e /dev/vboxadd ]] ; then
-                einfo "	Loading kernel modules and creating devices"
-                /sbin/modprobe vboxadd &> /dev/null
-		mknod /dev/vboxadd c 254 0 -m 0664 &> /dev/null
-                /sbin/modprobe vboxvfs &> /dev/null
-        fi
+	if [[ -e /dev/vboxadd ]] ; then
+		rm -f /dev/vboxadd &> /dev/null
+	fi
+
+	einfo "	Loading kernel modules and creating devices"
+	/sbin/modprobe vboxadd &> /dev/null
+	createvboxdevice
+	/sbin/modprobe vboxvfs &> /dev/null
 
 	einfo "	Starting the time syncronization system service"
         start-stop-daemon --start --make-pidfile \