gentoo auto-resync : 30:11:2024 - 02:06:22

17 files changed, 310 insertions, 130 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 4258c026de67..bcc6c831e556 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/nemu/Manifest b/app-emulation/nemu/Manifest
index 7e1d209e7788..3f21f8cc94e9 100644
--- a/app-emulation/nemu/Manifest
+++ b/app-emulation/nemu/Manifest
@@ -1,7 +1,5 @@
-DIST nemu-3.0.0.tar.gz 151223 BLAKE2B a71875eb727eed13bc252cee072e1c5b25bf7ea106f51ddddfb8e8bfacf21e030b1c4045de2353d40121b78756b131de1a376891197f6d553430b4b30f53bf3e SHA512 59dae5364659dda5d7c05ba6378b6e20c5d2c5b619cb919c49036918a887574b75f5d568cbfa8f21ecf790778c9de55266f5c5e3e90cc991f613a6408b10a1df
 DIST nemu-3.1.0.tar.gz 164222 BLAKE2B 32600bcdcf2a4f963612a13d89375df2cb4a49a376aec694ada01a86f6c27d6c4198250834cc924bb20e7b60b11ff8643e3bbd30aa883b437cf7828ab00509f2 SHA512 b764e94133e4ab4f052fca77d3dbc64dbbd6a52349828e8ccfe9892f1a9bb290b6578cd8afec7bac84ac339daf9ae11520fce28e842bfa649178fe471014fad1
 DIST nemu-3.3.0.tar.gz 174431 BLAKE2B 62f69bb4789d8b1ce369bca5f82f11e4fc41813ae2732d61f6ae1819bc8e3e052420e6f1a2582c5460dfccd9dd3b98c350968c5a732aad654493f7b03bcacec2 SHA512 3b497d3edccb41ca9b34d6c51079caadc893effd2c026d9b199538574fad173d1c3fe5e5db36b60f07debc774473082b338553e269d1d462203470dee292e107
-EBUILD nemu-3.0.0.ebuild 2149 BLAKE2B ae883b72053d8dcd936c5e1db791ff17d441ce8870085f5ef6b7d63e248de8286a58e57b0a41c9a09d56be2e67a246fc38f2709dce54d11947f5a19649600dfe SHA512 e9f82e767f8ab091bc565f22fd1ca33f202aeb4c69a0d5abceb43b35992c7d4e353a63484bec1d9d776a9bba0bb246159f570cf645d0d3cbc09024bb0bb5f299
 EBUILD nemu-3.1.0.ebuild 1979 BLAKE2B 66843a5bde718a59b2d9b1c075c68fa96d1b4db50708b0f6fcc85827fc3ee26295bd29a121aad1cdfe0e25fc38fa1092b131c6e5bea887f369f54a157c8ce16d SHA512 63e337049da372d3028016a000393ba299ff231d657d53d7ea9c118584e5ef89a7f13ee6ed373858d27b58d479e215179438784c992fb6ca4f3ddae7dae18c75
 EBUILD nemu-3.3.0.ebuild 2026 BLAKE2B c0c188aa96b4e11553c2188beb15cfe4e6380cf5c4b8767c581eec8e4182d85094edeaa16c37c838147bf7ddc66b000dc490f5304ed410fb811b9de0849d4625 SHA512 488da92a701126ec7df229958e253aaf7080651ba2f782e49f4440220981bb7cfc4227e0a3e3a9e603945f931afd6395b2157a80a59be918f404dca78610bd98
-MISC metadata.xml 731 BLAKE2B 6305ec1a1798443ca824b69100b398a141d380dc72bf57e43957da3b0a28cf57bbb24384df4463eb872838695c2609af6d09e7f67125df78d2bd54edfa39ea25 SHA512 01b832c196911dfcb163ec629a4c20119557f312bb1c389d86a67a7f2e3d6f955b3acce9275a001923c7052ab6da15b55ca922f32b03272ed6891cdc47c5b36d
+MISC metadata.xml 605 BLAKE2B cfc5c70b4fb151c617a0c408b8cdf5a84ce1a7927502dbd280b954668f8cd16dd607f8a9f546e04c9e0611665ad0d9d8f7d945afbb8a34ac836a583c71bc40c4 SHA512 bb480ccfe6a0f6aff31055f2f80cc6ce053105ab9f5b19ba8ee576b21d6139c45a8cf37a67e27b6b0bf6c845f696d60605ecf100a34552186e850a01d73d73e5
diff --git a/app-emulation/nemu/metadata.xml b/app-emulation/nemu/metadata.xml
index 29430bd2b950..afc94e945d4a 100644
--- a/app-emulation/nemu/metadata.xml
+++ b/app-emulation/nemu/metadata.xml
@@ -13,7 +13,5 @@
 		<flag name="ovf">Adds support for OVA/OVF import</flag>
 		<flag name="network-map">Adds possibility of exporting network map to SVG</flag>
 		<flag name="remote-api">Adds API for remote control</flag>
