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: Wed, 06 Jul 2022 06:05:36
Message-Id: 1657087518.c811211d3a19f9b79a9e0e9afc4aaf5e3fa5ed54.sam@gentoo
1 commit: c811211d3a19f9b79a9e0e9afc4aaf5e3fa5ed54
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 6 06:04:51 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 6 06:05:18 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c811211d
7
8 app-emulation/virtualbox: add more wsimport context
9
10 Bug: https://bugs.gentoo.org/832166
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 app-emulation/virtualbox/virtualbox-6.1.34-r4.ebuild | 10 ++++++++--
14 1 file changed, 8 insertions(+), 2 deletions(-)
15
16 diff --git a/app-emulation/virtualbox/virtualbox-6.1.34-r4.ebuild b/app-emulation/virtualbox/virtualbox-6.1.34-r4.ebuild
17 index a20ee04a2d51..7eb42e9cf9ea 100644
18 --- a/app-emulation/virtualbox/virtualbox-6.1.34-r4.ebuild
19 +++ b/app-emulation/virtualbox/virtualbox-6.1.34-r4.ebuild
20 @@ -82,7 +82,13 @@ COMMON_DEPEND="
21 # We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
22 # with USE="vboxwebsrv java". Note that we have to put things in DEPEND,
23 # not (only, anyway) BDEPEND, as the eclass magic to set the environment variables
24 -# based on *DEPEND doesn't work for BDEPEND at least right now. See bug #832166.
25 +# based on *DEPEND doesn't work for BDEPEND at least right now.
26 +#
27 +# There's a comment in Config.kmk about it
28 +# ("With Java 11 wsimport was removed, usually part of a separate install now.")
29 +# but it needs more investigation.
30 +#
31 +# See bug #832166.
32 DEPEND="
33 ${COMMON_DEPEND}
34 alsa? ( >=media-libs/alsa-lib-1.0.13 )
35 @@ -550,7 +556,7 @@ src_install() {
36 eerror "(listed in PYTHON_COMPAT in the ebuild) is incomplete within the Makefiles."
37 die "Incomplete installation of Python bindings! File a bug with Gentoo!"
38 fi
39 - fi
40 + fi
41
42 newtmpfiles "${FILESDIR}"/${PN}-vboxusb_tmpfilesd ${PN}-vboxusb.conf
43 }