gentoo resync : 20.03.2022

3 files changed, 40 insertions, 51 deletions

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index b189e50178d9..1e54472d36fe 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -1,4 +1,4 @@
-AUX gentoo-patches.conf 3599 BLAKE2B bde110cce9707136b4c0ab4ffa51115a01557945b37d943115460b243aa6b9627411ea8498fec71479b8aaa12e0d6a830b097ed3b5a2275b9e581e7022ecd878 SHA512 d06853b6bd602e7e313e2433526898b316c7d138e81fb9bbbf175e275b59114e544305fec130d462fb99288a5b998eb6ed376830786e6b807743566982b47839
+AUX gentoo-patches.conf 2606 BLAKE2B 7fe706c365038bf0c21a3001cd5f6f73be05302eb947f18a471375059095b563a7a880894d39521bca1acc99b15e7b2ab3d6214cd1dccc9b3dc2844c68eac4a8 SHA512 4cc22817195d8a125c9ead62c7dc1354b797f06db2d18f5d14821d67ab9235d99ac432ba2e0402f92563b6262a706a4f2163f3972a00142a29bb92748851ce97
 AUX stubs-32.h 537 BLAKE2B 456f57c4a4ba574c737f1b84b62a085d0290ebc8981a5f96fdebc16b6c86c801c5ca8dde135e803f46c5ec875fdd74770f6ed754880bc7af930b8ce1ce972fb7 SHA512 55308dbedaa91909a2213940f7a7b574cabe6b5a3104761a2a6f28d6aed00164544488c00cbf9d66a9a370a14c6b6d3a00434efd3ff0228cc8e4d81af19c0e68
 AUX xen-consoles.logrotate 63 BLAKE2B 4ae650876035d2815dbcacc6ed618c58cc61d9cfd9cde1b6c2f792cbf51898c577ef979443ad827fc82ced4d21ae24836883160b20d697965ef5377d50c2973c SHA512 ab2105c75cfe01768aecd5bcbb56269d63666e8a44e42b6a83aee87df6c84ee2f9ab249171c21b2e09f8fec2cae8318f6e87d160989398a3e7dd68db8d52c426
 AUX xen-tools-4.15.0-fix-xenstat-python-bindings.patch 850 BLAKE2B e0150d32e01ddda954b97eee9d4f0df97f01b710193e803c7db08776bee71b8a05b78ab1bec858c69834a3b61a7562dd25b6c78ad49dc9d5a68109ad171d17b7 SHA512 25df248f40d37be130f8601d5b7a0e21562c31e9d4e4b65af632048e7b29d63397434ce45afeee0eeb6686ed43f7b659427ca6e151cbd17007798058917abd7c
@@ -17,23 +17,22 @@ AUX xenqemudev.confd 156 BLAKE2B 566dbe6e3a3d3bbbfd1b3cded7b0677b8b94ee3382226f4
 AUX xenqemudev.initd 1828 BLAKE2B 695090fca31cff426c8434fe7a766c491725bcc91975b8338a8bd7d69bd51409bc8b586597866f7dc570e93693c87961e327c720cf44e7e941e1b83a157076e3 SHA512 d9ef6c0446cd2510f79d2117f0ad9ea3605854d1f5f601526706d9563abc72b71b4777c773e39ea1a9a77772e6ac70f6111109696a2621bc4b98c4518c7b589f
 AUX xenstored.confd 42 BLAKE2B 61153f1bb17c78614e215f25f59642f35185f7f7a2e911e04285a7f589c6a69856f914096621eded787b0c23a3f8994076ee15d2dd3e2a36589a65cd585c7946 SHA512 0906cbcdc84935d07cf53bc4447a1f9a9dc4e4fb9fda9a7163f6982f1d8a3ada1f0650fcd254fb6f715a54f7971daf0a5e61c3de6db70dfd156156fd55b59fe4
 AUX xenstored.initd-r1 916 BLAKE2B 5acda60c3d1c8aaf91d14d980a0b68f3d5ff803b617431c87f46b5c2c6f4c87548fa8db32ebd554e8aad4928d7ec0b16598bf8dfb0aa7e3642caa96eb164a292 SHA512 1404c9c454f5359389a2e9588317f10412dafdbdeb1de5da945c10f8e6efd09007e96d35b75d04a4c3d5c59baa9c3bbee4192240cacee128b0adf9066d3efc10
