diff options
| author |   Viorel Munteanu <ceamac@gentoo.org> | 2024-03-19 19:13:54 +0200 |
|---|---|---|
| committer | Viorel Munteanu <ceamac@gentoo.org> | 2024-03-19 19:19:13 +0200 |
| commit | 75e9e05a39521093f1ea9e8070dde78d5cb1b863 (patch) | |
| tree | 9e59f8e1cce1f5eaefe12cf8bc6e4d86d6d4da95 /app-emulation/virtualbox | |
| parent | x11-misc/tabbed: add 0.8 (diff) | |
| download | gentoo-75e9e05a39521093f1ea9e8070dde78d5cb1b863.tar.gz gentoo-75e9e05a39521093f1ea9e8070dde78d5cb1b863.tar.bz2 gentoo-75e9e05a39521093f1ea9e8070dde78d5cb1b863.zip | |
app-emulation/virtualbox: update live version
Make it build again after changes from upstream.
Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
Diffstat (limited to 'app-emulation/virtualbox')
| -rw-r--r-- | app-emulation/virtualbox/virtualbox-9999.ebuild | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/app-emulation/virtualbox/virtualbox-9999.ebuild b/app-emulation/virtualbox/virtualbox-9999.ebuild index 25a390ed1bc9..fa51d3f6c124 100644 --- a/app-emulation/virtualbox/virtualbox-9999.ebuild +++ b/app-emulation/virtualbox/virtualbox-9999.ebuild @@ -48,13 +48,12 @@ IUSE="alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl py unset WATCOM #856769 -# <libxml2-2.12.0: bug #922445 COMMON_DEPEND=" ${PYTHON_DEPS} acct-group/vboxusers app-arch/xz-utils dev-libs/libtpms - <dev-libs/libxml2-2.12.0 + dev-libs/libxml2 dev-libs/openssl:0= media-libs/libpng:0= media-libs/libvpx:0= @@ -63,7 +62,6 @@ COMMON_DEPEND=" dbus? ( sys-apps/dbus ) gui? ( dev-qt/qtbase:6[widgets] - dev-qt/qt5compat:6 dev-qt/qtscxml:6 dev-qt/qttools:6[assistant] x11-libs/libX11 @@ -129,6 +127,7 @@ DEPEND=" " RDEPEND=" ${COMMON_DEPEND} + !app-emulation/virtualbox-modules gui? ( x11-libs/libxcb:= ) java? ( virtual/jre:1.8 ) " @@ -549,7 +548,7 @@ src_install() { insinto ${vbox_inst_path} doins -r components - for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,VMMPreload,XPCOMIPCD} \ + for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,VMMPreload} \ vboximg-mount vbox-img *so *r0; do vbox_inst ${each} done @@ -710,7 +709,7 @@ src_install() { fi # 378871 - local installer_dir="${ED}/usr/$(get_libdir)/virtualbox/sdk/installer" + local installer_dir="${ED}/usr/$(get_libdir)/virtualbox/sdk/installer/python/vboxapi/src" pushd "${installer_dir}" &> /dev/null || die sed -e "s;%VBOX_INSTALL_PATH%;${vbox_inst_path};" \ -e "s;%VBOX_SDK_PATH%;${vbox_inst_path}/sdk;" \ @@ -719,10 +718,14 @@ src_install() { find vboxapi -name \*.py -exec sed -e "1 i\#! ${PYTHON}" -i {} \+ || die python_domodule vboxapi popd &> /dev/null || die + + # upstream added a /bin/sh stub here + # use /usr/bin/python3, python_doscript will take care of it + sed -e '1 i #! /usr/bin/python3' -i vboxshell.py python_doscript vboxshell.py # do not install the installer - rm -r "${installer_dir}" || die + rm -r "${installer_dir%vboxapi*}" || die fi newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf |