commit: 226c5ac5f4ee6399f18b2e2b0a8e4b9586e780e4 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Sat Apr 20 11:30:50 2019 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Sat Apr 20 11:31:22 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=226c5ac5
app-emulation/virtualbox: Revbumps to finally install vnc ExtPack also install dtrace ExtPack if requested. Closes: https://bugs.gentoo.org/438930 Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> app-emulation/virtualbox/metadata.xml | 1 + ...box-5.2.28.ebuild => virtualbox-5.2.28-r1.ebuild} | 20 ++++++++++++++++++-- ...albox-6.0.6.ebuild => virtualbox-6.0.6-r1.ebuild} | 20 ++++++++++++++++++-- 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/app-emulation/virtualbox/metadata.xml b/app-emulation/virtualbox/metadata.xml index 0c28b5e7197..3a2ea79813a 100644 --- a/app-emulation/virtualbox/metadata.xml +++ b/app-emulation/virtualbox/metadata.xml @@ -6,6 +6,7 @@ <name>Lars Wendler</name> </maintainer> <use> + <flag name="dtrace">Install dtrace Extension Pack</flag> <flag name="headless">Build without any graphic frontend</flag> <flag name="lvm">Build VBoxVolInfo that needs devicemapper from <pkg>sys-fs/lvm2</pkg>.</flag> <flag name="pax_kernel">Apply patch needed for pax enabled kernels.</flag> diff --git a/app-emulation/virtualbox/virtualbox-5.2.28.ebuild b/app-emulation/virtualbox/virtualbox-5.2.28-r1.ebuild similarity index 95% rename from app-emulation/virtualbox/virtualbox-5.2.28.ebuild rename to app-emulation/virtualbox/virtualbox-5.2.28-r1.ebuild index 4464ccc84a0..05f95844d59 100644 --- a/app-emulation/virtualbox/virtualbox-5.2.28.ebuild +++ b/app-emulation/virtualbox/virtualbox-5.2.28-r1.ebuild @@ -15,10 +15,10 @@ HOMEPAGE="https://www.virtualbox.org/"; SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2 https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.2.16-patches-02.tar.xz"; -LICENSE="GPL-2" +LICENSE="GPL-2 dtrace? ( CDDL )" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="alsa debug doc headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" +IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" RDEPEND="!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-${PV} @@ -424,6 +424,22 @@ src_install() { newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv fi + # Fix version string in extensions or else they don't get accepted + # by the virtualbox host process (see bug #438930) + find ExtensionPacks -type f -name "ExtPack.xml" -print0 \ + | xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \ + || die + + if use vnc ; then + insinto ${vbox_inst_path}/ExtensionPacks + doins -r ExtensionPacks/VNC + fi + + if use dtrace ; then + insinto ${vbox_inst_path}/ExtensionPacks + doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack + fi + if use doc ; then dodoc UserManual.pdf fi diff --git a/app-emulation/virtualbox/virtualbox-6.0.6.ebuild b/app-emulation/virtualbox/virtualbox-6.0.6-r1.ebuild similarity index 95% rename from app-emulation/virtualbox/virtualbox-6.0.6.ebuild rename to app-emulation/virtualbox/virtualbox-6.0.6-r1.ebuild index 8c7e76ae253..ac99dd66bda 100644 --- a/app-emulation/virtualbox/virtualbox-6.0.6.ebuild +++ b/app-emulation/virtualbox/virtualbox-6.0.6-r1.ebuild @@ -15,11 +15,11 @@ HOMEPAGE="https://www.virtualbox.org/"; SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2 https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.0.0_beta2-patches-01.tar.xz"; -LICENSE="GPL-2" +LICENSE="GPL-2 dtrace? ( CDDL )" SLOT="0" [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ KEYWORDS="~amd64 ~x86" -IUSE="alsa debug doc headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" +IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" RDEPEND="!app-emulation/virtualbox-bin ~app-emulation/virtualbox-modules-${PV} @@ -427,6 +427,22 @@ src_install() { newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv fi + # Fix version string in extensions or else they don't get accepted + # by the virtualbox host process (see bug #438930) + find ExtensionPacks -type f -name "ExtPack.xml" -print0 \ + | xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \ + || die + + if use vnc ; then + insinto ${vbox_inst_path}/ExtensionPacks + doins -r ExtensionPacks/VNC + fi + + if use dtrace ; then + insinto ${vbox_inst_path}/ExtensionPacks + doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack + fi + if use doc ; then dodoc UserManual.pdf fi