-		<flag name="spice">Adds Spice protocol support</flag>
-		<flag name="vnc-client">Adds support for external VNC client</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-emulation/nemu/nemu-3.0.0.ebuild b/app-emulation/nemu/nemu-3.0.0.ebuild
deleted file mode 100644
index 54d5c3502eb7..000000000000
--- a/app-emulation/nemu/nemu-3.0.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 2019-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-info
-
-MY_PV="${PV/_rc/-RC}"
-
-DESCRIPTION="ncurses interface for QEMU"
-HOMEPAGE="https://github.com/nemuTUI/nemu"
-SRC_URI="https://github.com/nemuTUI/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dbus network-map +ovf spice +vnc-client remote-api"
-
-RDEPEND="
-	>=app-emulation/qemu-6.0.0-r3[vnc,virtfs,spice?]
-	dev-db/sqlite:3=
-	dev-libs/json-c
-	sys-libs/ncurses:=[unicode(+)]
-	virtual/libusb:1
-	virtual/libudev:=
-	dbus? ( sys-apps/dbus )
-	network-map? ( media-gfx/graphviz[svg] )
-	ovf? (
-		dev-libs/libxml2:2
-		app-arch/libarchive:=
-	)
-	remote-api? ( dev-libs/openssl )
-	spice? ( app-emulation/virt-viewer )
-	vnc-client? ( net-misc/tigervnc )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/gettext"
-S="${WORKDIR}/${PN}-${MY_PV}/"
-
-pkg_pretend() {
-	if use kernel_linux; then
-		if ! linux_config_exists; then
-			eerror "Unable to check your kernel"
-		else
-			CONFIG_CHECK="~VETH ~MACVTAP"
-			ERROR_VETH="You will need the Virtual ethernet pair device driver compiled"
-			ERROR_VETH+=" into your kernel or loaded as a module to use the"
-			ERROR_VETH+=" local network settings feature."
-			ERROR_MACVTAP="You will also need support for MAC-VLAN based tap driver."
-			check_extra_config
-		fi
-	fi
-}
-
-src_configure() {
-	# -DNM_WITH_QEMU: Do not embbed qemu.
-	local mycmakeargs=(
-		-DNM_WITH_DBUS=$(usex dbus)
-		-DNM_WITH_NETWORK_MAP=$(usex network-map)
-		-DNM_WITH_REMOTE=$(usex remote-api)
-		-DNM_WITH_OVF_SUPPORT=$(usex ovf)
-		-DNM_WITH_QEMU=off
-		-DNM_WITH_SPICE=$(usex spice)
-		-DNM_WITH_VNC_CLIENT=$(usex vnc-client)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	docompress -x /usr/share/man/man1/nemu.1.gz
-}
-
-pkg_postinst() {
-	elog "For non-root usage execute script:"
-	elog "/usr/share/nemu/scripts/setup_nemu_nonroot.sh linux <username>"
-	elog "and add udev rule:"
-	elog "cp /usr/share/nemu/scripts/42-net-macvtap-perm.rules /etc/udev/rules.d"
-	elog "Afterwards reboot or reload udev with"
-	elog "udevadm control --reload-rules && udevadm trigger"
-}
diff --git a/app-emulation/ruffle/Manifest b/app-emulation/ruffle/Manifest
index dc71940379bd..e7032806bd60 100644
--- a/app-emulation/ruffle/Manifest
+++ b/app-emulation/ruffle/Manifest
@@ -1,8 +1,8 @@
 AUX ruffle-0_p20231216-skip-render-tests.patch 662 BLAKE2B 1715c6e5c80c0e4e2a53a70bab319bb78e493a8e48ad01c8ade5ddfdd76e7590506e46f2c2fafb9ac4e732ebefd04fd563e8a2f0c2f5d60bd29d0bf8eb7fbacf SHA512 7d42b5c7f1a11bc7666739fd76e341ff57e2dda25b95e883897d705e0bc37ab0beffa842d34902601b24ced1b0134855c85813067c83a2ea36c73ff7daf7c697
-DIST ruffle-nightly-2024-09-29-vendor.tar.xz 68100452 BLAKE2B 31644cd0015e54ac784be531587c2d44412dcf68dbefd391df44268b31925262bf6ea676ab0a5cbf15d81494109db328b4519742bff61558608a3baf795ff8bc SHA512 1ee34f2fdecb5cc2bf5fdf7d728185a74ca72caf2295096842e557a321e54bc9ae4812c46f18ef42c2033703e26ef4edb124fc0a2a7ad8a9dfb2671473082a31
-DIST ruffle-nightly-2024-09-29.tar.gz 93467899 BLAKE2B 9a9c10686e161ce913892279378bca6c4aea67397bad6fb500e18d5362ee9c6303fcb20238dd8e1fbdb3cbeaa2eaa623eb3b5f2b8c7c9f2ca061c1edb5cc239b SHA512 1a835c5fcb7e6420cea5680af6d14e0bf8d889823b5f2617373aeec88511a31300441c869b53e01e32900e8cb1b2a9e69d52434dc4586354d266a8b6a99af2bb
 DIST ruffle-nightly-2024-10-27-vendor.tar.xz 68393412 BLAKE2B 16a3cb7a16900d21c91e900d0dc8b1036120abd2168fea2482473bb9c2170de4e1d5619fad15dd8b9df44228b93167f1b722311f7f54a5dff1a9c78682fdf04a SHA512 d085af00d4417e961bf7e05b7af1c70f222ac1277c701d67ce99084f85648eba521273269732d74ddc281fb71c8762646cd15c6f1f1a05da788f04ea302696b0
 DIST ruffle-nightly-2024-10-27.tar.gz 93507412 BLAKE2B fcbcd5639bffa8fd1157e1f19765e7ea6721073fc9af6579562a5412d1d07086f53de7d099001ab4eb1b4d497077f09dd1a6da6eaf92c71f12cd1c61633d6f78 SHA512 19790a6641c61ef7e2c1ec94039452c06ea95273de2868198a307d21da955d4196ae33e0807c8f8c74e3f996dc8e26bebdd59ad8bdfa40c9fe6a8afcc745e91f
-EBUILD ruffle-0_p20240929-r1.ebuild 2776 BLAKE2B 337f3f413a94cc237476a40637680a473c81fd285966bff126405e707488e63846d1392ee38419363e3576962df5158d6911671026778e8e0fc075967b9e30d7 SHA512 78cd84a19f4e976f4e2811cf3b2851f195fa829c0c94bc6fa4058ea198a3febadf91b0272e8ed120c5c7668c7b9748f6e64c13f0fa4087508648c2ba48b70ec3
+DIST ruffle-nightly-2024-11-29-vendor.tar.xz 67239116 BLAKE2B d2eaaf7c7528207a1fabc67cd52bab37442e4c09a740842840f3e44a0d79c826f17b1014e30fcbb07b9e6346c48d4a92439c209b7f54ddc1897cb4166546a295 SHA512 fbf8589d2c9b21b1cb6e93963e8350fad77854e351538ac8155f16bbc16f0ecb1680f7ac7066d14e7fffefa5ead217acc8b8a9319ded891abdeffd5890797776
+DIST ruffle-nightly-2024-11-29.tar.gz 94965476 BLAKE2B 9440808ebc0f2db33df06f45eaf6b089b56b6ce604537c522ba57bb2e7e6ada4f334fa4e483547af9b203c4047566d88d88dbca93c6ab2dd8d1a5ced20bc6cdb SHA512 380da319ee84bddc9f12d472516471a18177f748b4072d1853e3aa9d6311226230cf5e38ac4b30041507f836ff620c04aa69e6e45407571d752baf77ac7ea42a
 EBUILD ruffle-0_p20241027-r1.ebuild 2533 BLAKE2B 964fa26f8a82b906670be88c0df4a73bbccd325a28f2454be06ace9eec6e69835d23adc6b20f9f5fec98e1bc6191d5d7446a4edc5c3ca666d92bbcdd78bae750 SHA512 116d0663d0889e4e3b62e3eb4661c6b0c3b6c6eecaabe428d7a38f1d5bece43a0d268e61809b3550e9ae3fba235f26e1dc63284d83ff5a9a07429d5c57878144
+EBUILD ruffle-0_p20241129.ebuild 2626 BLAKE2B 5af26b4a106b4172d339a5bb988454acabab28086d78da632e1ff6413b25c4624147d22f3ab187019c60e1881f849d9e3c4deabc661ff15916e5505bbd4689a6 SHA512 65608dcfa8b94db9f33ce4db8bc2cebc88a5a450aa6127857e2031583627627c2c8915822c0441b2c1e86c8240871249f3effa18ac4a3474de3719090529ad3c
 MISC metadata.xml 327 BLAKE2B aad7b4089000263fccd1bf6af04e88ac138658121db322215ce0dcc85380b12afa01cdcd2be232c5d2c773698b38903759ecaea6f4854d8c90c420c0a43f33b1 SHA512 bb5e665acc6d02ae3e6a22fbb483c293142104e538d386a9b93884f097629dcbb8ca7b614aa20e0358bf22ae36487c7d86cc1467103987845a70ebacc9c4a5d2
diff --git a/app-emulation/ruffle/ruffle-0_p20240929-r1.ebuild b/app-emulation/ruffle/ruffle-0_p20241129.ebuild
index 47beaf5f8067..9a293c3f8717 100644
--- a/app-emulation/ruffle/ruffle-0_p20240929-r1.ebuild
+++ b/app-emulation/ruffle/ruffle-0_p20241129.ebuild
@@ -3,27 +3,20 @@
 
 EAPI=8
 
-RUST_MIN_VER="1.81.0"
-
+RUST_MIN_VER=1.81.0
 inherit cargo desktop optfeature xdg
 
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/ruffle-rs/ruffle.git"
-	inherit git-r3
-else
-	MY_PV=nightly-${PV:3:4}-${PV:7:2}-${PV:9:2}
-	MY_P=${PN}-${MY_PV}
-	SRC_URI="
-		https://github.com/ruffle-rs/ruffle/archive/refs/tags/${MY_PV}.tar.gz
-			-> ${MY_P}.tar.gz
-		https://dev.gentoo.org/~ionen/distfiles/${MY_P}-vendor.tar.xz
-	"
-	S=${WORKDIR}/${MY_P}
-	KEYWORDS="amd64"
-fi
+MY_PV=nightly-${PV:3:4}-${PV:7:2}-${PV:9:2}
+MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="Flash Player emulator written in Rust"
 HOMEPAGE="https://ruffle.rs/"
+SRC_URI="
+	https://github.com/ruffle-rs/ruffle/archive/refs/tags/${MY_PV}.tar.gz
+		-> ${MY_P}.tar.gz
+	https://dev.gentoo.org/~ionen/distfiles/${MY_P}-vendor.tar.xz
+"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="|| ( Apache-2.0 MIT )"
 LICENSE+="
@@ -31,10 +24,12 @@ LICENSE+="
 	MPL-2.0 OFL-1.1 openssl Unicode-3.0 Unicode-DFS-2016 ZLIB
 " # crates
 SLOT="0"
+KEYWORDS="~amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-# dlopen: libX* (see winit+x11-dl crates)
+# dlopen: libX* (see winit+x11-dl crates -- TODO: need to recheck
+# if still correct and for the potential to be optional on wayland)
 RDEPEND="
 	media-libs/alsa-lib
 	virtual/libudev:=
@@ -58,15 +53,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0_p20231216-skip-render-tests.patch
 )
 
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
-
 src_configure() {
 	local workspaces=(
 		ruffle_{desktop,scanner}
diff --git a/app-emulation/virt-manager/Manifest b/app-emulation/virt-manager/Manifest
index 9f13b2535d59..c33d3dbda1fe 100644
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,4 +1,6 @@
 DIST virt-manager-4.1.0.tar.gz 3151412 BLAKE2B 1b4203be81bd7b82251225d691a4d9068f268e610f049bcadb96de5b539e964ca0b001f22f06ddd8266b58b079f60046f6d11942a1e4eadbc43f0607c46bbddd SHA512 725cb5bcbaebaafae417f95deffb4243ccdad769668cba6e1235f4607e2b29dbd099d2a9a3885981158f53ea854dd71cc29ed9d7557b2791161c13d34f2ef883
+DIST virt-manager-5.0.0.tar.xz 1466724 BLAKE2B b8b93587b1e1cdb398f33e4820aeaa9c1aecfbe26cd54597830fcbc009a51e70b0dd10b947b9392a1d3fdc5b28c19573a1d417b5748c38658b6e03725023bcfb SHA512 d0cb7eb844fc98ad29413717e5fa5834bc6f9f6cb6b9339b59c2721bb37a58f71280e3d2a04a64a6021614626329d76c92474f826bb1d9b7a9040b479f20d4e8
 EBUILD virt-manager-4.1.0-r1.ebuild 2721 BLAKE2B 2d2a1bde23307ac37f94c7b3a3eac3ee2d1a8cd425fce7cecaac2f79cb8c23aae81fd49f0d212cfcbc480732fba7ceb27211a34be4a336754c5efaf9f07e0997 SHA512 fe21b35ed5b09836a6b74208d14eb436ff1a4354ae1d31d50ea38b5c861c403be7aeb9ae5d05b0b9516c500a32f67372be75db4a4998ca78f57c5f05c0d0724f
-EBUILD virt-manager-9999.ebuild 2602 BLAKE2B d1dd8dc52bcc542a7ebd02eed656199bfa3893d7a287564a1d6d2f2a3f3b29a0ebb56da4b0ea274d6c792dc3a956441fef313732285c60136d1596c668a2162d SHA512 1f0fa7ea8419ead54c2d2f3a4ee0f353ec4c6d1daf0f72f7c871e078c3c5786715e4de51ff8ebba8090006ff11c1380f61551410adf321a3c10506a1e9a91255
+EBUILD virt-manager-5.0.0.ebuild 2602 BLAKE2B d7c3390c19cc8348fd7a64e9331df902ee6ab5857a2557188386b8b9852112767143328a4bea68c31760e064227de3cbf031b22bf8b06a2bee39eb500950f608 SHA512 7b6b86d6d95da9da4027e325642f6bf8e12f5aa07859d4064530babadedd016d181e4f38fef043d3e059ce55d1214435dfbe0341bc8764cb2a6fc55d1cf0d4bb
+EBUILD virt-manager-9999.ebuild 2602 BLAKE2B d7c3390c19cc8348fd7a64e9331df902ee6ab5857a2557188386b8b9852112767143328a4bea68c31760e064227de3cbf031b22bf8b06a2bee39eb500950f608 SHA512 7b6b86d6d95da9da4027e325642f6bf8e12f5aa07859d4064530babadedd016d181e4f38fef043d3e059ce55d1214435dfbe0341bc8764cb2a6fc55d1cf0d4bb
 MISC metadata.xml 717 BLAKE2B 931cc0f16850272e3d61e4c3421768bd01fd98891d1049d540c36dfcc1cd3872c158796edf33479005fdf07fe449d251ef55562a832db8827e757202ed1b046e SHA512 e40d93e6febcbb48ea6178986736721a5c45bc92073a9108179fd437bb303ba1b6bf0adb6053e36f877b660c413404ef877aefe4d3ef2ec124d6b6cc808a411d
diff --git a/app-emulation/virt-manager/virt-manager-5.0.0.ebuild b/app-emulation/virt-manager/virt-manager-5.0.0.ebuild
new file mode 100644
index 000000000000..d31e6ccd1906
--- /dev/null
+++ b/app-emulation/virt-manager/virt-manager-5.0.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit gnome2 python-single-r1 optfeature meson
+
+DESCRIPTION="A graphical tool for administering virtual machines"
+HOMEPAGE="https://virt-manager.org https://github.com/virt-manager/virt-manager"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/virt-manager/virt-manager.git"
+	EGIT_BRANCH="main"
+	SRC_URI=""
+	inherit git-r3
+else
+	SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="gui policykit sasl"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	|| ( dev-libs/libisoburn app-cdr/cdrtools )
+	>=app-emulation/libvirt-glib-1.0.0[introspection]
+	>=sys-libs/libosinfo-0.2.10[introspection]
+	$(python_gen_cond_dep '
+		dev-libs/libxml2[python,${PYTHON_USEDEP}]
+		dev-python/argcomplete[${PYTHON_USEDEP}]
+		>=dev-python/libvirt-python-6.10.0[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
+	gui? (
+		gnome-base/dconf
+		>=net-libs/gtk-vnc-0.3.8[gtk3(+),introspection]
+		net-misc/spice-gtk[usbredir,gtk3,introspection,sasl?]
+		sys-apps/dbus[X]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/gtksourceview:4[introspection]
+		x11-libs/vte:2.91[introspection]
+		policykit? ( sys-auth/polkit[introspection] )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-python/docutils"
+
+DOCS=( README.md NEWS.md )
+
+src_configure() {
+	# While in the past we did allow test suite to run, any errors from
+	# test_cli.py were ignored. Since that's where like 90% of tests actually
+	# lives, just disable tests (and do not drag additional dependencies).
+	local emesonargs=(
+		-Dcompile-schemas=false
+		-Ddefault-graphics=spice
+		-Dtests=disabled
+		-Dupdate-icon-cache=false
+	)
+
+	meson_src_configure
+}
+
+pkg_preinst() {
+	if use gui ; then
+		gnome2_pkg_preinst
+
+		cd "${ED}" || die
+		export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null || die)
+	else
+		rm -r "${ED}/usr/share/virt-manager/ui/" || die
+		rm -r "${ED}/usr/share/virt-manager/icons/" || die
+		rm -r "${ED}/usr/share/icons/" || die
+		rm -r "${ED}/usr/share/applications/virt-manager.desktop" || die
+		rm -r "${ED}/usr/bin/virt-manager" || die
+	fi
+}
+
+pkg_postinst() {
+	use gui && gnome2_pkg_postinst
+
+	optfeature "SSH_ASKPASS program implementation" lxqt-base/lxqt-openssh-askpass net-misc/ssh-askpass-fullscreen net-misc/x11-ssh-askpass
+	optfeature "QEMU host support" app-emulation/qemu[usbredir,spice]
+}
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index 054d03a48f7f..d31e6ccd1906 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 	inherit git-r3
 else
-	SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
+	SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 2218efab10ad..cfd018f057a5 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -27,10 +27,11 @@ DIST virtualbox-help-7.1.4.tar.xz 1586108 BLAKE2B e8219ed67b1db9a5e4d0271e25980f
 DIST virtualbox-patches-6.1.36.tar.bz2 2733 BLAKE2B dcfebfeca4873d382441515d48b4dfee9343bc7c83ea3cbb5002dbf7975143a79fae9a701b67dc35505e9ca03ff1b6293cb7c3279c4fdfda8ad21ba5fb9b7e87 SHA512 1bed5cdefbf8e7c4b0d9092ba4961ecf2262f27f35c71a91ef6f2e8fe8a1d92ed74f06bafbf58d70ba7165d933997f58073f4d4f4051e3ba5c0339b729066f57
 DIST virtualbox-patches-7.0.16.tar.bz2 6808 BLAKE2B d15fa2ca306375142c3e25d4759d2790b2bb9eb69e333a8773ad500b29dd127b401943abf59ca59d01858a3ed5551fb3a6c93c4c893c8de971a714ce5306d577 SHA512 a488cbc6660fe8637c44cd79d87156609af089988239a7e76fea8a3c7e6319512c574bef2e942b354b14ce671a8e75ab8b2160abf7c40963795ee8a545ecd992
 DIST virtualbox-patches-7.1.0.tar.bz2 5952 BLAKE2B cb024f36249d7d312c9d0f9231c22a9609d45de1d4c82ca36672fea703765d437d7a414d810adb5eb5f2db92018b669c3b5d0c32372c5ced90f5e13f82344ffa SHA512 c6ef54b7d60f01f5f2b89c6fd7f8b7b509bc62bca0502114cedcbaaf9643445ea413bba481dcf43fb96b5b4d94d64395965682c1ee160d889213615c9272184c
+DIST virtualbox-patches-7.2.0_pre20241128.tar.bz2 5982 BLAKE2B b502d73edd9faa527b4cb88f7ff7d44604120fa1acae5223752361c3e2251a1f37562b82a250d6e4169171b8bbff890b726b7ce8068e76178319d899c58fe0db SHA512 299be2d5bccab9db6a6246bf75acaccb745c4bac64deef1ceb45e3a5182fa6a5d960d0f55494a1ffc924bfe76ef16b6932b2562d7d27aac5c862faa96db0c0ab
 EBUILD virtualbox-6.1.50-r3.ebuild 18929 BLAKE2B 5361667320ccdc5534959f12f40665f7a8a19e8b09b0b172c3537bb0d93a7bb0117dc35114e27e7a6de35eefb0811aaf94c54568b32cd1dcc62524ec22d7b393 SHA512 54719ef39276acff779d399ed744d5aef88e6275dce7d06cec9fc611335d243b8dd1b817aea56fa5b93b96345f7b19dccdf8facdfc49e58d42524f9050ba7776
 EBUILD virtualbox-7.0.20.ebuild 20842 BLAKE2B ecbe8b10b4f87550cdd04b878009b5443d859f141b5b214cab7cb53c693ee00470e89140f6ee2c66a24435ceba7484ded028a9594b8a7a7594cd00cd59a4ca74 SHA512 9fc697f31fab0ffbea2ac94fe031400ce544d93069a720fc3871452d8074e97fd4a075603732ca1bb5441ddfccf95664f3b5f5ff44b2dd3be4554129121918ba
 EBUILD virtualbox-7.0.22.ebuild 21435 BLAKE2B 8c230a12c33356124ebfb034c560b3b00b950acb8710760296d57f65628481159fa62f905fb836317849744684f78a4dc31afeeaf2b4a1f697e37a37143bc735 SHA512 852e321e94a461164906619e7b1da7420ffe8963f4bf63ba18e14d17e80fa498a823cfdcfb40d7809cda86004eb9fbf746ff9f0fbc7695a12bb7bc97aba828e0
 EBUILD virtualbox-7.1.2.ebuild 21056 BLAKE2B 833942382aea99f46ee96c3a6c7e7d0b2249a95a294fb438b71fcae7da89bc612620f3b68cf07ba4d0d5d4c08c167b35dba71c44aa8da29dea5ec63b1e6544b9 SHA512 739a706265dbefe62af5985c134effe80c6a78d6928c3bb4ff10589b57441a783184b2fc27e50bc4d7296d8a9966f64cf24cde553e45e3771c7b29d3fdb73dd7
 EBUILD virtualbox-7.1.4.ebuild 21860 BLAKE2B df58fc3ecd623b5cc4fa59abba724a4ce7380adeaaae5ecd4710383c009b67a12a738bb79d63ce4793e934d1b72ea11e2765862b7c60b0b7448f6a8acbf29f44 SHA512 b6e24aa60cc79e55e2dcdb4a355fef623c2e8226fb3ad758d7398c5c270e05049ead8cbe241011983e063ce2cad766fdad3c17a637fa3401ed5837bb9053c013
-EBUILD virtualbox-9999.ebuild 21786 BLAKE2B 5afb7f0128428c8b9e21566be919375da4b54640cdf8742c4ae0cca6f487292ac8701af19f2aedca2eb8a41be9788d6c02ec3a053ecfd4e696bda193be050d3a SHA512 f886f7caa42c27f02288adef130ccfc919c5d730e1b8fa696915598a124c32a93259c9d75a1ad18e8ca8c621fe71b85503eb876e4de8215a729ac7ccfdb6b4f0
+EBUILD virtualbox-9999.ebuild 21810 BLAKE2B bbedc56f49a5adb7df680abfa95b301b9cf873c4dc36268db6dd9b8465ada24f4112d8259953cd2104fcd49be1df60d05d225b263d9f72e7940cdb520106da0a SHA512 c923ee5a3d61999d7d77f904ced781112232770d387462565219dc04743ddfd4622bd8bc950a55cc6f456b9306687e276ecbf135dfbd025f8a8d43eaee836b2a
 MISC metadata.xml 948 BLAKE2B c074e494d9affda91addd2355f8e71616602102b4cc151d2b45efd04754f1f92621ecd313dbe3baa44c3301f57b61e9cff780d445c2ea3d19ce3d9c8ae05213a SHA512 5338812da9334aedf08dd7a31a4a07c7bfa8232e8f0de6af9de9ac0f5585397cea16e66cb73d56632efa4cf21386782108182d803de6ff45c08082a13dc5fed9
diff --git a/app-emulation/virtualbox/virtualbox-9999.ebuild b/app-emulation/virtualbox/virtualbox-9999.ebuild
index ad3e2aba25bb..1306d563b1c4 100644
--- a/app-emulation/virtualbox/virtualbox-9999.ebuild
+++ b/app-emulation/virtualbox/virtualbox-9999.ebuild
@@ -36,7 +36,7 @@ DESCRIPTION="Family of powerful x86 virtualization products for enterprise and h
 HOMEPAGE="https://www.virtualbox.org/"
 ESVN_REPO_URI="https://www.virtualbox.org/svn/vbox/trunk"
 SRC_URI="
-	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.1.0.tar.bz2
+	https://gitweb.gentoo.org/proj/virtualbox-patches.git/snapshot/virtualbox-patches-7.2.0_pre20241128.tar.bz2
 	gui? ( !doc? ( https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-help-${BASE_PV}.tar.xz ) )
 "
 S="${WORKDIR}/trunk"
@@ -135,7 +135,7 @@ BDEPEND="
 	>=dev-lang/yasm-0.6.2
 	dev-libs/libIDL
 	dev-util/glslang
-	>=dev-build/kbuild-0.1.9998.3592
+	>=dev-build/kbuild-0.1.9998.3660
 	sys-apps/which
 	sys-devel/bin86
 	sys-libs/libcap
@@ -198,7 +198,7 @@ REQUIRED_USE="
 
 PATCHES=(
 	# Downloaded patchset
-	"${WORKDIR}"/virtualbox-patches-7.1.0/patches
+	"${WORKDIR}"/virtualbox-patches-7.2.0_pre20241128/patches
 )
 
 DOCS=()	# Don't install the default README file during einstalldocs
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index c4159ac880a0..b3a8490e4245 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -23,8 +23,9 @@ DIST xen-4.18.3.tar.gz 51911584 BLAKE2B 01bc915ea88c6a80608bb4f9c37ec75cd4abcc78
 DIST xen-4.19.0.tar.gz 52011199 BLAKE2B bc6502bf5b68ab130f1d64e20e8a6d8ca656240545f0a4f5fe500413504c7610352bd7577f0e7e9d9354745afaf39d3edd3ad775718e20d14181dd2dca28ec0a SHA512 bc0b4257cab66b0f9d4a1fe72e07f4980398b2934989c02ffe488b465eca3443caa0ded903871480aba6e36212921f335b68d67f202f22548c31899225f2d657
 DIST xen-gentoo-patches-4.17.0-gentoo-patchset-2.tar.bz2 4001 BLAKE2B 7afce426759952e202a1dd819fe0a23108072bf9552ba14a0bd787a96ffe5e7a36f37e03dad8db9c46f5731acbc122c258eef6d517816aad9c8db1ca64700d19 SHA512 bcb1479f9ff5e194a4e452da9d0479febc2bcd465b4be69bb8f30e2e6b858fb77a71216dcb3e74dfb65e7ca6513742c294cd6b5eaa5ce82d0b122a00f1cbc450
 DIST xen-upstream-patches-4.18.4-pre-patchset-0.tar.bz2 30806 BLAKE2B 29654a8bbf5515ba51b278cc62222bc741ddab59976655e4b5df02fe75277d20686e4f4cda7a38997fab86a179fa511fc6c2b9c830080a4af80a24215c0e6e71 SHA512 b188c5111714eb1775ee7ad91ed443c03cdb6342c2e26ad5e2f4724f82220191695ecb0b616c8dc3956c07560d0d4056eb1cfdd1143a7b138c4a8669ac24c945
-DIST xen-upstream-patches-4.19.1-pre-patchset-0.tar.bz2 39681 BLAKE2B cdec8853ee6b7f6ccac332bd6dcb65294f282e14c6085d4a3c4f90fa6c96850acc5bd0e4cb27ef71d7145e6bdc780ba0223c6e2ba13bea77b9f3803f32954918 SHA512 7ecf5380211cebab5bed3276caa23d9b3fffa0dabfbcb46c1900e35883e8af21773a9c7bcc0a6b584ac3ba61e7cb49eed2bc5492e2571268929e59dde5856170
+DIST xen-upstream-patches-4.18.4-pre-patchset-1.tar.bz2 55216 BLAKE2B 9cc25750cc48db6efbc349278a89cfc3880326ad4556d5dad28a016bbf270435acff606d545420d44a3143ab1f540156c6997ad676d36b3ec3d5e85a63fb495c SHA512 3752998f804c7e1e5dc327a1a84dafbdac6c06eefa404766fc94089521d836a5fecd2f760e229200d4b6267af88f55b119505336be4d57e9fd74457b122f896f
+DIST xen-upstream-patches-4.19.1-pre-patchset-1.tar.bz2 77344 BLAKE2B 8f201a0aee7f0dda2d06f2a476de213d835b94e55ff0c5ddbcae539db49dc51993bf424a68fcc70e67469394590e6d2256107efd9cfc578c9a09f5c55750c828 SHA512 a8ebf31d5805d238298b77ff086270b7077f38786249237601eba716b62ad63b4b8f13158ed6c3ca126f78d7bf991a55ffce85fd8826d59061410a5bc24bb883
 EBUILD xen-tools-4.18.4_pre0-r1.ebuild 16080 BLAKE2B 1a90ecebe2131f6af0320e6b0f16fbcc3b7eb2d260be1348b87869c13abec599c580a704bc84d87f0720faf9a1f52bca91ce844e99ae0ec3a6e07d5d4bf50c9f SHA512 832202e5ac853d7136736f4697146f093dbcd7921506049890e94f1c526a1d4ef1e397cf05763cb053be8acee5e45a74f6a4fe840c79aaf2f30532f0159ac238
-EBUILD xen-tools-4.18.4_pre0.ebuild 15962 BLAKE2B ec78b2f6f45a35638669b3b14d34788e306c06525049408c21ee2594fae231b4890858ff26601d67175cea41b69fcb6340db915098e136ed378653e5156fe2c9 SHA512 9462f80b12d03c817446acf48ca26d3819e678d5bff9cc834bafd1b8b7743437b17d1ec7c9d8a19fccfb7a9f197cf67783b57897d76c94d97f61dd5bf7ca3a73
-EBUILD xen-tools-4.19.1_pre0-r1.ebuild 16082 BLAKE2B 2c2bca859396f11c22fe3e5a15c5fb4fe69411215e4c82e488ae8134b3039e007bbc42e853ce1caaf5a2394e5b1f4d20ff3292847b30a13f3ed1f2db3550deab SHA512 412209a31e3369cf586d190fd8e863bb032f7db643a4f8bd45d80de5b8de7516ef20e5c62b14866556df0dd11e92c5df148aac806b826a959da2184f1f311e6d
+EBUILD xen-tools-4.18.4_pre1.ebuild 16082 BLAKE2B bf0baa7519f822ce7df12656a0a7b31850693ba1ba9c7175d5359668e9a4394355e2bda05427002c3739c32347c2f19e0cda13161b7fa1df98929760643f2977 SHA512 9923cbf3d7d17bbcbe74d2f97c2cdd563a9efdb14dd28cceb898bde75382604b9ef4e7fd2ff0c8cb29bd7d0dc81740f3824d5b04036197ccc0d3030c9f772d3b
+EBUILD xen-tools-4.19.1_pre1.ebuild 16082 BLAKE2B 9699af8ab7d420ba11a1fb90b5eff3bf6877e2bb960092b19beee5fe63ec3f15858f839493f3c7148b5b975e0674388dc665449842df1205a83b745cc0126bc5 SHA512 2b8efc9486a4850092fdc07f11fc95c379a18c7302e4f79e6917e3950f834b811b3251a88f9f43430a6cbd3daf81442df8059fe70fe073acb36964317d9ed221
 MISC metadata.xml 1562 BLAKE2B a619e34e6fec4c6ffc00fd098dc040c5bb464ed7f2032db2e933fada0614e82c21269175f37720a123404551474e2aeeb2728b405ff93f9b4d9d092d027e0839 SHA512 f45c793a4b4819f0e50501ddc85acdaf99e4d675530712f8dccfb5166d071ae8ed07917a61d56037d6ba3a54123f72f4512d8c11643ea8c6e507feb9d29594e7
diff --git a/app-emulation/xen-tools/xen-tools-4.18.4_pre0.ebuild b/app-emulation/xen-tools/xen-tools-4.18.4_pre1.ebuild
index 1ef6d3e68c50..59abdfb47d72 100644
--- a/app-emulation/xen-tools/xen-tools-4.18.4_pre0.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.18.4_pre1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://xenbits.xen.org/git-http/${REPO}"
 	S="${WORKDIR}/${REPO}"
 else
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 	SEABIOS_VER="1.16.0"
 	EDK2_COMMIT="b16284e2a0011489f6e16dfcc6af7623c3cbaf0b"
@@ -25,7 +25,7 @@ else
 
 	XEN_GENTOO_PATCHSET_NUM=2
 	XEN_GENTOO_PATCHSET_BASE=4.17.0
-	XEN_PRE_PATCHSET_NUM=0
+	XEN_PRE_PATCHSET_NUM=1
 	XEN_PRE_VERSION_BASE=4.18.3
 
 	XEN_BASE_PV="${PV}"
@@ -370,6 +370,10 @@ src_prepare() {
 	sed -e "s:\$\$source/configure:\0 --disable-containers:" \
 		-i tools/Makefile || die
 
+	# disable gettext (Bug #937219)
+	sed -e "s:\$\$source/configure:\0 --disable-gettext:" \
+		-i tools/Makefile || die
+
 	# disable abi-dumper (Bug #791172)
 	sed -e 's/$(ABI_DUMPER) /echo /g' \
 		-i tools/libs/libs.mk || die
diff --git a/app-emulation/xen-tools/xen-tools-4.19.1_pre0-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.19.1_pre1.ebuild
index ab2e6bbf30a7..51362e2df46d 100644
--- a/app-emulation/xen-tools/xen-tools-4.19.1_pre0-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.19.1_pre1.ebuild
@@ -25,7 +25,7 @@ else
 
 	XEN_GENTOO_PATCHSET_NUM=2
 	XEN_GENTOO_PATCHSET_BASE=4.17.0
-	XEN_PRE_PATCHSET_NUM=0
+	XEN_PRE_PATCHSET_NUM=1
 	XEN_PRE_VERSION_BASE=4.19.0
 
 	XEN_BASE_PV="${PV}"
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 3dbcd668f36e..359d275091ff 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -2,7 +2,9 @@ DIST xen-4.18.3.tar.gz 51911584 BLAKE2B 01bc915ea88c6a80608bb4f9c37ec75cd4abcc78
 DIST xen-4.19.0.tar.gz 52011199 BLAKE2B bc6502bf5b68ab130f1d64e20e8a6d8ca656240545f0a4f5fe500413504c7610352bd7577f0e7e9d9354745afaf39d3edd3ad775718e20d14181dd2dca28ec0a SHA512 bc0b4257cab66b0f9d4a1fe72e07f4980398b2934989c02ffe488b465eca3443caa0ded903871480aba6e36212921f335b68d67f202f22548c31899225f2d657
 DIST xen-gentoo-patches-4.17.0-gentoo-patchset-2.tar.bz2 4001 BLAKE2B 7afce426759952e202a1dd819fe0a23108072bf9552ba14a0bd787a96ffe5e7a36f37e03dad8db9c46f5731acbc122c258eef6d517816aad9c8db1ca64700d19 SHA512 bcb1479f9ff5e194a4e452da9d0479febc2bcd465b4be69bb8f30e2e6b858fb77a71216dcb3e74dfb65e7ca6513742c294cd6b5eaa5ce82d0b122a00f1cbc450
 DIST xen-upstream-patches-4.18.4-pre-patchset-0.tar.bz2 30806 BLAKE2B 29654a8bbf5515ba51b278cc62222bc741ddab59976655e4b5df02fe75277d20686e4f4cda7a38997fab86a179fa511fc6c2b9c830080a4af80a24215c0e6e71 SHA512 b188c5111714eb1775ee7ad91ed443c03cdb6342c2e26ad5e2f4724f82220191695ecb0b616c8dc3956c07560d0d4056eb1cfdd1143a7b138c4a8669ac24c945
-DIST xen-upstream-patches-4.19.1-pre-patchset-0.tar.bz2 39681 BLAKE2B cdec8853ee6b7f6ccac332bd6dcb65294f282e14c6085d4a3c4f90fa6c96850acc5bd0e4cb27ef71d7145e6bdc780ba0223c6e2ba13bea77b9f3803f32954918 SHA512 7ecf5380211cebab5bed3276caa23d9b3fffa0dabfbcb46c1900e35883e8af21773a9c7bcc0a6b584ac3ba61e7cb49eed2bc5492e2571268929e59dde5856170
+DIST xen-upstream-patches-4.18.4-pre-patchset-1.tar.bz2 55216 BLAKE2B 9cc25750cc48db6efbc349278a89cfc3880326ad4556d5dad28a016bbf270435acff606d545420d44a3143ab1f540156c6997ad676d36b3ec3d5e85a63fb495c SHA512 3752998f804c7e1e5dc327a1a84dafbdac6c06eefa404766fc94089521d836a5fecd2f760e229200d4b6267af88f55b119505336be4d57e9fd74457b122f896f
+DIST xen-upstream-patches-4.19.1-pre-patchset-1.tar.bz2 77344 BLAKE2B 8f201a0aee7f0dda2d06f2a476de213d835b94e55ff0c5ddbcae539db49dc51993bf424a68fcc70e67469394590e6d2256107efd9cfc578c9a09f5c55750c828 SHA512 a8ebf31d5805d238298b77ff086270b7077f38786249237601eba716b62ad63b4b8f13158ed6c3ca126f78d7bf991a55ffce85fd8826d59061410a5bc24bb883
 EBUILD xen-4.18.4_pre0.ebuild 4536 BLAKE2B 30a527849841dd6c3850606db1cf38f8d3a58ad356e77d873ad60ebb59bbc1088d244095c0c7e81c2dfd56bc635cf622efcffb280baf16202e7cfc4211a1e23f SHA512 cdda47bbc483affabf4d9145695e6c3d3f4adfed02ce7f694e55d0456b7f92d246d61ceea0a6e6b97b28e052216af7825798b618c84b835a6e65574cb448bb5e
-EBUILD xen-4.19.1_pre0.ebuild 4537 BLAKE2B 6533e5f9ce30cd3a62dc22a9607b136a4cc2a4a06c652c7297e6521089b4da8ff1bec00f51c5650049228c266b6828dce5aa9f1eed64f46f653b508ba84e002c SHA512 3bf3d7e1c3c9d8646d1a4cb0fcfc99d5fcda5bd8e53f7fa3dcbcd1763c1cb6bc8a7df081961c9c92c4c4567a31291f4e9a71749d189a2b5f86f1137e43726a37
+EBUILD xen-4.18.4_pre1.ebuild 4537 BLAKE2B e7de9d5f0df90c0be06196efec65da2ba9da21b92779ecb7ef47b2c63e46e5d1f4cc69bd3bcb40bb3a0dbbb811ca6940975a6ba00801b5707263d56d679d331a SHA512 0d22b1c5ec67136016a413059dd04e64bcc71b12cda32f25db5c2ba5266ee912ca4b5c55264544f2f6ace941f180d47535742309e8f72bee372e0772026a717e
+EBUILD xen-4.19.1_pre1.ebuild 4537 BLAKE2B 880fe82fa2833f39e9bcc8e7c74deb78a9b074bc5b4d2a933ad4da05f0421dff5e95a4472aab184ba8c559ebfe715b6808724031c3aadfd70a78334769d4ce2b SHA512 8cf01599e59129df7775a323c37bb2b0fe692bc423280a74d99a3fcfa00e01d821f03f77b454f4a3b845892051b8ed51422b8c4145e4935df5ff067db8ed782a
 MISC metadata.xml 775 BLAKE2B 35370f9f1a629b090ffaf3c984b54fdc195c7f60e5ca8ec12c51d31494ee238e4fc9d29e0aa724109a992a7d4ab0e1663a9764b31f7c7eb98fbbcab68d386809 SHA512 68e59dc5fc7d9478fcef4e346d0124e8fa7497a4fbfce4bc42ff323dc5cd73d5b26d6819639268fc8e555670168835a3dcfa9596eadd74975585183fcd366d18
diff --git a/app-emulation/xen/xen-4.18.4_pre1.ebuild b/app-emulation/xen/xen-4.18.4_pre1.ebuild
new file mode 100644
index 000000000000..16b027565136
--- /dev/null
+++ b/app-emulation/xen/xen-4.18.4_pre1.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit flag-o-matic mount-boot python-any-r1 secureboot toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://xenbits.xen.org/git-http/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm -x86"
+
+	XEN_GENTOO_PATCHSET_NUM=2
+	XEN_GENTOO_PATCHSET_BASE=4.17.0
+	XEN_PRE_PATCHSET_NUM=1
+	XEN_PRE_VERSION_BASE=4.18.3
+
+	XEN_BASE_PV="${PV}"
+	if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
+		XEN_BASE_PV="${XEN_PRE_VERSION_BASE}"
+	fi
+
+	SRC_URI="https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz"
+
+	if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then
+		XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}"
+		XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}"
+		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/${XEN_UPSTREAM_PATCHES_NAME}.tar.bz2"
+		XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}"
+	fi
+	if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then
+		XEN_GENTOO_PATCHES_TAG="$(ver_cut 1-3 ${XEN_GENTOO_PATCHSET_BASE})-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}"
+		XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}"
+		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/${XEN_GENTOO_PATCHES_NAME}.tar.bz2"
+		XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}"
+	fi
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="https://xenproject.org"
+
+S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+boot-symlinks debug uefi flask"
+REQUIRED_USE="arm? ( debug )"
+
+DEPEND="${PYTHON_DEPS}
+	uefi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!uefi? ( >=sys-devel/binutils-2.22 )
+	flask? ( sys-apps/checkpolicy )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+	use uefi && secureboot_pkg_setup
+}
+
+src_prepare() {
+	if [[ -v XEN_UPSTREAM_PATCHES_DIR ]]; then
+		eapply "${XEN_UPSTREAM_PATCHES_DIR}"
+	fi
+
+	if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then
+		eapply "${XEN_GENTOO_PATCHES_DIR}"
+	fi
+
+	# Symlinks do not work on fat32 volumes # 829765
+	if ! use boot-symlinks || use uefi; then
+		eapply "${XEN_GENTOO_PATCHES_DIR}"/no-boot-symlinks/${PN}-4.16-no-symlinks.patch
+	fi
+
+	# Workaround new gcc-11 options
+	sed -e '/^CFLAGS/s/-Werror//g' -i xen/Makefile || die
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use uefi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="/boot"
+	fi
+
+	default
+}
+
+xen_make() {
+	# Setting clang to either 'y' or 'n' tells Xen's build system
+	# whether or not clang is used.
+	local clang=n
+	if tc-is-clang; then
+		clang=y
+	fi
+
+	# Send raw LDFLAGS so that --as-needed works
+	emake \
+		V=1 \
+		LDFLAGS="$(raw-ldflags)" \
+		HOSTCC="$(tc-getBUILD_CC)" \
+		HOSTCXX="$(tc-getBUILD_CXX)" \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		LD="$(tc-getLD)" \
+		AR="$(tc-getAR)" \
+		OBJDUMP="$(tc-getOBJDUMP)" \
+		RANLIB="$(tc-getRANLIB)" \
+		clang="${clang}" \
+		"$@"
+}
+
+src_configure() {
+	cd xen || die
+
+	touch gentoo-config || die
+	if use arm; then
+	   echo "CONFIG_EARLY_PRINTK=sun7i" >> gentoo-config || die
+	fi
+	if use debug; then
+		cat <<-EOF >> gentoo-config || die
+		CONFIG_DEBUG=y
+		CONFIG_CRASH_DEBUG=y
+EOF
+	fi
+	if use flask; then
+		echo "CONFIG_XSM=y" >> gentoo-config || die
+	fi
+
+	# remove flags
+	unset CFLAGS
+
+	tc-ld-disable-gold # Bug 700374
+
+	xen_make KCONFIG_ALLCONFIG=gentoo-config alldefconfig
+}
+
+src_compile() {
+	xen_make -C xen
+}
+
+src_install() {
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use uefi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	xen_make DESTDIR="${D}" -C xen install
+
+	if use uefi; then
+		secureboot_auto_sign --in-place
+	else
+		# make install likes to throw in some extra EFI bits if it built
+		rm -rf "${D}/usr/$(get_libdir)/efi"
+	fi
+}
diff --git a/app-emulation/xen/xen-4.19.1_pre0.ebuild b/app-emulation/xen/xen-4.19.1_pre1.ebuild
index 3abdbca38ccb..41c66e724d68 100644
--- a/app-emulation/xen/xen-4.19.1_pre0.ebuild
+++ b/app-emulation/xen/xen-4.19.1_pre1.ebuild
@@ -16,7 +16,7 @@ else
 
 	XEN_GENTOO_PATCHSET_NUM=2
 	XEN_GENTOO_PATCHSET_BASE=4.17.0
-	XEN_PRE_PATCHSET_NUM=0
+	XEN_PRE_PATCHSET_NUM=1
 	XEN_PRE_VERSION_BASE=4.19.0
 
 	XEN_BASE_PV="${PV}"