Some minor cosmetics in the wrapper, fix desktop entry

Package-Manager: portage-2.1.3.16
RepoMan-Options: --force

7 files changed, 40 insertions, 180 deletions

diff --git a/app-emulation/virtualbox-bin/ChangeLog b/app-emulation/virtualbox-bin/ChangeLog
index 31dab28a9544..da63ddacf47c 100644
--- a/app-emulation/virtualbox-bin/ChangeLog
+++ b/app-emulation/virtualbox-bin/ChangeLog
@@ -1,6 +1,11 @@
 # 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.18 2007/10/29 13:26:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/ChangeLog,v 1.19 2007/11/03 15:17:28 jokey Exp $
+
+  03 Nov 2007; Markus Ullmann <jokey@gentoo.org>
+  files/virtualbox-bin-wrapper, -virtualbox-bin-1.4.0.ebuild,
+  -virtualbox-bin-1.5.2.ebuild, +virtualbox-bin-1.5.2-r1.ebuild:
+  Some minor cosmetics in the wrapper, fix desktop entry
 
   29 Oct 2007; Markus Meier <maekke@gentoo.org> virtualbox-bin-1.5.2.ebuild:
   x86 stable
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index 54dddcb554ae..5c74df43e8f0 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -9,40 +9,31 @@ AUX virtualbox-bin-interfaces 218 RMD160 4639b9848cf44ac59cd12585a3c56ef53d72a6d
 MD5 fd2d685f86a8c205d512940be94307ef files/virtualbox-bin-interfaces 218
 RMD160 4639b9848cf44ac59cd12585a3c56ef53d72a6d9 files/virtualbox-bin-interfaces 218
 SHA256 50ddbfedce3afd41aad45163eb799fce0956d815948ad9da842f09163aaafd52 files/virtualbox-bin-interfaces 218
-AUX virtualbox-bin-wrapper 3308 RMD160 782f2a62d189579afef89612df34800177b5ab8d SHA1 e09d66d8b8f4638158ad27761049aca1366453c5 SHA256 2a9df2cf8774a0889092e493a9ee44da729f4fcb60510209262d8e78cb47aad4
-MD5 5bdd49e27edcbcfb77450d5d1287cf44 files/virtualbox-bin-wrapper 3308
-RMD160 782f2a62d189579afef89612df34800177b5ab8d files/virtualbox-bin-wrapper 3308
-SHA256 2a9df2cf8774a0889092e493a9ee44da729f4fcb60510209262d8e78cb47aad4 files/virtualbox-bin-wrapper 3308
-DIST VirtualBox_1.4.0_Linux_amd64.run 11766998 RMD160 973378f363f251065044d5e6244fff84eef0ae69 SHA1 8e72562248bd1638e1c3883d81c2e0206e8eed2d SHA256 5fa13a82fe1cb333668e6dfa84005e78e9ac08a0bb4b68d8e053bde630345ff7
-DIST VirtualBox_1.4.0_Linux_x86.run 13631688 RMD160 2738fe9a74edac51c884ff0dba4c6d8704488dd5 SHA1 8961951d15619873a9977b296f5fb472fdf1f836 SHA256 b9e9d18e2f070fdbb769292f90171cf9e91e53f800e22683a106ad185edb774c
+AUX virtualbox-bin-wrapper 3429 RMD160 86ae316c2a4168662bfdac07eb233f4eae9d365a SHA1 3efc2c2995501ead856284399c584da5e66383b9 SHA256 b2cca8636c6b0f2489b973e656dcfeb863159479e9eac798362c90380275d304
+MD5 95cf8df11de1d1af114c75d6c7f4580e files/virtualbox-bin-wrapper 3429
+RMD160 86ae316c2a4168662bfdac07eb233f4eae9d365a files/virtualbox-bin-wrapper 3429
+SHA256 b2cca8636c6b0f2489b973e656dcfeb863159479e9eac798362c90380275d304 files/virtualbox-bin-wrapper 3429
 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
