(Proxy commit) Version bump

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 i686

6 files changed, 53 insertions, 80 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/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 00a1edae62d7..44d77a93e7de 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,11 +1,20 @@
-AUX virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch 2141 RMD160 406b0663e786721cee80736ec1119fe0406e0a1c SHA1 63229245e4c43dcfa526ef02f5fb8f8ba59030af SHA256 28a035ada49784d118cf61811f4d4b7e4957e2a3333cb3256d42bdd75e4f20e7
-AUX virtualbox-guest-additions-2.0.2-localconfig 845 RMD160 5cd3b73046f0dbe8eebef9041f224b6c2433b733 SHA1 1a31b795e4037e444b94afdaa586349f1ae34d9b SHA256 ac7c25fd5f93f4a9ab76a085c58c9c3eb5e93f9e58594a022799df7103040a43
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX virtualbox-guest-additions-2-localconfig 845 RMD160 5cd3b73046f0dbe8eebef9041f224b6c2433b733 SHA1 1a31b795e4037e444b94afdaa586349f1ae34d9b SHA256 ac7c25fd5f93f4a9ab76a085c58c9c3eb5e93f9e58594a022799df7103040a43
 AUX virtualbox-guest-additions.initd 1463 RMD160 4daceefa3e10659381f4b714512548944c7f54fd SHA1 f5290150bbf99feac5c6d81c4f82f9191e5f1786 SHA256 933dbdc5e5363dfbdc2d51deed0726ab91f1ea89e330298266b9ffb03c38989a
-DIST VirtualBox-1.6.4-OSE.tar.bz2 35484117 RMD160 af94b774d9964757da125c4614e393396f7e892b SHA1 457ae85f2d10028ac7c56e4b35ee47028ec0208b SHA256 7e777e5f602d7b48bf5a8b1d580ee43dd6327b9037816fde484a13db8a86b422
 DIST VirtualBox-1.6.6-OSE.tar.bz2 35483853 RMD160 4b17428371089806cf6f5e52d1905936f7beb01d SHA1 7c323b35d77277c650cbce2821ab6778d1e3270e SHA256 acb3c20ef751ed408489d7b5c2d5d441226055a6e83bfeb9258ce2d55baba4da
 DIST VirtualBox-2.0.2-OSE.tar.bz2 37548591 RMD160 4156f2efe5245236f9890abcd0adb5ad5291f86f SHA1 cdc51cc4e5ff189cf9eff832179494009df1334a SHA256 0318c69eace3db0979f0aefd27aeb6c54d7c1aafcc6a156b076bc116a1d8805b
-EBUILD virtualbox-guest-additions-1.6.4-r2.ebuild 3472 RMD160 7b32134cf5584fc8a3906784d1ff09322011b56b SHA1 e75d6e47c95623271708c8f4d4f87fa299145886 SHA256 b1721a33cf0ad020226efe956f58bd46721bb16b3a009bb113a344b76a7b35a2
+DIST VirtualBox-2.0.4-OSE.tar.bz2 37841781 RMD160 390a2b4d97a3ed6fdc885b89354884a07b3fc464 SHA1 f8e7c109546c033927bd41e78f259adb81cb1504 SHA256 5618fb09efafac3fc9c183a44aa3c1d8c44d1d7fa58bfb5a73c221f1dd8740fd
 EBUILD virtualbox-guest-additions-1.6.6.ebuild 3538 RMD160 91fce610d0376e447f9e92c0123702f1ad0b32ae SHA1 b3add8bb09c82cc150592ded34d2885f346839ca SHA256 8bd6503e530f0b63cd041901f18b5e38fced553e690d867cf25e532765e1a8e5
-EBUILD virtualbox-guest-additions-2.0.2.ebuild 3753 RMD160 752d9e460b55452eddf48243b090e3aee194aa3e SHA1 233f7cf60ee58c50fcbbd58cbd0fdc637468dac7 SHA256 6257149e6075703be11cb7689ee93e5c56a6af1680d41ec2002e5c09639bec77
-MISC ChangeLog 5805 RMD160 fa3c67232c717d390a2e3edcf73d535fe9a32d67 SHA1 abcc91290e81c2ed64b5426e9bab33c38b5d4149 SHA256 7d337a447bdacfcea52fdfea9dbbeb744280ae27e37a74c3526866a2d1ff8799
+EBUILD virtualbox-guest-additions-2.0.2.ebuild 3753 RMD160 577fdfbca78a54bb91850551a464ca2370b52117 SHA1 84bfbd095c56722d0a026affaffd4e0a725a75dd SHA256 c76a8070695639c0261fd0e58fd03e444e0b97e882357137811683082ae706ee
+EBUILD virtualbox-guest-additions-2.0.4.ebuild 3753 RMD160 24032b9121720e33e93798a1214e7bc9dd9ac01b SHA1 48c281bead6f2c9e430a8caa347e514595f2786e SHA256 5404813f7c2d1666ac789c8b3b76754b54ae8b489d5000b403c734947521ffa3
+MISC ChangeLog 6652 RMD160 88dcf735e564a5c7dfc8e02c314703ae3db53503 SHA1 5c1082d5cf1cbf5cfcca8b2a80fdb5c76ecf1541 SHA256 f7de08ac14b5b094c4cf945ff03d70992fe0ba689e57c2732db5c01ac35b825d
 MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkGB8MACgkQz974XjDVpbmEQgCgs8aL0jfR/NtheKlMn7CnxMRf
+I3MAoJJAFeb3u2XjuEmiGsXUOHVi2Y5b
+=C/UW
+-----END PGP SIGNATURE-----
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" \