Version bump; prune old ebuilds in overlay

svn path=/trunk/; revision=714

3 files changed, 53 insertions, 8 deletions

diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index 7dadeba..282a06d 100644
--- a/x11-drivers/xf86-video-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-video-virtualbox/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.12 2009/06/01 00:26:48 patrick Exp $
 
+  05 Aug 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  -xf86-video-virtualbox-2.2.4.ebuild,
+  +xf86-video-virtualbox-3.0.4.ebuild:
+  Version bump; prune old ebuilds in overlay
+
   20 Jul 2009; Alessio Cassibba (X-Drum) <swapon@gmail.com>
   -xf86-video-virtualbox-3.0.2.ebuild,
   +xf86-video-virtualbox-3.0.2-r1.ebuild:
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index 670838f..7f24f27 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -2,9 +2,9 @@ AUX xf86-video-virtualbox-2-localconfig 876 RMD160 db4b06bd8646f237260e8d61c5651
 AUX xf86-video-virtualbox-2.2.0-enable-opengl.patch 303 RMD160 c8c8e6a9aaea1ec53f3c0cb285750921287959a6 SHA1 7d68f5529a921f7d9786b232e8ecc7ebe7ba0e1b SHA256 194b7bca875f18e1621f065640d1c1a1364640e17475c493ec3b56f6e7e5ce66
 AUX xf86-video-virtualbox-3-vboxvideo_drm.makefile 6810 RMD160 55758e73adef9924a9bcea5da465fc93a1ea03df SHA1 fce332db7b3f9fd337b26e2165441aaeb2193b48 SHA256 ccf3eaaa8e1ed4a9c816a9a944c3ce6f289d002f03ce72d796500d209e26ae7e
 AUX xf86-video-virtualbox-3.0.0-mesa-check.patch 692 RMD160 c1b62d987fa941f5455a8fb0c0d6b07377756d0f SHA1 18c987a024fc45778cc2dc55515100150996408d SHA256 88e981ed765b26c11ea9c606a009a9a1b03c67a1de5cb42b18e0088e027fe0c8
-DIST VirtualBox-2.2.4-OSE.tar.bz2 50948689 RMD160 12577f01568e362d6285aa19eeb8eeb9ca6eadb7 SHA1 ebc5566c4b8115c649a82bde743e94ea62ed1a26 SHA256 b5d52a67b94510275eb3dc8649eb7d3063446da4f3ac038f821d598c62b5d6c5
 DIST VirtualBox-3.0.2-OSE.tar.bz2 51322139 RMD160 9d33f82cf0ef2ca001fd61b9b26583ca2ad32a5a SHA1 442206e7dfcf6719b7ee452f9f042563acd6f0eb SHA256 41ee0fc47103aeeae8301f7b75d358662ff0f05e5874b9775641d6a9b9e39fe8
-EBUILD xf86-video-virtualbox-2.2.4.ebuild 2860 RMD160 37dbe66e28952c6265603b2ceee79e2c264aba69 SHA1 b40dd75554a0da0196f559d6f7e46e8a9c064420 SHA256 bf78665cd0d1690e07e3fe20915f4260d096bad96ec010c3249f3003d32d5186
+DIST VirtualBox-3.0.4-OSE.tar.bz2 51381059 RMD160 7addc9d840ef751d95356a342c6a51f2c87a855b SHA1 454f4fbd46a3c7bfa0f6e48eaa37bb578446aca5 SHA256 006a25df51a209262ee93b8cf3f155e1883fa872b4b8c5d77f042675a0f302e1
 EBUILD xf86-video-virtualbox-3.0.2-r1.ebuild 4033 RMD160 ccee9c9764d08aea1e0fbbe178f880d57ebcdf18 SHA1 64cab8c1ac6ac5b9982aea323bbeccc55b6307d6 SHA256 b4eecb60b09d9bc284a3e1f508ace82a364495c23d20b241d59becf9c4f8ab05
