Add a version bump for virtualbox to 1.5.2.

svn path=/; revision=143

9 files changed, 368 insertions, 0 deletions

diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
new file mode 100644
index 0000000..68104b0
--- /dev/null
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -0,0 +1,2 @@
+DIST VBoxGuestAdditions_1.5.2.iso 5228544 RMD160 4d70818342e8653ba0a6c53795d903a35ddbd59b SHA1 2c8318f3d4300371e2a47fc66baafcfc574188b7 SHA256 822fd13e129d736590bfb740e57c06fe8f68f281b60a9f8b9e0cc32b6672f230
+EBUILD virtualbox-additions-1.5.2.ebuild 767 RMD160 46697baf3dc2ba7d0f79a077c99ca5a39635b926 SHA1 0d5190457540ece49d307e1a019c6b166eb23ed2 SHA256 d330fee602033a921bcdf7c3a17e2da1d0fd40069940c079fd7dab1203ca078b
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-1.5.2.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-1.5.2.ebuild
new file mode 100644
index 0000000..8ad5336
--- /dev/null
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-1.5.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-additions/virtualbox-additions-1.5.0.ebuild,v 1.2 2007/09/04 23:41:19 jokey Exp $
+
+inherit eutils
+
+MY_PN=VBoxGuestAdditions
+MY_P=${MY_PN}_${PV}
+
+DESCRIPTION="Guest additions for VirtualBox"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://virtualbox.org/download/${PV}/${MY_P}.iso"
+
+LICENSE="PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!app-emulation/virtualbox-bin
+	!=app-emulation/virtualbox-9999"
+
+RESTRICT="primaryuri"
+
+pkg_setup() {
+	check_license
+}
+
+src_unpack() {
+	return 0
+}
+
+src_install() {
+	insinto /opt/VirtualBox/additions
+	newins "${DISTDIR}"/${MY_P}.iso ${MY_PN}.iso
+}
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
new file mode 100644
index 0000000..dc91e5f
--- /dev/null
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -0,0 +1,2 @@
+DIST vbox-kernel-module-src-1.5.2.tar.gz 203247 RMD160 942b0d520dd638c18ba782c325c6c1d41b62d8d7 SHA1 f2b229884fbf372e9eebcf3a3ab859ed92bbbb84 SHA256 29ca917b9032c82b632d8557e26474bbac8086015311eb57c23fec3bf8ebe4e2
+EBUILD virtualbox-modules-1.5.2.ebuild 1029 RMD160 6ff462ae8c8b8414452c338794b62d4db9eeb890 SHA1 45a1f8494ae7e382cdd6892d21ed308d05313c32 SHA256 9ec0c4a4dc3284ec4a11cbaa265adf633eb25de86942f028d1c9554cf765b424
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-1.5.2.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-1.5.2.ebuild
new file mode 100644
index 0000000..4f6d002
--- /dev/null
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-1.5.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-1.5.0.ebuild,v 1.3 2007/09/17 09:50:16 jokey Exp $
+
+inherit eutils linux-mod
+
+MY_P=vbox-kernel-module-src-${PV}
+DESCRIPTION="Modules for Virtualbox OSE"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://www.virtualbox.org/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="!=app-emulation/virtualbox-9999"
+
+S=${WORKDIR}/vboxdrv
+
+BUILD_TARGETS="all"
+BUILD_TARGET_ARCH="${ARCH}"
+MODULE_NAMES="vboxdrv(misc:${S})"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	# udev rule for vboxdrv
+	dodir /etc/udev/rules.d
+	echo 'KERNEL=="vboxdrv", GROUP="vboxusers" MODE=660' >> "${D}/etc/udev/rules.d/60-virtualbox.rules"
+}
+
+pkg_preinst() {
+	enewgroup vboxusers
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+}
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
new file mode 100644
index 0000000..9015f4c
--- /dev/null
+++ b/app-emulation/virtualbox/Manifest
@@ -0,0 +1,5 @@
+AUX virtualbox-1.5.2-remove-splitted-stuff.patch 1812 RMD160 205230424f464df05d61824667d4bbc0e72730e8 SHA1 ee211af2895f24f5df22efbb5124ecc78f01e069 SHA256 751bbd7ed8b1bea27d4a1b7dcf5e6b22c911189eb208da429ef5aab4a9dfea65
+AUX virtualbox-wrapper 1606 RMD160 21a75925d364c61c1040b3d217b3e05dfbbfc175 SHA1 d0e885ead0dd5626a70ace3e9185940d27715743 SHA256 28a6305a7162c1864fee241568c1dd25e758c129069790512a0b1d7767656168
+AUX virtualbox.desktop 244 RMD160 19cfc0639dfff1c4a0d61914776ff9b3ce9f4c6a SHA1 0a1d0d934ceabefde69e20d0fb913811e0b71fcb SHA256 b9d75d466f400258d99d8e165f9a90dae872f4b69252f41b61064f0235c1acfd
+DIST VirtualBox-1.5.2_OSE.tar.bz2 24227070 RMD160 ca9ae0ad715109835800a2258124101ada679ede SHA1 1b34ec0bd838f2b6e0c5b91b944a7b2c977f0875 SHA256 a34c3ef9d3c07bbf8fd5c1b62a7a1f05185a1760299ac99f19dd6926f1dc39bd
+EBUILD virtualbox-1.5.2.ebuild 4588 RMD160 c656bd2bc5ac337cf519c128f86a75e0b20b65f4 SHA1 57d3bec9e5de63a9d8ddd227a857cb313805da4d SHA256 0b128bf8e421deec50e8c113fea27b6e7347b911c083b5ee827343ef05ed39bd
diff --git a/app-emulation/virtualbox/files/virtualbox-1.5.2-remove-splitted-stuff.patch b/app-emulation/virtualbox/files/virtualbox-1.5.2-remove-splitted-stuff.patch
new file mode 100644
index 0000000..8b28893
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-1.5.2-remove-splitted-stuff.patch
@@ -0,0 +1,58 @@
+--- Config.kmk.orig	2007-09-05 10:17:41.000000000 +0200
++++ Config.kmk	2007-09-05 10:20:27.000000000 +0200
+@@ -134,7 +134,7 @@
+ 
+ # Build linux / win32 additions.
+ ifeq ($(BUILD_TARGET),linux)
+-  VBOX_WITH_LINUX_ADDITIONS = 1
++#  VBOX_WITH_LINUX_ADDITIONS = 1
+   VBOX_WITH_WIN32_ADDITIONS = 1
+ endif
+ ifeq ($(BUILD_TARGET),l4)
+@@ -173,7 +173,7 @@
+ VBOX_WITHOUT_IDT_PATCHING = 1
+ endif
+ # The kernel driver/module and related runtime libraries.
+-VBOX_WITH_VBOXDRV = 1
++#VBOX_WITH_VBOXDRV = 1
+ # build with secure label support
+ ifeq ($(filter win.amd64,$(BUILD_TARGET).$(BUILD_TARGET_ARCH)),) # too much work with freetype and all that.
+ VBOX_WITH_SECURELABEL = 1
+@@ -206,11 +206,11 @@
+ # Disable WINMM support for Windows (not implemented)
+ VBOX_WITH_WINMM =
+ # Enable the kchmviewer
+-VBOX_WITH_KCHMVIEWER = 1
++#VBOX_WITH_KCHMVIEWER = 1
+ # Build the testsuite.
+-VBOX_WITH_TESTSUITE = 1
++#VBOX_WITH_TESTSUITE = 1
+ # Build the testcases.
+-VBOX_WITH_TESTCASES = 1
++#VBOX_WITH_TESTCASES = 1
+ # Set this to not use COM or XPCOM in places where it can be avoided.
+ #VBOX_WITHOUT_COM = 1
+ # Set this to skip installing the redistributable compiler runtime.
+--- configure.orig	2007-09-05 10:20:35.000000000 +0200
++++ configure	2007-09-05 10:23:44.000000000 +0200
+@@ -1281,14 +1281,14 @@
+ # some things are not available in for OSE
+ if [ $OSE -ge 1 ]; then
+   cnf_append "VBOX_OSE" "1"
+-  cnf_append "VBOX_WITH_TESTSUITE" ""
++#  cnf_append "VBOX_WITH_TESTSUITE" ""
+   cnf_append "VBOX_WITH_WIN32_ADDITIONS" ""
+ 
+-  if [ "$OS" = "linux" ]; then
+-    cnf_append "VBOX_WITH_LINUX_ADDITIONS" "1"
+-  else
+-    cnf_append "VBOX_WITH_LINUX_ADDITIONS" ""
+-  fi
++#  if [ "$OS" = "linux" ]; then
++#    cnf_append "VBOX_WITH_LINUX_ADDITIONS" "1"
++#  else
++#    cnf_append "VBOX_WITH_LINUX_ADDITIONS" ""
++#  fi
+   echo >> $CNF
+ fi
+ 
diff --git a/app-emulation/virtualbox/files/virtualbox-wrapper b/app-emulation/virtualbox/files/virtualbox-wrapper
new file mode 100644
index 0000000..059a788
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-wrapper
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+INSTALL_DIR=/opt/VirtualBox
+USER=$( whoami )
+
+SERVER_PID=$( ps -U $USER | grep VBoxSVC | awk '{ print $1 }' )
+
+if [ "$1" = shutdown ]; then
+    if [ "$SERVER_PID" != "" ]; then
+        kill -TERM $SERVER_PID
+        sleep 2
+    fi
+    exit 0
+fi
+
+[ "$VBOX_USER_HOME" = "" ] && VBOX_USER_HOME="$HOME/.VirtualBox"
+
+mkdir -p "$VBOX_USER_HOME"
+LOG="$VBOX_USER_HOME/VBoxSVC.log"
+
+if [[ -e /proc/modules && ! -e /dev/vboxdrv ]] ; then
+	echo "Error: vboxdrv kernel module is not loaded..."
+	echo "Please load the module before starting VirtualBox."
+	exit 1
+elif [ ! -w /dev/vboxdrv ]; then
+	if [ "`id | grep vboxusers`" = "" ]; then
+		echo "Error: You are not a member of the \"vboxusers\" group..."
+		echo "Please add yourself to this group before starting VirtualBox."
+	else
+		echo "Error: /dev/vboxdrv is not writable for some reason..." 
+		echo "If you recently added the current user to the vboxusers group,"
+		echo "then you have to logout and re-login to take the change effect."
+	fi
+	exit 1
+fi
+
+export LD_LIBRARY_PATH="$INSTALL_DIR"
+
+if [ "$SERVER_PID" = "" ]; then
+	rm -rf /tmp/.vbox-$USER-ipc
+	[ -f "$LOG.1" ] && mv "$LOG.1" "$LOG.2"
+	[ -f "$LOG.0" ] && mv "$LOG.0" "$LOG.1"
+	[ -f "$LOG" ] && mv "$LOG" "$LOG.0"
+	/opt/VirtualBox/VBoxSVC --daemonize >"$LOG" 2>&1
+fi
+
+APP=$( which $0 )
+APP=${APP##/*/}
+case "$APP" in
+	virtualbox)
+		exec "$INSTALL_DIR/VirtualBox" "$@"
+		;;
+	vboxmanage)
+		exec "$INSTALL_DIR/VBoxManage" "$@"
+		;;
+	vboxsdl)
+		exec "$INSTALL_DIR/VBoxSDL" "$@"
+		;;
+	vboxbfe)
+		exec "$INSTALL_DIR/VBoxBFE" "$@"
+		;;
+	*)
+		echo "Error: Unknown application - $APP"
+		exit 1
+		;;
+esac
diff --git a/app-emulation/virtualbox/files/virtualbox.desktop b/app-emulation/virtualbox/files/virtualbox.desktop
new file mode 100644
index 0000000..902b45d
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=
+Name=Innotek VirtualBox
+Type=Application
+Comment=Run several virtual systems on a single host computer
+Exec=virtualbox
+TryExec=virtualbox
+Path=
+Icon=virtualbox.png
+Categories=Application;Emulator;System;
diff --git a/app-emulation/virtualbox/virtualbox-1.5.2.ebuild b/app-emulation/virtualbox/virtualbox-1.5.2.ebuild
new file mode 100644
index 0000000..7666c01
--- /dev/null
+++ b/app-emulation/virtualbox/virtualbox-1.5.2.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-1.5.0-r1.ebuild,v 1.1 2007/09/17 09:41:37 jokey Exp $
+
+inherit eutils flag-o-matic qt3 toolchain-funcs
+
+MY_P=VirtualBox-${PV}_OSE
+DESCRIPTION="Softwarefamily of powerful x86 virtualization"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="http://www.virtualbox.org/download/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="additions alsa nowrapper sdk vboxbfe"
+
+RDEPEND="!app-emulation/virtualbox-bin
+	~app-emulation/virtualbox-modules-${PV}
+	dev-libs/libIDL
+	>=dev-libs/libxslt-1.1.19
+	dev-libs/xalan-c
+	dev-libs/xerces-c
+	media-libs/libsdl
+	x11-libs/libXcursor
+	$(qt_min_version 3.3.5)
+	sys-apps/hal"
+DEPEND="${RDEPEND}
+	sys-devel/bin86
+	sys-devel/dev86
+	sys-power/iasl
+	alsa? ( >=media-libs/alsa-lib-1.0.13 )"
+RDEPEND="${RDEPEND}
+	additions? ( ~app-emulation/virtualbox-additions-${PV} )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	# The VBoxSDL frontend needs media-libs/libsdl compiled
+	# with USE flag X enabled (bug #177335)
+	if ! built_with_use media-libs/libsdl X; then
+		eerror "media-libs/libsdl was compiled without the \"X\" USE flag enabled."
+		eerror "Please re-emerge media-libs/libsdl with USE=\"X\"."
+		die "media-libs/libsdl should be compiled with the \"X\" USE flag."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Don't build vboxdrv and additions: splitted into separate ebuilds
+	epatch "${FILESDIR}/${P}-remove-splitted-stuff.patch"
+	# Don't build the Alsa audio driver and remove Alsa checks in configure
+	# when Alsa is not selected (bug #167739)
+	use alsa || epatch "${FILESDIR}/${P}-remove-alsa.patch"
+}
+
+src_compile() {
+	cd "${S}"
+
+	./configure || die "configure failed"
+	source ./env.sh
+
+	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
+	# and strip all flags
+	strip-flags
+
+	MAKE="kmk" emake TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
+		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
+		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
+		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
+		all || die "kmk failed"
+}
+
+src_install() {
+	cd "${S}"/out/linux.${ARCH}/release/bin || die
+
+	insinto /opt/VirtualBox
+	if use sdk; then
+		doins -r sdk
+		make_wrapper xpidl "sdk/bin/xpidl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+		fowners root:vboxusers /opt/VirtualBox/sdk/bin/xpidl
+		fperms 0750 /opt/VirtualBox/sdk/bin/xpidl
+	fi
+	if use vboxbfe; then
+		doins VBoxBFE
+		fowners root:vboxusers /opt/VirtualBox/VBoxBFE
+		fperms 0750 /opt/VirtualBox/VBoxBFE
+
+		if use nowrapper ; then
+			make_wrapper vboxbfe "./VBoxBFE" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+		else
+			dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxbfe || die
+		fi
+	fi
+
+	rm -rf sdk src tst* testcase VBoxBFE vditool xpidl SUPInstall SUPUninstall
+
+	doins -r *
+	for each in VBox{Manage,SDL,SVC,XPCOMIPCD} VirtualBox ; do
+		fowners root:vboxusers /opt/VirtualBox/${each}
+		fperms 0750 /opt/VirtualBox/${each}
+	done
+
+	if use nowrapper ; then
+		make_wrapper vboxsvc "./VBoxSVC" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+		make_wrapper virtualbox "./VirtualBox" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+		make_wrapper vboxmanage "./VBoxManage" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+		make_wrapper vboxsdl "./VBoxSDL" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	else
+		exeinto /opt/VirtualBox
+		newexe "${FILESDIR}/${PN}-wrapper" "wrapper.sh" || die
+		fowners root:vboxusers /opt/VirtualBox/wrapper.sh
+		fperms 0750 /opt/VirtualBox/wrapper.sh
+
+		dosym /opt/VirtualBox/wrapper.sh /usr/bin/virtualbox
+		dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxmanage
+		dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxsdl
+	fi
+
+	# desktop entry
+	newicon "${S}"/src/VBox/Frontends/VirtualBox/images/ico32x01.png \
+		${PN}.png || die
+	cp "${FILESDIR}"/${PN}.desktop "${T}"
+	sed -e "s/Version=/Version=${PV}/" -i "${T}/${PN}.desktop" || die
+	domenu "${T}/${PN}.desktop" || die
+}
+
+pkg_postinst() {
+	elog ""
+	if use nowrapper; then
+		elog "In order to launch VirtualBox you need to start the"
+		elog "VirtualBox XPCom Server first, with:"
+		elog "vboxsvc --daemonize && virtualbox"
+	else
+		elog "To launch VirtualBox just type: \"virtualbox\""
+	fi
+	elog ""
+	elog "You must be in the vboxusers group to use VirtualBox,"
+	elog "\"vditool\" is now deprecated, use \"VBoxManage\" instead."
+	elog ""
+	elog "The last user manual is available for download at:"
+	elog "http://www.virtualbox.org/download/UserManual.pdf"
+	elog ""
+}