make 3.1.x ebuilds properly working with xorg-server-1.7, close bug #295553

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

diff --git a/x11-drivers/xf86-input-virtualbox/ChangeLog b/x11-drivers/xf86-input-virtualbox/ChangeLog
index 4902527454b76b123fe9f4ff6382d1a30c58abd0..f6af9bd5ced1b128ba84eaf208176f6756ccd025 100644 (file)
--- a/x11-drivers/xf86-input-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-input-virtualbox/ChangeLog
@@ -1,6 +1,12 @@
 # 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.33 2010/03/28 13:45:17 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v 1.34 2010/04/30 19:46:02 lxnay Exp $
+
+  30 Apr 2010; Fabio Erculiani <lxnay@gentoo.org>
+  xf86-input-virtualbox-3.1.0.ebuild, xf86-input-virtualbox-3.1.2.ebuild,
+  xf86-input-virtualbox-3.1.4-r1.ebuild, xf86-input-virtualbox-3.1.6.ebuild:
+  make 3.1.x ebuilds properly working with xorg-server-1.7, close bug
+  #295553
 
 *xf86-input-virtualbox-3.1.6 (28 Mar 2010)
 

diff --git a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.0.ebuild b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.0.ebuild
index 3b1a2612af6c28cf17ae9cfd28a47944f054f0a0..43bc5bb7cf012e76f2010c9a0792e04571b04ef7 100644 (file)
--- a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.0.ebuild
+++ b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# 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.0.ebuild,v 1.1 2009/12/02 20:39:48 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.0.ebuild,v 1.2 2010/04/30 19:46:02 lxnay Exp $
 
 EAPI=2
 