-MISC ChangeLog 6258 RMD160 b9777763d78b2108dead32dd11a5238beb6a3afc SHA1 493dc2e156a9a49aa5624a226578123e18ca5de9 SHA256 82da4adf968441c2cf23f7c6e73928e6d17c859e068f576ecbc7d507ae30903a
+EBUILD xf86-video-virtualbox-3.0.4.ebuild 4033 RMD160 ccee9c9764d08aea1e0fbbe178f880d57ebcdf18 SHA1 64cab8c1ac6ac5b9982aea323bbeccc55b6307d6 SHA256 b4eecb60b09d9bc284a3e1f508ace82a364495c23d20b241d59becf9c4f8ab05
+MISC ChangeLog 6442 RMD160 491b812131669070d8607956d0d4f22f341df138 SHA1 ee7b83c1e4bafb87432993d14a85614a9d55df68 SHA256 925509dc68d2ce682adce34e7d50c820273c3cfe3b5b8135901db0f1604e60d3
 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.2.4.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.0.4.ebuild
index 10480df..276f552 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.2.4.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-3.0.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-2.2.4.ebuild,v 1.1 2009/06/01 00:26:48 patrick Exp $
 
 EAPI=2
 
-inherit x-modular eutils
+inherit x-modular eutils linux-mod multilib
 
 MY_P=VirtualBox-${PV}-OSE
 DESCRIPTION="VirtualBox video driver"
@@ -37,8 +37,27 @@ DEPEND="${RDEPEND}
 	    dri? (  x11-proto/xf86driproto
 				>=x11-libs/libdrm-2.4.5 )"
 
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxvideo(misc:${WORKDIR}/vboxvideo_drm:${WORKDIR}/vboxvideo_drm)"
+
 S=${WORKDIR}/${MY_P/-OSE/_OSE}
 
+pkg_setup() {
+		linux-mod_pkg_setup
+		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+}
+
+src_unpack() {
+		unpack ${A}
+
+		# Prepare the vboxvideo_drm sources and Makefile in ${WORKDIR}
+		cp -a "${MY_P/-OSE/_OSE}"/src/VBox/Additions/linux/drm \
+		"${WORKDIR}/vboxvideo_drm"
+		cp "${FILESDIR}/${PN}-3-vboxvideo_drm.makefile" \
+		"${WORKDIR}/vboxvideo_drm/Makefile"
+}
+
 src_prepare() {
 		# Remove shipped binaries (kBuild,yasm), see bug #232775
 		rm -rf kBuild/bin tools
@@ -48,6 +67,9 @@ src_prepare() {
 
 		# Ugly hack to build the opengl part of the video driver
 		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"
 }
 
 src_configure() {
@@ -62,6 +84,10 @@ 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
@@ -73,8 +99,12 @@ src_compile() {
 }
 
 src_install() {
+		if use dri; then
+			linux-mod_src_install
+		fi
+
 		cd "${S}/out/linux.${ARCH}/release/bin/additions"
-		insinto /usr/lib/xorg/modules/drivers
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
 
 		# xorg-server-1.6.x (currently on the official x11 overlay)
 		if has_version ">=x11-base/xorg-server-1.6" ; then
@@ -93,11 +123,11 @@ src_install() {
 		fi
 
 		# Guest OpenGL driver
-		insinto /usr/lib
+		insinto /usr/$(get_libdir)
 		doins -r VBoxOGL* || die
 
 		if use dri ; then
-			dosym /usr/lib/VBoxOGL.so /usr/lib/dri/vboxvideo_dri.so
+			dosym /usr/$(get_libdir)/VBoxOGL.so /usr/$(get_libdir)/dri/vboxvideo_dri.so
 		fi
 }
 
@@ -108,4 +138,14 @@ pkg_postinst() {
 		elog ""
 		elog "in the Graphics device section (Section \"Device\")"
 		elog ""
+		if use dri; then
+			elog "To use the kernel drm video driver, please add:"
+			elog "\"vboxvideo\" to:"
+			if has_version sys-apps/openrc; then
+				elog "/etc/conf.d/modules"
+			else
+				elog "/etc/modules.autoload.d/kernel-${KV_MAJOR}.${KV_MINOR}"
+			fi
+			elog ""
+		fi
 }