app-emulation/virtualbox: fixed qt5 gui session startup

added some missing symlinks, and enhanced the wrapper script a bit more.

Closes: https://bugs.gentoo.org/671354
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

diff --git a/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper b/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper
index 43e9c9ed44833e97af80ff5dddd88a7f197f6e8e..af8090dd09afd48a9ad70dfa46d0b2b221c7d123 100644 (file)
--- a/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper
+++ b/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper
@@ -84,6 +84,9 @@ case "$APP" in
     VirtualBox|virtualbox)
         exec "$INSTALL_DIR/VirtualBox" "$@"
         ;;
+    VirtualBoxVM|virtualboxvm)
+        exec "$INSTALL_DIR/VirtualBoxVM" "$@"
+        ;;
     VBoxManage|vboxmanage)
         exec "$INSTALL_DIR/VBoxManage" "$@"
         ;;

diff --git a/app-emulation/virtualbox/virtualbox-6.0.0_beta3.ebuild b/app-emulation/virtualbox/virtualbox-6.0.0_beta3.ebuild
index edda2a369a4b2627707d97ed6f8464782f60fcaf..cd98a4875fd293d7272805c94a747a612b97de10 100644 (file)
--- a/app-emulation/virtualbox/virtualbox-6.0.0_beta3.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.0.0_beta3.ebuild
@@ -262,7 +262,7 @@ src_install() {
        use debug && binpath="debug"
        cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die
 
-       local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile size ico icofile
+       local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
 
        vbox_inst() {
                local binary="${1}"
@@ -312,11 +312,9 @@ src_install() {
        done
 
        # Install EFI Firmware files (bug #320757)
-       pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
-       for fwfile in VBoxEFI{32,64}.fd ; do
-               vbox_inst ${fwfile} 0644
+       for each in VBoxEFI{32,64}.fd ; do
+               vbox_inst ${each} 0644
        done
-       popd &>/dev/null || die
 
        # VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
        # VBoxXPCOMIPCD (bug #524202)
@@ -325,7 +323,7 @@ src_install() {
        done
 
        # Symlink binaries to the shipped wrapper
-       for each in vbox{headless,manage} VBox{BugReport,Headless,Manage,VRDP} ; do
+       for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
                dosym ${vbox_inst_path}/VBox /usr/bin/${each}
        done
        dosym ${vbox_inst_path}/VBoxTunctl /usr/bin/VBoxTunctl
@@ -348,8 +346,9 @@ src_install() {
                done
 
                if use qt5 ; then
+                       vbox_inst Virtualbox
+                       vbox_inst VirtualboxVM 4750
                        for each in VirtualBox{,VM} ; do
-                               vbox_inst ${each}
                                pax-mark -m "${ED%/}"${vbox_inst_path}/${each}
                        done
 
@@ -358,7 +357,7 @@ src_install() {
                                pax-mark -m "${ED%/}"${vbox_inst_path}/VBoxTestOGL
                        fi
 
-                       for each in virtualbox VirtualBox ; do
+                       for each in virtualbox{,vm} VirtualBox{,VM} ; do
                                dosym ${vbox_inst_path}/VBox /usr/bin/${each}
                        done