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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index 981b23d32e915a86abb21cf710a5b25814371025..c92282763475b7a5965e715d55343040c57c9751 100644 (file)
--- 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/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 9cc9648185188bd3fedb8994d4ebba2b4c656185..d407124b59910157cc3513d0be38d4f7cbdd6d8d 100644 (file)
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,6 +1,7 @@
 AUX virtualbox-guest-additions-2-localconfig 877 RMD160 7a09c0e50c1294c289cfd0665dc29986e55f2f7c SHA1 186a04d197c4f1a22376f767b4804cb05a8c811a SHA256 0115ff252376fa9c1244f79f183041a8e1b078f64d8bea2126d344e8b21a7b84
 AUX virtualbox-guest-additions-3-localconfig 877 RMD160 7a09c0e50c1294c289cfd0665dc29986e55f2f7c SHA1 186a04d197c4f1a22376f767b4804cb05a8c811a SHA256 0115ff252376fa9c1244f79f183041a8e1b078f64d8bea2126d344e8b21a7b84
 AUX virtualbox-guest-additions-3.initd 1454 RMD160 617d486535efccfd2cf013ffeb7c2ae9c211a533 SHA1 942b81b99d33e85d7dc6564f0449608620cd5d50 SHA256 d87d8386fbed5c17c4919368d59540ce527bcca7d539fb88927e3b4a849ad9ae
+AUX virtualbox-guest-additions-4.initd 1452 RMD160 09a233e65ecb5cb960cbb477e24433efce3416b5 SHA1 027967966f0b9ea05433bc5d6d60edafefad9fc8 SHA256 89c903600134d0ad59ac4f5b2d117dd0d5fed2b73ff5c78601f11a293d9519d4
 AUX virtualbox-guest-additions.initd 1463 RMD160 4daceefa3e10659381f4b714512548944c7f54fd SHA1 f5290150bbf99feac5c6d81c4f82f9191e5f1786 SHA256 933dbdc5e5363dfbdc2d51deed0726ab91f1ea89e330298266b9ffb03c38989a
 DIST VirtualBox-3.0.12-OSE.tar.bz2 52075946 RMD160 4c19f2b945f7288235c8becfc0d1931ddf1bc94e SHA1 7ac46be39db4e51ea38cb6a857d2da544b7a820f SHA256 3c88b6ad1fa5739440485ad8cfd9754dbd17dc23df09a7dcc47b2e91635182b2
 DIST VirtualBox-3.1.0-OSE.tar.bz2 55491869 RMD160 7e3600ca1320af601d01d24f0a4e78ef04c89aac SHA1 fb7c97d692fc8e9973578ef44a848a5988694606 SHA256 da8affc44342d3988c96ad2d98c248b99f481ecd001af1557aeb31cd15e10639
@@ -13,6 +14,6 @@ EBUILD virtualbox-guest-additions-3.1.0.ebuild 4269 RMD160 507f8f7a3eaea71c56f04
 EBUILD virtualbox-guest-additions-3.1.2.ebuild 4268 RMD160 c5b284478a9f3f0b929cd944193490899ef5c7d5 SHA1 79517951b8793d982bc602bf6332fe453b467e3f SHA256 14f33922fa1939da44023646cebbabdb3eae39a1ee5fa0600e04a3ed0763ebf1
 EBUILD virtualbox-guest-additions-3.1.4.ebuild 4268 RMD160 90a68252721e1a2aa5e8221ff7612a47e7e68a87 SHA1 c97f6b4b161bc2aa0e0125eaa32f870e855fed7c SHA256 92de42847ec6946705ca09ab259c88fcc4d6e572a25aab102efee35d78558f9a
 EBUILD virtualbox-guest-additions-3.1.6.ebuild 4268 RMD160 ccaa4e4bcb267970dc25edc7ec74e24a6083706a SHA1 60ada0dac66bc3f0082a10a0f72f6eff35eef2bd SHA256 19d02d4168baf4d1fb8d30cc6e1332dcccb4a87f1f10b15ea966695eccc9bf1c
-EBUILD virtualbox-guest-additions-3.1.8.ebuild 4275 RMD160 8e25d3827993ab280f21c4ece71b6dd2e78ac41f SHA1 399bf1888b94ec1a8ac96925b34e37ccb2a32f01 SHA256 a60c93db2cad47c98f14e330a51bf906fc87e26f14e49e9c50bf8ee429461187
-MISC ChangeLog 12993 RMD160 cc019032959d2d12789961ed5feb9e51faabb770 SHA1 d6bb01914536035a5338d113a3dfb8ab7eb98a37 SHA256 3f7a110da203ac5c6b953749fb8c7342ed41e9671a69634b75e2baf5415fe026
+EBUILD virtualbox-guest-additions-3.1.8.ebuild 4204 RMD160 dcfeebee312b99f750c8a92739a099b10fc590f2 SHA1 6e149eb79d62d096bedcfc4b9916f2c567752a5d SHA256 fa107fe50af8cdb77ac9688a70aac837655a99b76508cb2753e6475951c6ae7e
+MISC ChangeLog 13236 RMD160 b90915b82f85a1ac9ab6b3699fb457e967db134b SHA1 341fc86ee664eb62f2afa2717bba6f9bdbbcc52f SHA256 546e23d31012be8336d1889aeeabc7504c4ece5f263c9883d83431a3982e9ecf
 MISC metadata.xml 353 RMD160 0fd52505150025043cf0f6d53b54736082f266bb SHA1 60aa8776951b13cd71fde130db73849977b4c48f SHA256 c8c97cdc3c8878c361444f278d234b1ad6fe9db06d8c4d4d9bcee711a2f6369d

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 (file)
index 0000000..be00ba2
--- /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 54584201c597a0b2d55b08b7827a53a84460ed6c..82dbbf527b6950f1460cb9a002cc356c9f24c409 100644 (file)
--- 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