Add version bump wrt bug #233683

(Portage version: 2.2_rc6/cvs/Linux 2.6.26-gentoo i686)

3 files changed, 143 insertions, 1 deletions

diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index 0bdf332397ff..b9613ae8ea28 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.1 2008/03/18 22:06:33 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.2 2008/08/10 14:45:33 jokey Exp $
+
+*xf86-video-virtualbox-1.6.4 (10 Aug 2008)
+
+  10 Aug 2008; Markus Ullmann <jokey@gentoo.org>
+  +files/xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch,
+  +xf86-video-virtualbox-1.6.4.ebuild:
+  Add version bump wrt bug #233683
 
 *xf86-video-virtualbox-1.5.6 (18 Mar 2008)
 
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch
new file mode 100644
index 000000000000..7a0b90b24a15
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch
@@ -0,0 +1,66 @@
+--- src/apps/Makefile.kmk	1970-01-01 01:00:00.000000000 +0100
++++ src/apps/Makefile.kmk	2008-08-02 16:06:11.358197514 +0200
+@@ -0,0 +1,28 @@
++# $Id: xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch,v 1.1 2008/08/10 14:45:34 jokey Exp $
++## @file
++# Sub-Makefile for the external apps.
++#
++
++#
++# Copyright (C) 2006-2007 Sun Microsystems, Inc.
++#
++# Sun Microsystems, Inc. confidential
++# All rights reserved
++#
++
++DEPTH = ../..
++include $(KBUILD_PATH)/subheader.kmk
++
++ifdef VBOX_WITH_KCHMVIEWER
++ ifneq ($(wildcard $(PATH_SUB_CURRENT)/kchmviewer-2.6),)
++  include $(PATH_SUB_CURRENT)/kchmviewer-2.6/Makefile.kmk
++ endif
++endif
++ifneq ($(wildcard $(PATH_SUB_CURRENT)/tunctl),)
++ ifeq ($(KBUILD_TARGET),linux)
++  include $(PATH_SUB_CURRENT)/tunctl/Makefile.kmk
++ endif
++endif
++
++include $(KBUILD_PATH)/subfooter.kmk
++
+--- src/apps/tunctl/Makefile.kmk	1970-01-01 01:00:00.000000000 +0100
++++ src/apps/tunctl/Makefile.kmk	2008-08-02 16:06:37.447936207 +0200
+@@ -0,0 +1,32 @@
++# $Id: xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch,v 1.1 2008/08/10 14:45:34 jokey Exp $
++## @file
++# Sub-Makefile for VBoxTunctl
++#
++# VBoxTunctl is identical to tunctl from Usermode Linux	except for the name.
++#
++
++#
++# Copyright (C) 2006-2007 Sun Microsystems, Inc.
++#
++# This file is part of VirtualBox Open Source Edition (OSE), as
++# available from http://www.virtualbox.org. This file is free software;
++# you can redistribute it and/or modify it under the terms of the GNU
++# General Public License (GPL) as published by the Free Software
++# Foundation, in version 2 as it comes in the "COPYING" file of the
++# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
++# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
++#
++# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa
++# Clara, CA 95054 USA or visit http://www.sun.com if you need
++# additional information or have any questions.
++#
++
++DEPTH = ../../..
++include $(KBUILD_PATH)/subheader.kmk
++
++PROGRAMS.linux += VBoxTunctl
++VBoxTunctl_TEMPLATE = VBOXR3EXE
++VBoxTunctl_SOURCES  = tunctl.c
++
++include $(KBUILD_PATH)/subfooter.kmk
++
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.4.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.4.ebuild
new file mode 100644
index 000000000000..ed4fd49a6f9e
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2008 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-1.6.4.ebuild,v 1.1 2008/08/10 14:45:33 jokey Exp $
+
+inherit x-modular eutils
+
+MY_P=VirtualBox-${PV}-OSE
+DESCRIPTION="VirtualBox video driver"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://www.virtualbox.org/download/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-base/xorg-server"
+DEPEND="${RDEPEND}
+		x11-proto/fontsproto
+		x11-proto/randrproto
+		x11-proto/renderproto
+		x11-proto/xextproto
+		x11-proto/xineramaproto
+		x11-proto/xproto"
+
+S=${WORKDIR}/${MY_P/-OSE/}
+
+src_unpack() {
+		unpack ${A}
+		cd "${S}"
+
+		# Fix missing makefiles
+		epatch "${FILESDIR}/${P}-fix-missing-makefiles.patch"
+}
+
+src_compile() {
+		# build the user-space tools, warnings are harmless
+		./configure --nofatal \
+		--disable-xpcom \
+		--disable-sdl-ttf \
+		--disable-pulse \
+		--disable-alsa \
+		--build-headless || die "configure failed"
+		source ./env.sh
+
+		cd "${S}/src/VBox/Additions/linux/xgraphics"
+
+		MAKE="kmk" emake || die "kmk failed"
+}
+
+src_install() {
+		cd "${S}/out/linux.${ARCH}/release/bin/additions"
+		insinto /usr/lib/xorg/modules/drivers
+
+		if has_version "<x11-base/xorg-server-1.4" ; then
+				newins vboxvideo_drv_13.so vboxvideo_drv.so
+		else
+				newins vboxvideo_drv_14.so vboxvideo_drv.so
+		fi
+}
+
+pkg_postinst() {
+		elog "You need to edit the file /etc/X11/xorg.conf and set:"
+		elog ""
+		elog "  Driver  \"vboxvideo\""
+		elog ""
+		elog "in the Graphics device section (Section \"Device\")"
+		elog ""
+}