gentoo auto-resync : 10:12:2022 - 15:20:44

4 files changed, 34 insertions, 23 deletions

diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index d58407152be6..51846fde4f12 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -20,6 +20,6 @@ DIST VirtualBox-7.0.2.tar.bz2 199461536 BLAKE2B 94f7c2961c13530b6086bf4576f243b5
 DIST VirtualBox-7.0.4.tar.bz2 199658172 BLAKE2B 51bde109805e8f3e25f179a05fac532de7a428010955c7cc2a7c9e8c072246d69c5f51f8a51e39b6a1b9f246bd945edc38e0f0cc0630c357a5e9641c38dcac21 SHA512 70f2031c4897249177131795281bf6bd5a75166067d1921db70fd1e21f5638285b5a0c3298a7070e272ac2f093a60c35eb3cab4e5f7d16a68d17b211f637b0bc
 DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
 EBUILD virtualbox-6.1.40.ebuild 18338 BLAKE2B aa2b2cb1bece62809d6684197adfb736562f8f9d7b650f01e5f0862316be2a870536b5501e1d8c25f546fbf755004a181d89a90199d8de49e0d216c4a86f752a SHA512 4c0f08304b8e96ae48bf8b2073dc5e86ad3aa0f0d835e3b8744a3161c6b6b43b4d6f67d23dee7134220d579804f15ab03af7c12ecab9002644abd48619eb68bb
-EBUILD virtualbox-7.0.2.ebuild 19455 BLAKE2B 387d070776423dc7c63c38f919e12c78aabd2c1605bb7be6b471d605f32057797182612841f70442c366299de3bf5616b9bc6880e693d168c8c927fa9079f094 SHA512 367f413c924054f9a06ff2b0be5e235354aaedd194c2be657499a83e3a1762dcd09dd79914fb23ec08be883c52cbf9247016a44eb0913bdebdf5e589feabc0eb
-EBUILD virtualbox-7.0.4.ebuild 19484 BLAKE2B b491b23a5cc5f130a86e7fca8a039c2e8d8f98003e0c523c3b510ae5c822e9eef2f4a372a9ee84038a3d1643d11050010c215e38ff7a03af4ef452105728ebe8 SHA512 57c3942b797c0f71ba003294ed46e99fd9bf3cc474fb8ed077202264dd982a1c8ccf91922a75c694d929e37483f453b159dc6a640d248f19c5d1f0708b6adf63
-MISC metadata.xml 771 BLAKE2B 0a8fc6454533217d8edba15349eb95d9db1fa076e92c4ca951251d16d1c266e1ee1b1ca8ab41de963ffa010cdd7b73e86ab4e134f7e1b4dbfbb4925000caccf9 SHA512 7630419b477f31b5a2fa93d0909407470ebafda39180217b0f3d43943d5a0cc23b5db39310a9bd76261f23f1025c10d927e771d27fcf50c5789bb04b2c61c0b1
+EBUILD virtualbox-7.0.2-r1.ebuild 19483 BLAKE2B 23a525aee434e2fe0f13e037d38626eece550321ac1e01dddcfb755c002976b64a0226ab2707f35f90bff82750f8cf7f2c3e2505777d21b1db7aadedb84e1467 SHA512 3a6624240bba74f4908eaff7fa5847ef9f7c6f9dca2a01ea198863d038b92f04868e327df5c7a5f933f46aa89f4b9969ec39b72121baaab91589c4786cc2daea
+EBUILD virtualbox-7.0.4-r1.ebuild 19567 BLAKE2B e9735a3b45ef427d78c9c912140cc416bd3798637444cdee03bc7598e04dbe6409945a02f75be218612f38c7b22710837ee3e44c372bc8cba730b0dd94a8aeaa SHA512 52bee2b70e0a1dfaa82332a8d73f42e4d4b7cc6fadd965610d9f594ec38e36c574e171fbb8b548dc3af21997db20fad33e5a80e51bc4d0de1914aa5a68a1c4de
+MISC metadata.xml 852 BLAKE2B 28c7b361100939ca374829ca6a28b9ff8d4fd5ad22d2750f005514ed25e43b9a3c9c00984ae4f94a89109d49b47826676576d25c001fbcdb4ea6d6d8a5e8b9ee SHA512 a67b3217cabe9dfa15d26617ab30218cd3b63a9eca9902213efc420b9efe0174de71b59091b663f8783a88ece857912aaaee8868a3aed3b309e6cd5993c5a7d4
diff --git a/app-emulation/virtualbox/metadata.xml b/app-emulation/virtualbox/metadata.xml
index f2a6f7873402..d675d2f1cec0 100644
--- a/app-emulation/virtualbox/metadata.xml
+++ b/app-emulation/virtualbox/metadata.xml
@@ -13,5 +13,6 @@
   <flag name="sdk">Enable building of SDK</flag>
   <flag name="udev">Controls installation of special USB udev rules.</flag>
   <flag name="vboxwebsrv">Build and install the VirtualBox webservice</flag>
