Version bump. Removed old

(Portage version: 2.2.0_alpha127/cvs/Linux x86_64)

2 files changed, 20 insertions, 9 deletions

diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index 152caff561fa..147d9e801b7e 100644
--- 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.97 2012/09/09 15:24:32 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.98 2012/09/13 19:45:21 polynomial-c Exp $
+
+*xf86-video-virtualbox-4.2.0 (13 Sep 2012)
+
+  13 Sep 2012; Lars Wendler <polynomial-c@gentoo.org>
+  -xf86-video-virtualbox-4.1.20.ebuild, +xf86-video-virtualbox-4.2.0.ebuild:
+  Version bump. Removed old.
 
 *xf86-video-virtualbox-4.1.22 (09 Sep 2012)
 
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.20.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.0.ebuild
index a3d3236da261..cd6fb36a46ac 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.1.20.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.2.0.ebuild
@@ -1,15 +1,17 @@
 # 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.1.20.ebuild,v 1.1 2012/08/21 09:20:10 polynomial-c Exp $
+# $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 $
 
 EAPI=2
 
 inherit eutils linux-mod multilib python versionator toolchain-funcs
 
-MY_P=VirtualBox-${PV}
+MY_PV="${PV/beta/BETA}"
+MY_PV="${PV/rc/RC}"
+MY_P=VirtualBox-${MY_PV}
 DESCRIPTION="VirtualBox video driver"
 HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
+SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,7 +21,7 @@ IUSE="dri"
 RDEPEND="<x11-base/xorg-server-1.12.99[-minimal]
 	x11-libs/libXcomposite"
 DEPEND="${RDEPEND}
-	>=dev-util/kbuild-0.1.999
+	>=dev-util/kbuild-0.1.9998_pre20120806
 	=dev-lang/python-2*
 	>=dev-lang/yasm-0.6.2
 	sys-devel/dev86
@@ -126,18 +128,21 @@ src_install() {
 	cd "${S}/out/linux.${ARCH}/release/bin/additions"
 	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
 	# xorg-server-1.12.x
 	if has_version ">=x11-base/xorg-server-1.12" ; then
-		newins vboxvideo_drv_112.so vboxvideo_drv.so
+		newins vboxvideo_drv_112.so vboxvideo_drv.so || die
 	# xorg-server-1.11.x
 	elif has_version ">=x11-base/xorg-server-1.11" ; then
-		newins vboxvideo_drv_111.so vboxvideo_drv.so
+		newins vboxvideo_drv_111.so vboxvideo_drv.so || die
 	# xorg-server-1.10.x
 	elif has_version ">=x11-base/xorg-server-1.10" ; then
-		newins vboxvideo_drv_110.so vboxvideo_drv.so
+		newins vboxvideo_drv_110.so vboxvideo_drv.so || die
 	# xorg-server-1.9.x
 	else
-		newins vboxvideo_drv_19.so vboxvideo_drv.so
+		newins vboxvideo_drv_19.so vboxvideo_drv.so || die
 	fi
 
 	# Guest OpenGL driver