Add correct module for xorg-server-1.8

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

4 files changed, 24 insertions, 8 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/Manifest b/x11-drivers/xf86-input-virtualbox/Manifest
index 369e330e4376..55b1490c67b6 100644
--- a/x11-drivers/xf86-input-virtualbox/Manifest
+++ b/x11-drivers/xf86-input-virtualbox/Manifest
@@ -6,7 +6,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 xf86-input-virtualbox-3.0.12.ebuild 2623 RMD160 a6f42c22980d6c4c69e17e14a06a776744926d67 SHA1 49178b6265ed0477e76e57ab3bfca4da7124c6a3 SHA256 821ded1c47b91b4d9cffcb3ef3af63c65a3fdadfd688bef61819ff3571d3bc98
 EBUILD xf86-input-virtualbox-3.1.6.ebuild 2852 RMD160 551fa367bb24cac5346e6c760ad6877615172c3e SHA1 32f33e96081a09712988eccfb2e63fe4ecea36c6 SHA256 0e47667d9dfb66b786f8721be872ca9040021759877e2f36df6153be03e0532e
-EBUILD xf86-input-virtualbox-3.1.8.ebuild 2852 RMD160 7ce06158b894a7592263dcba3f823204194e9962 SHA1 c0d3dc1fa9c7d2575218b47826be79d96f183f47 SHA256 8a48b7b47a248fe1194037bb7e3eb062767a271f129a549990423751a122c9ef
-EBUILD xf86-input-virtualbox-3.2.0.ebuild 2852 RMD160 1da4f752a0333b608b80d338256d02d76000133d SHA1 ecd7fba8acf004dfdfe35ab1e4ed8ff493d7e5bd SHA256 3543e920ffbafcf85d81ecbe753edc279a512085efa4cd1c107580fd21d32262
-MISC ChangeLog 9781 RMD160 d6f58aaf5990253ac4737e8321ad73e567764477 SHA1 995f8ebd5fcd61685904fbbb4756850b3c0db2fa SHA256 ffb88b6ea5e47a5acacd0b5714cd71883a3fc81173d5d8bc482f3e3964c61855
+EBUILD xf86-input-virtualbox-3.1.8-r1.ebuild 2978 RMD160 70f127b3c64a59fb428c2faf464e7c77c9785c04 SHA1 18a4daf371f5cec40c71f370bedb7f653f9d5adf SHA256 878d207e67308218ea18300e291ae8ddacf5a7c3bc6e603b6889766c69a1eb3e
+EBUILD xf86-input-virtualbox-3.2.0-r1.ebuild 2978 RMD160 037dcd88d55678c02593c9846c75fb1bcc4f372a SHA1 117d1ec36f1d6634208013c28ce059f12d52eb3c SHA256 d95067003bb0328318436629152225f493dc93cabbbfbe2176e98a9f03959486
+MISC ChangeLog 10132 RMD160 d3523803f4b8fc77a977166ce2c801a1d437ddb3 SHA1 22b22eec22039db66e6fb2807f64467a7a3c7ccd SHA256 9d24c492abf965f76247051846fe09916f9884c2f3a1bd38464b3dc6d0de8e68
 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
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