+  <flag name="vde">Support for VDE networking via <pkg>net-misc/vde</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/app-emulation/virtualbox/virtualbox-7.0.2.ebuild b/app-emulation/virtualbox/virtualbox-7.0.2-r1.ebuild
index bc613d5df1fa..dc0c47d4cbb0 100644
--- a/app-emulation/virtualbox/virtualbox-7.0.2.ebuild
+++ b/app-emulation/virtualbox/virtualbox-7.0.2-r1.ebuild
@@ -51,6 +51,7 @@ COMMON_DEPEND="
 		x11-libs/libXt
 		opengl? (
 			media-libs/libglvnd[X]
+			media-libs/vulkan-loader
 		)
 		qt5? (
 			dev-qt/qtcore:5
diff --git a/app-emulation/virtualbox/virtualbox-7.0.4.ebuild b/app-emulation/virtualbox/virtualbox-7.0.4-r1.ebuild
index 5794887625c9..1c3bb805c7ab 100644
--- a/app-emulation/virtualbox/virtualbox-7.0.4.ebuild
+++ b/app-emulation/virtualbox/virtualbox-7.0.4-r1.ebuild
@@ -17,7 +17,8 @@ EAPI=8
 #  See bug #785835, bug #856121.
 PYTHON_COMPAT=( python3_{8..11} )
 
-inherit desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils python-single-r1 tmpfiles toolchain-funcs udev xdg
+inherit desktop edo flag-o-matic java-pkg-opt-2 linux-info multilib optfeature pax-utils \
+	python-single-r1 tmpfiles toolchain-funcs udev xdg
 
 MY_PN="VirtualBox"
 MY_P=${MY_PN}-${PV}
@@ -31,7 +32,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )"
 SLOT="0/$(ver_cut 1-2)"
 KEYWORDS="~amd64"
-IUSE="alsa dbus debug doc dtrace +gui java lvm pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vnc"
+IUSE="alsa dbus debug doc dtrace +gui java lvm pam pch pulseaudio +opengl python +sdk +sdl +udev vboxwebsrv vde vnc"
 
 unset WATCOM #856769
 
@@ -62,6 +63,7 @@ COMMON_DEPEND="
 	lvm? ( sys-fs/lvm2 )
 	opengl? (
 		media-libs/libglvnd[X]
+		media-libs/vulkan-loader
 		x11-libs/libX11
 		x11-libs/libXt
 	)
@@ -73,6 +75,7 @@ COMMON_DEPEND="
 		x11-libs/libXt
 	)
 	vboxwebsrv? ( net-libs/gsoap[-gnutls(-)] )
+	vde? ( net-misc/vde )
 	vnc? ( >=net-libs/libvncserver-0.9.9 )
 "
 # We're stuck on JDK (and JRE, I guess?) 1.8 because of need for wsimport
