1 |
commit: bd169bf87e74dd92cb7df5db229ad7c515cc0e1a |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 16 14:55:43 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 16 14:56:08 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd169bf8 |
7 |
|
8 |
app-emulation/virtualbox: Some ebuild improvements. |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
app-emulation/virtualbox/virtualbox-5.1.32.ebuild | 29 +++++++++++++---------- |
13 |
app-emulation/virtualbox/virtualbox-5.2.6.ebuild | 29 +++++++++++++---------- |
14 |
2 files changed, 34 insertions(+), 24 deletions(-) |
15 |
|
16 |
diff --git a/app-emulation/virtualbox/virtualbox-5.1.32.ebuild b/app-emulation/virtualbox/virtualbox-5.1.32.ebuild |
17 |
index 698f0b56dda..08304b19cae 100644 |
18 |
--- a/app-emulation/virtualbox/virtualbox-5.1.32.ebuild |
19 |
+++ b/app-emulation/virtualbox/virtualbox-5.1.32.ebuild |
20 |
@@ -204,21 +204,26 @@ src_configure() { |
21 |
--with-g++="$(tc-getCXX)" |
22 |
--disable-dbus |
23 |
--disable-kmods |
24 |
+ $(usex alsa '' --disable-alsa) |
25 |
+ $(usex debug --build-debug '') |
26 |
+ $(usex doc '' --disable-docs) |
27 |
+ $(usex java '' --disable-java) |
28 |
+ $(usex lvm '' --disable-devmapper) |
29 |
+ $(usex pulseaudio '' --disable-pulse) |
30 |
+ $(usex python '' --disable-python) |
31 |
+ $(usex vboxwebsrv --enable-webservice '') |
32 |
+ $(usex vnc --enable-vnc '') |
33 |
) |
34 |
- use alsa || myconf+=( --disable-alsa ) |
35 |
- use debug && myconf+=( --build-debug ) |
36 |
- use doc || myconf+=( --disable-docs ) |
37 |
- use java || myconf+=( --disable-java ) |
38 |
- use lvm || myconf+=( --disable-devmapper ) |
39 |
- use opengl || myconf+=( --disable-opengl ) |
40 |
- use pulseaudio || myconf+=( --disable-pulse ) |
41 |
- use python || myconf+=( --disable-python ) |
42 |
- use vboxwebsrv && myconf+=( --enable-webservice ) |
43 |
- use vnc && myconf+=( --enable-vnc ) |
44 |
if ! use headless ; then |
45 |
- use qt5 || myconf+=( --disable-qt ) |
46 |
+ myconf+=( |
47 |
+ $(usex opengl '' --disable-opengl) |
48 |
+ $(usex qt5 '' --disable-qt) |
49 |
+ ) |
50 |
else |
51 |
- myconf+=( --build-headless --disable-opengl ) |
52 |
+ myconf+=( |
53 |
+ --build-headless |
54 |
+ --disable-opengl |
55 |
+ ) |
56 |
fi |
57 |
if use amd64 && ! has_multilib_profile ; then |
58 |
myconf+=( --disable-vmmraw ) |
59 |
|
60 |
diff --git a/app-emulation/virtualbox/virtualbox-5.2.6.ebuild b/app-emulation/virtualbox/virtualbox-5.2.6.ebuild |
61 |
index 46c3c3cba7a..7133045118b 100644 |
62 |
--- a/app-emulation/virtualbox/virtualbox-5.2.6.ebuild |
63 |
+++ b/app-emulation/virtualbox/virtualbox-5.2.6.ebuild |
64 |
@@ -204,21 +204,26 @@ src_configure() { |
65 |
--with-g++="$(tc-getCXX)" |
66 |
--disable-dbus |
67 |
--disable-kmods |
68 |
+ $(usex alsa '' --disable-alsa) |
69 |
+ $(usex debug --build-debug '') |
70 |
+ $(usex doc '' --disable-docs) |
71 |
+ $(usex java '' --disable-java) |
72 |
+ $(usex lvm '' --disable-devmapper) |
73 |
+ $(usex pulseaudio '' --disable-pulse) |
74 |
+ $(usex python '' --disable-python) |
75 |
+ $(usex vboxwebsrv --enable-webservice '') |
76 |
+ $(usex vnc --enable-vnc '') |
77 |
) |
78 |
- use alsa || myconf+=( --disable-alsa ) |
79 |
- use debug && myconf+=( --build-debug ) |
80 |
- use doc || myconf+=( --disable-docs ) |
81 |
- use java || myconf+=( --disable-java ) |
82 |
- use lvm || myconf+=( --disable-devmapper ) |
83 |
- use opengl || myconf+=( --disable-opengl ) |
84 |
- use pulseaudio || myconf+=( --disable-pulse ) |
85 |
- use python || myconf+=( --disable-python ) |
86 |
- use vboxwebsrv && myconf+=( --enable-webservice ) |
87 |
- use vnc && myconf+=( --enable-vnc ) |
88 |
if ! use headless ; then |
89 |
- use qt5 || myconf+=( --disable-qt ) |
90 |
+ myconf+=( |
91 |
+ $(usex opengl '' --disable-opengl) |
92 |
+ $(usex qt5 '' --disable-qt) |
93 |
+ ) |
94 |
else |
95 |
- myconf+=( --build-headless --disable-opengl ) |
96 |
+ myconf+=( |
97 |
+ --build-headless |
98 |
+ --disable-opengl |
99 |
+ ) |
100 |
fi |
101 |
if use amd64 && ! has_multilib_profile ; then |
102 |
myconf+=( --disable-vmmraw ) |