From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DEA62138334 for ; Fri, 7 Dec 2018 21:42:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A606BE097A; Fri, 7 Dec 2018 21:42:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 67C8DE097A for ; Fri, 7 Dec 2018 21:42:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9E5D2335C38 for ; Fri, 7 Dec 2018 21:42:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E9BB2326 for ; Fri, 7 Dec 2018 21:42:22 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1544218935.be4b63a80148cc9f6c1d4f305ef3a1a28f52d676.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/, app-emulation/virtualbox/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/virtualbox/files/virtualbox-ose-6-wrapper app-emulation/virtualbox/virtualbox-6.0.0_beta3.ebuild X-VCS-Directories: app-emulation/virtualbox/ app-emulation/virtualbox/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: be4b63a80148cc9f6c1d4f305ef3a1a28f52d676 X-VCS-Branch: master Date: Fri, 7 Dec 2018 21:42:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a723c625-471c-4332-9337-cc9a1d4ce640 X-Archives-Hash: 4707c3c54900b016a73fc6125e5c08bb commit: be4b63a80148cc9f6c1d4f305ef3a1a28f52d676 Author: Lars Wendler gentoo org> AuthorDate: Fri Dec 7 20:29:55 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Fri Dec 7 21:42:15 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be4b63a8 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 gentoo.org> app-emulation/virtualbox/files/virtualbox-ose-6-wrapper | 3 +++ app-emulation/virtualbox/virtualbox-6.0.0_beta3.ebuild | 15 +++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper b/app-emulation/virtualbox/files/virtualbox-ose-6-wrapper index 43e9c9ed448..af8090dd09a 100644 --- 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 edda2a369a4..cd98a4875fd 100644 --- 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