fix xorg-server 1.5.x version check, fix hal fdi installation thanks to Walter Meinl, wrt bug #244920

svn path=/trunk/; revision=527

4 files changed, 17 insertions, 17 deletions

diff --git a/x11-drivers/xf86-input-virtualbox/ChangeLog b/x11-drivers/xf86-input-virtualbox/ChangeLog
index 989d98a..856f1e0 100644
--- a/x11-drivers/xf86-input-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-input-virtualbox/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v 1.6 2008/10/27 18:20:25 jokey Exp $
 
+  31 Oct 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  -xf86-input-virtualbox-2.0.2.ebuild,
+  +xf86-input-virtualbox-2.0.2-r1.ebuild,
+  -xf86-input-virtualbox-2.0.4.ebuild,
+  +xf86-input-virtualbox-2.0.4-r1.ebuild:
+  fix xorg-server 1.5.x version check, fix hal fdi installation thanks to
+  Walter Meinl, wrt bug #244920
+
 *xf86-input-virtualbox-2.0.4 (27 Oct 2008)
 
   27 Oct 2008; Markus Ullmann <jokey@gentoo.org>
diff --git a/x11-drivers/xf86-input-virtualbox/Manifest b/x11-drivers/xf86-input-virtualbox/Manifest
index 82594e8..9da4cc3 100644
--- a/x11-drivers/xf86-input-virtualbox/Manifest
+++ b/x11-drivers/xf86-input-virtualbox/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xf86-input-virtualbox-2-localconfig 845 RMD160 5cd3b73046f0dbe8eebef9041f224b6c2433b733 SHA1 1a31b795e4037e444b94afdaa586349f1ae34d9b SHA256 ac7c25fd5f93f4a9ab76a085c58c9c3eb5e93f9e58594a022799df7103040a43
 DIST VirtualBox-1.6.6-OSE.tar.bz2 35483853 RMD160 4b17428371089806cf6f5e52d1905936f7beb01d SHA1 7c323b35d77277c650cbce2821ab6778d1e3270e SHA256 acb3c20ef751ed408489d7b5c2d5d441226055a6e83bfeb9258ce2d55baba4da
 DIST VirtualBox-2.0.2-OSE.tar.bz2 37548591 RMD160 4156f2efe5245236f9890abcd0adb5ad5291f86f SHA1 cdc51cc4e5ff189cf9eff832179494009df1334a SHA256 0318c69eace3db0979f0aefd27aeb6c54d7c1aafcc6a156b076bc116a1d8805b
 DIST VirtualBox-2.0.4-OSE.tar.bz2 37841781 RMD160 390a2b4d97a3ed6fdc885b89354884a07b3fc464 SHA1 f8e7c109546c033927bd41e78f259adb81cb1504 SHA256 5618fb09efafac3fc9c183a44aa3c1d8c44d1d7fa58bfb5a73c221f1dd8740fd
 EBUILD xf86-input-virtualbox-1.6.6.ebuild 1769 RMD160 964e8d69873ee2f9fb7329aef30e148aa09cf236 SHA1 bb792778be400195518495f9ec691e382d0ed11f SHA256 3da97df6a74e0a24ef7275446a98fa589837e5af22fcba1b57d6a339a0186772
