gentoo auto-resync : 16:05:2023 - 16:07:12

11 files changed, 55 insertions, 1415 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 4293da1103d1..9da84ad89ab0 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 4480fe186663..b58bf22acd32 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -2,6 +2,7 @@ AUX README.gentoo 572 BLAKE2B 1284e49ac0bde0e1c1ad32b7dc200848c0837378224daed628
 AUX stubs-32.h 537 BLAKE2B 456f57c4a4ba574c737f1b84b62a085d0290ebc8981a5f96fdebc16b6c86c801c5ca8dde135e803f46c5ec875fdd74770f6ed754880bc7af930b8ce1ce972fb7 SHA512 55308dbedaa91909a2213940f7a7b574cabe6b5a3104761a2a6f28d6aed00164544488c00cbf9d66a9a370a14c6b6d3a00434efd3ff0228cc8e4d81af19c0e68
 AUX xen-consoles.logrotate 63 BLAKE2B 4ae650876035d2815dbcacc6ed618c58cc61d9cfd9cde1b6c2f792cbf51898c577ef979443ad827fc82ced4d21ae24836883160b20d697965ef5377d50c2973c SHA512 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426
 AUX xen-tools-4.15.1-brotli-gcc11.patch 1283 BLAKE2B 846d0d3b687f576bcc737a53afe2885d9e8a261e3a23ee18a5871af2bafef6fa4208f1eeb557c843140021b2144d8c51c3e9682233dcff6a0b4148122eacb9ee SHA512 2c3426573db4ab27eb48aac5736c5094c7160893ad318ebf69a6caf64e20881a526658ff6f72cacc357b615c8795a777ebc897ba586f28fbbc08dca28caaaf0f
+AUX xen-tools-m4-ptyfuncs.m4-tools-configure-add-linux-headers-for.patch 1044 BLAKE2B 684171bc305782058c34f22a658f63ba7a7e7dfa378c4fea6ae6e1f068bf8c828f76ddd809a4188c369076dd568bb4d82672b478a8720644ddf91afa79c0712c SHA512 0442a734555475dbad75bd0a4b57a94a81b93b7ecaf41e0773c8081e78be7851d36b299a62c5a2d2486af8263cae485cc52e5fd830dd179ac31425275576b5f9
 AUX xen-watchdog.initd 181 BLAKE2B b8529db36016b6f71520c1e4119a2ea5c4d3f52f2c77ccb5603efb67bcdd88b8273a359f6ae0df61763ea31a50bd8a0be775df5aabbd17c90e7928c8ed5b7c0e SHA512 5f6da91c0067b93f1b9f1a2f181caf34034896944ab26f5820e860336e3b3159a65e8a7f39ea273927d64d58a2fe4d918d2c3234f2b03ab0770e0c15d6dfe84b
 AUX xencommons.confd 109 BLAKE2B 6a2023a95cd1e411abe57c321e1c5f13096b51299817ce547e8ff042cbdbf859a5c1f50135e946fe650e0ec9221db3389ff50bc23f6d88d0c0fd1805b64786be SHA512 f0bbc9647cecc6cf806e3059960fbe39b23304d9ca0955fb261e1d320b9b9ce59e5b28cc4b5a9922295b31221f0cd8f0cccb405520e097a7b12dc6ddb3294c17
 AUX xencommons.initd 1451 BLAKE2B ef0cfa4fc7c4071b7a5822f4ad8983b9f7c386505e8b6967139c8921b002ff03a0a2be235060160d00d3890cffd15300b588c2b06a67a839df110c3737bbaee5 SHA512 1d25ae65ff073a5fc00aed2011af9e38f53d179dfadd06f791a4599c070a5ddbbf75d80b37e219b6de5d09e3466510c241311cbb018ef22cd3c97ce3b7c15b3c
@@ -27,19 +28,15 @@ DIST seabios-1.16.0.tar.gz 635419 BLAKE2B b645f20bae341d56ce4fc4a7044446050d8490
 DIST xen-4.15.4.tar.gz 40820669 BLAKE2B 22edaf817851856c777d02b5211be932c1731bf50fb582545f948c7e8f871937f7c94636496a480642fa7ed8222e12dda091a06638c75b9ee935f3ff9bc2aea0 SHA512 fa6a4991c0699025af163ed117f8d0523c0a482102464615025eb3575d755ffacec5df394e3fe01871cde6028678f654d99f8e3c2533b138765971a2a7994cb8
 DIST xen-4.16.3.tar.gz 45003057 BLAKE2B 6092cff33bffed1b6133daf8d3ce53c57204297e66df6ac58266b2da8d5585df62ae718cc8afaad36ebe6dabdce65b9979b0d13b88e60f2b23c01be21ae4db8e SHA512 b8cbd6f95681de5f824ada2d3cbe0653a38514a18df0dafcf811fb255219c7abec96f46217bdb0c83e1119f685da9a6af7194eeaa94f1cc3c892702782133b4f
 DIST xen-4.16.4.tar.gz 45008515 BLAKE2B 6637cbebe76e48ca6d2ea885b9c52244efe2fa8188c1649f6a5444fd980a8bfcff5508c8496b89b8a31ba1c4e06f47047b7289513cf22fb86d2b76a77b3cfd21 SHA512 1b5a167a9f5537b5311ef1cb56e0e6ffda0e4e569ef0534e47b4f4a528067bda46fb58b2a01abc02e8c38b2b70207fb201a5d4d10274fba70135eaa8e318e055
