Add correct module for xorg-server-1.8

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

3 files changed, 21 insertions, 5 deletions

diff --git a/x11-drivers/xf86-input-virtualbox/ChangeLog b/x11-drivers/xf86-input-virtualbox/ChangeLog
index 0e357725c1cd..7c4f70935f72 100644
--- a/x11-drivers/xf86-input-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-input-virtualbox/ChangeLog
@@ -1,6 +1,16 @@
 # 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.36 2010/05/20 13:11:06 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v 1.37 2010/05/20 15:49:34 polynomial-c Exp $
+
+*xf86-input-virtualbox-3.2.0-r1 (20 May 2010)
+*xf86-input-virtualbox-3.1.8-r1 (20 May 2010)
+
+  20 May 2010; Lars Wendler <polynomial-c@gentoo.org>
+  -xf86-input-virtualbox-3.1.8.ebuild,
+  +xf86-input-virtualbox-3.1.8-r1.ebuild,
+  -xf86-input-virtualbox-3.2.0.ebuild,
+  +xf86-input-virtualbox-3.2.0-r1.ebuild:
+  Add correct module for xorg-server-1.8
 
 *xf86-input-virtualbox-3.2.0 (20 May 2010)
 
diff --git a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.8.ebuild b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.8-r1.ebuild
index 8a178d0dd73f..7fd31785ebb3 100644
--- a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.8.ebuild
+++ b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.8-r1.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/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.8.ebuild,v 1.1 2010/05/10 13:31:46 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.8-r1.ebuild,v 1.1 2010/05/20 15:49:34 polynomial-c Exp $
 
 EAPI=2
 
@@ -66,8 +66,11 @@ src_install() {
 		cd "${S}/out/linux.${ARCH}/release/bin/additions"
 		insinto /usr/$(get_libdir)/xorg/modules/input
 
+		# xorg-server-1.8
+		if has_version ">=x11-base/xorg-server-1.8" ; then
+				newins vboxmouse_drv_18.so vboxmouse_drv.so
 		# xorg-server-1.7
-		if has_version ">=x11-base/xorg-server-1.7" ; then
+		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
diff --git a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.2.0.ebuild b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.2.0-r1.ebuild
index 3190152b10aa..0395f05bb4b1 100644
--- a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.2.0.ebuild
+++ b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.2.0-r1.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/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.2.0.ebuild,v 1.1 2010/05/20 13:11:06 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.2.0-r1.ebuild,v 1.1 2010/05/20 15:49:34 polynomial-c Exp $
 
 EAPI=2
 
@@ -66,8 +66,11 @@ src_install() {
 		cd "${S}/out/linux.${ARCH}/release/bin/additions"
 		insinto /usr/$(get_libdir)/xorg/modules/input
 
+		# xorg-server-1.8
+		if has_version ">=x11-base/xorg-server-1.8" ; then
+				newins vboxmouse_drv_18.so vboxmouse_drv.so
 		# xorg-server-1.7
-		if has_version ">=x11-base/xorg-server-1.7" ; then
+		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