Version bump. Removed old

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

4 files changed, 33 insertions, 29 deletions

diff --git a/x11-drivers/xf86-input-virtualbox/ChangeLog b/x11-drivers/xf86-input-virtualbox/ChangeLog
index b9d412e4dcda..d1fc2593f5b5 100644
--- 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v 1.62 2011/03/28 08:46:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v 1.63 2011/04/22 15:45:16 polynomial-c Exp $
+
+*xf86-input-virtualbox-4.0.6 (22 Apr 2011)
+
+  22 Apr 2011; Lars Wendler <polynomial-c@gentoo.org>
+  -xf86-input-virtualbox-4.0.2-r2.ebuild, +xf86-input-virtualbox-4.0.6.ebuild:
+  Version bump. Removed old.
 
   28 Mar 2011; Samuli Suominen <ssuominen@gentoo.org>
   xf86-input-virtualbox-4.0.2-r2.ebuild, xf86-input-virtualbox-4.0.4.ebuild:
diff --git a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.0.2-r2.ebuild b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.0.6.ebuild
index 67b5ad0253d3..5ba4a42e0966 100644
--- a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.0.2-r2.ebuild
+++ b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.0.6.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.0.2-r2.ebuild,v 1.2 2011/03/28 08:46:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-4.0.6.ebuild,v 1.1 2011/04/22 15:45:16 polynomial-c Exp $
 
 EAPI=2
 
@@ -67,28 +67,23 @@ src_install() {
 		cd "${S}/out/linux.${ARCH}/release/bin/additions"
 		insinto /usr/$(get_libdir)/xorg/modules/input
 
+		# xorg-server-1.10
+		if has_version "=x11-base/xorg-server-1.10*" ; then
+				newins vboxmouse_drv_110.so vboxmouse_drv.so
 		# xorg-server-1.9
-		if has_version "=x11-base/xorg-server-1.9*" ; then
-				newins vboxmouse_drv_19.so vboxmouse_drv.so
-		# xorg-server-1.8
-		elif has_version "=x11-base/xorg-server-1.8*" ; then
-				newins vboxmouse_drv_18.so vboxmouse_drv.so
-		# xorg-server-1.7
 		else
-				newins vboxmouse_drv_17.so vboxmouse_drv.so
+				newins vboxmouse_drv_19.so vboxmouse_drv.so
 		fi
 
 		cd "${S}/src/VBox/Additions/linux/installer" || die
 
-		if has_version ">=x11-base/xorg-server-1.8" ; then
-			# install udev information file about the mouse driver
-			insinto /lib/udev/rules.d
-			doins 70-xorg-vboxmouse.rules
+		# install udev information file about the mouse driver
+		insinto /lib/udev/rules.d
+		doins 70-xorg-vboxmouse.rules
 
-			# install X11 information file about the mouse driver
-			insinto /etc/X11/xorg.conf.d
-			doins "${S}/src/VBox/Additions/x11/Installer/50-vboxmouse.conf"
-		fi
+		# install X11 information file about the mouse driver
+		insinto /etc/X11/xorg.conf.d
+		doins "${S}/src/VBox/Additions/x11/Installer/50-vboxmouse.conf"
 }
 
 pkg_postinst() {
diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index 3586c7ee34d3..f2cc44bb7f92 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.61 2011/03/05 19:06:53 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.62 2011/04/22 15:45:39 polynomial-c Exp $
+
+*xf86-video-virtualbox-4.0.6 (22 Apr 2011)
+
+  22 Apr 2011; Lars Wendler <polynomial-c@gentoo.org>
+  -xf86-video-virtualbox-4.0.2.ebuild, +xf86-video-virtualbox-4.0.6.ebuild:
+  Version bump. Removed old.
 
   05 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   xf86-video-virtualbox-3.2.12.ebuild, xf86-video-virtualbox-4.0.2.ebuild,
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.0.2.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.0.6.ebuild
index e77cf3b0e377..64c1f7df898e 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.0.2.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.0.6.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.0.2.ebuild,v 1.2 2011/03/05 19:06:53 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.0.6.ebuild,v 1.1 2011/04/22 15:45:39 polynomial-c Exp $
 
 EAPI=2
 
@@ -77,9 +77,9 @@ src_prepare() {
 		epatch "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
 
 		# unset useless/problematic checks in configure
-		epatch "${FILESDIR}/${PN}-3.2.8-mesa-check.patch"
-		epatch "${FILESDIR}/${PN}-4-makeself-check.patch"
-		epatch "${FILESDIR}/${PN}-4-mkisofs-check.patch"
+		epatch "${FILESDIR}/${PN}-3.2.8-mesa-check.patch" \
+			"${FILESDIR}/${PN}-4-makeself-check.patch" \
+			"${FILESDIR}/${PN}-4-mkisofs-check.patch"
 }
 
 src_configure() {
@@ -119,15 +119,12 @@ src_install() {
 		cd "${S}/out/linux.${ARCH}/release/bin/additions"
 		insinto /usr/$(get_libdir)/xorg/modules/drivers
 
+		# xorg-server-1.10.x
+		if has_version ">=x11-base/xorg-server-1.10" ; then
+				newins vboxvideo_drv_110.so vboxvideo_drv.so
 		# xorg-server-1.9.x
-		if has_version ">=x11-base/xorg-server-1.9" ; then
-				newins vboxvideo_drv_19.so vboxvideo_drv.so
-		# xorg-server-1.8.x
-		elif has_version ">=x11-base/xorg-server-1.8" ; then
-				newins vboxvideo_drv_18.so vboxvideo_drv.so
-		# xorg-server-1.7.x
 		else
-				newins vboxvideo_drv_17.so vboxvideo_drv.so
+				newins vboxvideo_drv_19.so vboxvideo_drv.so
 		fi
 
 		# Guest OpenGL driver