-DIST OpenSSL_1_1_1g.tar.gz 9975550 BLAKE2B 22efa4ffe5d56a861bc4e2e1bc9a558e79265a3789acd9ca65d0a1162a1808a089a92a234e88c951f2a3cdabd3b1908ac7fe6d5f2b5fe554f229a22c11ab185b SHA512 bc8d24d7fc93542a8d77e13a57768de242ef679ef4db93c1b6b981a15a60646a5c5d869d066248448f3eb1ab2012e3ddc80bf301f486c0574d469a3f7db7b8d4
 DIST OpenSSL_1_1_1j.tar.gz 9994760 BLAKE2B 749886716739dcb909bd79b29cf714640b64039917f64f6cfc4bee9861e797380d0df9ff11d7f6bb084508b322cb0db4ef7a2f871ee304548ec919d387cdb2c5 SHA512 f94ef129514e69b70f800a599ae726eff6a2fac0dfa8e42982973d1328f6fac6b1da1124e1a7b8aa3d579b720ecf9c71a8bae45db6b1630c052b0c3a22b9360e
 DIST berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz 148741 BLAKE2B 72014022926b636147e202d74c42df2ce9cfed00b91c275d5b2e0afbc5c68765445cbe7ac6389d7c2512bd1d45b0e16e999936552d09bbc733ab66c92968bd31 SHA512 8420c29faa7ff57e06d6758b03e81ca0630c59946bc031e8611f1449e23634cf901b502161f2c1423c0cff949b5481445e36a3aa53dc885b61ca2c673b3ba567
 DIST brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz 23855739 BLAKE2B 7406ec5b29ac66afbcd7c1376bb3208f298d19b6592b2869c52173aa64947d58bd443f9a61c67deaf046be910a0e31c0b843e5508e97e0e1f5e7bce100d86904 SHA512 df8e90562c4fd7f0e787949df6bc4f5a165b39bd333f442d27874fe65640fbba268f9350d7113e6761a5acceb66d78e75f1a296e5a89b94574edf28109cdc812
