9 files changed, 115 insertions, 406 deletions
diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index ff525585eae8..1e19792bc265 100644
--- a/app-emulation/virtualbox-guest-additions/ChangeLog
+++ b/app-emulation/virtualbox-guest-additions/ChangeLog
@@ -1,6 +1,14 @@
 # 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.38 2010/05/11 18:52:37 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.39 2010/05/20 13:18:57 polynomial-c Exp $
+
+*virtualbox-guest-additions-3.2.0 (20 May 2010)
+
+  20 May 2010; Lars Wendler <polynomial-c@gentoo.org>
+  +virtualbox-guest-additions-3.2.0.ebuild,
+  +files/virtualbox-guest-additions-7.initd, +files/vboxclient.desktop,
+  +files/xorg.conf.vbox:
+  Version bump. Removed old versions. First attempt to fix bug #297633.
 
 *virtualbox-guest-additions-3.1.8-r1 (11 May 2010)
 
diff --git a/app-emulation/virtualbox-guest-additions/files/vboxclient.desktop b/app-emulation/virtualbox-guest-additions/files/vboxclient.desktop
new file mode 100644
index 000000000000..316eb9f6203a
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/files/vboxclient.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=VirtualBox Client Service
+Exec=VBoxClient-all
+Terminal=false
+X-KDE-StartupNotify=false
+StartupNotify=false
diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-2-localconfig b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-2-localconfig
deleted file mode 100644
index 5e6371e76648..000000000000
--- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-2-localconfig
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- Makefile -*-
-#
-# Overwrite some default kBuild settings
-#
-
-#
-# Copyright (C) 2006-2008 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 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.
-#
-
-# don't build testcases to save time, they are not needed for the package
-VBOX_WITH_TESTCASES     :=
-VBOX_WITH_TESTSUITE     :=
-
-KBUILD_MSG_STYLE        := brief
-
-## paths, origin, hardening
-VBOX_WITH_HARDENING        := 2
-VBOX_WITH_ORIGIN           :=
-VBOX_ONLY_ADDITIONS        := 1
-
diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.initd b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.initd
new file mode 100644
index 000000000000..67097dab7e3f
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-7.initd
@@ -0,0 +1,40 @@
+#!/sbin/runscript
+# Copyright 1999-2009 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"
+
+	einfo " Loading kernel modules"
+	/sbin/modprobe vboxguest &> /dev/null
+	/sbin/modprobe vboxsf &> /dev/null
+
+        start-stop-daemon --start --make-pidfile \
+		--exec /usr/sbin/vboxguest-service --pidfile /var/run/vboxguest-service.pid \
+		--name vboxguest-service \
+		--background -- \
+		--foreground
+
+        eend $? "Failed to start vboxguest-service"
+}
+
+stop() {
+	local retval=1
+        ebegin "Stopping VirtualBox guest additions"
+
+	start-stop-daemon --stop --quiet \
+		--pidfile /var/run/vboxguest-service.pid --name vboxguest-service \
+			&& retval=0
+
+	einfo "Removing kernel modules"
+	/sbin/modprobe -r vboxsf &> /dev/null
+	/sbin/modprobe -r vboxguest &> /dev/null
+
+        eend ${retval} "Failed to stop vboxguest-service"
+}
diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions.initd b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions.initd
deleted file mode 100644
index 69b0a46ef0fb..000000000000
--- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions.initd
+++ /dev/null
@@ -1,61 +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
-}
-
-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 vboxvfs &> /dev/null
-
-	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/xorg.conf.vbox b/app-emulation/virtualbox-guest-additions/files/xorg.conf.vbox
new file mode 100644
index 000000000000..faa471bc2e51
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/files/xorg.conf.vbox
@@ -0,0 +1,19 @@
+Section "Device"
+	Identifier  "Device-vboxvideo"
+	Driver      "vboxvideo"
+EndSection
+Section "Screen"
+	Identifier  "Screen-vboxvideo"
+	Device      "Device-vboxvideo"
+EndSection
+
+Section "InputDevice"
+	Identifier  "InputDevice-vboxmouse"
+	Driver      "vboxmouse"
+EndSection
+
+Section "ServerLayout"
+	Identifier  "Default Layout"
+	Screen      "Screen-vboxvideo"
+	InputDevice "InputDevice-vboxmouse"
+EndSection
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.0.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.0.ebuild
deleted file mode 100644
index 35984f7d784d..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.0.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# 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.0.ebuild,v 1.2 2010/05/01 14:04:21 lxnay Exp $
-
-inherit eutils linux-mod
-
-MY_P=VirtualBox-${PV}-OSE
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests"
-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="X"
-
-RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
-			 ~x11-drivers/xf86-input-virtualbox-${PV}
-			 x11-apps/xrandr
-			 x11-apps/xrefresh
-			 x11-libs/libXmu
-			 x11-libs/libX11
-			 x11-libs/libXt
-			 x11-libs/libXext
-			 x11-libs/libXau
-			 x11-libs/libXdmcp
-			 x11-libs/libSM
-			 x11-libs/libICE
-			 amd64? ( app-emulation/emul-linux-x86-xlibs ) )"
-DEPEND="${RDEPEND}
-		>=dev-util/kbuild-0.1.5-r1
-		>=dev-lang/yasm-0.6.2
-		sys-devel/bin86
-		sys-devel/dev86
-		sys-power/iasl
-		X? ( x11-proto/renderproto )"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
-			vboxvfs(misc:${WORKDIR}/vboxvfs:${WORKDIR}/vboxvfs)"
-
-S=${WORKDIR}/${MY_P/-OSE/_OSE}
-
-pkg_setup() {
-		linux-mod_pkg_setup
-		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
-		enewgroup vboxguest
-		enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest
-}
-
-src_unpack() {
-		unpack ${A}
-
-		# Create and unpack a tarball with the sources of the Linux guest
-		# kernel modules, to include all the needed files
-		"${MY_P/-OSE/_OSE}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
-		unpack ./vbox-kmod.tar.gz
-
-		# Remove shipped binaries (kBuild,yasm), see bug #232775
-		cd "${S}"
-		rm -rf kBuild/bin tools
-
-		# Disable things unused or splitted into separate ebuilds
-		cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
-}
-
-src_compile() {
-		linux-mod_src_compile
-
-		# build the user-space tools, warnings are harmless
-		./configure --nofatal \
-		--disable-xpcom \
-		--disable-sdl-ttf \
-		--disable-pulse \
-		--disable-alsa \
-		--build-headless || die "configure failed"
-		source ./env.sh
-
-		for each in	/src/VBox/{Runtime,Additions/common} \
-		/src/VBox/Additions/linux/{sharedfolders,daemon} ; do
-				cd "${S}"${each}
-				MAKE="kmk" emake TOOL_YASM_AS=yasm \
-				KBUILD_PATH="${S}/kBuild" \
-				|| die "kmk VBoxControl failed"
-		done
-
-		if use X; then
-				cd "${S}"/src/VBox/Additions/x11/VBoxClient
-				MAKE="kmk" emake TOOL_YASM_AS=yasm \
-				KBUILD_PATH="${S}/kBuild" \
-				|| die "kmk VBoxClient failed"
-		fi
-}
-
-src_install() {
-		linux-mod_src_install
-
-		cd "${S}"/out/linux.${ARCH}/release/bin/additions
-
-		insinto /sbin
-		newins mountvboxsf mount.vboxsf
-		fperms 4755 /sbin/mount.vboxsf
-
-		newinitd "${FILESDIR}"/${PN}-3.initd ${PN}
-
-		insinto /usr/sbin/
-		newins VBoxService vboxguest-service
-		fperms 0755 /usr/sbin/vboxguest-service
-
-		insinto /usr/bin
-		doins VBoxControl
-		fperms 0755 /usr/bin/VBoxControl
-
-		# VBoxClient user service and xrandr wrapper
-		if use X; then
-			doins VBoxClient
-			fperms 0755 /usr/bin/VBoxClient
-
-			cd "${S}"/src/VBox/Additions/x11/Installer
-			newins VBoxRandR.sh VBoxRandR
-			fperms 0755 /usr/bin/VBoxRandR
-
-			newins 98vboxguest-xclient VBoxClient-all
-			fperms 0755 /usr/bin/VBoxClient-all
-		fi
-
-		# udev rule for vboxdrv
-		dodir /etc/udev/rules.d
-		echo 'KERNEL=="vboxguest", NAME="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
-		echo 'KERNEL=="vboxuser", NAME="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
-}
-
-pkg_postinst() {
-		linux-mod_pkg_postinst
-		if ! useq X ; then
-			elog "use flag X is off, enable it to install the"
-			elog "X Window System input and video drivers"
-		fi
-		elog "Please add:"
-		elog "/etc/init.d/${PN}"
-		elog "to the default runlevel in order to load all"
-		elog "needed modules and services."
-		elog ""
-		elog "Warning:"
-		elog "this ebuild is only needed if you are running gentoo"
-		elog "inside a VirtualBox Virtual Machine, you don't need"
-		elog "it to run VirtualBox itself."
-		elog ""
-}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.2.ebuild
deleted file mode 100644
index 0dff9efddd96..000000000000
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.2.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# 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.2.ebuild,v 1.2 2010/05/01 14:04:21 lxnay Exp $
-
-inherit eutils linux-mod
-
-MY_P=VirtualBox-${PV}-OSE
-DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests"
-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="X"
-
-RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
-			 ~x11-drivers/xf86-input-virtualbox-${PV}
-			 x11-apps/xrandr
-			 x11-apps/xrefresh
-			 x11-libs/libXmu
-			 x11-libs/libX11
-			 x11-libs/libXt
-			 x11-libs/libXext
-			 x11-libs/libXau
-			 x11-libs/libXdmcp
-			 x11-libs/libSM
-			 x11-libs/libICE
-			 amd64? ( app-emulation/emul-linux-x86-xlibs ) )"
-DEPEND="${RDEPEND}
-		>=dev-util/kbuild-0.1.5-r1
-		>=dev-lang/yasm-0.6.2
-		sys-devel/bin86
-		sys-devel/dev86
-		sys-power/iasl
-		X? ( x11-proto/renderproto )"
-
-BUILD_TARGETS="all"
-BUILD_TARGET_ARCH="${ARCH}"
-MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
-			vboxvfs(misc:${WORKDIR}/vboxvfs:${WORKDIR}/vboxvfs)"
-
-S=${WORKDIR}/${MY_P/-OSE/_OSE}
-
-pkg_setup() {
-		linux-mod_pkg_setup
-		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
-		enewgroup vboxguest
-		enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest
-}
-
-src_unpack() {
-		unpack ${A}
-
-		# Create and unpack a tarball with the sources of the Linux guest
-		# kernel modules, to include all the needed files
-		"${MY_P/-OSE/_OSE}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
-		unpack ./vbox-kmod.tar.gz
-
-		# Remove shipped binaries (kBuild,yasm), see bug #232775
-		cd "${S}"
-		rm -rf kBuild/bin tools
-
-		# Disable things unused or splitted into separate ebuilds
-		cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
-}
-
-src_compile() {
-		linux-mod_src_compile
-
-		# build the user-space tools, warnings are harmless
-		./configure --nofatal \
-		--disable-xpcom \
-		--disable-sdl-ttf \
-		--disable-pulse \
-		--disable-alsa \
-		--build-headless || die "configure failed"
-		source ./env.sh
-
-		for each in	/src/VBox/{Runtime,Additions/common} \
-		/src/VBox/Additions/linux/{sharedfolders,daemon} ; do
-				cd "${S}"${each}
-				MAKE="kmk" emake TOOL_YASM_AS=yasm \
-				KBUILD_PATH="${S}/kBuild" \
-				|| die "kmk VBoxControl failed"
-		done
-
-		if use X; then
-				cd "${S}"/src/VBox/Additions/x11/VBoxClient
-				MAKE="kmk" emake TOOL_YASM_AS=yasm \
-				KBUILD_PATH="${S}/kBuild" \
-				|| die "kmk VBoxClient failed"
-		fi
-}
-
-src_install() {
-		linux-mod_src_install
-
-		cd "${S}"/out/linux.${ARCH}/release/bin/additions
-
-		insinto /sbin
-		newins mount.vboxsf mount.vboxsf
-		fperms 4755 /sbin/mount.vboxsf
-
-		newinitd "${FILESDIR}"/${PN}-3.initd ${PN}
-
-		insinto /usr/sbin/
-		newins VBoxService vboxguest-service
-		fperms 0755 /usr/sbin/vboxguest-service
-
-		insinto /usr/bin
-		doins VBoxControl
-		fperms 0755 /usr/bin/VBoxControl
-
-		# VBoxClient user service and xrandr wrapper
-		if use X; then
-			doins VBoxClient
-			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
-
-		# udev rule for vboxdrv
-		dodir /etc/udev/rules.d
-		echo 'KERNEL=="vboxguest", NAME="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
-		echo 'KERNEL=="vboxuser", NAME="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
-		>> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
-}
-
-pkg_postinst() {
-		linux-mod_pkg_postinst
-		if ! useq X ; then
-			elog "use flag X is off, enable it to install the"
-			elog "X Window System input and video drivers"
-		fi
-		elog "Please add:"
-		elog "/etc/init.d/${PN}"
-		elog "to the default runlevel in order to load all"
-		elog "needed modules and services."
-		elog ""
-		elog "Warning:"
-		elog "this ebuild is only needed if you are running gentoo"
-		elog "inside a VirtualBox Virtual Machine, you don't need"
-		elog "it to run VirtualBox itself."
-		elog ""
-}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.4.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.0.ebuild
index 652f7bf52bab..91c7e618248d 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.4.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.0.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.4.ebuild,v 1.3 2010/05/11 18:52:37 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.0.ebuild,v 1.1 2010/05/20 13:18:57 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}
 
