From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1430005-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id C218F158094
for <garchives@archives.gentoo.org>; Tue, 23 Aug 2022 20:48:15 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id A8D11E0794;
Tue, 23 Aug 2022 20:48:13 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 8CBEEE0794
for <gentoo-commits@lists.gentoo.org>; Tue, 23 Aug 2022 20:48:13 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 94D24340FB2
for <gentoo-commits@lists.gentoo.org>; Tue, 23 Aug 2022 20:48:12 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id D7C9157B
for <gentoo-commits@lists.gentoo.org>; Tue, 23 Aug 2022 20:48:10 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1661287595.c8222e6710da2d14619ef7d6f9a1a533aeb0402f.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtualbox/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-emulation/virtualbox/virtualbox-6.1.36-r1.ebuild app-emulation/virtualbox/virtualbox-6.1.36-r2.ebuild
X-VCS-Directories: app-emulation/virtualbox/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: c8222e6710da2d14619ef7d6f9a1a533aeb0402f
X-VCS-Branch: master
Date: Tue, 23 Aug 2022 20:48:10 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 6a6c6aea-cf6c-4969-9ef3-5b1878a75ca3
X-Archives-Hash: e3fdeae1f5466e6b3f29164867af7b8f
commit: c8222e6710da2d14619ef7d6f9a1a533aeb0402f
Author: Andrew Udvare <audvare <AT> gmail <DOT> com>
AuthorDate: Tue Aug 23 20:42:09 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 20:46:35 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8222e67
app-emulation/virtualbox: add SDL flag to 6.1.36-r1; revbump to r2
Signed-off-by: Andrew Udvare <audvare <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26991
Signed-off-by: Sam James <sam <AT> gentoo.org>
...box-6.1.36-r1.ebuild => virtualbox-6.1.36-r2.ebuild} | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/app-emulation/virtualbox/virtualbox-6.1.36-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.36-r2.ebuild
similarity index 98%
rename from app-emulation/virtualbox/virtualbox-6.1.36-r1.ebuild
rename to app-emulation/virtualbox/virtualbox-6.1.36-r2.ebuild
index e964abdd6906..f0081d49d032 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.36-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.36-r2.ebuild
@@ -36,7 +36,7 @@ SLOT="0/$(ver_cut 1-2)"
if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
KEYWORDS="~amd64"
fi
-IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +sdl +udev vboxwebsrv vnc"
unset WATCOM #856769
@@ -52,7 +52,7 @@ COMMON_DEPEND="
media-libs/libvpx:0=
sys-libs/zlib:=
!headless? (
- media-libs/libsdl:0[X,video]
+ sdl? ( media-libs/libsdl:0[X,video] )
x11-libs/libX11
x11-libs/libxcb:=
x11-libs/libXcursor
@@ -293,6 +293,7 @@ src_configure() {
myconf+=(
$(usex opengl '' --disable-opengl)
$(usex qt5 '' --disable-qt)
+ $(usex sdl '' --disable-sdl)
)
else
myconf+=(
@@ -487,12 +488,14 @@ src_install() {
if ! use headless ; then
vbox_inst rdesktop-vrdp
- vbox_inst VBoxSDL 4750
- pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
+ if use sdl ; then
+ vbox_inst VBoxSDL 4750
+ pax-mark -m "${ED}"${vbox_inst_path}/VBoxSDL
- for each in vboxsdl VBoxSDL ; do
- dosym ${vbox_inst_path}/VBox /usr/bin/${each}
- done
+ for each in vboxsdl VBoxSDL ; do
+ dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+ done
+ fi
if use qt5 ; then
vbox_inst VirtualBox