@@ -311,8 +314,11 @@ src_prepare() {
 
 	# 489208
 	# Cannot patch the whole text, many translations.  Use sed instead to replace the command
-	find src/VBox/Frontends/VirtualBox/nls -name \*.ts -exec sed -i 's/&apos;[^&]*\(vboxdrv setup\|vboxconfig\)&apos;/\&apos;emerge -1 virtualbox-modules\&apos;/' {} \+ || die
-	sed -i "s:'/sbin/vboxconfig':'emerge -1 virtualbox-modules':" src/VBox/Frontends/VirtualBox/src/main.cpp src/VBox/VMM/VMMR3/VM.cpp
+	find src/VBox/Frontends/VirtualBox/nls -name \*.ts -exec sed -i \
+		's/&apos;[^&]*\(vboxdrv setup\|vboxconfig\)&apos;/\&apos;emerge -1 virtualbox-modules\&apos;/' {} \+ || die
+	sed -i "s:'/sbin/vboxconfig':'emerge -1 virtualbox-modules':" \
+		src/VBox/Frontends/VirtualBox/src/main.cpp \
+		src/VBox/VMM/VMMR3/VM.cpp || die
 }
 
 src_configure() {
@@ -327,23 +333,24 @@ src_configure() {
 
 		--disable-kmods
 
-		$(usex alsa '' --disable-alsa)
-		$(usex dbus '' --disable-dbus)
-		$(usex debug --build-debug '')
-		$(usex doc '' --disable-docs)
-		$(usex java '' --disable-java)
-		$(usex lvm '' --disable-devmapper)
-		$(usex pulseaudio '' --disable-pulse)
-		$(usex python '' --disable-python)
-		$(usex vboxwebsrv --enable-webservice '')
-		$(usex vnc --enable-vnc '')
+		$(usev !alsa --disable-alsa)
+		$(usev !dbus --disable-dbus)
+		$(usev debug --build-debug)
+		$(usev !doc --disable-docs)
+		$(usev !java --disable-java)
+		$(usev !lvm --disable-devmapper)
+		$(usev !pulseaudio --disable-pulse)
+		$(usev !python --disable-python)
+		$(usev vboxwebsrv --enable-webservice)
+		$(usev vde --enable-vde)
+		$(usev vnc --enable-vnc)
 	)
 
 	if use gui || use sdl || use opengl; then
 		myconf+=(
-			$(usex opengl '' --disable-opengl)
-			$(usex gui '' --disable-qt)
-			$(usex sdl '' --disable-sdl)
+			$(usev !opengl --disable-opengl)
+			$(usev !gui --disable-qt)
+			$(usev !sdl --disable-sdl)
 		)
 	else
 		myconf+=(
@@ -493,7 +500,8 @@ src_install() {
 	insinto ${vbox_inst_path}
 	doins -r components
 
-	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,VMMPreload,XPCOMIPCD} vboximg-mount vbox-img *so *r0; do
+	for each in VBox{Autostart,BalloonCtrl,BugReport,CpuReport,ExtPackHelperApp,Manage,SVC,VMMPreload,XPCOMIPCD} \
+		vboximg-mount vbox-img *so *r0; do
 		vbox_inst ${each}
 	done
 
@@ -514,8 +522,9 @@ src_install() {
 	done
 
 	# Symlink binaries to the shipped wrapper
-	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
-		dosym ${vbox_inst_path}/VBox /usr/bin/${each}
+	for each in vbox{autostart,balloonctrl,bugreport,headless,manage} \
+		VBox{Autostart,BalloonCtrl,BugReport,Headless,Manage,VRDP} ; do
+			dosym ${vbox_inst_path}/VBox /usr/bin/${each}
 	done
 	dosym ${vbox_inst_path}/vboximg-mount /usr/bin/vboximg-mount
 	dosym ${vbox_inst_path}/vbox-img /usr/bin/vbox-img