app-emulation/virtualbox-bin: add blockers for virtualbox-additions bug #194183, remove bashism from virtualbox-bin-wrapper bug #194185

svn path=/trunk/; revision=281

6 files changed, 338 insertions, 0 deletions

diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
new file mode 100644
index 0000000..6ba0faf
--- /dev/null
+++ b/app-emulation/virtualbox-bin/ChangeLog
@@ -0,0 +1,87 @@
+# ChangeLog for app-emulation/virtualbox-bin
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.14 2007/09/17 09:48:47 jokey Exp $
+
+  01 Oct 2007; Alessio Cassibba (X-Drum) <swapon@gmail.com>
+  +virtualbox-bin-1.5.0-r1.ebuild, +files/virtualbox-bin-wrapper,
+  +metadata.xml:
+  add blockers for virtualbox-additions bug #194183, remove bashism from
+  virtualbox-bin-wrapper bug #194185
+
+*virtualbox-bin-1.5.0-r1 (17 Sep 2007)
+
+  17 Sep 2007; Markus Ullmann <jokey@gentoo.org>
+  -virtualbox-bin-1.5.0.ebuild, +virtualbox-bin-1.5.0-r1.ebuild:
+  Revbump to fix HAL mess, bug #191473
+
+*virtualbox-bin-1.5.0 (04 Sep 2007)
+
+  04 Sep 2007; Markus Ullmann <jokey@gentoo.org>
+  -virtualbox-bin-1.3.8-r1.ebuild, +virtualbox-bin-1.5.0.ebuild:
+  Version bump wrt bug #191142
+
+  23 Jun 2007; Charlie Shepherd <masterdriverz@gentoo.org>
+  virtualbox-bin-1.3.8-r1.ebuild, virtualbox-bin-1.4.0.ebuild,
+  virtualbox-bin-1.4.0-r1.ebuild:
+  Fix headers, thanks to x-drum
+
+*virtualbox-bin-1.4.0-r1 (22 Jun 2007)
+
+  22 Jun 2007; Charlie Shepherd <masterdriverz@gentoo.org>
+  virtualbox-bin-1.4.0.ebuild, +virtualbox-bin-1.4.0-r1.ebuild:
+  Port changes from jokey's overlay; thanks to x-drum: minor changes to
+  desktop entry; libstdc++-3.3 is only needed for x86 binaries, adjusted perms
+  for executables, removed unneeded files; fixed SRC_URI (bug 181161)
+
+*virtualbox-bin-1.4.0 (06 Jun 2007)
+
+  06 Jun 2007; Markus Ullmann <jokey@gentoo.org>
+  +virtualbox-bin-1.4.0.ebuild:
+  Version bump, thanks to Alessio
+
+  13 May 2007; Markus Ullmann <jokey@gentoo.org>
+  virtualbox-bin-1.3.8-r1.ebuild:
+  Fix for sdl useflag bug #177335
+
+  21 Apr 2007; Raúl Porcel <armin76@gentoo.org>
+  virtualbox-bin-1.3.8-r1.ebuild:
+  x86 stable
+
+*virtualbox-bin-1.3.8-r1 (21 Apr 2007)
+
+  21 Apr 2007; Markus Ullmann <jokey@gentoo.org>
+  -virtualbox-bin-1.3.6.ebuild, -virtualbox-bin-1.3.8.ebuild,
+  +virtualbox-bin-1.3.8-r1.ebuild:
+  PaXify bins to make hardened people happy
+
+*virtualbox-bin-1.3.8 (16 Mar 2007)
+
+  16 Mar 2007; Markus Ullmann <jokey@gentoo.org>
+  -files/virtualbox-bin-1.3.6-wrapper, +files/virtualbox-bin-wrapper,
+  -virtualbox-bin-1.3.4.ebuild, virtualbox-bin-1.3.6.ebuild,
+  +virtualbox-bin-1.3.8.ebuild:
+  Version bump
+
+  03 Mar 2007; Markus Ullmann <jokey@gentoo.org>
+  files/digest-virtualbox-bin-1.3.6, Manifest:
+  Better checksums
+
+*virtualbox-bin-1.3.6 (28 Feb 2007)
+
+  28 Feb 2007; Markus Ullmann <jokey@gentoo.org>
+  +files/virtualbox-bin-1.3.6-wrapper, +virtualbox-bin-1.3.6.ebuild:
+  Version bump, thanks to x-drum for the hard work
+
+  25 Feb 2007; <genstef@gentoo.org> virtualbox-bin-1.3.4.ebuild:
+  use KV_DIR only after linux-mod_pkg_setup, bug 168051
+
+  16 Feb 2007; Markus Ullmann <jokey@gentoo.org>
+  virtualbox-bin-1.3.4.ebuild:
+  Fix ROOT
+
+*virtualbox-bin-1.3.4 (15 Feb 2007)
+
+  15 Feb 2007; Markus Ullmann <jokey@gentoo.org> +metadata.xml,
+  +virtualbox-bin-1.3.4.ebuild:
+  Initial version, thanks to Alessio Cassibba
+
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
new file mode 100644
index 0000000..c7e6f25
--- /dev/null
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -0,0 +1,21 @@
+AUX virtualbox-bin-wrapper 1609 RMD160 8deb3202b8801d393bee24d7a9b17fbb205dc468 SHA1 b0cce7e0020571fea4bf8a75cd7ff45390d537d9 SHA256 5fdd76c791256c41b8fbdca8b5fbdc7a4a3c9af678a1e55134b2937e7354b20c
+MD5 1c350abb04320009fde27837281554d5 files/virtualbox-bin-wrapper 1609
+RMD160 8deb3202b8801d393bee24d7a9b17fbb205dc468 files/virtualbox-bin-wrapper 1609
+SHA256 5fdd76c791256c41b8fbdca8b5fbdc7a4a3c9af678a1e55134b2937e7354b20c files/virtualbox-bin-wrapper 1609
+DIST VirtualBox_1.5.0_Linux_amd64.run 13939184 RMD160 9e8e9e3b5fa4dbefa1c65001c08c06b51e4aaafa SHA1 01fc52e8aa84d8d6fae6e7e38076938df8756909 SHA256 7b5c1774a3f2536a00805f6a8baf53b41eb9a5917090618b52c7942eec655d3d
+DIST VirtualBox_1.5.0_Linux_x86.run 15491060 RMD160 33ede7cd5e3f7697ccc2f2b1f11053af5bf95a74 SHA1 fab4722e2add0a8492624f4f08685dfd1d378a1a SHA256 74a5f34772f826761bf5ca24f3b20a5b0ceb8bdf9602bb4bfba91c05fce0c232
+EBUILD virtualbox-bin-1.5.0-r1.ebuild 4606 RMD160 89abd394032c3b52e890020841b19a29f2d99c1f SHA1 f3db66c7168ae37e0c2e03fdce5f0a77e273c972 SHA256 728608906729e46aed9bc5aa57f53bb3683f6ef2c4bf40979a47cee17cb57243
+MD5 37ee6a6cff45e0e211e790e6cd7d0f38 virtualbox-bin-1.5.0-r1.ebuild 4606
+RMD160 89abd394032c3b52e890020841b19a29f2d99c1f virtualbox-bin-1.5.0-r1.ebuild 4606
+SHA256 728608906729e46aed9bc5aa57f53bb3683f6ef2c4bf40979a47cee17cb57243 virtualbox-bin-1.5.0-r1.ebuild 4606
+MISC ChangeLog 3015 RMD160 eb298379bdcdac119386fca748e4cfacfe3f207f SHA1 442a046301fb18feb09bf6a929849b79869c5564 SHA256 df90a395081456e5cf2f7e08935b6c8a80041e9f77f44fddb4c3a16b2434a21d
+MD5 49d7b85f23743a10fad0bd6b91892106 ChangeLog 3015
+RMD160 eb298379bdcdac119386fca748e4cfacfe3f207f ChangeLog 3015
+SHA256 df90a395081456e5cf2f7e08935b6c8a80041e9f77f44fddb4c3a16b2434a21d ChangeLog 3015
+MISC metadata.xml 344 RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e SHA1 68b99919921f246738cce4350b77d895e7c78106 SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9
+MD5 688de6c9943189afc4fa3ab510813dbd metadata.xml 344
+RMD160 12935d5b21be85bc4222fd06371c93dcbf6f534e metadata.xml 344
+SHA256 fff5aeb6f453d2e137765ca5016e81344cb0cd0cecd51d81bbb889cb1d7a5ba9 metadata.xml 344
+MD5 f4d77272b9adefab6b0021cc05872d3d files/digest-virtualbox-bin-1.5.0-r1 560
+RMD160 b23bb4622d1c26f2c620b4a61e230254f47699f0 files/digest-virtualbox-bin-1.5.0-r1 560
+SHA256 8363a04f1d39c9e75c05c16cb92c07bbef7475635af0d9a6789937ac3ccae0e7 files/digest-virtualbox-bin-1.5.0-r1 560
diff --git a/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.5.0-r1 b/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.5.0-r1
new file mode 100644
index 0000000..0290a2f
--- /dev/null
+++ b/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.5.0-r1
@@ -0,0 +1,6 @@
+MD5 f58939a54bff98afa1decf30385750b7 VirtualBox_1.5.0_Linux_amd64.run 13939184
+RMD160 9e8e9e3b5fa4dbefa1c65001c08c06b51e4aaafa VirtualBox_1.5.0_Linux_amd64.run 13939184
+SHA256 7b5c1774a3f2536a00805f6a8baf53b41eb9a5917090618b52c7942eec655d3d VirtualBox_1.5.0_Linux_amd64.run 13939184
+MD5 1107980b50b473406cee12ada89ab4f8 VirtualBox_1.5.0_Linux_x86.run 15491060
+RMD160 33ede7cd5e3f7697ccc2f2b1f11053af5bf95a74 VirtualBox_1.5.0_Linux_x86.run 15491060
+SHA256 74a5f34772f826761bf5ca24f3b20a5b0ceb8bdf9602bb4bfba91c05fce0c232 VirtualBox_1.5.0_Linux_x86.run 15491060
diff --git a/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper b/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper
new file mode 100644
index 0000000..f92b67f
--- /dev/null
+++ b/app-emulation/virtualbox-bin/files/virtualbox-bin-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
+
+[ -z "$VBOX_USER_HOME" ] && VBOX_USER_HOME="$HOME/.VirtualBox"
+
+mkdir -p "$VBOX_USER_HOME"
+LOG="$VBOX_USER_HOME/VBoxSVC.log"
+
+if [ -e /proc/modules -a ! -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 [ -z "$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=$( command -v "$0" )
+APP=${APP##/*/}
+case "$APP" in
+	virtualbox)
+		exec "$INSTALL_DIR/VirtualBox" "$@"
+		;;
+	vboxmanage)
+		exec "$INSTALL_DIR/VBoxManage" "$@"
+		;;
+	vboxsdl)
+		exec "$INSTALL_DIR/VBoxSDL" "$@"
+		;;
+	vboxvrdp)
+		exec "$INSTALL_DIR/VBoxVRDP" "$@"
+		;;
+	*)
+		echo "Error: Unknown application - $APP"
+		exit 1
+		;;
+esac
diff --git a/app-emulation/virtualbox-bin/metadata.xml b/app-emulation/virtualbox-bin/metadata.xml
new file mode 100644
index 0000000..76eddd3
--- /dev/null
+++ b/app-emulation/virtualbox-bin/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>jokey@gentoo.org</email>
+  <name>Markus Ullmann</name>
+</maintainer>
+<maintainer>
+  <email>swapon@gmail.com</email>
+  <name>Alessio Cassibba</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-1.5.0-r1.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-1.5.0-r1.ebuild
new file mode 100644
index 0000000..dabf8e3
--- /dev/null
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-1.5.0-r1.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-bin/virtualbox-bin-1.5.0-r1.ebuild,v 1.1 2007/09/17 09:48:47 jokey Exp $
+
+inherit eutils qt3 pax-utils
+
+MY_P=VirtualBox_${PV}_Linux_${ARCH}.run
+
+DESCRIPTION="Softwarefamily of powerful x86 virtualization"
+HOMEPAGE="http://www.virtualbox.org/"
+SRC_URI="amd64? ( http://www.virtualbox.org/download/${PV}/VirtualBox_${PV}_Linux_amd64.run )
+	x86? ( http://www.virtualbox.org/download/${PV}/VirtualBox_${PV}_Linux_x86.run )"
+
+LICENSE="PUEL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="additions nowrapper sdk"
+
+RDEPEND="!app-emulation/virtualbox
+	!app-emulation/virtualbox-additions
+	~app-emulation/virtualbox-modules-${PV}
+	virtual/xft
+	x11-libs/libXi
+	x11-libs/libX11
+	x11-libs/libXft
+	x11-libs/libXtst
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXrender
+	x11-libs/libXrandr
+	x11-libs/libXau
+	x11-libs/libXcursor
+	x11-libs/libXdmcp
+	x11-libs/libXfixes
+	dev-libs/libxml2
+	media-libs/libsdl
+	media-libs/libmng
+	media-libs/jpeg
+	media-libs/libpng
+	media-libs/freetype
+	media-libs/fontconfig
+	$(qt_min_version 3.3.5)
+	x86? ( =virtual/libstdc++-3.3 )
+	sdk? ( dev-libs/libIDL )"
+
+S=${WORKDIR}
+
+RESTRICT="primaryuri"
+
+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
+
+	check_license
+}
+
+src_unpack() {
+	unpack_makeself ${MY_P}
+	unpack ./VirtualBox.tar.bz2
+}
+
+src_install() {
+	cd "${S}"
+
+	# desktop entry
+	insinto /usr/share/pixmaps
+	newins VBox.png virtualbox.png
+	insinto /usr/share/applications
+	newins VirtualBox.desktop virtualbox.desktop
+	dosed -e "10d" /usr/share/applications/virtualbox.desktop
+	dosed -e "5d" /usr/share/applications/virtualbox.desktop
+	dosed -e "s/VirtualBox/virtualbox/" /usr/share/applications/virtualbox.desktop
+	dosed -e "s/VBox.png/virtualbox.png/" /usr/share/applications/virtualbox.desktop
+	dosed -e "s/innotek virtualbox/Innotek VirtualBox/" /usr/share/applications/virtualbox.desktop
+	dosed -e "s/X-MandrivaLinux-System;//" /usr/share/applications/virtualbox.desktop
+
+	insinto /opt/VirtualBox
+
+	doins UserManual.pdf
+
+	make_wrapper vboxtunctl "./VBoxTunctl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+
+	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
+		make_wrapper xpidl "sdk/bin/xpidl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	fi
+
+	rm -rf src sdk tst* UserManual.pdf rdesktop-vrdp.tar.gz deffiles install.sh \
+	routines.sh runlevel.sh vboxdrv.sh VBox.sh VBox.png kchmviewer additions \
+	VirtualBox.desktop VirtualBox.chm VirtualBox.tar.bz2 vditool VBoxAddIF.sh \
+	vboxnet.sh LICENSE
+
+	doins -r *
+	for each in VBox{Manage,SDL,SVC,XPCOMIPCD,VRDP,Tunctl} VirtualBox ; do
+		fowners root:vboxusers /opt/VirtualBox/${each}
+		fperms 0750 /opt/VirtualBox/${each}
+		pax-mark -m "${D}"/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"
+		make_wrapper vboxvrdp "./VBoxVRDP" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
+	else
+		exeinto /opt/VirtualBox
+		newexe "${FILESDIR}/${PN}-wrapper" "wrapper.sh"
+		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
+		dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxvrdp
+	fi
+}
+
+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 ""
+}