Bump to 3.0.2. Fixes #275963. Thanks to Alessio Cassiba and all the testers

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 222 insertions, 1 deletions

diff --git a/app-emulation/virtualbox-guest-additions/ChangeLog b/app-emulation/virtualbox-guest-additions/ChangeLog
index bf68679dc3f5..a288af550e21 100644
--- a/app-emulation/virtualbox-guest-additions/ChangeLog
+++ b/app-emulation/virtualbox-guest-additions/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/virtualbox-guest-additions
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.13 2009/06/01 00:24:41 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.14 2009/07/16 21:42:07 patrick Exp $
+
+*virtualbox-guest-additions-3.0.2 (16 Jul 2009)
+
+  16 Jul 2009; Patrick Lauer <patrick@gentoo.org>
+  +virtualbox-guest-additions-3.0.2.ebuild,
+  +files/virtualbox-guest-additions-3.initd:
+  Bump to 3.0.2. Fixes #275963. Thanks to Alessio Cassiba and all the
+  testers
 
 *virtualbox-guest-additions-2.2.4 (01 Jun 2009)
 
diff --git a/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-3.initd b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-3.initd
new file mode 100644
index 000000000000..ab45a5c57e40
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/files/virtualbox-guest-additions-3.initd
@@ -0,0 +1,61 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header:
+
+depend() {
+        need localmount
+	before xdm
+}
+
+createvboxdevice() {
+		local maj min
+
+		maj=`sed -n 's;\([0-9]\+\) vboxadd;\1;p' /proc/devices`
+
+		if ! [[ -z $maj ]] ; then
+			min=0
+		else
+			min=`sed -n 's;\([0-9]\+\) vboxadd;\1;p' /proc/misc`
+			if ! [[ -z $min ]] ; then
+				maj=10
+			fi
+		fi
+
+		mknod /dev/vboxadd c $maj $min -m 0664 &> /dev/null
+}
+
+start() {
+	ebegin "Starting VirtualBox guest additions"
+
+	if [[ -e /dev/vboxadd ]] ; then
+		rm -f /dev/vboxadd &> /dev/null
+	fi
+
+	einfo "	Loading kernel modules and creating devices"
+	/sbin/modprobe vboxadd &> /dev/null
+	createvboxdevice
+	/sbin/modprobe vboxvfs &> /dev/null
+
+	einfo "	Starting the vboxadd system service"
+        start-stop-daemon --start --make-pidfile \
+		--exec /usr/sbin/vboxadd-service --pidfile /var/run/vboxadd-service.pid \
+		--name vboxadd-service \
+		--background
+
+        eend $? "Failed to start VirtualBox guest additions"
+}
+
+stop() {
+        ebegin "Stopping VirtualBox guest additions"
+
+	einfo "	Stopping the vboxadd system service"
+	start-stop-daemon --stop --quiet \
+		--pidfile /var/run/vboxadd-service.pid --name vboxadd-service
+
+	einfo " Unloading kernel modules and removing devices"
+	/sbin/rmmod vboxvfs &> /dev/null
+	/sbin/rmmod vboxadd &> /dev/null
+	rm -f /dev/vboxadd &> /dev/null
+        eend $?
+}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.0.2.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.0.2.ebuild
new file mode 100644
index 000000000000..43593c68bd29
--- /dev/null
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.0.2.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2009 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-3.0.2.ebuild,v 1.1 2009/07/16 21:42:07 patrick 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="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
+			 ~x11-drivers/xf86-input-virtualbox-${PV}
+			 x11-apps/xrandr
+			 x11-apps/xrefresh
+			 x11-libs/libXmu
+			 x11-libs/libX11
+			 x11-libs/libXt
+			 x11-libs/libXext
+			 x11-libs/libXau
+			 x11-libs/libXdmcp
+			 x11-libs/libSM
+			 x11-libs/libICE
+			 amd64? ( app-emulation/emul-linux-x86-xlibs ) )"
+DEPEND="${RDEPEND}
+		>=dev-util/kbuild-0.1.5-r1
+		>=dev-lang/yasm-0.6.2
+		sys-devel/bin86
+		sys-devel/dev86
+		sys-power/iasl
+		X? ( 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/_OSE}
+
+pkg_setup() {
+		linux-mod_pkg_setup
+		BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+		enewgroup vboxadd
+		enewuser vboxadd -1 /bin/sh /var/run/vboxadd vboxadd
+}
+
+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/_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}/${PN}-2-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/{sharedfolders,daemon} ; do
+				cd "${S}"${each}
+				MAKE="kmk" emake TOOL_YASM_AS=yasm \
+				KBUILD_PATH="${S}/kBuild" \
+				|| die "kmk VBoxControl failed"
+		done
+
+		if use X; then
+				cd "${S}"/src/VBox/Additions/x11/VBoxClient
+				MAKE="kmk" emake TOOL_YASM_AS=yasm \
+				KBUILD_PATH="${S}/kBuild" \
+				|| die "kmk VBoxClient failed"
+		fi
+}
+
+src_install() {
+		linux-mod_src_install
+
+		cd "${S}"/out/linux.${ARCH}/release/bin/additions
+
+		insinto /sbin
+		newins mountvboxsf mount.vboxsf
+		fperms 4755 /sbin/mount.vboxsf
+
+		newinitd "${FILESDIR}"/${PN}-3.initd ${PN}
+
+		insinto /usr/sbin/
+		newins VBoxService vboxadd-service
+		fperms 0755 /usr/sbin/vboxadd-service
+
+		insinto /usr/bin
+		doins VBoxControl
+		fperms 0755 /usr/bin/VBoxControl
+
+		# VBoxClient user service and xrandr wrapper
+		if use X; then
+			doins VBoxClient
+			fperms 0755 /usr/bin/VBoxClient
+
+			cd "${S}"/src/VBox/Additions/x11/Installer
+			newins VBoxRandR.sh VBoxRandR
+			fperms 0755 /usr/bin/VBoxRandR
+
+			newins 98vboxadd-xclient VBoxClient-all
+			fperms 0755 /usr/bin/VBoxClient-all
+		fi
+
+		# udev rule for vboxdrv
+		dodir /etc/udev/rules.d
+		echo 'KERNEL=="vboxadd", NAME="vboxadd", OWNER="vboxadd", MODE="0660"' \
+		>> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules"
+		echo 'KERNEL=="vboxuser", NAME="vboxuser", OWNER="vboxadd", 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 ""
+}