1 |
commit: 226c5ac5f4ee6399f18b2e2b0a8e4b9586e780e4 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 20 11:30:50 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 20 11:31:22 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=226c5ac5 |
7 |
|
8 |
app-emulation/virtualbox: Revbumps to finally install vnc ExtPack |
9 |
|
10 |
also install dtrace ExtPack if requested. |
11 |
|
12 |
Closes: https://bugs.gentoo.org/438930 |
13 |
Package-Manager: Portage-2.3.64, Repoman-2.3.12 |
14 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
15 |
|
16 |
app-emulation/virtualbox/metadata.xml | 1 + |
17 |
...box-5.2.28.ebuild => virtualbox-5.2.28-r1.ebuild} | 20 ++++++++++++++++++-- |
18 |
...albox-6.0.6.ebuild => virtualbox-6.0.6-r1.ebuild} | 20 ++++++++++++++++++-- |
19 |
3 files changed, 37 insertions(+), 4 deletions(-) |
20 |
|
21 |
diff --git a/app-emulation/virtualbox/metadata.xml b/app-emulation/virtualbox/metadata.xml |
22 |
index 0c28b5e7197..3a2ea79813a 100644 |
23 |
--- a/app-emulation/virtualbox/metadata.xml |
24 |
+++ b/app-emulation/virtualbox/metadata.xml |
25 |
@@ -6,6 +6,7 @@ |
26 |
<name>Lars Wendler</name> |
27 |
</maintainer> |
28 |
<use> |
29 |
+ <flag name="dtrace">Install dtrace Extension Pack</flag> |
30 |
<flag name="headless">Build without any graphic frontend</flag> |
31 |
<flag name="lvm">Build VBoxVolInfo that needs devicemapper from <pkg>sys-fs/lvm2</pkg>.</flag> |
32 |
<flag name="pax_kernel">Apply patch needed for pax enabled kernels.</flag> |
33 |
|
34 |
diff --git a/app-emulation/virtualbox/virtualbox-5.2.28.ebuild b/app-emulation/virtualbox/virtualbox-5.2.28-r1.ebuild |
35 |
similarity index 95% |
36 |
rename from app-emulation/virtualbox/virtualbox-5.2.28.ebuild |
37 |
rename to app-emulation/virtualbox/virtualbox-5.2.28-r1.ebuild |
38 |
index 4464ccc84a0..05f95844d59 100644 |
39 |
--- a/app-emulation/virtualbox/virtualbox-5.2.28.ebuild |
40 |
+++ b/app-emulation/virtualbox/virtualbox-5.2.28-r1.ebuild |
41 |
@@ -15,10 +15,10 @@ HOMEPAGE="https://www.virtualbox.org/" |
42 |
SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2 |
43 |
https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.2.16-patches-02.tar.xz" |
44 |
|
45 |
-LICENSE="GPL-2" |
46 |
+LICENSE="GPL-2 dtrace? ( CDDL )" |
47 |
SLOT="0" |
48 |
KEYWORDS="~amd64 ~x86" |
49 |
-IUSE="alsa debug doc headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" |
50 |
+IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" |
51 |
|
52 |
RDEPEND="!app-emulation/virtualbox-bin |
53 |
~app-emulation/virtualbox-modules-${PV} |
54 |
@@ -424,6 +424,22 @@ src_install() { |
55 |
newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv |
56 |
fi |
57 |
|
58 |
+ # Fix version string in extensions or else they don't get accepted |
59 |
+ # by the virtualbox host process (see bug #438930) |
60 |
+ find ExtensionPacks -type f -name "ExtPack.xml" -print0 \ |
61 |
+ | xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \ |
62 |
+ || die |
63 |
+ |
64 |
+ if use vnc ; then |
65 |
+ insinto ${vbox_inst_path}/ExtensionPacks |
66 |
+ doins -r ExtensionPacks/VNC |
67 |
+ fi |
68 |
+ |
69 |
+ if use dtrace ; then |
70 |
+ insinto ${vbox_inst_path}/ExtensionPacks |
71 |
+ doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack |
72 |
+ fi |
73 |
+ |
74 |
if use doc ; then |
75 |
dodoc UserManual.pdf |
76 |
fi |
77 |
|
78 |
diff --git a/app-emulation/virtualbox/virtualbox-6.0.6.ebuild b/app-emulation/virtualbox/virtualbox-6.0.6-r1.ebuild |
79 |
similarity index 95% |
80 |
rename from app-emulation/virtualbox/virtualbox-6.0.6.ebuild |
81 |
rename to app-emulation/virtualbox/virtualbox-6.0.6-r1.ebuild |
82 |
index 8c7e76ae253..ac99dd66bda 100644 |
83 |
--- a/app-emulation/virtualbox/virtualbox-6.0.6.ebuild |
84 |
+++ b/app-emulation/virtualbox/virtualbox-6.0.6-r1.ebuild |
85 |
@@ -15,11 +15,11 @@ HOMEPAGE="https://www.virtualbox.org/" |
86 |
SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2 |
87 |
https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.0.0_beta2-patches-01.tar.xz" |
88 |
|
89 |
-LICENSE="GPL-2" |
90 |
+LICENSE="GPL-2 dtrace? ( CDDL )" |
91 |
SLOT="0" |
92 |
[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ |
93 |
KEYWORDS="~amd64 ~x86" |
94 |
-IUSE="alsa debug doc headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" |
95 |
+IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" |
96 |
|
97 |
RDEPEND="!app-emulation/virtualbox-bin |
98 |
~app-emulation/virtualbox-modules-${PV} |
99 |
@@ -427,6 +427,22 @@ src_install() { |
100 |
newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv |
101 |
fi |
102 |
|
103 |
+ # Fix version string in extensions or else they don't get accepted |
104 |
+ # by the virtualbox host process (see bug #438930) |
105 |
+ find ExtensionPacks -type f -name "ExtPack.xml" -print0 \ |
106 |
+ | xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \ |
107 |
+ || die |
108 |
+ |
109 |
+ if use vnc ; then |
110 |
+ insinto ${vbox_inst_path}/ExtensionPacks |
111 |
+ doins -r ExtensionPacks/VNC |
112 |
+ fi |
113 |
+ |
114 |
+ if use dtrace ; then |
115 |
+ insinto ${vbox_inst_path}/ExtensionPacks |
116 |
+ doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack |
117 |
+ fi |
118 |
+ |
119 |
if use doc ; then |
120 |
dodoc UserManual.pdf |
121 |
fi |