Fixed outdated elog messages. Adjusted the sample xorg.conf file accordingly (bug #443608)

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

5 files changed, 21 insertions, 19 deletions

diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index 75e83abe66cc..255a282b04a2 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.107 2012/11/10 21:11:38 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.108 2012/11/17 11:54:03 polynomial-c Exp $
+
+  17 Nov 2012; Lars Wendler <polynomial-c@gentoo.org>
+  virtualbox-guest-additions-4.1.22.ebuild,
+  virtualbox-guest-additions-4.2.2.ebuild,
+  virtualbox-guest-additions-4.2.4.ebuild, files/xorg.conf.vbox:
+  Fixed elog message to no longer mention the deprecated (and removed)
+  virtualbox mouse driver. Adjusted the sample xorg.conf file accordingly (bug
+  #443608).
 
 *virtualbox-guest-additions-4.2.4 (10 Nov 2012)
 
diff --git a/app-emulation/virtualbox-guest-additions/files/xorg.conf.vbox b/app-emulation/virtualbox-guest-additions/files/xorg.conf.vbox
index faa471bc2e51..a8624694e271 100644
--- a/app-emulation/virtualbox-guest-additions/files/xorg.conf.vbox
+++ b/app-emulation/virtualbox-guest-additions/files/xorg.conf.vbox
@@ -7,13 +7,7 @@ Section "Screen"
 	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-4.1.22.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.22.ebuild
index 1a35e64fc824..639806d8842d 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.22.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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-4.1.22.ebuild,v 1.3 2012/09/17 20:10:44 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.22.ebuild,v 1.4 2012/11/17 11:54:03 polynomial-c Exp $
 
 EAPI=2
 
@@ -168,7 +168,7 @@ pkg_postinst() {
 		linux-mod_pkg_postinst
 		if ! use X ; then
 			elog "use flag X is off, enable it to install the"
-			elog "X Window System input and video drivers"
+			elog "X Window System video driver."
 		fi
 		elog ""
 		elog "Please add users to the \"vboxguest\" group so they can"
@@ -178,9 +178,9 @@ pkg_postinst() {
 		elog "/etc/init.d/${PN}"
 		elog "to the default runlevel in order to start"
 		elog "needed services."
-		elog "To use the VirtualBox X drivers, use the following"
+		elog "To use the VirtualBox X driver, use the following"
 		elog "file as your /etc/X11/xorg.conf:"
-		elog "    /usr/share/doc/${PF}/xorg.conf.xorg"
+		elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
 		elog ""
 		elog "Also make sure you use the Mesa library for OpenGL:"
 		elog "    eselect opengl set xorg-x11"
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.2.ebuild
index e1331d63acb0..02d7c868ed24 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.2.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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-4.2.2.ebuild,v 1.1 2012/10/24 04:43:27 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.2.ebuild,v 1.2 2012/11/17 11:54:03 polynomial-c Exp $
 
 EAPI=2
 
@@ -170,7 +170,7 @@ pkg_postinst() {
 		linux-mod_pkg_postinst
 		if ! use X ; then
 			elog "use flag X is off, enable it to install the"
-			elog "X Window System input and video drivers"
+			elog "X Window System video driver."
 		fi
 		elog ""
 		elog "Please add users to the \"vboxguest\" group so they can"
@@ -180,9 +180,9 @@ pkg_postinst() {
 		elog "/etc/init.d/${PN}"
 		elog "to the default runlevel in order to start"
 		elog "needed services."
-		elog "To use the VirtualBox X drivers, use the following"
+		elog "To use the VirtualBox X driver, use the following"
 		elog "file as your /etc/X11/xorg.conf:"
-		elog "    /usr/share/doc/${PF}/xorg.conf.xorg"
+		elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
 		elog ""
 		elog "Also make sure you use the Mesa library for OpenGL:"
 		elog "    eselect opengl set xorg-x11"
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.4.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.4.ebuild
index 043136e1fbc0..07b3fb237cd1 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.4.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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-4.2.4.ebuild,v 1.1 2012/11/10 21:11:38 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.4.ebuild,v 1.2 2012/11/17 11:54:03 polynomial-c Exp $
 
 EAPI=2
 
@@ -170,7 +170,7 @@ pkg_postinst() {
 		linux-mod_pkg_postinst
 		if ! use X ; then
 			elog "use flag X is off, enable it to install the"
-			elog "X Window System input and video drivers"
+			elog "X Window System video driver."
 		fi
 		elog ""
 		elog "Please add users to the \"vboxguest\" group so they can"
@@ -180,9 +180,9 @@ pkg_postinst() {
 		elog "/etc/init.d/${PN}"
 		elog "to the default runlevel in order to start"
 		elog "needed services."
-		elog "To use the VirtualBox X drivers, use the following"
+		elog "To use the VirtualBox X driver, use the following"
 		elog "file as your /etc/X11/xorg.conf:"
-		elog "    /usr/share/doc/${PF}/xorg.conf.xorg"
+		elog "    /usr/share/doc/${PF}/xorg.conf.vbox"
 		elog ""
 		elog "Also make sure you use the Mesa library for OpenGL:"
 		elog "    eselect opengl set xorg-x11"