From 6dff4dd4d5c444df61a48c7a0de5e45c111dff10 Mon Sep 17 00:00:00 2001
From: Markus Ullmann <jokey@gentoo.org>
Date: Sat, 6 Sep 2008 19:29:04 +0000
Subject: Port from dev overlay Package-Manager: portage-2.2_rc8/cvs/Linux
 2.6.26-gentoo i686

---
 x11-drivers/xf86-input-virtualbox/ChangeLog        | 18 +++++-
 .../xf86-input-virtualbox-1.5.6-remove-alsa.patch  | 22 -------
 ...ut-virtualbox-1.6.4-fix-missing-makefiles.patch |  4 +-
 .../xf86-input-virtualbox-1.5.6.ebuild             | 63 ------------------
 .../xf86-input-virtualbox-1.6.4-r1.ebuild          |  4 +-
 .../xf86-input-virtualbox-1.6.6.ebuild             | 72 +++++++++++++++++++++
 x11-drivers/xf86-video-virtualbox/ChangeLog        | 19 +++++-
 .../xf86-video-virtualbox-1.5.6-remove-alsa.patch  | 22 -------
 ...eo-virtualbox-1.6.4-fix-missing-makefiles.patch |  4 +-
 .../xf86-video-virtualbox-1.5.6.ebuild             | 67 -------------------
 .../xf86-video-virtualbox-1.6.4-r1.ebuild          | 72 +++++++++++++++++++++
 .../xf86-video-virtualbox-1.6.4.ebuild             | 69 --------------------
 .../xf86-video-virtualbox-1.6.6.ebuild             | 75 ++++++++++++++++++++++
 13 files changed, 260 insertions(+), 251 deletions(-)
 delete mode 100644 x11-drivers/xf86-input-virtualbox/files/xf86-input-virtualbox-1.5.6-remove-alsa.patch
 delete mode 100644 x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-1.5.6.ebuild
 create mode 100644 x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-1.6.6.ebuild
 delete mode 100644 x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-1.5.6-remove-alsa.patch
 delete mode 100644 x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.5.6.ebuild
 create mode 100644 x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.4-r1.ebuild
 delete mode 100644 x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.4.ebuild
 create mode 100644 x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.6.ebuild

(limited to 'x11-drivers')

diff --git a/x11-drivers/xf86-input-virtualbox/ChangeLog b/x11-drivers/xf86-input-virtualbox/ChangeLog
index ae1f0ad98d38..8f40abdfb963 100644
--- a/x11-drivers/xf86-input-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-input-virtualbox/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for x11-drivers/xf86-input-virtualbox
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v 1.3 2008/08/30 19:16:37 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/ChangeLog,v 1.4 2008/09/06 19:27:14 jokey Exp $
+
+*xf86-input-virtualbox-1.6.6 (06 Sep 2008)
+
+  06 Sep 2008; Markus Ullmann <jokey@gentoo.org>
+  -files/xf86-input-virtualbox-1.5.6-remove-alsa.patch,
+  files/xf86-input-virtualbox-1.6.4-fix-missing-makefiles.patch,
+  -xf86-input-virtualbox-1.5.6.ebuild,
+  xf86-input-virtualbox-1.6.4-r1.ebuild,
+  +xf86-input-virtualbox-1.6.6.ebuild:
+  Port from dev overlay
+
+  03 Sep 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  xf86-input-virtualbox-1.6.4-r1.ebuild,
+  +xf86-input-virtualbox-1.6.6.ebuild:
+  Version bump; fix SRC_URI; add dev-util/kbuild and dev-lang/yasm to DEPEND
+  and force to build without shipped binaries (kBuild, yasm), wrt bug #232775;
 
 *xf86-input-virtualbox-1.6.4-r1 (30 Aug 2008)
 
