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

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

6 files changed, 235 insertions, 24 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/Manifest b/app-emulation/virtualbox-bin/Manifest
index 6a70f5ce410f..1b2cb2974b7b 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -1,11 +1,16 @@
-AUX vboxwebsrv-confd 621 RMD160 1418c29b163fbec787fc253c3254e85b198411f0 SHA1 d9d250a78c9735fd70a54bf54c379ffcbb5d4828 SHA256 2c15ccb6e6032cfae69db26928007d8d96ec1c1a8fe5ba0a8502f5cefe080063
-AUX vboxwebsrv-initd 914 RMD160 9ab70364b4cb847ec43c9435cb37a663c3627f89 SHA1 ec6adb93fb56285eee06ab5482f419b899ff58da SHA256 62eeedb05e01bb4849e4e58661fd2fcb5dd309be5290127f6ea28f81dcd74a80
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX vboxwebsrv-confd 620 RMD160 7a4ecbd895da0d5851f1a3afda54b3e2bb4012e1 SHA1 651f7b2588a16317f59d692e087b347aadd20aab SHA256 5ea07fcb6e5253cd013bb0277603cba17ca45d96044740172987c0b452f4324a
+AUX vboxwebsrv-initd 913 RMD160 b3a25666b5e9fa293339facfaf1598e68e5f64b0 SHA1 024f5ea55edeeca2d7cf7123c9415dd8dd3b976d SHA256 b04d531d63d7ab7909fc66ac969435dbc1276af65c5a362ebda56caf9f197a47
 AUX virtualbox-bin-config 28 RMD160 c03986f0a6ecc77c2d15382d965952bb209ae534 SHA1 43b5fd213ae08bb390ec1962ee2776d4f7fe45fd SHA256 5326f7abdd1a7c8a8a44fd4ab269977ec115286059fc8a4c2fde6805c381236f
 AUX virtualbox-bin-interfaces 218 RMD160 4639b9848cf44ac59cd12585a3c56ef53d72a6d9 SHA1 3268e5759286bdff1c5242598266e6c2a5b17e5d SHA256 50ddbfedce3afd41aad45163eb799fce0956d815948ad9da842f09163aaafd52
-AUX virtualbox-bin-wrapper 3496 RMD160 36bb73d4a52cee8cb3b17e2f93bc4dc4355e8979 SHA1 750fe97fa5aece70e6bc9ef73afd5409587c1009 SHA256 a604086cb6b269b31c098d1b6e234766343d468cb392f9efc7209fcb714739a6
+AUX virtualbox-bin-wrapper 3807 RMD160 8b6b6cdaaef0a49460af30103c9bdb0f59b0288d SHA1 4531eb5a0ead8c8f645870bdab6c738919463b2b SHA256 18a028fd02a971d7273020c2f5a75db441f93798a84a264d5b8a9c21996643c2
 AUX virtualbox-bin.desktop 198 RMD160 0e99c539851ee91ba909f1a2ba9259eac032fb07 SHA1 39cabeecd1e635f7a8f47f35303ddf3a45f66b9d SHA256 fdfbaf10c0ff7a9a3811ec2b1fb8fbc8bfe9b6706a3eb55b31ccc3943672a033
 DIST VirtualBox-1.6.2-Linux_amd64.run 22004296 RMD160 7b54bacbab46fc4ef9e944f22ad92ab8aeb1a6d6 SHA1 260decf3db9b2cb565588530b19854f39981d30d SHA256 6648c448939a908c219855888c35133088d08e1219d2f7b4c31bf5757f00533a
 DIST VirtualBox-1.6.2-Linux_x86.run 21451307 RMD160 4d9daa3236f776e8c7409aaccd5d8aed3c4a498c SHA1 191b7bb89165dd882295630582a04bc6860352cc SHA256 9db07a43b9c2235b2abf3bb6ede56feda9d9d282d7a6724d38eef1989ede335c
