gentoo resync : 20.10.2021

5 files changed, 31 insertions, 5 deletions

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 8766efeb83ee..d62f289661d9 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -6,13 +6,14 @@ AUX qemu-5.2.0-dce-locks.patch 738 BLAKE2B 121372ed4d812a19f365ec88b584a196548f8
 AUX qemu-5.2.0-disable-keymap.patch 884 BLAKE2B dbbe245a52615f8894cbac1c94ce3fee2051b1c54def32ec6ad43dedfe8190d02937c28ce93d93eeb13fe82f2ac2df52bec375501e83af53624d8292f8208fe3 SHA512 f84c6f37ce742201b63b308bef5fdaf1dc50e77e0dcf164e85284e338ed7bd861fc0e147fb88668b056ab0f15b4e6cbefbfb2cd2bafeb002c281ae88d08f9703
 AUX qemu-5.2.0-strings.patch 799 BLAKE2B 8f249a647714a4a677d1aca5d8d5c19b27a0e1933877a286017928e01ec23d82e41dc1d196a50ba38bcf4ec8b71fd89c89e41b7c9673faf13935188eebaf4a56 SHA512 481917c8ec9c5089c210f80e719f5a65af1193323ccda4d68bec6afaab0d0e6407cee1d05cd1f3b1bfbd7b7a5f9d2cdb42dd12123813f2c3c51116e999c09288
 AUX qemu-6.0.0-make.patch 306 BLAKE2B 701c6d929dc7544a2e155243a2545dc488765cf8b733fca29c4f4cb06cad732d72f64c330d95fbcdcf12b174b92b7fa5b713bf833065e5014f8aed1eec22c0a1 SHA512 5d22c6c4085dd0bf58752e21af9addd6a1a670a60f172b488d1ccfb1b9356ce9808a3b9337dd1bd2aa9e06735a3c7a465bc11ae3871cc4294ec609729b2e09c7
+AUX qemu-6.1.0-automagic-libbpf.patch 887 BLAKE2B 9c74ea440dbd958368ae41b4d39cf869fa34f70493c7e79d5be31309d343cb35b8061c9d99f3b5e7bfcf99f4cc590d9b4854b12f109a8dd247922d7a07aa68bf SHA512 76fcb4d280cd0c7f7610b55154d987501597b823f286110e0ae756ae6bb541193423f942ce6d4f8fefdc42d1727b8689142dd50f186689427afef18adb5f62b5
 AUX qemu-6.1.0-strings.patch 882 BLAKE2B 9c35aca28371c15e037af5e9deaa90edcad769b5346f7c90cbb7768ce5639b1d1d1204933024241b7349573cc94ebca7a85ebaf051a9fb9dab8ea7d87d843ef9 SHA512 fcbf02a38401dbc7612130bb993dbec72468c926f729cd32e822b39fefe446ed8fd0906d6ffd4557181df753a84d77182fa713a5939300f193008532be88ada4
 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e
 AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
 DIST qemu-6.0.0.tar.xz 107333232 BLAKE2B 7746329d3e13782b7c346ce4052cc517cfc65cd9b2d514d199e4d5b8570ca79566ec04b0c114db2e97c84e68eb551e0d4cdce1b14b91a88fe08d2a5f682c1418 SHA512 ee3ff00aebec4d8891d2ff6dabe4e667e510b2a4fe3f6190aa34673a91ea32dcd2db2e9bf94c2f1bf05aa79788f17cfbbedc6027c0988ea08a92587b79ee05e4
 DIST qemu-6.1.0.tar.xz 111258808 BLAKE2B 412eecf6d39debd6089b26d3b22e5d25c6c8c30d2eaf31b17c25cc2b3a1b10794a30218dfb151c78801aa295255aa974b297f1fe05b93f14334f203c2af5ccee SHA512 3378ae21c75b77ee6a759827f1fcf7b2a50a0fef07e3b0e89117108022a8d8655fa977e4d65596f4f24f7c735c6594d44b0c6f69732ea4465e88a7406b1d5d3c
 EBUILD qemu-6.0.0-r3.ebuild 25707 BLAKE2B e42d63e7b996356466a1aaecc99b6b6435d8a7c733694b9afd5279cebc973c9236e8544dc806d3117a60ee725e1a5a0bb3a2fbbecc0d7053b57fb4b5e66211b8 SHA512 26ff7c7d12b427621dbfea2a6fb9e5e79ae8e5ee6eb8bebfd6c0512bed547bb62c99629592d23ca2f24611fb17fd37f15a43ae063b5b4b8bf9c9ad0712c3c1ec
