(Proxy commit) Version bump

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

5 files changed, 38 insertions, 74 deletions

diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index 39a921e893bf..165bf9af03ae 100644
--- a/app-emulation/virtualbox-guest-additions/ChangeLog
+++ b/app-emulation/virtualbox-guest-additions/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for app-emulation/virtualbox-guest-additions
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.5 2008/09/15 19:50:08 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.6 2008/10/27 18:26:13 jokey Exp $
+
+*virtualbox-guest-additions-2.0.4 (27 Oct 2008)
+
+  27 Oct 2008; Markus Ullmann <jokey@gentoo.org>
+  -files/virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch,
+  -files/virtualbox-guest-additions-2.0.2-localconfig,
+  +files/virtualbox-guest-additions-2-localconfig,
+  -virtualbox-guest-additions-1.6.4-r2.ebuild,
+  virtualbox-guest-additions-2.0.2.ebuild,
+  +virtualbox-guest-additions-2.0.4.ebuild:
+  (Proxy commit) Version bump
+
+  26 Oct 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  -virtualbox-guest-additions-1.6.4-r2.ebuild,
+  -files/virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch,
+  virtualbox-guest-additions-2.0.2.ebuild,
+  -files/virtualbox-guest-additions-2.0.2-localconfig,
+  +virtualbox-guest-additions-2.0.4.ebuild,
+  +files/virtualbox-guest-additions-2-localconfig:
+  Version Bump; drop version 1.6.4
 
 *virtualbox-guest-additions-2.0.2 (15 Sep 2008)
 
diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch
deleted file mode 100644
index 25d928871f39..000000000000
--- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- 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: virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch,v 1.4 2008/09/15 19:50:09 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: virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch,v 1.4 2008/09/15 19:50:09 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/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-2.0.2-localconfig b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-2-localconfig
index 3e1f7d8cbb32..3e1f7d8cbb32 100644
--- a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-2.0.2-localconfig
+++ b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-2-localconfig
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.0.2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.0.2.ebuild
index dcf30cc5c49b..ea1b3b1b0ad5 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.0.2.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.0.2.ebuild,v 1.2 2008/09/15 22:13:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.0.2.ebuild,v 1.3 2008/10/27 18:26:13 jokey Exp $
 
 inherit eutils linux-mod
 
@@ -52,8 +52,8 @@ src_unpack() {
 		cd "${S}"
 		rm -rf kBuild/bin tools
 
-		# Disable things unused or splitted into separate ebuilds
-		cp "${FILESDIR}/${P}-localconfig" LocalConfig.kmk
+		# Disable things unused or splitted into separate ebuilds 
+		cp "${FILESDIR}/${PN}-2-localconfig" LocalConfig.kmk
 }
 
 src_compile() {
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.4-r2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.0.4.ebuild
index 259a71368e2f..74aeba22498c 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.4-r2.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.4-r2.ebuild,v 1.2 2008/09/15 19:50:08 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.0.4.ebuild,v 1.1 2008/10/27 18:26:13 jokey Exp $
 
 inherit eutils linux-mod
 
@@ -21,6 +21,8 @@ RDEPEND="x11-libs/libXt
 			 x11-apps/xrandr
 			 x11-apps/xrefresh )"
 DEPEND="${RDEPEND}
+		>=dev-util/kbuild-0.1.4
+		>=dev-lang/yasm-0.6.2
 		sys-devel/bin86
 		sys-devel/dev86
 		sys-power/iasl
@@ -46,9 +48,12 @@ src_unpack() {
 		"${MY_P/-OSE/}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
 		unpack ./vbox-kmod.tar.gz
 
-		# Fix missing makefiles
+		# Remove shipped binaries (kBuild,yasm), see bug #232775
 		cd "${S}"
-		epatch "${FILESDIR}/${P}-fix-missing-makefiles.patch"
+		rm -rf kBuild/bin tools
+
+		# Disable things unused or splitted into separate ebuilds 
+		cp "${FILESDIR}/${PN}-2-localconfig" LocalConfig.kmk
 }
 
 src_compile() {
@@ -65,7 +70,9 @@ src_compile() {
 
 		for each in	src/VBox/{Runtime,Additions/common} \
 		src/VBox/Additions/linux{sharefolders,daemon} ; do
-				MAKE="kmk" emake || die "kmk failed"
+				MAKE="kmk" emake TOOL_YASM_AS=yasm \
+				KBUILD_PATH="${S}/kBuild" \
+				|| die "kmk failed"
 		done
 }
 
@@ -89,8 +96,11 @@ src_install() {
 		# VBoxClient user service and xrandr wrapper
 		if use X; then
 			insinto /usr/bin
+
 			doins VBoxClient
+			doins VBoxComtrol
 			fperms 4755 /usr/bin/VBoxClient
+			fperms 4755 /usr/bin/VBoxControl
 
 			dodir /etc/X11/xinit/xinitrc.d/
 			echo -e "#/bin/sh\n/usr/bin/VBoxClient" \