Version bump. Removed old.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)

3 files changed, 19 insertions, 11 deletions

diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index d1cf3ced9251..94881d1b738c 100644
--- a/x11-drivers/xf86-video-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-video-virtualbox/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-drivers/xf86-video-virtualbox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.102 2012/10/24 04:45:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.103 2012/11/10 21:10:47 polynomial-c Exp $
+
+*xf86-video-virtualbox-4.2.4 (10 Nov 2012)
+
+  10 Nov 2012; Lars Wendler <polynomial-c@gentoo.org>
+  -xf86-video-virtualbox-4.2.0.ebuild, xf86-video-virtualbox-4.2.2.ebuild,
+  +xf86-video-virtualbox-4.2.4.ebuild:
+  Version bump. Removed old. Moved restriction for xorg up to 1.13.x (bug
+  #439482).
 
 *xf86-video-virtualbox-4.2.2 (24 Oct 2012)
 
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.2.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.2.ebuild
index a74aecea1449..240242566ee0 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.2.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.2.2.ebuild,v 1.1 2012/10/24 04:45:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.2.ebuild,v 1.2 2012/11/10 21:10:47 polynomial-c Exp $
 
 EAPI=2
 
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="dri"
 
-RDEPEND="<x11-base/xorg-server-1.12.99[-minimal]
+RDEPEND="<x11-base/xorg-server-1.13.99[-minimal]
 	x11-libs/libXcomposite"
 DEPEND="${RDEPEND}
 	>=dev-util/kbuild-0.1.9998_pre20120806
@@ -129,10 +129,10 @@ src_install() {
 	insinto /usr/$(get_libdir)/xorg/modules/drivers
 
 	# xorg-server-1.13.x
-	#if has_version ">=x11-base/xorg-server-1.12.99" ; then
-	#	newins vboxvideo_drv_113.so vboxvideo_drv.so || die
+	if has_version ">=x11-base/xorg-server-1.12.99" ; then
+		newins vboxvideo_drv_113.so vboxvideo_drv.so || die
 	# xorg-server-1.12.x
-	if has_version ">=x11-base/xorg-server-1.12" ; then
+	elif has_version ">=x11-base/xorg-server-1.12" ; then
 		newins vboxvideo_drv_112.so vboxvideo_drv.so || die
 	# xorg-server-1.11.x
 	elif has_version ">=x11-base/xorg-server-1.11" ; then
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.0.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.4.ebuild
index cd6fb36a46ac..b7722a0d1751 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.0.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.2.0.ebuild,v 1.1 2012/09/13 19:45:21 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.4.ebuild,v 1.1 2012/11/10 21:10:47 polynomial-c Exp $
 
 EAPI=2
 
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="dri"
 
-RDEPEND="<x11-base/xorg-server-1.12.99[-minimal]
+RDEPEND="<x11-base/xorg-server-1.13.99[-minimal]
 	x11-libs/libXcomposite"
 DEPEND="${RDEPEND}
 	>=dev-util/kbuild-0.1.9998_pre20120806
@@ -129,10 +129,10 @@ src_install() {
 	insinto /usr/$(get_libdir)/xorg/modules/drivers
 
 	# xorg-server-1.13.x
-	#if has_version ">=x11-base/xorg-server-1.12.99" ; then
-	#	newins vboxvideo_drv_113.so vboxvideo_drv.so || die
+	if has_version ">=x11-base/xorg-server-1.12.99" ; then
+		newins vboxvideo_drv_113.so vboxvideo_drv.so || die
 	# xorg-server-1.12.x
-	if has_version ">=x11-base/xorg-server-1.12" ; then
+	elif has_version ">=x11-base/xorg-server-1.12" ; then
 		newins vboxvideo_drv_112.so vboxvideo_drv.so || die
 	# xorg-server-1.11.x
 	elif has_version ">=x11-base/xorg-server-1.11" ; then