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

svn path=/trunk/; revision=528

4 files changed, 14 insertions, 17 deletions

diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index 3b81fd2..44bc799 100644
--- a/x11-drivers/xf86-video-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-video-virtualbox/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.5 2008/10/27 18:21:13 jokey Exp $
 
+  31 Oct 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  -xf86-video-virtualbox-2.0.2.ebuild,
+  +xf86-video-virtualbox-2.0.2-r1.ebuild,
+  -xf86-video-virtualbox-2.0.4.ebuild,
+  +xf86-video-virtualbox-2.0.4-r1.ebuild:
+  fix xorg-server 1.5.x version check thanks to Walter Meinl, wrt bug #244920
+
 *xf86-video-virtualbox-2.0.4 (27 Oct 2008)
 
   27 Oct 2008; Markus Ullmann <jokey@gentoo.org>
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index dd0afe4..906d18e 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xf86-video-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-video-virtualbox-1.6.6.ebuild 1831 RMD160 39bc9acce013faace38374da5d247a9afa8e3c50 SHA1 d48f1d7b41f572a2e8b4dd3f0d36da30f56c26ee SHA256 66d2ded0f1cde76dccb1cc98cd0a28b5713a08bc5b23ee849b2af98e015392de
-EBUILD xf86-video-virtualbox-2.0.2.ebuild 2088 RMD160 91953ef472c02da41b9b6334369e327797453ee4 SHA1 23edf195b000747bcbbfbc79f53ca0b45005bcf4 SHA256 73a1d5dfe8acd898f24120b3eeee46d6138d3285c2032fd7adaea9436ff85fe7
-EBUILD xf86-video-virtualbox-2.0.4.ebuild 2088 RMD160 7a2c7fcbb82935df806fe3c09755c711025216b2 SHA1 4f1146869d78530b720ba0c5dab6a94886c76362 SHA256 f15b23b212ba810ea2a3aff6c2bc0cbac419a6352190c85687df674437a64caf
-MISC ChangeLog 3988 RMD160 1a58970ed5f305afd701337f0b46feaf195fb3d7 SHA1 75d158041ae6fee2532b224238a12d38fa7c3690 SHA256 090e01261b23a956e64d22b93ca876660aa6152f4629f3380d979fd8d0d8604d
+EBUILD xf86-video-virtualbox-2.0.2-r1.ebuild 2119 RMD160 bd2bf3a0d0c14ff697b31e16b394f15c94b26491 SHA1 d8c736f45096f527d8ff561a06039a75a757d610 SHA256 9b917ece0343f392a817965df15e2a7283d776dbb5ed7a3296bb7cc73ed16a3d
+EBUILD xf86-video-virtualbox-2.0.4-r1.ebuild 2119 RMD160 fd0954c922d75614e030e44caad4f55e63422a16 SHA1 5306e28e1916d3585b0fa4d07039758e01754dcb SHA256 6c03d8efe5d49ca48ca22456db84885901b00fa497ccd265cfeb1d6e200cbdc4
+MISC ChangeLog 4289 RMD160 fa238dfb83bad37e67efbeb2da23f57399781f41 SHA1 c5c6e2e1287dbe8cc15c147ce35335742219cee8 SHA256 d404a3e0732b2e40397d1c60e96d00c02dc13ca7b02c19166305f1061768acbc
 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkGBpgACgkQz974XjDVpbngVgCguZsEXxFbLfQ3eui0wGS5shLe
-7U8AoJEGKZOu19WLGvg0rjBeMXPOaLtT
-=9jgq
------END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.0.2.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.0.2-r1.ebuild
index 6df93d4..da72ed3 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.0.2.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.0.2-r1.ebuild
@@ -62,9 +62,9 @@ src_install() {
 		cd "${S}/out/linux.${ARCH}/release/bin/additions"
 		insinto /usr/lib/xorg/modules/drivers
 
-		if has_version "=x11-base/xorg-server-1.5" ; then
+		if has_version ">=x11-base/xorg-server-1.5" ; then
 				newins vboxvideo_drv_15.so vboxvideo_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 vboxvideo_drv_14.so vboxvideo_drv.so
 		else
 				newins vboxvideo_drv_13.so vboxvideo_drv.so
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.0.4.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.0.4-r1.ebuild
index e9cf207..29c90fa 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.0.4.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.0.4-r1.ebuild
@@ -62,9 +62,9 @@ src_install() {
 		cd "${S}/out/linux.${ARCH}/release/bin/additions"
 		insinto /usr/lib/xorg/modules/drivers
 
-		if has_version "=x11-base/xorg-server-1.5" ; then
+		if has_version ">=x11-base/xorg-server-1.5" ; then
 				newins vboxvideo_drv_15.so vboxvideo_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 vboxvideo_drv_14.so vboxvideo_drv.so
 		else
 				newins vboxvideo_drv_13.so vboxvideo_drv.so