Fix desktop entry for bug #196832, typo in wrapper and HAL warning. Thanks to Alessio for providing needed modifications

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

6 files changed, 40 insertions, 171 deletions

diff --git a/app-emulation/virtualbox/ChangeLog b/app-emulation/virtualbox/ChangeLog
index 3e82e1fe3dcf..c106c848c03f 100644
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/virtualbox
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.28 2007/10/29 06:27:32 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.29 2007/11/03 15:08:51 jokey Exp $
+
+*virtualbox-1.5.2-r1 (03 Nov 2007)
+
+  03 Nov 2007; Markus Ullmann <jokey@gentoo.org> files/virtualbox-wrapper,
+  -virtualbox-1.4.0.ebuild, -virtualbox-1.5.2.ebuild,
+  +virtualbox-1.5.2-r1.ebuild:
+  Fix desktop entry for bug #196832, typo in wrapper and HAL warning. Thanks
+  to Alessio for providing needed modifications
 
   29 Oct 2007; Dawid Węgliński <cla@gentoo.org> virtualbox-1.5.2.ebuild:
   Stable on x86
diff --git a/app-emulation/virtualbox/files/digest-virtualbox-1.4.0 b/app-emulation/virtualbox/files/digest-virtualbox-1.4.0
deleted file mode 100644
index dbee8ac1a533..000000000000
--- a/app-emulation/virtualbox/files/digest-virtualbox-1.4.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8e89d32a67a3a39271f44039d0583a16 VirtualBox-OSE-1.4.0.tar.bz2 21720127
-RMD160 60a445f8ee68b834f19d8004c329e0aed426a15b VirtualBox-OSE-1.4.0.tar.bz2 21720127
-SHA256 32307799f1d03fd9e87b23588279a627ac3856fbea3d4c44f50a2b9c4194a434 VirtualBox-OSE-1.4.0.tar.bz2 21720127
diff --git a/app-emulation/virtualbox/files/digest-virtualbox-1.5.2 b/app-emulation/virtualbox/files/digest-virtualbox-1.5.2-r1
index c7b9e2c0583e..c7b9e2c0583e 100644
--- a/app-emulation/virtualbox/files/digest-virtualbox-1.5.2
+++ b/app-emulation/virtualbox/files/digest-virtualbox-1.5.2-r1
diff --git a/app-emulation/virtualbox/files/virtualbox-wrapper b/app-emulation/virtualbox/files/virtualbox-wrapper
index 4e39565812b1..9b25815c35c6 100644
--- a/app-emulation/virtualbox/files/virtualbox-wrapper
+++ b/app-emulation/virtualbox/files/virtualbox-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,31 +47,45 @@ 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
     fi
+elif [ ! -e /usr/lib/libhal.so ]; then
+	cat << EOF
+WARNING: libhal was not found on this system.
+	 This can create several side effects thus problems,
+	 when accessing host resources (eg: Cd/Dvd readers).
+
+	 The use of "sys-apps/hal" is still recommended, please install it
+	 to meet this requirement by:
+
+	 	sudo emerge sys-apps/hal
+EOF
 fi
 
 export LD_LIBRARY_PATH="$INSTALL_DIR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