+DIST VirtualBox-1.6.4-Linux_amd64.run 22096469 RMD160 7c0a7df62ec0ce7d90684ec930f2c32f10d4eb51 SHA1 92fba77dab56ed5613893a6d8a74f9a48d73ea56 SHA256 a01ca85bee3273cf083dd63834881dbfb958c0962f5fab3e9ebfdb314f61dcb4
+DIST VirtualBox-1.6.4-Linux_x86.run 21533241 RMD160 fc6fc97f9b97e3a76a720430c87cab05721d79b1 SHA1 4fd99774f54d9a101366f610cee8bbbb2c8eb3ad SHA256 a063b3f237ea4f88d46c3144991b027531f5ba48592ac279ac7d3ec6bd1f5378
 DIST VirtualBox_1.5.2_Linux_amd64.run 16563190 RMD160 0e97a0f3175b57140743fb961215ccec651edc33 SHA1 1f3aadadbc47b427fce447f32b71cdc3cdbdf9ab SHA256 b7290b1df17d9011901b64ed3bf697bc8bdc71a762bdd0c12ef18dd7685ec5b8
 DIST VirtualBox_1.5.2_Linux_x86.run 15946150 RMD160 c8373044892a1b4b036ae3bb0460c03d0c5c9078 SHA1 4b79800d41da5c6bac109a617ce0da1a89c9cb22 SHA256 f1e0b3de29e39f0bdfd8697ee3409b5274fe8afd61b3c93c668c835409aaa6a7
 DIST VirtualBox_1.5.4_Linux_amd64.run 17118151 RMD160 49e688315ab7f4964eb22720f21fed7f72f68a59 SHA1 d42e591feb19685b3e84fb19b842c10a91c48bd2 SHA256 db3b64235dd90a7853ad73be788e418a91c353b247ba3608807d4a281cae0361
@@ -16,5 +21,13 @@ EBUILD virtualbox-bin-1.5.2-r1.ebuild 4046 RMD160 efe7d1e7112ce858e152618eb8035f
 EBUILD virtualbox-bin-1.5.4.ebuild 3841 RMD160 881481e2ddbb4241b13faaada3adbbdbcbdad227 SHA1 3fee520e111b9064874c10222106393fe60b57f1 SHA256 dc5ca0331b67c975719b2cfb7d7899a7a54296ccb9c2de9b6f24dca9706c5d8f
 EBUILD virtualbox-bin-1.5.6.ebuild 3850 RMD160 7e21772cccf32fcba4c077e86fc6ede93c4e6e10 SHA1 2338e43f618e41a3102ac3a8619d3ad8355f5afb SHA256 8e63e5129f9693f4bf22904a85d52085e9bfe6605bdb2ad41dceefbe017d7660
 EBUILD virtualbox-bin-1.6.2.ebuild 4927 RMD160 913add73c9d73cba146792cfa2aff03998b25419 SHA1 ef575d1b396c839d4d589ac6c3698dfdd6058a9c SHA256 eddf9b797e7dd9ca1f5e14170965bd8e9551a0a809a9115e4fe41adc807b107c
-MISC ChangeLog 5493 RMD160 0587f67ad1f60cdc0211a5cbff8a0967f68717e2 SHA1 5c0a014fb5861e019c6a664f711bd7909cbb1d93 SHA256 b24b9626e70a67cd0d7f3245c6f8a6b410a80df7b3a0dc635ec2d894af3f8321
+EBUILD virtualbox-bin-1.6.4.ebuild 5228 RMD160 e472ff9e87a3a6f7ce29e3cc349b7ecbd0fe575f SHA1 fb8dec73c8c011e2f73970768932eb17cd16ccd0 SHA256 d26ab842eee0d16803d1983d0e515a3fb560df0e5fe04656ebf8b49143556dd4
+MISC ChangeLog 5760 RMD160 3025d1807d30e4257d44bd10f7634ead5f62fe87 SHA1 505960aa9fd2679126a00ace7c5f36f9733717fa SHA256 1626d2b1963bdfaac73e91685dbb5d98ff19c5d05c3c51ac29067c86e75a68bc
 MISC metadata.xml 674 RMD160 227ce8924ca2756736cafabca6db6d392045c046 SHA1 39897f3c50ad79428f105790727cdd1c8b9a2d33 SHA256 4a6a5fb269164b795ab5927c44408e3f7a18822df080ee989071d834f5bfd54b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkie/XwACgkQz974XjDVpbnNhACguM1OFNqpecbxYhGvl34XZU7s
+B0MAoKKOSN364i9JrcIN7+19sBWZJFcZ
+=U2j7
+-----END PGP SIGNATURE-----
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
+}