copy changes from jokey's overlay to the tree as jokey requested

Package-Manager: portage-2.1.5.5

6 files changed, 240 insertions, 4 deletions

diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index e1b4fdd64a34..f3cbf944bec7 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.25 2008/05/14 08:14:46 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.26 2008/06/13 22:44:27 cardoe Exp $
+
+*virtualbox-bin-1.6.2 (13 Jun 2008)
+
+  13 Jun 2008; Doug Goldstein <cardoe@gentoo.org> +files/vboxwebsrv-confd,
+  +files/vboxwebsrv-initd, files/virtualbox-bin.desktop,
+  files/virtualbox-bin-wrapper, +virtualbox-bin-1.6.2.ebuild:
+  copy changes from jokey's overlay to the tree as jokey requested
 
   14 May 2008; Peter Volkov <pva@gentoo.org> virtualbox-bin-1.5.4.ebuild,
   virtualbox-bin-1.5.6.ebuild:
diff --git a/app-emulation/virtualbox-bin/files/vboxwebsrv-confd b/app-emulation/virtualbox-bin/files/vboxwebsrv-confd
new file mode 100644
index 000000000000..461add2aa1ac
--- /dev/null
+++ b/app-emulation/virtualbox-bin/files/vboxwebsrv-confd
@@ -0,0 +1,18 @@
+# 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 $
+
+# The host to bind to (defaults to "localhost").
+VBOXWEBSRV_HOST="localhost"
+
+# Which port to on the host (defaults to 18083).
+VBOXWEBSRV_PORT="18083"
+
+# Session timeout, in seconds. (defaults to 20).
+VBOXWEBSRV_TIMEOUT=20
+
+# The interval in which the webservice checks for 
+# timed-out clients, in seconds. Normally does not
+# need to be changed (defaults to 5).
+VBOXWEBSRV_INTERVAL=5
+
diff --git a/app-emulation/virtualbox-bin/files/vboxwebsrv-initd b/app-emulation/virtualbox-bin/files/vboxwebsrv-initd
new file mode 100644
index 000000000000..c880aba5210e
--- /dev/null
+++ b/app-emulation/virtualbox-bin/files/vboxwebsrv-initd
@@ -0,0 +1,33 @@
+#!/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 $
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ -z "${RDATE_SERVER}" ] ; then
+		eerror "Please edit /etc/conf.d/rdate"
+		eerror "I need to know what server to use!"
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	#checkconfig || return $?
+
+	ebegin "Starting VirtualBox WebService"
+	start-stop-daemon --start --quiet --pidfile /var/run/vboxwebsrv.pid \
+		--background --make-pidfile --exec /usr/bin/vboxwebsrv \
+		-- -H ${VBOXWEBSRV_HOST} -p ${VBOXWEBSRV_PORT} -t ${VBOXWEBSRV_TIMEOUT} -i ${VBOXWEBSRV_INTERVAL}
+	eend $?
+}
+
+stop() {
+        ebegin "Stopping VirtualBox WebService"
+        start-stop-daemon --stop --quiet --pidfile /var/run/vboxwebsrv.pid
+        eend $?
+}
diff --git a/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper b/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper
index 147edc4a2d46..d88bec3ef1a2 100644
--- a/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper
+++ b/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper
@@ -110,8 +110,11 @@ case "$APP" in
   VBoxSDL)
     exec "$INSTALL_DIR/VBoxSDL" "$@"
   ;;
-  VBoxVRDP)
-    exec "$INSTALL_DIR/VBoxVRDP" "$@"
+  VBoxHeadless)
+    exec "$INSTALL_DIR/VBoxHeadless" "$@"
+  ;;
+  vboxwebsrv)
+    exec "$INSTALL_DIR/vboxwebsrv" "$@"
   ;;
   *)
     echo "Unknown application - $APP"
diff --git a/app-emulation/virtualbox-bin/files/virtualbox-bin.desktop b/app-emulation/virtualbox-bin/files/virtualbox-bin.desktop
index 1f009e95530d..5aa492552507 100644
--- a/app-emulation/virtualbox-bin/files/virtualbox-bin.desktop
+++ b/app-emulation/virtualbox-bin/files/virtualbox-bin.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=Innotek VirtualBox
+Name=Sun xVM VirtualBox
 Type=Application
 Comment=Run several virtual systems on a single host computer
 Exec=VirtualBox
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-1.6.2.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-1.6.2.ebuild
new file mode 100644
index 000000000000..48e428b37c81
--- /dev/null
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-1.6.2.ebuild
@@ -0,0 +1,175 @@
+# 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.2.ebuild,v 1.1 2008/06/13 22:44:27 cardoe Exp $
+
+inherit eutils fdo-mime qt3 pax-utils
+
+MY_P=VirtualBox-${PV}-Linux
+
+DESCRIPTION="Softwarefamily of powerful x86 virtualization"
+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? (
+		$(qt_min_version 3.3.5)
+		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 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
+
+	check_license
+}
+
+src_unpack() {
+	sh "${DISTDIR}/${A}" --keep --noexec
+	unpack ./install/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 *
+
+	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/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 ""
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}