Port from dev overlay

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo i686

8 files changed, 111 insertions, 115 deletions

diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index ab0cd3fb35ed..590767e333ac 100644
--- a/app-emulation/virtualbox-guest-additions/ChangeLog
+++ b/app-emulation/virtualbox-guest-additions/ChangeLog
@@ -1,6 +1,33 @@
 # ChangeLog for app-emulation/virtualbox-guest-additions
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.3 2008/08/27 12:30:59 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.4 2008/09/06 19:30:00 jokey Exp $
+
+*virtualbox-guest-additions-1.6.6 (06 Sep 2008)
+*virtualbox-guest-additions-1.6.4-r2 (06 Sep 2008)
+
+  06 Sep 2008; Markus Ullmann <jokey@gentoo.org>
+  -files/virtualbox-guest-additions-1.5.6-remove-alsa.patch,
+  -files/virtualbox-guest-additions-1.5.6.initd,
+  files/virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch,
+  -files/virtualbox-guest-additions-1.6.4.initd,
+  +files/virtualbox-guest-additions.initd,
+  -virtualbox-guest-additions-1.5.6.ebuild,
+  -virtualbox-guest-additions-1.6.4-r1.ebuild,
+  +virtualbox-guest-additions-1.6.4-r2.ebuild,
+  +virtualbox-guest-additions-1.6.6.ebuild:
+  Port from dev overlay
+
+  03 Sep 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  -virtualbox-guest-additions-1.5.6.ebuild,
+  -files/virtualbox-guest-additions-1.5.6-remove-alsa.patch,
+  -files/virtualbox-guest-additions-1.5.6.initd,
+  virtualbox-guest-additions-1.6.4-r2.ebuild,
+  -files/virtualbox-guest-additions-1.6.4.initd,
+  +virtualbox-guest-additions-1.6.6.ebuild,
+  +files/virtualbox-guest-additions.initd:
+  Version bump; drop old 1.5.x version; fix SRC_URI; add dev-util/kbuild and
+  dev-lang/yasm to DEPEND and force to build without shipped binaries (kBuild,
+  yasm), wrt bug #232775;
 
 *virtualbox-guest-additions-1.6.4-r1 (27 Aug 2008)
 
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index df859a362870..3055333051e9 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX virtualbox-guest-additions-1.5.6-remove-alsa.patch 761 RMD160 01a703389ac676662c16150855e7dc536d5b0845 SHA1 327818074e2dd85b1c55570fc67367165b525e79 SHA256 b23acb72dc347a98982bc882d646d9aa785ec46d34083448f1a3c9c77794d18f
-AUX virtualbox-guest-additions-1.5.6.initd 1286 RMD160 b0a59b77f09772a048b74447e1e3b0c88a523437 SHA1 5f0db8a24b1a6546a8079c0e2f45d463d7a3d9a3 SHA256 18a01b1995f8fe99459ad5f997a5b6b6257928ff3666550c8a3fb703ea3e7a27
-AUX virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch 2141 RMD160 6986c03806cb0d04db1c9589db02389ec7b76f52 SHA1 e1dad4837b2a6fc8c4158b6aec6bf5c5763fbc3d SHA256 6fb67967698559b56a7efb7ee429333882e7d8486560a8c027be76b1a8b0eeb5
-AUX virtualbox-guest-additions-1.6.4.initd 1286 RMD160 b0a59b77f09772a048b74447e1e3b0c88a523437 SHA1 5f0db8a24b1a6546a8079c0e2f45d463d7a3d9a3 SHA256 18a01b1995f8fe99459ad5f997a5b6b6257928ff3666550c8a3fb703ea3e7a27
-DIST VirtualBox-1.5.6-1_OSE.tar.bz2 26720717 RMD160 b016986beeae6205f19f5f1a3c586d3c08511c2f SHA1 1cb11c012b9143e14f2eada645757cae8886d0d1 SHA256 fb4d98f932a89d914486101a22dfdda628dae34069dfae8b6cdece4fa10b9c24
+AUX virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch 2141 RMD160 dbaa0add3f5c28871431cb5525870c840e3f95ba SHA1 195a8a77bf14d591b8c4ef727df4c7d2a89faa36 SHA256 20cca8887c845e5706690252288ce41cc27d2ae3f4fb73c2a87064606f048475
+AUX virtualbox-guest-additions.initd 1463 RMD160 4daceefa3e10659381f4b714512548944c7f54fd SHA1 f5290150bbf99feac5c6d81c4f82f9191e5f1786 SHA256 933dbdc5e5363dfbdc2d51deed0726ab91f1ea89e330298266b9ffb03c38989a
 DIST VirtualBox-1.6.4-OSE.tar.bz2 35484117 RMD160 af94b774d9964757da125c4614e393396f7e892b SHA1 457ae85f2d10028ac7c56e4b35ee47028ec0208b SHA256 7e777e5f602d7b48bf5a8b1d580ee43dd6327b9037816fde484a13db8a86b422