-DIST xen-4.17.0.tar.gz 46484553 BLAKE2B a4665fb557eb264566179bc5b2678d44f694ef5b20bb7dc58c8a7e6fcdf0145f25a462cfe2ad35be67a4a5ca4579c03eb092954915953e2ab98ae90b4ea983f0 SHA512 8aa7c3025c81127a4f653411bc1cbe8fc27b767a2f96a2a454329a6773cb74d714ecc1ff011a8e7169c6b83b2cc5cb39c39798bd6b1178df75ce9ff00f5a1011
 DIST xen-4.17.1.tar.gz 46487600 BLAKE2B 56fefc4e6f859129f3faae28f7060b5228f25b1b9d4496e127c51f44e0c97508adaba77da2b8532e578bb8e4ea421a0d56aa1c4d1b9985e85294b210179410a4 SHA512 bd98c5a2d75a0368ef312274b8e47f27db7f6b79302fd0c8b4975185e63640f98d9302e2834344acc1e97133e19f3993359dfab85aea5928008debada78c5f7a
 DIST xen-gentoo-patches-4.15.3-gentoo-patchset-2.tar.bz2 4681 BLAKE2B 59fe5c2d5f3b975f281778ee96f8771debde7ae738636fc8294e7e2578dffc40938d8c48e4e94f0341762b2ba8e1b6769f71b7783322fb3b2a0a187bbf2b5104 SHA512 8540aa3631277fb652f90c53f6f5b4e9d119a7ed267dec96d7aecca4eac2c465ec3be32b0b82057e79f858cc8115bfdfbf2af5c4879a0be3f98ed68cbe64fdae
 DIST xen-gentoo-patches-4.16.1-gentoo-patchset-2.tar.bz2 5403 BLAKE2B 7fa3b4aa123b2deed260d02b8d34a35dd205207038edb92569278b25c6fe32e0f0e3857c07755553e047f0eb0d9fe7f8b0816e0f3d7f68aee7929afaf6611dfd SHA512 9e7d25640b24235acf756b031b8b7cee582dded65fe7b94a706c990232e9704d574036c3a9605f285e8e9534578d100a3f38719b27b22775f17ef8f68287997e
 DIST xen-gentoo-patches-4.17.0-gentoo-patchset-0.tar.bz2 4474 BLAKE2B aa367a4ccf96a61c04c52e415d7143ca946323d7d50d6ab16ad7a917279ad4b1aac802e35e7e306c3a244317db713e913dc8d6343717b2307ccd049adb956a0d SHA512 debba71b17be7b1bb9a70f01782c12c3c053cc2fb1f4ad95829356ee365878aad68430055d4b8c648ef1ff54cb9e3e7c03d40d14c560d51f8ac4fce2b8f82190
 DIST xen-upstream-patches-4.15.5-pre-patchset-0.tar.bz2 21880 BLAKE2B 89ef7b8cc56ca5a4738ce665aaa3461b61c554088b1b727e34ea417beb43f9b8eae403bae50449c0c96e79ff4b71edf9b6808071b1ca8f0b3878bf1cb9697c6e SHA512 0752d699168e3c2ba13a0ad886dd1d1f9affefc5e7fed9980b2a634012508f405c2accfcd7e92f79016bb869d2d0b09139266a952cc203bea37870fc7d910e51
 DIST xen-upstream-patches-4.16.4-pre-patchset-0.tar.bz2 60151 BLAKE2B 5c8a8f772ba6be5f776b3270b9f1e64df35c2be7b4e238262eb4ec6b4859576b3ecb448880e1e05ad53dbdaa71643e678978151b10d0d47c901ab3e3518b7eb0 SHA512 b33a9b2f602f18165e048ef6a339bc5bf3f800fb1f2449e2e1a6090774ce3ef07b1d7ea8e9e6449fae7b91afcc1a6e281c1bb218a56bca74ba7f12b491fab186
-DIST xen-upstream-patches-4.17.1-pre-patchset-0.tar.bz2 87023 BLAKE2B 4b6c66c20aecde5a696ee6879b1a9e9b365eba3a2e55c7b13153adb4c100081242a5f4498e17597697ac96a75685d88536309accb8dcebee45b31c9b35a3d7d8 SHA512 9da15f7726f2813a6dc701dbf67c1aa52a574c8049238c6d18d68bc0c0c80db98b925cd1cb7ec5627ff8b3489847608a185353cda6e599e6e5bffe75339b18a7
 EBUILD xen-tools-4.15.4-r1.ebuild 16891 BLAKE2B 196a04b2d2bf0d33734b7086835aa84737d4b23c3c290e20d967e78833aeef71e0c0c853fcce2bd08e7b764c99e82d9e8fdcec177c24b76e8992f8e3416e13c7 SHA512 d2fe60ed130b5c4c2d8239472fd92db6d35baf60efabcf51089b44168b9839f8dad1916e7bce952e46fa49b2e39ad59feacd409fbbdaf65b010bb0ef6478ad44
-EBUILD xen-tools-4.15.5_pre1.ebuild 16898 BLAKE2B 399e699c7b43031c10c264911b79438b566673669799bbd892a7def93bdfbb6da51d1eafafcd919a5cda7bac9da57fe1e549a9c751bb2278f8f5772fca6d8ade SHA512 406d9c98717e0888e773957da582a3a6e7b2a84ffbbc11d8ff3c201c80561da47615b745f72322316349308d61f1c078c09139f8a740bb3c2f687e941b01d9b6
-EBUILD xen-tools-4.16.3.ebuild 16238 BLAKE2B 5eaab0ec3cbd2de0c8be12a03ca584b7b9037c379e4beb24f15043844bb7a4ccd230e730450cd4803ec9c7d19c1274c32d14d446d04f65190e7efeddab9afa47 SHA512 8000d9e9f046817b16f756d3d613e7db337e708bcf9a60312b3c559555b3db413dc673c6939ca4c6a172e1fbc0bd6888e418bb2f5427e04e7f30f68d3e38e6dc
-EBUILD xen-tools-4.16.4.ebuild 15830 BLAKE2B e3636e51e370b7ea648f6b7261b1a16bec5b98ec26662d5274e6c74184f3c43062c08a3905900bbd8f5c6b32be262d4b2628df5c32acd4e54f33e5b27fbf60a8 SHA512 d93be7f4dc3d879c345a64bb5aec4e73b904b26e42619dddfd0c87ee5d151ff31a4f07ec213b8dd4e1b9c1bdfece531b8ac26b7e944f001059adda2f04b8d677
+EBUILD xen-tools-4.15.5_pre1-r1.ebuild 16995 BLAKE2B 038306f663d225cfb90a52d863f5a009c9a266d210d9fafae45613bf83429428f2ea7298fea50258c490647f8c4be9300b443621eda7025045fbd3c9747826ca SHA512 ae4998ae498b2e9b644ea2285a6f2e433688fd64919cba68c9cc796f28533a34df472de89af89df72195989283abed5dea5e9f5633612aab6d6f94456c7fa130
+EBUILD xen-tools-4.16.4-r1.ebuild 15927 BLAKE2B 1333a4fe89f99b9a2ea7337fc2b858d0ede0a4a152826f5e3e0f7c4914b592bf4cc7809bf5375337ac982585c76dc53141ee8d4a57d28df31d37c38e801c56ca SHA512 904687f3812eb8f72656d732ce69ca6493d31f742b888c60f5b7cc3917a1844567ef9e5d12645567bd882d2654ea8f8fadf0d8fdb9ffae52365ea8fa0c8f4c29
 EBUILD xen-tools-4.16.4_pre1.ebuild 15835 BLAKE2B 6f9c0d33880fec6aaa5c397e5539fbe6a74d578105ea9233c3f71ffa6251467072da545daf69237804b94e8ccaf8be71d6c5ae3c3b1cabc60f3c524b985dba21 SHA512 b21f17a3401e70f25c7bc56614ef77f46e003f3c6ba82410a644434cacbff3a8347060f4eba976cb8dacfd0ce4491364450d3a3a87b996317e2a268ecd5a0f8f
