gentoo auto-resync : 12:03:2023 - 06:11:51

5 files changed, 44 insertions, 3 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index f07f0a1edd02..bf28d68f8d8e 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index f50753cc1974..ad90832eb94f 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -7,6 +7,8 @@ AUX qemu-7.1.0-capstone-include-path.patch 1076 BLAKE2B cb595acb50ff2a64d0b879d5
 AUX qemu-7.2.0-disable-gmp.patch 1554 BLAKE2B ac21e5985676123e8b61de8d590d8489de1d7401e5005899e5a95d7e86b77741572087a294d4b63533c26fe53f81c76e23ee482fd3a371f2e3700859644b6c8a SHA512 d4a600cfe42f1c49d45cffae64ba1e1225ae8e75a92454cbb534be5f95e1b8dbdbf441d092764cc9f9e97ed6bf6367175d7b56cdf97694dec57da2c8fabd1969
 AUX qemu-7.2.0-linux-headers-6.2-glibc-2.36.patch 5148 BLAKE2B 74d22dbc2113d7e7150908046f5c7c04be2f330143d7f61b5a08d8b837b3665857327f50176393a3df0078c5b856cd34b72e779825d10fb8faec9678812d8654 SHA512 3c4a7d41710b34bdce4ab09929aba25fe3995c85dfa1e2a88ea780179709e8ccfe7e7c5073ef321c986061282725896ca615193be68c48674d6b5632f4995661
 AUX qemu-7.2.0-tcg-curl-ssl.patch 6514 BLAKE2B 02bde5269b02472a9afb24019bbeee6995a317ca6c0ab355dad20bcfa088be7ac2c82ce3f544d8397fb44db52dc94cb060139b74515c216479d12ccb1b152f8d SHA512 1117179b48824d0aed39e352783f8228658a39e8f52a171076ba60df42cd5869bde6092d7bd63b88a594e4d7b355935f8f2294057a19be26a53c63b98d8cb761
+AUX qemu-8.0.0-disable-keymap.patch 1108 BLAKE2B 1ea466578b1251803250e4fb16ea7363e58e743a904fb542371cf0df6acf3c6734ce5921f824f1cc87d0bb1b3f2793d1f59d4732a55566ae1eb316f09e4614fa SHA512 dff22d1fc8ace0812300c402af95458fbd400a069204fdb26099a9822f5849c4feb72811f359c835634eacf0c2d589dcba3e0bd6e819e85373c33d19868eaf18
+AUX qemu-8.0.0-make.patch 305 BLAKE2B fb292d6cc13268ad79db85c907825a67e8ae84e4d53ebb8a83a78e3dd33e208a2de96d0df09963874bc596beb062966542d255fc08ceff7ccbd893069042c8ef SHA512 a603d68b952b297089c6bcb1a1e0bd114381bf444cd9638bc383689f64aa940d5376b9174df4078aabba52e9e3d564485ffe650322bf3b2657aebc140446bd7a
 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e
 AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
 DIST qemu-7.2.0-docs.tar.xz 1984184 BLAKE2B 103900fb7903ed8d75f7f012bf61fa2d6fce345b657c851d0437c3384f5735bd1cfd3129320683ea7846ea0b0940e5af5b2663c9320f12fee74b058523a8ea06 SHA512 a7edd448982865e07533c300d3e44a8b50cefbdde1982b73c24d0b2aa74315439252c59b634c75de312860874c7b06c75aa72629da681b5105f28ee936794585
@@ -14,5 +16,5 @@ DIST qemu-7.2.0.tar.xz 122408576 BLAKE2B 415ff621356c59f88b29cfe3ef5db1e282b26bb
 EBUILD qemu-7.2.0-r2.ebuild 27511 BLAKE2B 42b6f37ac0884baec367ee08783d8605bab17c9d396a29d71a2f4d29171f27f41ade4c22918d9818460d1554ea354b844a0cbd3f967898ce0f8f5fc0d61339e3 SHA512 d92da3cbe562f29b1cdeaab456dd68eec0a57e54230deecce53537ff54ecab7a4abb839ae491eb3958f7635dcdc4327ba9ff4d879d7e2db3fecb62f44b693131
 EBUILD qemu-7.2.0-r3.ebuild 27557 BLAKE2B d460a49bc8da7c15f0511b5dad0f29d3759f7579b3523be45abf1e23b2352b01cfcd00cb748355ff475c04357a44cf795a968f9b07ac2331627fbc39d105f6cc SHA512 b931683cadd8a6247778fee17b0a18ee7a6afa36809f89f2b2356a88ed44095764a24de9fe1e13d1e35e0172a3b51d02ad55663bafdffbaeae255d934b906770
 EBUILD qemu-7.2.0.ebuild 27190 BLAKE2B e8043e113cef4b06501c0141126925ee21906c187868202b8c4b885120dc6552305558b55ba88f4cdc5c004771d8e888d86a6f8140f17200279e3b2ee85da9f8 SHA512 c413dfa2382e993022d079128afd5e49ce41eebd276323836058ce5fe2d620baad35868bf213cae3c0d212eb9bf7ba53c0eb58380435cb5808d96a11a8980822