diff --git a/app-emulation/virtualbox/virtualbox-1.4.0.ebuild b/app-emulation/virtualbox/virtualbox-1.4.0.ebuild
deleted file mode 100644
index 3a5793af58e2..000000000000
--- a/app-emulation/virtualbox/virtualbox-1.4.0.ebuild
+++ /dev/null
@@ -1,151 +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/virtualbox-1.4.0.ebuild,v 1.4 2007/06/26 01:37:14 mr_bones_ Exp $
-
-inherit eutils flag-o-matic qt3 toolchain-funcs
-
-MY_P=VirtualBox-OSE-${PV}
-DESCRIPTION="Softwarefamily of powerful x86 virtualization"
-HOMEPAGE="http://www.virtualbox.org/"
-SRC_URI="http://www.virtualbox.org/download/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="additions alsa hal nowrapper sdk vboxbfe"
-
-RDEPEND="!app-emulation/virtualbox-bin
-	~app-emulation/virtualbox-modules-${PV}
-	dev-libs/libIDL
-	>=dev-libs/libxslt-1.1.19
-	dev-libs/xalan-c
-	dev-libs/xerces-c
-	media-libs/libsdl
-	x11-libs/libXcursor
-	$(qt_min_version 3.3.5)
-	hal? ( sys-apps/hal )"
-DEPEND="${RDEPEND}
-	sys-devel/bin86
-	sys-devel/dev86
-	sys-power/iasl
-	alsa? ( >=media-libs/alsa-lib-1.0.13 )"
-RDEPEND="${RDEPEND}
-	additions? ( ~app-emulation/virtualbox-additions-${PV} )"
-
-S=${WORKDIR}/VirtualBox-OSE-${PV}
-
-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
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Don't build vboxdrv and additions: splitted into separate ebuilds
-	epatch "${FILESDIR}/${P}-remove-splitted-stuff.patch"
-	# Don't build the Alsa audio driver and remove Alsa checks in configure
-	# when Alsa is not selected (bug #167739)
-	use alsa || epatch "${FILESDIR}/${P}-remove-alsa.patch"
-}
-
-src_compile() {
-	cd "${S}"
-
-	local myconf
-	if ! use hal; then
-		myconf="${myconf} --without-hal"
-	fi
-
-	./configure \
-	${myconf} || die "configure failed"
-	source ./env.sh
-
-	# Force kBuild to respect C[XX]FLAGS and MAKEOPTS (bug #178529)
-	# and strip all flags
-	strip-flags
-
-	MAKE="kmk" emake TOOL_GCC3_CC="$(tc-getCC)" TOOL_GCC3_CXX="$(tc-getCXX)" \
-		TOOL_GCC3_AS="$(tc-getCC)" TOOL_GCC3_AR="$(tc-getAR)" \
-		TOOL_GCC3_LD="$(tc-getCXX)" TOOL_GCC3_LD_SYSMOD="$(tc-getLD)" \
-		TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" \
-		all || die "kmk failed"
-}
-
-src_install() {
-	cd "${S}"/out/linux.${ARCH}/release/bin
-
-	insinto /opt/VirtualBox
-	if use sdk; then
-		doins -r sdk
-		make_wrapper xpidl "sdk/bin/xpidl" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-		fowners root:vboxusers /opt/VirtualBox/sdk/bin/xpidl
-		fperms 0750 /opt/VirtualBox/sdk/bin/xpidl
-	fi
-	if use vboxbfe; then
-		doins VBoxBFE
-		fowners root:vboxusers /opt/VirtualBox/VBoxBFE
-		fperms 0750 /opt/VirtualBox/VBoxBFE
-
-		if use nowrapper ; then
-			make_wrapper vboxbfe "./VBoxBFE" "/opt/VirtualBox" "/opt/VirtualBox" "/usr/bin"
-		else
-			dosym /opt/VirtualBox/wrapper.sh /usr/bin/vboxbfe
-		fi
-	fi
-
-	rm -rf sdk src tst* testcase VBoxBFE vditool xpidl SUPInstall SUPUninstall
-
-	doins -r *
-	for each in VBox{Manage,SDL,SVC,XPCOMIPCD} VirtualBox ; do
-		fowners root:vboxusers /opt/VirtualBox/${each}
-		fperms 0750 /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"
-	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
-	fi
-
-	# desktop entry
-	insinto /usr/share/pixmaps
-	newins "${S}"/src/VBox/Frontends/VirtualBox/images/ico32x01.png ${PN}.png
-	insinto /usr/share/applications
-	doins "${FILESDIR}"/${PN}.desktop
-	dosed -e "s/Version=/Version=${PV}/" /usr/share/applications/${PN}.desktop
-}
-
-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 ""
-	elog "The last user manual is available for download at:"
-	elog "http://www.virtualbox.org/download/UserManual.pdf"
-	elog ""
-}
diff --git a/app-emulation/virtualbox/virtualbox-1.5.2.ebuild b/app-emulation/virtualbox/virtualbox-1.5.2-r1.ebuild
index eb52330e3a5d..45ee4ec338fc 100644
--- a/app-emulation/virtualbox/virtualbox-1.5.2.ebuild
+++ b/app-emulation/virtualbox/virtualbox-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/virtualbox-1.5.2.ebuild,v 1.2 2007/10/29 06:27:32 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-1.5.2-r1.ebuild,v 1.1 2007/11/03 15:08:51 jokey Exp $
 
 inherit eutils flag-o-matic qt3 toolchain-funcs
 
@@ -22,17 +22,18 @@ RDEPEND="!app-emulation/virtualbox-bin
 	dev-libs/xerces-c
 	media-libs/libsdl
 	x11-libs/libXcursor
-	$(qt_min_version 3.3.5)
-	sys-apps/hal"
+	$(qt_min_version 3.3.5)"
 DEPEND="${RDEPEND}
 	sys-devel/bin86
 	sys-devel/dev86
 	sys-power/iasl
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )"
+# sys-apps/hal is required at runtime (bug #197541)
 RDEPEND="${RDEPEND}
 	additions? ( ~app-emulation/virtualbox-additions-${PV} )
 	sys-apps/usermode-utilities
-	net-misc/bridge-utils"
+	net-misc/bridge-utils
+	sys-apps/hal"
 
 S=${WORKDIR}/${MY_P}