Add version bump and some improvements from SpanKY wrt bug #233683

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

5 files changed, 218 insertions, 20 deletions

diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index c26692ac324e..713efadc2492 100644
--- a/app-emulation/virtualbox-bin/ChangeLog
+++ b/app-emulation/virtualbox-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/virtualbox-bin
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.29 2008/07/29 07:02:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.30 2008/08/10 14:38:45 jokey Exp $
+
+*virtualbox-bin-1.6.4 (10 Aug 2008)
+
+  10 Aug 2008; Markus Ullmann <jokey@gentoo.org> files/vboxwebsrv-confd,
+  files/vboxwebsrv-initd, files/virtualbox-bin-wrapper,
+  +virtualbox-bin-1.6.4.ebuild:
+  Add version bump and some improvements from SpanKY wrt bug #233683
 
   29 Jul 2008; Mike Frysinger <vapier@gentoo.org>
   virtualbox-bin-1.6.2.ebuild:
diff --git a/app-emulation/virtualbox-bin/files/vboxwebsrv-confd b/app-emulation/virtualbox-bin/files/vboxwebsrv-confd
index 461add2aa1ac..5ca18d55f74f 100644
--- a/app-emulation/virtualbox-bin/files/vboxwebsrv-confd
+++ b/app-emulation/virtualbox-bin/files/vboxwebsrv-confd
@@ -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-bin/files/vboxwebsrv-confd,v 1.1 2008/06/13 22:44:28 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/files/vboxwebsrv-confd,v 1.2 2008/08/10 14:38:45 jokey Exp $
 
 # The host to bind to (defaults to "localhost").
 VBOXWEBSRV_HOST="localhost"
diff --git a/app-emulation/virtualbox-bin/files/vboxwebsrv-initd b/app-emulation/virtualbox-bin/files/vboxwebsrv-initd
index c880aba5210e..03648489593d 100644
--- a/app-emulation/virtualbox-bin/files/vboxwebsrv-initd
+++ b/app-emulation/virtualbox-bin/files/vboxwebsrv-initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/files/vboxwebsrv-initd,v 1.1 2008/06/13 22:44:28 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/files/vboxwebsrv-initd,v 1.2 2008/08/10 14:38:45 jokey Exp $
 
 depend() {
 	need net
diff --git a/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper b/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper
index d88bec3ef1a2..38f1838d3eb0 100644
--- a/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper
+++ b/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper
@@ -1,16 +1,21 @@
 #!/bin/sh
 #
-# innotek VirtualBox
+# Sun xVM VirtualBox
+#
+# 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.
 #
-#  Copyright (C) 2006-2007 innotek GmbH
-# 
-#  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.
 
 PATH="/usr/bin:/bin:/usr/sbin:/sbin"
 CONFIG="/etc/vbox/vbox.cfg"
@@ -19,7 +24,7 @@ if [ ! -r "$CONFIG" ]; then
     echo "Could not find VirtualBox installation. Please reinstall."
     exit 1
 fi
-	
+
 . "$CONFIG"
 
 # Note: This script must not fail if the module was not successfully installed
@@ -78,6 +83,7 @@ EOF
 fi
 
 export LD_LIBRARY_PATH="$INSTALL_DIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+export VBOX_LOG_DEST="nofile"
 
 SERVER_PID=`ps -U \`whoami\` | grep VBoxSVC | awk '{ print $1 }'`
 if [ -z "$SERVER_PID" ]; then
@@ -99,24 +105,28 @@ if [ "$SHUTDOWN" = "true" ]; then
 fi
 
 APP=`which $0`
+APP=`basename $APP`
 APP=${APP##/*/}
 case "$APP" in
   VirtualBox)
     exec "$INSTALL_DIR/VirtualBox" "$@"
-  ;;
+    ;;
   VBoxManage)
     exec "$INSTALL_DIR/VBoxManage" "$@"
-  ;;
+    ;;
   VBoxSDL)
     exec "$INSTALL_DIR/VBoxSDL" "$@"
-  ;;
+    ;;
+  VBoxVRDP)
+    exec "$INSTALL_DIR/VBoxHeadless" "$@"
+    ;;
   VBoxHeadless)
     exec "$INSTALL_DIR/VBoxHeadless" "$@"
-  ;;
+    ;;
   vboxwebsrv)
     exec "$INSTALL_DIR/vboxwebsrv" "$@"
-  ;;
+    ;;
   *)
     echo "Unknown application - $APP"
