Version bump (bug #385577). Removed old

Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64

diff --git a/x11-drivers/xf86-input-virtualbox/ChangeLog b/x11-drivers/xf86-input-virtualbox/ChangeLog
index b3e43b429e4669c7ed7e49805b99cb43e48c5007..6933f07ca847a7968355ed369e08fbb3f702e06d 100644 (file)
--- a/x11-drivers/xf86-input-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-input-virtualbox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-input-virtualbox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v 1.73 2011/09/01 08:16:24 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v 1.74 2011/10/04 18:01:01 polynomial-c Exp $
+
+*xf86-input-virtualbox-4.1.4 (04 Oct 2011)
+
+  04 Oct 2011; Lars Wendler <polynomial-c@gentoo.org>
+  -xf86-input-virtualbox-4.1.0.ebuild, +xf86-input-virtualbox-4.1.4.ebuild:
+  Version bump. Thanks to Christian Inci who reported this in bug #385577.
+  Removed old.
 
   01 Sep 2011; Lars Wendler <polynomial-c@gentoo.org>
   xf86-input-virtualbox-4.1.0.ebuild:

diff --git a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.1.0.ebuild b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.1.4.ebuild
similarity index 89%
rename from x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.1.0.ebuild
rename to x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.1.4.ebuild
index 9f3e882e3e693f7dadcd6dd144e814dc0e37b231..b54647f91c917a07e0bea047a393275af861af65 100644 (file)
--- a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.1.0.ebuild
+++ b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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-4.1.0.ebuild,v 1.2 2011/09/01 08:16:24 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.1.4.ebuild,v 1.1 2011/10/04 18:01:01 polynomial-c Exp $
 
 EAPI=2
 
@@ -20,7 +20,7 @@ RDEPEND="x11-base/xorg-server
        || ( x11-drivers/xf86-input-mouse
            x11-drivers/xf86-input-evdev )"
 DEPEND="${RDEPEND}
-       =dev-util/kbuild-0.1.5*
+       >=dev-util/kbuild-0.1.999
        >=dev-lang/yasm-0.6.2
        sys-devel/dev86
        sys-power/iasl
@@ -67,8 +67,11 @@ src_install() {
                cd "${S}/out/linux.${ARCH}/release/bin/additions"
                insinto /usr/$(get_libdir)/xorg/modules/input
 
+               # xorg-server-1.11
+               if has_version "=x11-base/xorg-server-1.11*" ; then
+                               newins vboxmouse_drv_111.so vboxmouse_drv.so
                # xorg-server-1.10
-               if has_version "=x11-base/xorg-server-1.10*" ; then
+               elif has_version "=x11-base/xorg-server-1.10*" ; then
                                newins vboxmouse_drv_110.so vboxmouse_drv.so
                # xorg-server-1.9
                else

diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index c077f2445b3633153b0ab96bd25ae5d2c50511a6..d74130ad8a9d34c031a5796e90a108bc53f584fd 100644 (file)
--- a/x11-drivers/xf86-video-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-video-virtualbox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-virtualbox
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.73 2011/09/01 08:14:31 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.74 2011/10/04 18:01:34 polynomial-c Exp $
+
+*xf86-video-virtualbox-4.1.4 (04 Oct 2011)
+
+  04 Oct 2011; Lars Wendler <polynomial-c@gentoo.org>
+  -xf86-video-virtualbox-4.1.0.ebuild, +xf86-video-virtualbox-4.1.4.ebuild:
+  Version bump. Thanks to Christian Inci who reported this in bug #385577.
+  Removed old.
 
   01 Sep 2011; Lars Wendler <polynomial-c@gentoo.org>
   xf86-video-virtualbox-4.1.0.ebuild:

diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.0.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.4.ebuild
similarity index 93%
rename from x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.0.ebuild
rename to x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.4.ebuild
index 1ed231f84cce903bb83f7f77cbfd4f5b6f022863..cfac5c43c2208f82761a9d1dd1cbf4cf686aca42 100644 (file)
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.0.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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-4.1.0.ebuild,v 1.2 2011/09/01 08:14:31 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.4.ebuild,v 1.1 2011/10/04 18:01:34 polynomial-c Exp $
 
 EAPI=2
 
@@ -18,7 +18,7 @@ IUSE="dri"
 
 RDEPEND="x11-base/xorg-server[-minimal]"
 DEPEND="${RDEPEND}
-               =dev-util/kbuild-0.1.5*
+               >=dev-util/kbuild-0.1.999
                =dev-lang/python-2*
                >=dev-lang/yasm-0.6.2
                sys-devel/dev86
@@ -119,8 +119,11 @@ src_install() {
                cd "${S}/out/linux.${ARCH}/release/bin/additions"
                insinto /usr/$(get_libdir)/xorg/modules/drivers
 
+               # xorg-server-1.11.x
+               if has_version ">=x11-base/xorg-server-1.11" ; then
+                               newins vboxvideo_drv_111.so vboxvideo_drv.so
                # xorg-server-1.10.x
-               if has_version ">=x11-base/xorg-server-1.10" ; then
+               elif has_version ">=x11-base/xorg-server-1.10" ; then
                                newins vboxvideo_drv_110.so vboxvideo_drv.so
                # xorg-server-1.9.x
                else