diff --git a/x11-drivers/xf86-input-virtualbox/files/xf86-input-virtualbox-1.5.6-remove-alsa.patch b/x11-drivers/xf86-input-virtualbox/files/xf86-input-virtualbox-1.5.6-remove-alsa.patch
deleted file mode 100644
index 44c5d7510dd7..000000000000
--- a/x11-drivers/xf86-input-virtualbox/files/xf86-input-virtualbox-1.5.6-remove-alsa.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- VirtualBox-1.5.6_OSE/Config.kmk.orig	2008-01-02 17:21:25.000000000 +0100
-+++ VirtualBox-1.5.6_OSE/Config.kmk	2008-01-02 17:24:20.000000000 +0100
-@@ -208,7 +208,7 @@
- # Enable the ISCSI feature.
- VBOX_WITH_ISCSI = 1
- # Enable ALSA support for Linux
--VBOX_WITH_ALSA = 1
-+#VBOX_WITH_ALSA = 1
- # Enable Pulse support for Linux
- VBOX_WITH_PULSE = 1
- # Disable WINMM support for Windows (not implemented)
---- VirtualBox-1.5.6_OSE/configure.orig	2008-01-02 17:21:37.000000000 +0100
-+++ VirtualBox-1.5.6_OSE/configure	2008-01-02 17:24:42.000000000 +0100
-@@ -1526,7 +1526,7 @@
-     cnf_append "VBOX_WITH_VBOXDRV" ""
-     cnf_append "VBOX_WITH_LINUX_ADDITIONS_32BIT_R0" ""
-   fi
--  check_alsa
-+#  check_alsa
-   if [ $WITH_PULSE -eq 1 ]; then
-     check_pulse
-   else
diff --git a/x11-drivers/xf86-input-virtualbox/files/xf86-input-virtualbox-1.6.4-fix-missing-makefiles.patch b/x11-drivers/xf86-input-virtualbox/files/xf86-input-virtualbox-1.6.4-fix-missing-makefiles.patch
index a8080821acd7..22f54475dc59 100644
--- a/x11-drivers/xf86-input-virtualbox/files/xf86-input-virtualbox-1.6.4-fix-missing-makefiles.patch
+++ b/x11-drivers/xf86-input-virtualbox/files/xf86-input-virtualbox-1.6.4-fix-missing-makefiles.patch
@@ -1,7 +1,7 @@
 --- 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-input-virtualbox-1.6.4-fix-missing-makefiles.patch,v 1.2 2008/08/30 19:16:38 jokey Exp $
++# $Id: xf86-input-virtualbox-1.6.4-fix-missing-makefiles.patch,v 1.3 2008/09/06 19:27:26 jokey Exp $
 +## @file
 +# Sub-Makefile for the external apps.
 +#
@@ -32,7 +32,7 @@
 --- 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-input-virtualbox-1.6.4-fix-missing-makefiles.patch,v 1.2 2008/08/30 19:16:38 jokey Exp $
++# $Id: xf86-input-virtualbox-1.6.4-fix-missing-makefiles.patch,v 1.3 2008/09/06 19:27:26 jokey Exp $
 +## @file
 +# Sub-Makefile for VBoxTunctl
 +#
diff --git a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-1.5.6.ebuild b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-1.5.6.ebuild
deleted file mode 100644
index 4d032251545c..000000000000
--- a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-1.5.6.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2008 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-1.5.6.ebuild,v 1.1 2008/03/18 22:04:03 jokey Exp $
-
-inherit x-modular eutils
-
-MY_P=VirtualBox-${PV}-1_OSE
-DESCRIPTION="VirtualBox input 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/inputproto
-		x11-proto/randrproto
-		x11-proto/xproto"
-
-S=${WORKDIR}/${MY_P/-1_/_}
-
-src_unpack() {
-		unpack ${A}
-
-		# Disable (unused) alsa checks in {configure, Comfig.kmk}
-		epatch "${FILESDIR}/${P}-remove-alsa.patch"
-}
-
-src_compile() {
-		# build the user-space tools, warnings are harmless
-		./configure --nofatal \
-		--disable-xpcom \
-		--disable-sdl-ttf \
-		--disable-pulse \
-		--build-headless || die "configure failed"
-		source ./env.sh
-
-		cd "${S}/src/VBox/Additions/linux/xmouse"
-		MAKE="kmk" emake || die "kmk failed"
-}
-
-src_install() {
-		cd "${S}/out/linux.${ARCH}/release/bin/additions"
-		insinto /usr/lib/xorg/modules/input
-
-		if has_version "<x11-base/xorg-server-1.4" ; then
-				newins vboxmouse_drv_71.so vboxmouse_drv.so
-		else
-				newins vboxmouse_drv_14.so vboxmouse_drv.so
-		fi
-}
-
-pkg_postinst() {
-		elog "You need to edit the file /etc/X11/xorg.conf and set:"
-		elog ""
-		elog "	Driver  \"vboxmouse\""
-		elog ""
-		elog "in the Core Pointer's InputDevice section (Section \"InputDevice\")"
-		elog ""
-}
diff --git a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-1.6.4-r1.ebuild b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-1.6.4-r1.ebuild
index 97a19ac3b202..b61ef502e6f2 100644
--- a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-1.6.4-r1.ebuild
+++ b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-1.6.4-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2008 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-1.6.4-r1.ebuild,v 1.1 2008/08/30 19:16:37 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-1.6.4-r1.ebuild,v 1.2 2008/09/06 19:27:14 jokey Exp $
 
 inherit x-modular eutils
 
 MY_P=VirtualBox-${PV}-OSE
 DESCRIPTION="VirtualBox input driver"
 HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://www.virtualbox.org/download/${PV}/${MY_P}.tar.bz2"
+SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-1.6.6.ebuild b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-1.6.6.ebuild
new file mode 100644
index 000000000000..36ae263c515f
--- /dev/null
+++ b/x11-drivers/xf86-input-virtualbox/xf86-input-virtualbox-1.6.6.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2008 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-1.6.6.ebuild,v 1.1 2008/09/06 19:27:14 jokey Exp $
+
+inherit x-modular eutils
+
+MY_P=VirtualBox-${PV}-OSE
+DESCRIPTION="VirtualBox input driver"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-base/xorg-server"
+DEPEND="${RDEPEND}
+		dev-util/kbuild
+		>=dev-lang/yasm-0.6.2
+		sys-devel/dev86
+		sys-power/iasl
+		x11-proto/inputproto
+		x11-proto/randrproto
+		x11-proto/xproto"
+
+S=${WORKDIR}/${MY_P/-OSE/}
+
+src_unpack() {
+		unpack ${A}
+		cd "${S}"
+
+		# Remove shipped binaries (kBuild,yasm), see bug #232775
+		rm -rf kBuild/bin tools
+}
+
+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
+
+		for each in src/VBox/{Runtime,Additions/common/VBoxGuestLib} \
+		src/VBox/Additions/x11/xmouse ; do
+			MAKE="kmk" emake TOOL_YASM_AS=yasm \
+			|| die "kmk failed"
+		done
+}
+
+src_install() {
+		cd "${S}/out/linux.${ARCH}/release/bin/additions"
+		insinto /usr/lib/xorg/modules/input
+
+		if has_version "<x11-base/xorg-server-1.4" ; then
+				newins vboxmouse_drv_71.so vboxmouse_drv.so
+		else
+				newins vboxmouse_drv_14.so vboxmouse_drv.so
+		fi
+}
+
+pkg_postinst() {
+		elog "You need to edit the file /etc/X11/xorg.conf and set:"
+		elog ""
+		elog "	Driver  \"vboxmouse\""
+		elog ""
+		elog "in the Core Pointer's InputDevice section (Section \"InputDevice\")"
+		elog ""
+}
diff --git a/x11-drivers/xf86-video-virtualbox/ChangeLog b/x11-drivers/xf86-video-virtualbox/ChangeLog
index b9613ae8ea28..f1c4544a4251 100644
--- a/x11-drivers/xf86-video-virtualbox/ChangeLog
+++ b/x11-drivers/xf86-video-virtualbox/ChangeLog
@@ -1,6 +1,23 @@
 # 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.2 2008/08/10 14:45:33 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-virtualbox/ChangeLog,v 1.3 2008/09/06 19:29:03 jokey Exp $
+
+*xf86-video-virtualbox-1.6.6 (06 Sep 2008)
+*xf86-video-virtualbox-1.6.4-r1 (06 Sep 2008)
+
+  06 Sep 2008; Markus Ullmann <jokey@gentoo.org>
+  -files/xf86-video-virtualbox-1.5.6-remove-alsa.patch,
+  files/xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch,
+  -xf86-video-virtualbox-1.5.6.ebuild, -xf86-video-virtualbox-1.6.4.ebuild,
+  +xf86-video-virtualbox-1.6.4-r1.ebuild,
+  +xf86-video-virtualbox-1.6.6.ebuild:
+  Port from dev overlay
+
+  03 Sep 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  xf86-video-virtualbox-1.6.4-r1.ebuild,
+  +xf86-video-virtualbox-1.6.6.ebuild:
+  Version bump; fix SRC_URI; add dev-util/kbuild and dev-lang/yasm to DEPEND
+  and force to build without shipped binaries (kBuild, yasm), wrt bug #232775;
 
 *xf86-video-virtualbox-1.6.4 (10 Aug 2008)
 
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-1.5.6-remove-alsa.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-1.5.6-remove-alsa.patch
deleted file mode 100644
index 44c5d7510dd7..000000000000
--- a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-1.5.6-remove-alsa.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- VirtualBox-1.5.6_OSE/Config.kmk.orig	2008-01-02 17:21:25.000000000 +0100
-+++ VirtualBox-1.5.6_OSE/Config.kmk	2008-01-02 17:24:20.000000000 +0100
-@@ -208,7 +208,7 @@
- # Enable the ISCSI feature.
- VBOX_WITH_ISCSI = 1
- # Enable ALSA support for Linux
--VBOX_WITH_ALSA = 1
-+#VBOX_WITH_ALSA = 1
- # Enable Pulse support for Linux
- VBOX_WITH_PULSE = 1
- # Disable WINMM support for Windows (not implemented)
---- VirtualBox-1.5.6_OSE/configure.orig	2008-01-02 17:21:37.000000000 +0100
-+++ VirtualBox-1.5.6_OSE/configure	2008-01-02 17:24:42.000000000 +0100
-@@ -1526,7 +1526,7 @@
-     cnf_append "VBOX_WITH_VBOXDRV" ""
-     cnf_append "VBOX_WITH_LINUX_ADDITIONS_32BIT_R0" ""
-   fi
--  check_alsa
-+#  check_alsa
-   if [ $WITH_PULSE -eq 1 ]; then
-     check_pulse
-   else
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
index 7a0b90b24a15..266df2074052 100644
--- 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
@@ -1,7 +1,7 @@
 --- 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 $