-EBUILD virtualbox-guest-additions-1.5.6.ebuild 3225 RMD160 0409ad29f6b7926d877b0f8a5164c9bab82a9474 SHA1 9bb55868b01c1533f6c2320c909185fff351940f SHA256 8f0e17a0016c420829cb5978c63ce9e20e506febca689ac842a346400de94e6f
-EBUILD virtualbox-guest-additions-1.6.4-r1.ebuild 3325 RMD160 e3209a85ba8ff539013f161b3cf4ec971e686017 SHA1 7f5962b99f664013fa6766fcc4dfb7aa388f7005 SHA256 4888c397756ac2de694ded9ab6de1996553a7ed9940442dc578b71071f1468d1
-MISC ChangeLog 3938 RMD160 ab6d218037603193697cad4ad756ad299ef4a296 SHA1 7a2e2c83615f3ae51d307a6de316b5450b771d65 SHA256 450e2c42d22724cb79464c8e6dc1ff9e8720591792f0622f056cabe0b9ab7a5f
+DIST VirtualBox-1.6.6-OSE.tar.bz2 35483853 RMD160 4b17428371089806cf6f5e52d1905936f7beb01d SHA1 7c323b35d77277c650cbce2821ab6778d1e3270e SHA256 acb3c20ef751ed408489d7b5c2d5d441226055a6e83bfeb9258ce2d55baba4da
+EBUILD virtualbox-guest-additions-1.6.4-r2.ebuild 3472 RMD160 eb999fa2634a104e2e1fd341c11c1b3fe8450f52 SHA1 b92a9536e5bd5c7a8f5b598bd1b774d68c0fb4fc SHA256 eda856f5e1cf441de0b311a8e28b872514f3902f53471c6e0d41cc4c60ad02d2
+EBUILD virtualbox-guest-additions-1.6.6.ebuild 3538 RMD160 5bae66bf3086f4cad5882acb97d364ae8f5f0092 SHA1 cb54dea5d642fc879bab63f73106666d5c6e85ef SHA256 fed5a3418b8e24eb6689600d02c3df6a862b6f33b4ce844708d2135b62bc174f
+MISC ChangeLog 5145 RMD160 f00661852e2956afc53d4109fd9f5c2f4025b608 SHA1 85b6c715ce74a06916c8d445d1f654bf5464f087 SHA256 c98ec1b216c77f8b3b8744e5bdd6b03a9851088f24e1529560230de1a6ad8ff9
 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAki1SQQACgkQz974XjDVpbkxAQCgp0ktnK0nGdF0CCrKYMRe33oO
-L1AAoNcr+fIGXHKKtZD2IbjRdDVt3Hx6
-=x9cm
+iEYEARECAAYFAkjC2jwACgkQz974XjDVpblwlQCggkcR7l4LIrgFThYb3AjAlvRD
+HKsAoLM1W4Zvk4g6djj7BO7pOe+kzkVj
+=tUdR
 -----END PGP SIGNATURE-----
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 \
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.4-r1.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.4-r2.ebuild
index 2e9b6653cb08..2acd337c3b9a 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.4-r1.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.4-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2008 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-1.6.4-r1.ebuild,v 1.1 2008/08/27 12:30:59 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.4-r2.ebuild,v 1.1 2008/09/06 19:30:00 jokey 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://www.virtualbox.org/download/${PV}/${MY_P}.tar.bz2"
+SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -76,15 +76,15 @@ src_install() {
 
 		# shared folders
 		insinto /sbin
-		newins mountvboxsf mount.vboxvfs
-		fperms 4755 /sbin/mount.vboxvfs
+		newins mountvboxsf mount.vboxsf
+		fperms 4755 /sbin/mount.vboxsf
 
 		# time synchronisation system service
 		insinto /usr/sbin
 		doins vboxadd-timesync
 		fperms 0755 /usr/sbin/vboxadd-timesync
 
-		newinitd "${FILESDIR}"/${P}.initd ${PN}
+		newinitd "${FILESDIR}"/${PN}.initd ${PN}
 
 		# VBoxClient user service and xrandr wrapper
 		if use X; then
@@ -114,10 +114,14 @@ pkg_postinst() {
 			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 "it to run VirtualBox itself."
 		elog ""
 }
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.5.6.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.6.ebuild
index 92d32b431be7..d2eeb73f6896 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.5.6.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.6.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2008 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-1.5.6.ebuild,v 1.2 2008/08/27 12:30:59 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.6.ebuild,v 1.1 2008/09/06 19:30:00 jokey Exp $
 
 inherit eutils linux-mod
 
-MY_P=VirtualBox-${PV}-1_OSE
+MY_P=VirtualBox-${PV}-OSE
 DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests"
 HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://www.virtualbox.org/download/${PV}/${MY_P}.tar.bz2"
+SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,8 +17,12 @@ IUSE="X"
 RDEPEND="x11-libs/libXt
 		amd64? ( app-emulation/emul-linux-x86-xlibs )
 		X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
-			 ~x11-drivers/xf86-input-virtualbox-${PV} )"
+			 ~x11-drivers/xf86-input-virtualbox-${PV}
+			 x11-apps/xrandr
+			 x11-apps/xrefresh )"
 DEPEND="${RDEPEND}
