(Proxy-Commit) Port from dev overlay

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

6 files changed, 185 insertions, 5 deletions

diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index 590767e333ac..39a921e893bf 100644
--- a/app-emulation/virtualbox-guest-additions/ChangeLog
+++ b/app-emulation/virtualbox-guest-additions/ChangeLog
@@ -1,6 +1,22 @@
 # 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.4 2008/09/06 19:30:00 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.5 2008/09/15 19:50:08 jokey Exp $
+
+*virtualbox-guest-additions-2.0.2 (15 Sep 2008)
+
+  15 Sep 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,
+  virtualbox-guest-additions-1.6.4-r2.ebuild,
+  virtualbox-guest-additions-1.6.6.ebuild,
+  +virtualbox-guest-additions-2.0.2.ebuild:
+  (Proxy-Commit) Port from dev overlay
+
+  13 Sep 2008; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  +virtualbox-guest-additions-2.0.2.ebuild,
+  +files/virtualbox-guest-additions-2.0.2-localconfig:
+  Version bump, add VBoxControl command line utility, force 2.0.2 to build
+  with dev-util/kbuild-0.1.4
 
 *virtualbox-guest-additions-1.6.6 (06 Sep 2008)
 *virtualbox-guest-additions-1.6.4-r2 (06 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
index 83ad78acf1b2..25d928871f39 100644
--- 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
@@ -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: virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch,v 1.3 2008/09/06 19:30:01 jokey Exp $
++# $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.
 +#
@@ -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: virtualbox-guest-additions-1.6.4-fix-missing-makefiles.patch,v 1.3 2008/09/06 19:30:01 jokey Exp $
++# $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
 +#
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.0.2-localconfig
new file mode 100644
index 000000000000..3e1f7d8cbb32
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-2.0.2-localconfig
@@ -0,0 +1,27 @@
+# -*- Makefile -*-
+#
+# Overwrite some default kBuild settings
+#
+
+#
+# Copyright (C) 2006-2008 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 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.
+#
+
+# don't build testcases to save time, they are not needed for the package
+VBOX_WITH_TESTCASES     :=
+VBOX_WITH_TESTSUITE     :=
+
+KBUILD_MSG_STYLE        := brief
+
+## paths, origin, hardening
+VBOX_WITH_HARDENING        := 2
+VBOX_WITH_ORIGIN           :=
+
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-1.6.4-r2.ebuild
index 2acd337c3b9a..259a71368e2f 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.4-r2.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.4-r2.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.1 2008/09/06 19:30:00 jokey Exp $
+# $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 $
 
 inherit eutils linux-mod
 
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.6.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.6.ebuild
index d2eeb73f6896..b8829e399c7c 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.6.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.6.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.6.ebuild,v 1.1 2008/09/06 19:30:00 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-1.6.6.ebuild,v 1.2 2008/09/15 19:50:08 jokey Exp $
 
 inherit eutils linux-mod
 
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
new file mode 100644
index 000000000000..e3a8e83e601d
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-2.0.2.ebuild
@@ -0,0 +1,137 @@
+# 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.1 2008/09/15 19:50:08 jokey Exp $
+
+inherit eutils linux-mod
+
+MY_P=VirtualBox-${PV}-OSE
+DESCRIPTION="VirtualBox kernel modules and user-space tools for Linux guests"
+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="X"
+
+RDEPEND="x11-libs/libXt
+		amd64? ( app-emulation/emul-linux-x86-xlibs )
+		X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
+			 ~x11-drivers/xf86-input-virtualbox-${PV}
+			 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
+		x11-proto/renderproto"
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxadd(misc:${WORKDIR}/vboxadd:${WORKDIR}/vboxadd)
+			vboxvfs(misc:${WORKDIR}/vboxvfs:${WORKDIR}/vboxvfs)"
+
+S=${WORKDIR}/${MY_P/-OSE/}
+
+pkg_setup() {
+		linux-mod_pkg_setup
+		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+}
+
+src_unpack() {
+		unpack ${A}
+
+		# Create and unpack a tarball with the sources of the Linux guest
+		# kernel modules, to include all the needed files
+		"${MY_P/-OSE/}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz"
+		unpack ./vbox-kmod.tar.gz
+
+		# Remove shipped binaries (kBuild,yasm), see bug #232775
+		cd "${S}"
+		rm -rf kBuild/bin tools
+
+		# Disable things unused or splitted into separate ebuilds 
+		cp "${FILESDIR}/${P}-localconfig" LocalConfig.kmk
+}
+
+src_compile() {
+		linux-mod_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} \
+		src/VBox/Additions/linux{sharefolders,daemon} ; do
+				MAKE="kmk" emake TOOL_YASM_AS=yasm \
+				KBUILD_PATH="${S}/kBuild" \
+				|| die "kmk failed"
+		done
+}
+
+src_install() {
+		linux-mod_src_install
+
+		cd "${S}"/out/linux.${ARCH}/release/bin/additions
+
+		# shared folders
+		insinto /sbin
+		newins mountvboxsf mount.vboxsf
+		fperms 4755 /sbin/mount.vboxsf
+
+		# time synchronisation system service
+		insinto /usr/sbin
+		doins vboxadd-timesync
+		fperms 0755 /usr/sbin/vboxadd-timesync
+
+		newinitd "${FILESDIR}"/${PN}.initd ${PN}
+
+		# 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" \
+			>> "${D}/etc/X11/xinit/xinitrc.d/98VBoxClient"
+			fperms 0755 /etc/X11/xinit/xinitrc.d/98VBoxClient
+
+			cd "${S}"/src/VBox/Additions/x11/installer
+			newins VBoxRandR.sh VBoxRandR
+			fperms 0755 /usr/bin/VBoxRandR
+		fi
+
+		# udev rule for vboxdrv
+		dodir /etc/udev/rules.d
+		echo 'KERNEL=="vboxadd", NAME="vboxadd", OWNER="root", MODE="0660"' \
+		>> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
+}
+
+pkg_postinst() {
+		linux-mod_pkg_postinst
+		if ! useq X ; then
+			elog "use flag X is off, enable it to install the"
+			elog "X Window System input and video drivers"
+		fi
+		elog "Please add:"
+		elog "/etc/init.d/${PN}"
+		elog "to the default runlevel in order to load all"
+		elog "needed modules and services."
+		elog ""
+		elog "Warning:"
+		elog "this ebuild is only needed if you are running gentoo"
+		elog "inside a VirtualBox Virtual Machine, you don't need"
+		elog "it to run VirtualBox itself."
+		elog ""
+}