-DIST edk2-06dc822d045c2bb42e497487935485302486e151.tar.gz 13192042 BLAKE2B 81afa7fd5f6f14fff35baa3c6c64583fa21c7b793ed847a3362fd05a926bb4402db911f9f78f4ffd76a6de9b815171dfa245ae41afac3b022cd108597e8c1ac3 SHA512 a032a1496db7ddc32a7d6d1a7d5fe4122ab43b13547ec019855166d785f162268ad82ceb3c41efafe1687e73fc72599ee6852741652451e1cb329fd655c69b6c
 DIST edk2-7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5.tar.gz 13998677 BLAKE2B 3614ceb69e295a6afb37c7905d0aec3534d8daf3d9f22137c1b722da6dc764a3669d99af03f96155d45feb5058a6f725acf37d1048186fecff4232d64f96e97c SHA512 a1933d815b947fd4f13c96970a6dc36c3048e3ddf27c897684104b0129cf58331e46d3147062ae1fb8973f08cd373c319788dd850ac5e45da385eed8368571a4
 DIST edk2-a3741780fe3535e19e02efa869a7cac481891129.tar.gz 12886279 BLAKE2B 2054bb84375b9840b31276f86786ea764368da200087e45c0528f2ca6b17aa9078a05e406bafa41c25cd65971ff007dfa19ffe91f9a5a2ab6c845bc6f62df3de SHA512 ca0543fefeb1fdc8d0d9841de309ce40fe88220463569a77f56d3fe3184fd4a57ce00b3c96c0861a51b7dbf5f4a9f9946b960a636593682f380c861f2606d190
 DIST ipxe-git-3c040ad387099483102708bb1839110bc788cefb.tar.gz 3962725 BLAKE2B a8084abaf93a4ab06ba170427a66dab08e68ba1288f42ea744e2cbc66d6bd2294bee82f6d0994260d2cd60daf6a6068e40eb74fdeba2bccaa432d090d81fd9db SHA512 4ac1d07ce879a3a8c6c260380258c37f5e4ecddc880b27fb59afc38fbf3718e81b04a4dda2b58fe7a438a23175e00b6179fc067acbc4a75e33d93c4b85ff5d68
 DIST ipxe-git-988d2c13cdf0f0b4140685af35ced70ac5b3283c.tar.gz 3931642 BLAKE2B bf0b5d9ea1d44803bc5c4aa0bf9188636e292b226ab759f32e3c2bfa3f80dd3f546526b9a11c1f67193793ede5309bfa67bdce80aba62ccca54597dc6e7e4ba4 SHA512 0a63f83c9135d05c6bfe7c4d12da3ff76271e35305a4d5654bd5aefa9ee59f5363546c65820c42133deb0fb5a0a0bcaa9b1c48396f9f996acea0d492a5f03f33
 DIST seabios-1.14.0.tar.gz 628985 BLAKE2B cc1126925dab1551a655680d20d06ebf28c12c386500d1ee4df9e1a99403b4c5bc6a66c2cc5ef58b4c3d6d7226f35007506a6a1855c2cf2742469dcb7aba05bb SHA512 215c42f59425f8abd062be7b11fc0e39c977cee5001a2381551b0f851ac337d0dd53c065267e6dee0e710ffd700fa635f9007b89da8dfce0f47122c984ee8146
-DIST xen-4.14.3.tar.gz 39982036 BLAKE2B 927fd2937f451567238702430cea3a6e5d2db70d5eef10f029bb1d6d030681573c851eb8076c8bad89c97c115f81a19ac8e46e78ca3f0e642565f7300c264ca1 SHA512 b462fcc1549f6e57f7f2a4fd10ce1e957a25a6a7c0319672b62699468f6c4330b9cd0cf2b0231b5cce94f4bb142a957eb8aa58aa0ffb5c85b37211d6b34ccf16
 DIST xen-4.15.1-upstream-patches-1.tar.xz 15476 BLAKE2B 9f0cf8f3dd993e32939ff1ee35244224bd3d16fbd345500ff01e51eb5828d3e44bddc539462c39d8c37b6497d4bf8887261a8df5d31b17b413b0c21f7faf3a84 SHA512 aac3f91c3c753aa8430abad055252cba5dbdfd9e548f219df1452388ef2f82b65c428755363aa0645824431e812f3b799af4f9468669e42a0f5b6b8874397c75
 DIST xen-4.15.1.tar.gz 40800852 BLAKE2B 39475ea33f029fb0e84b82b4a2b13fd613bab01e3ef6c241dfede3d190ee9be53c99b62121d37d83b1e078764b3e4d88d1dfb99be1b5623691e56519850c6798 SHA512 8d3cbdf708f46477e32ee7cbd16a490c82efa855cecd84ee712b8680df4d69c987ba9ab00ff3851f627b98a8ebbc5dab71f92f142ed958ee2bc538bc792cd4b9
