Version bump. Removed old.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 32 insertions, 13 deletions

diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index bd6736fb1277..c520f516b6a5 100644
--- 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.38 2010/05/20 14:01:10 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.39 2010/06/03 10:59:15 polynomial-c Exp $
+
+*xf86-video-virtualbox-3.2.2 (03 Jun 2010)
+
+  03 Jun 2010; Lars Wendler <polynomial-c@gentoo.org>
+  -xf86-video-virtualbox-3.1.6-r1.ebuild,
+  +xf86-video-virtualbox-3.2.2.ebuild, metadata.xml:
+  Version bump. Removed old.
 
 *xf86-video-virtualbox-3.1.8-r1 (20 May 2010)
 
diff --git a/x11-drivers/xf86-video-virtualbox/metadata.xml b/x11-drivers/xf86-video-virtualbox/metadata.xml
index 76eddd3fbb1b..4046f60dd7b3 100644
--- a/x11-drivers/xf86-video-virtualbox/metadata.xml
+++ b/x11-drivers/xf86-video-virtualbox/metadata.xml
@@ -10,4 +10,8 @@
   <email>swapon@gmail.com</email>
   <name>Alessio Cassibba</name>
 </maintainer>
+<maintainer>
+  <email>polynomial-c@gentoo.org</email>
+  <name>Lars Wendler</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.6-r1.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.2.2.ebuild
index 4c88a68c5503..c77e7d079a62 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.1.6-r1.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.2.2.ebuild
@@ -1,10 +1,10 @@
 # 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-r1.ebuild,v 1.2 2010/05/10 13:27:52 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.2.2.ebuild,v 1.1 2010/06/03 10:59:15 polynomial-c Exp $
 
 EAPI=2
 
-inherit x-modular eutils linux-mod multilib
+inherit x-modular eutils linux-mod multilib versionator
 
 MY_P=VirtualBox-${PV}-OSE
 DESCRIPTION="VirtualBox video driver"
@@ -57,10 +57,12 @@ src_prepare() {
 		cp "${FILESDIR}/${PN}-3-vboxvideo_drm.makefile" \
 		"${WORKDIR}/vboxvideo_drm/Makefile" || die "cannot copy vboxvideo_drm Makefile"
 
-	        if kernel_is -ge 2 6 33; then
-			# evil patch for new kernels - header moved
-			grep -lR linux/autoconf.h *  | xargs sed -i -e 's:<linux/autoconf.h>:<generated/autoconf.h>:'
-		fi
+		# stupid new header references...
+		for vboxheader in {product,version}-generated.h ; do
+			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
+				"${WORKDIR}/vboxvideo_drm/${vboxheader}"
+		done
+
 		# Remove shipped binaries (kBuild,yasm), see bug #232775
 		rm -rf kBuild/bin tools
 
@@ -71,7 +73,7 @@ src_prepare() {
 		epatch "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
 
 		# unset useless/problematic mesa checks in configure
-		epatch "${FILESDIR}/${PN}-3.0.0-mesa-check.patch"
+		epatch "${FILESDIR}/${PN}-3.2.0-mesa-check.patch"
 }
 
 src_configure() {
@@ -86,10 +88,6 @@ src_configure() {
 }
 
 src_compile() {
-		if use dri; then
-			linux-mod_src_compile
-		fi
-
 		for each in /src/VBox/{Runtime,Additions/common/VBoxGuestLib} \
 		/src/VBox/{GuestHost/OpenGL,Additions/x11/x11stubs,Additions/common/crOpenGL} \
 		/src/VBox/Additions/x11/vboxvideo ; do
@@ -98,6 +96,13 @@ src_compile() {
 			KBUILD_PATH="${S}/kBuild" \
 			|| die "kmk failed"
 		done
+
+		if use dri; then
+			# Now creating the kernel modules. We must do this _after_
+			# we compiled the user-space tools as we need two of the
+			# automatically generated header files. (>=3.2.0)
+			linux-mod_src_compile
+		fi
 }
 
 src_install() {
@@ -108,8 +113,11 @@ src_install() {
 		cd "${S}/out/linux.${ARCH}/release/bin/additions"
 		insinto /usr/$(get_libdir)/xorg/modules/drivers
 
+		# xorg-server-1.8.x
+		if has_version ">=x11-base/xorg-server-1.8" ; then
+				newins vboxvideo_drv_18.so vboxvideo_drv.so
 		# xorg-server-1.7.x
-		if has_version ">=x11-base/xorg-server-1.7" ; then
+		elif has_version ">=x11-base/xorg-server-1.7" ; then
 				newins vboxvideo_drv_17.so vboxvideo_drv.so
 		# xorg-server-1.6.x
 		elif has_version ">=x11-base/xorg-server-1.6" ; then