@@ -63,11 +63,17 @@ src_unpack() {
 
 		# Disable things unused or splitted into separate ebuilds
 		cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk
+
+		# stupid new header references...
+		for vboxheader in {product,revision}-generated.h ; do
+			for mdir in vbox{guest,sf} ; do
+				ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+					"${WORKDIR}/${mdir}/${vboxheader}"
+			done
+		done
 }
 
 src_compile() {
-		linux-mod_src_compile
-
 		# build the user-space tools, warnings are harmless
 		./configure --nofatal \
 		--disable-xpcom \
@@ -91,6 +97,11 @@ src_compile() {
 				KBUILD_PATH="${S}/kBuild" \
 				|| die "kmk VBoxClient failed"
 		fi
+
+		# Now creating the kernel modules. We must do this _after_
+		# we compiled the user-space tools as we need two of the
+		# automatically generated header files. (>=3.2.0)
+		linux-mod_src_compile
 }
 
 src_install() {
@@ -102,7 +113,7 @@ src_install() {
 		newins mount.vboxsf mount.vboxsf
 		fperms 4755 /sbin/mount.vboxsf
 
-		newinitd "${FILESDIR}"/${PN}-5.initd ${PN}
+		newinitd "${FILESDIR}"/${PN}-7.initd ${PN}
 
 		insinto /usr/sbin/
 		newins VBoxService vboxguest-service
@@ -118,19 +129,24 @@ 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
 
 		# udev rule for vboxdrv
 		dodir /etc/udev/rules.d
-		echo 'KERNEL=="vboxguest", NAME="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
 		>> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
-		echo 'KERNEL=="vboxuser", NAME="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
+		echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \
 		>> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
+
+		# VBoxClient autostart file
+		insinto /etc/xdg/autostart
+		doins "${FILESDIR}"/vboxclient.desktop
+
+		# sample xorg.conf
+		insinto /usr/share/doc/${PF}
+		doins "${FILESDIR}"/xorg.conf.vbox
 }
 
 pkg_postinst() {
@@ -141,8 +157,20 @@ pkg_postinst() {
 		fi
 		elog "Please add:"
 		elog "/etc/init.d/${PN}"
-		elog "to the default runlevel in order to load all"
-		elog "needed modules and services."
+		elog "to the default runlevel in order to start"
+		elog "needed services."
+		elog "To use the VirtualBox X drivers, use the following"
+		elog "file as your /etc/X11/xorg.conf:"
+		elog "    /usr/share/doc/${PF}/xorg.conf.xorg"
+		elog ""
+		elog "Also make sure you use the Mesa library for OpenGL:"
+		elog "    eselect opengl set xorg-x11"
+		elog ""
+		elog "An autostart .desktop file has been installed to start"
+		elog "VBoxClient in desktop sessions."
+		elog ""
+		elog "You can mount shared folders with:"
+		elog "    mount -t vboxsf <shared_folder_name> <mount_point>"
 		elog ""
 		elog "Warning:"
 		elog "this ebuild is only needed if you are running gentoo"