+DIST xen-4.15.2-upstream-patches-0.tar.xz 33368 BLAKE2B f22c0e9ce6b859a2741f09c0c52479e8acb38440b631882850993fcfcdc445c28fbeac4353df6bac1b2be89e39a99bae1a920796d505f888e3701a98f17ed29d SHA512 10a996cd87404ff6536119deeedfe67143c02475c4ca2d7f741e087197aaffa10c5831aad1f9ee2f9070461dd8cdc7af4851fbafb634a2f65235603d6fb0848f
+DIST xen-4.15.2.tar.gz 40773378 BLAKE2B 7c3e3bb066505f9838cd7c56d85debc64e5ed32cf4d4edf699ff843db49bee916e6eb46d07e5cd9021c2644bba0628a2aa567f60ace26c6d7ee5922643e04104 SHA512 1cbf988fa8ed38b7ad724978958092ca0e5506e38c709c7d1af196fb8cb8ec0197a79867782761ef230b268624b3d7a0d5d0cd186f37d25f495085c71bf70d54
 DIST xen-4.16.0.tar.gz 44982322 BLAKE2B 7e16a93b3f1131e2b10307fabc10641a9c5983173155b9a35eaf6ff317b6a747bccf6b8c87c06686830acc2c4bd3e19e5867eb443eabac9a1e4ee59124dfa87f SHA512 2869ed90d1779c9754d7f2397f5fc67a655304d9c32953ac20655ef96cb154521d8fce9f23915ac0c91f984dc54f72c67e5e619e2da318b5997748f44cf21b87
 DIST xen-gentoo-patches-23.tar.xz 20536 BLAKE2B 0064f79f8794a21ab13047a4ee296e37efa616e16ca6cd65b31fdafeb458fd9b80f0443758343c8328b1901d7169618346becfe75f16dcaeff08fc975f1d08d5 SHA512 09248e17ff7865feb2a505169d62ee5c8c60bd672fa8c4c7c4e3a2e4af58bfad0379d37b395bab3e3393af8d53d882f56749dfeb560edeea6b7ab56c902a3c49
 DIST xen-gentoo-patches-24.tar.xz 20952 BLAKE2B 292ea384f007a9615ca840068c45cd0e37a63a59e596c9c87a278a0136805327c85f5e5576eac751e40bda616559e413b396d313d43f2d36d904f09a41b0d302 SHA512 26b7344cea40ef44d1eaec330465071c96ee27a5b0ca91f787fc80c6801abed47cab9050a40ef80f20471a7cd9ee0dc7aaa46b16e5af7d0e50643ccc7d3a828b
-EBUILD xen-tools-4.14.3.ebuild 17085 BLAKE2B 307122a50a4d2869b17d52c81644644c2e154faff80022b5a61fa71441ca92ba75d767f0cbda99f83f6f1ff519076b299b46caf87cf2004474f6d61fcf51eba2 SHA512 add91512fab0dd7f92d6e7eb6451653556ca73d3b7e44e66387f1944fc0a1c93f3fbf9e8de879d55d2fcf3d2077ad370d8b161f9569a03dce26b87fbbb81c8c9
 EBUILD xen-tools-4.15.1-r2.ebuild 17880 BLAKE2B 86a2fa11d9c57a2a3a1565fc2da415248d4b40d86c57bf1a99cd4dc76c43c42e83b1a91f4a1700d4d8a996bf27306ff68b74c792abea72fa76f249474716f21c SHA512 73a7fa4a820f7ebb7a63f3e29d7a7ec4f6627fa452d924ba5eca0980c8001b19f38645f174848913b7ac2f8a4d6d96b93e8421ac1e5a3720036cded1d4a6fd0b