-EBUILD virtualbox-bin-1.4.0.ebuild 4063 RMD160 83ca6d627ae8325f165e61a71b7c7069752fc579 SHA1 f729bf4efdda572dff4b1b27b48bc87dbe1a70cd SHA256 ea5176b8c8e76cdb15bfe6b336082908a462f705696f7e048cf5f5c3438661a2
-MD5 52f840faf2f81eed9f55ba9c5b6ff5ce virtualbox-bin-1.4.0.ebuild 4063
-RMD160 83ca6d627ae8325f165e61a71b7c7069752fc579 virtualbox-bin-1.4.0.ebuild 4063
-SHA256 ea5176b8c8e76cdb15bfe6b336082908a462f705696f7e048cf5f5c3438661a2 virtualbox-bin-1.4.0.ebuild 4063
-EBUILD virtualbox-bin-1.5.2.ebuild 4126 RMD160 a3d42c03f4aa0c766ec3c3abdddaa3cb129e3925 SHA1 bb5fd1f1a7ffe539b6f28f6f7403435a1547f2e3 SHA256 73bed404ab6d57d339c19ed2dfe3fc3eb679841d9546da0da68606c6458d859f
-MD5 e88312eab13f3825e30af51a7ace0804 virtualbox-bin-1.5.2.ebuild 4126
-RMD160 a3d42c03f4aa0c766ec3c3abdddaa3cb129e3925 virtualbox-bin-1.5.2.ebuild 4126
-SHA256 73bed404ab6d57d339c19ed2dfe3fc3eb679841d9546da0da68606c6458d859f virtualbox-bin-1.5.2.ebuild 4126
-MISC ChangeLog 3475 RMD160 cfecbe5e62741b78acaa8327c406a593a0c24533 SHA1 3f7f0a282905a2ccb4e594034747d2e73f2ff80d SHA256 cd668f907ba39552beb5fbc4b543fec9747eed3906f4ccab8b50681cd66181c1
-MD5 abc4315d393d32eaec1caf069701de1f ChangeLog 3475
-RMD160 cfecbe5e62741b78acaa8327c406a593a0c24533 ChangeLog 3475
-SHA256 cd668f907ba39552beb5fbc4b543fec9747eed3906f4ccab8b50681cd66181c1 ChangeLog 3475
+EBUILD virtualbox-bin-1.5.2-r1.ebuild 4048 RMD160 8c85568cf48524f28f7c0efe4db5f9d049e9e711 SHA1 0f62cb691f9cfa75b10e6aaab3ea57b90ce55bc6 SHA256 333715300e2cd3a198269204b458bb0ad83b60c44e2b5fa578edb9fbc181f15f
+MD5 69d8f4ec0ee27bea03fa87ded52da152 virtualbox-bin-1.5.2-r1.ebuild 4048
+RMD160 8c85568cf48524f28f7c0efe4db5f9d049e9e711 virtualbox-bin-1.5.2-r1.ebuild 4048
+SHA256 333715300e2cd3a198269204b458bb0ad83b60c44e2b5fa578edb9fbc181f15f virtualbox-bin-1.5.2-r1.ebuild 4048
+MISC ChangeLog 3708 RMD160 ec919c1f062458177475df6ed8d0bd7ec0010f8d SHA1 5304ee0168a7fcd833fb13dfe1613228f329ceee SHA256 27059b5ce27d6611aafae7b72f0f0abea6ad06ef7e4abea02743831c7452438a
+MD5 fcb6ef53f65ccbd95b437fc58a0618d3 ChangeLog 3708
+RMD160 ec919c1f062458177475df6ed8d0bd7ec0010f8d ChangeLog 3708
+SHA256 27059b5ce27d6611aafae7b72f0f0abea6ad06ef7e4abea02743831c7452438a ChangeLog 3708
 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 d9df0fe0b1c0514407ba6ad67f34104a files/digest-virtualbox-bin-1.4.0 560
-RMD160 ec32e5ae8e937b5d0b7a8739ab0175190cbf3383 files/digest-virtualbox-bin-1.4.0 560
-SHA256 9136fe4f089052c70277b270ce9b97970512330aacd6ddc18cc06676a7b7762e files/digest-virtualbox-bin-1.4.0 560
-MD5 78029607fad2eec9e97e143df9418ab7 files/digest-virtualbox-bin-1.5.2 560
-RMD160 1325cc991acf5d578059f102985d3f686d3ad445 files/digest-virtualbox-bin-1.5.2 560
-SHA256 5b65ee084241d9ddb6918f252e11778234b874067d1c68bd9158433f898a9682 files/digest-virtualbox-bin-1.5.2 560
+MD5 78029607fad2eec9e97e143df9418ab7 files/digest-virtualbox-bin-1.5.2-r1 560
+RMD160 1325cc991acf5d578059f102985d3f686d3ad445 files/digest-virtualbox-bin-1.5.2-r1 560
+SHA256 5b65ee084241d9ddb6918f252e11778234b874067d1c68bd9158433f898a9682 files/digest-virtualbox-bin-1.5.2-r1 560
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHJd+MkKaRLQcq0GIRAsHyAKCBeUAO3rdyglqzpT/O1wg789Ud6wCfd7iO
-YHu+L71n1YuSDpRsjX2QtAo=
-=c+B0
+iD8DBQFHLJEQz974XjDVpbkRAuGaAJ9t98TnlLW/LTHsTtRT0/7XFXEQrQCfSEGM
+ctwdwOFcyEppbFNV1SfDK3Y=
+=2GnG
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.4.0 b/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.4.0
deleted file mode 100644
index 957ad7b6602e..000000000000
--- a/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.4.0
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 17003e95329ea1ee4c8b7c0ff0e2bc04 VirtualBox_1.4.0_Linux_amd64.run 11766998
-RMD160 973378f363f251065044d5e6244fff84eef0ae69 VirtualBox_1.4.0_Linux_amd64.run 11766998
-SHA256 5fa13a82fe1cb333668e6dfa84005e78e9ac08a0bb4b68d8e053bde630345ff7 VirtualBox_1.4.0_Linux_amd64.run 11766998
-MD5 d796ef14caa3e3b3be10c959a14f1634 VirtualBox_1.4.0_Linux_x86.run 13631688
-RMD160 2738fe9a74edac51c884ff0dba4c6d8704488dd5 VirtualBox_1.4.0_Linux_x86.run 13631688
-SHA256 b9e9d18e2f070fdbb769292f90171cf9e91e53f800e22683a106ad185edb774c VirtualBox_1.4.0_Linux_x86.run 13631688
diff --git a/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.5.2 b/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.5.2-r1
index f11b0b8b7c43..f11b0b8b7c43 100644
--- a/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.5.2
+++ b/app-emulation/virtualbox-bin/files/digest-virtualbox-bin-1.5.2-r1
diff --git a/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper b/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper
index 7ea5eca943b2..147edc4a2d46 100644
--- a/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper
+++ b/app-emulation/virtualbox-bin/files/virtualbox-bin-wrapper
@@ -29,17 +29,17 @@ if [ "$1" = "shutdown" ]; then
     SHUTDOWN="true"
 elif [ ! -e /lib/modules/`uname -r`/misc/vboxdrv.ko ]; then
 	cat << EOF
-WARNING: There is no module available for the currente kernel (`uname -r`).
-         Please recompile the kernel module and install it by
+WARNING: There is no module available for the current kernel (`uname -r`).
+         Please recompile the kernel module and install it by:
 	
-	 sudo emerge -1 virtualbox-modules
+	 sudo emerge -1 app-emulation/virtualbox-modules
 
 	 You will not be able to start VMs until this problem is fixed.
 EOF
 elif ! lsmod|grep -q vboxdrv; then
     cat << EOF
 WARNING: The vboxdrv kernel module is not loaded.
-         Please load the kernel by
+         Please load the kernel module by:
 
            sudo modprobe vboxdrv
 
@@ -47,27 +47,30 @@ WARNING: The vboxdrv kernel module is not loaded.
 EOF
 elif [ ! -c /dev/vboxdrv ]; then
     cat << EOF
-WARNING: The character device /dev/vboxdrv does not exist. Try
+WARNING: The character device /dev/vboxdrv does not exist.
+	 Please try to reload the kernel module by:
 
-           sudo /etc/init.d/virtualbox restart
+           sudo rmmod vboxdrv; sleep 2; sudo modprobe vboxdrv
 
-         and if that is not successful, try to re-install the package.
+         and if that is not successful, try to re-install the package by:
+
+	   sudo emerge -1 app-emulation/virtualbox-modules
 
 	 You will not be able to start VMs until this problem is fixed.
 EOF
 elif [ ! -w /dev/vboxdrv ]; then
     if [ "`id | grep vboxusers`" = "" ]; then
         cat << EOF
-WARNING: You are not a member of the "vboxusers" group.  Please add yourself
-         to this group before starting VirtualBox.
+WARNING: You are not a member of the "vboxusers" group.
+	 Please add yourself to this group before starting VirtualBox.
 
 	 You will not be able to start VMs until this problem is fixed.
 EOF
     else
         cat << EOF
-WARNING: /dev/vboxdrv not writable for some reason. If you recently added the
-         current user to the vboxusers group then you have to logout and
-	 re-login to take the change effect.
+WARNING: /dev/vboxdrv not writable for some reason.
+	 If you recently added the current user to the "vboxusers" group
+	 then you have to logout and re-login to take the change effect.
 
 	 You will not be able to start VMs until this problem is fixed.
 EOF
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-1.4.0.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-1.4.0.ebuild
deleted file mode 100644
index db5275d0c879..000000000000
--- a/app-emulation/virtualbox-bin/virtualbox-bin-1.4.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# 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.4.0.ebuild,v 1.3 2007/06/23 16:10:40 masterdriverz 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-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)
-	=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
-
-	insinto /opt/VirtualBox
-	doins UserManual.pdf
-	if use additions; then
-		doins -r additions
-	fi
-	if use sdk; then
-		doins -r sdk
-		fperms 0755 /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 LICENSE
-
-	doins -r *
-	for each in VBox{Manage,SDL,SVC,XPCOMIPCD,VRDP} VirtualBox ; do
-		fperms 0755 /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"
-		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 ""
-}
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-1.5.2.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-1.5.2-r1.ebuild
index c074ea0431af..2bf9e826b052 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-1.5.2.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-1.5.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.2 2007/10/29 13:26:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-bin/virtualbox-bin-1.5.2-r1.ebuild,v 1.1 2007/11/03 15:17:28 jokey Exp $
 
 inherit eutils qt3 pax-utils
 
@@ -78,7 +78,6 @@ src_install() {
 	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