++# $Id: xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch,v 1.2 2008/09/06 19:29:04 jokey Exp $
 +## @file
 +# Sub-Makefile for the external apps.
 +#
@@ -32,7 +32,7 @@
 --- 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 $
++# $Id: xf86-video-virtualbox-1.6.4-fix-missing-makefiles.patch,v 1.2 2008/09/06 19:29:04 jokey Exp $
 +## @file
 +# Sub-Makefile for VBoxTunctl
 +#
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.5.6.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.5.6.ebuild
deleted file mode 100644
index af840a108136..000000000000
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.5.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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.5.6.ebuild,v 1.1 2008/03/18 22:06:33 jokey Exp $
-
-inherit x-modular eutils
-
-MY_P=VirtualBox-${PV}-1_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/-1_/_}
-
-src_unpack() {
-		unpack ${A}
-
-		# Disable (unused) alsa checks in {configure, Comfig.kmk}
-		epatch "${FILESDIR}/${P}-remove-alsa.patch"
-}
-
-src_compile() {
-		# build the user-space tools, warnings are harmless
-		./configure --nofatal \
-		--disable-xpcom \
-		--disable-sdl-ttf \
-		--disable-pulse \
-		--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 ""
-}
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.4-r1.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.4-r1.ebuild
new file mode 100644
index 000000000000..017af879d369
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.4-r1.ebuild
@@ -0,0 +1,72 @@
+# 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-r1.ebuild,v 1.1 2008/09/06 19:29:03 jokey Exp $
+
+inherit x-modular eutils
+
+MY_P=VirtualBox-${PV}-OSE
+DESCRIPTION="VirtualBox video driver"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-base/xorg-server"
+DEPEND="${RDEPEND}
+		sys-devel/dev86
+		sys-power/iasl
+		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
+
+		for each in src/VBox/{Runtime,Additions/common/VBoxGuestLib} \
+		src/VBox/Additions/x11/xgraphics ; do
+			MAKE="kmk" emake || die "kmk failed"
+		done
+}
+
+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 ""
+}
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
deleted file mode 100644
index ed4fd49a6f9e..000000000000
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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 ""
-}
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.6.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.6.ebuild
new file mode 100644
index 000000000000..fce392eabca4
--- /dev/null
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.6.ebuild
@@ -0,0 +1,75 @@
+# 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.6.ebuild,v 1.1 2008/09/06 19:29:03 jokey Exp $
+
+inherit x-modular eutils
+
+MY_P=VirtualBox-${PV}-OSE
+DESCRIPTION="VirtualBox video driver"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-base/xorg-server"
+DEPEND="${RDEPEND}
+		dev-util/kbuild
+		>=dev-lang/yasm-0.6.2
+		sys-devel/dev86
+		sys-power/iasl
+		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}"
+
+		# Remove shipped binaries (kBuild,yasm), see bug #232775
+		rm -rf kBuild/bin tools
+}
+
+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
+
+		for each in src/VBox/{Runtime,Additions/common/VBoxGuestLib} \
+		src/VBox/Additions/x11/xgraphics ; do
+			MAKE="kmk" emake TOOL_YASM_AS=yasm \
+			|| die "kmk failed"
+		done
+}
+
+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 ""
+}
-- 
cgit v1.2.3-65-gdbad