+EBUILD xen-tools-4.15.2.ebuild 17883 BLAKE2B ef806e883cde09c79be898f6917ffbb9dd392d0969d7c1d362768e2d9320cb21dceadcb4164d40ea9f50a4dca6bef534c6f81c7114c607be75efebaa34352bec SHA512 707acbc2c443193fc23feb2a37baa5cf28dc014b5e6a3348a2b8d984cbd4d0ff10a704c663c1e7daa3d67f0d9bf608e64f6509542d9a0b6d1fae4708a9bab3f8
 EBUILD xen-tools-4.16.0.ebuild 17927 BLAKE2B 87adf30cda85c9fd448db6bdc410e0a2705b8f341e627d48cdc9ee981858a08e975a9b3d6f825d32e217d86733f65e37b09b7819f1a7406080c3231abf841587 SHA512 8097dffbdb00812246035ceea81f7500543ef44059ccd26f9f72498fff1192994d6cf3a8e92fcce4414416aa43305ab850a33013696c7116ce43c874623d143f
 MISC metadata.xml 1562 BLAKE2B a619e34e6fec4c6ffc00fd098dc040c5bb464ed7f2032db2e933fada0614e82c21269175f37720a123404551474e2aeeb2728b405ff93f9b4d9d092d027e0839 SHA512 f45c793a4b4819f0e50501ddc85acdaf99e4d675530712f8dccfb5166d071ae8ed07917a61d56037d6ba3a54123f72f4512d8c11643ea8c6e507feb9d29594e7
diff --git a/app-emulation/xen-tools/files/gentoo-patches.conf b/app-emulation/xen-tools/files/gentoo-patches.conf
index fc52db69dccd..d6fce26a06c0 100644
--- a/app-emulation/xen-tools/files/gentoo-patches.conf
+++ b/app-emulation/xen-tools/files/gentoo-patches.conf
@@ -51,44 +51,11 @@ _gx056=" xen-tools-4.12.2-libxenstat-makefile.patch"
 # Fix building with gcc 10, bug #722930
 _gx060=" xen-tools-4.13.0-gcc10.patch"
 
-# xen-tools-4.14.2 patches set
-_gpv_xen_tools_4142_0="
-	xen-tools-4.12.0-gcc8.patch
-	xen-tools-4.12.0-shim.patch
-	xen-tools-4.12.0-unbundle-ipxe.patch
-	xen-tools-4.12.2-libxenstat-makefile.patch
-	xen-tools-4.14-ar-cc.patch
-	xen-tools-4.14-qemu-bridge.patch
-	xen-tools-4.15.0-disable-werror.patch
-	xen-tools-4.15.0-gcc11.patch
-	xen-tools-4.4.1-tinfo.patch
-	xen-tools-4.6-increase-stack-size.patch
-	xen-tools-4-anti-ovmf-download.patch
-	xen-tools-4-qemu-fix-po-collision.patch
-"
-
-# xen-tools-4.14.3 patches set
-_gpv_xen_tools_4143_0="
-	xen-tools-4.12.0-gcc8.patch
-	xen-tools-4.12.0-shim.patch
-	xen-tools-4.12.0-unbundle-ipxe.patch
-	xen-tools-4.12.2-libxenstat-makefile.patch
-	xen-tools-4.14-ar-cc.patch
-	xen-tools-4.14-qemu-bridge.patch
-	xen-tools-4.15.0-disable-werror.patch
-	xen-tools-4.4.1-tinfo.patch
-	xen-tools-4.6-increase-stack-size.patch
-	xen-tools-4-anti-ovmf-download.patch
-	xen-tools-4-qemu-fix-po-collision.patch
-"
-
-# xen-tools-4.15.0 patches set
-_gpv_xen_tools_4150_0="
+# xen-tools-4.15.1 patches set
+_gpv_xen_tools_4151_0="
 	xen-tools-4.14-ar-cc.patch
 	xen-tools-4.15.0-disable-werror.patch
-	xen-tools-4.15.0-gcc11.patch
 	xen-tools-4.15.0-libxenstat-makefile.patch
-	xen-tools-4.15.0-no-ld-no-pie.patch
 	xen-tools-4.15.0-qemu-bridge.patch
 	xen-tools-4.15.0-unbundle-ipxe.patch
 	xen-tools-4.4.1-tinfo.patch