-EBUILD xen-tools-4.17.1.ebuild 15849 BLAKE2B b4e991c04eb2021d7a27fad6c509fd5605e605d618d5747f70bc9f0894a1d8c908c6dc51eb44bb9bcf8daff9975ccb7e7d3e60e995750d1fe2d8497194d9c564 SHA512 11d752ed8d639457be20ad3f35737bdbb735e9c174af535d55464004fad651067643c303e39367691017ba2522df68ded0af90d7c87ed0fea439340670371937
-EBUILD xen-tools-4.17.1_pre1.ebuild 15856 BLAKE2B 080c541a5515bafa94ed37da9f0cf4b64271cb7c4cb9fbe149b28d2d87256f5cb6947e6751bea08c43e4be8402601e60c8e225fc9c5c73d3da88fd2d4cd442a0 SHA512 923bb51bafa5f36471507ff464af7eb40176cf81d429697b2e5ee27a7449e775fd71f43201eba771a0e969e9d2c4b9d22e1f9211da89367f457113891750d0d2
+EBUILD xen-tools-4.17.1-r1.ebuild 15946 BLAKE2B 5dd661b15b9227ab02947d8539bf2f496c6944d62ca63700dcaae8a06e3c7313fb5ffdf8d4312d21f295adb170b82ed9fc81cfb402769aef67591fda06596bf3 SHA512 0a8ef3ebe74b3b591e59a74db8bfce59acf2d3dd0f979de8a6d0f9991f7433f8fd833aeeb38868cb759a7f82aff4ebaab4967dfdccc7c8682e1eb8be83181f83
 MISC metadata.xml 1562 BLAKE2B a619e34e6fec4c6ffc00fd098dc040c5bb464ed7f2032db2e933fada0614e82c21269175f37720a123404551474e2aeeb2728b405ff93f9b4d9d092d027e0839 SHA512 f45c793a4b4819f0e50501ddc85acdaf99e4d675530712f8dccfb5166d071ae8ed07917a61d56037d6ba3a54123f72f4512d8c11643ea8c6e507feb9d29594e7
