Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/
Date: Tue, 23 Aug 2022 20:48:15
Message-Id: 1661287595.c8222e6710da2d14619ef7d6f9a1a533aeb0402f.sam@gentoo
1 commit: c8222e6710da2d14619ef7d6f9a1a533aeb0402f
2 Author: Andrew Udvare <audvare <AT> gmail <DOT> com>
3 AuthorDate: Tue Aug 23 20:42:09 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 23 20:46:35 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8222e67
7
8 app-emulation/virtualbox: add SDL flag to 6.1.36-r1; revbump to r2
9
10 Signed-off-by: Andrew Udvare <audvare <AT> gmail.com>
11 Closes: https://github.com/gentoo/gentoo/pull/26991
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 ...box-6.1.36-r1.ebuild => virtualbox-6.1.36-r2.ebuild} | 17 ++++++++++-------
15 1 file changed, 10 insertions(+), 7 deletions(-)
16
17 diff --git a/app-emulation/virtualbox/virtualbox-6.1.36-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.36-r2.ebuild
18 similarity index 98%
19 rename from app-emulation/virtualbox/virtualbox-6.1.36-r1.ebuild
20 rename to app-emulation/virtualbox/virtualbox-6.1.36-r2.ebuild
21 index e964abdd6906..f0081d49d032 100644
22 --- a/app-emulation/virtualbox/virtualbox-6.1.36-r1.ebuild
23 +++ b/app-emulation/virtualbox/virtualbox-6.1.36-r2.ebuild
24 @@ -36,7 +36,7 @@ SLOT="0/$(ver_cut 1-2)"
25 if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
26 KEYWORDS="~amd64"
27 fi
28 -IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
29 +IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +sdl +udev vboxwebsrv vnc"
30
31 unset WATCOM #856769
32
33 @@ -52,7 +52,7 @@ COMMON_DEPEND="
34 media-libs/libvpx:0=
35 sys-libs/zlib:=
36 !headless? (
37 - media-libs/libsdl:0[X,video]
38 + sdl? ( media-libs/libsdl:0[X,video] )
39 x11-libs/libX11
40 x11-libs/libxcb:=
41 x11-libs/libXcursor
42 @@ -293,6 +293,7 @@ src_configure() {
43 myconf+=(
44 $(usex opengl '' --disable-opengl)
45 $(usex qt5 '' --disable-qt)
46 + $(usex sdl '' --disable-sdl)
47 )
48 else
49 myconf+=(
50 @@ -487,12 +488,14 @@ src_install() {
51
52 if ! use headless ; then
53 vbox_inst rdesktop-vrdp
54 - vbox_inst VBoxSDL 4750
55 - pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
56 + if use sdl ; then
57 + vbox_inst VBoxSDL 4750
58 + pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
59
60 - for each in vboxsdl VBoxSDL ; do
61 - dosym ${vbox_inst_path}/VBox /usr/bin/${each}
62 - done
63 + for each in vboxsdl VBoxSDL ; do
64 + dosym ${vbox_inst_path}/VBox /usr/bin/${each}
65 + done
66 + fi
67
68 if use qt5 ; then
69 vbox_inst VirtualBox