Some minor cosmetics in the wrapper, fix desktop entry

(Portage version: 2.1.3.16, RepoMan options: --force)

6 files changed, 22 insertions, 153 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/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