diff --git a/app-emulation/xen-tools/files/xen-tools-m4-ptyfuncs.m4-tools-configure-add-linux-headers-for.patch b/app-emulation/xen-tools/files/xen-tools-m4-ptyfuncs.m4-tools-configure-add-linux-headers-for.patch
new file mode 100644
index 000000000000..02d1f0ff8b1f
--- /dev/null
+++ b/app-emulation/xen-tools/files/xen-tools-m4-ptyfuncs.m4-tools-configure-add-linux-headers-for.patch
@@ -0,0 +1,39 @@
+From 873d4759aa7b0581bf34e8a7ebfcbeca789ed6e1 Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Tue, 16 May 2023 09:56:48 +0200
+Subject: [PATCH] m4/ptyfuncs.m4 tools/configure: add linux headers for pty
+ functions
+
+To avoid implicit function declarations, which will cause an error on
+modern compilers. See https://wiki.gentoo.org/wiki/Modern_C_porting
+
+Downstream Gentoo bug: https://bugs.gentoo.org/904449
+
+Signed-off-by: Florian Schmaus <flo@geekplace.eu>
+--- a/m4/ptyfuncs.m4
++++ b/m4/ptyfuncs.m4
+@@ -19,6 +19,9 @@ AC_DEFUN([AX_CHECK_PTYFUNCS], [
+             AC_LINK_IFELSE([AC_LANG_SOURCE([
+ #ifdef INCLUDE_LIBUTIL_H
+ #include INCLUDE_LIBUTIL_H
++#else
++#include <pty.h>
++#include <utmp.h>
+ #endif
+ int main(void) {
+   openpty(0,0,0,0,0);
+--- a/tools/configure
++++ b/tools/configure
+@@ -9002,6 +9002,9 @@ See \`config.log' for more details" "$LINENO" 5; }
+ 
+ #ifdef INCLUDE_LIBUTIL_H
+ #include INCLUDE_LIBUTIL_H
++#else
++#include <pty.h>
++#include <utmp.h>
+ #endif
+ int main(void) {
+   openpty(0,0,0,0,0);
+-- 
+2.39.3
+
diff --git a/app-emulation/xen-tools/xen-tools-4.15.5_pre1.ebuild b/app-emulation/xen-tools/xen-tools-4.15.5_pre1-r1.ebuild
index 75003ae0412f..b4d296686754 100644
--- a/app-emulation/xen-tools/xen-tools-4.15.5_pre1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.15.5_pre1-r1.ebuild
@@ -209,6 +209,10 @@ QA_PREBUILT="
 
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}/xen-tools-m4-ptyfuncs.m4-tools-configure-add-linux-headers-for.patch"
+)
+
 pkg_setup() {
 	python_setup
 	export "CONFIG_LOMOUNT=y"
diff --git a/app-emulation/xen-tools/xen-tools-4.16.3.ebuild b/app-emulation/xen-tools/xen-tools-4.16.3.ebuild
deleted file mode 100644
index 5cb850086cd6..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.16.3.ebuild
+++ /dev/null
@@ -1,532 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE='ncurses,xml(+),threads(+)'
-
-inherit bash-completion-r1 flag-o-matic multilib python-single-r1 readme.gentoo-r1 toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	REPO="xen.git"
-	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
-	S="${WORKDIR}/${REPO}"
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-	SEABIOS_VER="1.14.0"
-	EDK2_COMMIT="7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5"
-	EDK2_OPENSSL_VERSION="1_1_1j"
-	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
-	EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
-	IPXE_COMMIT="3c040ad387099483102708bb1839110bc788cefb"
-
-	XEN_GENTOO_PATCHSET_NUM=2
-	XEN_GENTOO_PATCHSET_BASE=4.16.1
-	XEN_PRE_PATCHSET_NUM=
-	XEN_PRE_VERSION_BASE=
-
-	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
-	https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
-	ipxe? ( https://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
-	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
-		https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
-		https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
-		https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.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="Xen tools including QEMU and xl"
-HOMEPAGE="https://xenproject.org"
-DOCS=( README )
-
-S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api debug doc +hvm +ipxe lzma ocaml ovmf pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios systemd zstd"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	ipxe? ( rombios )
-	ovmf? ( hvm )
-	pygrub? ( python )
-	rombios? ( hvm )
-	system-ipxe? ( rombios )
-	?? ( ipxe system-ipxe )
-	?? ( qemu system-qemu )"
-
-COMMON_DEPEND="
-	lzma? ( app-arch/xz-utils )
-	qemu? (
-		dev-libs/glib:2
-		sys-libs/pam
-	)
-	zstd? ( app-arch/zstd )
-	app-arch/bzip2
-	app-arch/zstd
-	dev-libs/libnl:3
-	dev-libs/lzo:2
-	dev-libs/yajl
-	sys-apps/util-linux
-	sys-fs/e2fsprogs
-	sys-libs/ncurses
-	sys-libs/zlib
-	${PYTHON_DEPS}
-"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2[-minimal]
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)
-	selinux? ( sec-policy/selinux-xen )"
-
-DEPEND="${COMMON_DEPEND}
-	app-misc/pax-utils
-	>=sys-kernel/linux-headers-4.11
-	x11-libs/pixman
-	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_USEDEP}]
-	')
-	x86? ( sys-devel/dev86
-		system-ipxe? ( sys-firmware/ipxe[qemu] )
-		sys-power/iasl )
-	api? ( dev-libs/libxml2
-		net-misc/curl )
-
-	ovmf? (
-		!arm? ( !arm64? ( dev-lang/nasm ) )
-		$(python_gen_impl_dep sqlite)
-		)
-	!amd64? ( >=sys-apps/dtc-1.4.0 )
-	amd64? ( sys-power/iasl
-		system-seabios? (
-			|| (
-				sys-firmware/seabios
-				sys-firmware/seabios-bin
-			)
-		)
-		system-ipxe? ( sys-firmware/ipxe[qemu] )
-		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
-	arm64? ( sys-power/iasl
-		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
-	doc? (
-		app-text/ghostscript-gpl
-		app-text/pandoc
-		$(python_gen_cond_dep '
-			dev-python/markdown[${PYTHON_USEDEP}]
-		')
-		dev-texlive/texlive-latexextra
-		media-gfx/transfig
-	)
-	hvm? ( x11-base/xorg-proto )
-	qemu? (
-		app-arch/snappy:=
-		dev-util/meson
-		sdl? (
-			media-libs/libsdl[X]
-			media-libs/libsdl2[X]
-		)
-	)
-	system-qemu? ( app-emulation/qemu[xen] )
-	ocaml? ( dev-ml/findlib
-		dev-lang/ocaml[ocamlopt] )
-	python? ( >=dev-lang/swig-4.0.0 )"
-
-BDEPEND="dev-lang/perl
-	sys-devel/bison
-	sys-devel/gettext"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="
-	usr/libexec/xen/boot/hvmloader
-	usr/libexec/xen/boot/ovmf.bin
-	usr/libexec/xen/boot/xen-shim
-	usr/share/qemu-xen/qemu/hppa-firmware.img
-	usr/share/qemu-xen/qemu/opensbi-riscv32-generic-fw_dynamic.elf
-	usr/share/qemu-xen/qemu/opensbi-riscv64-generic-fw_dynamic.elf
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-QA_EXECSTACK="
-	usr/share/qemu-xen/qemu/hppa-firmware.img
-"
-
-QA_PREBUILT="
-	usr/libexec/xen/bin/elf2dmp
-	usr/libexec/xen/bin/ivshmem-client
-	usr/libexec/xen/bin/ivshmem-server
-	usr/libexec/xen/bin/qemu-edid
-	usr/libexec/xen/bin/qemu-img
-	usr/libexec/xen/bin/qemu-io
-	usr/libexec/xen/bin/qemu-keymap
-	usr/libexec/xen/bin/qemu-nbd
-	usr/libexec/xen/bin/qemu-pr-helper
-	usr/libexec/xen/bin/qemu-storage-daemon
-	usr/libexec/xen/bin/qemu-system-i386
-	usr/libexec/xen/bin/virtfs-proxy-helper
-	usr/libexec/xen/boot/ovmf.bin
-	usr/libexec/xen/boot/xen-shim
-	usr/libexec/xen/libexec/qemu-pr-helper
-	usr/libexec/xen/libexec/virtfs-proxy-helper
-	usr/libexec/xen/libexec/virtiofsd
-	usr/libexec/xen/libexec/xen-bridge-helper
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/s390-netboot.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python_setup
-	export "CONFIG_LOMOUNT=y"
-
-	#bug 522642, disable compile tools/tests
-	export "CONFIG_TESTS=n"
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif 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
-}
-
-src_prepare() {
-	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
-	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
-	pushd tools/firmware/ > /dev/null
-	ln -s seabios-dir-remote seabios-dir || die
-	popd > /dev/null
-
-	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
-
-	# Rename qemu-bridge-helper to xen-bridge-helper to avoid file
-	# collisions with app-emulation/qemu.
-	sed -i 's/qemu-bridge-helper/xen-bridge-helper/g' \
-		tools/qemu-xen/include/net/net.h \
-		tools/qemu-xen/meson.build \
-		tools/qemu-xen/qemu-bridge-helper.c \
-		tools/qemu-xen/qemu-options.hx \
-		|| die
-	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-	if use ovmf; then
-		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
-		rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
-		rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
-		rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
-		rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
-		mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
-		mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
-		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
-		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
-		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
-
-		# Bug #816987
-		pushd tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli > /dev/null
-			eapply "${XEN_GENTOO_PATCHES_DIR}/ovmf/${PN}-4.15.1-brotli-gcc11.patch"
-		popd > /dev/null
-
-		pushd tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli > /dev/null
-			eapply "${XEN_GENTOO_PATCHES_DIR}/ovmf/${PN}-4.15.1-brotli-gcc11.patch"
-		popd > /dev/null
-	fi
-
-	# ipxe
-	if use ipxe; then
-		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/ipxe.tar.gz || die
-
-		# gcc 11
-		cp "${XEN_GENTOO_PATCHES_DIR}/ipxe/${PN}-4.15.0-ipxe-gcc11.patch" tools/firmware/etherboot/patches/ipxe-gcc11.patch || die
-		echo ipxe-gcc11.patch >> tools/firmware/etherboot/patches/series || die
-	fi
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
-	# Drop .config, fixes to gcc-4.6
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	# drop flags
-	unset CFLAGS
-	unset LDFLAGS
-	unset ASFLAGS
-	unset CPPFLAGS
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-	fi
-
-	if ! use python; then
-		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-	fi
-
-	if ! use hvm; then
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	# Bug 351648
-	elif ! use x86 && ! has x86 $(get_all_abis); then
-		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-		export CPATH="${WORKDIR}"/extra-headers
-	fi
-
-	if use qemu; then
-		if use sdl; then
-			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
-				tools/Makefile || die
-		else
-			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
-				tools/qemu-xen-traditional/xen-setup || die
-			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
-				tools/Makefile || die
-		fi
-	else
-		# Don't bother with qemu, only needed for fully virtualised guests
-		sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die
-	fi
-
-	# Reset bash completion dir; Bug 472438
-	sed -e "s;^BASH_COMPLETION_DIR      :=.*;BASH_COMPLETION_DIR := $(get_bashcompdir);" \
-		-i config/Paths.mk.in || die
-
-	# xencommons, Bug #492332, sed lighter weight than patching
-	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-		-i tools/hotplug/Linux/init.d/xencommons.in || die
-
-	# fix bashishm
-	sed -e '/Usage/s/\$//g' \
-		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
-
-	# respect multilib, usr/lib/libcacard.so.0.0.0
-	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-		-i tools/qemu-xen/configure || die
-
-	#bug 518136, don't build 32bit exactuable for nomultilib profile
-	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-	fi
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=:autoballoon=:' \
-		-e 's:^#lockfile=:lockfile=:' \
-		-e 's:^#vif.default.script=:vif.default.script=:' \
-		-i tools/examples/xl.conf  || die
-
-	# disable capstone (Bug #673474)
-	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
-		-i tools/Makefile || die
-
-	# disable glusterfs
-	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
-		-i tools/Makefile || die
-
-	# disable jpeg automagic
-	sed -e "s:\$\$source/configure:\0 --disable-vnc-jpeg:" \
-		-i tools/Makefile || die
-
-	# disable png automagic
-	sed -e "s:\$\$source/configure:\0 --disable-vnc-png:" \
-		-i tools/Makefile || die
-
-	# disable docker (Bug #732970)
-	sed -e "s:\$\$source/configure:\0 --disable-containers:" \
-		-i tools/Makefile || die
-
-	# disable abi-dumper (Bug #791172)
-	sed -e 's/$(ABI_DUMPER) /echo /g' \
-		-i tools/libs/libs.mk || die
-
-	# Remove -Werror
-	find . -type f \( -name Makefile -o -name "*.mk" \) \
-		 -exec sed -i \
-		 -e 's/-Werror //g' \
-		 -e '/^CFLAGS *+= -Werror$/d' \
-		 -e 's/, "-Werror"//' \
-		 {} + || die
-
-	default
-}
-
-src_configure() {
-	local myconf=(
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		--libexecdir="${EPREFIX}/usr/libexec"
-		--localstatedir="${EPREFIX}/var"
-		--disable-golang
-		--disable-werror
-		--disable-xen
-		--enable-tools
-		--enable-docs
-		$(use_enable api xenapi)
-		$(use_enable ipxe)
-		$(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '')
-		$(use_enable ocaml ocamltools)
-		$(use_enable ovmf)
-		$(use_enable rombios)
-		$(use_enable systemd)
-		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored')
-	)
-
-	use system-seabios && myconf+=( --with-system-seabios=/usr/share/seabios/bios.bin )
-	use system-qemu && myconf+=( --with-system-qemu=/usr/bin/qemu-system-x86_64 )
-	use amd64 && myconf+=( $(use_enable qemu-traditional) )
-	tc-ld-disable-gold # Bug 669570
-	econf ${myconf[@]}
-}
-
-src_compile() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-	use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
-
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	# bug #845099
-	if use ipxe; then
-		local -x NO_WERROR=1
-	fi
-
-	emake \
-		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)" \
-		build-tools ${myopt}
-
-	if use doc; then
-		emake -C docs build
-	else
-		emake -C docs man-pages
-	fi
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Created at runtime
-	rm -rv "${ED}/var/run" || die
-
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${D}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}"/tmp || die
-
-	if use doc; then
-		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-		dodoc -r docs/{pdf,txt}
-	else
-		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
-	fi
-	dodoc ${DOCS[@]}
-
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-	newinitd "${FILESDIR}"/xencommons.initd xencommons
-	newconfd "${FILESDIR}"/xencommons.confd xencommons
-	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-
-	keepdir /var/lib/xen/dump
-	keepdir /var/lib/xen/xenpaging
-	keepdir /var/lib/xenstored
-	keepdir /var/log/xen
-
-	if use python; then
-		python_domodule "${S}/tools/libs/stat/bindings/swig/python/xenstat.py"
-		python_domodule "${S}/tools/libs/stat/bindings/swig/python/_xenstat.so"
-	fi
-
-	python_optimize
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/xen-tools/xen-tools-4.16.4.ebuild b/app-emulation/xen-tools/xen-tools-4.16.4-r1.ebuild
index 578e95053175..fbeaed9743e8 100644
--- a/app-emulation/xen-tools/xen-tools-4.16.4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.16.4-r1.ebuild
@@ -208,6 +208,10 @@ QA_PREBUILT="
 
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}/xen-tools-m4-ptyfuncs.m4-tools-configure-add-linux-headers-for.patch"
+)
+
 pkg_setup() {
 	python_setup
 	export "CONFIG_LOMOUNT=y"
diff --git a/app-emulation/xen-tools/xen-tools-4.17.1.ebuild b/app-emulation/xen-tools/xen-tools-4.17.1-r1.ebuild
index c1abdbc8c7f5..d324baad0b3a 100644
--- a/app-emulation/xen-tools/xen-tools-4.17.1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.17.1-r1.ebuild
@@ -208,6 +208,10 @@ QA_PREBUILT="
 
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}/xen-tools-m4-ptyfuncs.m4-tools-configure-add-linux-headers-for.patch"
+)
+
 pkg_setup() {
 	python_setup
 	export "CONFIG_LOMOUNT=y"
diff --git a/app-emulation/xen-tools/xen-tools-4.17.1_pre1.ebuild b/app-emulation/xen-tools/xen-tools-4.17.1_pre1.ebuild
deleted file mode 100644
index 2c7afcb524d9..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.17.1_pre1.ebuild
+++ /dev/null
@@ -1,524 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE='ncurses,xml(+),threads(+)'
-
-inherit bash-completion-r1 flag-o-matic multilib python-single-r1 readme.gentoo-r1 toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	REPO="xen.git"
-	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
-	S="${WORKDIR}/${REPO}"
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-	SEABIOS_VER="1.16.0"
-	EDK2_COMMIT="b16284e2a0011489f6e16dfcc6af7623c3cbaf0b"
-	EDK2_OPENSSL_VERSION="1_1_1t"
-	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
-	EDK2_BROTLI_COMMIT="f4153a09f87cbb9c826d8fc12c74642bb2d879ea"
-	IPXE_COMMIT="3c040ad387099483102708bb1839110bc788cefb"
-
-	XEN_GENTOO_PATCHSET_NUM=0
-	XEN_GENTOO_PATCHSET_BASE=4.17.0
-	XEN_PRE_PATCHSET_NUM=0
-	XEN_PRE_VERSION_BASE=4.17.0
-
-	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
-	https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
-	ipxe? ( https://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
-	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
-		https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
-		https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
-		https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.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="Xen tools including QEMU and xl"
-HOMEPAGE="https://xenproject.org"
-DOCS=( README )
-
-S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-IUSE="api debug doc +hvm +ipxe lzma ocaml ovmf pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios systemd zstd"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	ipxe? ( rombios )
-	ovmf? ( hvm )
-	pygrub? ( python )
-	rombios? ( hvm )
-	system-ipxe? ( rombios )
-	?? ( ipxe system-ipxe )
-	?? ( qemu system-qemu )"
-
-COMMON_DEPEND="
-	lzma? ( app-arch/xz-utils )
-	qemu? (
-		dev-libs/glib:2
-		sys-libs/pam
-	)
-	zstd? ( app-arch/zstd )
-	app-arch/bzip2
-	app-arch/zstd
-	dev-libs/libnl:3
-	dev-libs/lzo:2
-	dev-libs/yajl
-	sys-apps/util-linux
-	sys-fs/e2fsprogs
-	sys-libs/ncurses
-	sys-libs/zlib
-	${PYTHON_DEPS}
-"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2[-minimal]
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)
-	selinux? ( sec-policy/selinux-xen )"
-
-DEPEND="${COMMON_DEPEND}
-	app-misc/pax-utils
-	>=sys-kernel/linux-headers-4.11
-	x11-libs/pixman
-	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_USEDEP}]
-	')
-	x86? ( sys-devel/dev86
-		system-ipxe? ( sys-firmware/ipxe[qemu] )
-		sys-power/iasl )
-	api? ( dev-libs/libxml2
-		net-misc/curl )
-
-	ovmf? (
-		!arm? ( !arm64? ( dev-lang/nasm ) )
-		$(python_gen_impl_dep sqlite)
-		)
-	!amd64? ( >=sys-apps/dtc-1.4.0 )
-	amd64? ( sys-power/iasl
-		system-seabios? (
-			|| (
-				sys-firmware/seabios
-				sys-firmware/seabios-bin
-			)
-		)
-		system-ipxe? ( sys-firmware/ipxe[qemu] )
-		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
-	arm64? ( sys-power/iasl
-		rombios? ( sys-devel/bin86 sys-devel/dev86 ) )
-	doc? (
-		app-text/ghostscript-gpl
-		app-text/pandoc
-		$(python_gen_cond_dep '
-			dev-python/markdown[${PYTHON_USEDEP}]
-		')
-		dev-texlive/texlive-latexextra
-		media-gfx/transfig
-	)
-	hvm? ( x11-base/xorg-proto )
-	qemu? (
-		app-arch/snappy:=
-		dev-util/meson
-		sdl? (
-			media-libs/libsdl[X]
-			media-libs/libsdl2[X]
-		)
-	)
-	system-qemu? ( app-emulation/qemu[xen] )
-	ocaml? ( dev-ml/findlib
-		dev-lang/ocaml[ocamlopt] )
-	python? ( >=dev-lang/swig-4.0.0 )"
-
-BDEPEND="dev-lang/perl
-	sys-devel/bison
-	sys-devel/gettext"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="
-	usr/libexec/xen/boot/hvmloader
-	usr/libexec/xen/boot/ovmf.bin
-	usr/libexec/xen/boot/xen-shim
-	usr/share/qemu-xen/qemu/hppa-firmware.img
-	usr/share/qemu-xen/qemu/opensbi-riscv32-generic-fw_dynamic.elf
-	usr/share/qemu-xen/qemu/opensbi-riscv64-generic-fw_dynamic.elf
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-QA_EXECSTACK="
-	usr/share/qemu-xen/qemu/hppa-firmware.img
-"
-
-QA_PREBUILT="
-	usr/libexec/xen/bin/elf2dmp
-	usr/libexec/xen/bin/ivshmem-client
-	usr/libexec/xen/bin/ivshmem-server
-	usr/libexec/xen/bin/qemu-edid
-	usr/libexec/xen/bin/qemu-img
-	usr/libexec/xen/bin/qemu-io
-	usr/libexec/xen/bin/qemu-keymap
-	usr/libexec/xen/bin/qemu-nbd
-	usr/libexec/xen/bin/qemu-pr-helper
-	usr/libexec/xen/bin/qemu-storage-daemon
-	usr/libexec/xen/bin/qemu-system-i386
-	usr/libexec/xen/bin/virtfs-proxy-helper
-	usr/libexec/xen/boot/ovmf.bin
-	usr/libexec/xen/boot/xen-shim
-	usr/libexec/xen/libexec/qemu-pr-helper
-	usr/libexec/xen/libexec/virtfs-proxy-helper
-	usr/libexec/xen/libexec/virtiofsd
-	usr/libexec/xen/libexec/xen-bridge-helper
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/s390-netboot.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python_setup
-	export "CONFIG_LOMOUNT=y"
-
-	#bug 522642, disable compile tools/tests
-	export "CONFIG_TESTS=n"
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif 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
-}
-
-src_prepare() {
-	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
-	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
-	pushd tools/firmware/ > /dev/null
-	ln -s seabios-dir-remote seabios-dir || die
-	popd > /dev/null
-
-	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
-
-	# Rename qemu-bridge-helper to xen-bridge-helper to avoid file
-	# collisions with app-emulation/qemu.
-	sed -i 's/qemu-bridge-helper/xen-bridge-helper/g' \
-		tools/qemu-xen/include/net/net.h \
-		tools/qemu-xen/meson.build \
-		tools/qemu-xen/qemu-bridge-helper.c \
-		tools/qemu-xen/qemu-options.hx \
-		|| die
-	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-	if use ovmf; then
-		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
-		rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
-		rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
-		rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
-		rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
-		mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
-		mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
-		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
-		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
-		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
-	fi
-
-	# ipxe
-	if use ipxe; then
-		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/ipxe.tar.gz || die
-
-		# gcc 11
-		cp "${XEN_GENTOO_PATCHES_DIR}/ipxe/${PN}-4.15.0-ipxe-gcc11.patch" tools/firmware/etherboot/patches/ipxe-gcc11.patch || die
-		echo ipxe-gcc11.patch >> tools/firmware/etherboot/patches/series || die
-	fi
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
-	# Drop .config, fixes to gcc-4.6
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	# drop flags
-	unset CFLAGS
-	unset LDFLAGS
-	unset ASFLAGS
-	unset CPPFLAGS
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-	fi
-
-	if ! use python; then
-		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-	fi
-
-	if ! use hvm; then
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	# Bug 351648
-	elif ! use x86 && ! has x86 $(get_all_abis); then
-		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-		export CPATH="${WORKDIR}"/extra-headers
-	fi
-
-	if use qemu; then
-		if use sdl; then
-			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
-				tools/Makefile || die
-		else
-			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
-				tools/qemu-xen-traditional/xen-setup || die
-			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
-				tools/Makefile || die
-		fi
-	else
-		# Don't bother with qemu, only needed for fully virtualised guests
-		sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die
-	fi
-
-	# Reset bash completion dir; Bug 472438
-	sed -e "s;^BASH_COMPLETION_DIR      :=.*;BASH_COMPLETION_DIR := $(get_bashcompdir);" \
-		-i config/Paths.mk.in || die
-
-	# xencommons, Bug #492332, sed lighter weight than patching
-	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-		-i tools/hotplug/Linux/init.d/xencommons.in || die
-
-	# fix bashishm
-	sed -e '/Usage/s/\$//g' \
-		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
-
-	# respect multilib, usr/lib/libcacard.so.0.0.0
-	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-		-i tools/qemu-xen/configure || die
-
-	#bug 518136, don't build 32bit exactuable for nomultilib profile
-	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-	fi
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=:autoballoon=:' \
-		-e 's:^#lockfile=:lockfile=:' \
-		-e 's:^#vif.default.script=:vif.default.script=:' \
-		-i tools/examples/xl.conf  || die
-
-	# disable capstone (Bug #673474)
-	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
-		-i tools/Makefile || die
-
-	# disable glusterfs
-	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
-		-i tools/Makefile || die
-
-	# disable jpeg automagic
-	sed -e "s:\$\$source/configure:\0 --disable-vnc-jpeg:" \
-		-i tools/Makefile || die
-
-	# disable png automagic
-	sed -e "s:\$\$source/configure:\0 --disable-vnc-png:" \
-		-i tools/Makefile || die
-
-	# disable docker (Bug #732970)
-	sed -e "s:\$\$source/configure:\0 --disable-containers:" \
-		-i tools/Makefile || die
-
-	# disable abi-dumper (Bug #791172)
-	sed -e 's/$(ABI_DUMPER) /echo /g' \
-		-i tools/libs/libs.mk || die
-
-	# Remove -Werror
-	find . -type f \( -name Makefile -o -name "*.mk" \) \
-		-exec sed -i \
-		-e 's/-Werror //g' \
-		-e '/^CFLAGS *+= -Werror$/d' \
-		-e 's/, "-Werror"//' \
-		{} + || die
-
-	default
-}
-
-src_configure() {
-	local myconf=(
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		--libexecdir="${EPREFIX}/usr/libexec"
-		--localstatedir="${EPREFIX}/var"
-		--disable-golang
-		--disable-pvshim
-		--disable-werror
-		--disable-xen
-		--enable-tools
-		--enable-docs
-		$(use_enable api xenapi)
-		$(use_enable ipxe)
-		$(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '')
-		$(use_enable ocaml ocamltools)
-		$(use_enable ovmf)
-		$(use_enable rombios)
-		$(use_enable systemd)
-		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored')
-	)
-
-	use system-seabios && myconf+=( --with-system-seabios=/usr/share/seabios/bios.bin )
-	use system-qemu && myconf+=( --with-system-qemu=/usr/bin/qemu-system-x86_64 )
-	use amd64 && myconf+=( $(use_enable qemu-traditional) )
-	tc-ld-disable-gold # Bug 669570
-	econf ${myconf[@]}
-}
-
-src_compile() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-	use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
-
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	# bug #845099
-	if use ipxe; then
-		local -x NO_WERROR=1
-	fi
-
-	emake \
-		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)" \
-		build-tools ${myopt}
-
-	if use doc; then
-		emake -C docs build
-	else
-		emake -C docs man-pages
-	fi
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Created at runtime
-	rm -rv "${ED}/var/run" || die
-
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${D}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}"/tmp || die
-
-	if use doc; then
-		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-		dodoc -r docs/{pdf,txt}
-	else
-		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
-	fi
-	dodoc ${DOCS[@]}
-
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-	newinitd "${FILESDIR}"/xencommons.initd xencommons
-	newconfd "${FILESDIR}"/xencommons.confd xencommons
-	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-
-	keepdir /var/lib/xen/dump
-	keepdir /var/lib/xen/xenpaging
-	keepdir /var/lib/xenstored
-	keepdir /var/log/xen
-
-	if use python; then
-		python_domodule "${S}/tools/libs/stat/bindings/swig/python/xenstat.py"
-		python_domodule "${S}/tools/libs/stat/bindings/swig/python/_xenstat.so"
-	fi
-
-	python_optimize
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 817dbbf781df..9fd92e7a758c 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -3,18 +3,14 @@ AUX xen-4.15-flask.patch 400 BLAKE2B 68ee04b8b0923cbe7e2b93b834a23b465c9c8e63ae4
 DIST xen-4.15.4.tar.gz 40820669 BLAKE2B 22edaf817851856c777d02b5211be932c1731bf50fb582545f948c7e8f871937f7c94636496a480642fa7ed8222e12dda091a06638c75b9ee935f3ff9bc2aea0 SHA512 fa6a4991c0699025af163ed117f8d0523c0a482102464615025eb3575d755ffacec5df394e3fe01871cde6028678f654d99f8e3c2533b138765971a2a7994cb8
 DIST xen-4.16.3.tar.gz 45003057 BLAKE2B 6092cff33bffed1b6133daf8d3ce53c57204297e66df6ac58266b2da8d5585df62ae718cc8afaad36ebe6dabdce65b9979b0d13b88e60f2b23c01be21ae4db8e SHA512 b8cbd6f95681de5f824ada2d3cbe0653a38514a18df0dafcf811fb255219c7abec96f46217bdb0c83e1119f685da9a6af7194eeaa94f1cc3c892702782133b4f
 DIST xen-4.16.4.tar.gz 45008515 BLAKE2B 6637cbebe76e48ca6d2ea885b9c52244efe2fa8188c1649f6a5444fd980a8bfcff5508c8496b89b8a31ba1c4e06f47047b7289513cf22fb86d2b76a77b3cfd21 SHA512 1b5a167a9f5537b5311ef1cb56e0e6ffda0e4e569ef0534e47b4f4a528067bda46fb58b2a01abc02e8c38b2b70207fb201a5d4d10274fba70135eaa8e318e055
-DIST xen-4.17.0.tar.gz 46484553 BLAKE2B a4665fb557eb264566179bc5b2678d44f694ef5b20bb7dc58c8a7e6fcdf0145f25a462cfe2ad35be67a4a5ca4579c03eb092954915953e2ab98ae90b4ea983f0 SHA512 8aa7c3025c81127a4f653411bc1cbe8fc27b767a2f96a2a454329a6773cb74d714ecc1ff011a8e7169c6b83b2cc5cb39c39798bd6b1178df75ce9ff00f5a1011
 DIST xen-4.17.1.tar.gz 46487600 BLAKE2B 56fefc4e6f859129f3faae28f7060b5228f25b1b9d4496e127c51f44e0c97508adaba77da2b8532e578bb8e4ea421a0d56aa1c4d1b9985e85294b210179410a4 SHA512 bd98c5a2d75a0368ef312274b8e47f27db7f6b79302fd0c8b4975185e63640f98d9302e2834344acc1e97133e19f3993359dfab85aea5928008debada78c5f7a
 DIST xen-gentoo-patches-4.16.1-gentoo-patchset-2.tar.bz2 5403 BLAKE2B 7fa3b4aa123b2deed260d02b8d34a35dd205207038edb92569278b25c6fe32e0f0e3857c07755553e047f0eb0d9fe7f8b0816e0f3d7f68aee7929afaf6611dfd SHA512 9e7d25640b24235acf756b031b8b7cee582dded65fe7b94a706c990232e9704d574036c3a9605f285e8e9534578d100a3f38719b27b22775f17ef8f68287997e
 DIST xen-gentoo-patches-4.17.0-gentoo-patchset-0.tar.bz2 4474 BLAKE2B aa367a4ccf96a61c04c52e415d7143ca946323d7d50d6ab16ad7a917279ad4b1aac802e35e7e306c3a244317db713e913dc8d6343717b2307ccd049adb956a0d SHA512 debba71b17be7b1bb9a70f01782c12c3c053cc2fb1f4ad95829356ee365878aad68430055d4b8c648ef1ff54cb9e3e7c03d40d14c560d51f8ac4fce2b8f82190
 DIST xen-upstream-patches-4.15.5-pre-patchset-0.tar.bz2 21880 BLAKE2B 89ef7b8cc56ca5a4738ce665aaa3461b61c554088b1b727e34ea417beb43f9b8eae403bae50449c0c96e79ff4b71edf9b6808071b1ca8f0b3878bf1cb9697c6e SHA512 0752d699168e3c2ba13a0ad886dd1d1f9affefc5e7fed9980b2a634012508f405c2accfcd7e92f79016bb869d2d0b09139266a952cc203bea37870fc7d910e51
 DIST xen-upstream-patches-4.16.4-pre-patchset-0.tar.bz2 60151 BLAKE2B 5c8a8f772ba6be5f776b3270b9f1e64df35c2be7b4e238262eb4ec6b4859576b3ecb448880e1e05ad53dbdaa71643e678978151b10d0d47c901ab3e3518b7eb0 SHA512 b33a9b2f602f18165e048ef6a339bc5bf3f800fb1f2449e2e1a6090774ce3ef07b1d7ea8e9e6449fae7b91afcc1a6e281c1bb218a56bca74ba7f12b491fab186
-DIST xen-upstream-patches-4.17.1-pre-patchset-0.tar.bz2 87023 BLAKE2B 4b6c66c20aecde5a696ee6879b1a9e9b365eba3a2e55c7b13153adb4c100081242a5f4498e17597697ac96a75685d88536309accb8dcebee45b31c9b35a3d7d8 SHA512 9da15f7726f2813a6dc701dbf67c1aa52a574c8049238c6d18d68bc0c0c80db98b925cd1cb7ec5627ff8b3489847608a185353cda6e599e6e5bffe75339b18a7
 EBUILD xen-4.15.4.ebuild 4793 BLAKE2B dd8879112c36615b2323d55406b4698dd4c3da96a4ba87b4796c82fbea35f1b30ea25e8fd8268aed8464fe62868f50cf9a2d222e196a7f15dde78dc28fe6f58b SHA512 0252cf80f8fcbdd00c72c6fdbc268b6dd3fe9d1346d91d8af39ca2c427d0bfdddbc27d7b690b563698fd502ac56f57c3894e2b45c4aefcfddf3713e4f13b814c
 EBUILD xen-4.15.5_pre1.ebuild 4800 BLAKE2B d671c011e811b8e724a97421e892692e8206ac7210362bfe6faba9d868ccef96bda01b8fa1e366609523cbd2bce0d0d036e0a743d7d35a9b15af71ba2dec7757 SHA512 6128b6a63c9a49d13b3efb282cf939d22a690156ab80682ce7629ab44a18520fc71e008edae4e187cda4931d6c12b2586a6c8f00575a03a37d4b9eb8b76ed780
-EBUILD xen-4.16.3.ebuild 4413 BLAKE2B ac9e09a43a8a8d592ec6c49500f03192d291b377fbca306677419d6d4840612fc613b9895fcc4bdf074e6cda4947922371ae033b9f60576113b6bd64c9fab52b SHA512 b9d4da75c9d8973c7c75cb28319a5d006df20681b0193df2de6b4a645f83465b709d20e0b51201c4d31c8b64165a6eba9f01c9ec86a1138bf8374cab84f344a9
 EBUILD xen-4.16.4.ebuild 4413 BLAKE2B ac9e09a43a8a8d592ec6c49500f03192d291b377fbca306677419d6d4840612fc613b9895fcc4bdf074e6cda4947922371ae033b9f60576113b6bd64c9fab52b SHA512 b9d4da75c9d8973c7c75cb28319a5d006df20681b0193df2de6b4a645f83465b709d20e0b51201c4d31c8b64165a6eba9f01c9ec86a1138bf8374cab84f344a9
 EBUILD xen-4.16.4_pre1.ebuild 4419 BLAKE2B 1efafcac7cbafb193f110329ce739d7bb7ee8df72613cea88b0d8e29ad3633a0ef1f2c23f479ecd643c05e8d02e0e252b7d3ce3454278fcd749d18685beff00f SHA512 ec5da510e09d960e7b46b8337e84267342f0aa59a30f80ef1c5d5cb0ad16ed9ac1231537a27f276dfa8c0bde032c941e977d6f3614f089941e97704a7bb304d3
 EBUILD xen-4.17.1.ebuild 4413 BLAKE2B 02fc0e2afe0697e9ebf0b140b19f19487273294dcb667b1627e718012c7846b8d2f676ce934083ca794ffaecf7a9be70b495bfc07fd2bf448d9d72c4c6002335 SHA512 43dc99cdf85c6f5301785abaa13aa220a5aee31fe7758d5597d7d0ea4b410604d67bfdc7696a5c26cfd7e5f832d2ec5c9a93cf56a0ef1860f5b0705eaedb39d2
-EBUILD xen-4.17.1_pre1.ebuild 4420 BLAKE2B a42a477b2160c15c7dcf1f2f52fe78bb0e6b50094f6a8003d3ffc8b238e7754b8ef7744b4aa9aa693deeff9c47bdb2b1b256f6cc3698ee1adc9e12ae5a1f0869 SHA512 41233558e10b6d81fbe558d027097d433309e8a2d5616b202f44e5edb731891b52098030fbb76feccc0f08753f900d3ab752e5f93e958d9ff698647dcf4d0c4d
 MISC metadata.xml 773 BLAKE2B 3d0c64f8bfaf753ee92681f9da2dfabd6196952b5694244b806cb6cdac02fedd10d8c8defb4f4211664e135cce38c671f543faab58575ae2d603efcb9b2a48b8 SHA512 16993794d7f578562112533f97bb76d1a2fafd0dce038dbd879a4a65d5fc893251f1d188cdc1a2b9f955a27581f76a26409cc0c90706c86514c05e81501966b9
diff --git a/app-emulation/xen/xen-4.16.3.ebuild b/app-emulation/xen/xen-4.16.3.ebuild
deleted file mode 100644
index c868fdb34a15..000000000000
--- a/app-emulation/xen/xen-4.16.3.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit flag-o-matic mount-boot python-any-r1 toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm -x86"
-
-	XEN_GENTOO_PATCHSET_NUM=2
-	XEN_GENTOO_PATCHSET_BASE=4.16.1
-	XEN_PRE_PATCHSET_NUM=
-	XEN_PRE_VERSION_BASE=
-
-	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 efi flask"
-REQUIRED_USE="arm? ( debug )"
-
-DEPEND="${PYTHON_DEPS}
-	efi? ( >=sys-devel/binutils-2.22[multitarget] )
-	!efi? ( >=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
-}
-
-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 efi; 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 efi; 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 efi; then
-		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
-	fi
-
-	xen_make DESTDIR="${D}" -C xen install
-
-	# make install likes to throw in some extra EFI bits if it built
-	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
-}
diff --git a/app-emulation/xen/xen-4.17.1_pre1.ebuild b/app-emulation/xen/xen-4.17.1_pre1.ebuild
deleted file mode 100644
index b14c81a14797..000000000000
--- a/app-emulation/xen/xen-4.17.1_pre1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit flag-o-matic mount-boot python-any-r1 toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm -x86"
-
-	XEN_GENTOO_PATCHSET_NUM=0
-	XEN_GENTOO_PATCHSET_BASE=4.17.0
-	XEN_PRE_PATCHSET_NUM=0
-	XEN_PRE_VERSION_BASE=4.17.0
-
-	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 efi flask"
-REQUIRED_USE="arm? ( debug )"
-
-DEPEND="${PYTHON_DEPS}
-	efi? ( >=sys-devel/binutils-2.22[multitarget] )
-	!efi? ( >=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
-}
-
-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 efi; 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 efi; 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 efi; then
-		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
-	fi
-
-	xen_make DESTDIR="${D}" -C xen install
-
-	# make install likes to throw in some extra EFI bits if it built
-	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
-}