Make the driver work with xorg-server-1.9*, too.

(Portage version: 2.2_rc98/cvs/Linux x86_64)

2 files changed, 18 insertions, 16 deletions

diff --git a/x11-drivers/xf86-input-virtualbox/ChangeLog b/x11-drivers/xf86-input-virtualbox/ChangeLog
index b12466df1c18..f06a9a584953 100644
--- a/x11-drivers/xf86-input-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-input-virtualbox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-input-virtualbox
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v 1.45 2010/10/12 14:10:26 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v 1.46 2010/10/19 10:26:18 polynomial-c Exp $
+
+*xf86-input-virtualbox-3.2.10-r1 (19 Oct 2010)
+
+  19 Oct 2010; Lars Wendler <polynomial-c@gentoo.org>
+  -xf86-input-virtualbox-3.2.10.ebuild,
+  +xf86-input-virtualbox-3.2.10-r1.ebuild:
+  Make the driver work with xorg-server-1.9*, too.
 
 *xf86-input-virtualbox-3.2.10 (12 Oct 2010)
 
diff --git a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.2.10.ebuild b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.2.10-r1.ebuild
index 234cccfd46a0..be4be6386945 100644
--- a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.2.10.ebuild
+++ b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.2.10-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.2.10.ebuild,v 1.1 2010/10/12 14:10:26 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.2.10-r1.ebuild,v 1.1 2010/10/19 10:26:19 polynomial-c Exp $
 
 EAPI=2
 
-inherit x-modular eutils multilib linux-info
+inherit eutils multilib linux-info
 
 MY_P=VirtualBox-${PV}-OSE
 DESCRIPTION="VirtualBox input driver"
@@ -66,18 +66,15 @@ src_install() {
 		cd "${S}/out/linux.${ARCH}/release/bin/additions"
 		insinto /usr/$(get_libdir)/xorg/modules/input
 
+		# xorg-server-1.9
+		if has_version ">=x11-base/xorg-server-1.9" ; then
+				newins vboxmouse_drv_19.so vboxmouse_drv.so
 		# xorg-server-1.8
-		if has_version ">=x11-base/xorg-server-1.8" ; then
+		elif has_version ">=x11-base/xorg-server-1.8" ; then
 				newins vboxmouse_drv_18.so vboxmouse_drv.so
 		# xorg-server-1.7
-		elif has_version ">=x11-base/xorg-server-1.7" ; then
-				newins vboxmouse_drv_17.so vboxmouse_drv.so
-		# xorg-server-1.6.x
-		elif has_version ">=x11-base/xorg-server-1.6" ; then
-				newins vboxmouse_drv_16.so vboxmouse_drv.so
-		# xorg-server-1.5.x
 		else
-				newins vboxmouse_drv_15.so vboxmouse_drv.so
+				newins vboxmouse_drv_17.so vboxmouse_drv.so
 		fi
 
 		# install hal information file about the mouse driver
@@ -95,9 +92,7 @@ pkg_postinst() {
 		elog ""
 		elog "in the Core Pointer's InputDevice section (Section \"InputDevice\")"
 		elog ""
-		if has_version ">=x11-base/xorg-server-1.5" ; then
-			elog "Starting with 1.5 version, X.Org Server can do mouse auto-detection."
-			elog "This ebuild provides a working default which has been installed into:"
-			elog "    /etc/hal/fdi/policy/90-vboxguest.fdi"
-		fi
+		elog "Starting with 1.5 version, X.Org Server can do mouse auto-detection."
+		elog "This ebuild provides a working default which has been installed into:"
+		elog "    /etc/hal/fdi/policy/90-vboxguest.fdi"
 }