-EBUILD qemu-6.0.0-r53.ebuild 25774 BLAKE2B ad019835cd1acd45f7b5c4d29161b3626a8a285d3d2c67b65aca3a5fe05a8748b252eadaddfbd177213f70f8be14dfec820e29a7ff068eb7fe87e5e742bc5901 SHA512 21c12bd597e7f1ed984aa1a6fb880a3cdfc5d7eb91dedd6265b8cd9be1d162eab371b3245ae02975fd9d7c981d5f1b944fa00fe4abd55458544e0fea72d75d7d
-EBUILD qemu-6.1.0.ebuild 25679 BLAKE2B 41ce7b2b45928ea5b5218f5764d0de0e96b40235663e573ec9fea0531e77dc3764dc87107239d6aa08e2b20b44cd30d01bf6bd344045a7ba8a42d9ebb4f7635e SHA512 0e26b90e4395d33b1cdebb5bf6ceb38f49fb0c191a3ce11b736cf94a1fb29369134fab7df834faa3b289a4ae68206063b4ade91d524b2d06ea7ba894cf26b885
+EBUILD qemu-6.0.0-r53.ebuild 25771 BLAKE2B 24747bb80a6be10aeee0a57544fd888ea6f07c4df4185366243f8716f47e54f4efce6eee7294ec4418046f88e7a02b52ab2e672cc66fa1876414bbf4d5648e57 SHA512 c818fb678899e76b9b6e16f84328b0d1def41614272d49067a0719b8540e46b950daa9229cc2b055b32877287e5356751d5e5db07541d27762ccaf124c970fc6
+EBUILD qemu-6.1.0.ebuild 25776 BLAKE2B 8e9e76c6839891b180a81c5a8563b3103fadf0bdc9a7e9608d22d1068007066788cb04b31140522745d5805ed0a91bf091d7b912a2666ef4410a71dd0d4213f2 SHA512 c2f1eb8cf381ac37f017fceb93f6ea0f5a62294dce66d4c157b78f8e29c04f313077fdf4ab0c4cbad32a0fd87d282804d3a0d84379e08dd45203997c36e388b4
 EBUILD qemu-9999.ebuild 25643 BLAKE2B 662ee64944087293a48267ce2c2e09ae940b088a50bf1ff6e09efddaf2656119267511130b8030c1d4e05fa3eabfc6c69ed7c302da6d1e952679c743a16e9dda SHA512 7389c614c6f092a0e333d5f9deca972d85dbc08fdd9bcfc3894aa14b506bcbcfa2810ac8ca097de7415eb1c3915a02c5984ea483db2dd9260a71aafcad407009
