From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1415734-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 12DA9158094
for <garchives@archives.gentoo.org>; Wed, 6 Jul 2022 03:01:47 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id BAC54E0AAC;
Wed, 6 Jul 2022 03:01:45 +0000 (UTC)
Received: from smtp.gentoo.org (mail.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))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id A010DE0AAC
for <gentoo-commits@lists.gentoo.org>; Wed, 6 Jul 2022 03:01:45 +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 86CC43418ED
for <gentoo-commits@lists.gentoo.org>; Wed, 6 Jul 2022 03:01:44 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id AC9B451C
for <gentoo-commits@lists.gentoo.org>; Wed, 6 Jul 2022 03:01:42 +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: <1657074152.fa21e2695b3da1f1b8935b13253cbd8d272719a2.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.34-r3.ebuild
X-VCS-Directories: app-emulation/virtualbox/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: fa21e2695b3da1f1b8935b13253cbd8d272719a2
X-VCS-Branch: master
Date: Wed, 6 Jul 2022 03:01:42 +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: 4f7479f5-9337-48b2-93d6-da04668eb673
X-Archives-Hash: 952eed3270de106b547f6072eb31a1d8
commit: fa21e2695b3da1f1b8935b13253cbd8d272719a2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 6 02:22:32 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 6 02:22:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa21e269
app-emulation/virtualbox: use optfeature
Closes: https://bugs.gentoo.org/674496
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../virtualbox/virtualbox-6.1.34-r3.ebuild | 31 ++++++++--------------
1 file changed, 11 insertions(+), 20 deletions(-)
diff --git a/app-emulation/virtualbox/virtualbox-6.1.34-r3.ebuild b/app-emulation/virtualbox/virtualbox-6.1.34-r3.ebuild
index 388c4e9cc7c0..db2898848eba 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.34-r3.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.34-r3.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
-inherit desktop edo java-pkg-opt-2 linux-info multilib pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
+inherit desktop edo java-pkg-opt-2 linux-info multilib optfeature pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
MY_PN="VirtualBox"
MY_PV="${PV/beta/BETA}"
@@ -487,8 +487,8 @@ pkg_postinst() {
xdg_pkg_postinst
if use udev ; then
- udevadm control --reload-rules \
- && udevadm trigger --subsystem-match=usb
+ udevadm control --reload-rules
+ udevadm trigger --subsystem-match=usb
fi
tmpfiles_process virtualbox-vboxusb.conf
@@ -496,27 +496,18 @@ pkg_postinst() {
if ! use headless && use qt5 ; then
elog "To launch VirtualBox just type: \"virtualbox\"."
fi
+
elog "You must be in the vboxusers group to use VirtualBox."
elog ""
elog "The latest user manual is available for download at:"
- elog "http://download.virtualbox.org/virtualbox/${DIR_PV:-${PV}}/UserManual.pdf"
- elog ""
- elog "For advanced networking setups you should emerge:"
- elog "net-misc/bridge-utils and sys-apps/usermode-utilities"
+ elog "https://download.virtualbox.org/virtualbox/${DIR_PV:-${PV}}/UserManual.pdf"
elog ""
- elog "Starting with version 4.0.0, ${PN} has USB-1 support."
- elog "For USB-2 support, PXE-boot ability and VRDP support please emerge"
- elog " app-emulation/virtualbox-extpack-oracle"
- elog "package."
- elog "Starting with version 5.0.0, ${PN} no longer has the \"additions\" and"
- elog "the \"extension\" USE flag. For installation of the guest additions ISO"
- elog "image, please emerge"
- elog " app-emulation/virtualbox-additions"
- elog "and for the USB2, USB3, VRDP and PXE boot ROM modules, please emerge"
- elog " app-emulation/virtualbox-extpack-oracle"
+
+ optfeature "Advanced networking setups" net-misc/bridge-utils sys-apps/usermode-utilities
+ optfeature "USB2, USB3, PXE boot, and VRDP support" app-emulation/virtualbox-extpack-oracle
+ optfeature "Guest additions ISO" app-emulation/virtualbox-additions
+
if ! use udev ; then
- elog ""
- elog "WARNING!"
- elog "Without USE=udev, USB devices will likely not work in ${PN}."
+ ewarn "Without USE=udev, USB devices will likely not work in ${PN}."
fi
}