+		dev-util/kbuild
+		>=dev-lang/yasm-0.6.2
 		sys-devel/bin86
 		sys-devel/dev86
 		sys-power/iasl
@@ -29,7 +33,7 @@ BUILD_TARGET_ARCH="${ARCH}"
 MODULE_NAMES="vboxadd(misc:${WORKDIR}/vboxadd:${WORKDIR}/vboxadd)
 			vboxvfs(misc:${WORKDIR}/vboxvfs:${WORKDIR}/vboxvfs)"
 
-S=${WORKDIR}/${MY_P/-1_/_}
+S=${WORKDIR}/${MY_P/-OSE/}
 
 pkg_setup() {
 		linux-mod_pkg_setup
@@ -41,11 +45,12 @@ src_unpack() {
 
 		# Create and unpack a tarball with the sources of the Linux guest
 		# kernel modules, to include all the needed files
-		"${MY_P/-1_/_}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
+		"${MY_P/-OSE/}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
 		unpack ./vbox-kmod.tar.gz
 
-		# Disable (unused) alsa checks in {configure, Comfig.kmk}
-		epatch "${FILESDIR}/${P}-remove-alsa.patch"
+		# Remove shipped binaries (kBuild,yasm), see bug #232775
+		cd "${S}"
+		rm -rf kBuild/bin tools
 }
 
 src_compile() {
@@ -56,12 +61,14 @@ src_compile() {
 		--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{sharefolders,daemon,xclient} ; do
-				MAKE="kmk" emake || die "kmk failed"
+		src/VBox/Additions/linux{sharefolders,daemon} ; do
+				MAKE="kmk" emake TOOL_YASM_AS=yasm \
+				|| die "kmk failed"
 		done
 }
 
@@ -72,27 +79,30 @@ src_install() {
 
 		# shared folders
 		insinto /sbin
-		newins mountvboxsf mount.vboxvfs
-		fperms 4755 /sbin/mount.vboxvfs
+		newins mountvboxsf mount.vboxsf
+		fperms 4755 /sbin/mount.vboxsf
 
 		# time synchronisation system service
 		insinto /usr/sbin
 		doins vboxadd-timesync
 		fperms 0755 /usr/sbin/vboxadd-timesync
 
-		# shared clipboard user service
-		insinto /usr/bin
-		doins vboxadd-xclient
-		fperms 4755 /usr/bin/vboxadd-xclient
+		newinitd "${FILESDIR}"/${PN}.initd ${PN}
 
-		newinitd "${FILESDIR}"/${P}.initd ${PN}
-
-		# shared clipboard user service xinit script
+		# VBoxClient user service and xrandr wrapper
 		if use X; then
+			insinto /usr/bin
+			doins VBoxClient
+			fperms 4755 /usr/bin/VBoxClient
+
 			dodir /etc/X11/xinit/xinitrc.d/
-			echo -e "#/bin/sh\n/usr/bin/vboxadd-xclient" \
-			>> "${D}/etc/X11/xinit/xinitrc.d/98vboxadd-xclient"
-			fperms 0755 /etc/X11/xinit/xinitrc.d/98vboxadd-xclient
+			echo -e "#/bin/sh\n/usr/bin/VBoxClient" \
+			>> "${D}/etc/X11/xinit/xinitrc.d/98VBoxClient"
+			fperms 0755 /etc/X11/xinit/xinitrc.d/98VBoxClient
+
+			cd "${S}"/src/VBox/Additions/x11/installer
+			newins VBoxRandR.sh VBoxRandR
+			fperms 0755 /usr/bin/VBoxRandR
 		fi
 
 		# udev rule for vboxdrv
@@ -107,10 +117,14 @@ pkg_postinst() {
 			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 "it to run VirtualBox itself."
 		elog ""
 }