@@ -62,8 +62,11 @@ src_install() {
                cd "${S}/out/linux.${ARCH}/release/bin/additions"
                insinto /usr/$(get_libdir)/xorg/modules/input
 
+               # xorg-server-1.7
+               if has_version ">=x11-base/xorg-server-1.7" ; then
+                               newins vboxmouse_drv_17.so vboxmouse_drv.so
                # xorg-server-1.6.x
-               if has_version ">=x11-base/xorg-server-1.6" ; then
+               elif has_version ">=x11-base/xorg-server-1.6" ; then
                                newins vboxmouse_drv_16.so vboxmouse_drv.so
                # xorg-server-1.5.x
                else

diff --git a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.2.ebuild b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.2.ebuild
index 1af3256bb583ec1033bfb7827495ac1fa2446689..90028a224a790b1d3539ea0a1bd99bc41af52ea1 100644 (file)
--- a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.2.ebuild
+++ b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.2.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.2.ebuild,v 1.1 2010/02/13 19:17:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.2.ebuild,v 1.2 2010/04/30 19:46:02 lxnay 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.7
+               if has_version ">=x11-base/xorg-server-1.7" ; then
+                               newins vboxmouse_drv_17.so vboxmouse_drv.so
                # xorg-server-1.6.x
-               if has_version ">=x11-base/xorg-server-1.6" ; then
+               elif has_version ">=x11-base/xorg-server-1.6" ; then
                                newins vboxmouse_drv_16.so vboxmouse_drv.so
                # xorg-server-1.5.x
                else

diff --git a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.4-r1.ebuild b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.4-r1.ebuild
index 80251612be4e4c0b004730754c10f1edbc58e528..855389720084cba58dff7d5556fb9b41223c6c26 100644 (file)
--- a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.4-r1.ebuild
+++ b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.4-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.4-r1.ebuild,v 1.1 2010/03/18 14:32:09 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.4-r1.ebuild,v 1.2 2010/04/30 19:46:02 lxnay 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.7
+               if has_version ">=x11-base/xorg-server-1.7" ; then
+                               newins vboxmouse_drv_17.so vboxmouse_drv.so
                # xorg-server-1.6.x
-               if has_version ">=x11-base/xorg-server-1.6" ; then
+               elif has_version ">=x11-base/xorg-server-1.6" ; then
                                newins vboxmouse_drv_16.so vboxmouse_drv.so
                # xorg-server-1.5.x
                else

diff --git a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.6.ebuild b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.6.ebuild
index 4e1612bda61c2eae060655b0ff565429f3c57df8..fc50989da885823a4b7fec87f01dd0fc23d3db57 100644 (file)
--- a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.6.ebuild
+++ b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.6.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.6.ebuild,v 1.1 2010/03/28 13:45:17 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-3.1.6.ebuild,v 1.2 2010/04/30 19:46:02 lxnay 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.7
+               if has_version ">=x11-base/xorg-server-1.7" ; then
+                               newins vboxmouse_drv_17.so vboxmouse_drv.so
                # xorg-server-1.6.x
-               if has_version ">=x11-base/xorg-server-1.6" ; then
+               elif has_version ">=x11-base/xorg-server-1.6" ; then
                                newins vboxmouse_drv_16.so vboxmouse_drv.so
                # xorg-server-1.5.x
                else

diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index 0efea5290deb7533d456c26e827d3d7da3fbecc6..1444352ee75cdfbab28fe5a99514a24c91ba9609 100644 (file)
--- a/x11-drivers/xf86-video-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-video-virtualbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-video-virtualbox
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.33 2010/03/28 13:45:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.34 2010/04/30 19:44:13 lxnay Exp $
+
+  30 Apr 2010; Fabio Erculiani <lxnay@gentoo.org>
+  xf86-video-virtualbox-3.1.0.ebuild, xf86-video-virtualbox-3.1.2.ebuild,
+  xf86-video-virtualbox-3.1.4-r1.ebuild, xf86-video-virtualbox-3.1.6.ebuild:
+  make 3.1.x ebuilds properly working with xorg-server-1.7, close bug
+  #295553
 
 *xf86-video-virtualbox-3.1.6 (28 Mar 2010)
 

diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.0.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.0.ebuild
index 995fe81efb882b25e9ffa5fb1cb169e72d9b6c1d..9cff5aa7e23b3c2aabfc5bcd86627c1e56aac557 100644 (file)
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.0.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.0.ebuild,v 1.1 2009/12/02 20:40:09 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.0.ebuild,v 1.2 2010/04/30 19:44:13 lxnay Exp $
 
 EAPI=2
 
@@ -108,8 +108,11 @@ src_install() {
                cd "${S}/out/linux.${ARCH}/release/bin/additions"
                insinto /usr/$(get_libdir)/xorg/modules/drivers
 
+               # xorg-server-1.7.x
+               if has_version ">=x11-base/xorg-server-1.7" ; then
+                               newins vboxvideo_drv_17.so vboxvideo_drv.so
                # xorg-server-1.6.x
-               if has_version ">=x11-base/xorg-server-1.6" ; then
+               elif has_version ">=x11-base/xorg-server-1.6" ; then
                                newins vboxvideo_drv_16.so vboxvideo_drv.so
                # xorg-server-1.5.x
                else

diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.2.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.2.ebuild
index b723b2b0ad7de9afcf0ff1ee4aef6f5b6b4d7f14..10a8bb1789cd95095d83c9a091c9bc91485cbadd 100644 (file)
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.2.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.2.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-video-virtualbox/xf86-video-virtualbox-3.1.2.ebuild,v 1.1 2010/02/13 19:18:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.2.ebuild,v 1.2 2010/04/30 19:44:13 lxnay Exp $
 
 EAPI=2
 
@@ -112,8 +112,11 @@ src_install() {
                cd "${S}/out/linux.${ARCH}/release/bin/additions"
                insinto /usr/$(get_libdir)/xorg/modules/drivers
 
+               # xorg-server-1.7.x
+               if has_version ">=x11-base/xorg-server-1.7" ; then
+                               newins vboxvideo_drv_17.so vboxvideo_drv.so
                # xorg-server-1.6.x
-               if has_version ">=x11-base/xorg-server-1.6" ; then
+               elif has_version ">=x11-base/xorg-server-1.6" ; then
                                newins vboxvideo_drv_16.so vboxvideo_drv.so
                # xorg-server-1.5.x
                else

diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.4-r1.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.4-r1.ebuild
index 64428e10e5e73d558eeafac8dd918fe4b1b2a3f7..7a2792c0d8d44aa9eb3fb7ac168199ee08293be2 100644 (file)
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.4-r1.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.4-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-video-virtualbox/xf86-video-virtualbox-3.1.4-r1.ebuild,v 1.1 2010/03/11 12:49:22 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.4-r1.ebuild,v 1.2 2010/04/30 19:44:13 lxnay Exp $
 
 EAPI=2
 
@@ -113,8 +113,11 @@ src_install() {
                cd "${S}/out/linux.${ARCH}/release/bin/additions"
                insinto /usr/$(get_libdir)/xorg/modules/drivers
 
+               # xorg-server-1.7.x
+               if has_version ">=x11-base/xorg-server-1.7" ; then
+                               newins vboxvideo_drv_17.so vboxvideo_drv.so
                # xorg-server-1.6.x
-               if has_version ">=x11-base/xorg-server-1.6" ; then
+               elif has_version ">=x11-base/xorg-server-1.6" ; then
                                newins vboxvideo_drv_16.so vboxvideo_drv.so
                # xorg-server-1.5.x
                else

diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.6.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.6.ebuild
index 846e4d8df90c8b3e24103bd3b025295c7dfa9674..48d508ebf966a035f64ce3ed2e706316a52804d1 100644 (file)
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.6.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.6.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-video-virtualbox/xf86-video-virtualbox-3.1.6.ebuild,v 1.1 2010/03/28 13:45:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.6.ebuild,v 1.2 2010/04/30 19:44:13 lxnay Exp $
 
 EAPI=2
 
@@ -108,8 +108,11 @@ src_install() {
                cd "${S}/out/linux.${ARCH}/release/bin/additions"
                insinto /usr/$(get_libdir)/xorg/modules/drivers
 
+               # xorg-server-1.7.x
+               if has_version ">=x11-base/xorg-server-1.7" ; then
+                               newins vboxvideo_drv_17.so vboxvideo_drv.so
                # xorg-server-1.6.x
-               if has_version ">=x11-base/xorg-server-1.6" ; then
+               elif has_version ">=x11-base/xorg-server-1.6" ; then
                                newins vboxvideo_drv_16.so vboxvideo_drv.so
                # xorg-server-1.5.x
                else