-  ;;
+    ;;
 esac
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-1.6.4.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-1.6.4.ebuild
new file mode 100644
index 000000000000..e50f2d27a999
--- /dev/null
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-1.6.4.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-1.6.4.ebuild,v 1.1 2008/08/10 14:38:45 jokey Exp $
+
+EAPI=1
+
+inherit eutils fdo-mime qt3 pax-utils
+
+MY_P=VirtualBox-${PV}-Linux
+
+DESCRIPTION="family of powerful x86 virtualization products for enterprise as well as home use"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="amd64? ( ${MY_P}_amd64.run )
+	x86? ( ${MY_P}_x86.run )"
+
+LICENSE="PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="additions headless sdk vboxwebsrv"
+
+RDEPEND="!app-emulation/virtualbox
+	!app-emulation/virtualbox-additions
+	>=app-emulation/virtualbox-modules-${PV}
+	!headless? (
+		x11-libs/qt:3
+		x11-libs/libXcursor
+		media-libs/libsdl
+		x11-libs/libXrender
+		x11-libs/libXfixes
+		media-libs/libmng
+		media-libs/jpeg
+		media-libs/libpng
+		x11-libs/libXi
+		x11-libs/libXrandr
+		x11-libs/libXinerama
+		virtual/xft
+		x11-libs/libXft
+		media-libs/freetype
+		media-libs/fontconfig
+		x11-libs/libXext )
+	x11-libs/libXt
+	dev-libs/libxml2
+	x11-libs/libXau
+	x11-libs/libX11
+	x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libXdmcp
+	sys-apps/usermode-utilities
+	net-misc/bridge-utils
+	x86? ( =virtual/libstdc++-3.3 )
+	sdk? ( dev-libs/libIDL )"
+
+S=${WORKDIR}
+
+RESTRICT="fetch"
+
+pkg_nofetch() {
+	elog "Please download the package from the site:"
+	elog "https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_SMI-Site/en_US/-/USD/ViewProductDetail-Start?ProductRef=innotek-1.6-G-F@CDS-CDS_SMI"
+	if use amd64 ; then
+		elog "select \"Linux (AMD64)\" and download \"${MY_P}_amd64.run\""
+	else
+		elog "select \"Linux i386\" and download \"${MY_P}_x86.run\""
+	fi
+	elog "then put this file in ${DISTDIR}"
+}
+
+pkg_setup() {
+	# The VBoxSDL frontend needs media-libs/libsdl compiled
+	# with USE flag X enabled (bug #177335)
+	if ! use headless ; then
+		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
+	fi
+}
+
+src_unpack() {
+	unpack_makeself
+	unpack ./VirtualBox.tar.bz2
+}
+
+src_install() {
+	if ! use headless ; then
+		newicon VBox.png virtualbox.png
+		newmenu "${FILESDIR}"/${PN}.desktop virtualbox.desktop
+	fi
+
+	# create virtualbox configurations files
+	insinto /etc/vbox
+	newins "${FILESDIR}/${PN}-config" vbox.cfg
+	newins "${FILESDIR}/${PN}-interfaces" interfaces
+
+	insinto /opt/VirtualBox
+	doins UserManual.pdf
+
+	if use additions; then
+		doins -r additions
+	fi
+	if use sdk; then
+		doins -r sdk
+		fowners root:vboxusers /opt/VirtualBox/sdk/bin/xpidl
+		fperms 0750 /opt/VirtualBox/sdk/bin/xpidl
+		pax-mark -m "${D}"/opt/VirtualBox/sdk/bin/xpidl
+	fi
+	if use vboxwebsrv; then
+		doins vboxwebsrv
+		fowners root:vboxusers /opt/VirtualBox/vboxwebsrv
+		fperms 0750 /opt/VirtualBox/vboxwebsrv
+		newinitd "${FILESDIR}"/vboxwebsrv-initd vboxwebsrv
+		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
+	fi
+
+	rm -rf src sdk tst* rdesktop-vrdp.tar.gz deffiles install* routines.sh \
+		runlevel.sh vboxdrv.sh VBox.sh VBox.png kchmviewer additions VirtualBox.desktop \
+		VirtualBox.tar.bz2 vboxnet.sh LICENSE VBoxSysInfo.sh rdesktop* vboxwebsrv webtest
+
+	if use headless ; then
+		rm -rf VBoxSDL VirtualBox VBoxKeyboard.so VirtualBoxAPI.chm \
+			VirtualBox.chm
+	fi
+
+	doins -r * || die
+
+	if ! use headless ; then
+		for each in VBox{Manage,SDL,SVC,XPCOMIPCD,Tunctl,Headless} VirtualBox; do
+			fowners root:vboxusers /opt/VirtualBox/${each}
+			fperms 0750 /opt/VirtualBox/${each}
+			pax-mark -m "${D}"/opt/VirtualBox/${each}
+		done
+
+		dosym /opt/VirtualBox/VBox.sh /usr/bin/VirtualBox
+		dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxSDL
+	else
+		for each in VBox{Manage,SVC,XPCOMIPCD,Tunctl,Headless} ; do
+			fowners root:vboxusers /opt/VirtualBox/${each}
+			fperms 0750 /opt/VirtualBox/${each}
+			pax-mark -m "${D}"/opt/VirtualBox/${each}
+		done
+	fi
+
+	exeinto /opt/VirtualBox
+	newexe "${FILESDIR}/${PN}-wrapper" "VBox.sh" || die
+	fowners root:vboxusers /opt/VirtualBox/VBox.sh
+	fperms 0750 /opt/VirtualBox/VBox.sh
+	fowners root:vboxusers /opt/VirtualBox/VBoxAddIF.sh
+	fperms 0750 /opt/VirtualBox/VBoxAddIF.sh
+
+	dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxManage
+	dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxVRDP
+	dosym /opt/VirtualBox/VBox.sh /usr/bin/VBoxHeadless
+	dosym /opt/VirtualBox/VBoxTunctl /usr/bin/VBoxTunctl
+	dosym /opt/VirtualBox/VBoxAddIF.sh /usr/bin/VBoxAddIF
+	dosym /opt/VirtualBox/VBoxAddIF.sh /usr/bin/VBoxDeleteIF
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	elog ""
+	if ! use headless ; then
+		elog "To launch VirtualBox just type: \"VirtualBox\""
+		elog ""
+		elog "In order to use the online help, create a link"
+		elog "to your favourite chm viewer, for example:"
+		elog "ln -s /usr/bin/kchmviewer /opt/VirtualBox/kchmviewer"
+		elog ""
+	fi
+	elog "You must be in the vboxusers group to use VirtualBox"
+	elog ""
+	elog "Warning:"
+	elog "Due to a bug which can cause a large amount of logging"
+	elog "data to be written to your home directory, logging is"
+	elog "disabled by default in this release, see bug #233683"
+	elog ""
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}