From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 592FF138334 for ; Sat, 20 Apr 2019 23:24:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 03F24E0976; Sat, 20 Apr 2019 23:20:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B9E24E0970 for ; Sat, 20 Apr 2019 23:20:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 22776341FFF for ; Sat, 20 Apr 2019 11:31:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 66880326 for ; Sat, 20 Apr 2019 11:31:29 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1555759882.226c5ac5f4ee6399f18b2e2b0a8e4b9586e780e4.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/virtualbox/metadata.xml app-emulation/virtualbox/virtualbox-5.2.28-r1.ebuild app-emulation/virtualbox/virtualbox-5.2.28.ebuild app-emulation/virtualbox/virtualbox-6.0.6-r1.ebuild app-emulation/virtualbox/virtualbox-6.0.6.ebuild X-VCS-Directories: app-emulation/virtualbox/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 226c5ac5f4ee6399f18b2e2b0a8e4b9586e780e4 X-VCS-Branch: master Date: Sat, 20 Apr 2019 11:31:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1d856978-c365-4803-864e-2042139559ab X-Archives-Hash: 92e04fb0b9df7b765c6dfe504b8e22ef commit: 226c5ac5f4ee6399f18b2e2b0a8e4b9586e780e4 Author: Lars Wendler gentoo org> AuthorDate: Sat Apr 20 11:30:50 2019 +0000 Commit: Lars Wendler gentoo 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 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 @@ Lars Wendler + Install dtrace Extension Pack Build without any graphic frontend Build VBoxVolInfo that needs devicemapper from sys-fs/lvm2. Apply patch needed for pax enabled kernels. 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