@@ -96,8 +63,8 @@ _gpv_xen_tools_4150_0="
 	xen-tools-4-qemu-fix-po-collision.patch
 "
 
-# xen-tools-4.15.1 patches set
-_gpv_xen_tools_4151_0="
+# xen-tools-4.15.2 patches set
+_gpv_xen_tools_4152_0="
 	xen-tools-4.14-ar-cc.patch
 	xen-tools-4.15.0-disable-werror.patch
 	xen-tools-4.15.0-libxenstat-makefile.patch
diff --git a/app-emulation/xen-tools/xen-tools-4.14.3.ebuild b/app-emulation/xen-tools/xen-tools-4.15.2.ebuild
index 550d43d8b601..e15386a8efc6 100644
--- a/app-emulation/xen-tools/xen-tools-4.14.3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.15.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE='ncurses,xml,threads(+)'
 
 inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
@@ -16,8 +16,8 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
 	S="${WORKDIR}/${REPO}"
 else
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-	UPSTREAM_VER=
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	UPSTREAM_VER=0
 	SECURITY_VER=
 	# xen-tools's gentoo patches tarball
 	GENTOO_VER=23
@@ -27,8 +27,8 @@ else
 	OVMF_VER=
 
 	SEABIOS_VER="1.14.0"
-	EDK2_COMMIT="06dc822d045c2bb42e497487935485302486e151"
-	EDK2_OPENSSL_VERSION="1_1_1g"
+	EDK2_COMMIT="a3741780fe3535e19e02efa869a7cac481891129"
+	EDK2_OPENSSL_VERSION="1_1_1j"
 	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
 	EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
 	IPXE_COMMIT="988d2c13cdf0f0b4140685af35ced70ac5b3283c"
@@ -154,6 +154,7 @@ BDEPEND="dev-lang/perl
 # Approved by QA team in bug #144032
 QA_WX_LOAD="
 	usr/libexec/xen/boot/hvmloader
+	usr/libexec/xen/boot/xen-shim
 	usr/share/qemu-xen/qemu/hppa-firmware.img
 	usr/share/qemu-xen/qemu/s390-ccw.img
 	usr/share/qemu-xen/qemu/u-boot.e500
@@ -169,8 +170,13 @@ QA_PREBUILT="
 	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/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
@@ -179,6 +185,8 @@ QA_PREBUILT="
 
 RESTRICT="test"
 
+PATCHES=( "${FILESDIR}/${PN}-4.15.0-fix-xenstat-python-bindings.patch" )
+
 pkg_setup() {
 	python_setup
 	export "CONFIG_LOMOUNT=y"
@@ -276,8 +284,24 @@ src_prepare() {
 		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 "${FILESDIR}/${PN}-4.15.1-brotli-gcc11.patch"
+		popd > /dev/null
+
+		pushd tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli > /dev/null
+			eapply "${FILESDIR}/${PN}-4.15.1-brotli-gcc11.patch"
+		popd > /dev/null
+
+		pushd tools/firmware/ovmf-dir-remote > /dev/null
+			eapply "${FILESDIR}/${PN}-4.15.1-edk2-python3.9.patch"
+		popd > /dev/null
 	fi
 
+	# Fix building with ocaml 4.12 #818100
+	eapply "${FILESDIR}/${PN}-4.15.1-ocaml-4.12.patch"
+
 	# ipxe
 	if use ipxe; then
 		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/_ipxe.tar.gz || die
@@ -340,7 +364,6 @@ src_prepare() {
 	# Reset bash completion dir; Bug 472438
 	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
 		-i Config.mk || die
-	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
 
 	# xencommons, Bug #492332, sed lighter weight than patching
 	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
@@ -502,8 +525,8 @@ src_install() {
 	keepdir /var/log/xen
 
 	if use python; then
-		python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/xenstat.py"
-		python_domodule "${S}/tools/xenstat/libxenstat/bindings/swig/python/_xenstat.so"
+		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