-MISC metadata.xml 4412 BLAKE2B c941bfcd3b0e601598859f87e5651959553e5b0baaa5f0adad01c6ea840cffb03612310e9fa034a92b16a1db27a5c07be3bd41be5105ba02bd8719e65bd43d6e SHA512 3639168093bf902d954c90748b69e3af66d9d03aeae8ddbf8ee5969ea9329f5a3a57312adf6995d12a26140b952a0a534eb4db6952f59b8bdd979c9bc91323c1
+MISC metadata.xml 4482 BLAKE2B 0444445c2cd94eb4c5446bd05ebb40e6bef98483f399a6c976affd36535962cc0c60b870b94dbd3dc7d184fad11eb7b6f401aacef016bce677e44450609661d8 SHA512 88bdbadca89a143d8dcb4a1d00629feff7ab8ac87878a23207933f9f3f414f76023b329c0aa91dfbc025ace7c138b5d08c5c7ddb51d61a6933c225511c040b47
diff --git a/app-emulation/qemu/files/qemu-6.1.0-automagic-libbpf.patch b/app-emulation/qemu/files/qemu-6.1.0-automagic-libbpf.patch
new file mode 100644
index 000000000000..d067650dc8fa
--- /dev/null
+++ b/app-emulation/qemu/files/qemu-6.1.0-automagic-libbpf.patch
@@ -0,0 +1,21 @@
+commit 080832e4f4801a28bd1170c49e61f6a0f5f05d03
+Author: Paolo Bonzini <pbonzini@redhat.com>
+Date:   Tue Sep 7 12:45:12 2021 +0200
+
+    ebpf: only include in system emulators
+    
+    eBPF files are being included in user emulators, which is useless and
+    also breaks compilation because ebpf/trace-events is only processed
+    if a system emulator is included in the build.
+    
+    Resolves: https://gitlab.com/qemu-project/qemu/-/issues/566
+    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+    Signed-off-by: Jason Wang <jasowang@redhat.com>
+
+diff --git a/ebpf/meson.build b/ebpf/meson.build
+index 9cd0635370..2dd0fd8948 100644
+--- a/ebpf/meson.build
++++ b/ebpf/meson.build
+@@ -1 +1 @@
+-common_ss.add(when: libbpf, if_true: files('ebpf_rss.c'), if_false: files('ebpf_rss-stub.c'))
++softmmu_ss.add(when: libbpf, if_true: files('ebpf_rss.c'), if_false: files('ebpf_rss-stub.c'))
diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index 6cc5daac8dcd..094f223846c3 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -17,6 +17,7 @@
 		<flag name="accessibility">Adds support for braille displays using brltty</flag>
 		<flag name="aio">Enables support for Linux's Async IO</flag>
 		<flag name="alsa">Enable alsa output for sound emulation</flag>
+		<flag name="bpf">Enable eBPF support for RSS implementation.</flag>
 		<flag name="capstone">Enable disassembly support with <pkg>dev-libs/capstone</pkg></flag>
 		<flag name="curl">Support ISOs / -cdrom directives via HTTP or HTTPS.</flag>
 		<flag name="fdt">Enables firmware device tree support</flag>
diff --git a/app-emulation/qemu/qemu-6.0.0-r53.ebuild b/app-emulation/qemu/qemu-6.0.0-r53.ebuild
index ea4fef2265a6..c08a7c759b94 100644
--- a/app-emulation/qemu/qemu-6.0.0-r53.ebuild
+++ b/app-emulation/qemu/qemu-6.0.0-r53.ebuild
@@ -23,7 +23,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.qemu.org/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
 fi
 
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
diff --git a/app-emulation/qemu/qemu-6.1.0.ebuild b/app-emulation/qemu/qemu-6.1.0.ebuild
index 8365c047729d..15cd2a1d2944 100644
--- a/app-emulation/qemu/qemu-6.1.0.ebuild
+++ b/app-emulation/qemu/qemu-6.1.0.ebuild
@@ -32,7 +32,7 @@ HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org"
 LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
 
-IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc
+IUSE="accessibility +aio alsa bpf bzip2 capstone +caps +curl debug +doc
 	+fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring
 	jack jemalloc +jpeg kernel_linux
 	kernel_FreeBSD lzo multipath
@@ -142,6 +142,7 @@ SOFTMMU_TOOLS_DEPEND="
 	)
 	aio? ( dev-libs/libaio[static-libs(+)] )
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
+	bpf? ( dev-libs/libbpf:= )
 	bzip2? ( app-arch/bzip2[static-libs(+)] )
 	capstone? ( dev-libs/capstone:= )
 	caps? ( sys-libs/libcap-ng[static-libs(+)] )
@@ -276,6 +277,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch
 	"${FILESDIR}"/${PN}-6.0.0-make.patch
 	"${FILESDIR}"/${PN}-6.1.0-strings.patch
+	"${FILESDIR}"/${P}-automagic-libbpf.patch
 )
 
 QA_PREBUILT="
@@ -501,6 +503,7 @@ qemu_src_configure() {
 	conf_opts+=(
 		$(conf_notuser accessibility brlapi)
 		$(conf_notuser aio linux-aio)
+		$(conf_softmmu bpf)
 		$(conf_notuser bzip2)
 		$(conf_notuser capstone)
 		$(conf_notuser caps cap-ng)