-EBUILD xf86-input-virtualbox-2.0.2.ebuild 2159 RMD160 37aa73e8a82087aeab878d6c103b5f7589aab4fe SHA1 d29589b514b10b5e6a47f1a947cbcc161db52da4 SHA256 5c4ec71d93988a39debf8e0e39f7f3c05ca4da2a9a142a13016441e2a24607b4
-EBUILD xf86-input-virtualbox-2.0.4.ebuild 2159 RMD160 68cfdad49b08c50fffa7c4e5eb70dcdbe59838c4 SHA1 655cb912a0b526972a7f463d738fc61d7488ac8f SHA256 d691c532432f96830420303c084accb54cfe96e425b64e324c4de2ae20d0c126
-MISC ChangeLog 4105 RMD160 1b75f16183b5682db366219faf0f20a08e0f5f7e SHA1 6374e101b316dd363af9e8ff611f0e557a980872 SHA256 ad870af647271ad8fd715ab42bee3c3fa86e0c9336dbe702c82d85e5416e0a05
+EBUILD xf86-input-virtualbox-2.0.2-r1.ebuild 2238 RMD160 9d61be35762fcb4753ecc442453c21a37546c7bd SHA1 45f47eef12bf302850b30bb408fb3bc1ea46099b SHA256 1f17560fc24ed3b442c0625afdce79834821f7cec1a5fc38ac36e89f04bd0e46
+EBUILD xf86-input-virtualbox-2.0.4-r1.ebuild 2238 RMD160 52b08404cc1a8a0a0f4f1592a25f134cd7ee27d2 SHA1 4a5edc1da1ef447c8f2f232adbc9ec47a5132c48 SHA256 5f4c5c614df13b0a0a1dcb31a37373a0a08ec3b692c64c7916ab1e81ad9a98a3
+MISC ChangeLog 4434 RMD160 96ed65047a228551a93db4ccacfed0c2dbae4ca4 SHA1 d74847873a90b37c0087ebd86b6ac448c6a645ce SHA256 d7b654b06435eb00b2dcbc9107b35f73786cf096ff51a9fbdf8f9db208ea71f5
 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkGBmgACgkQz974XjDVpblHJQCgw4XYJnQhlSQ5BEhenVcJfnoc
-0qAAoMaU7kxf5zsFJczYuplRMWik38Dc
-=cg1o
------END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.0.2.ebuild b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.0.2-r1.ebuild
index 58022a4..36c961a 100644
--- a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.0.2.ebuild
+++ b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.0.2-r1.ebuild
@@ -60,15 +60,16 @@ src_install() {
 		cd "${S}/out/linux.${ARCH}/release/bin/additions"
 		insinto /usr/lib/xorg/modules/input
 
-		if has_version "=x11-base/xorg-server-1.5" ; then
+		if has_version ">=x11-base/xorg-server-1.5" ; then
 				newins vboxmouse_drv_15.so vboxmouse_drv.so
-		elif has_version "=x11-base/xorg-server-1.4" ; then
+		elif has_version ">=x11-base/xorg-server-1.4 &&	<x11-base/xorg-server-1.5" ; then
 				newins vboxmouse_drv_14.so vboxmouse_drv.so
 		else
 				newins vboxmouse_drv_71.so vboxmouse_drv.so
 		fi
 
 		if use hal; then
+			cd "${S}/src/VBox/Additions/linux/installer"
 			insinto /usr/share/hal/fdi/information/20thirdparty
 			doins 90-vboxguest.fdi
 		fi
diff --git a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.0.4.ebuild b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.0.4-r1.ebuild
index e7ccae7..e985620 100644
--- a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.0.4.ebuild
+++ b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-2.0.4-r1.ebuild
@@ -60,15 +60,16 @@ src_install() {
 		cd "${S}/out/linux.${ARCH}/release/bin/additions"
 		insinto /usr/lib/xorg/modules/input
 
-		if has_version "=x11-base/xorg-server-1.5" ; then
+		if has_version ">=x11-base/xorg-server-1.5" ; then
 				newins vboxmouse_drv_15.so vboxmouse_drv.so
-		elif has_version "=x11-base/xorg-server-1.4" ; then
+		elif has_version ">=x11-base/xorg-server-1.4 &&	<x11-base/xorg-server-1.5" ; then
 				newins vboxmouse_drv_14.so vboxmouse_drv.so
 		else
 				newins vboxmouse_drv_71.so vboxmouse_drv.so
 		fi
 
 		if use hal; then
+			cd "${S}/src/VBox/Additions/linux/installer"
 			insinto /usr/share/hal/fdi/information/20thirdparty
 			doins 90-vboxguest.fdi
 		fi