New revision with cherry picked changes from bug #297633

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

3 files changed, 37 insertions, 9 deletions

diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index 3c3d97f71e4c..146ca84cec49 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.40 2010/05/20 20:38:13 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.41 2010/05/20 21:02:55 polynomial-c Exp $
+
+*virtualbox-guest-additions-3.1.8-r2 (20 May 2010)
+
+  20 May 2010; Lars Wendler <polynomial-c@gentoo.org>
+  -virtualbox-guest-additions-3.1.8-r1.ebuild,
+  +virtualbox-guest-additions-3.1.8-r2.ebuild:
+  New revision with cherry picked changes from bug #297633 (thanks to Ambroz
+  Bizjak for the report and the patches).
 
   20 May 2010; Lars Wendler <polynomial-c@gentoo.org>
   files/virtualbox-guest-additions-3-localconfig:
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index df00ed728802..8de7de0bf21d 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -11,7 +11,7 @@ DIST VirtualBox-3.1.8-OSE.tar.bz2 56291753 RMD160 45aa637d1e008248bd9061e9824b9c
 DIST VirtualBox-3.2.0-OSE.tar.bz2 57837589 RMD160 aca3a820c952c4f90f08350a4438e502d12c3f42 SHA1 d0e9f1dc56dad61d4d6a519c764ce73e242807cd SHA256 1818320efcbc2e7d223536b3f0e719dc37ed9da3058440de23759789edc63d34
 EBUILD virtualbox-guest-additions-3.0.12.ebuild 4203 RMD160 220f120b9491918acc465e6949af44281df8eeeb SHA1 f457f354fd4fe30a6238c01a59c42127f1fbde4a SHA256 1d59c89a053ba58b8193c2bfeafacabe6ff99e2f9017bd55f0c39fdddf55c5e6
 EBUILD virtualbox-guest-additions-3.1.6.ebuild 4267 RMD160 d29b4ff2f525a1eea138200ffbbc1bc475a90579 SHA1 3d24ab232a5611912dcf5c20225348ddb984c300 SHA256 096ca5370faac47319b2d324961edf9ab41747e092210a95f6f13e07bd0c80c1
-EBUILD virtualbox-guest-additions-3.1.8-r1.ebuild 4199 RMD160 e0c91f5a49fe22c7a62b241ebf2019f655e36acb SHA1 8baf426ed8f18831847b58c59abe9f97c080dd1c SHA256 aea9cead0a0072aa91e4d786b3ed8d38d1104b6e055a3b2755c978d0d89f5800
+EBUILD virtualbox-guest-additions-3.1.8-r2.ebuild 4844 RMD160 b15f8461dd6e80e0f16de81a393532005290eae5 SHA1 8e851a9ae4af4c548d66f8adef7c381a3554d4e6 SHA256 d9527d7680ec42ba7b8a906b21d0397c753c72a5b6192c7faf464ae6823ba55b
 EBUILD virtualbox-guest-additions-3.2.0.ebuild 5256 RMD160 bb9f0f9450400216892f27134c8a19eeda48aee5 SHA1 b3b9f8d7e8e034cc9afb4382e52c1ae617187e29 SHA256 d2641e6d420c70b81b9e53be750d062c6f1fc3532f1df9aa617561076f45fd3f
-MISC ChangeLog 14188 RMD160 d80cb37a94801a741416e58fa2e40e4d79d6ba85 SHA1 7321184b8be6c0dc746af6f675384be321f229b3 SHA256 70842c1c094b3ecde52944cb837353c767611e4f0367e28b98d05150fbf606fb
+MISC ChangeLog 14508 RMD160 ce2f3b09391542ad6003b104cfcf0eefc4629d50 SHA1 4529e7e81d5e8252bf6bcbc0cb3b20267b4c9397 SHA256 edbb1492295c99ce9441895c029f13851b856792b37a670de859c2eacfadf59c
 MISC metadata.xml 353 RMD160 0fd52505150025043cf0f6d53b54736082f266bb SHA1 60aa8776951b13cd71fde130db73849977b4c48f SHA256 c8c97cdc3c8878c361444f278d234b1ad6fe9db06d8c4d4d9bcee711a2f6369d
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8-r1.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8-r2.ebuild
index b78a3c784791..0da8fd63d3f6 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8-r1.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8-r2.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-r1.ebuild,v 1.1 2010/05/11 18:52:37 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.1.8-r2.ebuild,v 1.1 2010/05/20 21:02:55 polynomial-c Exp $
 
 inherit eutils linux-mod
 
@@ -102,7 +102,7 @@ src_install() {
 		newins mount.vboxsf mount.vboxsf
 		fperms 4755 /sbin/mount.vboxsf
 
-		newinitd "${FILESDIR}"/${PN}-6.initd ${PN}
+		newinitd "${FILESDIR}"/${PN}-7.initd ${PN}
 
 		insinto /usr/sbin/
 		newins VBoxService vboxguest-service
@@ -124,10 +124,18 @@ src_install() {
 
 		# 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() {
@@ -138,8 +146,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"