-EBUILD qemu-9999.ebuild 27365 BLAKE2B d8fda510a06bd1164b36c215978254710b0c924a0667dd0ab2c89d907d51df8b366b7b8f69b55bf4a20621dd3df5de36cc6166c5e12c194c08b341ef658568a7 SHA512 a3a4333404505538f96ffac67741fe04f6a047cdd0f9a5a19e2e784f752dfd2b07950b28ee0ea5d715deed4d118a3b29cb3c17502a434d214575e152c7fb6ea1
+EBUILD qemu-9999.ebuild 27365 BLAKE2B 560f23f250a9d377853a19e1eea99c82e561189b84066ee111d093d61e89e7ba60470738a4fc9ba6fcedcae5ce2ab40f308cb1deeeee16dd05ab00053c81e90d SHA512 680271052011be37781a89f0476a302a9ae4f2be6cdbb31f21b44ded0aa73e23a8084ad6aea346068c3b1034a1ce00514b45d2e6b0d886a6b44e8b3ecf10094a
 MISC metadata.xml 4249 BLAKE2B 56e23de79e691a3634c21f2c7d3d2d02461cc5d2569c4ff15856f8ea99f8d53837cfa7c4dede988c304fdbe3c831f9cd776b9d62191e87f593d9643594abc133 SHA512 c4fd2aea291de484c24e3ef8d1b88a95fe3ac0b73d44bbae99f0de076b2335222f32e1b49a3fe7bd7168dc5cc290274a13bd7c615aeb54d06a04c8819e1f1b96
diff --git a/app-emulation/qemu/files/qemu-8.0.0-disable-keymap.patch b/app-emulation/qemu/files/qemu-8.0.0-disable-keymap.patch
new file mode 100644
index 000000000000..aab5dde5fbd9
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-8.0.0-disable-keymap.patch
@@ -0,0 +1,27 @@
+diff -ruN qemu-9999.orig/meson.build qemu-9999/meson.build
+--- qemu-9999.orig/meson.build	2023-03-12 01:17:38.273756012 +0100
++++ qemu-9999/meson.build	2023-03-12 01:18:44.854716789 +0100
+@@ -667,6 +667,8 @@
+ 
+ if get_option('xkbcommon').auto() and not have_system and not have_tools
+   xkbcommon = not_found
++elif get_option('xkbcommon').disabled()
++  xkbcommon = not_found
+ else
+   xkbcommon = dependency('xkbcommon', required: get_option('xkbcommon'),
+                          method: 'pkg-config', kwargs: static_kwargs)
+diff -ruN qemu-9999.orig/pc-bios/keymaps/meson.build qemu-9999/pc-bios/keymaps/meson.build
+--- qemu-9999.orig/pc-bios/keymaps/meson.build	2023-03-12 01:17:38.321756706 +0100
++++ qemu-9999/pc-bios/keymaps/meson.build	2023-03-12 01:20:22.015111600 +0100
+@@ -33,8 +33,10 @@
+   'tr': '-l tr',
+ }
+ 
+-if meson.is_cross_build() or not xkbcommon.found()
++if meson.is_cross_build()
+   native_qemu_keymap = find_program('qemu-keymap', required: false, disabler: true)
++elif get_option('xkbcommon').disabled()
++  native_qemu_keymap = not_found
+ else
+   native_qemu_keymap = qemu_keymap
+ endif
diff --git a/app-emulation/qemu/files/qemu-8.0.0-make.patch b/app-emulation/qemu/files/qemu-8.0.0-make.patch
new file mode 100644
index 000000000000..4bf3f7157713
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-8.0.0-make.patch
@@ -0,0 +1,12 @@
+diff -ruN qemu-9999.orig/configure qemu-9999/configure
+--- qemu-9999.orig/configure	2023-03-12 01:26:15.488133462 +0100
++++ qemu-9999/configure	2023-03-12 01:29:19.355724020 +0100
+@@ -1068,7 +1068,7 @@
+     fi
+ fi
+ 
+-if ! has "$make"
++if ! has $make
+ then
+     error_exit "GNU make ($make) not found"
+ fi
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 61f5fdffb2eb..874bcfff7852 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -308,8 +308,8 @@ RDEPEND="${CDEPEND}
 	)"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
-	"${FILESDIR}"/${PN}-6.0.0-make.patch
+	"${FILESDIR}"/${PN}-8.0.0-disable-keymap.patch
+	"${FILESDIR}"/${PN}-8.0.0-make.patch
 	"${FILESDIR}"/${PN}-7.1.0-also-build-virtfs-proxy-helper.patch
 	"${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch
 )