taking care of renamed module (vboxvfs --> vboxsf)

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 72 insertions, 7 deletions

diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index 981b23d32e91..c92282763475 100644
--- a/app-emulation/virtualbox-guest-additions/ChangeLog
+++ b/app-emulation/virtualbox-guest-additions/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/virtualbox-guest-additions
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.36 2010/05/10 13:36:25 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.37 2010/05/11 05:39:44 polynomial-c Exp $
+
+  11 May 2010; Lars Wendler <polynomial-c@gentoo.org>
+  virtualbox-guest-additions-3.1.8.ebuild,
+  +files/virtualbox-guest-additions-4.initd:
+  Fixing compilation and init script. There's no longer a vboxvfs module.
+  It's now called vboxsf.
 
 *virtualbox-guest-additions-3.1.8 (10 May 2010)
 
diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-4.initd b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-4.initd
new file mode 100644
index 000000000000..be00ba264b12
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-4.initd
@@ -0,0 +1,62 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header:
+
+depend() {
+        need localmount
+	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"
+
+	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 vboxsf &> /dev/null
+
+	einfo "	Starting the vboxadd system service"
+        start-stop-daemon --start --make-pidfile \
+		--exec /usr/sbin/vboxadd-service --pidfile /var/run/vboxadd-service.pid \
+		--name vboxadd-service \
+		--background -- \
+		--foreground
+
+        eend $? "Failed to start VirtualBox guest additions"
+}
+
+stop() {
+        ebegin "Stopping VirtualBox guest additions"
+
+	einfo "	Stopping the vboxadd system service"
+	start-stop-daemon --stop --quiet \
+		--pidfile /var/run/vboxadd-service.pid --name vboxadd-service
+
+	einfo " Unloading kernel modules and removing devices"
+	/sbin/rmmod vboxsf &> /dev/null
+	/sbin/rmmod vboxadd &> /dev/null
+	rm -f /dev/vboxadd &> /dev/null
+        eend $?
+}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8.ebuild
index 54584201c597..82dbbf527b69 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8.ebuild,v 1.1 2010/05/10 13:36:25 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8.ebuild,v 1.2 2010/05/11 05:39:44 polynomial-c Exp $
 
 inherit eutils linux-mod
 
@@ -38,7 +38,7 @@ DEPEND="${RDEPEND}
 BUILD_TARGETS="all"
 BUILD_TARGET_ARCH="${ARCH}"
 MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
-			vboxvfs(misc:${WORKDIR}/vboxvfs:${WORKDIR}/vboxvfs)"
+			vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
 
 S=${WORKDIR}/${MY_P/-OSE/_OSE}
 
@@ -102,7 +102,7 @@ src_install() {
 		newins mount.vboxsf mount.vboxsf
 		fperms 4755 /sbin/mount.vboxsf
 
-		newinitd "${FILESDIR}"/${PN}-3.initd ${PN}
+		newinitd "${FILESDIR}"/${PN}-4.initd ${PN}
 
 		insinto /usr/sbin/
 		newins VBoxService vboxguest-service
@@ -118,9 +118,6 @@ src_install() {
 			fperms 0755 /usr/bin/VBoxClient
 
 			cd "${S}"/src/VBox/Additions/x11/Installer
-			newins VBoxRandR.sh VBoxRandR
-			fperms 0755 /usr/bin/VBoxRandR
-
 			newins 98vboxadd-xclient VBoxClient-all
 			fperms 0755 /usr/bin/VBoxClient-all
 		fi