Port from dev overlay

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

5 files changed, 45 insertions, 39 deletions

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.6.4.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.4-r1.ebuild
index ed4fd49a6f9e..017af879d369 100644
--- 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-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-video-virtualbox/xf86-video-virtualbox-1.6.4.ebuild,v 1.1 2008/08/10 14:45:33 jokey Exp $
+# $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://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"
@@ -16,6 +16,8 @@ IUSE=""
 
 RDEPEND="x11-base/xorg-server"
 DEPEND="${RDEPEND}
+		sys-devel/dev86
+		sys-power/iasl
 		x11-proto/fontsproto
 		x11-proto/randrproto
 		x11-proto/renderproto
@@ -43,9 +45,10 @@ src_compile() {
 		--build-headless || die "configure failed"
 		source ./env.sh
 
-		cd "${S}/src/VBox/Additions/linux/xgraphics"
-
-		MAKE="kmk" emake || die "kmk failed"
+		for each in src/VBox/{Runtime,Additions/common/VBoxGuestLib} \
+		src/VBox/Additions/x11/xgraphics ; do
+			MAKE="kmk" emake || die "kmk failed"
+		done
 }
 
 src_install() {
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.6.6.ebuild
index af840a108136..fce392eabca4 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.5.6.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-1.6.6.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-video-virtualbox/xf86-video-virtualbox-1.5.6.ebuild,v 1.1 2008/03/18 22:06:33 jokey Exp $
+# $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}-1_OSE
+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"
+SRC_URI="http://download.virtualbox.org/virtualbox/${PV}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,6 +16,10 @@ 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
@@ -23,13 +27,14 @@ DEPEND="${RDEPEND}
 		x11-proto/xineramaproto
 		x11-proto/xproto"
 
-S=${WORKDIR}/${MY_P/-1_/_}
+S=${WORKDIR}/${MY_P/-OSE/}
 
 src_unpack() {
 		unpack ${A}
+		cd "${S}"
 
-		# Disable (unused) alsa checks in {configure, Comfig.kmk}
-		epatch "${FILESDIR}/${P}-remove-alsa.patch"
+		# Remove shipped binaries (kBuild,yasm), see bug #232775
+		rm -rf kBuild/bin tools
 }
 
 src_compile() {
@@ -38,12 +43,15 @@ src_compile() {
 		--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"
+		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() {